Skip to content

Commit 3836fac

Browse files
authored
Merge pull request #43087 from dotnet/main
Merge main into live
2 parents 73a244a + 103df1f commit 3836fac

File tree

66 files changed

+690
-388
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+690
-388
lines changed

.github/dependabot.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1009,6 +1009,17 @@ updates:
10091009
dotnet:
10101010
patterns:
10111011
- "*" # Prefer a single PR per project update.
1012+
- package-ecosystem: "nuget"
1013+
directory: "/docs/core/extensions/snippets/configuration/console-binder-gen" #console-binder-gen.csproj
1014+
schedule:
1015+
interval: "weekly"
1016+
day: "wednesday"
1017+
open-pull-requests-limit: 5
1018+
groups:
1019+
# Group .NET updates together for projects.
1020+
dotnet:
1021+
patterns:
1022+
- "*" # Prefer a single PR per project update.
10121023
- package-ecosystem: "nuget"
10131024
directory: "/docs/core/extensions/snippets/configuration/console-custom-logging" #console-custom-logging.csproj
10141025
schedule:
@@ -2186,14 +2197,3 @@ updates:
21862197
dotnet:
21872198
patterns:
21882199
- "*" # Prefer a single PR per project update.
2189-
- package-ecosystem: "nuget"
2190-
directory: "/docs/orleans/deployment/snippets/service-fabric/stateless" #Orleans.ServiceFabric.Stateless.csproj
2191-
schedule:
2192-
interval: "weekly"
2193-
day: "wednesday"
2194-
open-pull-requests-limit: 5
2195-
groups:
2196-
# Group .NET updates together for projects.
2197-
dotnet:
2198-
patterns:
2199-
- "*" # Prefer a single PR per project update.

.github/policies/policy-edits.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,12 @@ configuration:
2525
permission: admin
2626
- activitySenderHasPermission:
2727
permission: write
28+
- isActivitySender:
29+
user: dependabot
30+
- isActivitySender:
31+
user: dependabot[bot]
32+
- isActivitySender:
33+
user: dotnet-policy-service[bot]
2834
then:
2935
- addReply:
3036
reply: >-

.github/workflows/scorecards.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,14 @@ jobs:
6363
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
6464
# format to the repository Actions tab.
6565
- name: "Upload artifact"
66-
uses: actions/upload-artifact@84480863f228bb9747b473957fcc9e309aa96097 # v4.4.2
66+
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
6767
with:
6868
name: SARIF file
6969
path: results.sarif
7070
retention-days: 5
7171

7272
# Upload the results to GitHub's code scanning dashboard.
7373
- name: "Upload to code-scanning"
74-
uses: github/codeql-action/upload-sarif@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3.26.12
74+
uses: github/codeql-action/upload-sarif@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
7575
with:
7676
sarif_file: results.sarif

docs/azure/includes/dotnet-all.md

Lines changed: 29 additions & 29 deletions
Large diffs are not rendered by default.

docs/azure/includes/dotnet-new.md

Lines changed: 14 additions & 14 deletions
Large diffs are not rendered by default.

docs/azure/sdk/snippets/logging/LoggingSampleApp.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<ItemGroup>
1010
<PackageReference Include="Azure.Extensions.AspNetCore.DataProtection.Blobs" Version="1.3.4" />
1111
<PackageReference Include="Azure.Extensions.AspNetCore.DataProtection.Keys" Version="1.2.4" />
12-
<PackageReference Include="Azure.Identity" Version="1.12.1" />
12+
<PackageReference Include="Azure.Identity" Version="1.13.0" />
1313
<PackageReference Include="Microsoft.Extensions.Azure" Version="1.7.6" />
1414
</ItemGroup>
1515

docs/azure/sdk/snippets/pagination/pagination.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Azure.Security.KeyVault.Secrets" Version="4.6.0" />
12+
<PackageReference Include="Azure.Security.KeyVault.Secrets" Version="4.7.0" />
1313
<PackageReference Include="Microsoft.Extensions.Azure" Version="1.7.6" />
1414
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
1515
<PackageReference Include="System.Linq.Async" Version="6.0.1" />

docs/azure/sdk/snippets/unit-testing/UnitTestingSampleApp.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Azure.Core" Version="1.44.0" />
14-
<PackageReference Include="Azure.Security.KeyVault.Secrets" Version="4.6.0" />
13+
<PackageReference Include="Azure.Core" Version="1.44.1" />
14+
<PackageReference Include="Azure.Security.KeyVault.Secrets" Version="4.7.0" />
1515
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
1616
<PackageReference Include="Moq" Version="[4.20.72]" /> <!-- Context: https://github.com/Azure/azure-sdk-for-net/issues/38111 -->
1717
<PackageReference Include="NSubstitute" Version="5.1.0" />

docs/core/diagnostics/snippets/Microsoft.Diagnostics.NETCore.Client/csharp/Microsoft.Diagnostics.NETCore.Client.Samples.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<ItemGroup>
99
<PackageReference Include="Microsoft.Diagnostics.NETCore.Client" Version="0.2.547301" />
10-
<PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="3.1.15" />
10+
<PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="3.1.16" />
1111
</ItemGroup>
1212

1313
</Project>

docs/core/diagnostics/snippets/OTLP-Example/csharp/OTLP-Example.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</ItemGroup>
1717

1818
<ItemGroup>
19-
<PackageReference Include="Azure.Monitor.OpenTelemetry.AspNetCore" Version="1.3.0-beta.1" />
19+
<PackageReference Include="Azure.Monitor.OpenTelemetry.AspNetCore" Version="1.3.0-beta.2" />
2020
</ItemGroup>
2121

2222
</Project>

0 commit comments

Comments
 (0)