Skip to content

Commit

Permalink
Merge branch 'main' into feature/storage/stg98base
Browse files Browse the repository at this point in the history
  • Loading branch information
seanmcc-msft committed Mar 3, 2025
2 parents 42c1977 + cf39a1e commit 0456cbe
Show file tree
Hide file tree
Showing 2,214 changed files with 84,384 additions and 39,701 deletions.
28 changes: 17 additions & 11 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
/.github/ @jsquire @ronniegeraghty

# PRLabel: %EngSys
/sdk/template/ @hallipr @weshaggard @benbp @chunyu3 @lirenhe @jsquire
/sdk/template/ @hallipr @weshaggard @benbp @jsquire

# Smoke tests
/common/SmokeTests/ @schaabs @tg-msft @jsquire
Expand All @@ -61,7 +61,7 @@
/sdk/core/ @Azure/azure-sdk-write-net-core

# ServiceLabel: %Azure.Core
# AzureSdkOwners: @annelo-msft
# AzureSdkOwners: @m-redding

# PRLabel: %Azure.Identity
/sdk/identity/ @schaabs @christothes @Azure/azure-sdk-write-identity
Expand Down Expand Up @@ -330,7 +330,7 @@
/sdk/communication/Azure.Communication.Identity/ @Azure/acs-identity-sdk @AikoBB @maximrytych-ms @mjafferi-msft

# PRLabel: %Communication - Phone Numbers
/sdk/communication/Azure.Communication.PhoneNumbers/ @miguhern @whisper6284 @danielav7
/sdk/communication/Azure.Communication.PhoneNumbers/ @whisper6284 @danielav7

# PRLabel: %Communication - Programmable Connectivity
/sdk/communication/Azure.Communication.ProgrammableConnectivity/ @Azure/azure-sdk-write-communication
Expand Down Expand Up @@ -568,10 +568,10 @@
/sdk/iot*/ @ethanann-ms @vighatke

# PRLabel: %Iot
/sdk/modelsrepository/ @timtay-microsoft @abhipsaMisra @digimaun @brycewang-microsoft @andyk-ms @tmahmood-microsoft @rido-min
/sdk/modelsrepository/ @timtay-microsoft @abhipsaMisra @digimaun @brycewang-microsoft @andyk-ms @tmahmood-microsoft

# ServiceLabel: %IoT
# ServiceOwners: @ethanann-ms @vighatke @timtay-microsoft @abhipsaMisra @digimaun @brycewang-microsoft @andyk-ms @tmahmood-microsoft @rido-min
# ServiceOwners: @ethanann-ms @vighatke @timtay-microsoft @abhipsaMisra @digimaun @brycewang-microsoft @andyk-ms @tmahmood-microsoft

# ServiceLabel: %IoT - CLI
# ServiceOwners: @Azure/azure-iot-cli-triage
Expand Down Expand Up @@ -980,10 +980,10 @@
# ServiceOwners: @sahilarora92 @rahuls-microsoft

# PRLael: %Container Orchestrator Runtime
/sdk/containerorchestratorruntime/Azure.ResourceManager.*/ @HE-Xinyu @ddadaal
/sdk/containerorchestratorruntime/Azure.ResourceManager.*/ @ddadaal

# ServiceLabel: %Container Orchestrator Runtime
# ServiceOwners: @HE-Xinyu @ddadaal
# ServiceOwners: @ddadaal

# PRLabel: %Device Registry
/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/ @davidemontanari @atastrophic @marcodalessandro @rohankhandelwal @riteshrao
Expand Down Expand Up @@ -1021,6 +1021,12 @@
# ServiceLabel: %Large Instance %Mgmt
# ServiceOwners: @8Gitbrix

# PRLabel: %Monitor
/sdk/monitor/Azure.ResourceManager.Monitor/ @thomasp98296

# ServiceLabel: %Monitor
# ServiceOwners: @thomasp98296

# PRLabel: %Neon Postgres
/sdk/neonpostgres/Azure.ResourceManager.*/ @archerzz @ArcturusZhang @ArthurMa1978

Expand All @@ -1046,10 +1052,10 @@
# ServiceOwners: @vipray-ms

# PRLabel: %Nginx
/sdk/nginx/Azure.ResourceManager.*/ @jamesfan1 @bangbingsyb @spencerofwiti
/sdk/nginx/Azure.ResourceManager.*/ @jamesfan1 @bangbingsyb @spencerofwiti @amwaleh @briantkim93

# ServiceLabel: %Nginx %Mgmt
# ServiceOwners: @jamesfan1 @bangbingsyb @spencerofwiti
# ServiceOwners: @jamesfan1 @bangbingsyb @spencerofwiti @amwaleh @briantkim93

# PRLabel: %Operator Nexus - Network Cloud
/sdk/networkcloud/Azure.ResourceManager.*/ @Azure/azure-sdk-write-networkcloud
Expand Down Expand Up @@ -1104,7 +1110,7 @@
# AzureSdkOwners: @JoshLove-msft

#PRLabel: %CodeGen %Client
/eng/packages/http-client-csharp/generator/Azure.Generator/ @JoshLove-msft @m-nash @jorgerangel-msft @jsquire @annelo-msft
/eng/packages/http-client-csharp/generator/Azure.Generator/ @JoshLove-msft @m-nash @jorgerangel-msft @jsquire

#PRLabel: %CodeGen %Client
/eng/scripts/typespec/ @JoshLove-msft @m-nash @jorgerangel-msft @jsquire @annelo-msft
/eng/scripts/typespec/ @JoshLove-msft @m-nash @jorgerangel-msft @jsquire
3 changes: 2 additions & 1 deletion .vscode/cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -1449,7 +1449,8 @@
"Ename",
"Evalue",
"Twilio",
"Soql"
"Soql",
"Tswtz"
]
},
{
Expand Down
33 changes: 17 additions & 16 deletions eng/Packages.Data.props
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
<PackageReference Update="System.ClientModel" Version="1.2.1" />
<PackageReference Update="System.IO.Hashing" Version="6.0.0" />
<PackageReference Update="System.Memory" Version="4.5.5" />
<PackageReference Update="System.Memory.Data" Version="6.0.0" />
<PackageReference Update="System.Memory.Data" Version="6.0.1" />
<PackageReference Update="System.Numerics.Vectors" Version="4.5.0" />
<PackageReference Update="System.Net.Http" Version="4.3.4" />
<PackageReference Update="System.Diagnostics.DiagnosticSource" Version="6.0.1" />
Expand All @@ -98,8 +98,8 @@
<PackageReference Update="System.Security.Cryptography.Cose" Version="7.0.0" />
<PackageReference Update="System.Threading.Channels" Version="6.0.0" />
<PackageReference Update="System.Threading.Tasks.Extensions" Version="4.5.4" />
<PackageReference Update="System.Text.Json" Version="6.0.10" />
<PackageReference Update="System.Text.Encodings.Web" Version="6.0.0" />
<PackageReference Update="System.Text.Json" Version="6.0.11" />
<PackageReference Update="System.Text.Encodings.Web" Version="6.0.1" />
<PackageReference Update="System.ValueTuple" Version="4.5.0" />
<PackageReference Update="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
<PackageReference Update="Microsoft.CSharp" Version="4.7.0" />
Expand All @@ -117,7 +117,7 @@
<PackageReference Update="Azure.Core.Expressions.DataFactory" Version="1.0.0" />
<PackageReference Update="Azure.Data.SchemaRegistry" Version="1.2.0" />
<PackageReference Update="Azure.Data.Tables" Version="12.8.0" />
<PackageReference Update="Azure.Messaging.EventHubs" Version="5.11.5" />
<PackageReference Update="Azure.Messaging.EventHubs" Version="5.11.6" />
<PackageReference Update="Azure.Messaging.EventGrid" Version="4.21.0" />
<PackageReference Update="Azure.Messaging.ServiceBus" Version="7.18.2" />
<PackageReference Update="Azure.Messaging.WebPubSub" Version="1.4.0" />
Expand All @@ -141,7 +141,7 @@
<PackageReference Update="Azure.ResourceManager.Batch" Version="1.4.0" />
<PackageReference Update="Azure.ResourceManager.CognitiveServices" Version="1.3.3" />
<PackageReference Update="Azure.ResourceManager.CosmosDB" Version="1.4.0-beta.9" />
<PackageReference Update="Azure.ResourceManager.EventHubs" Version="1.1.0-beta.8" />
<PackageReference Update="Azure.ResourceManager.EventHubs" Version="1.2.0-beta.1" />
<PackageReference Update="Azure.ResourceManager.KeyVault" Version="1.2.3" />
<PackageReference Update="Azure.ResourceManager.ManagedServiceIdentities" Version="1.2.3" />
<PackageReference Update="Azure.ResourceManager.OperationalInsights" Version="1.2.2" />
Expand Down Expand Up @@ -190,7 +190,7 @@
</ItemGroup>

<ItemGroup Condition="$(MSBuildProjectName.StartsWith('Azure.AI.OpenAI'))">
<PackageReference Update="OpenAI" Version="2.2.0-beta.1" />
<PackageReference Update="OpenAI" Version="2.2.0-beta.2" />
</ItemGroup>

<ItemGroup Condition="$(MSBuildProjectName.StartsWith('Azure.Developer.MicrosoftPlaywrightTesting'))">
Expand Down Expand Up @@ -231,7 +231,6 @@
<PackageReference Update="Microsoft.AspNetCore.DataProtection" Version="3.1.32" />
<PackageReference Update="Microsoft.AspNetCore.Http" Version="2.1.22" />
<PackageReference Update="Microsoft.AspNetCore.Http.Connections" Version="1.0.15" />
<PackageReference Update="Microsoft.Azure.Functions.Extensions" Version="1.0.0" />
<PackageReference Update="Microsoft.Azure.Functions.Worker.Extensions.Abstractions" Version="1.1.0" />
<PackageReference Update="Microsoft.Extensions.Azure" Version="1.10.0" />
<PackageReference Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.1.0" />
Expand All @@ -247,8 +246,8 @@
All should have PrivateAssets="All" set so they don't become package dependencies
-->
<ItemGroup>
<PackageReference Update="Microsoft.Azure.AutoRest.CSharp" Version="3.0.0-beta.20250206.1" PrivateAssets="All" />
<PackageReference Update="Azure.ClientSdk.Analyzers" Version="0.1.1-dev.20240813.2" PrivateAssets="All" />
<PackageReference Update="Microsoft.Azure.AutoRest.CSharp" Version="3.0.0-beta.20250223.1" PrivateAssets="All" />
<PackageReference Update="Azure.ClientSdk.Analyzers" Version="0.1.1-dev.20250227.2" PrivateAssets="All" />
<PackageReference Update="coverlet.collector" Version="3.2.0" PrivateAssets="All" />
<PackageReference Update="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0" PrivateAssets="All" />
<PackageReference Update="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.2" PrivateAssets="All" />
Expand All @@ -262,7 +261,7 @@
</ItemGroup>

<ItemGroup Condition="'$(IsGeneratorLibrary)' == 'true'">
<PackageReference Update="Microsoft.Generator.CSharp.ClientModel" Version="1.0.0-alpha.20250205.1" />
<PackageReference Update="Microsoft.TypeSpec.Generator.ClientModel" Version="1.0.0-alpha.20250223.1" />
</ItemGroup>

<!--
Expand All @@ -274,7 +273,7 @@
<PackageReference Update="Azure.Core" Version="1.44.1" />
<PackageReference Update="Azure.Identity" Version="1.13.1" />
<PackageReference Update="Azure.Messaging.EventGrid" Version="4.17.0" />
<PackageReference Update="Azure.Messaging.EventHubs.Processor" Version="5.11.3" />
<PackageReference Update="Azure.Messaging.EventHubs.Processor" Version="5.11.6" />
<PackageReference Update="Azure.Messaging.ServiceBus" Version="7.18.2" />
<PackageReference Update="Azure.ResourceManager.Compute" Version="1.7.0-beta.1" />
<PackageReference Update="Azure.ResourceManager.CognitiveServices" Version="1.3.0" />
Expand Down Expand Up @@ -318,6 +317,7 @@
<PackageReference Update="Microsoft.Azure.Devices.Client" Version="1.41.3" />
<PackageReference Update="Microsoft.Azure.EventHubs" Version="4.3.2" />
<PackageReference Update="Microsoft.Azure.EventHubs.Processor" Version="4.3.2" />
<PackageReference Update="Microsoft.Azure.Functions.Extensions" Version="1.0.0" />
<PackageReference Update="Microsoft.Azure.Graph.RBAC" Version="2.2.2-preview" />
<PackageReference Update="Microsoft.Azure.KeyVault" Version="3.0.5" />
<PackageReference Update="Microsoft.Azure.KeyVault.Core" Version="3.0.5" />
Expand Down Expand Up @@ -383,7 +383,7 @@
<PackageReference Update="System.IO.Compression" Version="4.3.0" />
<PackageReference Update="System.IO.Pipelines" Version="4.5.1" />
<PackageReference Update="System.Linq.Async" Version="5.0.0" />
<PackageReference Update="System.Memory.Data" Version="6.0.0" />
<PackageReference Update="System.Memory.Data" Version="6.0.1" />
<PackageReference Update="System.Net.WebSockets.Client" Version="4.3.2" />
<PackageReference Update="System.Reflection.Emit" Version="4.7.0" />
<PackageReference Update="System.Runtime.InteropServices" Version="4.3.0" />
Expand Down Expand Up @@ -411,9 +411,11 @@
<PackageReference Update="System.ServiceModel.Primitives" Version="6.2.0" />
<PackageReference Update="Azure.Storage.Files.Shares" Version="12.21.0" />
<PackageReference Update="Azure.Storage.Queues" Version="12.21.0" />
<PackageReference Update="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
<PackageReference Update="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.1" />
<PackageReference Update="Microsoft.Extensions.Http" Version="8.0.0" />
<PackageReference Update="Microsoft.Extensions.Logging.Configuration" Version="8.0.0" />
<PackageReference Update="Microsoft.Extensions.Logging.Configuration" Version="8.0.1" />
<PackageReference Update="System.Formats.Asn1" Version="6.0.1" />
<PackageReference Update="System.Security.Cryptography.Pkcs" Version="6.0.5" />
</ItemGroup>
<ItemGroup Condition="('$(IsWcfLibrary)' == 'true') AND ($(TargetFramework.StartsWith('net4')))">
<PackageReference Update="Microsoft.Extensions.Configuration.UserSecrets" Version="2.1.1" />
Expand All @@ -422,7 +424,6 @@
</ItemGroup>

<PropertyGroup>
<TestProxyVersion>1.0.0-dev.20241213.1</TestProxyVersion>
<TestProxyVersion>1.0.0-dev.20250221.1</TestProxyVersion>
</PropertyGroup>

</Project>
Empty file modified eng/common/TestResources/New-TestResources.ps1
100644 → 100755
Empty file.
Empty file modified eng/common/TestResources/Remove-TestResources.ps1
100644 → 100755
Empty file.
Empty file modified eng/common/TestResources/Update-TestResources.ps1
100644 → 100755
Empty file.
12 changes: 6 additions & 6 deletions eng/common/pipelines/templates/archetype-typespec-emitter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -172,22 +172,22 @@ extends:
- ${{ if parameters.PublishPublic }}:
# publish to npmjs.org using ESRP
- task: EsrpRelease@7
- task: EsrpRelease@9
inputs:
displayName: Publish to npmjs.org
ConnectedServiceName: Azure SDK Engineering System
ConnectedServiceName: Azure SDK PME Managed Identity
ClientId: 5f81938c-2544-4f1f-9251-dd9de5b8a81b
KeyVaultName: AzureSDKEngKeyVault
AuthCertName: azure-sdk-esrp-release-auth-certificate
SignCertName: azure-sdk-esrp-release-sign-certificate
DomainTenantId: 975f013f-7f24-47e8-a7d3-abc4752bf346
UseManagedIdentity: true
KeyVaultName: kv-azuresdk-codesign
SignCertName: azure-sdk-esrp-release-certificate
Intent: PackageDistribution
ContentType: npm
FolderLocation: $(buildArtifactsPath)/packages
Owners: ${{ coalesce(variables['Build.RequestedForEmail'], '[email protected]') }}
Approvers: ${{ coalesce(variables['Build.RequestedForEmail'], '[email protected]') }}
ServiceEndpointUrl: https://api.esrp.microsoft.com
MainPublisher: ESRPRELPACMANTEST
DomainTenantId: 72f988bf-86f1-41af-91ab-2d7cd011db47

- task: PowerShell@2
displayName: Create emitter-package.json
Expand Down
2 changes: 1 addition & 1 deletion eng/common/pipelines/templates/jobs/prepare-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ jobs:
$generateUnifiedWeekly = 'false'
$testServiceConnections = '"Azure" "azure-sdk-tests" "azure-sdk-tests-preview" "azure-sdk-tests-public" "Azure SDK Test Resources - LiveTestSecrets"'
$internalServiceConnections = '"Azure" "Azure SDK Artifacts" "Azure SDK Engineering System" "opensource-api-connection" "AzureSDKEngKeyVault Secrets"'
$internalServiceConnections = '"Azure" "Azure SDK Artifacts" "Azure SDK Engineering System" "opensource-api-connection" "AzureSDKEngKeyVault Secrets" "Azure SDK PME Managed Identity"'
# Map the language to the appropriate variable groups
switch ($lang)
Expand Down
8 changes: 5 additions & 3 deletions eng/common/pipelines/templates/steps/detect-api-changes.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
parameters:
ArtifactPath: $(Build.ArtifactStagingDirectory)
ArtifactName: 'packages'
RepoRoot: $(Build.SourcesDirectory)
Condition: true

steps:
- pwsh: |
$apiChangeDetectRequestUrl = "https://apiview.dev/PullRequest/DetectApiChanges"
echo "##vso[task.setvariable variable=ApiChangeDetectRequestUrl]$apiChangeDetectRequestUrl"
displayName: "Set API change detect request URL"
condition: eq(variables['ApiChangeDetectRequestUrl'], '')
condition: and(${{ parameters.Condition}}, eq(variables['ApiChangeDetectRequestUrl'], ''))
- task: Powershell@2
inputs:
filePath: $(Build.SourcesDirectory)/eng/common/scripts/Detect-Api-Changes.ps1
filePath: ${{ parameters.RepoRoot }}/eng/common/scripts/Detect-Api-Changes.ps1
arguments: >
-ArtifactPath ${{parameters.ArtifactPath}}
-CommitSha '$(Build.SourceVersion)'
Expand All @@ -23,4 +25,4 @@ steps:
-DevopsProject $(System.TeamProject)
pwsh: true
displayName: Detect API changes
condition: and(succeededOrFailed(), eq(variables['Build.Reason'],'PullRequest'))
condition: and(${{ parameters.Condition }}, succeededOrFailed(), eq(variables['Build.Reason'],'PullRequest'))
Original file line number Diff line number Diff line change
Expand Up @@ -66,5 +66,5 @@ steps:
arguments: >
-ServiceDirectory '${{parameters.ServiceDirectory}}'
-OutDirectory '${{ parameters.PackageInfoDirectory }}'
-AddDevVersion:$${{ eq(variables['SetDevVersion'],'true') }}
-AddDevVersion:($env:SETDEVVERSION -eq 'true')
pwsh: true
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ parameters:
PackageName: ''
PackageNames: ''
ServiceDirectory: ''
TagSeparator: '_'
TestPipeline: false

steps:
Expand All @@ -16,4 +17,5 @@ steps:
-BuildID $(Build.BuildId)
-PackageNames '${{ coalesce(parameters.PackageName, parameters.PackageNames) }}'
-ServiceDirectory '${{ parameters.ServiceDirectory }}'
-TagSeparator '${{ parameters.TagSeparator }}'
pwsh: true
Loading

0 comments on commit 0456cbe

Please sign in to comment.