diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 82e45f4ed5f34..8bba9abb0dfc4 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,18 +13,18 @@
-
+
https://github.com/dotnet/arcade
- 5145e86df0c491e082b589aa31d69eea300adc02
+ 7f522f2e42fd8c2064afb45eac34a1773ce6a1cc
https://github.com/dotnet/roslyn
5d10d428050c0d6afef30a072c4ae68776621877
-
+
https://github.com/dotnet/arcade
- 5145e86df0c491e082b589aa31d69eea300adc02
+ 7f522f2e42fd8c2064afb45eac34a1773ce6a1cc
diff --git a/eng/common/init-tools-native.ps1 b/eng/common/init-tools-native.ps1
index 413adea4365b1..24a5e65de1b3e 100644
--- a/eng/common/init-tools-native.ps1
+++ b/eng/common/init-tools-native.ps1
@@ -93,7 +93,7 @@ try {
$ToolVersion = ""
}
$ArcadeToolsDirectory = "C:\arcade-tools"
- if (Test-Path $ArcadeToolsDirectory -eq $False) {
+ if (-not (Test-Path $ArcadeToolsDirectory)) {
Write-Error "Arcade tools directory '$ArcadeToolsDirectory' was not found; artifacts were not properly installed."
exit 1
}
@@ -103,13 +103,14 @@ try {
exit 1
}
$BinPathFile = "$($ToolDirectory.FullName)\binpath.txt"
- if (Test-Path -Path "$BinPathFile" -eq $False) {
+ if (-not (Test-Path -Path "$BinPathFile")) {
Write-Error "Unable to find binpath.txt in '$($ToolDirectory.FullName)' ($ToolName $ToolVersion); artifact is either installed incorrectly or is not a bootstrappable tool."
exit 1
}
$BinPath = Get-Content "$BinPathFile"
- Write-Host "Adding $ToolName to the path ($(Convert-Path -Path $BinPath))..."
- Write-Host "##vso[task.prependpath]$(Convert-Path -Path $BinPath)"
+ $ToolPath = Convert-Path -Path $BinPath
+ Write-Host "Adding $ToolName to the path ($ToolPath)..."
+ Write-Host "##vso[task.prependpath]$ToolPath"
}
}
exit 0
@@ -188,7 +189,7 @@ try {
Write-Host "##vso[task.prependpath]$(Convert-Path -Path $InstallBin)"
return $InstallBin
}
- else {
+ elseif (-not ($PathPromotion)) {
Write-PipelineTelemetryError -Category 'NativeToolsBootstrap' -Message 'Native tools install directory does not exist, installation failed'
exit 1
}
diff --git a/eng/common/internal/Tools.csproj b/eng/common/internal/Tools.csproj
index beb9c4648ea19..7f5ce6d608133 100644
--- a/eng/common/internal/Tools.csproj
+++ b/eng/common/internal/Tools.csproj
@@ -8,6 +8,9 @@
+
+
+
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index 797f05292a851..423bd962e9661 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -635,6 +635,10 @@ function InitializeNativeTools() {
InstallDirectory = "$ToolsDir"
}
}
+ if (Test-Path variable:NativeToolsOnMachine) {
+ Write-Host "Variable NativeToolsOnMachine detected, enabling native tool path promotion..."
+ $nativeArgs += @{ PathPromotion = $true }
+ }
& "$PSScriptRoot/init-tools-native.ps1" @nativeArgs
}
}
diff --git a/global.json b/global.json
index 90efbb504fff5..8ac63ce7cd60d 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
"xcopy-msbuild": "16.10.0-preview2"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22225.6",
- "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22225.6"
+ "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22306.1",
+ "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22306.1"
}
}