Skip to content

Commit 981b8c9

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20250220.6 (#649)
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Helix.Sdk From Version 10.0.0-beta.25113.2 -> To Version 10.0.0-beta.25120.6 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent dfd5ec1 commit 981b8c9

File tree

6 files changed

+19
-20
lines changed

6 files changed

+19
-20
lines changed

eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,23 @@
88
</Dependency>
99
</ProductDependencies>
1010
<ToolsetDependencies>
11-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25113.2">
11+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25120.6">
1212
<Uri>https://github.com/dotnet/arcade</Uri>
13-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
13+
<Sha>ecdb2f499cb5f5c99b58fba1a14fdf977c56e1ac</Sha>
1414
</Dependency>
1515
<!-- Intermediate is necessary for source build. -->
16-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25113.2">
16+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25120.6">
1717
<Uri>https://github.com/dotnet/arcade</Uri>
18-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
18+
<Sha>ecdb2f499cb5f5c99b58fba1a14fdf977c56e1ac</Sha>
1919
<SourceBuild RepoName="arcade" ManagedOnly="true" />
2020
</Dependency>
21-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25113.2">
21+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25120.6">
2222
<Uri>https://github.com/dotnet/arcade</Uri>
23-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
23+
<Sha>ecdb2f499cb5f5c99b58fba1a14fdf977c56e1ac</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.25113.2">
25+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.25120.6">
2626
<Uri>https://github.com/dotnet/arcade</Uri>
27-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
27+
<Sha>ecdb2f499cb5f5c99b58fba1a14fdf977c56e1ac</Sha>
2828
</Dependency>
2929
</ToolsetDependencies>
3030
</Dependencies>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
77
</PropertyGroup>
88
<PropertyGroup>
9-
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.25113.2</MicrosoftDotNetBuildTasksPackagingVersion>
9+
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.25120.6</MicrosoftDotNetBuildTasksPackagingVersion>
1010
</PropertyGroup>
1111
</Project>

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,11 @@ jobs:
7676
fetchDepth: 3
7777
clean: true
7878

79-
- task: DownloadBuildArtifacts@0
80-
displayName: Download artifact
79+
- task: DownloadPipelineArtifact@2
80+
displayName: Download Asset Manifests
8181
inputs:
8282
artifactName: AssetManifests
83-
downloadPath: '$(Build.StagingDirectory)/Download'
84-
checkDownloadedFiles: true
83+
targetPath: '$(Build.StagingDirectory)/AssetManifests'
8584
condition: ${{ parameters.condition }}
8685
continueOnError: ${{ parameters.continueOnError }}
8786

@@ -95,7 +94,7 @@ jobs:
9594
scriptLocation: scriptPath
9695
scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1
9796
arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet
98-
/p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests'
97+
/p:ManifestsPath='$(Build.StagingDirectory)/AssetManifests'
9998
/p:MaestroApiEndpoint=https://maestro.dot.net
10099
/p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }}
101100
/p:OfficialBuildId=$(Build.BuildNumber)

eng/common/sdk-task.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ try {
6464
$GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
6565
}
6666
if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
67-
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.12.0" -MemberType NoteProperty
67+
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.13.0" -MemberType NoteProperty
6868
}
6969
if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
7070
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true

eng/common/tools.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -383,8 +383,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
383383

384384
# If the version of msbuild is going to be xcopied,
385385
# use this version. Version matches a package here:
386-
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.12.0
387-
$defaultXCopyMSBuildVersion = '17.12.0'
386+
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.13.0
387+
$defaultXCopyMSBuildVersion = '17.13.0'
388388

389389
if (!$vsRequirements) {
390390
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {

global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"tools": {
3-
"dotnet": "10.0.100-alpha.1.25077.2"
3+
"dotnet": "10.0.100-preview.2.25118.3"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25113.2",
7-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25113.2",
6+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25120.6",
7+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25120.6",
88
"Microsoft.Build.Traversal": "3.4.0"
99
}
1010
}

0 commit comments

Comments
 (0)