diff options
author | dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> | 2021-12-06 17:46:09 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-06 17:46:09 +0300 |
commit | 45004b720a726e3283dc241136384198a823312d (patch) | |
tree | 0f54ec73fa439b3966c493bacdac190196421f04 | |
parent | 2e69189f031e16ffb36167d89a658e14cbdba099 (diff) |
Update dependencies from https://github.com/dotnet/arcade build 20211203.6 (#146)
[release/11.x] Update dependencies from dotnet/arcade
-rw-r--r-- | eng/Version.Details.xml | 12 | ||||
-rw-r--r-- | eng/Versions.props | 2 | ||||
-rw-r--r-- | eng/common/sdl/packages.config | 2 | ||||
-rw-r--r-- | eng/common/templates/job/execute-sdl.yml | 2 | ||||
-rwxr-xr-x | eng/common/tools.sh | 2 | ||||
-rw-r--r-- | global.json | 4 |
6 files changed, 12 insertions, 12 deletions
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ca1134b89cdc..54fd6143cf03 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,17 +3,17 @@ <ProductDependencies> </ProductDependencies> <ToolsetDependencies> - <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21576.4"> + <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21603.6"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>427c05909067bb2e484116ae2239456bb45adb85</Sha> + <Sha>b3e949192067c8acdaaae35015534f76e92d79d4</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21576.4"> + <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21603.6"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>427c05909067bb2e484116ae2239456bb45adb85</Sha> + <Sha>b3e949192067c8acdaaae35015534f76e92d79d4</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.21576.4"> + <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.21603.6"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>427c05909067bb2e484116ae2239456bb45adb85</Sha> + <Sha>b3e949192067c8acdaaae35015534f76e92d79d4</Sha> </Dependency> </ToolsetDependencies> </Dependencies> diff --git a/eng/Versions.props b/eng/Versions.props index 05e34ae513c6..50c4e6cb6be0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -6,6 +6,6 @@ <PreReleaseVersionIteration>1</PreReleaseVersionIteration> </PropertyGroup> <PropertyGroup> - <MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.21576.4</MicrosoftDotNetBuildTasksPackagingVersion> + <MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.21603.6</MicrosoftDotNetBuildTasksPackagingVersion> </PropertyGroup> </Project> diff --git a/eng/common/sdl/packages.config b/eng/common/sdl/packages.config index 3bd8b29ebd72..4585cfd6bba1 100644 --- a/eng/common/sdl/packages.config +++ b/eng/common/sdl/packages.config @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="Microsoft.Guardian.Cli" version="0.53.3"/> + <package id="Microsoft.Guardian.Cli" version="0.109.0"/> </packages> diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index 3aafc82e4171..8128f2c35705 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 e555c34269f6..17f0a365805d 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 4c9f2c0b4a64..b2e88ac62e8c 100644 --- a/global.json +++ b/global.json @@ -3,8 +3,8 @@ "dotnet": "6.0.100" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21576.4", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21576.4", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21603.6", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21603.6", "Microsoft.Build.Traversal": "2.0.2" } } |