Ensure WPF builds against framework SRSF version #9492
Merged
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
WPF was depending on the package version of System.Runtime.Serialization.Formatters but never shipping it. �Instead WPF should depend on the built-in assembly version. To do that we need to update the SDK version since WPF's vcxprojs don't enable the nuget package targeting pack #9490
dotnet-policy-service
bot
added
the
PR
JeremyKuhne
approved these changes
Jul 30, 2024
pchaurasia14
approved these changes
Jul 30, 2024
|
/backport to release/9.0-preview7 |
|
Started backporting to release/9.0-preview7: https://github.com/dotnet/wpf/actions/runs/10202962600 |
|
@pchaurasia14 an error occurred while backporting to release/9.0-preview7, please check the run log for details! Error: @pchaurasia14 is not a repo collaborator, backporting is not allowed. If you're a collaborator please make sure your dotnet team membership visibility is set to Public on https://github.com/orgs/dotnet/people?query=pchaurasia14 |
|
/backport to release/9.0-preview7 |
|
Started backporting to release/9.0-preview7: https://github.com/dotnet/wpf/actions/runs/10202973100 |
|
@pchaurasia14 backporting to release/9.0-preview7 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Ensure WPF builds against framework SRSF version
Using index info to reconstruct a base tree...
M global.json
M src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj
M src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj
M src/Microsoft.DotNet.Wpf/tests/UnitTests/PresentationCore.Tests/PresentationCore.Tests.csproj
Falling back to patching base and 3-way merge...
Auto-merging src/Microsoft.DotNet.Wpf/tests/UnitTests/PresentationCore.Tests/PresentationCore.Tests.csproj
CONFLICT (content): Merge conflict in src/Microsoft.DotNet.Wpf/tests/UnitTests/PresentationCore.Tests/PresentationCore.Tests.csproj
Auto-merging src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj
Auto-merging src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj
Auto-merging global.json
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 advice.mergeConflict false"
Patch failed at 0001 Ensure WPF builds against framework SRSF version
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
@pchaurasia14 an error occurred while backporting to release/9.0-preview7, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
pchaurasia14
added a commit
to pchaurasia14/wpf
that referenced
this pull request
Aug 1, 2024
WPF was depending on the package version of System.Runtime.Serialization.Formatters but never shipping it. �Instead WPF should depend on the built-in assembly version. To do that we need to update the SDK version since WPF's vcxprojs don't enable the nuget package targeting pack dotnet#9490
ericstj
added a commit
that referenced
this pull request
Aug 1, 2024
WPF was depending on the package version of System.Runtime.Serialization.Formatters but never shipping it. �Instead WPF should depend on the built-in assembly version. To do that we need to update the SDK version since WPF's vcxprojs don't enable the nuget package targeting pack #9490
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Fixes # #9309
Description
WPF was depending on the package version of System.Runtime.Serialization.Formatters but never shipping it. Instead WPF should depend on the built-in assembly version. To do that we need to update the SDK version since WPF's vcxprojs don't
enable the nuget package targeting pack #9490
Customer Impact
Customers see a
FileNotFoundExceptioninstead of the expectedPlatformNotSupportedExceptionwhen using API that depends onBinaryFormatter.Regression
Yes, regressed in Preview6.
Testing
I've run the unit tests with the fix. I made sure the test assemblies reference the compatibility package. WPF should add more tests to validate that without the package they'll throw PNSE - #9491
Risk
Low. If it builds it should be doing what we want. It could have more fallout in other tests which aren't represented in
test.cmd. Those may need to add a reference to the compat packages.Microsoft Reviewers: Open in CodeFlow