Skip to content

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

Merged
steveisok merged 1 commit into
dotnet:mainfrom
steveisok:use-macproxy-catalyst
Sep 5, 2023
Merged

[maccatalyst] Make sure MacProxy is included in System.Net.Http#91473
steveisok merged 1 commit into
dotnet:mainfrom
steveisok:use-macproxy-catalyst

Conversation

@steveisok

@steveisoksteveisok commented Sep 1, 2023•
edited by karelz
Loading

Copy link
Copy Markdown
Member

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.

Steve Pfister
[maccatalyst] Make sure MacProxy is included in System.Net.Http
bd26996
dotnet#90258 identified that `HttpClient.DefaultProxy` returned `System.Net.Http.HttpNoProxy` when using MacCatalyst. This is due to a condition in System.Net.Http.csproj not including maccatalyst as a condition and as a result, skipped adding the MacProxy sources.
Way back when, dotnet#47823 had the condition, but this appears to have changed in dotnet#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.
@ghostghost assigned steveisokSep 1, 2023
@ghost

ghost commented Sep 1, 2023

Copy link
Copy Markdown

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
steveisok requested a review from wfurtSeptember 1, 2023 17:34
@steveisok

steveisok commented Sep 1, 2023

Copy link
Copy Markdown
MemberAuthor

/azp run runtime-maccatalyst

@azure-pipelines

azure-pipelinesBot commented Sep 1, 2023

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@steveisok
steveisok merged commit f9db6b4 into dotnet:mainSep 5, 2023
@steveisok

steveisok commented Sep 5, 2023

Copy link
Copy Markdown
MemberAuthor

/backport to release/8.0

@steveisok

steveisok commented Sep 5, 2023

Copy link
Copy Markdown
MemberAuthor

/backport to release/7.0-staging

@github-actions

github-actionsBot commented Sep 5, 2023

Copy link
Copy Markdown
Contributor

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

@github-actions

github-actionsBot commented Sep 5, 2023

Copy link
Copy Markdown
Contributor

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

@github-actions

github-actionsBot commented Sep 5, 2023

Copy link
Copy Markdown
Contributor

@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

github-actionsBot commented Sep 5, 2023

Copy link
Copy Markdown
Contributor

@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.

@github-actionsgithub-actionsBot mentioned this pull request Sep 5, 2023
Merged
@MihaZupan

MihaZupan commented Sep 5, 2023

Copy link
Copy Markdown
Member

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

steveisok commented Sep 5, 2023

Copy link
Copy Markdown
MemberAuthor

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

MihaZupan commented Sep 5, 2023

Copy link
Copy Markdown
Member

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

Line 120 in e3925e3

publicvoidProxy_UseEnvironmentVariableToSetSystemProxy_RequestGoesThruProxy()
looks like it could be the relevant test.

