diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 6f672808..d92424c1 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,25 +3,25 @@
-
+
https://github.com/dotnet/arcade
- a264eb13fea14125f3ef8d4056586cd66fa55309
+ 66cb5f1f50059cbafe25d1b75a1adbbced840d85
-
+
https://github.com/dotnet/arcade
- a264eb13fea14125f3ef8d4056586cd66fa55309
+ 66cb5f1f50059cbafe25d1b75a1adbbced840d85
-
+
https://github.com/dotnet/arcade
- a264eb13fea14125f3ef8d4056586cd66fa55309
+ 66cb5f1f50059cbafe25d1b75a1adbbced840d85
-
+
https://github.com/dotnet/arcade
- a264eb13fea14125f3ef8d4056586cd66fa55309
+ 66cb5f1f50059cbafe25d1b75a1adbbced840d85
-
+
https://github.com/dotnet/arcade
- a264eb13fea14125f3ef8d4056586cd66fa55309
+ 66cb5f1f50059cbafe25d1b75a1adbbced840d85
https://github.com/dotnet/arcade-services
diff --git a/eng/common/init-tools-native.ps1 b/eng/common/init-tools-native.ps1
index 24a5e65d..8d48ec56 100644
--- a/eng/common/init-tools-native.ps1
+++ b/eng/common/init-tools-native.ps1
@@ -87,6 +87,7 @@ try {
$NativeTools.PSObject.Properties | ForEach-Object {
$ToolName = $_.Name
$ToolVersion = $_.Value
+ $InstalledTools = @{}
if ((Get-Command "$ToolName" -ErrorAction SilentlyContinue) -eq $null) {
if ($ToolVersion -eq "latest") {
@@ -111,9 +112,10 @@ try {
$ToolPath = Convert-Path -Path $BinPath
Write-Host "Adding $ToolName to the path ($ToolPath)..."
Write-Host "##vso[task.prependpath]$ToolPath"
+ $InstalledTools += @{ $ToolName = $ToolDirectory.FullName }
}
}
- exit 0
+ return $InstalledTools
} else {
$NativeTools.PSObject.Properties | ForEach-Object {
$ToolName = $_.Name
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index 395b43ee..9638c63c 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -635,7 +635,7 @@ function InitializeNativeTools() {
InstallDirectory = "$ToolsDir"
}
}
- if (Test-Path variable:NativeToolsOnMachine) {
+ if ($env:NativeToolsOnMachine) {
Write-Host "Variable NativeToolsOnMachine detected, enabling native tool path promotion..."
$nativeArgs += @{ PathPromotion = $true }
}
diff --git a/global.json b/global.json
index f7af2ee6..8bf97c79 100644
--- a/global.json
+++ b/global.json
@@ -3,7 +3,7 @@
"allowPrerelease": true
},
"tools": {
- "dotnet": "7.0.100-preview.2.22153.17",
+ "dotnet": "7.0.100-preview.5.22307.18",
"runtimes": {
"dotnet": [
"6.0.0"
@@ -14,6 +14,6 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22327.2"
+ "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22354.1"
}
}