diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index a63bf7b133a437..9087dea090bfca 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.21602.1", + "version": "1.0.0-prerelease.21602.2", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c5ab8e9f3ca16a..d4afac7bd540bf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,121 +18,121 @@ - + https://github.com/dotnet/arcade - 427c05909067bb2e484116ae2239456bb45adb85 + 59775387deb609d7c62f9e713d133c34ba28ffcd - + https://github.com/dotnet/arcade - 427c05909067bb2e484116ae2239456bb45adb85 + 59775387deb609d7c62f9e713d133c34ba28ffcd - + https://github.com/dotnet/arcade - 427c05909067bb2e484116ae2239456bb45adb85 + 59775387deb609d7c62f9e713d133c34ba28ffcd - + https://github.com/dotnet/arcade - 427c05909067bb2e484116ae2239456bb45adb85 + 59775387deb609d7c62f9e713d133c34ba28ffcd - + https://github.com/dotnet/arcade - 427c05909067bb2e484116ae2239456bb45adb85 + 59775387deb609d7c62f9e713d133c34ba28ffcd - + https://github.com/dotnet/arcade - 427c05909067bb2e484116ae2239456bb45adb85 + 59775387deb609d7c62f9e713d133c34ba28ffcd - + https://github.com/dotnet/arcade - 427c05909067bb2e484116ae2239456bb45adb85 + 59775387deb609d7c62f9e713d133c34ba28ffcd - + https://github.com/dotnet/arcade - 427c05909067bb2e484116ae2239456bb45adb85 + 59775387deb609d7c62f9e713d133c34ba28ffcd - + https://github.com/dotnet/arcade - 427c05909067bb2e484116ae2239456bb45adb85 + 59775387deb609d7c62f9e713d133c34ba28ffcd - + https://github.com/dotnet/arcade - 427c05909067bb2e484116ae2239456bb45adb85 + 59775387deb609d7c62f9e713d133c34ba28ffcd - + https://github.com/dotnet/arcade - 427c05909067bb2e484116ae2239456bb45adb85 + 59775387deb609d7c62f9e713d133c34ba28ffcd - + https://github.com/dotnet/arcade - 427c05909067bb2e484116ae2239456bb45adb85 + 59775387deb609d7c62f9e713d133c34ba28ffcd - + https://github.com/dotnet/arcade - 427c05909067bb2e484116ae2239456bb45adb85 + 59775387deb609d7c62f9e713d133c34ba28ffcd - + https://github.com/dotnet/arcade - 427c05909067bb2e484116ae2239456bb45adb85 + 59775387deb609d7c62f9e713d133c34ba28ffcd - + https://github.com/dotnet/arcade - 427c05909067bb2e484116ae2239456bb45adb85 + 59775387deb609d7c62f9e713d133c34ba28ffcd - + https://github.com/dotnet/arcade - 427c05909067bb2e484116ae2239456bb45adb85 + 59775387deb609d7c62f9e713d133c34ba28ffcd - + https://github.com/dotnet/arcade - 427c05909067bb2e484116ae2239456bb45adb85 + 59775387deb609d7c62f9e713d133c34ba28ffcd - + https://github.com/dotnet/arcade - 427c05909067bb2e484116ae2239456bb45adb85 + 59775387deb609d7c62f9e713d133c34ba28ffcd https://github.com/microsoft/vstest 140434f7109d357d0158ade9e5164a4861513965 - + https://github.com/dotnet/runtime-assets - 8784c859561193c0a91b2b47108113a9a7c40038 + 6003aa6296ad2bebdf8147de94afbea9b5f16264 - + https://github.com/dotnet/runtime-assets - 8784c859561193c0a91b2b47108113a9a7c40038 + 6003aa6296ad2bebdf8147de94afbea9b5f16264 - + https://github.com/dotnet/runtime-assets - 8784c859561193c0a91b2b47108113a9a7c40038 + 6003aa6296ad2bebdf8147de94afbea9b5f16264 - + https://github.com/dotnet/runtime-assets - 8784c859561193c0a91b2b47108113a9a7c40038 + 6003aa6296ad2bebdf8147de94afbea9b5f16264 - + https://github.com/dotnet/runtime-assets - 8784c859561193c0a91b2b47108113a9a7c40038 + 6003aa6296ad2bebdf8147de94afbea9b5f16264 - + https://github.com/dotnet/runtime-assets - 8784c859561193c0a91b2b47108113a9a7c40038 + 6003aa6296ad2bebdf8147de94afbea9b5f16264 - + https://github.com/dotnet/runtime-assets - 8784c859561193c0a91b2b47108113a9a7c40038 + 6003aa6296ad2bebdf8147de94afbea9b5f16264 - + https://github.com/dotnet/runtime-assets - 8784c859561193c0a91b2b47108113a9a7c40038 + 6003aa6296ad2bebdf8147de94afbea9b5f16264 - + https://github.com/dotnet/runtime-assets - 8784c859561193c0a91b2b47108113a9a7c40038 + 6003aa6296ad2bebdf8147de94afbea9b5f16264 - + https://github.com/dotnet/runtime-assets - 8784c859561193c0a91b2b47108113a9a7c40038 + 6003aa6296ad2bebdf8147de94afbea9b5f16264 https://github.com/dotnet/llvm-project @@ -202,17 +202,17 @@ https://github.com/dotnet/linker 4e77a943d360a5afea00de7b8a2d0ba2c721223f - + https://github.com/dotnet/xharness - b2b296f03a410996ff29e5975288964c7047918c + d27acf37630aa2a03824b698aa51356e47f902c0 - + https://github.com/dotnet/xharness - b2b296f03a410996ff29e5975288964c7047918c + d27acf37630aa2a03824b698aa51356e47f902c0 - + https://github.com/dotnet/arcade - 427c05909067bb2e484116ae2239456bb45adb85 + 59775387deb609d7c62f9e713d133c34ba28ffcd https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -234,9 +234,9 @@ https://github.com/dotnet/hotreload-utils 49922f7ec53df036084899e597f3c94627d709eb - + https://github.com/dotnet/runtime-assets - 8784c859561193c0a91b2b47108113a9a7c40038 + 6003aa6296ad2bebdf8147de94afbea9b5f16264 https://github.com/dotnet/roslyn-analyzers diff --git a/eng/Versions.props b/eng/Versions.props index 74aa2f682d5d0f..6af39feabfeb67 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,21 +54,21 @@ 2.0.0-alpha.1.21525.11 - 7.0.0-beta.21576.4 - 7.0.0-beta.21576.4 - 7.0.0-beta.21576.4 - 7.0.0-beta.21576.4 - 7.0.0-beta.21576.4 - 7.0.0-beta.21576.4 - 2.5.1-beta.21576.4 - 7.0.0-beta.21576.4 - 7.0.0-beta.21576.4 - 7.0.0-beta.21576.4 - 7.0.0-beta.21576.4 - 7.0.0-beta.21576.4 - 7.0.0-beta.21576.4 - 7.0.0-beta.21576.4 - 7.0.0-beta.21576.4 + 7.0.0-beta.21602.3 + 7.0.0-beta.21602.3 + 7.0.0-beta.21602.3 + 7.0.0-beta.21602.3 + 7.0.0-beta.21602.3 + 7.0.0-beta.21602.3 + 2.5.1-beta.21602.3 + 7.0.0-beta.21602.3 + 7.0.0-beta.21602.3 + 7.0.0-beta.21602.3 + 7.0.0-beta.21602.3 + 7.0.0-beta.21602.3 + 7.0.0-beta.21602.3 + 7.0.0-beta.21602.3 + 7.0.0-beta.21602.3 6.0.0-preview.1.102 @@ -118,17 +118,17 @@ 4.5.0 7.0.0-alpha.1.21576.4 - 7.0.0-beta.21579.1 - 7.0.0-beta.21579.1 - 7.0.0-beta.21579.1 - 7.0.0-beta.21579.1 - 7.0.0-beta.21579.1 - 7.0.0-beta.21579.1 - 7.0.0-beta.21579.1 - 7.0.0-beta.21579.1 - 7.0.0-beta.21579.1 - 7.0.0-beta.21579.1 - 7.0.0-beta.21579.1 + 7.0.0-beta.21602.1 + 7.0.0-beta.21602.1 + 7.0.0-beta.21602.1 + 7.0.0-beta.21602.1 + 7.0.0-beta.21602.1 + 7.0.0-beta.21602.1 + 7.0.0-beta.21602.1 + 7.0.0-beta.21602.1 + 7.0.0-beta.21602.1 + 7.0.0-beta.21602.1 + 7.0.0-beta.21602.1 1.0.0-prerelease.21577.2 1.0.0-prerelease.21577.2 @@ -151,8 +151,8 @@ 1.0.1-prerelease-00006 16.9.0-preview-20201201-01 - 1.0.0-prerelease.21602.1 - 1.0.0-prerelease.21602.1 + 1.0.0-prerelease.21602.2 + 1.0.0-prerelease.21602.2 1.0.2-alpha.0.21579.1 2.4.2-pre.9 2.4.2 diff --git a/eng/common/sdl/packages.config b/eng/common/sdl/packages.config index 3bd8b29ebd721b..4585cfd6bba1ed 100644 --- a/eng/common/sdl/packages.config +++ b/eng/common/sdl/packages.config @@ -1,4 +1,4 @@ - + diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index 3aafc82e4171a7..8128f2c357052c 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -54,7 +54,7 @@ jobs: # The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in # sync with the packages.config file. - name: DefaultGuardianVersion - value: 0.53.3 + value: 0.109.0 - name: GuardianVersion value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }} - name: GuardianPackagesConfigFile diff --git a/eng/common/tools.sh b/eng/common/tools.sh index e555c34269f6e8..17f0a365805d51 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -178,7 +178,7 @@ function InstallDotNetSdk { if [[ $# -ge 3 ]]; then architecture=$3 fi - InstallDotNet "$root" "$version" $architecture 'sdk' 'false' $runtime_source_feed $runtime_source_feed_key + InstallDotNet "$root" "$version" $architecture 'sdk' 'true' $runtime_source_feed $runtime_source_feed_key } function InstallDotNet { diff --git a/global.json b/global.json index e13e46fe71ce80..ae4b4d3af4b13a 100644 --- a/global.json +++ b/global.json @@ -12,10 +12,10 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "7.0.0-beta.21576.4", - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21576.4", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21576.4", - "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.21576.4", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "7.0.0-beta.21602.3", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21602.3", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21602.3", + "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.21602.3", "Microsoft.Build.NoTargets": "3.1.0", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "7.0.0-alpha.1.21576.4"