Exclude the managed code around libproc on iOS/tvOS #61590
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
MaximLipnin
requested review from
directhex,
simonrozsival,
steveisok,
akoeplinger and
mdh1418
|
Tagging subscribers to this area: @dotnet/area-system-diagnostics-process Issue DetailsSee #61265 (comment) and above for more details
|
|
Tagging subscribers to 'os-ios': @steveisok, @akoeplinger Issue DetailsSee #61265 (comment) and above for more details
|
am11
reviewed
Nov 15, 2021
src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.iOS.cs
Outdated
Show resolved
Hide resolved
am11
reviewed
Nov 15, 2021
src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.UnknownUnix.cs
Show resolved
Hide resolved
am11
reviewed
Nov 15, 2021
src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj
Show resolved
Hide resolved
|
I've marked it as |
stephentoub
approved these changes
Nov 15, 2021
|
Nit: Make the PR description be tad bit more descriptive. The issue referenced and title of this PR suggests that just |
marek-safar
reviewed
Nov 15, 2021
src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj
Show resolved
Hide resolved
MaximLipnin
changed the title
steveisok
approved these changes
Nov 15, 2021
|
/backport to release/6.0 |
|
Started backporting to release/6.0: https://github.com/dotnet/runtime/actions/runs/1464098919 |
|
@steveisok an error occurred while backporting to release/6.0, please check the run log for details! Error: @steveisok is not a repo collaborator, backporting is not allowed. |
|
/backport to release/6.0 |
|
Started backporting to release/6.0: https://github.com/dotnet/runtime/actions/runs/1464211394 |
|
@steveisok backporting to release/6.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Exclude libroc and related on iOS/tvOS
Using index info to reconstruct a base tree...
M src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj
Falling back to patching base and 3-way merge...
Auto-merging src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj
CONFLICT (content): Merge conflict in src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Exclude libroc and related on iOS/tvOS
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! |
This was referenced Nov 16, 2021
MaximLipnin
added a commit
that referenced
this pull request
Nov 18, 2021
This is a follow up PR for #61590. It includes: - additional UnsupportedOSPlatform annotations for some System.Diagnostics.Process APIs throwing PNSE on iOS/tvOS (they started doing so after excluding some managed logic around librpoc ) - fixing a bit ugly workaround for CS0649 (see https://github.com/dotnet/runtime/pull/61590/files#r749525127) - used a local pragma in the ThreadInfo class. - skipping the respective S.D.P. tests ( it will address [iOS/tvOS] System.Diagnostics.Tests.ProcessTests.TestGetProcesses fails on devices #60588 as well)
MaximLipnin
added a commit
to MaximLipnin/runtime
that referenced
this pull request
Nov 19, 2021
…stenerTests on iOS/tvOS (dotnet#61807) This marks System.Diagnostics.TextWriterTraceListenerTests.XmlWriterTraceListenerTests withSkipOnPlatform attribute for iOS/tvOS as those tests try to create a process info, which throws PNSE after S.D.Process API's around libproc have been excluded in dotnet#61590.
This was referenced Nov 29, 2021
MaximLipnin
added a commit
to MaximLipnin/runtime
that referenced
this pull request
Dec 1, 2021
Since libproc is a private Apple API, it is not available on iOS/tvOS and should be excluded (see dotnet#61265 (comment) and above for more details). This PR excludes $(CommonPath)Interop\OSX\Interop.libproc.cs on the iOS/tvOS as well as makes some methods in Process, ProcessManager, and ProcessThread classes calling that API throw PNSE so that for iOS/tvOS it's possible to re-use the respective *.UnknownUnix.cs parts.
MaximLipnin
added a commit
to MaximLipnin/runtime
that referenced
this pull request
Dec 1, 2021
This is a follow up PR for dotnet#61590. It includes: - additional UnsupportedOSPlatform annotations for some System.Diagnostics.Process APIs throwing PNSE on iOS/tvOS (they started doing so after excluding some managed logic around librpoc ) - fixing a bit ugly workaround for CS0649 (see https://github.com/dotnet/runtime/pull/61590/files#r749525127) - used a local pragma in the ThreadInfo class. - skipping the respective S.D.P. tests ( it will address [iOS/tvOS] System.Diagnostics.Tests.ProcessTests.TestGetProcesses fails on devices dotnet#60588 as well)
MaximLipnin
added a commit
to MaximLipnin/runtime
that referenced
this pull request
Dec 1, 2021
…stenerTests on iOS/tvOS (dotnet#61807) This marks System.Diagnostics.TextWriterTraceListenerTests.XmlWriterTraceListenerTests withSkipOnPlatform attribute for iOS/tvOS as those tests try to create a process info, which throws PNSE after S.D.Process API's around libproc have been excluded in dotnet#61590.
steveisok
pushed a commit
that referenced
this pull request
Dec 2, 2021
#62235) * Exclude the managed code around libproc on iOS/tvOS (#61590) Since libproc is a private Apple API, it is not available on iOS/tvOS and should be excluded (see #61265 (comment) and above for more details). This PR excludes $(CommonPath)Interop\OSX\Interop.libproc.cs on the iOS/tvOS as well as makes some methods in Process, ProcessManager, and ProcessThread classes calling that API throw PNSE so that for iOS/tvOS it's possible to re-use the respective *.UnknownUnix.cs parts. * [iOS] Follow up changes for 61590 (#61670) This is a follow up PR for #61590. It includes: - additional UnsupportedOSPlatform annotations for some System.Diagnostics.Process APIs throwing PNSE on iOS/tvOS (they started doing so after excluding some managed logic around librpoc ) - fixing a bit ugly workaround for CS0649 (see https://github.com/dotnet/runtime/pull/61590/files#r749525127) - used a local pragma in the ThreadInfo class. - skipping the respective S.D.P. tests ( it will address [iOS/tvOS] System.Diagnostics.Tests.ProcessTests.TestGetProcesses fails on devices #60588 as well) * Skip System.Diagnostics.TextWriterTraceListenerTests.XmlWriterTraceListenerTests on iOS/tvOS (#61807) This marks System.Diagnostics.TextWriterTraceListenerTests.XmlWriterTraceListenerTests withSkipOnPlatform attribute for iOS/tvOS as those tests try to create a process info, which throws PNSE after S.D.Process API's around libproc have been excluded in #61590. * Disable several failing tests on iOSSimulator arm64 #61826 A few tests popped up as failures on the rolling build due to parts of System.Diagnostics.Process throwing PNSE. Disabled the functional tests from running on arm64 as mlaunch can't detect the return code. * Use separate partials for iOS&tvOS instead of UnknowUnix in System.Diagnostics.Process (#61871) * Remove NoWarn removal
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.
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.
Since
libprocis a private Apple API, it is not available on iOS/tvOS and should be excluded (see #61265 (comment) and above for more details)This PR excludes
$(CommonPath)Interop\OSX\Interop.libproc.cson the iOS/tvOS as well as makes some methods inProcess,ProcessManager, andProcessThreadclasses calling that API throw PNSE so that for iOS/tvOS it's possible to re-use the respective*.UnknownUnix.csparts.