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

[main] Update dependencies from dotnet/msbuild #44977

Merged
merged 22 commits into from
Dec 4, 2024

Conversation

dotnet-maestro[bot]
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Nov 20, 2024

This pull request updates the following dependencies

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

  • Subscription: 51256791-e30b-4b96-f2b9-08daf1d75f3f
  • Build: 20241204.4
  • Date Produced: December 4, 2024 10:24:22 AM UTC
  • Commit: 5491064fe8d18c8f73d8b6048d277c3ec8b81d31
  • Branch: refs/heads/main

…1120.2

Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization
 From Version 17.13.0-preview-24568-05 -> To Version 17.13.0-preview-24570-02
@dotnet-issue-labeler dotnet-issue-labeler bot added Area-CodeFlow untriaged Request triage from a team member labels Nov 20, 2024
…1120.3

Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization
 From Version 17.13.0-preview-24568-05 -> To Version 17.13.0-preview-24570-03
…1121.2

Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization
 From Version 17.13.0-preview-24568-05 -> To Version 17.13.0-preview-24571-02
@nagilson
Copy link
Member

@dotnet/msbuild-admins ILLink_can_treat_warnings_not_as_errors is failing and some other warning/error related tests, and it looks like you may have changed some warning code dotnet/msbuild@37fc828...e73ffcb. May you PTAL? @surayya-MS @JanKrivanek @JanProvaznik

@JanKrivanek
Copy link
Member

FYI @SimaTian - possible warnaserror impact?

@SimaTian
Copy link
Member

Hello, the ILLink is using the WarningAsErrors property for their own purposes.
#12601 (comment)
Until this point this caused no issues due to the way MSBuild handled these, but now that we moved the parsing to the engine level, it clashed with their "overload".
I will revert the change in Main for now, so that we're not blocking msbuild->sdk merges and we'll take it from there.

@SimaTian
Copy link
Member

After some further discussion we've decided against reverting. I will disable the tests for now and create a follow up issue to handle them.

@SimaTian SimaTian requested a review from a team as a code owner November 26, 2024 10:57
…1126.1

Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization
 From Version 17.13.0-preview-24568-05 -> To Version 17.13.0-preview-24576-01
@nagilson
Copy link
Member

@dotnet/msbuild-admins Thank you and @SimaTian for following up.

There is a new problem with analyzers. I think this might be on msbuild to look into.

error : The .NET SDK has newer analyzers with version '10.0.0' than what version '5.0.3' of 'Microsoft.CodeAnalysis.NetAnalyzers' package provides. Update or remove this package reference. [/datadisks/disk1/work/AB970987/w/AFD10983/e/testExecutionDirectory/AnalyzersAreC---4DE360D4/AnalyzersAreConflictResolved/AnalyzersAreConflictResolved.csproj]
AnalyzersAreConflictResolved -> /datadisks/disk1/work/AB970987/w/AFD10983/e/testExecutionDirectory/AnalyzersAreC---4DE360D4/AnalyzersAreConflictResolved/bin/Debug/net10.0/AnalyzersAreConflictResolved.dll

…1127.2

Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization
 From Version 17.13.0-preview-24568-05 -> To Version 17.13.0-preview-24577-02
@surayya-MS
Copy link
Member

looking into this

dotnet-maestro bot and others added 3 commits November 28, 2024 13:32
…1128.1

Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization
 From Version 17.13.0-preview-24568-05 -> To Version 17.13.0-preview-24578-01
@surayya-MS
Copy link
Member

surayya-MS commented Nov 29, 2024

I couldn't find Microsoft.CodeAnalysis.NetAnalyzers in msbuild repo.

The failed test is Microsoft.NET.Build.Tests.GivenThatWeWantToResolveConflicts.AnalyzersAreConflictResolved. @nagilson could this be the problem?

testProject.PackageReferences.Add(new TestPackageReference("Microsoft.CodeAnalysis.NetAnalyzers", "5.0.3"));

@surayya-MS
Copy link
Member

surayya-MS commented Nov 29, 2024

scratch that. here is the problem

itemGroup.Add(new XElement(ns + "TreatWarningsAsErrors", "true"));

@SimaTian this is related to the same change dotnet/msbuild@4dff69f

…1129.2

Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization
 From Version 17.13.0-preview-24568-05 -> To Version 17.13.0-preview-24579-02
surayya-MS added a commit to dotnet/msbuild that referenced this pull request Nov 29, 2024
… and Tre…" (#11041)

Reverts #10942

Due to the issue with sdk merge, I'm temporarily withdrawing this PR.
dotnet/sdk#44977
@surayya-MS
Copy link
Member

We've decided to revert the change dotnet/msbuild@4dff69f to unblock this PR

…1129.6

Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization
 From Version 17.13.0-preview-24568-05 -> To Version 17.13.0-preview-24579-06
@surayya-MS surayya-MS removed the request for review from a team December 2, 2024 11:19
@surayya-MS
Copy link
Member

surayya-MS commented Dec 2, 2024

Microsoft.NET.Build.Tests.GivenThatWeWantMSBuildToRespectCustomCulture.SupportRespectAlreadyAssignedItemCulture_IsNotSupported_BuildShouldFail test fails

@JanKrivanek could this be related to dotnet/msbuild@04ef516 ?

@nagilson nagilson added Area-MSBuild and removed msbuild-analyzer-candidate Items that would be a good MSBuild Analyzer labels Dec 2, 2024
@JanKrivanek
Copy link
Member

FullFW Msbuild tests are still on 17.12 - se separating the test case for it temporarily

…1203.7

Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization
 From Version 17.13.0-preview-24568-05 -> To Version 17.13.0-preview-24603-07
@nagilson
Copy link
Member

nagilson commented Dec 3, 2024

Now, GivenThatWeWantMSBuildToRespectCustomCulture is failing.

…1204.4

Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization
 From Version 17.13.0-preview-24568-05 -> To Version 17.13.0-preview-24604-04
@dotnet-maestro dotnet-maestro bot merged commit f2ae697 into main Dec 4, 2024
42 checks passed
@dotnet-maestro dotnet-maestro bot deleted the darc-main-18ac571e-b280-4bd1-b026-1167471dd6fa branch December 4, 2024 15:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants