diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1fac68b9691..6256a3bfd1d 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -20,7 +20,7 @@ variables: resources: containers: - container: LinuxContainer - image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-14.04-cross-0cd4667-20170319080304 + image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-20210714125435-9b5bbc2 stages: - stage: build diff --git a/global.json b/global.json index a8e5ccf722a..877587a05e6 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.100" + "dotnet": "7.0.100-preview.2.22153.17" }, "msbuild-sdks": { "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22157.6", diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props b/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props index 3b59cef4ba3..2d881320123 100644 --- a/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props +++ b/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props @@ -2,7 +2,7 @@ false - 6.0.0 + 7.0.0-preview.2.22153.2 runtime $(BundledNETCoreAppPackageVersion) diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/XHarnessRunner.targets b/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/XHarnessRunner.targets index 05eb88368d1..44bc81bbb9e 100644 --- a/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/XHarnessRunner.targets +++ b/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/XHarnessRunner.targets @@ -1,12 +1,9 @@ - true - true net6.0 - 6.0.100 - aspnetcore-runtime - $(AspNetCoreRuntimeVersion) + 6.0.100 + sdk