Skip to content

Commit 596a73a

Browse files
committed
Merge remote-tracking branch 'origin/main' into feature/ai-foundry/agents-v2
2 parents ed9304f + ea12dc9 commit 596a73a

File tree

467 files changed

+18324
-19601
lines changed

Some content is hidden

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

467 files changed

+18324
-19601
lines changed

.github/CODEOWNERS

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -281,10 +281,10 @@
281281
# ServiceOwners: @quentinRobinson
282282

283283
# PRLabel: %Cognitive - Translator
284-
/sdk/translation/ @mikeymcz @vikaspalaskar
284+
/sdk/translation/ @jrjrguo @SG-MS
285285

286286
# ServiceLabel: %Cognitive - Translator
287-
# ServiceOwners: @swmachan @mikeymcz @vikaspalaskar
287+
# ServiceOwners: @jrjrguo @SG-MS
288288

289289
# ServiceLabel: %Commerce
290290
# ServiceOwners: @ms-premp @qiaozha
@@ -1085,10 +1085,7 @@
10851085
/sdk/pineconevectordb/Azure.ResourceManager.*/ @ArcturusZhang @ArthurMa1978
10861086

10871087
# PRLabel: %Planetary Computer
1088-
/sdk/planetarycomputer/Azure.ResourceManager.*/ @shaktichetan23 @ArthurMa1978
1089-
1090-
# ServiceLabel: %Planetary Computer %Mgmt
1091-
# ServiceOwners: @shaktichetan23
1088+
/sdk/planetarycomputer/Azure.ResourceManager.*/ @ArcturusZhang @ArthurMa1978
10921089

10931090
# PRLabel: %PureStorage
10941091
/sdk/purestorageblock/Azure.ResourceManager.*/ @ArthurMa1978 @ArcturusZhang

doc/GeneratorMigration/Library_Inventory.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
- Total libraries: 421
66
- Management Plane (Swagger): 162
7-
- Management Plane (TSP-Old): 43
7+
- Management Plane (TSP-Old): 42
88
- Management Plane (TypeSpec - @azure-typespec/http-client-csharp): 0
9-
- Management Plane (TypeSpec - @azure-typespec/http-client-csharp-mgmt): 20
9+
- Management Plane (TypeSpec - @azure-typespec/http-client-csharp-mgmt): 21
1010
- Management Plane (TypeSpec - @typespec/http-client-csharp): 0
1111
- Management Plane (TypeSpec - Unknown TypeSpec Generator: eng/emitter-package.json): 0
1212
- Data Plane (Swagger): 111
@@ -204,14 +204,15 @@ Total: 111
204204

205205
## Management Plane Libraries using TypeSpec (@azure-typespec/http-client-csharp-mgmt)
206206

207-
TypeSpec with @azure-typespec/http-client-csharp-mgmt generator is detected by the presence of a tsp-location.yaml file with an emitterPackageJsonPath value referencing @azure-typespec/http-client-csharp-mgmt, or through special handling for specific libraries. Total: 20
207+
TypeSpec with @azure-typespec/http-client-csharp-mgmt generator is detected by the presence of a tsp-location.yaml file with an emitterPackageJsonPath value referencing @azure-typespec/http-client-csharp-mgmt, or through special handling for specific libraries. Total: 21
208208

209209
| Service | Library | Path |
210210
| ------- | ------- | ---- |
211211
| agricultureplatform | Azure.ResourceManager.AgriculturePlatform | sdk/agricultureplatform/Azure.ResourceManager.AgriculturePlatform |
212212
| arizeaiobservabilityeval | Azure.ResourceManager.ArizeAIObservabilityEval | sdk/arizeaiobservabilityeval/Azure.ResourceManager.ArizeAIObservabilityEval |
213213
| cloudhealth | Azure.ResourceManager.CloudHealth | sdk/cloudhealth/Azure.ResourceManager.CloudHealth |
214214
| computerecommender | Azure.ResourceManager.Compute.Recommender | sdk/computerecommender/Azure.ResourceManager.Compute.Recommender |
215+
| connectedcache | Azure.ResourceManager.ConnectedCache | sdk/connectedcache/Azure.ResourceManager.ConnectedCache |
215216
| dellstorage | Azure.ResourceManager.Dell.Storage | sdk/dellstorage/Azure.ResourceManager.Dell.Storage |
216217
| dependencymap | Azure.ResourceManager.DependencyMap | sdk/dependencymap/Azure.ResourceManager.DependencyMap |
217218
| deviceregistry | Azure.ResourceManager.DeviceRegistry | sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry |
@@ -232,7 +233,7 @@ TypeSpec with @azure-typespec/http-client-csharp-mgmt generator is detected by t
232233

233234
## Management Plane Libraries using TypeSpec (Old Generator)
234235

235-
TypeSpec with old generator is detected by the presence of a tsp-location.yaml file without an emitterPackageJsonPath value, tspconfig.yaml file, tsp directory, or *.tsp files. Total: 43
236+
TypeSpec with old generator is detected by the presence of a tsp-location.yaml file without an emitterPackageJsonPath value, tspconfig.yaml file, tsp directory, or *.tsp files. Total: 42
236237

