Bump globals.yml .NET SDK version from 3.1.405 to 6.x + assorted chan…

…ges (#4916) See #4916
Azure · Dec 15, 2022 · 10c9b8c · 10c9b8c
1 parent 15fa5ad
commit 10c9b8c
Show file tree

Hide file tree

Showing 17 changed files with 51 additions and 81 deletions.
diff --git a/eng/pipelines/templates/stages/archetype-sdk-tool-azure-function.yml b/eng/pipelines/templates/stages/archetype-sdk-tool-azure-function.yml
@@ -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

diff --git a/eng/pipelines/templates/stages/archetype-sdk-tool-azure-webapp.yml b/eng/pipelines/templates/stages/archetype-sdk-tool-azure-webapp.yml
@@ -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

diff --git a/eng/pipelines/templates/stages/archetype-sdk-tool-dotnet.yml b/eng/pipelines/templates/stages/archetype-sdk-tool-dotnet.yml
@@ -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."
+              }
+            displayName: Create directory for packages to publish if absent
+
           - publish: $(Build.ArtifactStagingDirectory)/packages
             displayName: Publish to packages artifact
             artifact: packages

diff --git a/eng/pipelines/templates/variables/globals.yml b/eng/pipelines/templates/variables/globals.yml
@@ -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'
diff --git a/src/dotnet/Azure.ClientSdk.Analyzers/ci.yml b/src/dotnet/Azure.ClientSdk.Analyzers/ci.yml
@@ -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
diff --git a/tools/CreateRuleFabricBot/ci.yml b/tools/CreateRuleFabricBot/ci.yml
@@ -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
diff --git a/tools/apiview/parsers/swagger-api-parser/ci.yml b/tools/apiview/parsers/swagger-api-parser/ci.yml
@@ -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
diff --git a/tools/code-owners-parser/ci.yml b/tools/code-owners-parser/ci.yml
@@ -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
     # get-codeowners.ps1 script uses the codeowners-parser NuGet package
     # which has net5.0, not net6.0, which causes it to fail. 

diff --git a/...ithub-issues/Azure.Sdk.Tools.GitHubIssues.Tests/Azure.Sdk.Tools.GitHubIssues.Tests.csproj b/...ithub-issues/Azure.Sdk.Tools.GitHubIssues.Tests/Azure.Sdk.Tools.GitHubIssues.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git a/tools/github-issues/Azure.Sdk.Tools.GitHubIssues/Azure.Sdk.Tools.GitHubIssues.csproj b/tools/github-issues/Azure.Sdk.Tools.GitHubIssues/Azure.Sdk.Tools.GitHubIssues.csproj
@@ -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>
@@ -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" />

diff --git a/tools/http-fault-injector/ci.yml b/tools/http-fault-injector/ci.yml
@@ -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    
diff --git a/tools/identity-resolution/ci.yml b/tools/identity-resolution/ci.yml
@@ -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
diff --git a/tools/notification-configuration/ci.yml b/tools/notification-configuration/ci.yml
@@ -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
diff --git a/tools/pipeline-generator/ci.yml b/tools/pipeline-generator/ci.yml
@@ -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
diff --git a/tools/snippet-generator/ci.yml b/tools/snippet-generator/ci.yml
@@ -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
diff --git a/tools/stress-cluster/cluster/kubernetes/generator/ci.yml b/tools/stress-cluster/cluster/kubernetes/generator/ci.yml
@@ -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
diff --git a/tools/version-guard/ci.yml b/tools/version-guard/ci.yml
@@ -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