Skip to content

Commit 37c3b18

Browse files
DonnaChen888DonnaChen888
authored
[release/9.0.3xx] Update dependencies from dotnet/arcade (#51607)
2 parents 97b796b + af031dc commit 37c3b18

File tree

6 files changed

+35
-31
lines changed

6 files changed

+35
-31
lines changed

‎eng/Version.Details.xml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -555,34 +555,34 @@
555555
</Dependency>
556556
</ProductDependencies>
557557
<ToolsetDependencies>
558-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25515.2">
558+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25561.1">
559559
<Uri>https://github.com/dotnet/arcade</Uri>
560-
<Sha>6666973b629b24e259162dba03486c23af464bab</Sha>
560+
<Sha>bcc287603101fa751ff666f17b661c5e40fef60f</Sha>
561561
</Dependency>
562-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25515.2">
562+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25561.1">
563563
<Uri>https://github.com/dotnet/arcade</Uri>
564-
<Sha>6666973b629b24e259162dba03486c23af464bab</Sha>
564+
<Sha>bcc287603101fa751ff666f17b661c5e40fef60f</Sha>
565565
</Dependency>
566-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25515.2">
566+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25561.1">
567567
<Uri>https://github.com/dotnet/arcade</Uri>
568-
<Sha>6666973b629b24e259162dba03486c23af464bab</Sha>
568+
<Sha>bcc287603101fa751ff666f17b661c5e40fef60f</Sha>
569569
</Dependency>
570-
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.25515.2">
570+
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.25561.1">
571571
<Uri>https://github.com/dotnet/arcade</Uri>
572-
<Sha>6666973b629b24e259162dba03486c23af464bab</Sha>
572+
<Sha>bcc287603101fa751ff666f17b661c5e40fef60f</Sha>
573573
</Dependency>
574-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25515.2">
574+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25561.1">
575575
<Uri>https://github.com/dotnet/arcade</Uri>
576-
<Sha>6666973b629b24e259162dba03486c23af464bab</Sha>
576+
<Sha>bcc287603101fa751ff666f17b661c5e40fef60f</Sha>
577577
</Dependency>
578-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25515.2">
578+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25561.1">
579579
<Uri>https://github.com/dotnet/arcade</Uri>
580-
<Sha>6666973b629b24e259162dba03486c23af464bab</Sha>
580+
<Sha>bcc287603101fa751ff666f17b661c5e40fef60f</Sha>
581581
</Dependency>
582582
<!-- Intermediate is necessary for source build. -->
583-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25515.2">
583+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25561.1">
584584
<Uri>https://github.com/dotnet/arcade</Uri>
585-
<Sha>6666973b629b24e259162dba03486c23af464bab</Sha>
585+
<Sha>bcc287603101fa751ff666f17b661c5e40fef60f</Sha>
586586
<SourceBuild RepoName="arcade" ManagedOnly="true" />
587587
</Dependency>
588588
<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
@@ -272,10 +272,10 @@
272272
</PropertyGroup>
273273
<PropertyGroup>
274274
<!-- Dependencies from https://github.com/dotnet/arcade -->
275-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.25515.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
276-
<MicrosoftDotNetSignToolVersion>9.0.0-beta.25515.2</MicrosoftDotNetSignToolVersion>
277-
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.25515.2</MicrosoftDotNetXliffTasksVersion>
278-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25515.2</MicrosoftDotNetXUnitExtensionsVersion>
275+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.25561.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
276+
<MicrosoftDotNetSignToolVersion>9.0.0-beta.25561.1</MicrosoftDotNetSignToolVersion>
277+
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.25561.1</MicrosoftDotNetXliffTasksVersion>
278+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25561.1</MicrosoftDotNetXUnitExtensionsVersion>
279279
</PropertyGroup>
280280
<PropertyGroup>
281281
<!-- Dependencies from https://github.com/dotnet/sourcelink -->

‎eng/common/core-templates/job/publish-build-assets.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,11 @@ jobs:
145145
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
146146
is1ESPipeline: ${{ parameters.is1ESPipeline }}
147147

148+
# Darc is targeting 8.0, so make sure it's installed
149+
- task: UseDotNet@2
150+
inputs:
151+
version: 8.0.x
152+
148153
- task: AzureCLI@2
149154
displayName: Publish Using Darc
150155
inputs:

‎eng/common/core-templates/post-build/post-build.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,11 @@ stages:
305305

306306
- task: NuGetAuthenticate@1
307307

308+
# Darc is targeting 8.0, so make sure it's installed
309+
- task: UseDotNet@2
310+
inputs:
311+
version: 8.0.x
312+
308313
- task: AzureCLI@2
309314
displayName: Publish Using Darc
310315
inputs:

‎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.25515.2",
21-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25515.2",
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)