Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump globals.yml .NET SDK version from 3.1.405 to 6.x + assorted changes #4916

Merged
merged 10 commits into from
Dec 15, 2022
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,13 @@ stages:
jobs:
- job: BuildPackage
pool:
vmImage: ubuntu-18.04
name: azsdk-pool-mms-ubuntu-2004-general
vmImage: MMSUbuntu20.04
steps:
- task: UseDotNet@2
displayName: Tools
inputs:
version: '3.1.201'
version: '6.x'
- pwsh: |
dotnet build tools/${{ parameters.ToolName }} --configuration Release
displayName: Build
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ stages:
- task: UseDotNet@2
displayName: Tools
inputs:
version: '6.0.x'
version: '6.x'
- pwsh: |
dotnet build tools/${{ parameters.ToolName }} --configuration Release
displayName: Build
Expand Down
13 changes: 13 additions & 0 deletions eng/pipelines/templates/stages/archetype-sdk-tool-dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,19 @@ stages:
BuildMatrix: ${{ parameters.StandaloneExeMatrix }}
TargetDirectory: '${{ coalesce(parameters.PackageDirectory, parameters.ToolDirectory) }}'

# This step creates "$(Build.ArtifactStagingDirectory)/packages" directory if it doesn't exist.
# This step is necessary since migration to net6.0. This is because since net6.0,
# in case the "Build and Package" above would not output any packages to this directory,
# the "Publish to packages artifact" step below would fail on missing directory.
- pwsh: |
if (!(Test-Path -PathType container "$(Build.ArtifactStagingDirectory)/packages")) {
New-Item -ItemType Directory -Path "$(Build.ArtifactStagingDirectory)/packages"
Write-Host "Created directory $(Build.ArtifactStagingDirectory)/packages"
} else {
Write-Host "Directory $(Build.ArtifactStagingDirectory)/packages already exists. Nothing to do."
konrad-jamrozik marked this conversation as resolved.
Show resolved Hide resolved
}
displayName: Create directory for packages to publish if absent

