diff options
author | dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> | 2022-10-03 15:38:12 +0300 |
---|---|---|
committer | dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> | 2022-10-03 15:38:12 +0300 |
commit | 460206f8552ff7dd97264f9fa0f4f69cbdd6a9c0 (patch) | |
tree | f5e059356081e32dc10e0b7846ecf0046c687eec | |
parent | 6f1fd1ec1df5fa4bb88087ea0ccc03ce56427746 (diff) |
Update dependencies from https://github.com/dotnet/arcade build 20220923.4darc-objwriter/release/7.0-9037fbb2-2da7-4a07-b4f1-9cf077fedfdd
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Helix.Sdk
From Version 7.0.0-beta.22457.4 -> To Version 7.0.0-beta.22473.4
-rw-r--r-- | eng/Version.Details.xml | 12 | ||||
-rw-r--r-- | eng/Versions.props | 2 | ||||
-rw-r--r-- | eng/common/build.ps1 | 5 | ||||
-rw-r--r-- | global.json | 4 |
4 files changed, 14 insertions, 9 deletions
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c2a9e885c2b4..e0c798b59b12 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.22471.1"> + <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22473.4"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>09c27cd8c71292f2e26a44ac80d20e4532ed35bf</Sha> + <Sha>86caedcb8d09e5631a8139aab1e1cb90726668f5</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22471.1"> + <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22473.4"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>09c27cd8c71292f2e26a44ac80d20e4532ed35bf</Sha> + <Sha>86caedcb8d09e5631a8139aab1e1cb90726668f5</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22471.1"> + <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22473.4"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>09c27cd8c71292f2e26a44ac80d20e4532ed35bf</Sha> + <Sha>86caedcb8d09e5631a8139aab1e1cb90726668f5</Sha> </Dependency> </ToolsetDependencies> </Dependencies> diff --git a/eng/Versions.props b/eng/Versions.props index 900bf0d732b3..4778489f1f1a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -6,6 +6,6 @@ <PreReleaseVersionIteration>1</PreReleaseVersionIteration> </PropertyGroup> <PropertyGroup> - <MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22471.1</MicrosoftDotNetBuildTasksPackagingVersion> + <MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22473.4</MicrosoftDotNetBuildTasksPackagingVersion> </PropertyGroup> </Project> diff --git a/eng/common/build.ps1 b/eng/common/build.ps1 index 8943da242f6e..e0420a642755 100644 --- a/eng/common/build.ps1 +++ b/eng/common/build.ps1 @@ -26,6 +26,7 @@ Param( [string] $runtimeSourceFeed = '', [string] $runtimeSourceFeedKey = '', [switch] $excludePrereleaseVS, + [switch] $nativeToolsOnMachine, [switch] $help, [Parameter(ValueFromRemainingArguments=$true)][String[]]$properties ) @@ -66,6 +67,7 @@ function Print-Usage() { Write-Host " -prepareMachine Prepare machine for CI run, clean up processes after build" Write-Host " -warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')" Write-Host " -msbuildEngine <value> Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)." + Write-Host " -nativeToolsOnMachine Sets the native tools on machine environment variable (indicating that the script should use native tools on machine)" Write-Host " -excludePrereleaseVS Set to exclude build engines in prerelease versions of Visual Studio" Write-Host "" @@ -146,6 +148,9 @@ try { $nodeReuse = $false } + if ($nativeToolsOnMachine) { + $env:NativeToolsOnMachine = $true + } if ($restore) { InitializeNativeTools } diff --git a/global.json b/global.json index f95e43512490..0e0e45516b45 100644 --- a/global.json +++ b/global.json @@ -3,8 +3,8 @@ "dotnet": "7.0.100-rc.1.22431.12" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22471.1", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22471.1", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22473.4", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22473.4", "Microsoft.Build.Traversal": "2.0.34" } } |