237238
| Service | Library | Path |
238239
| ------- | ------- | ---- |
@@ -242,7 +243,6 @@ TypeSpec with old generator is detected by the presence of a tsp-location.yaml f
242243
| chaos | Azure.ResourceManager.Chaos | sdk/chaos/Azure.ResourceManager.Chaos |
243244
| computefleet | Azure.ResourceManager.ComputeFleet | sdk/computefleet/Azure.ResourceManager.ComputeFleet |
244245
| computeschedule | Azure.ResourceManager.ComputeSchedule | sdk/computeschedule/Azure.ResourceManager.ComputeSchedule |
245-
| connectedcache | Azure.ResourceManager.ConnectedCache | sdk/connectedcache/Azure.ResourceManager.ConnectedCache |
246246
| containerorchestratorruntime | Azure.ResourceManager.ContainerOrchestratorRuntime | sdk/containerorchestratorruntime/Azure.ResourceManager.ContainerOrchestratorRuntime |
247247
| databasewatcher | Azure.ResourceManager.DatabaseWatcher | sdk/databasewatcher/Azure.ResourceManager.DatabaseWatcher |
248248
| databox | Azure.ResourceManager.DataBox | sdk/databox/Azure.ResourceManager.DataBox |

eng/Packages.Data.props

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
<PackageReference Update="Azure.Messaging.ServiceBus" Version="7.20.1" />
125125
<PackageReference Update="Azure.Messaging.WebPubSub" Version="1.6.0" />
126126
<PackageReference Update="Azure.MixedReality.Authentication" version= "1.2.0" />
127-
<PackageReference Update="Azure.Monitor.OpenTelemetry.Exporter" Version="1.4.0" />
127+
<PackageReference Update="Azure.Monitor.OpenTelemetry.Exporter" Version="1.5.0" />
128128
<PackageReference Update="Azure.Monitor.Query.Logs" Version="1.0.0" />
129129
<PackageReference Update="Azure.Identity" Version="1.16.0" />
130130
<PackageReference Update="Azure.Search.Documents" Version="11.6.0" />
@@ -195,11 +195,11 @@
195195

196196
<ItemGroup Condition="$(MSBuildProjectName.StartsWith('Azure.Monitor.OpenTelemetry'))">
197197
<!-- OpenTelemetry dependency approved for Azure.Monitor.OpenTelemetry.Exporter package only -->
198-
<PackageReference Update="OpenTelemetry" Version="1.12.0" />
199-
<PackageReference Update="OpenTelemetry.Extensions.Hosting" Version="1.12.0" />
200-
<PackageReference Update="OpenTelemetry.Instrumentation.AspNetCore" Version="1.12.0" />
201-
<PackageReference Update="OpenTelemetry.Instrumentation.Http" Version="1.12.0" />
202-
<PackageReference Update="OpenTelemetry.PersistentStorage.FileSystem" Version="1.0.1" />
198+
<PackageReference Update="OpenTelemetry" Version="1.14.0" />
199+
<PackageReference Update="OpenTelemetry.Extensions.Hosting" Version="1.14.0" />
200+
<PackageReference Update="OpenTelemetry.Instrumentation.AspNetCore" Version="1.14.0" />
201+
<PackageReference Update="OpenTelemetry.Instrumentation.Http" Version="1.14.0" />
202+
<PackageReference Update="OpenTelemetry.PersistentStorage.FileSystem" Version="1.0.2" />
203203
<PackageReference Update="Microsoft.AspNetCore.Http.Abstractions" Version="[2.1.1,6.0)" />
204204
<PackageReference Update="Microsoft.AspNetCore.Http.Features" Version="[2.1.1,6.0)" />
205205
</ItemGroup>
@@ -449,12 +449,12 @@
449449
<PackageReference Update="NSubstitute" Version="3.1.0" />
450450
<PackageReference Update="NUnit" Version="3.13.2" />
451451
<PackageReference Update="NUnit3TestAdapter" Version="4.4.2" />
452-
<PackageReference Update="OpenTelemetry" Version="1.12.0" />
453-
<PackageReference Update="OpenTelemetry.Exporter.Console" Version="1.12.0" />
454-
<PackageReference Update="OpenTelemetry.Exporter.InMemory" Version="1.12.0" />
455-
<PackageReference Update="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.12.0" />
456-
<PackageReference Update="OpenTelemetry.Instrumentation.Http" Version="1.12.0" />
457-
<PackageReference Update="OpenTelemetry.Instrumentation.SqlClient" Version="1.12.0-beta.1" />
452+
<PackageReference Update="OpenTelemetry" Version="1.14.0" />
453+
<PackageReference Update="OpenTelemetry.Exporter.Console" Version="1.14.0" />
454+
<PackageReference Update="OpenTelemetry.Exporter.InMemory" Version="1.14.0" />
455+
<PackageReference Update="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.14.0" />
456+
<PackageReference Update="OpenTelemetry.Instrumentation.Http" Version="1.14.0" />
457+
<PackageReference Update="OpenTelemetry.Instrumentation.SqlClient" Version="1.14.0-beta.1" />
458458
<PackageReference Update="Polly" Version="7.1.0" />
459459
<PackageReference Update="Polly.Contrib.WaitAndRetry" Version="1.1.1" />
460460
<PackageReference Update="Portable.BouncyCastle" Version="1.9.0" />
@@ -495,6 +495,6 @@
495495
<PropertyGroup>
496496
<TestProxyVersion>1.0.0-dev.20250930.1</TestProxyVersion>
497497
<UnbrandedGeneratorVersion>1.0.0-alpha.20251113.2</UnbrandedGeneratorVersion>
498-
<AzureGeneratorVersion>1.0.0-alpha.20251113.1</AzureGeneratorVersion>
498+
<AzureGeneratorVersion>1.0.0-alpha.20251114.1</AzureGeneratorVersion>
499499
</PropertyGroup>
500500
</Project>

0 commit comments

Comments
 (0)