Fix entries in Version.Details.xml and make version overriding clearer #11561
+149
−80
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
akoeplinger
force-pushed
the
fix-version-details-xml
branch
from
f0960f3 to
ee9e882
Compare
akoeplinger
force-pushed
the
fix-version-details-xml
branch
3 times, most recently
from
fbd3137 to
b7741a4
Compare
rainersigwald
approved these changes
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.
…builtBaseline.xml We now properly reference it from source-build-externals
akoeplinger
force-pushed
the
fix-version-details-xml
branch
from
51274a8 to
c7f1f7a
Compare
rainersigwald
approved these changes
Mar 10, 2025
ViktorHofer
approved these changes
Mar 10, 2025
|
/backport to vs17.14 |
|
Started backporting to vs17.14: https://github.com/dotnet/msbuild/actions/runs/13784257663 |
|
@ViktorHofer backporting to "vs17.14" failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Fix entries in Version.Details.xml and make version overriding clearer
Using index info to reconstruct a base tree...
M eng/Packages.props
M eng/Versions.props
M eng/dependabot/Packages.props
Falling back to patching base and 3-way merge...
Auto-merging eng/dependabot/Packages.props
CONFLICT (content): Merge conflict in eng/dependabot/Packages.props
Auto-merging eng/Versions.props
CONFLICT (content): Merge conflict in eng/Versions.props
Auto-merging eng/Packages.props
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Fix entries in Version.Details.xml and make version overriding clearer
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
Needs #11571 merged first. |
ViktorHofer
pushed a commit
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
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 <viktor.hofer@microsoft.com> Co-authored-by: Alexander Köplinger <alex.koeplinger@outlook.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Follow-up to #11145.
We were missing the entry for System.Text.Encoding.CodePages and the source-build-externals intermediate for vs-solutionpersistence in Version.Details.xml which caused a prebuild in dotnet/sdk#47377 and version mismatches in dotnet/sdk#47376.
Also simplified the way we reference the different package versions a bit to make it clearer and synced the list of packages between Version.Details.xml/Versions.props/Packages.props.
Depends on #11555