diff options
| author | dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> | 2021-11-15 17:37:26 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-15 17:37:26 +0300 |
| commit | 2059b611a9a58c0bcb25ece23c65acce83503a37 (patch) | |
| tree | 8edfb9a564351f83527d431bd27ccea3c4fb197f | |
| parent | 75fa01d7eba1a283c7f2513bffa72c6bea440ac2 (diff) | |
Update dependencies from https://github.com/dotnet/arcade build 20211109.3 (#144)
[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/msbuild.ps1 | 1 | ||||
| -rw-r--r-- | global.json | 4 |
4 files changed, 10 insertions, 9 deletions
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 31b97fa7ee68..fa2f8c7e1682 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.21555.2"> + <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21559.3"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>a7c57abb74deaee6dac921dd68f9c3c58059ebfb</Sha> + <Sha>fecf65bedcee9036b8ba9d8d7feef5413f294914</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21555.2"> + <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21559.3"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>a7c57abb74deaee6dac921dd68f9c3c58059ebfb</Sha> + <Sha>fecf65bedcee9036b8ba9d8d7feef5413f294914</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.21555.2"> + <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.21559.3"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>a7c57abb74deaee6dac921dd68f9c3c58059ebfb</Sha> + <Sha>fecf65bedcee9036b8ba9d8d7feef5413f294914</Sha> </Dependency> </ToolsetDependencies> </Dependencies> diff --git a/eng/Versions.props b/eng/Versions.props index f9b1adf69c29..e6f7f3f101e7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -6,6 +6,6 @@ <PreReleaseVersionIteration>1</PreReleaseVersionIteration> </PropertyGroup> <PropertyGroup> - <MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.21555.2</MicrosoftDotNetBuildTasksPackagingVersion> + <MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.21559.3</MicrosoftDotNetBuildTasksPackagingVersion> </PropertyGroup> </Project> diff --git a/eng/common/msbuild.ps1 b/eng/common/msbuild.ps1 index eea19cd8452f..f041e5ddd958 100644 --- a/eng/common/msbuild.ps1 +++ b/eng/common/msbuild.ps1 @@ -6,6 +6,7 @@ Param( [switch] $ci, [switch] $prepareMachine, [switch] $excludePrereleaseVS, + [string] $msbuildEngine = $null, [Parameter(ValueFromRemainingArguments=$true)][String[]]$extraArgs ) diff --git a/global.json b/global.json index 03431cdb6633..1b3b600b87b5 100644 --- a/global.json +++ b/global.json @@ -3,8 +3,8 @@ "dotnet": "6.0.100-rc.1.21430.12" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21555.2", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21555.2", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21559.3", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21559.3", "Microsoft.Build.Traversal": "2.0.2" } } |