[release/8.0] Skip duplicate --info output if it is known SDK output#92013

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
carlossanlop merged 4 commits into from
Sep 14, 2023
Merged

[release/8.0] Skip duplicate --info output if it is known SDK output #92013

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
07f80ac
Skip duplicate --info output if it is known SDK output
elinor-fung Sep 11, 2023
718c325
Update src/native/corehost/fxr/fx_muxer.cpp
elinor-fung Sep 12, 2023
775ae93
Add tests
elinor-fung Sep 12, 2023
78d58cb
Merge branch 'release/8.0' into backport/pr-91900-to-release/8.0
carlossanlop Sep 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions src/installer/tests/HostActivation.Tests/DotnetArgValidation.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -82,6 +82,35 @@ public void InvalidFileOrCommand_NoSDK_ListsPossibleIssues()
.And.FindAnySdk(false);
}

[Fact]
public void DotNetInfo_NoSDK()
{
sharedTestState.BuiltDotNet.Exec("--info")
.CaptureStdOut()
.CaptureStdErr()
.Execute()
.Should().Pass()
.And.HaveStdOutMatching($@"Architecture:\s*{RepoDirectoriesProvider.Default.BuildArchitecture}")
.And.HaveStdOutMatching($@"RID:\s*{RepoDirectoriesProvider.Default.BuildRID}");
}

[Fact]
public void DotNetInfo_WithSDK()
{
DotNetCli dotnet = new DotNetBuilder(sharedTestState.BaseDirectory.Location, RepoDirectoriesProvider.Default.BuiltDotnet, "withSdk")
.AddMicrosoftNETCoreAppFrameworkMockHostPolicy("1.0.0")
.AddMockSDK("1.0.0", "1.0.0")
.Build();

dotnet.Exec("--info")
.WorkingDirectory(sharedTestState.BaseDirectory.Location)
.CaptureStdOut()
.CaptureStdErr()
.Execute()
.Should().Pass()
.And.NotHaveStdOutMatching($@"RID:\s*{RepoDirectoriesProvider.Default.BuildRID}");
}

// Return a non-existent path that contains a mix of / and \
private string GetNonexistentAndUnnormalizedPath()
{
Expand Down
7 changes: 7 additions & 0 deletions src/installer/tests/TestUtils/Assertions/CommandResultAssertions.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,6 +74,13 @@ public AndConstraint<CommandResultAssertions> HaveStdOutMatching(string pattern,
return new AndConstraint<CommandResultAssertions>(this);
}

public AndConstraint<CommandResultAssertions> NotHaveStdOutMatching(string pattern, RegexOptions options = RegexOptions.None)
{
Execute.Assertion.ForCondition(!Regex.IsMatch(Result.StdOut, pattern, options))
.FailWith($"The command output matched a pattern is should not have matched. Pattern: '{pattern}'{GetDiagnosticsInfo()}");
return new AndConstraint<CommandResultAssertions>(this);
}

public AndConstraint<CommandResultAssertions> HaveStdErr()
{
Execute.Assertion.ForCondition(!string.IsNullOrEmpty(Result.StdErr))
Expand Down
11 changes: 6 additions & 5 deletions src/native/corehost/fxr/command_line.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -280,17 +280,18 @@ int command_line::parse_args_for_sdk_command(
return parse_args(host_info, 1, argc, argv, false, host_mode_t::muxer, new_argoff, app_candidate, opts);
}

void command_line::print_muxer_info(const pal::string_t &dotnet_root, const pal::string_t &global_json_path)
void command_line::print_muxer_info(const pal::string_t &dotnet_root, const pal::string_t &global_json_path, bool skip_sdk_info_output)
{
pal::string_t commit = _STRINGIFY(REPO_COMMIT_HASH);
trace::println(_X("\n")
_X("Host:\n")
_X(" Version: ") _STRINGIFY(HOST_VERSION) _X("\n")
_X(" Architecture: ") _STRINGIFY(CURRENT_ARCH_NAME) _X("\n")
_X(" Commit: %s\n")
_X(" RID: %s"),
commit.substr(0, 10).c_str(),
get_runtime_id().c_str());
_X(" Commit: %s"),
commit.substr(0, 10).c_str());

if (!skip_sdk_info_output)
trace::println(_X(" RID: %s"), get_runtime_id().c_str());

trace::println(_X("\n")
_X(".NET SDKs installed:"));
Expand Down
4 changes: 3 additions & 1 deletion src/native/corehost/fxr/command_line.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,9 @@ namespace command_line
/*out*/ pal::string_t &app_candidate,
/*out*/ opt_map_t &opts);

void print_muxer_info(const pal::string_t &dotnet_root, const pal::string_t &global_json_path);
// skip_sdk_info_output indicates whether or not to skip any information that the SDK would have
// already printed. Related: https://github.com/dotnet/sdk/issues/33697
void print_muxer_info(const pal::string_t &dotnet_root, const pal::string_t &global_json_path, bool skip_sdk_info_output);
void print_muxer_usage(bool is_sdk_present);
};

Expand Down
4 changes: 2 additions & 2 deletions src/native/corehost/fxr/fx_muxer.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1055,7 +1055,7 @@ int fx_muxer_t::handle_cli(
}
else if (pal::strcasecmp(_X("--info"), argv[1]) == 0)
{
command_line::print_muxer_info(host_info.dotnet_root, resolver.global_file_path());
command_line::print_muxer_info(host_info.dotnet_root, resolver.global_file_path(), false /*skip_sdk_info_output*/);
return StatusCode::Success;
}

