diff --git a/NuGet.config b/NuGet.config
index fd12114faa5c..220bbc493b99 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -17,7 +17,7 @@
-
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 8c4db2215448..acab3aaf6a08 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,15 +3,15 @@
https://github.com/dotnet/templating
- 60c0235b29a158b4ea57b440bfa498ebed6641ff
+ ca95ce39a1d1c189a275bb5e3b8c78434d2cca48
-
+
https://github.com/dotnet/templating
- 60c0235b29a158b4ea57b440bfa498ebed6641ff
+ ca95ce39a1d1c189a275bb5e3b8c78434d2cca48
-
+
https://github.com/dotnet/templating
- 60c0235b29a158b4ea57b440bfa498ebed6641ff
+ ca95ce39a1d1c189a275bb5e3b8c78434d2cca48
diff --git a/eng/Versions.props b/eng/Versions.props
index 893d31eb95b4..8c4069c5a5a2 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -148,7 +148,7 @@
$(MicrosoftTemplateEngineAbstractionsPackageVersion)
$(MicrosoftTemplateEngineAbstractionsPackageVersion)
- 8.0.123-servicing.25566.2
+ 8.0.123-servicing.25602.3
$(MicrosoftTemplateEngineMocksPackageVersion)
$(MicrosoftTemplateEngineAbstractionsPackageVersion)
$(MicrosoftTemplateEngineMocksPackageVersion)
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index bb048ad125a8..6764bdedbf05 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -296,7 +296,7 @@ function InstallDotNet([string] $dotnetRoot,
if ($runtime -eq "aspnetcore") { $runtimePath = $runtimePath + "\Microsoft.AspNetCore.App" }
if ($runtime -eq "windowsdesktop") { $runtimePath = $runtimePath + "\Microsoft.WindowsDesktop.App" }
$runtimePath = $runtimePath + "\" + $version
-
+
$dotnetVersionLabel = "runtime toolset '$runtime/$architecture v$version'"
if (Test-Path $runtimePath) {
@@ -545,19 +545,25 @@ function LocateVisualStudio([object]$vsRequirements = $null){
})
}
- if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs }
+ if (!$vsRequirements) {
+ if (Get-Member -InputObject $GlobalJson.tools -Name 'vs' -ErrorAction SilentlyContinue) {
+ $vsRequirements = $GlobalJson.tools.vs
+ } else {
+ $vsRequirements = $null
+ }
+ }
$args = @('-latest', '-format', 'json', '-requires', 'Microsoft.Component.MSBuild', '-products', '*')
if (!$excludePrereleaseVS) {
$args += '-prerelease'
}
- if (Get-Member -InputObject $vsRequirements -Name 'version') {
+ if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'version' -ErrorAction SilentlyContinue)) {
$args += '-version'
$args += $vsRequirements.version
}
- if (Get-Member -InputObject $vsRequirements -Name 'components') {
+ if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'components' -ErrorAction SilentlyContinue)) {
foreach ($component in $vsRequirements.components) {
$args += '-requires'
$args += $component
@@ -954,4 +960,4 @@ function Enable-Nuget-EnhancedRetry() {
Write-PipelineSetVariable -Name 'NUGET_ENHANCED_NETWORK_RETRY_DELAY_MILLISECONDS' -Value '1000'
Write-PipelineSetVariable -Name 'NUGET_RETRY_HTTP_429' -Value 'true'
}
-}
+}
\ No newline at end of file