Skip to content

Commit 584b5ef

Browse files
Merge pull request #44676 from dotnet/main
Merge main into live
2 parents 4c2e26b + 5802e8b commit 584b5ef

File tree

118 files changed

+579
-418
lines changed

Some content is hidden

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

118 files changed

+579
-418
lines changed

.github/dependabot.yml

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,17 @@ updates:
88
interval: "weekly"
99
day: "wednesday"
1010
open-pull-requests-limit: 10
11+
- package-ecosystem: "nuget"
12+
directory: "/docs/azure/sdk/snippets/authentication/best-practices" #BestPractices.sln
13+
schedule:
14+
interval: "weekly"
15+
day: "wednesday"
16+
open-pull-requests-limit: 5
17+
groups:
18+
# Group .NET updates together for solutions.
19+
dotnet:
20+
patterns:
21+
- "*" # Prefer a single PR per solution update.
1122
- package-ecosystem: "nuget"
1223
directory: "/docs/core/extensions/snippets/caching" #caching.sln
1324
schedule:
@@ -767,6 +778,17 @@ updates:
767778
dotnet:
768779
patterns:
769780
- "*" # Prefer a single PR per project update.
781+
- package-ecosystem: "nuget"
782+
directory: "/docs/ai/how-to/snippets/hosted-app-auth" #hosted-app-auth.csproj
783+
schedule:
784+
interval: "weekly"
785+
day: "wednesday"
786+
open-pull-requests-limit: 5
787+
groups:
788+
# Group .NET updates together for projects.
789+
dotnet:
790+
patterns:
791+
- "*" # Prefer a single PR per project update.
770792
- package-ecosystem: "nuget"
771793
directory: "/docs/ai/how-to/snippets/semantic-kernel" #semantic-kernel.csproj
772794
schedule:
@@ -778,6 +800,17 @@ updates:
778800
dotnet:
779801
patterns:
780802
- "*" # Prefer a single PR per project update.
803+
- package-ecosystem: "nuget"
804+
directory: "/docs/ai/quickstarts/snippets/assistants" #AIAssistants.csproj
805+
schedule:
806+
interval: "weekly"
807+
day: "wednesday"
808+
open-pull-requests-limit: 5
809+
groups:
810+
# Group .NET updates together for projects.
811+
dotnet:
812+
patterns:
813+
- "*" # Prefer a single PR per project update.
781814
- package-ecosystem: "nuget"
782815
directory: "/docs/ai/quickstarts/snippets/build-chat-app/azure-openai" #ChatAppAI.csproj
783816
schedule:
@@ -2164,36 +2197,3 @@ updates:
21642197
dotnet:
21652198
patterns:
21662199
- "*" # Prefer a single PR per project update.
2167-
- package-ecosystem: "nuget"
2168-
directory: "/docs/devops/snippets/create-dotnet-github-action/DotNet.GitHubAction" #DotNet.GitHubAction.csproj
2169-
schedule:
2170-
interval: "weekly"
2171-
day: "wednesday"
2172-
open-pull-requests-limit: 5
2173-
groups:
2174-
# Group .NET updates together for projects.
2175-
dotnet:
2176-
patterns:
2177-
- "*" # Prefer a single PR per project update.
2178-
- package-ecosystem: "nuget"
2179-
directory: "/docs/framework/migration-guide/snippets/csharp" #FrameworkVersions.csproj
2180-
schedule:
2181-
interval: "weekly"
2182-
day: "wednesday"
2183-
open-pull-requests-limit: 5
2184-
groups:
2185-
# Group .NET updates together for projects.
2186-
dotnet:
2187-
patterns:
2188-
- "*" # Prefer a single PR per project update.
2189-
- package-ecosystem: "nuget"
2190-
directory: "/docs/framework/migration-guide/snippets/visual-basic" #FrameworkVersions.vbproj
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/workflows/scorecards.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,6 @@ jobs:
7171

7272
# Upload the results to GitHub's code scanning dashboard.
7373
- name: "Upload to code-scanning"
74-
uses: github/codeql-action/upload-sarif@17a820bf2e43b47be2c72b39cc905417bc1ab6d0 # v3.28.6
74+
uses: github/codeql-action/upload-sarif@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
7575
with:
7676
sarif_file: results.sarif

.github/workflows/snippets5000.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
# Get the latest preview SDK (or sdk not installed by the runner)
4242
- name: Setup .NET
4343
if: ${{ env.DOTNET_DO_INSTALL == 'true' }}
44-
uses: actions/setup-dotnet@87b7050bc53ea08284295505d98d2aa94301e852 #@4.2.0
44+
uses: actions/setup-dotnet@3951f0dfe7a07e2313ec93c75700083e2005cbab #@4.3.0
4545
with:
4646
dotnet-version: ${{ env.DOTNET_VERSION }}
4747
dotnet-quality: ${{ env.DOTNET_QUALITY }}