Expand DownExpand Up@@ -1107,7 +1107,7 @@ int fx_muxer_t::handle_cli(

if (pal::strcasecmp(_X("--info"), argv[1]) == 0)
{
command_line::print_muxer_info(host_info.dotnet_root, resolver.global_file_path());
command_line::print_muxer_info(host_info.dotnet_root, resolver.global_file_path(), result == 0 /*skip_sdk_info_output*/);
}

return result;
Expand Down
, '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" + '

Skip to content
[release/8.0] Skip duplicate --info output if it is known SDK output#92013

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

carlossanlop
merged 4 commits into

from

Sep 14, 2023
 Merged


[release/8.0] Skip duplicate --info output if it is known SDK output
#92013
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
07f80ac

Skip duplicate --info output if it is known SDK output


elinor-fung Sep 11, 2023
718c325

Update src/native/corehost/fxr/fx_muxer.cpp


elinor-fung Sep 12, 2023
775ae93

Add tests


elinor-fung Sep 12, 2023
78d58cb

Merge branch 'release/8.0' into backport/pr-91900-to-release/8.0


carlossanlop Sep 13, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


29 changes: 29 additions & 0 deletions
src/installer/tests/HostActivation.Tests/DotnetArgValidation.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,6 +82,35 @@ public void InvalidFileOrCommand_NoSDK_ListsPossibleIssues()
 .And.FindAnySdk(false);
 }

 [Fact]
 public void DotNetInfo_NoSDK()
 {
 sharedTestState.BuiltDotNet.Exec("--info")
 .CaptureStdOut()
 .CaptureStdErr()
 .Execute()
 .Should().Pass()
 .And.HaveStdOutMatching($@"Architecture:\s*{RepoDirectoriesProvider.Default.BuildArchitecture}")
 .And.HaveStdOutMatching($@"RID:\s*{RepoDirectoriesProvider.Default.BuildRID}");
 }

 [Fact]
 public void DotNetInfo_WithSDK()
 {
 DotNetCli dotnet = new DotNetBuilder(sharedTestState.BaseDirectory.Location, RepoDirectoriesProvider.Default.BuiltDotnet, "withSdk")
 .AddMicrosoftNETCoreAppFrameworkMockHostPolicy("1.0.0")
 .AddMockSDK("1.0.0", "1.0.0")
 .Build();

 dotnet.Exec("--info")
 .WorkingDirectory(sharedTestState.BaseDirectory.Location)
 .CaptureStdOut()
 .CaptureStdErr()
 .Execute()
 .Should().Pass()
 .And.NotHaveStdOutMatching($@"RID:\s*{RepoDirectoriesProvider.Default.BuildRID}");
 }

 // Return a non-existent path that contains a mix of / and \
 private string GetNonexistentAndUnnormalizedPath()
 {
Expand Down

7 changes: 7 additions & 0 deletions
src/installer/tests/TestUtils/Assertions/CommandResultAssertions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,6 +74,13 @@ public AndConstraint<CommandResultAssertions> HaveStdOutMatching(string pattern,
 return new AndConstraint<CommandResultAssertions>(this);
 }

 public AndConstraint<CommandResultAssertions> NotHaveStdOutMatching(string pattern, RegexOptions options = RegexOptions.None)
 {
 Execute.Assertion.ForCondition(!Regex.IsMatch(Result.StdOut, pattern, options))
 .FailWith($"The command output matched a pattern is should not have matched. Pattern: '{pattern}'{GetDiagnosticsInfo()}");
 return new AndConstraint<CommandResultAssertions>(this);
 }

 public AndConstraint<CommandResultAssertions> HaveStdErr()
 {
 Execute.Assertion.ForCondition(!string.IsNullOrEmpty(Result.StdErr))
Expand Down

11 changes: 6 additions & 5 deletions
src/native/corehost/fxr/command_line.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -280,17 +280,18 @@ int command_line::parse_args_for_sdk_command(
 return parse_args(host_info, 1, argc, argv, false, host_mode_t::muxer, new_argoff, app_candidate, opts);
}

void command_line::print_muxer_info(const pal::string_t &dotnet_root, const pal::string_t &global_json_path)
void command_line::print_muxer_info(const pal::string_t &dotnet_root, const pal::string_t &global_json_path, bool skip_sdk_info_output)
{
 pal::string_t commit = _STRINGIFY(REPO_COMMIT_HASH);
 trace::println(_X("\n")
 _X("Host:\n")
 _X(" Version: ") _STRINGIFY(HOST_VERSION) _X("\n")
 _X(" Architecture: ") _STRINGIFY(CURRENT_ARCH_NAME) _X("\n")
 _X(" Commit: %s\n")
 _X(" RID: %s"),
 commit.substr(0, 10).c_str(),
 get_runtime_id().c_str());
 _X(" Commit: %s"),
 commit.substr(0, 10).c_str());

 if (!skip_sdk_info_output)
 trace::println(_X(" RID: %s"), get_runtime_id().c_str());

 trace::println(_X("\n")
 _X(".NET SDKs installed:"));
Expand Down

4 changes: 3 additions & 1 deletion
src/native/corehost/fxr/command_line.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,9 @@ namespace command_line
 /*out*/ pal::string_t &app_candidate,
 /*out*/ opt_map_t &opts);

 void print_muxer_info(const pal::string_t &dotnet_root, const pal::string_t &global_json_path);
 // skip_sdk_info_output indicates whether or not to skip any information that the SDK would have
 // already printed. Related: https://github.com/dotnet/sdk/issues/33697
 void print_muxer_info(const pal::string_t &dotnet_root, const pal::string_t &global_json_path, bool skip_sdk_info_output);
 void print_muxer_usage(bool is_sdk_present);
};

Expand Down

4 changes: 2 additions & 2 deletions
src/native/corehost/fxr/fx_muxer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1055,7 +1055,7 @@ int fx_muxer_t::handle_cli(
 }
 else if (pal::strcasecmp(_X("--info"), argv[1]) == 0)
 {
 command_line::print_muxer_info(host_info.dotnet_root, resolver.global_file_path());
 command_line::print_muxer_info(host_info.dotnet_root, resolver.global_file_path(), false /*skip_sdk_info_output*/);
 return StatusCode::Success;
 }

