Skip to content

Commit 402d3f6

Browse files
gewarrengewarren
authored
Merge pull request #48609 from dotnet/main
Merge main into live
2 parents b168914 + 01610b6 commit 402d3f6

File tree

35 files changed

+251
-175
lines changed

35 files changed

+251
-175
lines changed

‎docs/ai/quickstarts/snippets/chat-with-data/azure-openai/VectorDataAI.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010

1111
<ItemGroup>
1212
<PackageReference Include="Azure.AI.OpenAI" Version="2.1.0" />
13-
<PackageReference Include="Azure.Identity" Version="1.14.2" />
13+
<PackageReference Include="Azure.Identity" Version="1.16.0" />
1414
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.5.0-preview.1.25265.7" />
15-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.7" />
16-
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.7" />
15+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.9" />
16+
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.9" />
1717
<PackageReference Include="Microsoft.Extensions.VectorData.Abstractions" Version="9.7.0" />
1818
<PackageReference Include="Microsoft.SemanticKernel.Connectors.InMemory" Version="1.55.0-preview" />
1919
</ItemGroup>

‎docs/ai/quickstarts/snippets/mcp-client/MinimalMCPClient.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99

1010
<ItemGroup>
1111
<PackageReference Include="Azure.AI.OpenAI" Version="2.2.0-beta.5" />
12-
<PackageReference Include="Azure.Identity" Version="1.14.2" />
13-
<PackageReference Include="Microsoft.Extensions.AI" Version="9.7.1" />
12+
<PackageReference Include="Azure.Identity" Version="1.16.0" />
13+
<PackageReference Include="Microsoft.Extensions.AI" Version="9.9.0" />
1414
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.4.3-preview.1.25230.7" />
1515
<PackageReference Include="ModelContextProtocol" Version="0.1.0-preview.14" />
1616
</ItemGroup>

‎docs/ai/snippets/microsoft-extensions-ai/ConsoleAI.CreateEmbeddings/ConsoleAI.CreateEmbeddings.csproj‎

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

1010
<ItemGroup>
11-
<PackageReference Include="OllamaSharp" Version="5.3.6" />
11+
<PackageReference Include="OllamaSharp" Version="5.4.4" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

‎docs/ai/snippets/microsoft-extensions-ai/ConsoleAI.CustomEmbeddingsMiddle/ConsoleAI.CustomEmbeddingsMiddle.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="Microsoft.Extensions.Caching.Memory" Version="10.0.0-preview.7.25380.108" />
12-
<PackageReference Include="OllamaSharp" Version="5.3.6" />
11+
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.0-rc.1.25451.107" />
12+
<PackageReference Include="OllamaSharp" Version="5.4.4" />
1313
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.12.0" />
1414
<ProjectReference Include="..\AI.Shared\AI.Shared.csproj" />
1515
</ItemGroup>

‎docs/ai/snippets/microsoft-extensions-ai/ConsoleAI.FunctionalityPipelines/ConsoleAI.FunctionalityPipelines.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="Microsoft.Extensions.Caching.Memory" Version="10.0.0-preview.7.25380.108" />
12-
<PackageReference Include="OllamaSharp" Version="5.3.6" />
11+
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.0-rc.1.25451.107" />
12+
<PackageReference Include="OllamaSharp" Version="5.4.4" />
1313
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.12.0" />
1414
</ItemGroup>
1515

‎docs/azure/includes/dotnet-all.md‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@
210210
| Resource Management - Connectedcache | NuGet [1.0.0-beta.1](https://www.nuget.org/packages/Azure.ResourceManager.ConnectedCache/1.0.0-beta.1) | [docs](/dotnet/api/overview/azure/ResourceManager.ConnectedCache-readme?view=azure-dotnet-preview&amp;preserve-view=true) | GitHub [1.0.0-beta.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.ConnectedCache_1.0.0-beta.1/sdk/connectedcache/Azure.ResourceManager.ConnectedCache/) |
211211
| Resource Management - Consumption | NuGet [1.0.1](https://www.nuget.org/packages/Azure.ResourceManager.Consumption/1.0.1)<br>NuGet [1.1.0-beta.3](https://www.nuget.org/packages/Azure.ResourceManager.Consumption/1.1.0-beta.3) | [docs](/dotnet/api/overview/azure/ResourceManager.Consumption-readme) | GitHub [1.0.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Consumption_1.0.1/sdk/consumption/Azure.ResourceManager.Consumption/)<br>GitHub [1.1.0-beta.3](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Consumption_1.1.0-beta.3/sdk/consumption/Azure.ResourceManager.Consumption/) |
212212
| Resource Management - Container Apps | NuGet [1.4.1](https://www.nuget.org/packages/Azure.ResourceManager.AppContainers/1.4.1) | [docs](/dotnet/api/overview/azure/ResourceManager.AppContainers-readme) | GitHub [1.4.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.AppContainers_1.4.1/sdk/containerapps/Azure.ResourceManager.AppContainers/) |
213-
| Resource Management - Container Instances | NuGet [1.2.1](https://www.nuget.org/packages/Azure.ResourceManager.ContainerInstance/1.2.1)<br>NuGet [1.3.0-beta.3](https://www.nuget.org/packages/Azure.ResourceManager.ContainerInstance/1.3.0-beta.3) | [docs](/dotnet/api/overview/azure/ResourceManager.ContainerInstance-readme) | GitHub [1.2.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.ContainerInstance_1.2.1/sdk/containerinstance/Azure.ResourceManager.ContainerInstance/)<br>GitHub [1.3.0-beta.3](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.ContainerInstance_1.3.0-beta.3/sdk/containerinstance/Azure.ResourceManager.ContainerInstance/) |
213+
| Resource Management - Container Instances | NuGet [1.2.1](https://www.nuget.org/packages/Azure.ResourceManager.ContainerInstance/1.2.1)<br>NuGet [1.3.0-beta.4](https://www.nuget.org/packages/Azure.ResourceManager.ContainerInstance/1.3.0-beta.4) | [docs](/dotnet/api/overview/azure/ResourceManager.ContainerInstance-readme) | GitHub [1.2.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.ContainerInstance_1.2.1/sdk/containerinstance/Azure.ResourceManager.ContainerInstance/)<br>GitHub [1.3.0-beta.4](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.ContainerInstance_1.3.0-beta.4/sdk/containerinstance/Azure.ResourceManager.ContainerInstance/) |
214214
| Resource Management - Container Orchestrator Runtime | NuGet [1.0.0-beta.1](https://www.nuget.org/packages/Azure.ResourceManager.ContainerOrchestratorRuntime/1.0.0-beta.1) | [docs](/dotnet/api/overview/azure/ResourceManager.ContainerOrchestratorRuntime-readme?view=azure-dotnet-preview&amp;preserve-view=true) | GitHub [1.0.0-beta.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.ContainerOrchestratorRuntime_1.0.0-beta.1/sdk/containerorchestratorruntime/Azure.ResourceManager.ContainerOrchestratorRuntime/) |
215215
| Resource Management - Container Registry | NuGet [1.3.1](https://www.nuget.org/packages/Azure.ResourceManager.ContainerRegistry/1.3.1) | [docs](/dotnet/api/overview/azure/ResourceManager.ContainerRegistry-readme) | GitHub [1.3.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.ContainerRegistry_1.3.1/sdk/containerregistry/Azure.ResourceManager.ContainerRegistry/) |
216216
| Resource Management - Container Service | NuGet [1.2.5](https://www.nuget.org/packages/Azure.ResourceManager.ContainerService/1.2.5) | [docs](/dotnet/api/overview/azure/ResourceManager.ContainerService-readme) | GitHub [1.2.5](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.ContainerService_1.2.5/sdk/containerservice/Azure.ResourceManager.ContainerService/) |
@@ -274,7 +274,7 @@
274274
| Resource Management - Hybrid Network | NuGet [1.0.0-beta.2](https://www.nuget.org/packages/Azure.ResourceManager.HybridNetwork/1.0.0-beta.2) | [docs](/dotnet/api/overview/azure/ResourceManager.HybridNetwork-readme?view=azure-dotnet-preview&amp;preserve-view=true) | GitHub [1.0.0-beta.2](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.HybridNetwork_1.0.0-beta.2/sdk/hybridnetwork/Azure.ResourceManager.HybridNetwork/) |
275275
| Resource Management - Informatica Data Management | NuGet [1.0.0-beta.1](https://www.nuget.org/packages/Azure.ResourceManager.InformaticaDataManagement/1.0.0-beta.1) | [docs](/dotnet/api/overview/azure/ResourceManager.InformaticaDataManagement-readme?view=azure-dotnet-preview&amp;preserve-view=true) | GitHub [1.0.0-beta.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.InformaticaDataManagement_1.0.0-beta.1/sdk/informaticadatamanagement/Azure.ResourceManager.InformaticaDataManagement/) |
276276
| Resource Management - IoT Central | NuGet [1.0.1](https://www.nuget.org/packages/Azure.ResourceManager.IotCentral/1.0.1)<br>NuGet [1.1.0-beta.3](https://www.nuget.org/packages/Azure.ResourceManager.IotCentral/1.1.0-beta.3) | [docs](/dotnet/api/overview/azure/ResourceManager.IotCentral-readme) | GitHub [1.0.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.IotCentral_1.0.1/sdk/iotcentral/Azure.ResourceManager.IotCentral/)<br>GitHub [1.1.0-beta.3](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.IotCentral_1.1.0-beta.3/sdk/iotcentral/Azure.ResourceManager.IotCentral/) |
277-
| Resource Management - IoT Firmware Defense | NuGet [1.0.1](https://www.nuget.org/packages/Azure.ResourceManager.IotFirmwareDefense/1.0.1)<br>NuGet [1.1.0-beta.1](https://www.nuget.org/packages/Azure.ResourceManager.IotFirmwareDefense/1.1.0-beta.1) | [docs](/dotnet/api/overview/azure/ResourceManager.IotFirmwareDefense-readme) | GitHub [1.0.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.IotFirmwareDefense_1.0.1/sdk/iot/Azure.ResourceManager.IotFirmwareDefense/)<br>GitHub [1.1.0-beta.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.IotFirmwareDefense_1.1.0-beta.1/sdk/iot/Azure.ResourceManager.IotFirmwareDefense/) |
277+
| Resource Management - IoT Firmware Defense | NuGet [1.1.0](https://www.nuget.org/packages/Azure.ResourceManager.IotFirmwareDefense/1.1.0) | [docs](/dotnet/api/overview/azure/ResourceManager.IotFirmwareDefense-readme) | GitHub [1.1.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.IotFirmwareDefense_1.1.0/sdk/iot/Azure.ResourceManager.IotFirmwareDefense/) |
278278
| Resource Management - IoT Hub | NuGet [1.1.1](https://www.nuget.org/packages/Azure.ResourceManager.IotHub/1.1.1)<br>NuGet [1.2.0-beta.1](https://www.nuget.org/packages/Azure.ResourceManager.IotHub/1.2.0-beta.1) | [docs](/dotnet/api/overview/azure/ResourceManager.IotHub-readme) | GitHub [1.1.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.IotHub_1.1.1/sdk/iothub/Azure.ResourceManager.IotHub/)<br>GitHub [1.2.0-beta.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.IotHub_1.2.0-beta.1/sdk/iothub/Azure.ResourceManager.IotHub/) |
279279
| Resource Management - IoT Operations | NuGet [1.0.0](https://www.nuget.org/packages/Azure.ResourceManager.IotOperations/1.0.0) | [docs](/dotnet/api/overview/azure/ResourceManager.IotOperations-readme) | GitHub [1.0.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.IotOperations_1.0.0/sdk/iotoperations/Azure.ResourceManager.IotOperations/) |
280280
| Resource Management - Key Vault | NuGet [1.3.2](https://www.nuget.org/packages/Azure.ResourceManager.KeyVault/1.3.2) | [docs](/dotnet/api/overview/azure/ResourceManager.KeyVault-readme) | GitHub [1.3.2](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.KeyVault_1.3.2/sdk/keyvault/Azure.ResourceManager.KeyVault/) |
@@ -384,6 +384,7 @@
384384
| Resource Management - Web PubSub | NuGet [1.2.0](https://www.nuget.org/packages/Azure.ResourceManager.WebPubSub/1.2.0) | [docs](/dotnet/api/overview/azure/ResourceManager.WebPubSub-readme) | GitHub [1.2.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.WebPubSub_1.2.0/sdk/webpubsub/Azure.ResourceManager.WebPubSub/) |
385385
| Resource Management - Weightsandbiases | NuGet [1.0.0-beta.1](https://www.nuget.org/packages/Azure.ResourceManager.WeightsAndBiases/1.0.0-beta.1) | [docs](/dotnet/api/overview/azure/ResourceManager.WeightsAndBiases-readme?view=azure-dotnet-preview&amp;preserve-view=true) | GitHub [1.0.0-beta.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.WeightsAndBiases_1.0.0-beta.1/sdk/weightsandbiases/Azure.ResourceManager.WeightsAndBiases/) |
386386
| Resource Management - Workload Monitor | NuGet [1.0.0-beta.5](https://www.nuget.org/packages/Azure.ResourceManager.WorkloadMonitor/1.0.0-beta.5) | [docs](/dotnet/api/overview/azure/ResourceManager.WorkloadMonitor-readme?view=azure-dotnet-preview&amp;preserve-view=true) | GitHub [1.0.0-beta.5](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.WorkloadMonitor_1.0.0-beta.5/sdk/workloadmonitor/Azure.ResourceManager.WorkloadMonitor/) |
387+
| Resource Management - Workloadorchestration | NuGet [1.0.0](https://www.nuget.org/packages/Azure.ResourceManager.WorkloadOrchestration/1.0.0) | | GitHub [1.0.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.WorkloadOrchestration_1.0.0/sdk/workloadorchestration/Azure.ResourceManager.WorkloadOrchestration/) |
387388
| Resource Management - Workloads | NuGet [1.1.1](https://www.nuget.org/packages/Azure.ResourceManager.Workloads/1.1.1)<br>NuGet [1.2.0-beta.1](https://www.nuget.org/packages/Azure.ResourceManager.Workloads/1.2.0-beta.1) | [docs](/dotnet/api/overview/azure/ResourceManager.Workloads-readme) | GitHub [1.1.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Workloads_1.1.1/sdk/workloads/Azure.ResourceManager.Workloads/)<br>GitHub [1.2.0-beta.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Workloads_1.2.0-beta.1/sdk/workloads/Azure.ResourceManager.Workloads/) |
388389
| Resource Management - Workloadssapvirtualinstance | NuGet [1.0.0-beta.1](https://www.nuget.org/packages/Azure.ResourceManager.WorkloadsSapVirtualInstance/1.0.0-beta.1) | [docs](/dotnet/api/overview/azure/ResourceManager.WorkloadsSapVirtualInstance-readme?view=azure-dotnet-preview&amp;preserve-view=true) | GitHub [1.0.0-beta.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.WorkloadsSapVirtualInstance_1.0.0-beta.1/sdk/workloadssapvirtualinstance/Azure.ResourceManager.WorkloadsSapVirtualInstance/) |
389390
| App Configuration Extension | NuGet [8.3.0](https://www.nuget.org/packages/Microsoft.Azure.AppConfiguration.Functions.Worker/8.3.0) | | |
@@ -413,14 +414,15 @@
413414
| Speech Extension Telemetry | NuGet [1.46.0](https://www.nuget.org/packages/Microsoft.CognitiveServices.Speech.Extension.Telemetry/1.46.0) | | |
414415
| System Net Client Model | NuGet [1.0.0-beta.1](https://www.nuget.org/packages/System.Net.ClientModel/1.0.0-beta.1) | | |
415416
| Unknown Display Name | NuGet [0.12.0](https://www.nuget.org/packages/Azure.Iot.Operations.Connector/0.12.0) | | |
416-
| Unknown Display Name | NuGet [0.6.0](https://www.nuget.org/packages/Azure.Mcp/0.6.0) | | |
417-
| Unknown Display Name | NuGet [0.6.0](https://www.nuget.org/packages/Azure.Mcp.linux-arm64/0.6.0) | | |
418-
| Unknown Display Name | NuGet [0.6.0](https://www.nuget.org/packages/Azure.Mcp.linux-x64/0.6.0) | | |
419-
| Unknown Display Name | NuGet [0.6.0](https://www.nuget.org/packages/Azure.Mcp.osx-arm64/0.6.0) | | |
420-
| Unknown Display Name | NuGet [0.6.0](https://www.nuget.org/packages/Azure.Mcp.osx-x64/0.6.0) | | |
421-
| Unknown Display Name | NuGet [0.6.0](https://www.nuget.org/packages/Azure.Mcp.win-arm64/0.6.0) | | |
422-
| Unknown Display Name | NuGet [0.6.0](https://www.nuget.org/packages/Azure.Mcp.win-x64/0.6.0) | | |
417+
| Unknown Display Name | NuGet [0.7.0](https://www.nuget.org/packages/Azure.Mcp/0.7.0) | | |
418+
| Unknown Display Name | NuGet [0.7.0](https://www.nuget.org/packages/Azure.Mcp.linux-arm64/0.7.0) | | |
419+
| Unknown Display Name | NuGet [0.7.0](https://www.nuget.org/packages/Azure.Mcp.linux-x64/0.7.0) | | |
420+
| Unknown Display Name | NuGet [0.7.0](https://www.nuget.org/packages/Azure.Mcp.osx-arm64/0.7.0) | | |
421+
| Unknown Display Name | NuGet [0.7.0](https://www.nuget.org/packages/Azure.Mcp.osx-x64/0.7.0) | | |
422+
| Unknown Display Name | NuGet [0.7.0](https://www.nuget.org/packages/Azure.Mcp.win-arm64/0.7.0) | | |
423+
| Unknown Display Name | NuGet [0.7.0](https://www.nuget.org/packages/Azure.Mcp.win-x64/0.7.0) | | |
423424
| Unknown Display Name | NuGet [0.1.2-preview.2](https://www.nuget.org/packages/Microsoft.Azure.Cosmos.Aot/0.1.2-preview.2) | | |
425+
| Unknown Display Name | NuGet [0.2.802](https://www.nuget.org/packages/Microsoft.Azure.Mcp.AzTypes.Internal.Compact/0.2.802) | | |
424426
| Unknown Display Name | NuGet [1.1.2-preview](https://www.nuget.org/packages/Microsoft.Azure.WebJobs.Extensions.AzureCosmosDb.Mongo/1.1.2-preview) | | |
425427
| Unknown Display Name | NuGet [1.46.0](https://www.nuget.org/packages/Microsoft.CognitiveServices.Speech.Extension.MAS/1.46.0) | | |
426428
| Unknown Display Name | NuGet [1.0.0](https://www.nuget.org/packages/Microsoft.Extensions.Caching.Postgres/1.0.0) | | |

0 commit comments

Comments
 (0)