Browse Source

Use single .NET SDK version in pipelines (#13719)

Julien Lebosquain 1 year ago
parent
commit
62b7eb4df2
3 changed files with 31 additions and 21 deletions
  1. 12 8
      azure-pipelines-integrationtests.yml
  2. 18 12
      azure-pipelines.yml
  3. 1 1
      global.json

+ 12 - 8
azure-pipelines-integrationtests.yml

@@ -5,14 +5,16 @@ jobs:
 
   steps:
   - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 6.0.415'
+    displayName: 'Use .NET 6.0 Runtime'
     inputs:
-      version: 6.0.415
+      packageType: runtime
+      version: 6.0.x
 
   - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 7.0.402'
+    displayName: 'Use .NET 7.0 SDK'
     inputs:
-      version: 7.0.402
+      packageType: sdk
+      useGlobalJson: true
 
   - script: system_profiler SPDisplaysDataType |grep Resolution
     displayName: 'Get Resolution'
@@ -57,14 +59,16 @@ jobs:
 
   steps:
   - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 6.0.404'
+    displayName: 'Use .NET 6.0 Runtime'
     inputs:
-      version: 6.0.404
+      packageType: runtime
+      version: 6.0.x
 
   - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 7.0.101'
+    displayName: 'Use .NET 7.0 SDK'
     inputs:
-      version: 7.0.101
+      packageType: sdk
+      useGlobalJson: true
 
   - task: Windows Application Driver@0
     inputs:

+ 18 - 12
azure-pipelines.yml

@@ -30,14 +30,16 @@ jobs:
     vmImage: 'ubuntu-20.04'
   steps:
   - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 6.0.415'
+    displayName: 'Use .NET 6.0 Runtime'
     inputs:
-      version: 6.0.415
+      packageType: runtime
+      version: 6.0.x
 
   - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 7.0.402'
+    displayName: 'Use .NET 7.0 SDK'
     inputs:
-      version: 7.0.402
+      packageType: sdk
+      useGlobalJson: true
 
   - task: CmdLine@2
     displayName: 'Install Workloads'
@@ -74,14 +76,16 @@ jobs:
     vmImage: 'macos-12'
   steps:
   - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 6.0.404'
+    displayName: 'Use .NET 6.0 Runtime'
     inputs:
-      version: 6.0.404
+      packageType: runtime
+      version: 6.0.x
 
   - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 7.0.101'
+    displayName: 'Use .NET 7.0 SDK'
     inputs:
-      version: 7.0.101
+      packageType: sdk
+      useGlobalJson: true
 
   - task: CmdLine@2
     displayName: 'Install Workloads'
@@ -152,14 +156,16 @@ jobs:
     SolutionDir: '$(Build.SourcesDirectory)'
   steps:
   - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 6.0.404'
+    displayName: 'Use .NET 6.0 Runtime'
     inputs:
-      version: 6.0.404
+      packageType: runtime
+      version: 6.0.x
 
   - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 7.0.101'
+    displayName: 'Use .NET 7.0 SDK'
     inputs:
-      version: 7.0.101
+      packageType: sdk
+      useGlobalJson: true
 
   - task: CmdLine@2
     displayName: 'Install Workloads'

+ 1 - 1
global.json

@@ -1,6 +1,6 @@
 {
     "sdk": {
-        "version": "7.0.101",
+        "version": "7.0.404",
         "rollForward": "latestFeature"
     },
     "msbuild-sdks": {