Expand DownExpand Up@@ -1107,7 +1107,7 @@ int fx_muxer_t::handle_cli(

 if (pal::strcasecmp(_X("--info"), argv[1]) == 0)
 {
 command_line::print_muxer_info(host_info.dotnet_root, resolver.global_file_path());
 command_line::print_muxer_info(host_info.dotnet_root, resolver.global_file_path(), result == 0 /*skip_sdk_info_output*/);
 }

 return result;
Expand Down

, '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('^' + ".*" + '

Skip to content
[release/8.0] Skip duplicate --info output if it is known SDK output#92013

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

carlossanlop
merged 4 commits into

from

Sep 14, 2023
 Merged


[release/8.0] Skip duplicate --info output if it is known SDK output
#92013
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
07f80ac

Skip duplicate --info output if it is known SDK output


elinor-fung Sep 11, 2023
718c325

Update src/native/corehost/fxr/fx_muxer.cpp


elinor-fung Sep 12, 2023
775ae93

Add tests


elinor-fung Sep 12, 2023
78d58cb

Merge branch 'release/8.0' into backport/pr-91900-to-release/8.0


carlossanlop Sep 13, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


29 changes: 29 additions & 0 deletions
src/installer/tests/HostActivation.Tests/DotnetArgValidation.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,6 +82,35 @@ public void InvalidFileOrCommand_NoSDK_ListsPossibleIssues()
 .And.FindAnySdk(false);
 }

 [Fact]
 public void DotNetInfo_NoSDK()
 {
 sharedTestState.BuiltDotNet.Exec("--info")
 .CaptureStdOut()
 .CaptureStdErr()
 .Execute()
 .Should().Pass()
 .And.HaveStdOutMatching($@"Architecture:\s*{RepoDirectoriesProvider.Default.BuildArchitecture}")
 .And.HaveStdOutMatching($@"RID:\s*{RepoDirectoriesProvider.Default.BuildRID}");
 }

 [Fact]
 public void DotNetInfo_WithSDK()
 {
 DotNetCli dotnet = new DotNetBuilder(sharedTestState.BaseDirectory.Location, RepoDirectoriesProvider.Default.BuiltDotnet, "withSdk")
 .AddMicrosoftNETCoreAppFrameworkMockHostPolicy("1.0.0")
 .AddMockSDK("1.0.0", "1.0.0")
 .Build();

 dotnet.Exec("--info")
 .WorkingDirectory(sharedTestState.BaseDirectory.Location)
 .CaptureStdOut()
 .CaptureStdErr()
 .Execute()
 .Should().Pass()
 .And.NotHaveStdOutMatching($@"RID:\s*{RepoDirectoriesProvider.Default.BuildRID}");
 }

 // Return a non-existent path that contains a mix of / and \
 private string GetNonexistentAndUnnormalizedPath()
 {
Expand Down

7 changes: 7 additions & 0 deletions
src/installer/tests/TestUtils/Assertions/CommandResultAssertions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,6 +74,13 @@ public AndConstraint<CommandResultAssertions> HaveStdOutMatching(string pattern,
 return new AndConstraint<CommandResultAssertions>(this);
 }

 public AndConstraint<CommandResultAssertions> NotHaveStdOutMatching(string pattern, RegexOptions options = RegexOptions.None)
 {
 Execute.Assertion.ForCondition(!Regex.IsMatch(Result.StdOut, pattern, options))
 .FailWith($"The command output matched a pattern is should not have matched. Pattern: '{pattern}'{GetDiagnosticsInfo()}");
 return new AndConstraint<CommandResultAssertions>(this);
 }

 public AndConstraint<CommandResultAssertions> HaveStdErr()
 {
 Execute.Assertion.ForCondition(!string.IsNullOrEmpty(Result.StdErr))
Expand Down

11 changes: 6 additions & 5 deletions
src/native/corehost/fxr/command_line.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -280,17 +280,18 @@ int command_line::parse_args_for_sdk_command(
 return parse_args(host_info, 1, argc, argv, false, host_mode_t::muxer, new_argoff, app_candidate, opts);
}

void command_line::print_muxer_info(const pal::string_t &dotnet_root, const pal::string_t &global_json_path)
void command_line::print_muxer_info(const pal::string_t &dotnet_root, const pal::string_t &global_json_path, bool skip_sdk_info_output)
{
 pal::string_t commit = _STRINGIFY(REPO_COMMIT_HASH);
 trace::println(_X("\n")
 _X("Host:\n")
 _X(" Version: ") _STRINGIFY(HOST_VERSION) _X("\n")
 _X(" Architecture: ") _STRINGIFY(CURRENT_ARCH_NAME) _X("\n")
 _X(" Commit: %s\n")
 _X(" RID: %s"),
 commit.substr(0, 10).c_str(),
 get_runtime_id().c_str());
 _X(" Commit: %s"),
 commit.substr(0, 10).c_str());

 if (!skip_sdk_info_output)
 trace::println(_X(" RID: %s"), get_runtime_id().c_str());

 trace::println(_X("\n")
 _X(".NET SDKs installed:"));
Expand Down

4 changes: 3 additions & 1 deletion
src/native/corehost/fxr/command_line.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,9 @@ namespace command_line
 /*out*/ pal::string_t &app_candidate,
 /*out*/ opt_map_t &opts);

 void print_muxer_info(const pal::string_t &dotnet_root, const pal::string_t &global_json_path);
 // skip_sdk_info_output indicates whether or not to skip any information that the SDK would have
 // already printed. Related: https://github.com/dotnet/sdk/issues/33697
 void print_muxer_info(const pal::string_t &dotnet_root, const pal::string_t &global_json_path, bool skip_sdk_info_output);
 void print_muxer_usage(bool is_sdk_present);
};

Expand Down

4 changes: 2 additions & 2 deletions
src/native/corehost/fxr/fx_muxer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1055,7 +1055,7 @@ int fx_muxer_t::handle_cli(
 }
 else if (pal::strcasecmp(_X("--info"), argv[1]) == 0)
 {
 command_line::print_muxer_info(host_info.dotnet_root, resolver.global_file_path());
 command_line::print_muxer_info(host_info.dotnet_root, resolver.global_file_path(), false /*skip_sdk_info_output*/);
 return StatusCode::Success;
 }

