Skip to content

[main] Update dependencies from dotnet/arcade #45353

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

Jump to bottom
Closed
wants to merge 17 commits into from
Closed

[main] Update dependencies from dotnet/arcade #45353

wants to merge 17 commits into from

Conversation

@dotnet-maestro
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Dec 6, 2024 •
edited
Loading

This pull request updates the following dependencies

From https://github.com/dotnet/arcade

  • Subscription: 3d9043af-0e17-4eb5-f3e3-08d8e97c775d
  • Build: 20241217.2
  • Date Produced: December 17, 2024 2:16:03 PM UTC
  • Commit: 4f2968fce08735a7e22fca6bd4c99d003221d716
  • Branch: refs/heads/main

@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20241…
91a9571 
…205.1

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions
 From Version 10.0.0-beta.24604.4 -> To Version 10.0.0-beta.24605.1
@ghost ghost added Area-Infrastructure untriaged Request triage from a team member labels Dec 6, 2024
This was referenced Dec 6, 2024
Open
Open
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 2024120…
043eb0b 
….6

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions
 From Version 10.0.0-beta.24604.4 -> To Version 10.0.0-beta.24606.6
@build-analysis build-analysis bot mentioned this pull request Dec 7, 2024
Open
@dsplaisted
Copy link
Member

dsplaisted commented Dec 10, 2024

@dotnet/product-construction @dotnet/source-build Can you look at the failures here?

@ViktorHofer ViktorHofer requested review from a team as code owners December 10, 2024 08:58
@ViktorHofer
Copy link
Member

ViktorHofer commented Dec 10, 2024 •
edited
Loading

@jaredpar @jjonescz can you please take a look at the roslyn source-build failure? There seems to be a TFM in-consistency now that NetCurrent is net10.0 and NetPrevious is net9.0:

/vmr/.dotnet/sdk/10.0.100-alpha.1.24555.54/Microsoft.Common.CurrentVersion.targets(1889,5): error : Project '../MSBuild.BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj' targets 'net10.0'. It cannot be referenced by a project that targets '.NETCoreApp,Version=v9.0'. [/vmr/src/roslyn/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj::TargetFramework=net9.0]

@ViktorHofer
Copy link
Member

ViktorHofer commented Dec 10, 2024 •
edited
Loading

@nohwnd the vstest repo fails to build with the .NET 10 SDK (which we use as the unified toolchain in the VMR) and the updated TMF properties in Arcade:

/vmr/.dotnet/sdk/10.0.100-alpha.1.24555.54/Sdks/NuGet.Build.Tasks.Pack/buildCrossTargeting/NuGet.Build.Tasks.Pack.targets(221,5): error : Could not find a part of the path '/vmr/src/vstest/artifacts/bin/Microsoft.TestPlatform.AdapterUtilities/Release/net9.0'. [/vmr/src/vstest/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.csproj]

This is happening because you use the NetCurrent TFM property but then hardcode the TFM in the nuspec: https://github.com/microsoft/vstest/blob/7d34b30433259fb914aaaf276fde663a47b6ef2f/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.nuspec#L80-L92. NetCurrent now means net10.0 with the latest Arcade SDK. What is the expected behavior from your POV?

Submitted microsoft/vstest#10622 to keep the existing behavior for now and unblock this PR. PTAL

@jjonescz
Copy link
Member

jjonescz commented Dec 10, 2024

can you please take a look at the roslyn source-build failure? There seems to be a TFM in-consistency now that NetCurrent is net10.0 and NetPrevious is net9.0

Looking at the TFMs of the failing projects, I guess this should help: dotnet/roslyn#76354

@nohwnd
Copy link
Member

nohwnd commented Dec 10, 2024

@ViktorHofer merged.

@jjonescz jjonescz mentioned this pull request Dec 10, 2024
Merged
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20241…
19c2f82 
…210.1

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions
 From Version 10.0.0-beta.24604.4 -> To Version 10.0.0-beta.24610.1
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20241…
18652f2 
…210.2

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions
 From Version 10.0.0-beta.24604.4 -> To Version 10.0.0-beta.24610.2
@v-wuzhai
Copy link
Contributor

v-wuzhai commented Dec 12, 2024

/azp run dotnet-sdk-public-ci,sdk-source-build,sdk-unified-build

@azure-pipelines
Copy link

azure-pipelines bot commented Dec 12, 2024

Azure Pipelines successfully started running 3 pipeline(s).

@ViktorHofer
Copy link
Member

ViktorHofer commented Dec 12, 2024 •
edited
Loading

@dotnet/source-build this PR requires a newer .NET SDK and Arcade SDK when building from source. Can you please help with that?

@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20241…
09aef35 
…212.1

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions
 From Version 10.0.0-beta.24604.4 -> To Version 10.0.0-beta.24612.1
@ViktorHofer ViktorHofer mentioned this pull request Dec 12, 2024
Merged
1 task
@ViktorHofer
Copy link
Member

ViktorHofer commented Dec 12, 2024 •
edited
Loading

Hmm I think the re-bootstrap won't help in this case as we don't yet have an official build with the new .NET SDK and Arcade SDK. I submitted dotnet/arcade#15330 with a workaround to partially unblock this build.

dotnet-maestro bot and others added 5 commits December 13, 2024 09:38
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20241…
bd616f0 
…212.4

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions
 From Version 10.0.0-beta.24604.4 -> To Version 10.0.0-beta.24612.4
@ViktorHofer
Merge branch 'main' into darc-main-6c820a58-5e5b-495b-8cdd-ecf3c55e964d
56b2788
@ViktorHofer
Add roslyn patch
993053e
@ViktorHofer
update patch
7e87e1a
@ViktorHofer
update patch again
915348d
@build-analysis build-analysis bot mentioned this pull request Dec 13, 2024
Open
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20241…
845ad5a 
…213.2

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions
 From Version 10.0.0-beta.24604.4 -> To Version 10.0.0-beta.24613.2
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20241…
6fed762 
…216.1

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions
 From Version 10.0.0-beta.24604.4 -> To Version 10.0.0-beta.24616.1
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20241…
563f20e 
…217.2

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions
 From Version 10.0.0-beta.24604.4 -> To Version 10.0.0-beta.24617.2
@dkurepa dkurepa mentioned this pull request Dec 18, 2024
Closed
@dsplaisted
Copy link
Member

dsplaisted commented Dec 18, 2024

@ViktorHofer @dotnet/product-construction Looks like this is still failing to apply the patch:

fail: Failed to synchronize repo sdk
Failed to apply the patch 0002-update-roslyn-tfms.patch to src/roslyn.

Exit code: 128
Std err:
error: corrupt patch at line 24

@ViktorHofer
Copy link
Member

ViktorHofer commented Dec 18, 2024

This was blocked on #45427

@ViktorHofer
Copy link
Member

ViktorHofer commented Dec 18, 2024

Now blocked on #45547 :(

@build-analysis build-analysis bot mentioned this pull request Dec 18, 2024
Closed
3 tasks
@ViktorHofer
Copy link
Member

ViktorHofer commented Dec 19, 2024

Closing in favor of #45535 (Maestro infra got moved which caused the new PR to get opened).

@dotnet-maestro dotnet-maestro bot deleted the darc-main-6c820a58-5e5b-495b-8cdd-ecf3c55e964d branch December 19, 2024 09:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

Area-CodeFlow untriaged Request triage from a team member

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@dsplaisted @ViktorHofer @jjonescz @nohwnd @v-wuzhai @marcpopMSFT