[maccatalyst] Make sure MacProxy is included in System.Net.Http

[steveisok]

Fixes #90258

#90258 identified that HttpClient.DefaultProxy returned System.Net.Http.HttpNoProxy when using MacCatalyst. This is due to System.Net.Http.csproj not having maccatalyst as a condition when including MacProxy sources.

Way back when, #47823 had the condition, but this appears to have changed in #48652 when we thought MacCatalyst would inherit settings from iOS. That turned out to not be the case and this check was never added back.

[ghost]

Tagging subscribers to this area: @dotnet/ncl
See info in area-owners.md if you want to be subscribed.

Issue Details

---

#90258 identified that HttpClient.DefaultProxy returned System.Net.Http.HttpNoProxy when using MacCatalyst. This is due to System.Net.Http.csproj not having maccatalyst as a condition when including MacProxy sources.

Way back when, #47823 had the condition, but this appears to have changed in #48652 when we thought MacCatalyst would inherit settings from iOS. That turned out to not be the case and this check was never added back.

Author:	steveisok
Assignees:	steveisok
Labels:	area-System.Net.Http
Milestone:	-

[steveisok]

/azp run runtime-maccatalyst

[azure-pipelines]

Azure Pipelines successfully started running 1 pipeline(s).

[steveisok]

/backport to release/8.0

[steveisok]

/backport to release/7.0-staging

[github-actions]

Started backporting to release/8.0: https://github.com/dotnet/runtime/actions/runs/6086905990

[github-actions]

Started backporting to release/7.0-staging: https://github.com/dotnet/runtime/actions/runs/6086908252

[github-actions]

@steveisok backporting to release/7.0-staging failed, the patch most likely resulted in conflicts:

$ git am --3way --ignore-whitespace --keep-non-patch changes.patch

Applying: [maccatalyst] Make sure MacProxy is included in System.Net.Http
Using index info to reconstruct a base tree...
M	src/libraries/System.Net.Http/src/System.Net.Http.csproj
Falling back to patching base and 3-way merge...
Auto-merging src/libraries/System.Net.Http/src/System.Net.Http.csproj
CONFLICT (content): Merge conflict in src/libraries/System.Net.Http/src/System.Net.Http.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 [maccatalyst] Make sure MacProxy is included in System.Net.Http
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 128

Please backport manually!

[github-actions]

@steveisok an error occurred while backporting to release/7.0-staging, please check the run log for details!

Error: git am failed, most likely due to a merge conflict.

[MihaZupan]

Is there a way to test this?
If it's important enough of a feature to backport, it'd be nice if we had some coverage given that changes to the csproj can silently break it.

[steveisok]

Is there a way to test this? If it's important enough of a feature to backport, it'd be nice if we had some coverage given that changes to the csproj can silently break it.

How do we test it now? MacCatalyst can be thought of as osx in this particular case.

[MihaZupan]

runtime/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.Proxy.cs

Line 120 in e3925e3

public void Proxy_UseEnvironmentVariableToSetSystemProxy_RequestGoesThruProxy()

looks like it could be the relevant test.