Expand DownExpand Up@@ -1107,7 +1107,7 @@ int fx_muxer_t::handle_cli(

 if (pal::strcasecmp(_X("--info"), argv[1]) == 0)
 {
 command_line::print_muxer_info(host_info.dotnet_root, resolver.global_file_path());
 command_line::print_muxer_info(host_info.dotnet_root, resolver.global_file_path(), result == 0 /*skip_sdk_info_output*/);
 }

 return result;
Expand Down

, '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('^' + ".*" + '

Skip to content
[release/8.0] Skip duplicate --info output if it is known SDK output#92013

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

carlossanlop
merged 4 commits into

from

Sep 14, 2023
 Merged


[release/8.0] Skip duplicate --info output if it is known SDK output
#92013
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
07f80ac

Skip duplicate --info output if it is known SDK output


elinor-fung Sep 11, 2023
718c325

Update src/native/corehost/fxr/fx_muxer.cpp


elinor-fung Sep 12, 2023
775ae93

Add tests


elinor-fung Sep 12, 2023
78d58cb

Merge branch 'release/8.0' into backport/pr-91900-to-release/8.0


carlossanlop Sep 13, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


29 changes: 29 additions & 0 deletions
src/installer/tests/HostActivation.Tests/DotnetArgValidation.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,6 +82,35 @@ public void InvalidFileOrCommand_NoSDK_ListsPossibleIssues()
 .And.FindAnySdk(false);
 }

 [Fact]
 public void DotNetInfo_NoSDK()
 {
 sharedTestState.BuiltDotNet.Exec("--info")
 .CaptureStdOut()
 .CaptureStdErr()
 .Execute()
 .Should().Pass()
 .And.HaveStdOutMatching($@"Architecture:\s*{RepoDirectoriesProvider.Default.BuildArchitecture}")
 .And.HaveStdOutMatching($@"RID:\s*{RepoDirectoriesProvider.Default.BuildRID}");
 }

 [Fact]
 public void DotNetInfo_WithSDK()
 {
 DotNetCli dotnet = new DotNetBuilder(sharedTestState.BaseDirectory.Location, RepoDirectoriesProvider.Default.BuiltDotnet, "withSdk")
 .AddMicrosoftNETCoreAppFrameworkMockHostPolicy("1.0.0")
 .AddMockSDK("1.0.0", "1.0.0")
 .Build();

 dotnet.Exec("--info")
 .WorkingDirectory(sharedTestState.BaseDirectory.Location)
 .CaptureStdOut()
 .CaptureStdErr()
 .Execute()
 .Should().Pass()
 .And.NotHaveStdOutMatching($@"RID:\s*{RepoDirectoriesProvider.Default.BuildRID}");
 }

 // Return a non-existent path that contains a mix of / and \
 private string GetNonexistentAndUnnormalizedPath()
 {
Expand Down

7 changes: 7 additions & 0 deletions
src/installer/tests/TestUtils/Assertions/CommandResultAssertions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,6 +74,13 @@ public AndConstraint<CommandResultAssertions> HaveStdOutMatching(string pattern,
 return new AndConstraint<CommandResultAssertions>(this);
 }

 public AndConstraint<CommandResultAssertions> NotHaveStdOutMatching(string pattern, RegexOptions options = RegexOptions.None)
 {
 Execute.Assertion.ForCondition(!Regex.IsMatch(Result.StdOut, pattern, options))
 .FailWith($"The command output matched a pattern is should not have matched. Pattern: '{pattern}'{GetDiagnosticsInfo()}");
 return new AndConstraint<CommandResultAssertions>(this);
 }

 public AndConstraint<CommandResultAssertions> HaveStdErr()
 {
 Execute.Assertion.ForCondition(!string.IsNullOrEmpty(Result.StdErr))
Expand Down

11 changes: 6 additions & 5 deletions
src/native/corehost/fxr/command_line.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -280,17 +280,18 @@ int command_line::parse_args_for_sdk_command(
 return parse_args(host_info, 1, argc, argv, false, host_mode_t::muxer, new_argoff, app_candidate, opts);
}

void command_line::print_muxer_info(const pal::string_t &dotnet_root, const pal::string_t &global_json_path)
void command_line::print_muxer_info(const pal::string_t &dotnet_root, const pal::string_t &global_json_path, bool skip_sdk_info_output)
{
 pal::string_t commit = _STRINGIFY(REPO_COMMIT_HASH);
 trace::println(_X("\n")
 _X("Host:\n")
 _X(" Version: ") _STRINGIFY(HOST_VERSION) _X("\n")
 _X(" Architecture: ") _STRINGIFY(CURRENT_ARCH_NAME) _X("\n")
 _X(" Commit: %s\n")
 _X(" RID: %s"),
 commit.substr(0, 10).c_str(),
 get_runtime_id().c_str());
 _X(" Commit: %s"),
 commit.substr(0, 10).c_str());

 if (!skip_sdk_info_output)
 trace::println(_X(" RID: %s"), get_runtime_id().c_str());

 trace::println(_X("\n")
 _X(".NET SDKs installed:"));
Expand Down

4 changes: 3 additions & 1 deletion
src/native/corehost/fxr/command_line.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,9 @@ namespace command_line
 /*out*/ pal::string_t &app_candidate,
 /*out*/ opt_map_t &opts);

 void print_muxer_info(const pal::string_t &dotnet_root, const pal::string_t &global_json_path);
 // skip_sdk_info_output indicates whether or not to skip any information that the SDK would have
 // already printed. Related: https://github.com/dotnet/sdk/issues/33697
 void print_muxer_info(const pal::string_t &dotnet_root, const pal::string_t &global_json_path, bool skip_sdk_info_output);
 void print_muxer_usage(bool is_sdk_present);
};

Expand Down

4 changes: 2 additions & 2 deletions
src/native/corehost/fxr/fx_muxer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1055,7 +1055,7 @@ int fx_muxer_t::handle_cli(
 }
 else if (pal::strcasecmp(_X("--info"), argv[1]) == 0)
 {
 command_line::print_muxer_info(host_info.dotnet_root, resolver.global_file_path());
 command_line::print_muxer_info(host_info.dotnet_root, resolver.global_file_path(), false /*skip_sdk_info_output*/);
 return StatusCode::Success;
 }

