Skip to content

Commit 1f3e50c

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20250220.6 (#35672)
[main] Update dependencies from dotnet/arcade
1 parent c54f51d commit 1f3e50c

File tree

6 files changed

+18
-19
lines changed

6 files changed

+18
-19
lines changed

Diff for: eng/Version.Details.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -67,17 +67,17 @@
6767
</Dependency>
6868
</ProductDependencies>
6969
<ToolsetDependencies>
70-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25113.2">
70+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25120.6">
7171
<Uri>https://github.com/dotnet/arcade</Uri>
72-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
72+
<Sha>ecdb2f499cb5f5c99b58fba1a14fdf977c56e1ac</Sha>
7373
</Dependency>
74-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25113.2">
74+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25120.6">
7575
<Uri>https://github.com/dotnet/arcade</Uri>
76-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
76+
<Sha>ecdb2f499cb5f5c99b58fba1a14fdf977c56e1ac</Sha>
7777
</Dependency>
78-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25113.2">
78+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25120.6">
7979
<Uri>https://github.com/dotnet/arcade</Uri>
80-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
80+
<Sha>ecdb2f499cb5f5c99b58fba1a14fdf977c56e1ac</Sha>
8181
</Dependency>
8282
</ToolsetDependencies>
8383
</Dependencies>

Diff for: eng/Versions.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<SystemRuntimeCachingVersion>10.0.0-preview.2.25114.1</SystemRuntimeCachingVersion>
3434
</PropertyGroup>
3535
<PropertyGroup Label="Dependencies from dotnet/arcade">
36-
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25113.2</MicrosoftDotNetBuildTasksTemplatingVersion>
36+
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25120.6</MicrosoftDotNetBuildTasksTemplatingVersion>
3737
</PropertyGroup>
3838
<PropertyGroup Label="Other dependencies">
3939
<MicrosoftBuildFrameworkVersion>17.8.3</MicrosoftBuildFrameworkVersion>

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

+4-5
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)

Diff for: eng/common/sdk-task.ps1

+1-1
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

Diff for: eng/common/tools.ps1

+2-2
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') {

Diff for: global.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
22
"sdk": {
3-
"version": "10.0.100-preview.2.25081.1",
3+
"version": "10.0.100-preview.2.25118.3",
44
"allowPrerelease": true,
55
"rollForward": "latestMajor"
66
},
77
"tools": {
8-
"dotnet": "10.0.100-preview.2.25081.1",
8+
"dotnet": "10.0.100-preview.2.25118.3",
99
"runtimes": {
1010
"dotnet": [
1111
"$(MicrosoftNETCoreAppRuntimewinx64Version)"
1212
]
1313
}
1414
},
1515
"msbuild-sdks": {
16-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25113.2",
17-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25113.2"
16+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25120.6",
17+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25120.6"
1818
}
1919
}

0 commit comments

Comments
 (0)