Skip to content

Commit f957924

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[release/9.0.1xx] Update dependencies from dotnet/arcade (#51671)
[release/9.0.1xx] Update dependencies from dotnet/arcade
1 parent 310522d commit f957924

File tree

4 files changed

+25
-31
lines changed

4 files changed

+25
-31
lines changed

‎eng/Version.Details.xml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -589,34 +589,34 @@
589589
</Dependency>
590590
</ProductDependencies>
591591
<ToolsetDependencies>
592-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25555.4">
592+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25561.1">
593593
<Uri>https://github.com/dotnet/arcade</Uri>
594-
<Sha>9eaf7b289d5003a94ee23658f057a6c06ddcd570</Sha>
594+
<Sha>bcc287603101fa751ff666f17b661c5e40fef60f</Sha>
595595
</Dependency>
596-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25555.4">
596+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25561.1">
597597
<Uri>https://github.com/dotnet/arcade</Uri>
598-
<Sha>9eaf7b289d5003a94ee23658f057a6c06ddcd570</Sha>
598+
<Sha>bcc287603101fa751ff666f17b661c5e40fef60f</Sha>
599599
</Dependency>
600-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25555.4">
600+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25561.1">
601601
<Uri>https://github.com/dotnet/arcade</Uri>
602-
<Sha>9eaf7b289d5003a94ee23658f057a6c06ddcd570</Sha>
602+
<Sha>bcc287603101fa751ff666f17b661c5e40fef60f</Sha>
603603
</Dependency>
604-
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.25555.4">
604+
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.25561.1">
605605
<Uri>https://github.com/dotnet/arcade</Uri>
606-
<Sha>9eaf7b289d5003a94ee23658f057a6c06ddcd570</Sha>
606+
<Sha>bcc287603101fa751ff666f17b661c5e40fef60f</Sha>
607607
</Dependency>
608-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25555.4">
608+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25561.1">
609609
<Uri>https://github.com/dotnet/arcade</Uri>
610-
<Sha>9eaf7b289d5003a94ee23658f057a6c06ddcd570</Sha>
610+
<Sha>bcc287603101fa751ff666f17b661c5e40fef60f</Sha>
611611
</Dependency>
612-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25555.4">
612+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25561.1">
613613
<Uri>https://github.com/dotnet/arcade</Uri>
614-
<Sha>9eaf7b289d5003a94ee23658f057a6c06ddcd570</Sha>
614+
<Sha>bcc287603101fa751ff666f17b661c5e40fef60f</Sha>
615615
</Dependency>
616616
<!-- Intermediate is necessary for source build. -->
617-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25555.4">
617+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25561.1">
618618
<Uri>https://github.com/dotnet/arcade</Uri>
619-
<Sha>9eaf7b289d5003a94ee23658f057a6c06ddcd570</Sha>
619+
<Sha>bcc287603101fa751ff666f17b661c5e40fef60f</Sha>
620620
<SourceBuild RepoName="arcade" ManagedOnly="true" />
621621
</Dependency>
622622
<Dependency Name="System.Reflection.MetadataLoadContext" Version="9.0.10">

‎eng/Versions.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -270,10 +270,10 @@
270270
</PropertyGroup>
271271
<PropertyGroup>
272272
<!-- Dependencies from https://github.com/dotnet/arcade -->
273-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.25555.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
274-
<MicrosoftDotNetSignToolVersion>9.0.0-beta.25555.4</MicrosoftDotNetSignToolVersion>
275-
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.25555.4</MicrosoftDotNetXliffTasksVersion>
276-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25555.4</MicrosoftDotNetXUnitExtensionsVersion>
273+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.25561.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
274+
<MicrosoftDotNetSignToolVersion>9.0.0-beta.25561.1</MicrosoftDotNetSignToolVersion>
275+
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.25561.1</MicrosoftDotNetXliffTasksVersion>
276+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25561.1</MicrosoftDotNetXUnitExtensionsVersion>
277277
</PropertyGroup>
278278
<PropertyGroup>
279279
<!-- Dependencies from https://github.com/dotnet/sourcelink -->

‎eng/common/tools.ps1‎

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

301301
if (Test-Path $runtimePath) {
@@ -547,25 +547,19 @@ function LocateVisualStudio([object]$vsRequirements = $null){
547547
})
548548
}
549549

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

559553
if (!$excludePrereleaseVS) {
560554
$args += '-prerelease'
561555
}
562556

563-
if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'version' -ErrorAction SilentlyContinue)) {
557+
if (Get-Member -InputObject $vsRequirements -Name 'version') {
564558
$args += '-version'
565559
$args += $vsRequirements.version
566560
}
567561

568-
if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'components' -ErrorAction SilentlyContinue)) {
562+
if (Get-Member -InputObject $vsRequirements -Name 'components') {
569563
foreach ($component in $vsRequirements.components) {
570564
$args += '-requires'
571565
$args += $component
@@ -616,7 +610,7 @@ function InitializeBuildTool() {
616610
} else {
617611
$initializeBuildToolFramework=$env:_OverrideArcadeInitializeBuildToolFramework
618612
}
619-
613+
620614
$buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = $initializeBuildToolFramework }
621615
} elseif ($msbuildEngine -eq "vs") {
622616
try {

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"cmake": "latest"
1818
},
1919
"msbuild-sdks": {
20-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25555.4",
21-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25555.4",
20+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25561.1",
21+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25561.1",
2222
"Microsoft.Build.NoTargets": "3.7.0",
2323
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
2424
}

0 commit comments

Comments
 (0)