[main] Update dependencies from dotnet/installer#93066

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
radical merged 22 commits into from
Oct 17, 2023
Merged

[main] Update dependencies from dotnet/installer #93066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
48fbf9a
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Oct 5, 2023
8cfb56f
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Oct 6, 2023
d0141eb
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Oct 7, 2023
9337be0
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Oct 8, 2023
593f5e5
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Oct 9, 2023
84390ea
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Oct 10, 2023
2936781
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Oct 11, 2023
25961d1
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Oct 12, 2023
c04ad79
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Oct 12, 2023
795671e
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Oct 13, 2023
c32c9af
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Oct 14, 2023
0849b81
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Oct 16, 2023
74f599f
Merge remote-tracking branch 'origin/main' into darc-main-ba0a68a4-66…
radical Oct 16, 2023
841c31b
wip
radical Oct 16, 2023
535d740
wip
radical Oct 17, 2023
d93afc5
wip
radical Oct 17, 2023
d76a4b0
wip
radical Oct 17, 2023
89a3883
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Oct 17, 2023
015a41d
Merge remote-tracking branch 'origin/main' into darc-main-ba0a68a4-66…
radical Oct 17, 2023
689bede
revert tfm=net9.0 changes
radical Oct 17, 2023
28cf02d
[wasm] WBT: Update blazor tests to track changed path for Pages
radical Oct 17, 2023
f408dcc
add comment
radical Oct 17, 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
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -398,9 +398,9 @@
<Uri>https://github.com/NuGet/NuGet.Client</Uri>
<Sha>8fef55f5a55a3b4f2c96cd1a9b5ddc51d4b927f8</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="9.0.100-alpha.1.23503.1">
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="9.0.100-alpha.1.23512.15">
<Uri>https://github.com/dotnet/installer</Uri>
<Sha>b1a461bdca599a57ee454502015263c9896c8970</Sha>
<Sha>24f9beb4d84f0b4aa03d380c76b181a79e14f6ec</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -251,7 +251,7 @@
<MicrosoftExtensionsLoggingVersion>3.1.7</MicrosoftExtensionsLoggingVersion>
<MicrosoftSymbolStoreVersion>1.0.406601</MicrosoftSymbolStoreVersion>
<!-- installer version, for testing workloads -->
<MicrosoftDotnetSdkInternalVersion>9.0.100-alpha.1.23503.1</MicrosoftDotnetSdkInternalVersion>
<MicrosoftDotnetSdkInternalVersion>9.0.100-alpha.1.23512.15</MicrosoftDotnetSdkInternalVersion>
<SdkVersionForWorkloadTesting>$(MicrosoftDotnetSdkInternalVersion)</SdkVersionForWorkloadTesting>
</PropertyGroup>
</Project>
17 changes: 17 additions & 0 deletions eng/testing/workloads-testing.targets
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,10 @@
</PropertyGroup>

<ItemGroup>
<!-- Required for running apps built with 9.0 sdk, but the sdk does
not yet support *running* with 9.0 sdk -->
<AdditionalSharedFrameworkToInstall Include="8.0.0-rc.2.23457.7" />

<_DefaultPropsForNuGetBuild Include="Configuration=$(Configuration)" />
<_DefaultPropsForNuGetBuild Include="TargetOS=$(TargetOS)" />
<_DefaultPropsForNuGetBuild Include="TargetArchitecture=$(TargetArchitecture)" />
Expand DownExpand Up@@ -78,6 +82,19 @@
<Exec Condition="$([MSBuild]::IsOSPlatform('windows'))"
IgnoreStandardErrorWarningFormat="true"
Command='powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; $(_DotNetInstallCommand)"' />

<!-- Install additional shared frameworks -->
<PropertyGroup>
<_DotNetInstallCommand>$(_DotNetInstallScriptPath) -Version %(AdditionalSharedFrameworkToInstall.Identity) -InstallDir $(_SdkWithNoWorkloadPath) -Runtime dotnet -SkipNonVersionedFiles</_DotNetInstallCommand>
</PropertyGroup>
<Message Text="Installing shared frameworks for @(AdditionalSharedFrameworkToInstall)" Importance="High" />
<Exec Condition="'%(AdditionalSharedFrameworkToInstall.Identity)' != '' and !$([MSBuild]::IsOSPlatform('windows'))"
IgnoreStandardErrorWarningFormat="true"
Command="$(_DotNetInstallCommand)" />

<Exec Condition="'%(AdditionalSharedFrameworkToInstall.Identity)' != '' and $([MSBuild]::IsOSPlatform('windows'))"
IgnoreStandardErrorWarningFormat="true"
Command='powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; $(_DotNetInstallCommand)"' />
</Target>

<Target Name="_GetDotNetVersion">
Expand Down
4 changes: 2 additions & 2 deletions src/mono/wasm/Wasm.Build.Tests/Blazor/MiscTests3.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,7 +63,7 @@ public static class MyDllImports
public static extern int cpp_add(int a, int b);
}}";

File.WriteAllText(Path.Combine(_projectDir!, "Pages", "MyDllImport.cs"), myDllImportCs);
File.WriteAllText(Path.Combine(_projectDir!, "Components", "Pages", "MyDllImport.cs"), myDllImportCs);