Expand DownExpand Up@@ -1107,7 +1107,7 @@ int fx_muxer_t::handle_cli(

 if (pal::strcasecmp(_X("--info"), argv[1]) == 0)
 {
 command_line::print_muxer_info(host_info.dotnet_root, resolver.global_file_path());
 command_line::print_muxer_info(host_info.dotnet_root, resolver.global_file_path(), result == 0 /*skip_sdk_info_output*/);
 }

 return result;
Expand Down

, '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" + '

Skip to content
[release/8.0] Skip duplicate --info output if it is known SDK output#92013

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

carlossanlop
merged 4 commits into

from

Sep 14, 2023
 Merged


[release/8.0] Skip duplicate --info output if it is known SDK output
#92013
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
07f80ac

Skip duplicate --info output if it is known SDK output


elinor-fung Sep 11, 2023
718c325

Update src/native/corehost/fxr/fx_muxer.cpp


elinor-fung Sep 12, 2023
775ae93

Add tests


elinor-fung Sep 12, 2023
78d58cb

Merge branch 'release/8.0' into backport/pr-91900-to-release/8.0


carlossanlop Sep 13, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


29 changes: 29 additions & 0 deletions
src/installer/tests/HostActivation.Tests/DotnetArgValidation.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,6 +82,35 @@ public void InvalidFileOrCommand_NoSDK_ListsPossibleIssues()
 .And.FindAnySdk(false);
 }

 [Fact]
 public void DotNetInfo_NoSDK()
 {
 sharedTestState.BuiltDotNet.Exec("--info")
 .CaptureStdOut()
 .CaptureStdErr()
 .Execute()
 .Should().Pass()
 .And.HaveStdOutMatching($@"Architecture:\s*{RepoDirectoriesProvider.Default.BuildArchitecture}")
 .And.HaveStdOutMatching($@"RID:\s*{RepoDirectoriesProvider.Default.BuildRID}");
 }

 [Fact]
 public void DotNetInfo_WithSDK()
 {
 DotNetCli dotnet = new DotNetBuilder(sharedTestState.BaseDirectory.Location, RepoDirectoriesProvider.Default.BuiltDotnet, "withSdk")
 .AddMicrosoftNETCoreAppFrameworkMockHostPolicy("1.0.0")
 .AddMockSDK("1.0.0", "1.0.0")
 .Build();

 dotnet.Exec("--info")
 .WorkingDirectory(sharedTestState.BaseDirectory.Location)
 .CaptureStdOut()
 .CaptureStdErr()
 .Execute()
 .Should().Pass()
 .And.NotHaveStdOutMatching($@"RID:\s*{RepoDirectoriesProvider.Default.BuildRID}");
 }

 // Return a non-existent path that contains a mix of / and \
 private string GetNonexistentAndUnnormalizedPath()
 {
Expand Down

7 changes: 7 additions & 0 deletions
src/installer/tests/TestUtils/Assertions/CommandResultAssertions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,6 +74,13 @@ public AndConstraint<CommandResultAssertions> HaveStdOutMatching(string pattern,
 return new AndConstraint<CommandResultAssertions>(this);
 }

 public AndConstraint<CommandResultAssertions> NotHaveStdOutMatching(string pattern, RegexOptions options = RegexOptions.None)
 {
 Execute.Assertion.ForCondition(!Regex.IsMatch(Result.StdOut, pattern, options))
 .FailWith($"The command output matched a pattern is should not have matched. Pattern: '{pattern}'{GetDiagnosticsInfo()}");
 return new AndConstraint<CommandResultAssertions>(this);
 }

 public AndConstraint<CommandResultAssertions> HaveStdErr()
 {
 Execute.Assertion.ForCondition(!string.IsNullOrEmpty(Result.StdErr))
Expand Down

11 changes: 6 additions & 5 deletions
src/native/corehost/fxr/command_line.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -280,17 +280,18 @@ int command_line::parse_args_for_sdk_command(
 return parse_args(host_info, 1, argc, argv, false, host_mode_t::muxer, new_argoff, app_candidate, opts);
}

void command_line::print_muxer_info(const pal::string_t &dotnet_root, const pal::string_t &global_json_path)
void command_line::print_muxer_info(const pal::string_t &dotnet_root, const pal::string_t &global_json_path, bool skip_sdk_info_output)
{
 pal::string_t commit = _STRINGIFY(REPO_COMMIT_HASH);
 trace::println(_X("\n")
 _X("Host:\n")
 _X(" Version: ") _STRINGIFY(HOST_VERSION) _X("\n")
 _X(" Architecture: ") _STRINGIFY(CURRENT_ARCH_NAME) _X("\n")
 _X(" Commit: %s\n")
 _X(" RID: %s"),
 commit.substr(0, 10).c_str(),
 get_runtime_id().c_str());
 _X(" Commit: %s"),
 commit.substr(0, 10).c_str());

 if (!skip_sdk_info_output)
 trace::println(_X(" RID: %s"), get_runtime_id().c_str());

 trace::println(_X("\n")
 _X(".NET SDKs installed:"));
Expand Down

4 changes: 3 additions & 1 deletion
src/native/corehost/fxr/command_line.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,9 @@ namespace command_line
 /*out*/ pal::string_t &app_candidate,
 /*out*/ opt_map_t &opts);

 void print_muxer_info(const pal::string_t &dotnet_root, const pal::string_t &global_json_path);
 // skip_sdk_info_output indicates whether or not to skip any information that the SDK would have
 // already printed. Related: https://github.com/dotnet/sdk/issues/33697
 void print_muxer_info(const pal::string_t &dotnet_root, const pal::string_t &global_json_path, bool skip_sdk_info_output);
 void print_muxer_usage(bool is_sdk_present);
};

Expand Down

4 changes: 2 additions & 2 deletions
src/native/corehost/fxr/fx_muxer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1055,7 +1055,7 @@ int fx_muxer_t::handle_cli(
 }
 else if (pal::strcasecmp(_X("--info"), argv[1]) == 0)
 {
 command_line::print_muxer_info(host_info.dotnet_root, resolver.global_file_path());
 command_line::print_muxer_info(host_info.dotnet_root, resolver.global_file_path(), false /*skip_sdk_info_output*/);
 return StatusCode::Success;
 }

