From c7e03f3b206516e4e649200b5927884fce019777 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 24 May 2022 12:42:48 +0000
Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade
build 20220523.1 (#1392)
[main] Update dependencies from dotnet/arcade
---
eng/Version.Details.xml | 20 ++++++++++----------
eng/common/tools.ps1 | 4 ++++
global.json | 2 +-
3 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index bb472a0b..499401e2 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,25 +3,25 @@
-
+
https://github.com/dotnet/arcade
- 0403b0d07aff1b103256cfbe082c97a5c8846d20
+ ad55f9b957b9539613ecff82649d17650e4624d2
-
+
https://github.com/dotnet/arcade
- 0403b0d07aff1b103256cfbe082c97a5c8846d20
+ ad55f9b957b9539613ecff82649d17650e4624d2
-
+
https://github.com/dotnet/arcade
- 0403b0d07aff1b103256cfbe082c97a5c8846d20
+ ad55f9b957b9539613ecff82649d17650e4624d2
-
+
https://github.com/dotnet/arcade
- 0403b0d07aff1b103256cfbe082c97a5c8846d20
+ ad55f9b957b9539613ecff82649d17650e4624d2
-
+
https://github.com/dotnet/arcade
- 0403b0d07aff1b103256cfbe082c97a5c8846d20
+ ad55f9b957b9539613ecff82649d17650e4624d2
https://github.com/dotnet/arcade-services
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index 797f0529..423bd962 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 a9aa900b..dc07e769 100644
--- a/global.json
+++ b/global.json
@@ -14,6 +14,6 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22269.3"
+ "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22273.1"
}
}