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.

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

Re-Bootstrap Source Build to .NET 10.0.100-alpha.1.24556.1 #44685

Merged
merged 12 commits into from
Nov 7, 2024

Conversation

dotnet-sb-bot
Copy link
Contributor

@dotnet-sb-bot dotnet-sb-bot commented Nov 6, 2024

Re-Bootstrap Source Build to .NET 10.0.100-alpha.1.24556.1

Fixes dotnet/source-build#4720

@dotnet-sb-bot dotnet-sb-bot requested review from a team as code owners November 6, 2024 14:21
@dotnet-issue-labeler dotnet-issue-labeler bot added Area-Infrastructure untriaged Request triage from a team member labels Nov 6, 2024
@mthalman mthalman enabled auto-merge (squash) November 6, 2024 14:22
Copy link
Member

@ViktorHofer ViktorHofer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we re-bootstrap to a newer Arcade.Sdk? I see this points to https://github.com/dotnet/arcade/tree/1818ed2babf890a1cd62fa96a1f03abdada2d003. It would be great if we could have dotnet/arcade@e0270d6 included (or ideally main HEAD).

Asking as that newer commit will allow fixing dotnet/source-build#4719

@ViktorHofer
Copy link
Member

@mthalman I pushed into your branch as I noticed that we don't consistently set NetCurrent to net10.0. We only set it for a set of projects (which don't import Arcade). That was overlooked in the previous net10.0 TFM PR. Hope that's OK.

@MichaelSimons
Copy link
Member

Can we re-bootstrap to a newer Arcade.Sdk?

We really shouldn't. The arcade, SDK, and previous SB artifacts should all be from the same build. Deviating from this often leads to prebuilts and other possible breaks. I would rather we just rebootstrap again once a build is available with the arcade fix. We have automation for this now so it can be as simple as queuing a build.

@ViktorHofer
Copy link
Member

ViktorHofer commented Nov 6, 2024

Isn't a build with the Arcade fix already available? Oh I just noticed that the full source-build pipeline only runs once per day. Understood.

@mthalman
Copy link
Member

mthalman commented Nov 6, 2024

@mthalman I pushed into your branch as I noticed that we don't consistently set NetCurrent to net10.0. We only set it for a set of projects (which don't import Arcade). That was overlooked in the previous net10.0 TFM PR. Hope that's OK.

Ah, so that probably explains why dotnet/source-build#4720 is happening.

@mthalman
Copy link
Member

mthalman commented Nov 6, 2024

Arcade is failing to build in sdk-source-build:

/vmr/src/arcade/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj error NU1202: Package Microsoft.NET.Sdk.WorkloadManifestReader 10.0.100-alpha.1.24556.1 is not compatible with net9.0 (.NETCoreApp,Version=v9.0). Package Microsoft.NET.Sdk.WorkloadManifestReader 10.0.100-alpha.1.24556.1 supports: net10.0 (.NETCoreApp,Version=v10.0) [/vmr/src/arcade/Arcade.sln]

Looks like we'll need the fix at dotnet/arcade@e0270d6. I'll get a full run of source build with this fix that we can use to bootstrap with.

@ViktorHofer
Copy link
Member

This one is different. Arcade consumes an sdk package but sdk already updated their TFM to net10.0. Arcade is still on net9.0.

@mthalman
Copy link
Member

mthalman commented Nov 6, 2024

This one is different. Arcade consumes an sdk package but sdk already updated their TFM to net10.0. Arcade is still on net9.0.

Ah. Do you know of any blockers to getting it on net10.0?

@ViktorHofer
Copy link
Member

Nope. The blocker got fixed yesterday with the net10.0 PR merged.

@mthalman
Copy link
Member

mthalman commented Nov 6, 2024

I'll probably create a patch for this. I know there's been pushback in the past about arcade upgrading to a new TFM too early.

@ViktorHofer
Copy link
Member

Here's the Arcade PR: dotnet/arcade#15221. Feel free to create a patch from it.

@ViktorHofer
Copy link
Member

You probably also need the latest commit from dotnet/arcade#15221. That was an unintentional change that I fixed with it.

@mthalman
Copy link
Member

mthalman commented Nov 6, 2024

Source build error in nuget-client:

/vmr/src/nuget-client/src/NuGet.Core/NuGet.Packaging/Signing/Utility/CertificateChainUtility.cs(131,27): error CS0433: The type 'X509CertificateLoader' exists in both 'Microsoft.Bcl.Cryptography, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51' and 'System.Security.Cryptography, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a' [/vmr/src/nuget-client/src/NuGet.Core/NuGet.Packaging/NuGet.Packaging.csproj]

This is the same issue that was identified in #44540.

@am11
Copy link
Member

am11 commented Nov 6, 2024

Looks like we may need another change similar to NuGet/NuGet.Client#5911? cc @akoeplinger

@mthalman
Copy link
Member

mthalman commented Nov 6, 2024

I added a patch to update nuget-client to net10.0 which should resolve the X509CertificateLoader issue there.

@ViktorHofer
Copy link
Member

Is the plan with this PR to patch all VMR repositories to target net10.0?

@mthalman mthalman merged commit ec8c882 into main Nov 7, 2024
37 checks passed
@mthalman mthalman deleted the nov2024-source-build-1730902862 branch November 7, 2024 22:06
@akoeplinger akoeplinger restored the nov2024-source-build-1730902862 branch November 8, 2024 11:14
@akoeplinger akoeplinger deleted the nov2024-source-build-1730902862 branch November 8, 2024 11:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area-Infrastructure untriaged Request triage from a team member
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[main] Publishing of SDK diff baseline PR failing after net10.0 upgrade
5 participants