Expand DownExpand Up@@ -1107,7 +1107,7 @@ int fx_muxer_t::handle_cli(

 if (pal::strcasecmp(_X("--info"), argv[1]) == 0)
 {
 command_line::print_muxer_info(host_info.dotnet_root, resolver.global_file_path());
 command_line::print_muxer_info(host_info.dotnet_root, resolver.global_file_path(), result == 0 /*skip_sdk_info_output*/);
 }

 return result;
Expand Down

, '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('^' + ".*" + '

Skip to content
[release/8.0] Skip duplicate --info output if it is known SDK output#92013

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

carlossanlop
merged 4 commits into

from

Sep 14, 2023
 Merged


[release/8.0] Skip duplicate --info output if it is known SDK output
#92013
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
07f80ac

Skip duplicate --info output if it is known SDK output


elinor-fung Sep 11, 2023
718c325

Update src/native/corehost/fxr/fx_muxer.cpp


elinor-fung Sep 12, 2023
775ae93

Add tests


elinor-fung Sep 12, 2023
78d58cb

Merge branch 'release/8.0' into backport/pr-91900-to-release/8.0


carlossanlop Sep 13, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


29 changes: 29 additions & 0 deletions
src/installer/tests/HostActivation.Tests/DotnetArgValidation.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,6 +82,35 @@ public void InvalidFileOrCommand_NoSDK_ListsPossibleIssues()
 .And.FindAnySdk(false);
 }

 [Fact]
 public void DotNetInfo_NoSDK()
 {
 sharedTestState.BuiltDotNet.Exec("--info")
 .CaptureStdOut()
 .CaptureStdErr()
 .Execute()
 .Should().Pass()
 .And.HaveStdOutMatching($@"Architecture:\s*{RepoDirectoriesProvider.Default.BuildArchitecture}")
 .And.HaveStdOutMatching($@"RID:\s*{RepoDirectoriesProvider.Default.BuildRID}");
 }

 [Fact]
 public void DotNetInfo_WithSDK()
 {
 DotNetCli dotnet = new DotNetBuilder(sharedTestState.BaseDirectory.Location, RepoDirectoriesProvider.Default.BuiltDotnet, "withSdk")
 .AddMicrosoftNETCoreAppFrameworkMockHostPolicy("1.0.0")
 .AddMockSDK("1.0.0", "1.0.0")
 .Build();

 dotnet.Exec("--info")
 .WorkingDirectory(sharedTestState.BaseDirectory.Location)
 .CaptureStdOut()
 .CaptureStdErr()
 .Execute()
 .Should().Pass()
 .And.NotHaveStdOutMatching($@"RID:\s*{RepoDirectoriesProvider.Default.BuildRID}");
 }

 // Return a non-existent path that contains a mix of / and \
 private string GetNonexistentAndUnnormalizedPath()
 {
Expand Down

7 changes: 7 additions & 0 deletions
src/installer/tests/TestUtils/Assertions/CommandResultAssertions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,6 +74,13 @@ public AndConstraint<CommandResultAssertions> HaveStdOutMatching(string pattern,
 return new AndConstraint<CommandResultAssertions>(this);
 }

 public AndConstraint<CommandResultAssertions> NotHaveStdOutMatching(string pattern, RegexOptions options = RegexOptions.None)
 {
 Execute.Assertion.ForCondition(!Regex.IsMatch(Result.StdOut, pattern, options))
 .FailWith($"The command output matched a pattern is should not have matched. Pattern: '{pattern}'{GetDiagnosticsInfo()}");
 return new AndConstraint<CommandResultAssertions>(this);
 }

 public AndConstraint<CommandResultAssertions> HaveStdErr()
 {
 Execute.Assertion.ForCondition(!string.IsNullOrEmpty(Result.StdErr))
Expand Down

11 changes: 6 additions & 5 deletions
src/native/corehost/fxr/command_line.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -280,17 +280,18 @@ int command_line::parse_args_for_sdk_command(
 return parse_args(host_info, 1, argc, argv, false, host_mode_t::muxer, new_argoff, app_candidate, opts);
}

void command_line::print_muxer_info(const pal::string_t &dotnet_root, const pal::string_t &global_json_path)
void command_line::print_muxer_info(const pal::string_t &dotnet_root, const pal::string_t &global_json_path, bool skip_sdk_info_output)
{
 pal::string_t commit = _STRINGIFY(REPO_COMMIT_HASH);
 trace::println(_X("\n")
 _X("Host:\n")
 _X(" Version: ") _STRINGIFY(HOST_VERSION) _X("\n")
 _X(" Architecture: ") _STRINGIFY(CURRENT_ARCH_NAME) _X("\n")
 _X(" Commit: %s\n")
 _X(" RID: %s"),
 commit.substr(0, 10).c_str(),
 get_runtime_id().c_str());
 _X(" Commit: %s"),
 commit.substr(0, 10).c_str());

 if (!skip_sdk_info_output)
 trace::println(_X(" RID: %s"), get_runtime_id().c_str());

 trace::println(_X("\n")
 _X(".NET SDKs installed:"));
Expand Down

4 changes: 3 additions & 1 deletion
src/native/corehost/fxr/command_line.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,9 @@ namespace command_line
 /*out*/ pal::string_t &app_candidate,
 /*out*/ opt_map_t &opts);

 void print_muxer_info(const pal::string_t &dotnet_root, const pal::string_t &global_json_path);
 // skip_sdk_info_output indicates whether or not to skip any information that the SDK would have
 // already printed. Related: https://github.com/dotnet/sdk/issues/33697
 void print_muxer_info(const pal::string_t &dotnet_root, const pal::string_t &global_json_path, bool skip_sdk_info_output);
 void print_muxer_usage(bool is_sdk_present);
};

Expand Down

4 changes: 2 additions & 2 deletions
src/native/corehost/fxr/fx_muxer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1055,7 +1055,7 @@ int fx_muxer_t::handle_cli(
 }
 else if (pal::strcasecmp(_X("--info"), argv[1]) == 0)
 {
 command_line::print_muxer_info(host_info.dotnet_root, resolver.global_file_path());
 command_line::print_muxer_info(host_info.dotnet_root, resolver.global_file_path(), false /*skip_sdk_info_output*/);
 return StatusCode::Success;
 }