AddItemsPropertiesToProject(projectFile, extraItems: @"<NativeFileReference Include=""mylib.cpp"" />");
BlazorAddRazorButton("cpp_add", """
Expand DownExpand Up@@ -144,7 +144,7 @@ public void BugRegression_60479_WithRazorClassLib()
Assert.Contains(razorClassLibraryFileName, lazyVal.EnumerateObject().Select(jp => jp.Name));
}

private void BlazorAddRazorButton(string buttonText, string customCode, string methodName = "test", string razorPage = "Pages/Counter.razor")
private void BlazorAddRazorButton(string buttonText, string customCode, string methodName = "test", string razorPage = "Components/Pages/Counter.razor")
{
string additionalCode = $$"""
<p role="{{methodName}}">Output: @outputText</p>
Expand Down
2 changes: 1 addition & 1 deletion src/mono/wasm/Wasm.Build.Tests/Blazor/WorkloadRequiredTests.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -84,7 +84,7 @@ public async Task WorkloadNotRequiredForInvariantGlobalization(string config, bo
if (invariant)
AddItemsPropertiesToProject(projectFile, extraProperties: "<InvariantGlobalization>true</InvariantGlobalization>");

string counterPath = Path.Combine(Path.GetDirectoryName(projectFile)!, "Pages", "Counter.razor");
string counterPath = Path.Combine(Path.GetDirectoryName(projectFile)!, "Components", "Pages", "Counter.razor");
string allText = File.ReadAllText(counterPath);
string ccText = "currentCount++;";
if (allText.IndexOf(ccText) < 0)
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n 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;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} 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
[main] Update dependencies from dotnet/installer#93066

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

radical
merged 22 commits into

from

Oct 17, 2023
 Merged


[main] Update dependencies from dotnet/installer
#93066
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


22 commits


Select commit
Hold shift + click to select a range
48fbf9a

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 5, 2023
8cfb56f

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 6, 2023
d0141eb

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 7, 2023
9337be0

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 8, 2023
593f5e5

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 9, 2023
84390ea

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 10, 2023
2936781

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 11, 2023
25961d1

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 12, 2023
c04ad79

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 12, 2023
795671e

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 13, 2023
c32c9af

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 14, 2023
0849b81

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 16, 2023
74f599f

Merge remote-tracking branch 'origin/main' into darc-main-ba0a68a4-66…


radical Oct 16, 2023
841c31b

wip


radical Oct 16, 2023
535d740

wip


radical Oct 17, 2023
d93afc5

wip


radical Oct 17, 2023
d76a4b0

wip


radical Oct 17, 2023
89a3883

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 17, 2023
015a41d

Merge remote-tracking branch 'origin/main' into darc-main-ba0a68a4-66…


radical Oct 17, 2023
689bede

revert tfm=net9.0 changes


radical Oct 17, 2023
28cf02d

[wasm] WBT: Update blazor tests to track changed path for Pages


radical Oct 17, 2023
f408dcc

add comment


radical Oct 17, 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


4 changes: 2 additions & 2 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -398,9 +398,9 @@
 <Uri>https://github.com/NuGet/NuGet.Client</Uri>
 <Sha>8fef55f5a55a3b4f2c96cd1a9b5ddc51d4b927f8</Sha>
 </Dependency>
 <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="9.0.100-alpha.1.23503.1">
 <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="9.0.100-alpha.1.23512.15">
 <Uri>https://github.com/dotnet/installer</Uri>
 <Sha>b1a461bdca599a57ee454502015263c9896c8970</Sha>
 <Sha>24f9beb4d84f0b4aa03d380c76b181a79e14f6ec</Sha>
 </Dependency>
 </ToolsetDependencies>
</Dependencies>

2 changes: 1 addition & 1 deletion
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -251,7 +251,7 @@
 <MicrosoftExtensionsLoggingVersion>3.1.7</MicrosoftExtensionsLoggingVersion>
 <MicrosoftSymbolStoreVersion>1.0.406601</MicrosoftSymbolStoreVersion>
 <!-- installer version, for testing workloads -->
 <MicrosoftDotnetSdkInternalVersion>9.0.100-alpha.1.23503.1</MicrosoftDotnetSdkInternalVersion>
 <MicrosoftDotnetSdkInternalVersion>9.0.100-alpha.1.23512.15</MicrosoftDotnetSdkInternalVersion>
 <SdkVersionForWorkloadTesting>$(MicrosoftDotnetSdkInternalVersion)</SdkVersionForWorkloadTesting>
 </PropertyGroup>
</Project>

17 changes: 17 additions & 0 deletions
eng/testing/workloads-testing.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,10 @@
 </PropertyGroup>

 <ItemGroup>
 <!-- Required for running apps built with 9.0 sdk, but the sdk does
 not yet support *running* with 9.0 sdk -->
 <AdditionalSharedFrameworkToInstall Include="8.0.0-rc.2.23457.7" />

 <_DefaultPropsForNuGetBuild Include="Configuration=$(Configuration)" />
 <_DefaultPropsForNuGetBuild Include="TargetOS=$(TargetOS)" />
 <_DefaultPropsForNuGetBuild Include="TargetArchitecture=$(TargetArchitecture)" />
Expand DownExpand Up@@ -78,6 +82,19 @@
 <Exec Condition="$([MSBuild]::IsOSPlatform('windows'))"
 IgnoreStandardErrorWarningFormat="true"
 Command='powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; $(_DotNetInstallCommand)"' />

 <!-- Install additional shared frameworks -->
 <PropertyGroup>
 <_DotNetInstallCommand>$(_DotNetInstallScriptPath) -Version %(AdditionalSharedFrameworkToInstall.Identity) -InstallDir $(_SdkWithNoWorkloadPath) -Runtime dotnet -SkipNonVersionedFiles</_DotNetInstallCommand>
 </PropertyGroup>
 <Message Text="Installing shared frameworks for @(AdditionalSharedFrameworkToInstall)" Importance="High" />
 <Exec Condition="'%(AdditionalSharedFrameworkToInstall.Identity)' != '' and !$([MSBuild]::IsOSPlatform('windows'))"
 IgnoreStandardErrorWarningFormat="true"
 Command="$(_DotNetInstallCommand)" />

 <Exec Condition="'%(AdditionalSharedFrameworkToInstall.Identity)' != '' and $([MSBuild]::IsOSPlatform('windows'))"
 IgnoreStandardErrorWarningFormat="true"
 Command='powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; $(_DotNetInstallCommand)"' />
 </Target>

 <Target Name="_GetDotNetVersion">
Expand Down

4 changes: 2 additions & 2 deletions
src/mono/wasm/Wasm.Build.Tests/Blazor/MiscTests3.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,7 +63,7 @@ public static class MyDllImports
 public static extern int cpp_add(int a, int b);
 }}";

 File.WriteAllText(Path.Combine(_projectDir!, "Pages", "MyDllImport.cs"), myDllImportCs);
 File.WriteAllText(Path.Combine(_projectDir!, "Components", "Pages", "MyDllImport.cs"), myDllImportCs);

 AddItemsPropertiesToProject(projectFile, extraItems: @"<NativeFileReference Include=""mylib.cpp"" />");
 BlazorAddRazorButton("cpp_add", """
Expand DownExpand Up@@ -144,7 +144,7 @@ public void BugRegression_60479_WithRazorClassLib()
 Assert.Contains(razorClassLibraryFileName, lazyVal.EnumerateObject().Select(jp => jp.Name));
 }

 private void BlazorAddRazorButton(string buttonText, string customCode, string methodName = "test", string razorPage = "Pages/Counter.razor")
 private void BlazorAddRazorButton(string buttonText, string customCode, string methodName = "test", string razorPage = "Components/Pages/Counter.razor")
 {
 string additionalCode = $$"""
 <p role="{{methodName}}">Output: @outputText</p>
Expand Down

2 changes: 1 addition & 1 deletion
src/mono/wasm/Wasm.Build.Tests/Blazor/WorkloadRequiredTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,7 +84,7 @@ public async Task WorkloadNotRequiredForInvariantGlobalization(string config, bo
 if (invariant)
 AddItemsPropertiesToProject(projectFile, extraProperties: "<InvariantGlobalization>true</InvariantGlobalization>");

 string counterPath = Path.Combine(Path.GetDirectoryName(projectFile)!, "Pages", "Counter.razor");
 string counterPath = Path.Combine(Path.GetDirectoryName(projectFile)!, "Components", "Pages", "Counter.razor");
 string allText = File.ReadAllText(counterPath);
 string ccText = "currentCount++;";
 if (allText.IndexOf(ccText) < 0)
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[main] Update dependencies from dotnet/installer#93066

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

radical
merged 22 commits into

from

Oct 17, 2023
 Merged


[main] Update dependencies from dotnet/installer
#93066
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


22 commits


Select commit
Hold shift + click to select a range
48fbf9a

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 5, 2023
8cfb56f

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 6, 2023
d0141eb

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 7, 2023
9337be0

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 8, 2023
593f5e5

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 9, 2023
84390ea

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 10, 2023
2936781

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 11, 2023
25961d1

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 12, 2023
c04ad79

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 12, 2023
795671e

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 13, 2023
c32c9af

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 14, 2023
0849b81

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 16, 2023
74f599f

Merge remote-tracking branch 'origin/main' into darc-main-ba0a68a4-66…


radical Oct 16, 2023
841c31b

wip


radical Oct 16, 2023
535d740

wip


radical Oct 17, 2023
d93afc5

wip


radical Oct 17, 2023
d76a4b0

wip


radical Oct 17, 2023
89a3883

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 17, 2023
015a41d

Merge remote-tracking branch 'origin/main' into darc-main-ba0a68a4-66…


radical Oct 17, 2023
689bede

revert tfm=net9.0 changes


radical Oct 17, 2023
28cf02d

[wasm] WBT: Update blazor tests to track changed path for Pages


radical Oct 17, 2023
f408dcc

add comment


radical Oct 17, 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


4 changes: 2 additions & 2 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -398,9 +398,9 @@
 <Uri>https://github.com/NuGet/NuGet.Client</Uri>
 <Sha>8fef55f5a55a3b4f2c96cd1a9b5ddc51d4b927f8</Sha>
 </Dependency>
 <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="9.0.100-alpha.1.23503.1">
 <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="9.0.100-alpha.1.23512.15">
 <Uri>https://github.com/dotnet/installer</Uri>
 <Sha>b1a461bdca599a57ee454502015263c9896c8970</Sha>
 <Sha>24f9beb4d84f0b4aa03d380c76b181a79e14f6ec</Sha>
 </Dependency>
 </ToolsetDependencies>
</Dependencies>

2 changes: 1 addition & 1 deletion
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -251,7 +251,7 @@
 <MicrosoftExtensionsLoggingVersion>3.1.7</MicrosoftExtensionsLoggingVersion>
 <MicrosoftSymbolStoreVersion>1.0.406601</MicrosoftSymbolStoreVersion>
 <!-- installer version, for testing workloads -->
 <MicrosoftDotnetSdkInternalVersion>9.0.100-alpha.1.23503.1</MicrosoftDotnetSdkInternalVersion>
 <MicrosoftDotnetSdkInternalVersion>9.0.100-alpha.1.23512.15</MicrosoftDotnetSdkInternalVersion>
 <SdkVersionForWorkloadTesting>$(MicrosoftDotnetSdkInternalVersion)</SdkVersionForWorkloadTesting>
 </PropertyGroup>
</Project>

17 changes: 17 additions & 0 deletions
eng/testing/workloads-testing.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,10 @@
 </PropertyGroup>

 <ItemGroup>
 <!-- Required for running apps built with 9.0 sdk, but the sdk does
 not yet support *running* with 9.0 sdk -->
 <AdditionalSharedFrameworkToInstall Include="8.0.0-rc.2.23457.7" />

 <_DefaultPropsForNuGetBuild Include="Configuration=$(Configuration)" />
 <_DefaultPropsForNuGetBuild Include="TargetOS=$(TargetOS)" />
 <_DefaultPropsForNuGetBuild Include="TargetArchitecture=$(TargetArchitecture)" />
Expand DownExpand Up@@ -78,6 +82,19 @@
 <Exec Condition="$([MSBuild]::IsOSPlatform('windows'))"
 IgnoreStandardErrorWarningFormat="true"
 Command='powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; $(_DotNetInstallCommand)"' />

 <!-- Install additional shared frameworks -->
 <PropertyGroup>
 <_DotNetInstallCommand>$(_DotNetInstallScriptPath) -Version %(AdditionalSharedFrameworkToInstall.Identity) -InstallDir $(_SdkWithNoWorkloadPath) -Runtime dotnet -SkipNonVersionedFiles</_DotNetInstallCommand>
 </PropertyGroup>
 <Message Text="Installing shared frameworks for @(AdditionalSharedFrameworkToInstall)" Importance="High" />
 <Exec Condition="'%(AdditionalSharedFrameworkToInstall.Identity)' != '' and !$([MSBuild]::IsOSPlatform('windows'))"
 IgnoreStandardErrorWarningFormat="true"
 Command="$(_DotNetInstallCommand)" />

 <Exec Condition="'%(AdditionalSharedFrameworkToInstall.Identity)' != '' and $([MSBuild]::IsOSPlatform('windows'))"
 IgnoreStandardErrorWarningFormat="true"
 Command='powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; $(_DotNetInstallCommand)"' />
 </Target>

 <Target Name="_GetDotNetVersion">
Expand Down

4 changes: 2 additions & 2 deletions
src/mono/wasm/Wasm.Build.Tests/Blazor/MiscTests3.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,7 +63,7 @@ public static class MyDllImports
 public static extern int cpp_add(int a, int b);
 }}";

 File.WriteAllText(Path.Combine(_projectDir!, "Pages", "MyDllImport.cs"), myDllImportCs);
 File.WriteAllText(Path.Combine(_projectDir!, "Components", "Pages", "MyDllImport.cs"), myDllImportCs);

 AddItemsPropertiesToProject(projectFile, extraItems: @"<NativeFileReference Include=""mylib.cpp"" />");
 BlazorAddRazorButton("cpp_add", """
Expand DownExpand Up@@ -144,7 +144,7 @@ public void BugRegression_60479_WithRazorClassLib()
 Assert.Contains(razorClassLibraryFileName, lazyVal.EnumerateObject().Select(jp => jp.Name));
 }

 private void BlazorAddRazorButton(string buttonText, string customCode, string methodName = "test", string razorPage = "Pages/Counter.razor")
 private void BlazorAddRazorButton(string buttonText, string customCode, string methodName = "test", string razorPage = "Components/Pages/Counter.razor")
 {
 string additionalCode = $$"""
 <p role="{{methodName}}">Output: @outputText</p>
Expand Down

2 changes: 1 addition & 1 deletion
src/mono/wasm/Wasm.Build.Tests/Blazor/WorkloadRequiredTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,7 +84,7 @@ public async Task WorkloadNotRequiredForInvariantGlobalization(string config, bo
 if (invariant)
 AddItemsPropertiesToProject(projectFile, extraProperties: "<InvariantGlobalization>true</InvariantGlobalization>");

 string counterPath = Path.Combine(Path.GetDirectoryName(projectFile)!, "Pages", "Counter.razor");
 string counterPath = Path.Combine(Path.GetDirectoryName(projectFile)!, "Components", "Pages", "Counter.razor");
 string allText = File.ReadAllText(counterPath);
 string ccText = "currentCount++;";
 if (allText.IndexOf(ccText) < 0)
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[main] Update dependencies from dotnet/installer#93066

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

radical
merged 22 commits into

from

Oct 17, 2023
 Merged


[main] Update dependencies from dotnet/installer
#93066
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


22 commits


Select commit
Hold shift + click to select a range
48fbf9a

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 5, 2023
8cfb56f

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 6, 2023
d0141eb

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 7, 2023
9337be0

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 8, 2023
593f5e5

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 9, 2023
84390ea

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 10, 2023
2936781

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 11, 2023
25961d1

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 12, 2023
c04ad79

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 12, 2023
795671e

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 13, 2023
c32c9af

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 14, 2023
0849b81

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 16, 2023
74f599f

Merge remote-tracking branch 'origin/main' into darc-main-ba0a68a4-66…


radical Oct 16, 2023
841c31b

wip


radical Oct 16, 2023
535d740

wip


radical Oct 17, 2023
d93afc5

wip


radical Oct 17, 2023
d76a4b0

wip


radical Oct 17, 2023
89a3883

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 17, 2023
015a41d

Merge remote-tracking branch 'origin/main' into darc-main-ba0a68a4-66…


radical Oct 17, 2023
689bede

revert tfm=net9.0 changes


radical Oct 17, 2023
28cf02d

[wasm] WBT: Update blazor tests to track changed path for Pages


radical Oct 17, 2023
f408dcc

add comment


radical Oct 17, 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


4 changes: 2 additions & 2 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -398,9 +398,9 @@
 <Uri>https://github.com/NuGet/NuGet.Client</Uri>
 <Sha>8fef55f5a55a3b4f2c96cd1a9b5ddc51d4b927f8</Sha>
 </Dependency>
 <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="9.0.100-alpha.1.23503.1">
 <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="9.0.100-alpha.1.23512.15">
 <Uri>https://github.com/dotnet/installer</Uri>
 <Sha>b1a461bdca599a57ee454502015263c9896c8970</Sha>
 <Sha>24f9beb4d84f0b4aa03d380c76b181a79e14f6ec</Sha>
 </Dependency>
 </ToolsetDependencies>
</Dependencies>

2 changes: 1 addition & 1 deletion
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -251,7 +251,7 @@
 <MicrosoftExtensionsLoggingVersion>3.1.7</MicrosoftExtensionsLoggingVersion>
 <MicrosoftSymbolStoreVersion>1.0.406601</MicrosoftSymbolStoreVersion>
 <!-- installer version, for testing workloads -->
 <MicrosoftDotnetSdkInternalVersion>9.0.100-alpha.1.23503.1</MicrosoftDotnetSdkInternalVersion>
 <MicrosoftDotnetSdkInternalVersion>9.0.100-alpha.1.23512.15</MicrosoftDotnetSdkInternalVersion>
 <SdkVersionForWorkloadTesting>$(MicrosoftDotnetSdkInternalVersion)</SdkVersionForWorkloadTesting>
 </PropertyGroup>
</Project>

17 changes: 17 additions & 0 deletions
eng/testing/workloads-testing.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,10 @@
 </PropertyGroup>

 <ItemGroup>
 <!-- Required for running apps built with 9.0 sdk, but the sdk does
 not yet support *running* with 9.0 sdk -->
 <AdditionalSharedFrameworkToInstall Include="8.0.0-rc.2.23457.7" />

 <_DefaultPropsForNuGetBuild Include="Configuration=$(Configuration)" />
 <_DefaultPropsForNuGetBuild Include="TargetOS=$(TargetOS)" />
 <_DefaultPropsForNuGetBuild Include="TargetArchitecture=$(TargetArchitecture)" />
Expand DownExpand Up@@ -78,6 +82,19 @@
 <Exec Condition="$([MSBuild]::IsOSPlatform('windows'))"
 IgnoreStandardErrorWarningFormat="true"
 Command='powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; $(_DotNetInstallCommand)"' />

 <!-- Install additional shared frameworks -->
 <PropertyGroup>
 <_DotNetInstallCommand>$(_DotNetInstallScriptPath) -Version %(AdditionalSharedFrameworkToInstall.Identity) -InstallDir $(_SdkWithNoWorkloadPath) -Runtime dotnet -SkipNonVersionedFiles</_DotNetInstallCommand>
 </PropertyGroup>
 <Message Text="Installing shared frameworks for @(AdditionalSharedFrameworkToInstall)" Importance="High" />
 <Exec Condition="'%(AdditionalSharedFrameworkToInstall.Identity)' != '' and !$([MSBuild]::IsOSPlatform('windows'))"
 IgnoreStandardErrorWarningFormat="true"
 Command="$(_DotNetInstallCommand)" />

 <Exec Condition="'%(AdditionalSharedFrameworkToInstall.Identity)' != '' and $([MSBuild]::IsOSPlatform('windows'))"
 IgnoreStandardErrorWarningFormat="true"
 Command='powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; $(_DotNetInstallCommand)"' />
 </Target>

 <Target Name="_GetDotNetVersion">
Expand Down

4 changes: 2 additions & 2 deletions
src/mono/wasm/Wasm.Build.Tests/Blazor/MiscTests3.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,7 +63,7 @@ public static class MyDllImports
 public static extern int cpp_add(int a, int b);
 }}";

 File.WriteAllText(Path.Combine(_projectDir!, "Pages", "MyDllImport.cs"), myDllImportCs);
 File.WriteAllText(Path.Combine(_projectDir!, "Components", "Pages", "MyDllImport.cs"), myDllImportCs);

 AddItemsPropertiesToProject(projectFile, extraItems: @"<NativeFileReference Include=""mylib.cpp"" />");
 BlazorAddRazorButton("cpp_add", """
Expand DownExpand Up@@ -144,7 +144,7 @@ public void BugRegression_60479_WithRazorClassLib()
 Assert.Contains(razorClassLibraryFileName, lazyVal.EnumerateObject().Select(jp => jp.Name));
 }

 private void BlazorAddRazorButton(string buttonText, string customCode, string methodName = "test", string razorPage = "Pages/Counter.razor")
 private void BlazorAddRazorButton(string buttonText, string customCode, string methodName = "test", string razorPage = "Components/Pages/Counter.razor")
 {
 string additionalCode = $$"""
 <p role="{{methodName}}">Output: @outputText</p>
Expand Down

2 changes: 1 addition & 1 deletion
src/mono/wasm/Wasm.Build.Tests/Blazor/WorkloadRequiredTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,7 +84,7 @@ public async Task WorkloadNotRequiredForInvariantGlobalization(string config, bo
 if (invariant)
 AddItemsPropertiesToProject(projectFile, extraProperties: "<InvariantGlobalization>true</InvariantGlobalization>");

 string counterPath = Path.Combine(Path.GetDirectoryName(projectFile)!, "Pages", "Counter.razor");
 string counterPath = Path.Combine(Path.GetDirectoryName(projectFile)!, "Components", "Pages", "Counter.razor");
 string allText = File.ReadAllText(counterPath);
 string ccText = "currentCount++;";
 if (allText.IndexOf(ccText) < 0)
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} 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
[main] Update dependencies from dotnet/installer#93066

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

radical
merged 22 commits into

from

Oct 17, 2023
 Merged


[main] Update dependencies from dotnet/installer
#93066
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


22 commits


Select commit
Hold shift + click to select a range
48fbf9a

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 5, 2023
8cfb56f

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 6, 2023
d0141eb

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 7, 2023
9337be0

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 8, 2023
593f5e5

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 9, 2023
84390ea

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 10, 2023
2936781

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 11, 2023
25961d1

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 12, 2023
c04ad79

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 12, 2023
795671e

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 13, 2023
c32c9af

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 14, 2023
0849b81

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 16, 2023
74f599f

Merge remote-tracking branch 'origin/main' into darc-main-ba0a68a4-66…


radical Oct 16, 2023
841c31b

wip


radical Oct 16, 2023
535d740

wip


radical Oct 17, 2023
d93afc5

wip


radical Oct 17, 2023
d76a4b0

wip


radical Oct 17, 2023
89a3883

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 17, 2023
015a41d

Merge remote-tracking branch 'origin/main' into darc-main-ba0a68a4-66…


radical Oct 17, 2023
689bede

revert tfm=net9.0 changes


radical Oct 17, 2023
28cf02d

[wasm] WBT: Update blazor tests to track changed path for Pages


radical Oct 17, 2023
f408dcc

add comment


radical Oct 17, 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


4 changes: 2 additions & 2 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -398,9 +398,9 @@
 <Uri>https://github.com/NuGet/NuGet.Client</Uri>
 <Sha>8fef55f5a55a3b4f2c96cd1a9b5ddc51d4b927f8</Sha>
 </Dependency>
 <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="9.0.100-alpha.1.23503.1">
 <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="9.0.100-alpha.1.23512.15">
 <Uri>https://github.com/dotnet/installer</Uri>
 <Sha>b1a461bdca599a57ee454502015263c9896c8970</Sha>
 <Sha>24f9beb4d84f0b4aa03d380c76b181a79e14f6ec</Sha>
 </Dependency>
 </ToolsetDependencies>
</Dependencies>

2 changes: 1 addition & 1 deletion
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -251,7 +251,7 @@
 <MicrosoftExtensionsLoggingVersion>3.1.7</MicrosoftExtensionsLoggingVersion>
 <MicrosoftSymbolStoreVersion>1.0.406601</MicrosoftSymbolStoreVersion>
 <!-- installer version, for testing workloads -->
 <MicrosoftDotnetSdkInternalVersion>9.0.100-alpha.1.23503.1</MicrosoftDotnetSdkInternalVersion>
 <MicrosoftDotnetSdkInternalVersion>9.0.100-alpha.1.23512.15</MicrosoftDotnetSdkInternalVersion>
 <SdkVersionForWorkloadTesting>$(MicrosoftDotnetSdkInternalVersion)</SdkVersionForWorkloadTesting>
 </PropertyGroup>
</Project>

17 changes: 17 additions & 0 deletions
eng/testing/workloads-testing.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,10 @@
 </PropertyGroup>

 <ItemGroup>
 <!-- Required for running apps built with 9.0 sdk, but the sdk does
 not yet support *running* with 9.0 sdk -->
 <AdditionalSharedFrameworkToInstall Include="8.0.0-rc.2.23457.7" />

 <_DefaultPropsForNuGetBuild Include="Configuration=$(Configuration)" />
 <_DefaultPropsForNuGetBuild Include="TargetOS=$(TargetOS)" />
 <_DefaultPropsForNuGetBuild Include="TargetArchitecture=$(TargetArchitecture)" />
Expand DownExpand Up@@ -78,6 +82,19 @@
 <Exec Condition="$([MSBuild]::IsOSPlatform('windows'))"
 IgnoreStandardErrorWarningFormat="true"
 Command='powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; $(_DotNetInstallCommand)"' />

 <!-- Install additional shared frameworks -->
 <PropertyGroup>
 <_DotNetInstallCommand>$(_DotNetInstallScriptPath) -Version %(AdditionalSharedFrameworkToInstall.Identity) -InstallDir $(_SdkWithNoWorkloadPath) -Runtime dotnet -SkipNonVersionedFiles</_DotNetInstallCommand>
 </PropertyGroup>
 <Message Text="Installing shared frameworks for @(AdditionalSharedFrameworkToInstall)" Importance="High" />
 <Exec Condition="'%(AdditionalSharedFrameworkToInstall.Identity)' != '' and !$([MSBuild]::IsOSPlatform('windows'))"
 IgnoreStandardErrorWarningFormat="true"
 Command="$(_DotNetInstallCommand)" />

 <Exec Condition="'%(AdditionalSharedFrameworkToInstall.Identity)' != '' and $([MSBuild]::IsOSPlatform('windows'))"
 IgnoreStandardErrorWarningFormat="true"
 Command='powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; $(_DotNetInstallCommand)"' />
 </Target>

 <Target Name="_GetDotNetVersion">
Expand Down

4 changes: 2 additions & 2 deletions
src/mono/wasm/Wasm.Build.Tests/Blazor/MiscTests3.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,7 +63,7 @@ public static class MyDllImports
 public static extern int cpp_add(int a, int b);
 }}";

 File.WriteAllText(Path.Combine(_projectDir!, "Pages", "MyDllImport.cs"), myDllImportCs);
 File.WriteAllText(Path.Combine(_projectDir!, "Components", "Pages", "MyDllImport.cs"), myDllImportCs);

 AddItemsPropertiesToProject(projectFile, extraItems: @"<NativeFileReference Include=""mylib.cpp"" />");
 BlazorAddRazorButton("cpp_add", """
Expand DownExpand Up@@ -144,7 +144,7 @@ public void BugRegression_60479_WithRazorClassLib()
 Assert.Contains(razorClassLibraryFileName, lazyVal.EnumerateObject().Select(jp => jp.Name));
 }

 private void BlazorAddRazorButton(string buttonText, string customCode, string methodName = "test", string razorPage = "Pages/Counter.razor")
 private void BlazorAddRazorButton(string buttonText, string customCode, string methodName = "test", string razorPage = "Components/Pages/Counter.razor")
 {
 string additionalCode = $$"""
 <p role="{{methodName}}">Output: @outputText</p>
Expand Down

2 changes: 1 addition & 1 deletion
src/mono/wasm/Wasm.Build.Tests/Blazor/WorkloadRequiredTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,7 +84,7 @@ public async Task WorkloadNotRequiredForInvariantGlobalization(string config, bo
 if (invariant)
 AddItemsPropertiesToProject(projectFile, extraProperties: "<InvariantGlobalization>true</InvariantGlobalization>");

 string counterPath = Path.Combine(Path.GetDirectoryName(projectFile)!, "Pages", "Counter.razor");
 string counterPath = Path.Combine(Path.GetDirectoryName(projectFile)!, "Components", "Pages", "Counter.razor");
 string allText = File.ReadAllText(counterPath);
 string ccText = "currentCount++;";
 if (allText.IndexOf(ccText) < 0)
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[main] Update dependencies from dotnet/installer#93066

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

radical
merged 22 commits into

from

Oct 17, 2023
 Merged


[main] Update dependencies from dotnet/installer
#93066
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


22 commits


Select commit
Hold shift + click to select a range
48fbf9a

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 5, 2023
8cfb56f

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 6, 2023
d0141eb

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 7, 2023
9337be0

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 8, 2023
593f5e5

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 9, 2023
84390ea

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 10, 2023
2936781

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 11, 2023
25961d1

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 12, 2023
c04ad79

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 12, 2023
795671e

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 13, 2023
c32c9af

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 14, 2023
0849b81

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 16, 2023
74f599f

Merge remote-tracking branch 'origin/main' into darc-main-ba0a68a4-66…


radical Oct 16, 2023
841c31b

wip


radical Oct 16, 2023
535d740

wip


radical Oct 17, 2023
d93afc5

wip


radical Oct 17, 2023
d76a4b0

wip


radical Oct 17, 2023
89a3883

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 17, 2023
015a41d

Merge remote-tracking branch 'origin/main' into darc-main-ba0a68a4-66…


radical Oct 17, 2023
689bede

revert tfm=net9.0 changes


radical Oct 17, 2023
28cf02d

[wasm] WBT: Update blazor tests to track changed path for Pages


radical Oct 17, 2023
f408dcc

add comment


radical Oct 17, 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


4 changes: 2 additions & 2 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -398,9 +398,9 @@
 <Uri>https://github.com/NuGet/NuGet.Client</Uri>
 <Sha>8fef55f5a55a3b4f2c96cd1a9b5ddc51d4b927f8</Sha>
 </Dependency>
 <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="9.0.100-alpha.1.23503.1">
 <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="9.0.100-alpha.1.23512.15">
 <Uri>https://github.com/dotnet/installer</Uri>
 <Sha>b1a461bdca599a57ee454502015263c9896c8970</Sha>
 <Sha>24f9beb4d84f0b4aa03d380c76b181a79e14f6ec</Sha>
 </Dependency>
 </ToolsetDependencies>
</Dependencies>

2 changes: 1 addition & 1 deletion
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -251,7 +251,7 @@
 <MicrosoftExtensionsLoggingVersion>3.1.7</MicrosoftExtensionsLoggingVersion>
 <MicrosoftSymbolStoreVersion>1.0.406601</MicrosoftSymbolStoreVersion>
 <!-- installer version, for testing workloads -->
 <MicrosoftDotnetSdkInternalVersion>9.0.100-alpha.1.23503.1</MicrosoftDotnetSdkInternalVersion>
 <MicrosoftDotnetSdkInternalVersion>9.0.100-alpha.1.23512.15</MicrosoftDotnetSdkInternalVersion>
 <SdkVersionForWorkloadTesting>$(MicrosoftDotnetSdkInternalVersion)</SdkVersionForWorkloadTesting>
 </PropertyGroup>
</Project>

17 changes: 17 additions & 0 deletions
eng/testing/workloads-testing.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,10 @@
 </PropertyGroup>

 <ItemGroup>
 <!-- Required for running apps built with 9.0 sdk, but the sdk does
 not yet support *running* with 9.0 sdk -->
 <AdditionalSharedFrameworkToInstall Include="8.0.0-rc.2.23457.7" />

 <_DefaultPropsForNuGetBuild Include="Configuration=$(Configuration)" />
 <_DefaultPropsForNuGetBuild Include="TargetOS=$(TargetOS)" />
 <_DefaultPropsForNuGetBuild Include="TargetArchitecture=$(TargetArchitecture)" />
Expand DownExpand Up@@ -78,6 +82,19 @@
 <Exec Condition="$([MSBuild]::IsOSPlatform('windows'))"
 IgnoreStandardErrorWarningFormat="true"
 Command='powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; $(_DotNetInstallCommand)"' />

 <!-- Install additional shared frameworks -->
 <PropertyGroup>
 <_DotNetInstallCommand>$(_DotNetInstallScriptPath) -Version %(AdditionalSharedFrameworkToInstall.Identity) -InstallDir $(_SdkWithNoWorkloadPath) -Runtime dotnet -SkipNonVersionedFiles</_DotNetInstallCommand>
 </PropertyGroup>
 <Message Text="Installing shared frameworks for @(AdditionalSharedFrameworkToInstall)" Importance="High" />
 <Exec Condition="'%(AdditionalSharedFrameworkToInstall.Identity)' != '' and !$([MSBuild]::IsOSPlatform('windows'))"
 IgnoreStandardErrorWarningFormat="true"
 Command="$(_DotNetInstallCommand)" />

 <Exec Condition="'%(AdditionalSharedFrameworkToInstall.Identity)' != '' and $([MSBuild]::IsOSPlatform('windows'))"
 IgnoreStandardErrorWarningFormat="true"
 Command='powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; $(_DotNetInstallCommand)"' />
 </Target>

 <Target Name="_GetDotNetVersion">
Expand Down

4 changes: 2 additions & 2 deletions
src/mono/wasm/Wasm.Build.Tests/Blazor/MiscTests3.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,7 +63,7 @@ public static class MyDllImports
 public static extern int cpp_add(int a, int b);
 }}";

 File.WriteAllText(Path.Combine(_projectDir!, "Pages", "MyDllImport.cs"), myDllImportCs);
 File.WriteAllText(Path.Combine(_projectDir!, "Components", "Pages", "MyDllImport.cs"), myDllImportCs);

 AddItemsPropertiesToProject(projectFile, extraItems: @"<NativeFileReference Include=""mylib.cpp"" />");
 BlazorAddRazorButton("cpp_add", """
Expand DownExpand Up@@ -144,7 +144,7 @@ public void BugRegression_60479_WithRazorClassLib()
 Assert.Contains(razorClassLibraryFileName, lazyVal.EnumerateObject().Select(jp => jp.Name));
 }

 private void BlazorAddRazorButton(string buttonText, string customCode, string methodName = "test", string razorPage = "Pages/Counter.razor")
 private void BlazorAddRazorButton(string buttonText, string customCode, string methodName = "test", string razorPage = "Components/Pages/Counter.razor")
 {
 string additionalCode = $$"""
 <p role="{{methodName}}">Output: @outputText</p>
Expand Down

2 changes: 1 addition & 1 deletion
src/mono/wasm/Wasm.Build.Tests/Blazor/WorkloadRequiredTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,7 +84,7 @@ public async Task WorkloadNotRequiredForInvariantGlobalization(string config, bo
 if (invariant)
 AddItemsPropertiesToProject(projectFile, extraProperties: "<InvariantGlobalization>true</InvariantGlobalization>");

 string counterPath = Path.Combine(Path.GetDirectoryName(projectFile)!, "Pages", "Counter.razor");
 string counterPath = Path.Combine(Path.GetDirectoryName(projectFile)!, "Components", "Pages", "Counter.razor");
 string allText = File.ReadAllText(counterPath);
 string ccText = "currentCount++;";
 if (allText.IndexOf(ccText) < 0)
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[main] Update dependencies from dotnet/installer#93066

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

radical
merged 22 commits into

from

Oct 17, 2023
 Merged


[main] Update dependencies from dotnet/installer
#93066
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


22 commits


Select commit
Hold shift + click to select a range
48fbf9a

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 5, 2023
8cfb56f

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 6, 2023
d0141eb

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 7, 2023
9337be0

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 8, 2023
593f5e5

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 9, 2023
84390ea

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 10, 2023
2936781

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 11, 2023
25961d1

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 12, 2023
c04ad79

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 12, 2023
795671e

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 13, 2023
c32c9af

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 14, 2023
0849b81

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 16, 2023
74f599f

Merge remote-tracking branch 'origin/main' into darc-main-ba0a68a4-66…


radical Oct 16, 2023
841c31b

wip


radical Oct 16, 2023
535d740

wip


radical Oct 17, 2023
d93afc5

wip


radical Oct 17, 2023
d76a4b0

wip


radical Oct 17, 2023
89a3883

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 17, 2023
015a41d

Merge remote-tracking branch 'origin/main' into darc-main-ba0a68a4-66…


radical Oct 17, 2023
689bede

revert tfm=net9.0 changes


radical Oct 17, 2023
28cf02d

[wasm] WBT: Update blazor tests to track changed path for Pages


radical Oct 17, 2023
f408dcc

add comment


radical Oct 17, 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


4 changes: 2 additions & 2 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -398,9 +398,9 @@
 <Uri>https://github.com/NuGet/NuGet.Client</Uri>
 <Sha>8fef55f5a55a3b4f2c96cd1a9b5ddc51d4b927f8</Sha>
 </Dependency>
 <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="9.0.100-alpha.1.23503.1">
 <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="9.0.100-alpha.1.23512.15">
 <Uri>https://github.com/dotnet/installer</Uri>
 <Sha>b1a461bdca599a57ee454502015263c9896c8970</Sha>
 <Sha>24f9beb4d84f0b4aa03d380c76b181a79e14f6ec</Sha>
 </Dependency>
 </ToolsetDependencies>
</Dependencies>

2 changes: 1 addition & 1 deletion
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -251,7 +251,7 @@
 <MicrosoftExtensionsLoggingVersion>3.1.7</MicrosoftExtensionsLoggingVersion>
 <MicrosoftSymbolStoreVersion>1.0.406601</MicrosoftSymbolStoreVersion>
 <!-- installer version, for testing workloads -->
 <MicrosoftDotnetSdkInternalVersion>9.0.100-alpha.1.23503.1</MicrosoftDotnetSdkInternalVersion>
 <MicrosoftDotnetSdkInternalVersion>9.0.100-alpha.1.23512.15</MicrosoftDotnetSdkInternalVersion>
 <SdkVersionForWorkloadTesting>$(MicrosoftDotnetSdkInternalVersion)</SdkVersionForWorkloadTesting>
 </PropertyGroup>
</Project>

17 changes: 17 additions & 0 deletions
eng/testing/workloads-testing.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,10 @@
 </PropertyGroup>

 <ItemGroup>
 <!-- Required for running apps built with 9.0 sdk, but the sdk does
 not yet support *running* with 9.0 sdk -->
 <AdditionalSharedFrameworkToInstall Include="8.0.0-rc.2.23457.7" />

 <_DefaultPropsForNuGetBuild Include="Configuration=$(Configuration)" />
 <_DefaultPropsForNuGetBuild Include="TargetOS=$(TargetOS)" />
 <_DefaultPropsForNuGetBuild Include="TargetArchitecture=$(TargetArchitecture)" />
Expand DownExpand Up@@ -78,6 +82,19 @@
 <Exec Condition="$([MSBuild]::IsOSPlatform('windows'))"
 IgnoreStandardErrorWarningFormat="true"
 Command='powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; $(_DotNetInstallCommand)"' />

 <!-- Install additional shared frameworks -->
 <PropertyGroup>
 <_DotNetInstallCommand>$(_DotNetInstallScriptPath) -Version %(AdditionalSharedFrameworkToInstall.Identity) -InstallDir $(_SdkWithNoWorkloadPath) -Runtime dotnet -SkipNonVersionedFiles</_DotNetInstallCommand>
 </PropertyGroup>
 <Message Text="Installing shared frameworks for @(AdditionalSharedFrameworkToInstall)" Importance="High" />
 <Exec Condition="'%(AdditionalSharedFrameworkToInstall.Identity)' != '' and !$([MSBuild]::IsOSPlatform('windows'))"
 IgnoreStandardErrorWarningFormat="true"
 Command="$(_DotNetInstallCommand)" />

 <Exec Condition="'%(AdditionalSharedFrameworkToInstall.Identity)' != '' and $([MSBuild]::IsOSPlatform('windows'))"
 IgnoreStandardErrorWarningFormat="true"
 Command='powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; $(_DotNetInstallCommand)"' />
 </Target>

 <Target Name="_GetDotNetVersion">
Expand Down

4 changes: 2 additions & 2 deletions
src/mono/wasm/Wasm.Build.Tests/Blazor/MiscTests3.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,7 +63,7 @@ public static class MyDllImports
 public static extern int cpp_add(int a, int b);
 }}";

 File.WriteAllText(Path.Combine(_projectDir!, "Pages", "MyDllImport.cs"), myDllImportCs);
 File.WriteAllText(Path.Combine(_projectDir!, "Components", "Pages", "MyDllImport.cs"), myDllImportCs);

 AddItemsPropertiesToProject(projectFile, extraItems: @"<NativeFileReference Include=""mylib.cpp"" />");
 BlazorAddRazorButton("cpp_add", """
Expand DownExpand Up@@ -144,7 +144,7 @@ public void BugRegression_60479_WithRazorClassLib()
 Assert.Contains(razorClassLibraryFileName, lazyVal.EnumerateObject().Select(jp => jp.Name));
 }

 private void BlazorAddRazorButton(string buttonText, string customCode, string methodName = "test", string razorPage = "Pages/Counter.razor")
 private void BlazorAddRazorButton(string buttonText, string customCode, string methodName = "test", string razorPage = "Components/Pages/Counter.razor")
 {
 string additionalCode = $$"""
 <p role="{{methodName}}">Output: @outputText</p>
Expand Down

2 changes: 1 addition & 1 deletion
src/mono/wasm/Wasm.Build.Tests/Blazor/WorkloadRequiredTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,7 +84,7 @@ public async Task WorkloadNotRequiredForInvariantGlobalization(string config, bo
 if (invariant)
 AddItemsPropertiesToProject(projectFile, extraProperties: "<InvariantGlobalization>true</InvariantGlobalization>");

 string counterPath = Path.Combine(Path.GetDirectoryName(projectFile)!, "Pages", "Counter.razor");
 string counterPath = Path.Combine(Path.GetDirectoryName(projectFile)!, "Components", "Pages", "Counter.razor");
 string allText = File.ReadAllText(counterPath);
 string ccText = "currentCount++;";
 if (allText.IndexOf(ccText) < 0)
Expand Down

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

Skip to content
[main] Update dependencies from dotnet/installer#93066

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

radical
merged 22 commits into

from

Oct 17, 2023
 Merged


[main] Update dependencies from dotnet/installer
#93066
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


22 commits


Select commit
Hold shift + click to select a range
48fbf9a

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 5, 2023
8cfb56f

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 6, 2023
d0141eb

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 7, 2023
9337be0

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 8, 2023
593f5e5

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 9, 2023
84390ea

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 10, 2023
2936781

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 11, 2023
25961d1

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 12, 2023
c04ad79

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 12, 2023
795671e

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 13, 2023
c32c9af

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 14, 2023
0849b81

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 16, 2023
74f599f

Merge remote-tracking branch 'origin/main' into darc-main-ba0a68a4-66…


radical Oct 16, 2023
841c31b

wip


radical Oct 16, 2023
535d740

wip


radical Oct 17, 2023
d93afc5

wip


radical Oct 17, 2023
d76a4b0

wip


radical Oct 17, 2023
89a3883

Update dependencies from https://github.com/dotnet/installer build 20…


dotnet-maestro[bot] Oct 17, 2023
015a41d

Merge remote-tracking branch 'origin/main' into darc-main-ba0a68a4-66…


radical Oct 17, 2023
689bede

revert tfm=net9.0 changes


radical Oct 17, 2023
28cf02d

[wasm] WBT: Update blazor tests to track changed path for Pages


radical Oct 17, 2023
f408dcc

add comment


radical Oct 17, 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


4 changes: 2 additions & 2 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -398,9 +398,9 @@
 <Uri>https://github.com/NuGet/NuGet.Client</Uri>
 <Sha>8fef55f5a55a3b4f2c96cd1a9b5ddc51d4b927f8</Sha>
 </Dependency>
 <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="9.0.100-alpha.1.23503.1">
 <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="9.0.100-alpha.1.23512.15">
 <Uri>https://github.com/dotnet/installer</Uri>
 <Sha>b1a461bdca599a57ee454502015263c9896c8970</Sha>
 <Sha>24f9beb4d84f0b4aa03d380c76b181a79e14f6ec</Sha>
 </Dependency>
 </ToolsetDependencies>
</Dependencies>

2 changes: 1 addition & 1 deletion
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -251,7 +251,7 @@
 <MicrosoftExtensionsLoggingVersion>3.1.7</MicrosoftExtensionsLoggingVersion>
 <MicrosoftSymbolStoreVersion>1.0.406601</MicrosoftSymbolStoreVersion>
 <!-- installer version, for testing workloads -->
 <MicrosoftDotnetSdkInternalVersion>9.0.100-alpha.1.23503.1</MicrosoftDotnetSdkInternalVersion>
 <MicrosoftDotnetSdkInternalVersion>9.0.100-alpha.1.23512.15</MicrosoftDotnetSdkInternalVersion>
 <SdkVersionForWorkloadTesting>$(MicrosoftDotnetSdkInternalVersion)</SdkVersionForWorkloadTesting>
 </PropertyGroup>
</Project>

17 changes: 17 additions & 0 deletions
eng/testing/workloads-testing.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,10 @@
 </PropertyGroup>

 <ItemGroup>
 <!-- Required for running apps built with 9.0 sdk, but the sdk does
 not yet support *running* with 9.0 sdk -->
 <AdditionalSharedFrameworkToInstall Include="8.0.0-rc.2.23457.7" />

 <_DefaultPropsForNuGetBuild Include="Configuration=$(Configuration)" />
 <_DefaultPropsForNuGetBuild Include="TargetOS=$(TargetOS)" />
 <_DefaultPropsForNuGetBuild Include="TargetArchitecture=$(TargetArchitecture)" />
Expand DownExpand Up@@ -78,6 +82,19 @@
 <Exec Condition="$([MSBuild]::IsOSPlatform('windows'))"
 IgnoreStandardErrorWarningFormat="true"
 Command='powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; $(_DotNetInstallCommand)"' />

 <!-- Install additional shared frameworks -->
 <PropertyGroup>
 <_DotNetInstallCommand>$(_DotNetInstallScriptPath) -Version %(AdditionalSharedFrameworkToInstall.Identity) -InstallDir $(_SdkWithNoWorkloadPath) -Runtime dotnet -SkipNonVersionedFiles</_DotNetInstallCommand>
 </PropertyGroup>
 <Message Text="Installing shared frameworks for @(AdditionalSharedFrameworkToInstall)" Importance="High" />
 <Exec Condition="'%(AdditionalSharedFrameworkToInstall.Identity)' != '' and !$([MSBuild]::IsOSPlatform('windows'))"
 IgnoreStandardErrorWarningFormat="true"
 Command="$(_DotNetInstallCommand)" />

 <Exec Condition="'%(AdditionalSharedFrameworkToInstall.Identity)' != '' and $([MSBuild]::IsOSPlatform('windows'))"
 IgnoreStandardErrorWarningFormat="true"
 Command='powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; $(_DotNetInstallCommand)"' />
 </Target>

 <Target Name="_GetDotNetVersion">
Expand Down

4 changes: 2 additions & 2 deletions
src/mono/wasm/Wasm.Build.Tests/Blazor/MiscTests3.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,7 +63,7 @@ public static class MyDllImports
 public static extern int cpp_add(int a, int b);
 }}";

 File.WriteAllText(Path.Combine(_projectDir!, "Pages", "MyDllImport.cs"), myDllImportCs);
 File.WriteAllText(Path.Combine(_projectDir!, "Components", "Pages", "MyDllImport.cs"), myDllImportCs);

 AddItemsPropertiesToProject(projectFile, extraItems: @"<NativeFileReference Include=""mylib.cpp"" />");
 BlazorAddRazorButton("cpp_add", """
Expand DownExpand Up@@ -144,7 +144,7 @@ public void BugRegression_60479_WithRazorClassLib()
 Assert.Contains(razorClassLibraryFileName, lazyVal.EnumerateObject().Select(jp => jp.Name));
 }

 private void BlazorAddRazorButton(string buttonText, string customCode, string methodName = "test", string razorPage = "Pages/Counter.razor")
 private void BlazorAddRazorButton(string buttonText, string customCode, string methodName = "test", string razorPage = "Components/Pages/Counter.razor")
 {
 string additionalCode = $$"""
 <p role="{{methodName}}">Output: @outputText</p>
Expand Down

2 changes: 1 addition & 1 deletion
src/mono/wasm/Wasm.Build.Tests/Blazor/WorkloadRequiredTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,7 +84,7 @@ public async Task WorkloadNotRequiredForInvariantGlobalization(string config, bo
 if (invariant)
 AddItemsPropertiesToProject(projectFile, extraProperties: "<InvariantGlobalization>true</InvariantGlobalization>");

 string counterPath = Path.Combine(Path.GetDirectoryName(projectFile)!, "Pages", "Counter.razor");
 string counterPath = Path.Combine(Path.GetDirectoryName(projectFile)!, "Components", "Pages", "Counter.razor");
 string allText = File.ReadAllText(counterPath);
 string ccText = "currentCount++;";
 if (allText.IndexOf(ccText) < 0)
Expand Down