Skip to content

Commit eccd14e

Browse files
[main] Update dependencies from dotnet/arcade (#13955)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 3a3b812 commit eccd14e

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
</Dependency>
99
</ProductDependencies>
1010
<ToolsetDependencies>
11-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22470.3">
11+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22471.2">
1212
<Uri>https://github.com/dotnet/arcade</Uri>
13-
<Sha>025103bcaefad81506465eeb7bb09b107b20f32d</Sha>
13+
<Sha>d179a8bfc4f295329bbbed456d088a0dfbc61a56</Sha>
1414
<SourceBuild RepoName="arcade" ManagedOnly="true" />
1515
</Dependency>
16-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.22470.3">
16+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.22471.2">
1717
<Uri>https://github.com/dotnet/arcade</Uri>
18-
<Sha>025103bcaefad81506465eeb7bb09b107b20f32d</Sha>
18+
<Sha>d179a8bfc4f295329bbbed456d088a0dfbc61a56</Sha>
1919
</Dependency>
2020
</ToolsetDependencies>
2121
</Dependencies>

eng/common/build.ps1

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ Param(
2626
[string] $runtimeSourceFeed = '',
2727
[string] $runtimeSourceFeedKey = '',
2828
[switch] $excludePrereleaseVS,
29+
[switch] $nativeToolsOnMachine,
2930
[switch] $help,
3031
[Parameter(ValueFromRemainingArguments=$true)][String[]]$properties
3132
)
@@ -67,6 +68,7 @@ function Print-Usage() {
6768
Write-Host " -warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
6869
Write-Host " -msbuildEngine <value> Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
6970
Write-Host " -excludePrereleaseVS Set to exclude build engines in prerelease versions of Visual Studio"
71+
Write-Host " -nativeToolsOnMachine Sets the native tools on machine environment variable (indicating that the script should use native tools on machine)"
7072
Write-Host ""
7173

7274
Write-Host "Command line arguments not listed above are passed thru to msbuild."
@@ -146,6 +148,9 @@ try {
146148
$nodeReuse = $false
147149
}
148150

151+
if ($nativeToolsOnMachine) {
152+
$env:NativeToolsOnMachine = $true
153+
}
149154
if ($restore) {
150155
InitializeNativeTools
151156
}

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"perl": "5.32.1.1"
1919
},
2020
"msbuild-sdks": {
21-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22470.3",
22-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22470.3"
21+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22471.2",
22+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22471.2"
2323
}
2424
}

0 commit comments

Comments
 (0)