Update WCF dependencies on the compat pack #59764
Merged
Conversation
This file contains hidden or 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
|
Tagging subscribers to this area: @Anipik, @safern, @ViktorHofer Issue DetailsWe will update to the latest GA packages once they are ready. Also, adding a new package which is a full façade to .NET Framework: I will also port this to 6.0
|
ViktorHofer
reviewed
Sep 29, 2021
ericstj
approved these changes
Sep 29, 2021
HongGit
approved these changes
Sep 29, 2021
|
Failures are unrelated and known, @jkoritzinsky is there an issue for the formatting job? |
|
/backport to release/6.0 |
|
Started backporting to release/6.0: https://github.com/dotnet/runtime/actions/runs/1292107282 |
|
@safern backporting to release/6.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Update WCF dependencies on the compat pack
Using index info to reconstruct a base tree...
M eng/Version.Details.xml
M eng/Versions.props
M src/libraries/Microsoft.Windows.Compatibility/src/Microsoft.Windows.Compatibility.csproj
Falling back to patching base and 3-way merge...
Auto-merging src/libraries/Microsoft.Windows.Compatibility/src/Microsoft.Windows.Compatibility.csproj
Auto-merging eng/Versions.props
CONFLICT (content): Merge conflict in eng/Versions.props
Auto-merging eng/Version.Details.xml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Update WCF dependencies on the compat pack
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
Yes and there's already a PR in flight to fix the issue. |
safern
added a commit
to safern/runtime
that referenced
this pull request
Sep 30, 2021
safern
added a commit
that referenced
this pull request
Oct 1, 2021
ghost
locked as resolved and limited conversation to collaborators
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
6 participants
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.
We will update to the latest GA packages once they are ready.
Also, adding a new package which is a full façade to .NET Framework:
System.Web.Services.Description.I will also port this to 6.0
FYI: @mconnew @HongGit