Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[main] Update dependencies from dotnet/arcade #46967

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
+51 −57
Open

[main] Update dependencies from dotnet/arcade #46967

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cc1798f
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Feb 20, 2025
26b509d
Delete src/SourceBuild/patches/arcade/0001-React-to-NuGet-package-pru…
ViktorHofer Feb 20, 2025
6ddf6cb
Pass SourceBuiltPdbArtifactsDir through (patch)
mmitche Feb 21, 2025
e15993d
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Feb 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -640,34 +640,34 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25113.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25120.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
<Sha>ecdb2f499cb5f5c99b58fba1a14fdf977c56e1ac</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25113.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25120.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
<Sha>ecdb2f499cb5f5c99b58fba1a14fdf977c56e1ac</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25113.2">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25120.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
<Sha>ecdb2f499cb5f5c99b58fba1a14fdf977c56e1ac</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.25113.2">
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.25120.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
<Sha>ecdb2f499cb5f5c99b58fba1a14fdf977c56e1ac</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25113.2">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25120.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
<Sha>ecdb2f499cb5f5c99b58fba1a14fdf977c56e1ac</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25113.2">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25120.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
<Sha>ecdb2f499cb5f5c99b58fba1a14fdf977c56e1ac</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25113.2">
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25120.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
<Sha>ecdb2f499cb5f5c99b58fba1a14fdf977c56e1ac</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-preview.2.25118.6">
Expand Down
8 changes: 4 additions & 4 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,10 +267,10 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.25113.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetSignToolVersion>10.0.0-beta.25113.2</MicrosoftDotNetSignToolVersion>
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.25113.2</MicrosoftDotNetXliffTasksVersion>
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25113.2</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.25120.6</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetSignToolVersion>10.0.0-beta.25120.6</MicrosoftDotNetSignToolVersion>
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.25120.6</MicrosoftDotNetXliffTasksVersion>
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25120.6</MicrosoftDotNetXUnitExtensionsVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sourcelink -->
Expand Down
9 changes: 4 additions & 5 deletions eng/common/core-templates/job/publish-build-assets.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,11 @@ jobs:
fetchDepth: 3
clean: true

- task: DownloadBuildArtifacts@0
displayName: Download artifact
- task: DownloadPipelineArtifact@2
displayName: Download Asset Manifests
inputs:
artifactName: AssetManifests
downloadPath: '$(Build.StagingDirectory)/Download'
checkDownloadedFiles: true
targetPath: '$(Build.StagingDirectory)/AssetManifests'
condition: ${{ parameters.condition }}
continueOnError: ${{ parameters.continueOnError }}

Expand All @@ -95,7 +94,7 @@ jobs:
scriptLocation: scriptPath
scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1
arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet
/p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests'
/p:ManifestsPath='$(Build.StagingDirectory)/AssetManifests'
/p:MaestroApiEndpoint=https://maestro.dot.net
/p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }}
/p:OfficialBuildId=$(Build.BuildNumber)
Expand Down
2 changes: 1 addition & 1 deletion eng/common/sdk-task.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ try {
$GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
}
if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.12.0" -MemberType NoteProperty
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.13.0" -MemberType NoteProperty
}
if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true
Expand Down
4 changes: 2 additions & 2 deletions eng/common/tools.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,8 +383,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =

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

if (!$vsRequirements) {
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {
Expand Down
6 changes: 3 additions & 3 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "10.0.100-alpha.1.25077.2",
"dotnet": "10.0.100-preview.2.25118.3",
"runtimes": {
"dotnet": [
"$(VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion)"
Expand All @@ -17,8 +17,8 @@
"cmake": "latest"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25113.2",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25113.2",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25120.6",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25120.6",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
}
Expand Down
28 changes: 0 additions & 28 deletions src/SourceBuild/patches/arcade/0001-React-to-NuGet-package-pruning-warnings.patch
View file
Open in desktop

This file was deleted.

23 changes: 23 additions & 0 deletions ...urceBuild/patches/runtime/0002-Pass-SourceBuiltPdbArtifactsDir-parameteres-to-runti.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "Matt Mitchell (.NET)" <mmitche@microsoft.com>
Date: Fri, 21 Feb 2025 08:44:15 -0800
Subject: [PATCH] Pass SourceBuiltPdbArtifactsDir parameteres to runtime build

Backport PR: https://github.com/dotnet/runtime/pull/112788

---
eng/DotNetBuild.props | 1 +
1 file changed, 1 insertion(+)

diff --git a/eng/DotNetBuild.props b/eng/DotNetBuild.props
index 346c7719ef6..87a013e43b1 100644
--- a/eng/DotNetBuild.props
+++ b/eng/DotNetBuild.props
@@ -92,6 +92,7 @@
<InnerBuildArgs Condition="'$(SourceBuiltShippingPackagesDir)' != ''">$(InnerBuildArgs) /p:SourceBuiltShippingPackagesDir=$(SourceBuiltShippingPackagesDir)</InnerBuildArgs>
<InnerBuildArgs Condition="'$(SourceBuiltNonShippingPackagesDir)' != ''">$(InnerBuildArgs) /p:SourceBuiltNonShippingPackagesDir=$(SourceBuiltNonShippingPackagesDir)</InnerBuildArgs>
<InnerBuildArgs Condition="'$(SourceBuiltAssetManifestsDir)' != ''">$(InnerBuildArgs) /p:SourceBuiltAssetManifestsDir=$(SourceBuiltAssetManifestsDir)</InnerBuildArgs>
+ <InnerBuildArgs Condition="'$(SourceBuiltPdbArtifactsDir)' != ''">$(InnerBuildArgs) /p:SourceBuiltPdbArtifactsDir=$(SourceBuiltPdbArtifactsDir)</InnerBuildArgs>
<InnerBuildArgs Condition="'$(SourceBuiltSymbolsDir)' != ''">$(InnerBuildArgs) /p:SourceBuiltSymbolsDir=$(SourceBuiltSymbolsDir)</InnerBuildArgs>
<InnerBuildArgs Condition="'$(GitHubRepositoryName)' != ''">$(InnerBuildArgs) /p:GitHubRepositoryName=$(GitHubRepositoryName)</InnerBuildArgs>

Loading