Expand DownExpand Up@@ -1107,7 +1107,7 @@ int fx_muxer_t::handle_cli(

 if (pal::strcasecmp(_X("--info"), argv[1]) == 0)
 {
 command_line::print_muxer_info(host_info.dotnet_root, resolver.global_file_path());
 command_line::print_muxer_info(host_info.dotnet_root, resolver.global_file_path(), result == 0 /*skip_sdk_info_output*/);
 }

 return result;
Expand Down

, '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('^' + ".*" + '

Skip to content
[release/8.0] Skip duplicate --info output if it is known SDK output#92013

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

carlossanlop
merged 4 commits into

from

Sep 14, 2023
 Merged


[release/8.0] Skip duplicate --info output if it is known SDK output
#92013
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
07f80ac

Skip duplicate --info output if it is known SDK output


elinor-fung Sep 11, 2023
718c325

Update src/native/corehost/fxr/fx_muxer.cpp


elinor-fung Sep 12, 2023
775ae93

Add tests


elinor-fung Sep 12, 2023
78d58cb

Merge branch 'release/8.0' into backport/pr-91900-to-release/8.0


carlossanlop Sep 13, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


29 changes: 29 additions & 0 deletions
src/installer/tests/HostActivation.Tests/DotnetArgValidation.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,6 +82,35 @@ public void InvalidFileOrCommand_NoSDK_ListsPossibleIssues()
 .And.FindAnySdk(false);
 }

 [Fact]
 public void DotNetInfo_NoSDK()
 {
 sharedTestState.BuiltDotNet.Exec("--info")
 .CaptureStdOut()
 .CaptureStdErr()
 .Execute()
 .Should().Pass()
 .And.HaveStdOutMatching($@"Architecture:\s*{RepoDirectoriesProvider.Default.BuildArchitecture}")
 .And.HaveStdOutMatching($@"RID:\s*{RepoDirectoriesProvider.Default.BuildRID}");
 }

 [Fact]
 public void DotNetInfo_WithSDK()
 {
 DotNetCli dotnet = new DotNetBuilder(sharedTestState.BaseDirectory.Location, RepoDirectoriesProvider.Default.BuiltDotnet, "withSdk")
 .AddMicrosoftNETCoreAppFrameworkMockHostPolicy("1.0.0")
 .AddMockSDK("1.0.0", "1.0.0")
 .Build();

 dotnet.Exec("--info")
 .WorkingDirectory(sharedTestState.BaseDirectory.Location)
 .CaptureStdOut()
 .CaptureStdErr()
 .Execute()
 .Should().Pass()
 .And.NotHaveStdOutMatching($@"RID:\s*{RepoDirectoriesProvider.Default.BuildRID}");
 }

 // Return a non-existent path that contains a mix of / and \
 private string GetNonexistentAndUnnormalizedPath()
 {
Expand Down

7 changes: 7 additions & 0 deletions
src/installer/tests/TestUtils/Assertions/CommandResultAssertions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,6 +74,13 @@ public AndConstraint<CommandResultAssertions> HaveStdOutMatching(string pattern,
 return new AndConstraint<CommandResultAssertions>(this);
 }

 public AndConstraint<CommandResultAssertions> NotHaveStdOutMatching(string pattern, RegexOptions options = RegexOptions.None)
 {
 Execute.Assertion.ForCondition(!Regex.IsMatch(Result.StdOut, pattern, options))
 .FailWith($"The command output matched a pattern is should not have matched. Pattern: '{pattern}'{GetDiagnosticsInfo()}");
 return new AndConstraint<CommandResultAssertions>(this);
 }

 public AndConstraint<CommandResultAssertions> HaveStdErr()
 {
 Execute.Assertion.ForCondition(!string.IsNullOrEmpty(Result.StdErr))
Expand Down

11 changes: 6 additions & 5 deletions
src/native/corehost/fxr/command_line.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -280,17 +280,18 @@ int command_line::parse_args_for_sdk_command(
 return parse_args(host_info, 1, argc, argv, false, host_mode_t::muxer, new_argoff, app_candidate, opts);
}

void command_line::print_muxer_info(const pal::string_t &dotnet_root, const pal::string_t &global_json_path)
void command_line::print_muxer_info(const pal::string_t &dotnet_root, const pal::string_t &global_json_path, bool skip_sdk_info_output)
{
 pal::string_t commit = _STRINGIFY(REPO_COMMIT_HASH);
 trace::println(_X("\n")
 _X("Host:\n")
 _X(" Version: ") _STRINGIFY(HOST_VERSION) _X("\n")
 _X(" Architecture: ") _STRINGIFY(CURRENT_ARCH_NAME) _X("\n")
 _X(" Commit: %s\n")
 _X(" RID: %s"),
 commit.substr(0, 10).c_str(),
 get_runtime_id().c_str());
 _X(" Commit: %s"),
 commit.substr(0, 10).c_str());

 if (!skip_sdk_info_output)
 trace::println(_X(" RID: %s"), get_runtime_id().c_str());

 trace::println(_X("\n")
 _X(".NET SDKs installed:"));
Expand Down

4 changes: 3 additions & 1 deletion
src/native/corehost/fxr/command_line.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,9 @@ namespace command_line
 /*out*/ pal::string_t &app_candidate,
 /*out*/ opt_map_t &opts);

 void print_muxer_info(const pal::string_t &dotnet_root, const pal::string_t &global_json_path);
 // skip_sdk_info_output indicates whether or not to skip any information that the SDK would have
 // already printed. Related: https://github.com/dotnet/sdk/issues/33697
 void print_muxer_info(const pal::string_t &dotnet_root, const pal::string_t &global_json_path, bool skip_sdk_info_output);
 void print_muxer_usage(bool is_sdk_present);
};

Expand Down

4 changes: 2 additions & 2 deletions
src/native/corehost/fxr/fx_muxer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1055,7 +1055,7 @@ int fx_muxer_t::handle_cli(
 }
 else if (pal::strcasecmp(_X("--info"), argv[1]) == 0)
 {
 command_line::print_muxer_info(host_info.dotnet_root, resolver.global_file_path());
 command_line::print_muxer_info(host_info.dotnet_root, resolver.global_file_path(), false /*skip_sdk_info_output*/);
 return StatusCode::Success;
 }

Expand DownExpand Up@@ -1107,7 +1107,7 @@ int fx_muxer_t::handle_cli(

 if (pal::strcasecmp(_X("--info"), argv[1]) == 0)
 {
 command_line::print_muxer_info(host_info.dotnet_root, resolver.global_file_path());
 command_line::print_muxer_info(host_info.dotnet_root, resolver.global_file_path(), result == 0 /*skip_sdk_info_output*/);
 }

 return result;
Expand Down

, '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); }
})();
})();

