Skip to content

[main] Update dependencies from dotnet/msbuild#44977

Merged
dotnet-maestro[bot] merged 22 commits intomainfrom
darc-main-18ac571e-b280-4bd1-b026-1167471dd6fa
Dec 4, 2024
Merged

[main] Update dependencies from dotnet/msbuild#44977
dotnet-maestro[bot] merged 22 commits intomainfrom
darc-main-18ac571e-b280-4bd1-b026-1167471dd6fa

Conversation

@dotnet-maestro
Copy link
Copy Markdown
Contributor

@dotnet-maestro dotnet-maestro bot commented Nov 20, 2024 •
edited
Loading

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

@dotnet-maestro
Update dependencies from https://github.com/dotnet/msbuild build 2024…
5b56997 
…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
@ghost ghost added Area-CodeFlow untriaged Request triage from a team member labels Nov 20, 2024
@dotnet-maestro
Update dependencies from https://github.com/dotnet/msbuild build 2024…
20cdb41 
…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
@dotnet-maestro
Update dependencies from https://github.com/dotnet/msbuild build 2024…
656e3cd 
…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
Copy Markdown
Member

nagilson commented Nov 25, 2024

@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
Copy Markdown
Member

JanKrivanek commented Nov 25, 2024

FYI @SimaTian - possible warnaserror impact?

@SimaTian
Copy link
Copy Markdown
Member

SimaTian commented Nov 26, 2024

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.

This was referenced Nov 26, 2024
Merged
Merged
@SimaTian
Copy link
Copy Markdown
Member

SimaTian commented Nov 26, 2024

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
@SimaTian SimaTian mentioned this pull request Nov 26, 2024
Open
@dotnet-maestro
Update dependencies from https://github.com/dotnet/msbuild build 2024…
67fba37 
…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 nagilson mentioned this pull request Nov 26, 2024
Merged
@nagilson
Copy link
Copy Markdown
Member

nagilson commented Nov 26, 2024

@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

@nagilson nagilson added msbuild-analyzer-candidate Items that would be a good MSBuild Analyzer Area-ILLink labels Nov 26, 2024
@nagilson nagilson mentioned this pull request Nov 26, 2024
Closed
@dotnet-maestro
Update dependencies from https://github.com/dotnet/msbuild build 2024…
6710f8d 
…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
Copy Markdown
Member

surayya-MS commented Nov 27, 2024

looking into this

dotnet-maestro bot and others added 3 commits November 28, 2024 13:32
@dotnet-maestro
Update dependencies from https://github.com/dotnet/msbuild build 2024…
5ee6c9e 
…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
Merge branch 'main' into darc-main-18ac571e-b280-4bd1-b026-1167471dd6fa
56f235f
@surayya-MS
Merge branch 'main' into darc-main-18ac571e-b280-4bd1-b026-1167471dd6fa
9019e39
@surayya-MS
Copy link
Copy Markdown
Member

surayya-MS commented Nov 29, 2024 •
edited
Loading

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?

sdk/test/Microsoft.NET.Build.Tests/GivenThatWeWantToResolveConflicts.cs

Line 233 in d7d440b

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

@surayya-MS
Copy link
Copy Markdown
Member

surayya-MS commented Nov 29, 2024 •
edited
Loading

scratch that. here is the problem

sdk/test/Microsoft.NET.Build.Tests/GivenThatWeWantToResolveConflicts.cs

Line 243 in d7d440b

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

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

@dotnet-maestro
Update dependencies from https://github.com/dotnet/msbuild build 2024…
413d3b4 
…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
@surayya-MS
Revert "add WarningsAsMessages, WarningsAsErrors, WarningsNotAsErrors…
84f3f0b 
… 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
Copy Markdown
Member

surayya-MS commented Nov 29, 2024

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

@dotnet-maestro
Update dependencies from https://github.com/dotnet/msbuild build 2024…
6c9eaeb 
…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
@build-analysis build-analysis bot mentioned this pull request Nov 30, 2024
Open
3 tasks
@surayya-MS surayya-MS removed the request for review from a team December 2, 2024 11:19
@surayya-MS
Copy link
Copy Markdown
Member

surayya-MS commented Dec 2, 2024 •
edited
Loading

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
Copy Markdown
Member

JanKrivanek commented Dec 3, 2024

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

@build-analysis build-analysis bot mentioned this pull request Dec 3, 2024
Open
@dotnet-maestro
Update dependencies from https://github.com/dotnet/msbuild build 2024…
b1d5b22 
…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
Copy Markdown
Member

nagilson commented Dec 3, 2024

Now, GivenThatWeWantMSBuildToRespectCustomCulture is failing.

@build-analysis build-analysis bot mentioned this pull request Dec 3, 2024
Closed
@dotnet-maestro
Update dependencies from https://github.com/dotnet/msbuild build 2024…
08b0eec 
…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
@dotnet-maestro dotnet-maestro bot deleted the darc-main-18ac571e-b280-4bd1-b026-1167471dd6fa branch December 4, 2024 15:46
@SimaTian SimaTian mentioned this pull request Dec 9, 2024
Open
@JanKrivanek JanKrivanek mentioned this pull request Jan 17, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@JanKrivanek JanKrivanek JanKrivanek approved these changes

@nagilson nagilson nagilson approved these changes

Assignees

No one assigned

Labels

Area-CodeFlow Area-ILLink Area-MSBuild untriaged Request triage from a team member

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@nagilson @JanKrivanek @SimaTian @surayya-MS