diff --git a/azure-pipelines-integrationtests.yml b/azure-pipelines-integrationtests.yml index 39923ca781..3613518dc1 100644 --- a/azure-pipelines-integrationtests.yml +++ b/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: diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 345378dbf2..a306e22355 100644 --- a/azure-pipelines.yml +++ b/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' diff --git a/global.json b/global.json index 8536535b51..13a6c6d6ad 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "7.0.101", + "version": "7.0.404", "rollForward": "latestFeature" }, "msbuild-sdks": {