diff --git a/NuGet.config b/NuGet.config index d5dbd101f043e..a66af49d118f5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,6 +9,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b1e7a3296db7a..b5630ba1a7341 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -26,77 +26,77 @@ - + https://github.com/dotnet/arcade - fdd3a242bc813f371023adff4e4c05c0be705d2a + 879df783283dfb44c7653493fdf7fd7b07ba6b01 - + https://github.com/dotnet/arcade - fdd3a242bc813f371023adff4e4c05c0be705d2a + 879df783283dfb44c7653493fdf7fd7b07ba6b01 - + https://github.com/dotnet/arcade - fdd3a242bc813f371023adff4e4c05c0be705d2a + 879df783283dfb44c7653493fdf7fd7b07ba6b01 - + https://github.com/dotnet/arcade - fdd3a242bc813f371023adff4e4c05c0be705d2a + 879df783283dfb44c7653493fdf7fd7b07ba6b01 - + https://github.com/dotnet/arcade - fdd3a242bc813f371023adff4e4c05c0be705d2a + 879df783283dfb44c7653493fdf7fd7b07ba6b01 - + https://github.com/dotnet/arcade - fdd3a242bc813f371023adff4e4c05c0be705d2a + 879df783283dfb44c7653493fdf7fd7b07ba6b01 - + https://github.com/dotnet/arcade - fdd3a242bc813f371023adff4e4c05c0be705d2a + 879df783283dfb44c7653493fdf7fd7b07ba6b01 - + https://github.com/dotnet/arcade - fdd3a242bc813f371023adff4e4c05c0be705d2a + 879df783283dfb44c7653493fdf7fd7b07ba6b01 - + https://github.com/dotnet/arcade - fdd3a242bc813f371023adff4e4c05c0be705d2a + 879df783283dfb44c7653493fdf7fd7b07ba6b01 - + https://github.com/dotnet/arcade - fdd3a242bc813f371023adff4e4c05c0be705d2a + 879df783283dfb44c7653493fdf7fd7b07ba6b01 - + https://github.com/dotnet/arcade - fdd3a242bc813f371023adff4e4c05c0be705d2a + 879df783283dfb44c7653493fdf7fd7b07ba6b01 - + https://github.com/dotnet/arcade - fdd3a242bc813f371023adff4e4c05c0be705d2a + 879df783283dfb44c7653493fdf7fd7b07ba6b01 - + https://github.com/dotnet/arcade - fdd3a242bc813f371023adff4e4c05c0be705d2a + 879df783283dfb44c7653493fdf7fd7b07ba6b01 - + https://github.com/dotnet/arcade - fdd3a242bc813f371023adff4e4c05c0be705d2a + 879df783283dfb44c7653493fdf7fd7b07ba6b01 - + https://github.com/dotnet/arcade - fdd3a242bc813f371023adff4e4c05c0be705d2a + 879df783283dfb44c7653493fdf7fd7b07ba6b01 - + https://github.com/dotnet/arcade - fdd3a242bc813f371023adff4e4c05c0be705d2a + 879df783283dfb44c7653493fdf7fd7b07ba6b01 - + https://github.com/dotnet/arcade - fdd3a242bc813f371023adff4e4c05c0be705d2a + 879df783283dfb44c7653493fdf7fd7b07ba6b01 - + https://github.com/dotnet/arcade - fdd3a242bc813f371023adff4e4c05c0be705d2a + 879df783283dfb44c7653493fdf7fd7b07ba6b01 https://github.com/microsoft/vstest @@ -142,37 +142,37 @@ https://github.com/dotnet/runtime-assets 6c6b7f90677142ad7bd829eb28d3bcf8ad775dd7 - + https://github.com/dotnet/llvm-project - 0f10ab4748ab03f248985e664aea7ec9df55b3f4 + cea4a95e1505e737e768c8094d6aa880f5442ab7 - + https://github.com/dotnet/llvm-project - 0f10ab4748ab03f248985e664aea7ec9df55b3f4 + cea4a95e1505e737e768c8094d6aa880f5442ab7 - + https://github.com/dotnet/llvm-project - 0f10ab4748ab03f248985e664aea7ec9df55b3f4 + cea4a95e1505e737e768c8094d6aa880f5442ab7 - + https://github.com/dotnet/llvm-project - 0f10ab4748ab03f248985e664aea7ec9df55b3f4 + cea4a95e1505e737e768c8094d6aa880f5442ab7 - + https://github.com/dotnet/llvm-project - 0f10ab4748ab03f248985e664aea7ec9df55b3f4 + cea4a95e1505e737e768c8094d6aa880f5442ab7 - + https://github.com/dotnet/llvm-project - 0f10ab4748ab03f248985e664aea7ec9df55b3f4 + cea4a95e1505e737e768c8094d6aa880f5442ab7 - + https://github.com/dotnet/llvm-project - 0f10ab4748ab03f248985e664aea7ec9df55b3f4 + cea4a95e1505e737e768c8094d6aa880f5442ab7 - + https://github.com/dotnet/llvm-project - 0f10ab4748ab03f248985e664aea7ec9df55b3f4 + cea4a95e1505e737e768c8094d6aa880f5442ab7 https://github.com/dotnet/runtime @@ -218,9 +218,9 @@ https://github.com/dotnet/xharness e9669dc84ecd668d3bbb748758103e23b394ffef - + https://github.com/dotnet/arcade - fdd3a242bc813f371023adff4e4c05c0be705d2a + 879df783283dfb44c7653493fdf7fd7b07ba6b01 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index af4b55b988420..43005de5e8db4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,21 +41,21 @@ 1.1.0-preview.22164.17 - 6.0.0-beta.22314.7 - 6.0.0-beta.22314.7 - 6.0.0-beta.22314.7 - 6.0.0-beta.22314.7 - 6.0.0-beta.22314.7 - 6.0.0-beta.22314.7 - 2.5.1-beta.22314.7 - 6.0.0-beta.22314.7 - 6.0.0-beta.22314.7 - 6.0.0-beta.22314.7 - 6.0.0-beta.22314.7 - 6.0.0-beta.22314.7 - 6.0.0-beta.22314.7 - 6.0.0-beta.22314.7 - 6.0.0-beta.22314.7 + 6.0.0-beta.22161.1 + 6.0.0-beta.22161.1 + 6.0.0-beta.22161.1 + 6.0.0-beta.22161.1 + 6.0.0-beta.22161.1 + 6.0.0-beta.22161.1 + 2.5.1-beta.22161.1 + 6.0.0-beta.22161.1 + 6.0.0-beta.22161.1 + 6.0.0-beta.22161.1 + 6.0.0-beta.22161.1 + 6.0.0-beta.22161.1 + 6.0.0-beta.22161.1 + 6.0.0-beta.22161.1 + 6.0.0-beta.22161.1 6.0.0-preview.1.102 @@ -161,14 +161,14 @@ 6.0.0-preview.7.21417.1 - 11.1.0-alpha.1.22316.1 - 11.1.0-alpha.1.22316.1 - 11.1.0-alpha.1.22316.1 - 11.1.0-alpha.1.22316.1 - 11.1.0-alpha.1.22316.1 - 11.1.0-alpha.1.22316.1 - 11.1.0-alpha.1.22316.1 - 11.1.0-alpha.1.22316.1 + 11.1.0-alpha.1.21416.1 + 11.1.0-alpha.1.21416.1 + 11.1.0-alpha.1.21416.1 + 11.1.0-alpha.1.21416.1 + 11.1.0-alpha.1.21416.1 + 11.1.0-alpha.1.21416.1 + 11.1.0-alpha.1.21416.1 + 11.1.0-alpha.1.21416.1 6.0.4 6.0.4 diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index abb1b2bcda42b..ba40dc82f1411 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -43,8 +43,8 @@ steps: # In that case, add variables to allow the download of internal runtimes if the specified versions are not found # in the default public locations. internalRuntimeDownloadArgs= - if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then - internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' + if [ '$(dotnetclimsrc-read-sas-token-base64)' != '$''(dotnetclimsrc-read-sas-token-base64)' ]; then + internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetclimsrc.blob.core.windows.net/dotnet /p:DotNetRuntimeSourceFeedKey=$(dotnetclimsrc-read-sas-token-base64) --runtimesourcefeed https://dotnetclimsrc.blob.core.windows.net/dotnet --runtimesourcefeedkey $(dotnetclimsrc-read-sas-token-base64)' fi buildConfig=Release diff --git a/global.json b/global.json index 580fe7e1d29ca..32d5293770001 100644 --- a/global.json +++ b/global.json @@ -12,10 +12,10 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.22314.7", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22314.7", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22314.7", - "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.22314.7", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.22161.1", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22161.1", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22161.1", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.22161.1", "Microsoft.Build.NoTargets": "3.1.0", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "6.0.0-rc.1.21415.6" diff --git a/src/workloads/workloads.csproj b/src/workloads/workloads.csproj index 60d2925336445..8ecc2de9c3dae 100644 --- a/src/workloads/workloads.csproj +++ b/src/workloads/workloads.csproj @@ -8,7 +8,8 @@ $(NuGetPackageRoot)microsoft.dotnet.build.tasks.installers\$(MicrosoftDotNetBuildTasksInstallersVersion)\tools\$(MicrosoftDotNetBuildTasksInstallersTaskTargetFramework)\Microsoft.DotNet.Build.Tasks.Installers.dll - + + @@ -47,12 +48,6 @@ - - - - - + + + + + + + + + + + @@ -97,28 +106,49 @@ - + - + + + + + - + - + + + + + + + + + + +