- publish: $(Build.ArtifactStagingDirectory)/packages
displayName: Publish to packages artifact
artifact: packages
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/templates/variables/globals.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
variables:
OfficialBuildId: $(Build.BuildNumber)
skipComponentGovernanceDetection: true
DotNetCoreVersion: '3.1.405'
DotNetCoreVersion: '6.x'
NotificationsCreatorVersion: '1.0.0-dev.20221011.1'
PipelineOwnersExtractorVersion: '1.0.0-dev.20221011.1'
6 changes: 1 addition & 5 deletions src/dotnet/Azure.ClientSdk.Analyzers/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,4 @@ pr:
extends:
template: /eng/pipelines/templates/stages/archetype-sdk-tool-dotnet.yml
parameters:
ToolDirectory: src/dotnet/Azure.ClientSdk.Analyzers
# As of 12/11/2022 this is a temporary override until the globally-set
# SDK is set to net6.0. For details, please see:
# https://github.com/Azure/azure-sdk-tools/pull/4916
DotNetCoreVersion: 6.0.403
ToolDirectory: src/dotnet/Azure.ClientSdk.Analyzers
4 changes: 0 additions & 4 deletions tools/CreateRuleFabricBot/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,3 @@ extends:
template: /eng/pipelines/templates/stages/archetype-sdk-tool-dotnet.yml
parameters:
ToolDirectory: tools/CreateRuleFabricBot
# As of 12/10/2022 this is a temporary override until the globally-set
# SDK is set to net6.0. For details, please see:
# https://github.com/Azure/azure-sdk-tools/pull/4916
DotNetCoreVersion: 6.0.403
60 changes: 28 additions & 32 deletions tools/apiview/parsers/swagger-api-parser/ci.yml
Original file line number Diff line number Diff line change
@@ -1,32 +1,28 @@
# NOTE: Please refer to https://aka.ms/azsdk/engsys/ci-yaml before editing this file.
trigger:
branches:
include:
- main
- feature/*
- release/*
- hotfix/*
paths:
include:
- tools/apiview/parsers/swagger-api-parser

pr:
branches:
include:
- main
- feature/*
- release/*
- hotfix/*
paths:
include:
- tools/apiview/parsers/swagger-api-parser

extends:
template: /eng/pipelines/templates/stages/archetype-sdk-tool-dotnet.yml
parameters:
PackageDirectory: $(Build.SourcesDirectory)/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser
TestDirectory: $(Build.SourcesDirectory)/tools/apiview/parsers/swagger-api-parser/SwaggerApiParserTest
# As of 12/11/2022 this is a temporary override until the globally-set
# SDK is set to net6.0. For details, please see:
# https://github.com/Azure/azure-sdk-tools/pull/4916
DotNetCoreVersion: 6.0.403
# NOTE: Please refer to https://aka.ms/azsdk/engsys/ci-yaml before editing this file.
trigger:
branches:
include:
- main
- feature/*
- release/*
- hotfix/*
paths:
include:
- tools/apiview/parsers/swagger-api-parser

pr:
branches:
include:
- main
- feature/*
- release/*
- hotfix/*
paths:
include:
- tools/apiview/parsers/swagger-api-parser

extends:
template: /eng/pipelines/templates/stages/archetype-sdk-tool-dotnet.yml
parameters:
PackageDirectory: $(Build.SourcesDirectory)/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser
TestDirectory: $(Build.SourcesDirectory)/tools/apiview/parsers/swagger-api-parser/SwaggerApiParserTest
4 changes: 0 additions & 4 deletions tools/code-owners-parser/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,6 @@ extends:
template: /eng/pipelines/templates/stages/archetype-sdk-tool-dotnet.yml
parameters:
ToolDirectory: tools/code-owners-parser
# As of 12/11/2022 this is a temporary override until the globally-set
# SDK is set to net6.0. For details, please see:
# https://github.com/Azure/azure-sdk-tools/pull/4916
DotNetCoreVersion: 6.0.403
# As of 12/11/2022 temporarily disabling TestPostSteps because the
konrad-jamrozik marked this conversation as resolved.
Show resolved Hide resolved
# get-codeowners.ps1 script uses the codeowners-parser NuGet package
# which has net5.0, not net6.0, which causes it to fail.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>

<IsPackable>false</IsPackable>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<AzureFunctionsVersion>v3</AzureFunctionsVersion>
<!-- Do not warn about using assemblies without a strong name signature-->
<NoWarn>$(NoWarn);8002</NoWarn>
Expand All @@ -12,7 +12,7 @@
<PackageReference Include="Azure.Storage.Blobs" Version="12.13.0" />
<PackageReference Include="Microsoft.Azure.Functions.Extensions" Version="1.1.0" />
<PackageReference Include="Microsoft.Extensions.Azure" Version="1.0.0" />
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="3.0.9" />
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.1.3" />
<PackageReference Include="Octokit" Version="0.48.0" />
<PackageReference Include="Polly" Version="7.2.1" />
<PackageReference Include="RateLimiter" Version="2.1.0" />
Expand Down
4 changes: 0 additions & 4 deletions tools/http-fault-injector/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,3 @@ extends:
template: /eng/pipelines/templates/stages/archetype-sdk-tool-dotnet.yml
parameters:
ToolDirectory: tools/http-fault-injector
# As of 12/11/2022 this is a temporary override until the globally-set
# SDK is set to net6.0. For details, please see:
# https://github.com/Azure/azure-sdk-tools/pull/4916
DotNetCoreVersion: 6.0.403
4 changes: 0 additions & 4 deletions tools/identity-resolution/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,3 @@ extends:
template: /eng/pipelines/templates/stages/archetype-sdk-tool-dotnet.yml
parameters:
ToolDirectory: tools/identity-resolution
# As of 12/11/2022 this is a temporary override until the globally-set
# SDK is set to net6.0. For details, please see:
# https://github.com/Azure/azure-sdk-tools/pull/4916
DotNetCoreVersion: 6.0.403
4 changes: 0 additions & 4 deletions tools/notification-configuration/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,3 @@ extends:
template: /eng/pipelines/templates/stages/archetype-sdk-tool-dotnet.yml
parameters:
ToolDirectory: tools/notification-configuration
# As of 12/11/2022 this is a temporary override until the globally-set
# SDK is set to net6.0. For details, please see:
# https://github.com/Azure/azure-sdk-tools/pull/4916
DotNetCoreVersion: 6.0.403
4 changes: 0 additions & 4 deletions tools/pipeline-generator/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,3 @@ extends:
template: /eng/pipelines/templates/stages/archetype-sdk-tool-dotnet.yml
parameters:
ToolDirectory: tools/pipeline-generator
# As of 12/10/2022 this is a temporary override until the globally-set
# SDK is set to net6.0. For details, please see:
# https://github.com/Azure/azure-sdk-tools/pull/4916
DotNetCoreVersion: 6.0.403
4 changes: 0 additions & 4 deletions tools/snippet-generator/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,3 @@ extends:
template: ../../eng/pipelines/templates/stages/archetype-sdk-tool-dotnet.yml
parameters:
ToolDirectory: tools/snippet-generator
# As of 12/11/2022 this is a temporary override until the globally-set
# SDK is set to net6.0. For details, please see:
# https://github.com/Azure/azure-sdk-tools/pull/4916
DotNetCoreVersion: 6.0.403
4 changes: 0 additions & 4 deletions tools/stress-cluster/cluster/kubernetes/generator/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,3 @@ extends:
template: /eng/pipelines/templates/stages/archetype-sdk-tool-dotnet.yml
parameters:
ToolDirectory: tools/stress-cluster/cluster/kubernetes/generator
# As of 12/11/2022 this is a temporary override until the globally-set
# SDK is set to net6.0. For details, please see:
# https://github.com/Azure/azure-sdk-tools/pull/4916
DotNetCoreVersion: 6.0.403
4 changes: 0 additions & 4 deletions tools/version-guard/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,3 @@ extends:
template: /eng/pipelines/templates/stages/archetype-sdk-tool-dotnet.yml
parameters:
ToolDirectory: tools/version-guard
# As of 12/10/2022 this is a temporary override until the globally-set
# SDK is set to net6.0. For details, please see:
# https://github.com/Azure/azure-sdk-tools/pull/4916
DotNetCoreVersion: 6.0.403