Skip to content

[release/9.0.2xx] Update dependencies from dotnet/msbuild#45880

Merged
Forgind merged 7 commits intorelease/9.0.2xxfrom
darc-release/9.0.2xx-fdf46c8e-e157-4baa-95db-0980a35bb3d4
Jan 19, 2025
Merged

[release/9.0.2xx] Update dependencies from dotnet/msbuild#45880
Forgind merged 7 commits intorelease/9.0.2xxfrom
darc-release/9.0.2xx-fdf46c8e-e157-4baa-95db-0980a35bb3d4

Conversation

@dotnet-maestro
Copy link
Copy Markdown
Contributor

@dotnet-maestro dotnet-maestro bot commented Jan 10, 2025 •
edited
Loading

This pull request updates the following dependencies

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

  • Subscription: ec91df1d-8e6d-40cf-80b3-4ef102298e66
  • Build: 20250114.8
  • Date Produced: January 14, 2025 2:55:05 PM UTC
  • Commit: bfea91c5fba33abb318bd022d96d4b2b1735eed8
  • Branch: refs/heads/vs17.13

@dotnet-maestro
Update dependencies from https://github.com/dotnet/msbuild build 2025…
12d3704 
…0109.1

Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization
 From Version 17.13.0-preview-24569-04 -> To Version 17.13.4-preview-25059-01
@ghost ghost added Area-Infrastructure untriaged Request triage from a team member labels Jan 10, 2025
This was referenced Jan 11, 2025
Open
Open
Closed
Open
@dotnet-maestro
Update dependencies from https://github.com/dotnet/msbuild build 2025…
8392810 
…0113.2

Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization
 From Version 17.13.0-preview-24569-04 -> To Version 17.13.5-preview-25063-02
@v-wuzhai
Copy link
Copy Markdown
Contributor

v-wuzhai commented Jan 13, 2025

@dotnet/msbuild-admins Could you take a look at the failures here?

@Forgind
Copy link
Copy Markdown
Contributor

Forgind commented Jan 13, 2025

@dotnet/kitten ^

@dotnet-maestro
Update dependencies from https://github.com/dotnet/msbuild build 2025…
4a604e9 
…0114.8

Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization
 From Version 17.13.0-preview-24569-04 -> To Version 17.13.6-preview-25064-08
@marcpopMSFT
Copy link
Copy Markdown
Member

marcpopMSFT commented Jan 16, 2025

@dotnet/kitten we're locking down for Feb release and GA. I assume we want this but it has MSBuild related test failures:
GivenThatWeWantMSBuildToRespectCustomCulture
/private/tmp/helix/working/9FD10919/p/d/sdk/9.0.200-ci/Microsoft.Common.CurrentVersion.targets(3291,5): warning MSB3002: Explicitly set culture "test-2" for item "Resources.test-2.resx" was overwritten with inferred culture "", because 'RespectAlreadyAssignedItemCulture' property was not set. [/private/tmp/helix/working/9FD10919/w/A82309A5/e/testExecutionDirectory/SupportRespec---806A3E28/MSBuildCultureResourceGeneration.csproj] MSBuildCultureResourceGeneration -> /private/tmp/helix/working/9FD10919/w/A82309A5/e/testExecutionDirectory/SupportRespec---806A3E28/bin/Debug/net6.0/MSBuildCultureResourceGeneration.dll

@rainersigwald
Copy link
Copy Markdown
Member

rainersigwald commented Jan 16, 2025

@JanKrivanek that error is your new one right?

@rainersigwald
Copy link
Copy Markdown
Member

rainersigwald commented Jan 16, 2025

and yes @marcpopMSFT 17.13.6 is what's currently in VS so we'd like to match

@JanKrivanek
Copy link
Copy Markdown
Member

JanKrivanek commented Jan 17, 2025

This is the identical thing as on #44977
9.0.2xx branched from main earlier - so it didn't contain the fix.
I've cherrypicked the test fix from there.

@JanKrivanek
Copy link
Copy Markdown
Member

JanKrivanek commented Jan 17, 2025

GivenThatWeWantMSBuildToRespectCustomCulture is fixed

Now the CanIgnoreTemplateGroupsWithConstraints, BasicTest_WhenListCommandIsUsed are failing. Both seems to be bit unstable based on history - so reruning.

@dotnet/domestic-cat - can you take it from here? Feel free to ping me if anything

@build-analysis build-analysis bot mentioned this pull request Jan 17, 2025
Open
@JanKrivanek
Copy link
Copy Markdown
Member

JanKrivanek commented Jan 17, 2025

FYI @marcpopMSFT - we synced with @rainersigwald and decided we want to be more conservative with the change that broke the test here - so we'll be pushing new update early next week.

Please hold on with merging till then

@marcpopMSFT
Copy link
Copy Markdown
Member

marcpopMSFT commented Jan 17, 2025

Note that we're trying to produce candidate builds today so I'd be good to know if the MSBuild changes are required for 9.0.200 or can wait for 9.0.201.

Forgind added a commit that referenced this pull request Jan 17, 2025
@Forgind
reimplement JanKrivanek's changes from #45880
e95e9b3
@rainersigwald
Copy link
Copy Markdown
Member

rainersigwald commented Jan 17, 2025

It's a looot of changes, we'd really like to have them.

@build-analysis build-analysis bot mentioned this pull request Jan 18, 2025
Open
@Forgind Forgind enabled auto-merge (squash) January 18, 2025 03:37
@Forgind Forgind disabled auto-merge January 19, 2025 01:42
@Forgind Forgind merged commit aa15f79 into release/9.0.2xx Jan 19, 2025
@Forgind Forgind deleted the darc-release/9.0.2xx-fdf46c8e-e157-4baa-95db-0980a35bb3d4 branch January 19, 2025 07:25
This was referenced Jan 20, 2025
Closed
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@Forgind Forgind Forgind approved these changes

Reviewers whose approvals may not affect merge requirements

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.

5 participants

@v-wuzhai @Forgind @marcpopMSFT @rainersigwald @JanKrivanek