Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[main] Update dependencies from dotnet/msbuild #47377

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

Merged
merged 7 commits into from
Mar 11, 2025

Conversation

dotnet-maestro[bot]
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Mar 8, 2025

This pull request updates the following dependencies

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

…0307.7

Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization
 From Version 17.14.0-preview-25155-03 -> To Version 17.14.0-preview-25157-07
@ghost ghost added Area-CodeFlow untriaged Request triage from a team member labels Mar 8, 2025
Copy link
Contributor Author

dotnet-maestro bot commented Mar 8, 2025

Notification for subscribed users from https://github.com/dotnet/msbuild:

@dotnet/kitten

Action requested: Please take a look at this failing automated dependency-flow pull request's checks; failures may be related to changes which originated in your repo.

  • This pull request contains changes from your source repo (https://github.com/dotnet/msbuild) and seems to have failed checks in this PR. Please take a peek at the failures and comment if they seem relevant to your changes.
  • If you're being tagged in this comment it is due to an entry in the related Maestro Subscription of the Build Asset Registry. If you feel this entry has added your GitHub login or your GitHub team in error, please update the subscription to reflect this.
  • For more details, please read the Arcade Darc documentation

edvilme and others added 2 commits March 9, 2025 10:57
Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
(cherry picked from commit 5a93642)
…nals build 20250306.1

Microsoft.SourceBuild.Intermediate.source-build-externals
 From Version 10.0.615301 -> To Version 10.0.615601

(cherry picked from commit e3ec954)
@v-wuzhai
Copy link
Member

@dotnet/source-build Could you take a look at the failures here?

/__w/1/vmr/repo-projects/Directory.Build.targets(924,5): warning : 1 new packages used not in baseline! See report at /__w/1/vmr/artifacts/prebuilt-report/baseline-comparison.xml for more information. Package IDs are: [/__w/1/vmr/repo-projects/dotnet.proj]
/__w/1/vmr/repo-projects/Directory.Build.targets(924,5): warning : System.Text.Encoding.CodePages.9.0.0 [/__w/1/vmr/repo-projects/dotnet.proj]
/__w/1/vmr/repo-projects/Directory.Build.targets(924,5): warning : Prebuilt usages are different from the baseline. If detected changes are acceptable, update baseline with: [/__w/1/vmr/repo-projects/dotnet.proj]
/__w/1/vmr/repo-projects/Directory.Build.targets(924,5): warning : cp '/__w/1/vmr/artifacts/prebuilt-report/generated-new-baseline.xml' '/__w/1/vmr/eng/tools/prebuilt-baseline.xml' [/__w/1/vmr/repo-projects/dotnet.proj]

@akoeplinger
Copy link
Member

It's because dotnet/msbuild@353c0f3 bumped to 9.0.0 versions of packages but System.Text.Encoding.CodePages isn't referenced in msbuild's Version.Details.xml

akoeplinger added a commit to dotnet/msbuild that referenced this pull request Mar 10, 2025
Follow-up to #11145. We were missing the entry for System.Text.Encoding.CodePages in Version.Details.xml which caused a prebuild in dotnet/sdk#47377.

Also simplified the way we reference the different package versions a bit to make it clearer.
@edvilme
Copy link
Member

edvilme commented Mar 10, 2025

Status: Waiting for dotnet/msbuild#11561

rainersigwald pushed a commit to dotnet/msbuild that referenced this pull request Mar 10, 2025
#11561)

Follow-up to #11145. We were missing the entry for System.Text.Encoding.CodePages in Version.Details.xml which caused a prebuild in dotnet/sdk#47377.

Also simplified the way we reference the different package versions a bit to make it clearer.

Remove Microsoft.VisualStudio.SolutionPersistence from SourceBuildPrebuiltBaseline.xml, since we now properly reference it from source-build-externals
@edvilme
Copy link
Member

edvilme commented Mar 11, 2025

Hello @dotnet/source-build do we know why this is still failing??

…0310.8

Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization
 From Version 17.14.0-preview-25155-03 -> To Version 17.14.0-preview-25160-08
@ViktorHofer
Copy link
Member

This PR doesn't yet have the required msbuild commit. You can see that by clicking on one of the new versions in the PR description which will show the commit diff in msbuild.

@ViktorHofer
Copy link
Member

ViktorHofer commented Mar 11, 2025

Hmm ok the reason for that is that we consume msbuild from the "vs17.14" channel which maps to the "VS 17.14" branch. I think the fixes need to get backported to that branch.

ViktorHofer pushed a commit to dotnet/msbuild that referenced this pull request Mar 11, 2025
#11561)

Follow-up to #11145. We were missing the entry for System.Text.Encoding.CodePages in Version.Details.xml which caused a prebuild in dotnet/sdk#47377.

Also simplified the way we reference the different package versions a bit to make it clearer.

Remove Microsoft.VisualStudio.SolutionPersistence from SourceBuildPrebuiltBaseline.xml, since we now properly reference it from source-build-externals
ViktorHofer added a commit to dotnet/msbuild that referenced this pull request Mar 11, 2025
…ries in Version.Details.xml (#11571)

* Remove deprecated 4.3.* package references

Both "System.Runtime" and "System.Private.Uri" are inbox in .NETCoreApp since ~2017 and don't need to be referenced explicitly anymore.

They were referenced here as external dependencies brought vulnerable netstandard1.x dependencies in which were then flagged by CG.

That isn't the case anymore. xunit, shouldly and other packages with their corresponding versions used in this repo don't bring netstandard1.x in anymore.

Don't reference "System.Net.Http" for the same reason. It is inbox on .NET Framework, .NETCoreApp and .NET Standard. On .NET Framework a "<Reference Include="System.Net.Http" />" item is needed as it isn't part of the default referenced assemblies.

Note that this change will help when starting to consume a .NET 10 SDK as those would get flagged by NuGet Prune Package Reference and NuGet Audit.

* Avoid netstandard1.x dependencies

* fix build

* Fix entries in Version.Details.xml and make version overriding clearer (#11561)

Follow-up to #11145. We were missing the entry for System.Text.Encoding.CodePages in Version.Details.xml which caused a prebuild in dotnet/sdk#47377.

Also simplified the way we reference the different package versions a bit to make it clearer.

Remove Microsoft.VisualStudio.SolutionPersistence from SourceBuildPrebuiltBaseline.xml, since we now properly reference it from source-build-externals

---------

Co-authored-by: Viktor Hofer <[email protected]>
Co-authored-by: Alexander Köplinger <[email protected]>
dotnet-maestro bot and others added 2 commits March 11, 2025 14:19
…0311.12

Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization
 From Version 17.14.0-preview-25155-03 -> To Version 17.14.0-preview-25161-12
@akoeplinger akoeplinger requested a review from a team as a code owner March 11, 2025 14:20
@akoeplinger akoeplinger requested a review from a team as a code owner March 11, 2025 14:20
@edvilme edvilme enabled auto-merge (squash) March 11, 2025 15:02
@edvilme
Copy link
Member

edvilme commented Mar 11, 2025

@ViktorHofer I think the issue is related to nuget using version 1.0.28 of vs-solutionpersistence :/

@ViktorHofer
Copy link
Member

The added patch should resolve this... Let's see :)

@edvilme edvilme merged commit 4c55da1 into main Mar 11, 2025
42 of 43 checks passed
@edvilme edvilme deleted the darc-main-8068e57a-9d11-4310-9327-0b5a6592cbfb branch March 11, 2025 20:31
@akoeplinger
Copy link
Member

ohh finally! thanks for the patience everyone 😄

maridematte added a commit to dotnet/msbuild that referenced this pull request Mar 19, 2025
* Localized file check-in by OneLocBuild Task: Build definition ID 9434: Build ID 11081403

* Update Versions.props VersionPrefix

* Update Versions.props VersionPrefix

* [vs17.14] Remove deprecated 4.3.* System package references & fix entries in Version.Details.xml (#11571)

* Remove deprecated 4.3.* package references

Both "System.Runtime" and "System.Private.Uri" are inbox in .NETCoreApp since ~2017 and don't need to be referenced explicitly anymore.

They were referenced here as external dependencies brought vulnerable netstandard1.x dependencies in which were then flagged by CG.

That isn't the case anymore. xunit, shouldly and other packages with their corresponding versions used in this repo don't bring netstandard1.x in anymore.

Don't reference "System.Net.Http" for the same reason. It is inbox on .NET Framework, .NETCoreApp and .NET Standard. On .NET Framework a "<Reference Include="System.Net.Http" />" item is needed as it isn't part of the default referenced assemblies.

Note that this change will help when starting to consume a .NET 10 SDK as those would get flagged by NuGet Prune Package Reference and NuGet Audit.

* Avoid netstandard1.x dependencies

* fix build

* Fix entries in Version.Details.xml and make version overriding clearer (#11561)

Follow-up to #11145. We were missing the entry for System.Text.Encoding.CodePages in Version.Details.xml which caused a prebuild in dotnet/sdk#47377.

Also simplified the way we reference the different package versions a bit to make it clearer.

Remove Microsoft.VisualStudio.SolutionPersistence from SourceBuildPrebuiltBaseline.xml, since we now properly reference it from source-build-externals

---------

Co-authored-by: Viktor Hofer <[email protected]>
Co-authored-by: Alexander Köplinger <[email protected]>

* Don't ngen StringTools.net35 (#11544)

This assembly shouldn't ever be loaded in the net4x context so don't spend the install time ngening it.

* Make SolutionParser package reference private  (#11603)

Context
The VS insertion is currently failing due to the SolutionParser version being upgraded beyond the version used by VS. Made the change so this reference is not exposed and so the insertions do not fail.

---------

Co-authored-by: dotnet bot <[email protected]>
Co-authored-by: Jenny Bai <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Viktor Hofer <[email protected]>
Co-authored-by: Alexander Köplinger <[email protected]>
Co-authored-by: Rainer Sigwald <[email protected]>
Co-authored-by: Mariana Dematte <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area-CodeFlow untriaged Request triage from a team member
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants