diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d01f924b5..a75ebdef5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -172,28 +172,28 @@ - + https://github.com/dotnet/arcade - 427c05909067bb2e484116ae2239456bb45adb85 + b3e949192067c8acdaaae35015534f76e92d79d4 - + https://github.com/dotnet/arcade - 427c05909067bb2e484116ae2239456bb45adb85 + b3e949192067c8acdaaae35015534f76e92d79d4 - + https://github.com/dotnet/arcade - 427c05909067bb2e484116ae2239456bb45adb85 + b3e949192067c8acdaaae35015534f76e92d79d4 https://github.com/dotnet/source-build-reference-packages fc184172bf8144f7c91a7bc0226b7d90c5821576 - + https://github.com/dotnet/sourcelink - 4f4f58596278e9ef72d68d7ea80b634e552c9c8f + 9c298b01ce0f161622bef0bc0c433a758d0dd3ac diff --git a/eng/Versions.props b/eng/Versions.props index 69b9e3393..9c1439974 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ - 7.0.0-beta.21576.4 + 7.0.0-beta.21603.6 diff --git a/eng/common/sdl/packages.config b/eng/common/sdl/packages.config index 3bd8b29eb..4585cfd6b 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 3aafc82e4..8128f2c35 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 e555c3426..17f0a3658 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 8fb5a2f42..0d12f5fd5 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21576.4", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21576.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21603.6", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21603.6" } } diff --git a/src/SourceBuild/tarball/patches/arcade/0008-Bootstrapping-workaround.patch b/src/SourceBuild/tarball/patches/arcade/0008-Bootstrapping-workaround.patch index 5ed742d7b..cfb166328 100644 --- a/src/SourceBuild/tarball/patches/arcade/0008-Bootstrapping-workaround.patch +++ b/src/SourceBuild/tarball/patches/arcade/0008-Bootstrapping-workaround.patch @@ -24,9 +24,9 @@ index 37feef5..c5aee85 100644 + $(NoWarn);NU1603 + + - -