Skip to content
[release/8.0] Skip duplicate --info output if it is known SDK output#92013

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

carlossanlop
merged 4 commits into

from

Sep 14, 2023
 Merged


[release/8.0] Skip duplicate --info output if it is known SDK output
#92013
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
07f80ac

Skip duplicate --info output if it is known SDK output


elinor-fung Sep 11, 2023
718c325

Update src/native/corehost/fxr/fx_muxer.cpp


elinor-fung Sep 12, 2023
775ae93

Add tests


elinor-fung Sep 12, 2023
78d58cb

Merge branch 'release/8.0' into backport/pr-91900-to-release/8.0


carlossanlop Sep 13, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


29 changes: 29 additions & 0 deletions
src/installer/tests/HostActivation.Tests/DotnetArgValidation.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,6 +82,35 @@ public void InvalidFileOrCommand_NoSDK_ListsPossibleIssues()
 .And.FindAnySdk(false);
 }

 [Fact]
 public void DotNetInfo_NoSDK()
 {
 sharedTestState.BuiltDotNet.Exec("--info")
 .CaptureStdOut()
 .CaptureStdErr()
 .Execute()
 .Should().Pass()
 .And.HaveStdOutMatching($@"Architecture:\s*{RepoDirectoriesProvider.Default.BuildArchitecture}")
 .And.HaveStdOutMatching($@"RID:\s*{RepoDirectoriesProvider.Default.BuildRID}");
 }

 [Fact]
 public void DotNetInfo_WithSDK()
 {
 DotNetCli dotnet = new DotNetBuilder(sharedTestState.BaseDirectory.Location, RepoDirectoriesProvider.Default.BuiltDotnet, "withSdk")
 .AddMicrosoftNETCoreAppFrameworkMockHostPolicy("1.0.0")
 .AddMockSDK("1.0.0", "1.0.0")
 .Build();

 dotnet.Exec("--info")
 .WorkingDirectory(sharedTestState.BaseDirectory.Location)
 .CaptureStdOut()
 .CaptureStdErr()
 .Execute()
 .Should().Pass()
 .And.NotHaveStdOutMatching($@"RID:\s*{RepoDirectoriesProvider.Default.BuildRID}");
 }

 // Return a non-existent path that contains a mix of / and \
 private string GetNonexistentAndUnnormalizedPath()
 {
Expand Down

7 changes: 7 additions & 0 deletions
src/installer/tests/TestUtils/Assertions/CommandResultAssertions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,6 +74,13 @@ public AndConstraint<CommandResultAssertions> HaveStdOutMatching(string pattern,
 return new AndConstraint<CommandResultAssertions>(this);
 }

 public AndConstraint<CommandResultAssertions> NotHaveStdOutMatching(string pattern, RegexOptions options = RegexOptions.None)
 {
 Execute.Assertion.ForCondition(!Regex.IsMatch(Result.StdOut, pattern, options))
 .FailWith($"The command output matched a pattern is should not have matched. Pattern: '{pattern}'{GetDiagnosticsInfo()}");
 return new AndConstraint<CommandResultAssertions>(this);
 }

 public AndConstraint<CommandResultAssertions> HaveStdErr()
 {
 Execute.Assertion.ForCondition(!string.IsNullOrEmpty(Result.StdErr))
Expand Down

11 changes: 6 additions & 5 deletions
src/native/corehost/fxr/command_line.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -280,17 +280,18 @@ int command_line::parse_args_for_sdk_command(
 return parse_args(host_info, 1, argc, argv, false, host_mode_t::muxer, new_argoff, app_candidate, opts);
}

void command_line::print_muxer_info(const pal::string_t &dotnet_root, const pal::string_t &global_json_path)
void command_line::print_muxer_info(const pal::string_t &dotnet_root, const pal::string_t &global_json_path, bool skip_sdk_info_output)
{
 pal::string_t commit = _STRINGIFY(REPO_COMMIT_HASH);
 trace::println(_X("\n")
 _X("Host:\n")
 _X(" Version: ") _STRINGIFY(HOST_VERSION) _X("\n")
 _X(" Architecture: ") _STRINGIFY(CURRENT_ARCH_NAME) _X("\n")
 _X(" Commit: %s\n")
 _X(" RID: %s"),
 commit.substr(0, 10).c_str(),
 get_runtime_id().c_str());
 _X(" Commit: %s"),
 commit.substr(0, 10).c_str());

 if (!skip_sdk_info_output)
 trace::println(_X(" RID: %s"), get_runtime_id().c_str());

 trace::println(_X("\n")
 _X(".NET SDKs installed:"));
Expand Down

4 changes: 3 additions & 1 deletion
src/native/corehost/fxr/command_line.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,9 @@ namespace command_line
 /*out*/ pal::string_t &app_candidate,
 /*out*/ opt_map_t &opts);

 void print_muxer_info(const pal::string_t &dotnet_root, const pal::string_t &global_json_path);
 // skip_sdk_info_output indicates whether or not to skip any information that the SDK would have
 // already printed. Related: https://github.com/dotnet/sdk/issues/33697
 void print_muxer_info(const pal::string_t &dotnet_root, const pal::string_t &global_json_path, bool skip_sdk_info_output);
 void print_muxer_usage(bool is_sdk_present);
};

Expand Down

4 changes: 2 additions & 2 deletions
src/native/corehost/fxr/fx_muxer.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1055,7 +1055,7 @@ int fx_muxer_t::handle_cli(
 }
 else if (pal::strcasecmp(_X("--info"), argv[1]) == 0)
 {
 command_line::print_muxer_info(host_info.dotnet_root, resolver.global_file_path());
 command_line::print_muxer_info(host_info.dotnet_root, resolver.global_file_path(), false /*skip_sdk_info_output*/);
 return StatusCode::Success;
 }

Expand DownExpand Up@@ -1107,7 +1107,7 @@ int fx_muxer_t::handle_cli(

 if (pal::strcasecmp(_X("--info"), argv[1]) == 0)
 {
 command_line::print_muxer_info(host_info.dotnet_root, resolver.global_file_path());
 command_line::print_muxer_info(host_info.dotnet_root, resolver.global_file_path(), result == 0 /*skip_sdk_info_output*/);
 }

 return result;
Expand Down