get rid of temporary overrides for .net 6.0

Azure · Dec 14, 2022 · 3097908 · 3097908
1 parent 0b8f699
commit 3097908
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 69 deletions.
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/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