steveisok pushed a commit to steveisok/runtime that referenced this pull request Sep 8, 2023
Steve Pfister
[release/7.0-staging] [maccatalyst] Make sure MacProxy is included in…
930cc64
… System.Net.Http
Backport of dotnet#91473 to release/7.0
@steveisoksteveisok mentioned this pull request Sep 8, 2023
Merged
carlossanlop pushed a commit that referenced this pull request Sep 11, 2023
@steveisokSteve Pfister
[release/7.0-staging] [maccatalyst] Make sure MacProxy is included in…
8d2dff4
… System.Net.Http (#91817)
* [release/7.0-staging] [maccatalyst] Make sure MacProxy is included in System.Net.Http
Backport of #91473 to release/7.0
* Additional conditions
---------
Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
@karelzkarelz added this to the 9.0.0 milestone Sep 14, 2023
@ghostghost locked as resolved and limited conversation to collaborators Oct 14, 2023
@karelzkarelz added the os-maccatalyst MacCatalyst OS label Jun 24, 2024
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@simonrozsivalsimonrozsivalsimonrozsival approved these changes
@akoeplingerakoeplingerAwaiting requested review from akoeplinger
@wfurtwfurtAwaiting requested review from wfurt

Assignees

@steveisoksteveisok

Labels

area-System.Net.Httpos-maccatalystMacCatalyst OS

Projects

None yet

Milestone

9.0.0

Development

Successfully merging this pull request may close these issues.

ClientWebSocket.ConnectAsync() does not work on Mac

4 participants

@steveisok@MihaZupan@simonrozsival@karelz
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
[maccatalyst] Make sure MacProxy is included in System.Net.Http by steveisok · Pull Request #91473 · dotnet/runtime · GitHub
Skip to content
[maccatalyst] Make sure MacProxy is included in System.Net.Http - #91473
Merged
steveisok merged 1 commit into
dotnet:mainfrom 
steveisok:use-macproxy-catalyst
Sep 5, 2023
Merged
[maccatalyst] Make sure MacProxy is included in System.Net.Http#91473
steveisok merged 1 commit into
dotnet:mainfrom 
steveisok:use-macproxy-catalyst
Conversation
@steveisok
@steveisoksteveisok
commented
Sep 1, 2023•

edited by karelz

Loading

Copy link


Copy Markdown

Member
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.
Steve Pfister
[maccatalyst] Make sure MacProxy is included in System.Net.Http
bd26996
dotnet#90258 identified that `HttpClient.DefaultProxy` returned `System.Net.Http.HttpNoProxy` when using MacCatalyst. This is due to a condition in System.Net.Http.csproj not including maccatalyst as a condition and as a result, skipped adding the MacProxy sources.
Way back when, dotnet#47823 had the condition, but this appears to have changed in dotnet#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.
@ghostghost
assigned steveisokSep 1, 2023
@ghost
ghost
commented
Sep 1, 2023

Copy link


Copy Markdown

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
steveisok
requested a review
from wfurtSeptember 1, 2023 17:34
@steveisok
steveisok
commented
Sep 1, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-maccatalyst
@azure-pipelines
azure-pipelinesBot
commented
Sep 1, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@steveisok
steveisok
merged commit f9db6b4
into
dotnet:mainSep 5, 2023
@steveisok
steveisok
commented
Sep 5, 2023

Copy link


Copy Markdown

MemberAuthor
/backport to release/8.0
@steveisok
steveisok
commented
Sep 5, 2023

Copy link


Copy Markdown

MemberAuthor
/backport to release/7.0-staging
@github-actions
github-actionsBot
commented
Sep 5, 2023

Copy link


Copy Markdown

Contributor
Started backporting to release/8.0: https://github.com/dotnet/runtime/actions/runs/6086905990
@github-actions
github-actionsBot
commented
Sep 5, 2023

Copy link


Copy Markdown

Contributor
Started backporting to release/7.0-staging: https://github.com/dotnet/runtime/actions/runs/6086908252
@github-actions
github-actionsBot
commented
Sep 5, 2023

Copy link


Copy Markdown

Contributor
@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
github-actionsBot
commented
Sep 5, 2023

Copy link


Copy Markdown

Contributor
@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.
@github-actionsgithub-actionsBot
mentioned this pull request
Sep 5, 2023
 Merged

@MihaZupan
MihaZupan
commented
Sep 5, 2023

Copy link


Copy Markdown

Member
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
steveisok
commented
Sep 5, 2023

Copy link


Copy Markdown

MemberAuthor
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
MihaZupan
commented
Sep 5, 2023

Copy link


Copy Markdown

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

Line 120
in
e3925e3
publicvoidProxy_UseEnvironmentVariableToSetSystemProxy_RequestGoesThruProxy()

looks like it could be the relevant test.
steveisok pushed a commit
to steveisok/runtime
that referenced
this pull request
Sep 8, 2023
Steve Pfister
[release/7.0-staging] [maccatalyst] Make sure MacProxy is included in…
930cc64
… System.Net.Http
Backport of dotnet#91473 to release/7.0
@steveisoksteveisok
mentioned this pull request
Sep 8, 2023
 Merged

carlossanlop pushed a commit
that referenced
this pull request
Sep 11, 2023
@steveisokSteve Pfister
[release/7.0-staging] [maccatalyst] Make sure MacProxy is included in…
8d2dff4
… System.Net.Http (#91817)
* [release/7.0-staging] [maccatalyst] Make sure MacProxy is included in System.Net.Http
Backport of #91473 to release/7.0
* Additional conditions
---------
Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
@karelzkarelz
added this to the 9.0.0 milestone
Sep 14, 2023
@ghostghost
locked as resolved and limited conversation to collaborators
Oct 14, 2023
@karelzkarelz
added
the 
os-maccatalyst
MacCatalyst OS
label
Jun 24, 2024
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@simonrozsivalsimonrozsivalsimonrozsival approved these changes
@akoeplingerakoeplingerAwaiting requested review from akoeplinger
@wfurtwfurtAwaiting requested review from wfurt

Assignees

@steveisoksteveisok

Labels

area-System.Net.Httpos-maccatalystMacCatalyst OS

Projects


None yet


Milestone

9.0.0

Development

Successfully merging this pull request may close these issues.

ClientWebSocket.ConnectAsync() does not work on Mac 

4 participants

@steveisok@MihaZupan@simonrozsival@karelz

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[maccatalyst] Make sure MacProxy is included in System.Net.Http by steveisok · Pull Request #91473 · dotnet/runtime · GitHub
Skip to content
[maccatalyst] Make sure MacProxy is included in System.Net.Http - #91473
Merged
steveisok merged 1 commit into
dotnet:mainfrom 
steveisok:use-macproxy-catalyst
Sep 5, 2023
Merged
[maccatalyst] Make sure MacProxy is included in System.Net.Http#91473
steveisok merged 1 commit into
dotnet:mainfrom 
steveisok:use-macproxy-catalyst
Conversation
@steveisok
@steveisoksteveisok
commented
Sep 1, 2023•

edited by karelz

Loading

Copy link


Copy Markdown

Member
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.
Steve Pfister
[maccatalyst] Make sure MacProxy is included in System.Net.Http
bd26996
dotnet#90258 identified that `HttpClient.DefaultProxy` returned `System.Net.Http.HttpNoProxy` when using MacCatalyst. This is due to a condition in System.Net.Http.csproj not including maccatalyst as a condition and as a result, skipped adding the MacProxy sources.
Way back when, dotnet#47823 had the condition, but this appears to have changed in dotnet#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.
@ghostghost
assigned steveisokSep 1, 2023
@ghost
ghost
commented
Sep 1, 2023

Copy link


Copy Markdown

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
steveisok
requested a review
from wfurtSeptember 1, 2023 17:34
@steveisok
steveisok
commented
Sep 1, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-maccatalyst
@azure-pipelines
azure-pipelinesBot
commented
Sep 1, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@steveisok
steveisok
merged commit f9db6b4
into
dotnet:mainSep 5, 2023
@steveisok
steveisok
commented
Sep 5, 2023

Copy link


Copy Markdown

MemberAuthor
/backport to release/8.0
@steveisok
steveisok
commented
Sep 5, 2023

Copy link


Copy Markdown

MemberAuthor
/backport to release/7.0-staging
@github-actions
github-actionsBot
commented
Sep 5, 2023

Copy link


Copy Markdown

Contributor
Started backporting to release/8.0: https://github.com/dotnet/runtime/actions/runs/6086905990
@github-actions
github-actionsBot
commented
Sep 5, 2023

Copy link


Copy Markdown

Contributor
Started backporting to release/7.0-staging: https://github.com/dotnet/runtime/actions/runs/6086908252
@github-actions
github-actionsBot
commented
Sep 5, 2023

Copy link


Copy Markdown

Contributor
@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
github-actionsBot
commented
Sep 5, 2023

Copy link


Copy Markdown

Contributor
@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.
@github-actionsgithub-actionsBot
mentioned this pull request
Sep 5, 2023
 Merged

@MihaZupan
MihaZupan
commented
Sep 5, 2023

Copy link


Copy Markdown

Member
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
steveisok
commented
Sep 5, 2023

Copy link


Copy Markdown

MemberAuthor
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
MihaZupan
commented
Sep 5, 2023

Copy link


Copy Markdown

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

Line 120
in
e3925e3
publicvoidProxy_UseEnvironmentVariableToSetSystemProxy_RequestGoesThruProxy()

looks like it could be the relevant test.
steveisok pushed a commit
to steveisok/runtime
that referenced
this pull request
Sep 8, 2023
Steve Pfister
[release/7.0-staging] [maccatalyst] Make sure MacProxy is included in…
930cc64
… System.Net.Http
Backport of dotnet#91473 to release/7.0
@steveisoksteveisok
mentioned this pull request
Sep 8, 2023
 Merged

carlossanlop pushed a commit
that referenced
this pull request
Sep 11, 2023
@steveisokSteve Pfister
[release/7.0-staging] [maccatalyst] Make sure MacProxy is included in…
8d2dff4
… System.Net.Http (#91817)
* [release/7.0-staging] [maccatalyst] Make sure MacProxy is included in System.Net.Http
Backport of #91473 to release/7.0
* Additional conditions
---------
Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
@karelzkarelz
added this to the 9.0.0 milestone
Sep 14, 2023
@ghostghost
locked as resolved and limited conversation to collaborators
Oct 14, 2023
@karelzkarelz
added
the 
os-maccatalyst
MacCatalyst OS
label
Jun 24, 2024
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@simonrozsivalsimonrozsivalsimonrozsival approved these changes
@akoeplingerakoeplingerAwaiting requested review from akoeplinger
@wfurtwfurtAwaiting requested review from wfurt

Assignees

@steveisoksteveisok

Labels

area-System.Net.Httpos-maccatalystMacCatalyst OS

Projects


None yet


Milestone

9.0.0

Development

Successfully merging this pull request may close these issues.

ClientWebSocket.ConnectAsync() does not work on Mac 

4 participants

@steveisok@MihaZupan@simonrozsival@karelz

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[maccatalyst] Make sure MacProxy is included in System.Net.Http by steveisok · Pull Request #91473 · dotnet/runtime · GitHub
Skip to content
[maccatalyst] Make sure MacProxy is included in System.Net.Http - #91473
Merged
steveisok merged 1 commit into
dotnet:mainfrom 
steveisok:use-macproxy-catalyst
Sep 5, 2023
Merged
[maccatalyst] Make sure MacProxy is included in System.Net.Http#91473
steveisok merged 1 commit into
dotnet:mainfrom 
steveisok:use-macproxy-catalyst
Conversation
@steveisok
@steveisoksteveisok
commented
Sep 1, 2023•

edited by karelz

Loading

Copy link


Copy Markdown

Member
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.
Steve Pfister
[maccatalyst] Make sure MacProxy is included in System.Net.Http
bd26996
dotnet#90258 identified that `HttpClient.DefaultProxy` returned `System.Net.Http.HttpNoProxy` when using MacCatalyst. This is due to a condition in System.Net.Http.csproj not including maccatalyst as a condition and as a result, skipped adding the MacProxy sources.
Way back when, dotnet#47823 had the condition, but this appears to have changed in dotnet#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.
@ghostghost
assigned steveisokSep 1, 2023
@ghost
ghost
commented
Sep 1, 2023

Copy link


Copy Markdown

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
steveisok
requested a review
from wfurtSeptember 1, 2023 17:34
@steveisok
steveisok
commented
Sep 1, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-maccatalyst
@azure-pipelines
azure-pipelinesBot
commented
Sep 1, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@steveisok
steveisok
merged commit f9db6b4
into
dotnet:mainSep 5, 2023
@steveisok
steveisok
commented
Sep 5, 2023

Copy link


Copy Markdown

MemberAuthor
/backport to release/8.0
@steveisok
steveisok
commented
Sep 5, 2023

Copy link


Copy Markdown

MemberAuthor
/backport to release/7.0-staging
@github-actions
github-actionsBot
commented
Sep 5, 2023

Copy link


Copy Markdown

Contributor
Started backporting to release/8.0: https://github.com/dotnet/runtime/actions/runs/6086905990
@github-actions
github-actionsBot
commented
Sep 5, 2023

Copy link


Copy Markdown

Contributor
Started backporting to release/7.0-staging: https://github.com/dotnet/runtime/actions/runs/6086908252
@github-actions
github-actionsBot
commented
Sep 5, 2023

Copy link


Copy Markdown

Contributor
@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
github-actionsBot
commented
Sep 5, 2023

Copy link


Copy Markdown

Contributor
@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.
@github-actionsgithub-actionsBot
mentioned this pull request
Sep 5, 2023
 Merged

@MihaZupan
MihaZupan
commented
Sep 5, 2023

Copy link


Copy Markdown

Member
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
steveisok
commented
Sep 5, 2023

Copy link


Copy Markdown

MemberAuthor
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
MihaZupan
commented
Sep 5, 2023

Copy link


Copy Markdown

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

Line 120
in
e3925e3
publicvoidProxy_UseEnvironmentVariableToSetSystemProxy_RequestGoesThruProxy()

looks like it could be the relevant test.
steveisok pushed a commit
to steveisok/runtime
that referenced
this pull request
Sep 8, 2023
Steve Pfister
[release/7.0-staging] [maccatalyst] Make sure MacProxy is included in…
930cc64
… System.Net.Http
Backport of dotnet#91473 to release/7.0
@steveisoksteveisok
mentioned this pull request
Sep 8, 2023
 Merged

carlossanlop pushed a commit
that referenced
this pull request
Sep 11, 2023
@steveisokSteve Pfister
[release/7.0-staging] [maccatalyst] Make sure MacProxy is included in…
8d2dff4
… System.Net.Http (#91817)
* [release/7.0-staging] [maccatalyst] Make sure MacProxy is included in System.Net.Http
Backport of #91473 to release/7.0
* Additional conditions
---------
Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
@karelzkarelz
added this to the 9.0.0 milestone
Sep 14, 2023
@ghostghost
locked as resolved and limited conversation to collaborators
Oct 14, 2023
@karelzkarelz
added
the 
os-maccatalyst
MacCatalyst OS
label
Jun 24, 2024
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@simonrozsivalsimonrozsivalsimonrozsival approved these changes
@akoeplingerakoeplingerAwaiting requested review from akoeplinger
@wfurtwfurtAwaiting requested review from wfurt

Assignees

@steveisoksteveisok

Labels

area-System.Net.Httpos-maccatalystMacCatalyst OS

Projects


None yet


Milestone

9.0.0

Development

Successfully merging this pull request may close these issues.

ClientWebSocket.ConnectAsync() does not work on Mac 

4 participants

@steveisok@MihaZupan@simonrozsival@karelz

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
[maccatalyst] Make sure MacProxy is included in System.Net.Http by steveisok · Pull Request #91473 · dotnet/runtime · GitHub
Skip to content
[maccatalyst] Make sure MacProxy is included in System.Net.Http - #91473
Merged
steveisok merged 1 commit into
dotnet:mainfrom 
steveisok:use-macproxy-catalyst
Sep 5, 2023
Merged
[maccatalyst] Make sure MacProxy is included in System.Net.Http#91473
steveisok merged 1 commit into
dotnet:mainfrom 
steveisok:use-macproxy-catalyst
Conversation
@steveisok
@steveisoksteveisok
commented
Sep 1, 2023•

edited by karelz

Loading

Copy link


Copy Markdown

Member
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.
Steve Pfister
[maccatalyst] Make sure MacProxy is included in System.Net.Http
bd26996
dotnet#90258 identified that `HttpClient.DefaultProxy` returned `System.Net.Http.HttpNoProxy` when using MacCatalyst. This is due to a condition in System.Net.Http.csproj not including maccatalyst as a condition and as a result, skipped adding the MacProxy sources.
Way back when, dotnet#47823 had the condition, but this appears to have changed in dotnet#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.
@ghostghost
assigned steveisokSep 1, 2023
@ghost
ghost
commented
Sep 1, 2023

Copy link


Copy Markdown

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
steveisok
requested a review
from wfurtSeptember 1, 2023 17:34
@steveisok
steveisok
commented
Sep 1, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-maccatalyst
@azure-pipelines
azure-pipelinesBot
commented
Sep 1, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@steveisok
steveisok
merged commit f9db6b4
into
dotnet:mainSep 5, 2023
@steveisok
steveisok
commented
Sep 5, 2023

Copy link


Copy Markdown

MemberAuthor
/backport to release/8.0
@steveisok
steveisok
commented
Sep 5, 2023

Copy link


Copy Markdown

MemberAuthor
/backport to release/7.0-staging
@github-actions
github-actionsBot
commented
Sep 5, 2023

Copy link


Copy Markdown

Contributor
Started backporting to release/8.0: https://github.com/dotnet/runtime/actions/runs/6086905990
@github-actions
github-actionsBot
commented
Sep 5, 2023

Copy link


Copy Markdown

Contributor
Started backporting to release/7.0-staging: https://github.com/dotnet/runtime/actions/runs/6086908252
@github-actions
github-actionsBot
commented
Sep 5, 2023

Copy link


Copy Markdown

Contributor
@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
github-actionsBot
commented
Sep 5, 2023

Copy link


Copy Markdown

Contributor
@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.
@github-actionsgithub-actionsBot
mentioned this pull request
Sep 5, 2023
 Merged

@MihaZupan
MihaZupan
commented
Sep 5, 2023

Copy link


Copy Markdown

Member
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
steveisok
commented
Sep 5, 2023

Copy link


Copy Markdown

MemberAuthor
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
MihaZupan
commented
Sep 5, 2023

Copy link


Copy Markdown

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

Line 120
in
e3925e3
publicvoidProxy_UseEnvironmentVariableToSetSystemProxy_RequestGoesThruProxy()

looks like it could be the relevant test.
steveisok pushed a commit
to steveisok/runtime
that referenced
this pull request
Sep 8, 2023
Steve Pfister
[release/7.0-staging] [maccatalyst] Make sure MacProxy is included in…
930cc64
… System.Net.Http
Backport of dotnet#91473 to release/7.0
@steveisoksteveisok
mentioned this pull request
Sep 8, 2023
 Merged

carlossanlop pushed a commit
that referenced
this pull request
Sep 11, 2023
@steveisokSteve Pfister
[release/7.0-staging] [maccatalyst] Make sure MacProxy is included in…
8d2dff4
… System.Net.Http (#91817)
* [release/7.0-staging] [maccatalyst] Make sure MacProxy is included in System.Net.Http
Backport of #91473 to release/7.0
* Additional conditions
---------
Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
@karelzkarelz
added this to the 9.0.0 milestone
Sep 14, 2023
@ghostghost
locked as resolved and limited conversation to collaborators
Oct 14, 2023
@karelzkarelz
added
the 
os-maccatalyst
MacCatalyst OS
label
Jun 24, 2024
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@simonrozsivalsimonrozsivalsimonrozsival approved these changes
@akoeplingerakoeplingerAwaiting requested review from akoeplinger
@wfurtwfurtAwaiting requested review from wfurt

Assignees

@steveisoksteveisok

Labels

area-System.Net.Httpos-maccatalystMacCatalyst OS

Projects


None yet


Milestone

9.0.0

Development

Successfully merging this pull request may close these issues.

ClientWebSocket.ConnectAsync() does not work on Mac 

4 participants

@steveisok@MihaZupan@simonrozsival@karelz

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[maccatalyst] Make sure MacProxy is included in System.Net.Http by steveisok · Pull Request #91473 · dotnet/runtime · GitHub
Skip to content
[maccatalyst] Make sure MacProxy is included in System.Net.Http - #91473
Merged
steveisok merged 1 commit into
dotnet:mainfrom 
steveisok:use-macproxy-catalyst
Sep 5, 2023
Merged
[maccatalyst] Make sure MacProxy is included in System.Net.Http#91473
steveisok merged 1 commit into
dotnet:mainfrom 
steveisok:use-macproxy-catalyst
Conversation
@steveisok
@steveisoksteveisok
commented
Sep 1, 2023•

edited by karelz

Loading

Copy link


Copy Markdown

Member
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.
Steve Pfister
[maccatalyst] Make sure MacProxy is included in System.Net.Http
bd26996
dotnet#90258 identified that `HttpClient.DefaultProxy` returned `System.Net.Http.HttpNoProxy` when using MacCatalyst. This is due to a condition in System.Net.Http.csproj not including maccatalyst as a condition and as a result, skipped adding the MacProxy sources.
Way back when, dotnet#47823 had the condition, but this appears to have changed in dotnet#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.
@ghostghost
assigned steveisokSep 1, 2023
@ghost
ghost
commented
Sep 1, 2023

Copy link


Copy Markdown

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
steveisok
requested a review
from wfurtSeptember 1, 2023 17:34
@steveisok
steveisok
commented
Sep 1, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-maccatalyst
@azure-pipelines
azure-pipelinesBot
commented
Sep 1, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@steveisok
steveisok
merged commit f9db6b4
into
dotnet:mainSep 5, 2023
@steveisok
steveisok
commented
Sep 5, 2023

Copy link


Copy Markdown

MemberAuthor
/backport to release/8.0
@steveisok
steveisok
commented
Sep 5, 2023

Copy link


Copy Markdown

MemberAuthor
/backport to release/7.0-staging
@github-actions
github-actionsBot
commented
Sep 5, 2023

Copy link


Copy Markdown

Contributor
Started backporting to release/8.0: https://github.com/dotnet/runtime/actions/runs/6086905990
@github-actions
github-actionsBot
commented
Sep 5, 2023

Copy link


Copy Markdown

Contributor
Started backporting to release/7.0-staging: https://github.com/dotnet/runtime/actions/runs/6086908252
@github-actions
github-actionsBot
commented
Sep 5, 2023

Copy link


Copy Markdown

Contributor
@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
github-actionsBot
commented
Sep 5, 2023

Copy link


Copy Markdown

Contributor
@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.
@github-actionsgithub-actionsBot
mentioned this pull request
Sep 5, 2023
 Merged

@MihaZupan
MihaZupan
commented
Sep 5, 2023

Copy link


Copy Markdown

Member
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
steveisok
commented
Sep 5, 2023

Copy link


Copy Markdown

MemberAuthor
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
MihaZupan
commented
Sep 5, 2023

Copy link


Copy Markdown

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

Line 120
in
e3925e3
publicvoidProxy_UseEnvironmentVariableToSetSystemProxy_RequestGoesThruProxy()

looks like it could be the relevant test.
steveisok pushed a commit
to steveisok/runtime
that referenced
this pull request
Sep 8, 2023
Steve Pfister
[release/7.0-staging] [maccatalyst] Make sure MacProxy is included in…
930cc64
… System.Net.Http
Backport of dotnet#91473 to release/7.0
@steveisoksteveisok
mentioned this pull request
Sep 8, 2023
 Merged

carlossanlop pushed a commit
that referenced
this pull request
Sep 11, 2023
@steveisokSteve Pfister
[release/7.0-staging] [maccatalyst] Make sure MacProxy is included in…
8d2dff4
… System.Net.Http (#91817)
* [release/7.0-staging] [maccatalyst] Make sure MacProxy is included in System.Net.Http
Backport of #91473 to release/7.0
* Additional conditions
---------
Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
@karelzkarelz
added this to the 9.0.0 milestone
Sep 14, 2023
@ghostghost
locked as resolved and limited conversation to collaborators
Oct 14, 2023
@karelzkarelz
added
the 
os-maccatalyst
MacCatalyst OS
label
Jun 24, 2024
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@simonrozsivalsimonrozsivalsimonrozsival approved these changes
@akoeplingerakoeplingerAwaiting requested review from akoeplinger
@wfurtwfurtAwaiting requested review from wfurt

Assignees

@steveisoksteveisok

Labels

area-System.Net.Httpos-maccatalystMacCatalyst OS

Projects


None yet


Milestone

9.0.0

Development

Successfully merging this pull request may close these issues.

ClientWebSocket.ConnectAsync() does not work on Mac 

4 participants

@steveisok@MihaZupan@simonrozsival@karelz

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[maccatalyst] Make sure MacProxy is included in System.Net.Http by steveisok · Pull Request #91473 · dotnet/runtime · GitHub
Skip to content
[maccatalyst] Make sure MacProxy is included in System.Net.Http - #91473
Merged
steveisok merged 1 commit into
dotnet:mainfrom 
steveisok:use-macproxy-catalyst
Sep 5, 2023
Merged
[maccatalyst] Make sure MacProxy is included in System.Net.Http#91473
steveisok merged 1 commit into
dotnet:mainfrom 
steveisok:use-macproxy-catalyst
Conversation
@steveisok
@steveisoksteveisok
commented
Sep 1, 2023•

edited by karelz

Loading

Copy link


Copy Markdown

Member
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.
Steve Pfister
[maccatalyst] Make sure MacProxy is included in System.Net.Http
bd26996
dotnet#90258 identified that `HttpClient.DefaultProxy` returned `System.Net.Http.HttpNoProxy` when using MacCatalyst. This is due to a condition in System.Net.Http.csproj not including maccatalyst as a condition and as a result, skipped adding the MacProxy sources.
Way back when, dotnet#47823 had the condition, but this appears to have changed in dotnet#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.
@ghostghost
assigned steveisokSep 1, 2023
@ghost
ghost
commented
Sep 1, 2023

Copy link


Copy Markdown

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
steveisok
requested a review
from wfurtSeptember 1, 2023 17:34
@steveisok
steveisok
commented
Sep 1, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-maccatalyst
@azure-pipelines
azure-pipelinesBot
commented
Sep 1, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@steveisok
steveisok
merged commit f9db6b4
into
dotnet:mainSep 5, 2023
@steveisok
steveisok
commented
Sep 5, 2023

Copy link


Copy Markdown

MemberAuthor
/backport to release/8.0
@steveisok
steveisok
commented
Sep 5, 2023

Copy link


Copy Markdown

MemberAuthor
/backport to release/7.0-staging
@github-actions
github-actionsBot
commented
Sep 5, 2023

Copy link


Copy Markdown

Contributor
Started backporting to release/8.0: https://github.com/dotnet/runtime/actions/runs/6086905990
@github-actions
github-actionsBot
commented
Sep 5, 2023

Copy link


Copy Markdown

Contributor
Started backporting to release/7.0-staging: https://github.com/dotnet/runtime/actions/runs/6086908252
@github-actions
github-actionsBot
commented
Sep 5, 2023

Copy link


Copy Markdown

Contributor
@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
github-actionsBot
commented
Sep 5, 2023

Copy link


Copy Markdown

Contributor
@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.
@github-actionsgithub-actionsBot
mentioned this pull request
Sep 5, 2023
 Merged

@MihaZupan
MihaZupan
commented
Sep 5, 2023

Copy link


Copy Markdown

Member
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
steveisok
commented
Sep 5, 2023

Copy link


Copy Markdown

MemberAuthor
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
MihaZupan
commented
Sep 5, 2023

Copy link


Copy Markdown

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

Line 120
in
e3925e3
publicvoidProxy_UseEnvironmentVariableToSetSystemProxy_RequestGoesThruProxy()

looks like it could be the relevant test.
steveisok pushed a commit
to steveisok/runtime
that referenced
this pull request
Sep 8, 2023
Steve Pfister
[release/7.0-staging] [maccatalyst] Make sure MacProxy is included in…
930cc64
… System.Net.Http
Backport of dotnet#91473 to release/7.0
@steveisoksteveisok
mentioned this pull request
Sep 8, 2023
 Merged

carlossanlop pushed a commit
that referenced
this pull request
Sep 11, 2023
@steveisokSteve Pfister
[release/7.0-staging] [maccatalyst] Make sure MacProxy is included in…
8d2dff4
… System.Net.Http (#91817)
* [release/7.0-staging] [maccatalyst] Make sure MacProxy is included in System.Net.Http
Backport of #91473 to release/7.0
* Additional conditions
---------
Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
@karelzkarelz
added this to the 9.0.0 milestone
Sep 14, 2023
@ghostghost
locked as resolved and limited conversation to collaborators
Oct 14, 2023
@karelzkarelz
added
the 
os-maccatalyst
MacCatalyst OS
label
Jun 24, 2024
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@simonrozsivalsimonrozsivalsimonrozsival approved these changes
@akoeplingerakoeplingerAwaiting requested review from akoeplinger
@wfurtwfurtAwaiting requested review from wfurt

Assignees

@steveisoksteveisok

Labels

area-System.Net.Httpos-maccatalystMacCatalyst OS

Projects


None yet


Milestone

9.0.0

Development

Successfully merging this pull request may close these issues.

ClientWebSocket.ConnectAsync() does not work on Mac 

4 participants

@steveisok@MihaZupan@simonrozsival@karelz

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
[maccatalyst] Make sure MacProxy is included in System.Net.Http by steveisok · Pull Request #91473 · dotnet/runtime · GitHub
Skip to content
[maccatalyst] Make sure MacProxy is included in System.Net.Http - #91473
Merged
steveisok merged 1 commit into
dotnet:mainfrom 
steveisok:use-macproxy-catalyst
Sep 5, 2023
Merged
[maccatalyst] Make sure MacProxy is included in System.Net.Http#91473
steveisok merged 1 commit into
dotnet:mainfrom 
steveisok:use-macproxy-catalyst
Conversation
@steveisok
@steveisoksteveisok
commented
Sep 1, 2023•

edited by karelz

Loading

Copy link


Copy Markdown

Member
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.
Steve Pfister
[maccatalyst] Make sure MacProxy is included in System.Net.Http
bd26996
dotnet#90258 identified that `HttpClient.DefaultProxy` returned `System.Net.Http.HttpNoProxy` when using MacCatalyst. This is due to a condition in System.Net.Http.csproj not including maccatalyst as a condition and as a result, skipped adding the MacProxy sources.
Way back when, dotnet#47823 had the condition, but this appears to have changed in dotnet#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.
@ghostghost
assigned steveisokSep 1, 2023
@ghost
ghost
commented
Sep 1, 2023

Copy link


Copy Markdown

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
steveisok
requested a review
from wfurtSeptember 1, 2023 17:34
@steveisok
steveisok
commented
Sep 1, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-maccatalyst
@azure-pipelines
azure-pipelinesBot
commented
Sep 1, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@steveisok
steveisok
merged commit f9db6b4
into
dotnet:mainSep 5, 2023
@steveisok
steveisok
commented
Sep 5, 2023

Copy link


Copy Markdown

MemberAuthor
/backport to release/8.0
@steveisok
steveisok
commented
Sep 5, 2023

Copy link


Copy Markdown

MemberAuthor
/backport to release/7.0-staging
@github-actions
github-actionsBot
commented
Sep 5, 2023

Copy link


Copy Markdown

Contributor
Started backporting to release/8.0: https://github.com/dotnet/runtime/actions/runs/6086905990
@github-actions
github-actionsBot
commented
Sep 5, 2023

Copy link


Copy Markdown

Contributor
Started backporting to release/7.0-staging: https://github.com/dotnet/runtime/actions/runs/6086908252
@github-actions
github-actionsBot
commented
Sep 5, 2023

Copy link


Copy Markdown

Contributor
@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
github-actionsBot
commented
Sep 5, 2023

Copy link


Copy Markdown

Contributor
@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.
@github-actionsgithub-actionsBot
mentioned this pull request
Sep 5, 2023
 Merged

@MihaZupan
MihaZupan
commented
Sep 5, 2023

Copy link


Copy Markdown

Member
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
steveisok
commented
Sep 5, 2023

Copy link


Copy Markdown

MemberAuthor
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
MihaZupan
commented
Sep 5, 2023

Copy link


Copy Markdown

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

Line 120
in
e3925e3
publicvoidProxy_UseEnvironmentVariableToSetSystemProxy_RequestGoesThruProxy()

looks like it could be the relevant test.
steveisok pushed a commit
to steveisok/runtime
that referenced
this pull request
Sep 8, 2023
Steve Pfister
[release/7.0-staging] [maccatalyst] Make sure MacProxy is included in…
930cc64
… System.Net.Http
Backport of dotnet#91473 to release/7.0
@steveisoksteveisok
mentioned this pull request
Sep 8, 2023
 Merged

carlossanlop pushed a commit
that referenced
this pull request
Sep 11, 2023
@steveisokSteve Pfister
[release/7.0-staging] [maccatalyst] Make sure MacProxy is included in…
8d2dff4
… System.Net.Http (#91817)
* [release/7.0-staging] [maccatalyst] Make sure MacProxy is included in System.Net.Http
Backport of #91473 to release/7.0
* Additional conditions
---------
Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
@karelzkarelz
added this to the 9.0.0 milestone
Sep 14, 2023
@ghostghost
locked as resolved and limited conversation to collaborators
Oct 14, 2023
@karelzkarelz
added
the 
os-maccatalyst
MacCatalyst OS
label
Jun 24, 2024
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@simonrozsivalsimonrozsivalsimonrozsival approved these changes
@akoeplingerakoeplingerAwaiting requested review from akoeplinger
@wfurtwfurtAwaiting requested review from wfurt

Assignees

@steveisoksteveisok

Labels

area-System.Net.Httpos-maccatalystMacCatalyst OS

Projects


None yet


Milestone

9.0.0

Development

Successfully merging this pull request may close these issues.

ClientWebSocket.ConnectAsync() does not work on Mac 

4 participants

@steveisok@MihaZupan@simonrozsival@karelz