Skip to content

Commit b508cf9

Browse files
authored
[release/8.0.1xx] Update dependencies from dotnet/templating (#51980)
2 parents 6485e03 + 8ce75a2 commit b508cf9

File tree

4 files changed

+18
-12
lines changed

4 files changed

+18
-12
lines changed

NuGet.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<!-- Begin: Package sources from dotnet-runtime -->
1818
<!-- End: Package sources from dotnet-runtime -->
1919
<!-- Begin: Package sources from dotnet-templating -->
20-
<add key="darc-pub-dotnet-templating-60c0235" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-60c0235b/nuget/v3/index.json" />
20+
<add key="darc-pub-dotnet-templating-ca95ce3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-ca95ce39/nuget/v3/index.json" />
2121
<!-- End: Package sources from dotnet-templating -->
2222
<!-- Begin: Package sources from dotnet-windowsdesktop -->
2323
<!-- End: Package sources from dotnet-windowsdesktop -->

eng/Version.Details.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
<ProductDependencies>
44
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.123">
55
<Uri>https://github.com/dotnet/templating</Uri>
6-
<Sha>60c0235b29a158b4ea57b440bfa498ebed6641ff</Sha>
6+
<Sha>ca95ce39a1d1c189a275bb5e3b8c78434d2cca48</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.123-servicing.25566.2">
8+
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.123-servicing.25602.3">
99
<Uri>https://github.com/dotnet/templating</Uri>
10-
<Sha>60c0235b29a158b4ea57b440bfa498ebed6641ff</Sha>
10+
<Sha>ca95ce39a1d1c189a275bb5e3b8c78434d2cca48</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.123-servicing.25566.2">
12+
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.123-servicing.25602.3">
1313
<Uri>https://github.com/dotnet/templating</Uri>
14-
<Sha>60c0235b29a158b4ea57b440bfa498ebed6641ff</Sha>
14+
<Sha>ca95ce39a1d1c189a275bb5e3b8c78434d2cca48</Sha>
1515
<SourceBuild RepoName="templating" ManagedOnly="true" />
1616
</Dependency>
1717
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.22">

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@
148148
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
149149
<MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
150150
<!-- test dependencies -->
151-
<MicrosoftTemplateEngineMocksPackageVersion>8.0.123-servicing.25566.2</MicrosoftTemplateEngineMocksPackageVersion>
151+
<MicrosoftTemplateEngineMocksPackageVersion>8.0.123-servicing.25602.3</MicrosoftTemplateEngineMocksPackageVersion>
152152
<MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
153153
<MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
154154
<MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>

eng/common/tools.ps1

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ function InstallDotNet([string] $dotnetRoot,
296296
if ($runtime -eq "aspnetcore") { $runtimePath = $runtimePath + "\Microsoft.AspNetCore.App" }
297297
if ($runtime -eq "windowsdesktop") { $runtimePath = $runtimePath + "\Microsoft.WindowsDesktop.App" }
298298
$runtimePath = $runtimePath + "\" + $version
299-
299+
300300
$dotnetVersionLabel = "runtime toolset '$runtime/$architecture v$version'"
301301

302302
if (Test-Path $runtimePath) {
@@ -545,19 +545,25 @@ function LocateVisualStudio([object]$vsRequirements = $null){
545545
})
546546
}
547547

548-
if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs }
548+
if (!$vsRequirements) {
549+
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs' -ErrorAction SilentlyContinue) {
550+
$vsRequirements = $GlobalJson.tools.vs
551+
} else {
552+
$vsRequirements = $null
553+
}
554+
}
549555
$args = @('-latest', '-format', 'json', '-requires', 'Microsoft.Component.MSBuild', '-products', '*')
550556

551557
if (!$excludePrereleaseVS) {
552558
$args += '-prerelease'
553559
}
554560

555-
if (Get-Member -InputObject $vsRequirements -Name 'version') {
561+
if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'version' -ErrorAction SilentlyContinue)) {
556562
$args += '-version'
557563
$args += $vsRequirements.version
558564
}
559565

560-
if (Get-Member -InputObject $vsRequirements -Name 'components') {
566+
if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'components' -ErrorAction SilentlyContinue)) {
561567
foreach ($component in $vsRequirements.components) {
562568
$args += '-requires'
563569
$args += $component
@@ -954,4 +960,4 @@ function Enable-Nuget-EnhancedRetry() {
954960
Write-PipelineSetVariable -Name 'NUGET_ENHANCED_NETWORK_RETRY_DELAY_MILLISECONDS' -Value '1000'
955961
Write-PipelineSetVariable -Name 'NUGET_RETRY_HTTP_429' -Value 'true'
956962
}
957-
}
963+
}

0 commit comments

Comments
 (0)