Skip to content

Commit 425a5b7

Browse files
dotnet-maestro[bot]ViktorHofer
dotnet-maestro[bot]
and
ViktorHofer
authored
[main] Update dependencies from dotnet/arcade, dotnet/sdk, dotnet/source-build-externals (#1171)
* Update dependencies from https://github.com/dotnet/arcade build 20250220.6 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.25113.2 -> To Version 10.0.0-beta.25120.6 * Update dependencies from https://github.com/dotnet/source-build-externals build 20250218.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 10.0.611001 -> To Version 10.0.611801 * Update dependencies from https://github.com/dotnet/sdk build 20250222.1 Microsoft.DotNet.GenAPI.Task From Version 10.0.100-preview.2.25114.7 -> To Version 10.0.100-preview.3.25122.1 * React to NuGet package pruning feature --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Viktor Hofer <[email protected]>
1 parent 75328d0 commit 425a5b7

File tree

8 files changed

+18
-24
lines changed

8 files changed

+18
-24
lines changed

‎eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<Dependencies>
33
<ToolsetDependencies>
44
<!-- Intermediate is necessary for source build. -->
5-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="10.0.611001">
5+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="10.0.611801">
66
<Uri>https://github.com/dotnet/source-build-externals</Uri>
7-
<Sha>50ad761f15d81bff4b0fbf35f5d374bb59d8bd28</Sha>
7+
<Sha>444d6d658db0ce670148c09f259efc3d405f7b01</Sha>
88
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
99
</Dependency>
1010
<!-- Intermediate is necessary for source build. -->
@@ -14,18 +14,18 @@
1414
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
1515
</Dependency>
1616
<!-- Intermediate is necessary for source build. -->
17-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25113.2">
17+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25120.6">
1818
<Uri>https://github.com/dotnet/arcade</Uri>
19-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
19+
<Sha>ecdb2f499cb5f5c99b58fba1a14fdf977c56e1ac</Sha>
2020
<SourceBuild RepoName="arcade" ManagedOnly="true" />
2121
</Dependency>
22-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25113.2">
22+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25120.6">
2323
<Uri>https://github.com/dotnet/arcade</Uri>
24-
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
24+
<Sha>ecdb2f499cb5f5c99b58fba1a14fdf977c56e1ac</Sha>
2525
</Dependency>
26-
<Dependency Name="Microsoft.DotNet.GenAPI.Task" Version="10.0.100-preview.2.25114.7">
26+
<Dependency Name="Microsoft.DotNet.GenAPI.Task" Version="10.0.100-preview.3.25122.1">
2727
<Uri>https://github.com/dotnet/sdk</Uri>
28-
<Sha>2f1799bcacae4e3b7915c4c06165aec55601e3ef</Sha>
28+
<Sha>856d3483ba4d2dab84fcf8e7db66fa8555c4c0ed</Sha>
2929
</Dependency>
3030
<Dependency Name="Microsoft.NETCore.ILAsm" Version="5.0.0-preview.4.20202.18">
3131
<Uri>https://github.com/dotnet/runtime</Uri>

‎eng/Versions.props

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@
1515
<!-- Runtime dependencies -->
1616
<MicrosoftNETCoreILAsmVersion>6.0.0-preview.6.21352.12</MicrosoftNETCoreILAsmVersion>
1717
<MicrosoftNETCoreILDAsmVersion>6.0.0-preview.6.21352.12</MicrosoftNETCoreILDAsmVersion>
18-
<SystemFormatsAsn1Version>6.0.1</SystemFormatsAsn1Version>
1918
<!-- SDK dependencies -->
20-
<MicrosoftDotNetGenAPITaskPackageVersion>10.0.100-preview.2.25114.7</MicrosoftDotNetGenAPITaskPackageVersion>
19+
<MicrosoftDotNetGenAPITaskPackageVersion>10.0.100-preview.3.25122.1</MicrosoftDotNetGenAPITaskPackageVersion>
2120
<!-- xUnit dependencies -->
2221
<XunitSkippableFactVersion>1.4.13</XunitSkippableFactVersion>
2322
</PropertyGroup>

‎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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
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",
6+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25120.6",
77
"Microsoft.Build.NoTargets": "3.7.0"
88
}
99
}

‎src/packageSourceGenerator/PackageSourceGeneratorTask/PackageSourceGeneratorTask.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
<ItemGroup>
1010
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCoreVersion)" ExcludeAssets="runtime" PrivateAssets="all" />
1111
<PackageReference Include="NuGet.Packaging" Version="$(NuGetPackagingVersion)" ExcludeAssets="runtime" PrivateAssets="all" />
12-
<!-- Transitive dependency of Nuget.Packaging. Needed to fix CVE for 6.0.0. -->
13-
<PackageReference Include="System.Formats.Asn1" Version="$(SystemFormatsAsn1Version)" />
1412
</ItemGroup>
1513

1614
</Project>

‎tests/SbrpTests/Sbrp.Tests.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
<ItemGroup>
99
<PackageReference Include="NuGet.Packaging" Version="$(NuGetPackagingVersion)" />
1010
<PackageReference Include="Xunit.SkippableFact" Version="$(XunitSkippableFactVersion)" />
11-
<!-- Transitive dependency of Nuget.Packaging. Needed to fix CVE for 6.0.0. -->
12-
<PackageReference Include="System.Formats.Asn1" Version="$(SystemFormatsAsn1Version)" />
1311
</ItemGroup>
1412

1513
<ItemGroup>

0 commit comments

Comments
 (0)