docs/ai/quickstarts/snippets/assistants/AIAssistants.csproj

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

1010
<ItemGroup>
11-
<PackageReference Include="Azure.AI.OpenAI" Version="2.1.0-beta.2" />
12-
<PackageReference Include="Azure.Identity" Version="1.13.1" />
11+
<PackageReference Include="Azure.AI.OpenAI" Version="2.1.0" />
12+
<PackageReference Include="Azure.Identity" Version="1.13.2" />
1313
<PackageReference Include="OpenAI" Version="2.1.0" />
1414
</ItemGroup>
1515

docs/azure/includes/dotnet-all.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@
289289
| Resource Management - NetApp Files | NuGet [1.8.0](https://www.nuget.org/packages/Azure.ResourceManager.NetApp/1.8.0) | [docs](/dotnet/api/overview/azure/ResourceManager.NetApp-readme) | GitHub [1.8.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.NetApp_1.8.0/sdk/netapp/Azure.ResourceManager.NetApp/) |
290290
| Resource Management - Network | NuGet [1.10.0](https://www.nuget.org/packages/Azure.ResourceManager.Network/1.10.0) | [docs](/dotnet/api/overview/azure/ResourceManager.Network-readme) | GitHub [1.10.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Network_1.10.0/sdk/network/Azure.ResourceManager.Network/) |
291291
| Resource Management - Network Analytics | NuGet [1.0.0](https://www.nuget.org/packages/Azure.ResourceManager.NetworkAnalytics/1.0.0) | [docs](/dotnet/api/overview/azure/ResourceManager.NetworkAnalytics-readme) | GitHub [1.0.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.NetworkAnalytics_1.0.0/sdk/networkanalytics/Azure.ResourceManager.NetworkAnalytics/) |
292-
| Resource Management - Network Cloud | NuGet [1.0.1](https://www.nuget.org/packages/Azure.ResourceManager.NetworkCloud/1.0.1)<br>NuGet [1.1.0-beta.1](https://www.nuget.org/packages/Azure.ResourceManager.NetworkCloud/1.1.0-beta.1) | [docs](/dotnet/api/overview/azure/ResourceManager.NetworkCloud-readme) | GitHub [1.0.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.NetworkCloud_1.0.1/sdk/networkcloud/Azure.ResourceManager.NetworkCloud/)<br>GitHub [1.1.0-beta.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.NetworkCloud_1.1.0-beta.1/sdk/networkcloud/Azure.ResourceManager.NetworkCloud/) |
292+
| Resource Management - Network Cloud | NuGet [1.1.0](https://www.nuget.org/packages/Azure.ResourceManager.NetworkCloud/1.1.0) | [docs](/dotnet/api/overview/azure/ResourceManager.NetworkCloud-readme) | GitHub [1.1.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.NetworkCloud_1.1.0/sdk/networkcloud/Azure.ResourceManager.NetworkCloud/) |
293293
| Resource Management - Network Function | NuGet [1.0.0-beta.4](https://www.nuget.org/packages/Azure.ResourceManager.NetworkFunction/1.0.0-beta.4) | [docs](/dotnet/api/overview/azure/ResourceManager.NetworkFunction-readme?view=azure-dotnet-preview&amp;preserve-view=true) | GitHub [1.0.0-beta.4](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.NetworkFunction_1.0.0-beta.4/sdk/networkfunction/Azure.ResourceManager.NetworkFunction/) |
294294
| Resource Management - New Relic Observability | NuGet [1.1.0](https://www.nuget.org/packages/Azure.ResourceManager.NewRelicObservability/1.1.0) | [docs](/dotnet/api/overview/azure/ResourceManager.NewRelicObservability-readme) | GitHub [1.1.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.NewRelicObservability_1.1.0/sdk/newrelicobservability/Azure.ResourceManager.NewRelicObservability/) |
295295
| Resource Management - Nginx | NuGet [1.0.0](https://www.nuget.org/packages/Azure.ResourceManager.Nginx/1.0.0)<br>NuGet [1.1.0-beta.2](https://www.nuget.org/packages/Azure.ResourceManager.Nginx/1.1.0-beta.2) | [docs](/dotnet/api/overview/azure/ResourceManager.Nginx-readme) | GitHub [1.0.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Nginx_1.0.0/sdk/nginx/Azure.ResourceManager.Nginx/)<br>GitHub [1.1.0-beta.2](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Nginx_1.1.0-beta.2/sdk/nginx/Azure.ResourceManager.Nginx/) |

docs/azure/includes/dotnet-new.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@
296296
| Resource Management - NetApp Files | NuGet [1.8.0](https://www.nuget.org/packages/Azure.ResourceManager.NetApp/1.8.0) | [docs](/dotnet/api/overview/azure/ResourceManager.NetApp-readme) | GitHub [1.8.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.NetApp_1.8.0/sdk/netapp/Azure.ResourceManager.NetApp/) |
297297
| Resource Management - Network | NuGet [1.10.0](https://www.nuget.org/packages/Azure.ResourceManager.Network/1.10.0) | [docs](/dotnet/api/overview/azure/ResourceManager.Network-readme) | GitHub [1.10.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Network_1.10.0/sdk/network/Azure.ResourceManager.Network/) |
298298
| Resource Management - Network Analytics | NuGet [1.0.0](https://www.nuget.org/packages/Azure.ResourceManager.NetworkAnalytics/1.0.0) | [docs](/dotnet/api/overview/azure/ResourceManager.NetworkAnalytics-readme) | GitHub [1.0.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.NetworkAnalytics_1.0.0/sdk/networkanalytics/Azure.ResourceManager.NetworkAnalytics/) |
299-
| Resource Management - Network Cloud | NuGet [1.0.1](https://www.nuget.org/packages/Azure.ResourceManager.NetworkCloud/1.0.1)<br>NuGet [1.1.0-beta.1](https://www.nuget.org/packages/Azure.ResourceManager.NetworkCloud/1.1.0-beta.1) | [docs](/dotnet/api/overview/azure/ResourceManager.NetworkCloud-readme) | GitHub [1.0.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.NetworkCloud_1.0.1/sdk/networkcloud/Azure.ResourceManager.NetworkCloud/)<br>GitHub [1.1.0-beta.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.NetworkCloud_1.1.0-beta.1/sdk/networkcloud/Azure.ResourceManager.NetworkCloud/) |
299+
| Resource Management - Network Cloud | NuGet [1.1.0](https://www.nuget.org/packages/Azure.ResourceManager.NetworkCloud/1.1.0) | [docs](/dotnet/api/overview/azure/ResourceManager.NetworkCloud-readme) | GitHub [1.1.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.NetworkCloud_1.1.0/sdk/networkcloud/Azure.ResourceManager.NetworkCloud/) |
300300
| Resource Management - Network Function | NuGet [1.0.0-beta.4](https://www.nuget.org/packages/Azure.ResourceManager.NetworkFunction/1.0.0-beta.4) | [docs](/dotnet/api/overview/azure/ResourceManager.NetworkFunction-readme?view=azure-dotnet-preview&amp;preserve-view=true) | GitHub [1.0.0-beta.4](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.NetworkFunction_1.0.0-beta.4/sdk/networkfunction/Azure.ResourceManager.NetworkFunction/) |
301301
| Resource Management - New Relic Observability | NuGet [1.1.0](https://www.nuget.org/packages/Azure.ResourceManager.NewRelicObservability/1.1.0) | [docs](/dotnet/api/overview/azure/ResourceManager.NewRelicObservability-readme) | GitHub [1.1.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.NewRelicObservability_1.1.0/sdk/newrelicobservability/Azure.ResourceManager.NewRelicObservability/) |
302302
| Resource Management - Nginx | NuGet [1.0.0](https://www.nuget.org/packages/Azure.ResourceManager.Nginx/1.0.0)<br>NuGet [1.1.0-beta.2](https://www.nuget.org/packages/Azure.ResourceManager.Nginx/1.1.0-beta.2) | [docs](/dotnet/api/overview/azure/ResourceManager.Nginx-readme) | GitHub [1.0.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Nginx_1.0.0/sdk/nginx/Azure.ResourceManager.Nginx/)<br>GitHub [1.1.0-beta.2](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Nginx_1.1.0-beta.2/sdk/nginx/Azure.ResourceManager.Nginx/) |

docs/azure/sdk/snippets/authentication/Directory.Packages.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
</PropertyGroup>
55
<ItemGroup>
66
<!-- Azure SDK packages -->
7-
<PackageVersion Include="Microsoft.Extensions.Azure" Version="1.7.5" />
7+
<PackageVersion Include="Microsoft.Extensions.Azure" Version="1.9.0" />
88
<PackageVersion Include="Azure.Identity" Version="1.13.2" />
99
<PackageVersion Include="Azure.Identity.Broker" Version="1.2.0" />
1010
<PackageVersion Include="Azure.Security.KeyVault.Secrets" Version="4.7.0" />
11-
<PackageVersion Include="Azure.Storage.Blobs" Version="12.21.2" />
11+
<PackageVersion Include="Azure.Storage.Blobs" Version="12.23.0" />
1212

1313
<!-- ASP.NET Core packages -->
1414
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="8.0.8" />

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.553101" />
10-
<PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="3.1.18" />
10+
<PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="3.1.19" />
1111
</ItemGroup>
1212

1313
</Project>

0 commit comments

Comments
 (0)