Skip to content

✅ Merge main into live #1553

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Aug 22, 2024
Merged

✅ Merge main into live #1553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
29ae2ae
Bump Microsoft.NET.Test.Sdk (#1532)
dependabot[bot] Aug 21, 2024
50cd45a
Bump Microsoft.NET.Test.Sdk (#1533)
dependabot[bot] Aug 21, 2024
e4168b2
Bump Swashbuckle.AspNetCore (#1534)
dependabot[bot] Aug 21, 2024
45f5192
Bump Microsoft.NET.Test.Sdk (#1535)
dependabot[bot] Aug 21, 2024
fcf9ebe
Bump Microsoft.Azure.SignalR (#1537)
dependabot[bot] Aug 21, 2024
beae0ee
Bump Swashbuckle.AspNetCore (#1547)
dependabot[bot] Aug 21, 2024
0885cbf
Update MailKitClientSettings.cs (#1531)
sammychinedu2ky Aug 21, 2024
a4bce98
Update custom-component.md (#1530)
sammychinedu2ky Aug 21, 2024
1a0bd94
Update custom-component.md (#1550)
sammychinedu2ky Aug 21, 2024
98f3777
Bump Dapr.AspNetCore (#1536)
dependabot[bot] Aug 21, 2024
27b8713
Bump Swashbuckle.AspNetCore (#1548)
dependabot[bot] Aug 21, 2024
6c6548b
Update MailKitClientSettings.cs (#1551)
sammychinedu2ky Aug 21, 2024
41d9902
Switch order of approve and auto-merge (#1552)
gewarren Aug 21, 2024
7161c2f
Bump Swashbuckle.AspNetCore (#1543)
dependabot[bot] Aug 21, 2024
feae8a7
Bump github/codeql-action from 3.26.1 to 3.26.3 (#1539)
dependabot[bot] Aug 21, 2024
c4b5243
Bump Swashbuckle.AspNetCore (#1540)
dependabot[bot] Aug 21, 2024
92f9314
Bump Swashbuckle.AspNetCore (#1538)
dependabot[bot] Aug 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/policies/auto-merge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ configuration:
- targetsBranch:
branch: main
then:
- enableAutoMerge:
mergeMethod: Squash
- approvePullRequest:
comment: "Approved; this PR will merge when all status checks pass."
- enableAutoMerge:
mergeMethod: Squash

- description: Auto-merge PRs to live labeled with 'auto-merge'
triggerOnOwnActions: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scorecards.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,6 @@ jobs:

# Upload the results to GitHub's code scanning dashboard.
- name: "Upload to code-scanning"
uses: github/codeql-action/upload-sarif@29d86d22a34ea372b1bbf3b2dced2e25ca6b3384 # v3.26.1
uses: github/codeql-action/upload-sarif@883d8588e56d1753a8a58c1c86e88976f0c23449 # v3.26.3
with:
sarif_file: results.sarif
2 changes: 1 addition & 1 deletion docs/deployment/azure/snippets/WebHook.Api/WebHook.Api.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.8" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.7.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.7.1" />
</ItemGroup>

</Project>
8 changes: 7 additions & 1 deletion docs/extensibility/custom-component.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ If you're following along, you should have a Newsletter app from the steps in th
1. Add the project to the solution.

```dotnetcli
dotnet sln /MailDevResource.sln add MailKit.Client/MailKit.Client.csproj
dotnet sln ./MailDevResource.sln add MailKit.Client/MailKit.Client.csproj
```

The next step is to add all the NuGet packages that the component relies on. Rather than having you add each package one-by-one from the .NET CLI, it's likely easier to copy and paste the following XML into the _MailKit.Client.csproj_ file.
Expand Down Expand Up @@ -155,6 +155,12 @@ With the component library created, you can now update the Newsletter service to
dotnet add ./MailDevResource.NewsletterService/MailDevResource.NewsletterService.csproj reference MailKit.Client/MailKit.Client.csproj
```

Next, add a reference to the `ServiceDefaults` project:

```dotnetcli
dotnet add ./MailDevResource.NewsletterService/MailDevResource.NewsletterService.csproj reference MailDevResource.ServiceDefaults/MailDevResource.ServiceDefaults.csproj
```

The final step is to replace the existing _:::no-loc text="Program.cs":::_ file in the `MailDevResource.NewsletterService` project with the following C# code:

:::code source="snippets/MailDevResourceAndComponent/MailDevResource.NewsletterService/Program.cs":::
Expand Down
2 changes: 1 addition & 1 deletion ...ailDevResource/MailDevResource.NewsletterService/MailDevResource.NewsletterService.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.8" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.7.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.7.1" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...ceAndComponent/MailDevResource.NewsletterService/MailDevResource.NewsletterService.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.8" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.7.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.7.1" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...xtensibility/snippets/MailDevResourceAndComponent/MailKit.Client/MailKitClientSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ configuration section.
""");
}

if (Uri.TryCreate(endpoint.ToString(), UriKind.Absolute, out var uri) is false)
if (Uri.TryCreate(endpoint.ToString(), UriKind.Absolute, out uri) is false)
{
throw new InvalidOperationException($"""
The 'ConnectionStrings:<connectionName>' (or 'Endpoint' key in
Expand Down
2 changes: 1 addition & 1 deletion ...ithCredentials/MailDevResource.NewsletterService/MailDevResource.NewsletterService.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.8" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.7.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.7.1" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...nsibility/snippets/MailDevResourceWithCredentials/MailKit.Client/MailKitClientSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ configuration section.
""");
}

if (Uri.TryCreate(endpoint.ToString(), UriKind.Absolute, out var uri) is false)
if (Uri.TryCreate(endpoint.ToString(), UriKind.Absolute, out uri) is false)
{
throw new InvalidOperationException($"""
The 'ConnectionStrings:<connectionName>' (or 'Endpoint' key in
Expand Down
2 changes: 1 addition & 1 deletion docs/frameworks/snippets/Dapr/Dapr.Web/Dapr.Web.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Dapr.AspNetCore" Version="1.13.1" />
<PackageReference Include="Dapr.AspNetCore" Version="1.14.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion docs/fundamentals/snippets/testing/nunit/AspireApp.Tests/AspireApp.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<ItemGroup>
<PackageReference Include="Aspire.Hosting.Testing" Version="8.1.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
<PackageReference Include="NUnit" Version="4.1.0" />
<PackageReference Include="NUnit.Analyzers" Version="4.3.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
Expand Down
2 changes: 1 addition & 1 deletion docs/fundamentals/snippets/testing/xunit/AspireApp.Tests/AspireApp.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<ItemGroup>
<PackageReference Include="Aspire.Hosting.Testing" Version="8.1.0" />
<PackageReference Include="coverlet.collector" Version="6.0.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
<PackageReference Include="xunit" Version="2.9.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion docs/real-time/snippets/signalr/SignalR.ApiService/SignalR.ApiService.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Azure.SignalR" Version="1.26.0" />
<PackageReference Include="Microsoft.Azure.SignalR" Version="1.26.1" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading