Skip to content

Commit

Permalink
Merge branch 'Azure:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
scorpion-ajay authored Dec 19, 2024
2 parents 4c307a7 + f3c748c commit 6b5b383
Show file tree
Hide file tree
Showing 2,545 changed files with 182,225 additions and 18,043 deletions.
8 changes: 1 addition & 7 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
# ServiceOwners: @Azure/aks-pm

# ServiceLabel: %Alerts Management
# ServiceOwners: @liadtal @yairgil
# ServiceOwners: @yairgil

# ServiceLabel: %ARM
# ServiceOwners: @armleads-azure
Expand Down Expand Up @@ -1039,12 +1039,6 @@
# ServiceLabel: %Operator Nexus - Network Cloud %Mgmt
# ServiceOwners: @Azure/azure-sdk-write-networkcloud

# PRLabel: %Oracle
/sdk/oracle/Azure.ResourceManager.*/ @v-jamcheung @v-rvilathurs @v-eelhomsi

# ServiceLabel: %Oracle %Mgmt
# ServiceOwners: @v-jamcheung @v-rvilathurs @v-eelhomsi

# PRLabel: %Quota
/sdk/quota/Azure.ResourceManager.*/ @tejasm-microsoft

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/event-processor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
run: >
dotnet tool install
Azure.Sdk.Tools.GitHubEventProcessor
--version 1.0.0-dev.20240917.2
--version 1.0.0-dev.20241206.2
--add-source https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json
--global
shell: bash
Expand Down Expand Up @@ -118,7 +118,7 @@ jobs:
run: >
dotnet tool install
Azure.Sdk.Tools.GitHubEventProcessor
--version 1.0.0-dev.20240917.2
--version 1.0.0-dev.20241206.2
--add-source https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json
--global
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scheduled-event-processor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
run: >
dotnet tool install
Azure.Sdk.Tools.GitHubEventProcessor
--version 1.0.0-dev.20240917.2
--version 1.0.0-dev.20241206.2
--add-source https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json
--global
shell: bash
Expand Down
18 changes: 15 additions & 3 deletions .vscode/cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@
"Hvci"
]
},
{
{
"filename": "**/sdk/computefleet/**/*.cs",
"words": [
"Rdma"
Expand Down Expand Up @@ -917,7 +917,7 @@
]
},
{
"filename": "**/sdk/maps/Azure.Maps.TimeZone/**/*.cs",
"filename": "**/sdk/maps/Azure.Maps.TimeZones/**/*.cs",
"words": [
"Posix",
"posix",
Expand Down Expand Up @@ -1618,7 +1618,19 @@
"AOAI",
"Rerank"
]
},
{
"filename": "**/sdk/cognitivelanguage/Azure.AI.Language.Text.Authoring/api/*.cs",
"words": [
"prebuilts"
]
},
{
"filename": "**/sdk/cognitivelanguage/Azure.AI.Language.Conversations.Authoring/api/*.cs",
"words": [
"prebuilts"
]
}
],
"allowCompoundWords": true
}
}
8 changes: 4 additions & 4 deletions doc/DataPlaneCodeGeneration/Autorest_DataPlane_Quickstart.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,16 +62,16 @@ sdk\<service name>\<package name>\CHANGELOG.md

We will use dotnet project template [Azure.Template](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/template/Azure.Template) to automatically create the project.

You can run `eng\scripts\automation\Invoke-DataPlaneGenerateSDKPackage.ps1` to generate the starting SDK client library package directly as following:
You can run `eng\scripts\automation\Invoke-AutorestDataPlaneGenerateSDKPackage.ps1` to generate the starting SDK client library package directly as following:

```powershell
eng/scripts/automation/Invoke-DataPlaneGenerateSDKPackage.ps1 -service <servicename> -namespace Azure.<group>.<service> -sdkPath <sdkrepoRootPath> [-inputfiles <inputfilelink>] [-readme <readmeFilelink>] [-securityScope <securityScope>] [-securityHeaderName <securityHeaderName>]
eng/scripts/automation/Invoke-AutorestDataPlaneGenerateSDKPackage.ps1 -service <servicename> -namespace Azure.<group>.<service> -sdkPath <sdkrepoRootPath> [-inputfiles <inputfilelink>] [-readme <readmeFilelink>] [-securityScope <securityScope>] [-securityHeaderName <securityHeaderName>]
```

e.g.

```powershell
pwsh /home/azure-sdk-for-net/eng/scripts/automation/Invoke-DataPlaneGenerateSDKPackage.ps1 -service webpubsub -namespace Azure.Messaging.WebPubSub -sdkPath /home/azure-sdk-for-net -inputfiles https://github.com/Azure/azure-rest-api-specs/blob/73a0fa453a93bdbe8885f87b9e4e9fef4f0452d0/specification/webpubsub/data-plane/WebPubSub/stable/2021-10-01/webpubsub.json -securityScope https://sample/.default
pwsh /home/azure-sdk-for-net/eng/scripts/automation/Invoke-AutorestDataPlaneGenerateSDKPackage.ps1 -service webpubsub -namespace Azure.Messaging.WebPubSub -sdkPath /home/azure-sdk-for-net -inputfiles https://github.com/Azure/azure-rest-api-specs/blob/73a0fa453a93bdbe8885f87b9e4e9fef4f0452d0/specification/webpubsub/data-plane/WebPubSub/stable/2021-10-01/webpubsub.json -securityScope https://sample/.default
```

**Note**:
Expand All @@ -85,7 +85,7 @@ pwsh /home/azure-sdk-for-net/eng/scripts/automation/Invoke-DataPlaneGenerateSDKP
- `-securityScope` designates the authentication scope to use if your library supports **Token Credential** authentication.
- `-securityHeaderName` designates the key to use if your library supports **Azure Key Credential** authentication.

When you run the `eng\scripts\automation\Invoke-DataPlaneGenerateSDKPackage.ps1` script, it will:
When you run the `eng\scripts\automation\Invoke-AutorestDataPlaneGenerateSDKPackage.ps1` script, it will:

- Create a project folder, install template files from `sdk/template/Azure.Template`, and create `.csproj` and `.sln` files for your new library.

Expand Down
6 changes: 3 additions & 3 deletions doc/DataPlaneCodeGeneration/AzureSDKPackage_Setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@ sdk\<service name>\<package name>\<package name>.sln
- `<package name>` - Should be the name of the shipping package, or an abbreviation that distinguishes the given shipping artifact for the given service. It will be `Azure.<group>.<service>`, e.g. Azure.IoT.DeviceUpdate

## Create sdk package
We will use the Azure SDK template [Azure.Template](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/template/Azure.Template) to create the initial project skeleton.

We will use the Azure SDK template [Azure.Template](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/template/Azure.Template) to create the initial project skeleton for SDKs generated from TypeSpec.

You can run `eng\scripts\automation\Invoke-TypeSpecDataPlaneGenerateSDKPackage.ps1` to generate the starting SDK client library package directly as following:

```powershell
eng/scripts/automation/Invoke-TypeSpecDataPlaneGenerateSDKPackage.ps1 -sdkFolder <sdk-folder-path> -typespecSpecDirectory <relativeTypeSpecProjectFolderPath> -commit <commitId> [-repo <specRepo>] [-additionalSubDirectories <relativeFolders>]
```

e.g.
e.g.
Use git url

```powershell
Expand Down
1 change: 1 addition & 0 deletions eng/ApiListing.exclude-attributes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ T:System.Runtime.CompilerServices.AsyncStateMachineAttribute
T:System.Runtime.CompilerServices.CompilerGeneratedAttribute
T:System.Runtime.CompilerServices.NullableContextAttribute
T:System.Runtime.CompilerServices.NullableAttribute
T:System.Runtime.CompilerServices.IsReadOnlyAttribute
T:Azure.Core.CodeGenSuppressAttribute
T:Azure.Core.CodeGenModelAttribute
T:Azure.Core.CodeGenMemberAttribute
Expand Down
13 changes: 9 additions & 4 deletions eng/Packages.Data.props
Original file line number Diff line number Diff line change
Expand Up @@ -186,14 +186,19 @@
</ItemGroup>

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

<ItemGroup Condition="$(MSBuildProjectName.StartsWith('Azure.Developer.MicrosoftPlaywrightTesting'))">
<PackageReference Update="Microsoft.TestPlatform.ObjectModel" Version="17.10.0" />
<PackageReference Update="NUnit" Version="3.13.2" />
</ItemGroup>

<ItemGroup Condition="$(MSBuildProjectName.Contains('CloudMachine'))">
<PackageReference Update="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
<PackageReference Update="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0"/>
</ItemGroup>

<!--
Dependency versions for Track 2, Microsoft.* libraries.
These are dependencies for Track 2 integration packages
Expand Down Expand Up @@ -239,7 +244,7 @@
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.20241201.1" PrivateAssets="All" />
<PackageReference Update="Microsoft.Azure.AutoRest.CSharp" Version="3.0.0-beta.20241217.1" PrivateAssets="All" />
<PackageReference Update="Azure.ClientSdk.Analyzers" Version="0.1.1-dev.20240813.2" PrivateAssets="All" />
<PackageReference Update="coverlet.collector" Version="3.2.0" PrivateAssets="All" />
<PackageReference Update="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0" PrivateAssets="All" />
Expand All @@ -254,7 +259,7 @@
</ItemGroup>

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

<!--
Expand Down Expand Up @@ -409,7 +414,7 @@
</ItemGroup>

<PropertyGroup>
<TestProxyVersion>1.0.0-dev.20241101.1</TestProxyVersion>
<TestProxyVersion>1.0.0-dev.20241209.1</TestProxyVersion>
</PropertyGroup>

</Project>
31 changes: 0 additions & 31 deletions eng/codegen_to_sdk_config.json

This file was deleted.

27 changes: 26 additions & 1 deletion eng/common/pipelines/templates/jobs/prepare-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,11 @@ jobs:
Prefix: 'na'
DevOpsPath: 'na'
InternalVariableGroups: ''
InternalServiceConnections: ''
GeneratePublicCIPipeline: ''
GenerateUnifiedWeekly: ''
TestVariableGroups: ''
TestServiceConnections: ''

# Standard set of variable groups for the Azure SDK repositories
AzureSDK_Maven_Release_Pipeline_Secrets: 1
Expand Down Expand Up @@ -70,6 +73,12 @@ jobs:
exit 1
}
$generatePublicCIPipeline = 'true'
$generateUnifiedWeekly = 'false'
$testServiceConnections = '"Azure" "azure-sdk-tests" "azure-sdk-tests-china" "azure-sdk-tests-preview" "azure-sdk-tests-public" "azure-sdk-tests-usgov" "Azure SDK Test Resources - LiveTestSecrets"'
$internalServiceConnections = '"Azure" "Azure SDK Artifacts" "Azure SDK Engineering System" "opensource-api-connection" "AzureSDKEngKeyVault Secrets"'
# Map the language prefix to the appropriate variable groups
switch ($prefix)
{
Expand All @@ -81,16 +90,19 @@ jobs:
$internalVariableGroups = '$(AzureSDK_Maven_Release_Pipeline_Secrets) $(Release_Secrets_for_GitHub) $(APIReview_AutoCreate_Configurations)'
}
"js" {
$generatePublicCIPipeline = 'false'
$internalVariableGroups = '$(NPM_Registry_Authentication) $(Release_Secrets_for_GitHub) $(APIReview_AutoCreate_Configurations)'
$testVariableGroups = '$(Secrets_for_Resource_Provisioner)'
}
"python" {
$generatePublicCIPipeline = 'false'
$internalVariableGroups = '$(Release_Secrets_for_GitHub) $(APIReview_AutoCreate_Configurations)'
$testVariableGroups = '$(Secrets_for_Resource_Provisioner)'
}
"net" {
$internalVariableGroups = '$(AzureSDK_Nuget_Release_Pipeline_Secrets) $(Release_Secrets_for_GitHub) $(APIReview_AutoCreate_Configurations)'
$testVariableGroups = '$(Secrets_for_Resource_Provisioner)'
$internalServiceConnections += ' "Azure SDK Symbols Publishing" Nuget.org'
}
"cpp" {
$internalVariableGroups = '$(Release_Secrets_for_GitHub) $(APIReview_AutoCreate_Configurations) $(Secrets_for_Resource_Provisioner)'
Expand All @@ -110,9 +122,16 @@ jobs:
Write-Host "InternalVariableGroups = $internalVariableGroups"
Write-Host "TestVariableGroups = $testVariableGroups"
Write-Host "TestServiceConnections = $testServiceConnections"
Write-Host "InternalServiceConnections = $internalServiceConnections"
Write-Host "GeneratePublicCIPipeline = $generatePublicCIPipeline"
Write-Host "GenerateUnifiedWeekly = $generateUnifiedWeekly"
Write-Host "##vso[task.setvariable variable=InternalVariableGroups]$internalVariableGroups"
Write-Host "##vso[task.setvariable variable=TestVariableGroups]$testVariableGroups"
Write-Host "##vso[task.setvariable variable=TestServiceConnections]$testServiceConnections"
Write-Host "##vso[task.setvariable variable=InternalServiceConnections]$internalServviceConnections"
Write-host "##vso[task.setvariable variable=GeneratePublicCIPipeline]$generatePublicCIPipeline"
Write-Host "##vso[task.setvariable variable=GenerateUnifiedWeekly]$generateUnifiedWeekly"
displayName: Setup pipeline generation variables
Expand All @@ -135,7 +154,9 @@ jobs:
--branch refs/heads/$(DefaultBranch)
--set-managed-variables
--debug
--serviceconnections "Azure"
displayName: 'Generate ci pipelines for: ${{ parameters.Repository }}'
condition: and(succeeded(), eq(variables['GeneratePublicCIPipeline'],'true'))
continueOnError: true
- task: AzureCLI@2
inputs:
Expand All @@ -157,6 +178,7 @@ jobs:
--set-managed-variables
--debug
--variablegroups $(InternalVariableGroups) $(TestVariableGroups)
--serviceconnections $(InternalServiceConnections) $(TestServiceConnections)
displayName: 'Generate release pipelines for: ${{ parameters.Repository }}'
continueOnError: true
- task: AzureCLI@2
Expand All @@ -179,6 +201,7 @@ jobs:
--set-managed-variables
--debug
--variablegroups $(TestVariableGroups)
--serviceconnections $(TestServiceConnections)
displayName: 'Generate test pipelines for: ${{ parameters.Repository }}'
condition: and(succeeded(), ne(variables['TestVariableGroups'],''))
continueOnError: true
Expand All @@ -202,6 +225,7 @@ jobs:
--set-managed-variables
--debug
--variablegroups $(TestVariableGroups)
--serviceconnections $(TestServiceConnections)
displayName: 'Generate weekly test pipelines (multi-cloud) for: ${{ parameters.Repository }}'
condition: and(succeeded(), ne(variables['TestVariableGroups'],''))
continueOnError: true
Expand All @@ -225,6 +249,7 @@ jobs:
--set-managed-variables
--debug
--variablegroups $(InternalVariableGroups) $(TestVariableGroups)
--serviceconnections $(InternalServiceConnections) $(TestServiceConnections)
displayName: 'Generate weekly unified test pipelines (multi-cloud) for: ${{ parameters.Repository }}'
condition: and(succeeded(), ne(variables['GenerateUnifiedWeekly'],''))
condition: and(succeeded(), eq(variables['GenerateUnifiedWeekly'],'true'))
continueOnError: true
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ steps:
- script: >
dotnet tool install
Azure.Sdk.Tools.PipelineGenerator
--version 1.1.0-dev.20240604.1
--version 1.1.0-dev.20241204.1
--add-source https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json
--tool-path ${{parameters.ToolPath}}
workingDirectory: $(Pipeline.Workspace)/pipeline-generator
Expand Down
6 changes: 3 additions & 3 deletions eng/common/scripts/Helpers/DevOps-WorkItem-Helpers.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,7 @@ function FindOrCreatePackageGroupParent($serviceName, $packageDisplayName, $outp
{
$existingItem = FindParentWorkItem $serviceName $packageDisplayName -outputCommand $outputCommand -ignoreReleasePlannerTests $ignoreReleasePlannerTests -tag $tag
if ($existingItem) {
Write-Host "Found existing product work item [$($existingItem.id)]"
Write-Verbose "Found existing product work item [$($existingItem.id)]"
$newparentItem = FindOrCreateServiceParent $serviceName -outputCommand $outputCommand -ignoreReleasePlannerTests $ignoreReleasePlannerTests -tag $tag
UpdateWorkItemParent $existingItem $newParentItem
return $existingItem
Expand All @@ -552,7 +552,7 @@ function FindOrCreateServiceParent($serviceName, $outputCommand = $true, $ignore
{
$serviceParent = FindParentWorkItem $serviceName -packageDisplayName $null -outputCommand $outputCommand -ignoreReleasePlannerTests $ignoreReleasePlannerTests -tag $tag
if ($serviceParent) {
Write-Host "Found existing service work item [$($serviceParent.id)]"
Write-Verbose "Found existing service work item [$($serviceParent.id)]"
return $serviceParent
}

Expand Down Expand Up @@ -1014,4 +1014,4 @@ function UpdateValidationStatus($pkgvalidationDetails, $BuildDefinition, $Pipeli
$workItem = UpdateWorkItem -id $workItem.id -fields $fields
Write-Host "[$($workItem.id)]$LanguageDisplayName - $pkgName($versionMajorMinor) - Updated"
return $true
}
}
Loading

0 comments on commit 6b5b383

Please sign in to comment.