[wasm] Browser.targets: Fix .dlls being deployed to publish/#96045

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 4 commits into from
Dec 19, 2023
Merged

[wasm] Browser.targets: Fix .dlls being deployed to publish/#96045

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
00e1d67
[wasm] Browser.targets: Fix .dlls being deployed to `publish/`
radical Dec 15, 2023
7acfc2e
add tests
radical Dec 18, 2023
3113830
InstallWorkloadFromArtifacts: default to using obj dir as temp, to ge…
radical Dec 18, 2023
af9344e
cleanup
radical Dec 18, 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
1 change: 1 addition & 0 deletions eng/testing/workloads-testing.targets
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -211,6 +211,7 @@
LocalNuGetsPath="$(LibrariesShippingPackagesDir)"
TemplateNuGetConfigPath="$(RepoRoot)NuGet.config"
SdkWithNoWorkloadInstalledPath="$(_SdkWithNoWorkloadPath)"
IntermediateOutputPath="$(ArtifactsObjDir)wasm"
/>

<Touch Files="$(_SdkWithNoWorkloadStampPath)" AlwaysCreate="true" />
Expand Down
10 changes: 7 additions & 3 deletions ...et/Microsoft.NET.Sdk.WebAssembly.Pack/build/Microsoft.NET.Sdk.WebAssembly.Browser.targets
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ Copyright (c) .NET Foundation. All rights reserved.
<_RunWorkingDirectory>$(OutputPath)</_RunWorkingDirectory>
<_RunWorkingDirectory Condition="'$(_RunWorkingDirectory)' != '' and !$([System.IO.Path]::IsPathRooted($(_RunWorkingDirectory)))">$([System.IO.Path]::Combine($(MSBuildProjectDirectory), $(_RunWorkingDirectory)))</_RunWorkingDirectory>
<_RuntimeConfigJsonPath>$([MSBuild]::NormalizePath($(_RunWorkingDirectory), '$(AssemblyName).runtimeconfig.json'))</_RuntimeConfigJsonPath>

<RunArguments>exec &quot;$([MSBuild]::NormalizePath($(WasmAppHostDir), 'WasmAppHost.dll'))&quot; --use-staticwebassets --runtime-config &quot;$(_RuntimeConfigJsonPath)&quot; $(WasmHostArguments)</RunArguments>
<RunWorkingDirectory>$(_RunWorkingDirectory)</RunWorkingDirectory>
</PropertyGroup>
Expand DownExpand Up@@ -395,7 +395,7 @@ Copyright (c) .NET Foundation. All rights reserved.
BeforeTargets="PrepareForPublish" />

<!-- Wasm's Nested publish is run just to build the native bits. We don't need to run blazor targets for that -->
<Target Name="ProcessPublishFilesForWasm" DependsOnTargets="_ResolveWasmConfiguration;LoadStaticWebAssetsBuildManifest;_GetWasmRuntimePackVersion" AfterTargets="ILLink" Condition="'$(WasmBuildingForNestedPublish)' != 'true'">
<Target Name="ProcessPublishFilesForWasm" DependsOnTargets="_ResolveWasmConfiguration;LoadStaticWebAssetsBuildManifest;_GetWasmRuntimePackVersion;_GatherWasmFilesToPublish" AfterTargets="ILLink" Condition="'$(WasmBuildingForNestedPublish)' != 'true'">
<!-- The list of static web assets already contains all the assets from the build. We want to correct certain assets that might
have changed as part of the publish process. We are going to do so as follows:
* We will update Blazor runtime asset dlls if we are running PublishTrimmed
Expand All@@ -419,7 +419,10 @@ Copyright (c) .NET Foundation. All rights reserved.
</ItemGroup>
<ItemGroup Condition="@(WasmAssembliesFinal->Count()) > 0">
<_WasmResolvedFilesToPublish Include="@(WasmAssembliesFinal)" />
<_WasmResolvedFilesToPublish Include="@(ResolvedFileToPublish)" Condition="'%(Extension)' != '.dll'" />

<!-- remove the original assemblies -->
<ResolvedFileToPublish Remove="@(WasmAssembliesToBundle)" />
<_WasmResolvedFilesToPublish Include="@(ResolvedFileToPublish)" />
</ItemGroup>

<ComputeWasmPublishAssets
Expand DownExpand Up@@ -600,6 +603,7 @@ Copyright (c) .NET Foundation. All rights reserved.
Code="BLAZORSDK1002" />
</Target>

<!-- called twice, once in the regular publish, and the other in the nested publish -->
<Target Name="_GatherWasmFilesToPublish">
<ItemGroup>
<WasmAssembliesToBundle Remove="@(WasmAssembliesToBundle)" />
Expand Down
4 changes: 2 additions & 2 deletions src/mono/wasm/Wasm.Build.Tests/Blazor/BuildPublishTests.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -155,11 +155,11 @@ public void DefaultTemplate_WithResources_Publish(string config)
if (config == "Release")
{
// relinking in publish for Release config
BlazorPublish(new BlazorBuildOptions(id, config, NativeFilesType.Relinked, ExpectRelinkDirWhenPublishing: true));
BlazorPublish(new BlazorBuildOptions(id, config, NativeFilesType.Relinked, ExpectRelinkDirWhenPublishing: true, IsPublish: true));
}
else
{
BlazorPublish(new BlazorBuildOptions(id, config, NativeFilesType.FromRuntimePack, ExpectRelinkDirWhenPublishing: true));
BlazorPublish(new BlazorBuildOptions(id, config, NativeFilesType.FromRuntimePack, ExpectRelinkDirWhenPublishing: true, IsPublish: true));
}

AssertResourcesDlls(FindBlazorBinFrameworkDir(config, true));
Expand Down
2 changes: 1 addition & 1 deletion src/mono/wasm/Wasm.Build.Tests/ProjectProviderBase.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ public abstract class ProjectProviderBase(ITestOutputHelper _testOutput, string?
};

public string? ProjectDir { get; set; } = _projectDir;
protected ITestOutputHelper _testOutput = _testOutput;
protected ITestOutputHelper _testOutput = new TestOutputWrapper(_testOutput);
protected BuildEnvironment _buildEnv = BuildTestBase.s_buildEnv;
public string BundleDirName { get; set; } = "wwwroot";

Expand Down
13 changes: 13 additions & 0 deletions src/mono/wasm/Wasm.Build.Tests/WasmSdkBasedProjectProvider.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@
using System;
using System.IO;
using System.Collections.Generic;
using Xunit;
using Xunit.Abstractions;
using Xunit.Sdk;
using System.Linq;
Expand DownExpand Up@@ -76,6 +77,18 @@ public void AssertBundle(AssertWasmSdkBundleOptions assertOptions)
{
IReadOnlyDictionary<string, DotNetFileName> actualDotnetFiles = AssertBasicBundle(assertOptions);

if (assertOptions.IsPublish)
{
string publishPath = Path.GetFullPath(Path.Combine(assertOptions.BinFrameworkDir, "..", ".."));
Assert.Equal("publish", Path.GetFileName(publishPath));

var dlls = Directory.EnumerateFiles(publishPath, "*.dll");
Assert.False(dlls.Any(), $"Did not expect to find any .dll in {publishPath} but found {string.Join(",", dlls)}");

var wasmAssemblies = Directory.EnumerateFiles(publishPath, "*.wasm");
Assert.False(wasmAssemblies.Any(), $"Did not expect to find any .wasm files in {publishPath} but found {string.Join(",", wasmAssemblies)}");
}

if (!BuildTestBase.IsUsingWorkloads)
return;

Expand Down
3 changes: 2 additions & 1 deletion src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,7 @@ public partial class InstallWorkloadFromArtifacts : Task
[Required, NotNull]
public string SdkWithNoWorkloadInstalledPath { get; set; } = string.Empty;

public string? IntermediateOutputPath { get; set; }
public bool OnlyUpdateManifests{ get; set; }

private const string s_nugetInsertionTag = "<!-- TEST_RESTORE_SOURCES_INSERTION_LINE -->";
Expand All@@ -59,7 +60,7 @@ public partial class InstallWorkloadFromArtifacts : Task

public override bool Execute()
{
_tempDir = Path.Combine(Path.GetTempPath(), $"workload-{Path.GetRandomFileName()}");
_tempDir = Path.Combine(IntermediateOutputPath ?? Path.GetTempPath(), $"workload-{Path.GetRandomFileName()}");
if (Directory.Exists(_tempDir))
Directory.Delete(_tempDir, recursive: true);
Directory.CreateDirectory(_tempDir);
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
[wasm] Browser.targets: Fix .dlls being deployed to publish/#96045

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 4 commits into

from

Dec 19, 2023
 Merged


[wasm] Browser.targets: Fix .dlls being deployed to publish/#96045
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
00e1d67

[wasm] Browser.targets: Fix .dlls being deployed to `publish/`


radical Dec 15, 2023
7acfc2e

add tests


radical Dec 18, 2023
3113830

InstallWorkloadFromArtifacts: default to using obj dir as temp, to ge…


radical Dec 18, 2023
af9344e

cleanup


radical Dec 18, 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


1 change: 1 addition & 0 deletions
eng/testing/workloads-testing.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -211,6 +211,7 @@
 LocalNuGetsPath="$(LibrariesShippingPackagesDir)"
 TemplateNuGetConfigPath="$(RepoRoot)NuGet.config"
 SdkWithNoWorkloadInstalledPath="$(_SdkWithNoWorkloadPath)"
 IntermediateOutputPath="$(ArtifactsObjDir)wasm"
 />

 <Touch Files="$(_SdkWithNoWorkloadStampPath)" AlwaysCreate="true" />
Expand Down

10 changes: 7 additions & 3 deletions
...et/Microsoft.NET.Sdk.WebAssembly.Pack/build/Microsoft.NET.Sdk.WebAssembly.Browser.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ Copyright (c) .NET Foundation. All rights reserved.
 <_RunWorkingDirectory>$(OutputPath)</_RunWorkingDirectory>
 <_RunWorkingDirectory Condition="'$(_RunWorkingDirectory)' != '' and !$([System.IO.Path]::IsPathRooted($(_RunWorkingDirectory)))">$([System.IO.Path]::Combine($(MSBuildProjectDirectory), $(_RunWorkingDirectory)))</_RunWorkingDirectory>
 <_RuntimeConfigJsonPath>$([MSBuild]::NormalizePath($(_RunWorkingDirectory), '$(AssemblyName).runtimeconfig.json'))</_RuntimeConfigJsonPath>

 <RunArguments>exec &quot;$([MSBuild]::NormalizePath($(WasmAppHostDir), 'WasmAppHost.dll'))&quot; --use-staticwebassets --runtime-config &quot;$(_RuntimeConfigJsonPath)&quot; $(WasmHostArguments)</RunArguments>
 <RunWorkingDirectory>$(_RunWorkingDirectory)</RunWorkingDirectory>
 </PropertyGroup>
Expand DownExpand Up@@ -395,7 +395,7 @@ Copyright (c) .NET Foundation. All rights reserved.
 BeforeTargets="PrepareForPublish" />

 <!-- Wasm's Nested publish is run just to build the native bits. We don't need to run blazor targets for that -->
 <Target Name="ProcessPublishFilesForWasm" DependsOnTargets="_ResolveWasmConfiguration;LoadStaticWebAssetsBuildManifest;_GetWasmRuntimePackVersion" AfterTargets="ILLink" Condition="'$(WasmBuildingForNestedPublish)' != 'true'">
 <Target Name="ProcessPublishFilesForWasm" DependsOnTargets="_ResolveWasmConfiguration;LoadStaticWebAssetsBuildManifest;_GetWasmRuntimePackVersion;_GatherWasmFilesToPublish" AfterTargets="ILLink" Condition="'$(WasmBuildingForNestedPublish)' != 'true'">
 <!-- The list of static web assets already contains all the assets from the build. We want to correct certain assets that might
 have changed as part of the publish process. We are going to do so as follows:
 * We will update Blazor runtime asset dlls if we are running PublishTrimmed
Expand All@@ -419,7 +419,10 @@ Copyright (c) .NET Foundation. All rights reserved.
 </ItemGroup>
 <ItemGroup Condition="@(WasmAssembliesFinal->Count()) > 0">
 <_WasmResolvedFilesToPublish Include="@(WasmAssembliesFinal)" />
 <_WasmResolvedFilesToPublish Include="@(ResolvedFileToPublish)" Condition="'%(Extension)' != '.dll'" />

 <!-- remove the original assemblies -->
 <ResolvedFileToPublish Remove="@(WasmAssembliesToBundle)" />
 <_WasmResolvedFilesToPublish Include="@(ResolvedFileToPublish)" />
 </ItemGroup>

 <ComputeWasmPublishAssets
Expand DownExpand Up@@ -600,6 +603,7 @@ Copyright (c) .NET Foundation. All rights reserved.
 Code="BLAZORSDK1002" />
 </Target>

 <!-- called twice, once in the regular publish, and the other in the nested publish -->
 <Target Name="_GatherWasmFilesToPublish">
 <ItemGroup>
 <WasmAssembliesToBundle Remove="@(WasmAssembliesToBundle)" />
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -155,11 +155,11 @@ public void DefaultTemplate_WithResources_Publish(string config)
 if (config == "Release")
 {
 // relinking in publish for Release config
 BlazorPublish(new BlazorBuildOptions(id, config, NativeFilesType.Relinked, ExpectRelinkDirWhenPublishing: true));
 BlazorPublish(new BlazorBuildOptions(id, config, NativeFilesType.Relinked, ExpectRelinkDirWhenPublishing: true, IsPublish: true));
 }
 else
 {
 BlazorPublish(new BlazorBuildOptions(id, config, NativeFilesType.FromRuntimePack, ExpectRelinkDirWhenPublishing: true));
 BlazorPublish(new BlazorBuildOptions(id, config, NativeFilesType.FromRuntimePack, ExpectRelinkDirWhenPublishing: true, IsPublish: true));
 }

 AssertResourcesDlls(FindBlazorBinFrameworkDir(config, true));
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ public abstract class ProjectProviderBase(ITestOutputHelper _testOutput, string?
 };

 public string? ProjectDir { get; set; } = _projectDir;
 protected ITestOutputHelper _testOutput = _testOutput;
 protected ITestOutputHelper _testOutput = new TestOutputWrapper(_testOutput);
 protected BuildEnvironment _buildEnv = BuildTestBase.s_buildEnv;
 public string BundleDirName { get; set; } = "wwwroot";

Expand Down

13 changes: 13 additions & 0 deletions
src/mono/wasm/Wasm.Build.Tests/WasmSdkBasedProjectProvider.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@
using System;
using System.IO;
using System.Collections.Generic;
using Xunit;
using Xunit.Abstractions;
using Xunit.Sdk;
using System.Linq;
Expand DownExpand Up@@ -76,6 +77,18 @@ public void AssertBundle(AssertWasmSdkBundleOptions assertOptions)
 {
 IReadOnlyDictionary<string, DotNetFileName> actualDotnetFiles = AssertBasicBundle(assertOptions);

 if (assertOptions.IsPublish)
 {
 string publishPath = Path.GetFullPath(Path.Combine(assertOptions.BinFrameworkDir, "..", ".."));
 Assert.Equal("publish", Path.GetFileName(publishPath));

 var dlls = Directory.EnumerateFiles(publishPath, "*.dll");
 Assert.False(dlls.Any(), $"Did not expect to find any .dll in {publishPath} but found {string.Join(",", dlls)}");

 var wasmAssemblies = Directory.EnumerateFiles(publishPath, "*.wasm");
 Assert.False(wasmAssemblies.Any(), $"Did not expect to find any .wasm files in {publishPath} but found {string.Join(",", wasmAssemblies)}");
 }

 if (!BuildTestBase.IsUsingWorkloads)
 return;

Expand Down

3 changes: 2 additions & 1 deletion
src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,7 @@ public partial class InstallWorkloadFromArtifacts : Task
 [Required, NotNull]
 public string SdkWithNoWorkloadInstalledPath { get; set; } = string.Empty;

 public string? IntermediateOutputPath { get; set; }
 public bool OnlyUpdateManifests{ get; set; }

 private const string s_nugetInsertionTag = "<!-- TEST_RESTORE_SOURCES_INSERTION_LINE -->";
Expand All@@ -59,7 +60,7 @@ public partial class InstallWorkloadFromArtifacts : Task

 public override bool Execute()
 {
 _tempDir = Path.Combine(Path.GetTempPath(), $"workload-{Path.GetRandomFileName()}");
 _tempDir = Path.Combine(IntermediateOutputPath ?? Path.GetTempPath(), $"workload-{Path.GetRandomFileName()}");
 if (Directory.Exists(_tempDir))
 Directory.Delete(_tempDir, recursive: true);
 Directory.CreateDirectory(_tempDir);
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
[wasm] Browser.targets: Fix .dlls being deployed to publish/#96045

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 4 commits into

from

Dec 19, 2023
 Merged


[wasm] Browser.targets: Fix .dlls being deployed to publish/#96045
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
00e1d67

[wasm] Browser.targets: Fix .dlls being deployed to `publish/`


radical Dec 15, 2023
7acfc2e

add tests


radical Dec 18, 2023
3113830

InstallWorkloadFromArtifacts: default to using obj dir as temp, to ge…


radical Dec 18, 2023
af9344e

cleanup


radical Dec 18, 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


1 change: 1 addition & 0 deletions
eng/testing/workloads-testing.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -211,6 +211,7 @@
 LocalNuGetsPath="$(LibrariesShippingPackagesDir)"
 TemplateNuGetConfigPath="$(RepoRoot)NuGet.config"
 SdkWithNoWorkloadInstalledPath="$(_SdkWithNoWorkloadPath)"
 IntermediateOutputPath="$(ArtifactsObjDir)wasm"
 />

 <Touch Files="$(_SdkWithNoWorkloadStampPath)" AlwaysCreate="true" />
Expand Down

10 changes: 7 additions & 3 deletions
...et/Microsoft.NET.Sdk.WebAssembly.Pack/build/Microsoft.NET.Sdk.WebAssembly.Browser.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ Copyright (c) .NET Foundation. All rights reserved.
 <_RunWorkingDirectory>$(OutputPath)</_RunWorkingDirectory>
 <_RunWorkingDirectory Condition="'$(_RunWorkingDirectory)' != '' and !$([System.IO.Path]::IsPathRooted($(_RunWorkingDirectory)))">$([System.IO.Path]::Combine($(MSBuildProjectDirectory), $(_RunWorkingDirectory)))</_RunWorkingDirectory>
 <_RuntimeConfigJsonPath>$([MSBuild]::NormalizePath($(_RunWorkingDirectory), '$(AssemblyName).runtimeconfig.json'))</_RuntimeConfigJsonPath>

 <RunArguments>exec &quot;$([MSBuild]::NormalizePath($(WasmAppHostDir), 'WasmAppHost.dll'))&quot; --use-staticwebassets --runtime-config &quot;$(_RuntimeConfigJsonPath)&quot; $(WasmHostArguments)</RunArguments>
 <RunWorkingDirectory>$(_RunWorkingDirectory)</RunWorkingDirectory>
 </PropertyGroup>
Expand DownExpand Up@@ -395,7 +395,7 @@ Copyright (c) .NET Foundation. All rights reserved.
 BeforeTargets="PrepareForPublish" />

 <!-- Wasm's Nested publish is run just to build the native bits. We don't need to run blazor targets for that -->
 <Target Name="ProcessPublishFilesForWasm" DependsOnTargets="_ResolveWasmConfiguration;LoadStaticWebAssetsBuildManifest;_GetWasmRuntimePackVersion" AfterTargets="ILLink" Condition="'$(WasmBuildingForNestedPublish)' != 'true'">
 <Target Name="ProcessPublishFilesForWasm" DependsOnTargets="_ResolveWasmConfiguration;LoadStaticWebAssetsBuildManifest;_GetWasmRuntimePackVersion;_GatherWasmFilesToPublish" AfterTargets="ILLink" Condition="'$(WasmBuildingForNestedPublish)' != 'true'">
 <!-- The list of static web assets already contains all the assets from the build. We want to correct certain assets that might
 have changed as part of the publish process. We are going to do so as follows:
 * We will update Blazor runtime asset dlls if we are running PublishTrimmed
Expand All@@ -419,7 +419,10 @@ Copyright (c) .NET Foundation. All rights reserved.
 </ItemGroup>
 <ItemGroup Condition="@(WasmAssembliesFinal->Count()) > 0">
 <_WasmResolvedFilesToPublish Include="@(WasmAssembliesFinal)" />
 <_WasmResolvedFilesToPublish Include="@(ResolvedFileToPublish)" Condition="'%(Extension)' != '.dll'" />

 <!-- remove the original assemblies -->
 <ResolvedFileToPublish Remove="@(WasmAssembliesToBundle)" />
 <_WasmResolvedFilesToPublish Include="@(ResolvedFileToPublish)" />
 </ItemGroup>

 <ComputeWasmPublishAssets
Expand DownExpand Up@@ -600,6 +603,7 @@ Copyright (c) .NET Foundation. All rights reserved.
 Code="BLAZORSDK1002" />
 </Target>

 <!-- called twice, once in the regular publish, and the other in the nested publish -->
 <Target Name="_GatherWasmFilesToPublish">
 <ItemGroup>
 <WasmAssembliesToBundle Remove="@(WasmAssembliesToBundle)" />
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -155,11 +155,11 @@ public void DefaultTemplate_WithResources_Publish(string config)
 if (config == "Release")
 {
 // relinking in publish for Release config
 BlazorPublish(new BlazorBuildOptions(id, config, NativeFilesType.Relinked, ExpectRelinkDirWhenPublishing: true));
 BlazorPublish(new BlazorBuildOptions(id, config, NativeFilesType.Relinked, ExpectRelinkDirWhenPublishing: true, IsPublish: true));
 }
 else
 {
 BlazorPublish(new BlazorBuildOptions(id, config, NativeFilesType.FromRuntimePack, ExpectRelinkDirWhenPublishing: true));
 BlazorPublish(new BlazorBuildOptions(id, config, NativeFilesType.FromRuntimePack, ExpectRelinkDirWhenPublishing: true, IsPublish: true));
 }

 AssertResourcesDlls(FindBlazorBinFrameworkDir(config, true));
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ public abstract class ProjectProviderBase(ITestOutputHelper _testOutput, string?
 };

 public string? ProjectDir { get; set; } = _projectDir;
 protected ITestOutputHelper _testOutput = _testOutput;
 protected ITestOutputHelper _testOutput = new TestOutputWrapper(_testOutput);
 protected BuildEnvironment _buildEnv = BuildTestBase.s_buildEnv;
 public string BundleDirName { get; set; } = "wwwroot";

Expand Down

13 changes: 13 additions & 0 deletions
src/mono/wasm/Wasm.Build.Tests/WasmSdkBasedProjectProvider.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@
using System;
using System.IO;
using System.Collections.Generic;
using Xunit;
using Xunit.Abstractions;
using Xunit.Sdk;
using System.Linq;
Expand DownExpand Up@@ -76,6 +77,18 @@ public void AssertBundle(AssertWasmSdkBundleOptions assertOptions)
 {
 IReadOnlyDictionary<string, DotNetFileName> actualDotnetFiles = AssertBasicBundle(assertOptions);

 if (assertOptions.IsPublish)
 {
 string publishPath = Path.GetFullPath(Path.Combine(assertOptions.BinFrameworkDir, "..", ".."));
 Assert.Equal("publish", Path.GetFileName(publishPath));

 var dlls = Directory.EnumerateFiles(publishPath, "*.dll");
 Assert.False(dlls.Any(), $"Did not expect to find any .dll in {publishPath} but found {string.Join(",", dlls)}");

 var wasmAssemblies = Directory.EnumerateFiles(publishPath, "*.wasm");
 Assert.False(wasmAssemblies.Any(), $"Did not expect to find any .wasm files in {publishPath} but found {string.Join(",", wasmAssemblies)}");
 }

 if (!BuildTestBase.IsUsingWorkloads)
 return;

Expand Down

3 changes: 2 additions & 1 deletion
src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,7 @@ public partial class InstallWorkloadFromArtifacts : Task
 [Required, NotNull]
 public string SdkWithNoWorkloadInstalledPath { get; set; } = string.Empty;

 public string? IntermediateOutputPath { get; set; }
 public bool OnlyUpdateManifests{ get; set; }

 private const string s_nugetInsertionTag = "<!-- TEST_RESTORE_SOURCES_INSERTION_LINE -->";
Expand All@@ -59,7 +60,7 @@ public partial class InstallWorkloadFromArtifacts : Task

 public override bool Execute()
 {
 _tempDir = Path.Combine(Path.GetTempPath(), $"workload-{Path.GetRandomFileName()}");
 _tempDir = Path.Combine(IntermediateOutputPath ?? Path.GetTempPath(), $"workload-{Path.GetRandomFileName()}");
 if (Directory.Exists(_tempDir))
 Directory.Delete(_tempDir, recursive: true);
 Directory.CreateDirectory(_tempDir);
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
[wasm] Browser.targets: Fix .dlls being deployed to publish/#96045

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 4 commits into

from

Dec 19, 2023
 Merged


[wasm] Browser.targets: Fix .dlls being deployed to publish/#96045
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
00e1d67

[wasm] Browser.targets: Fix .dlls being deployed to `publish/`


radical Dec 15, 2023
7acfc2e

add tests


radical Dec 18, 2023
3113830

InstallWorkloadFromArtifacts: default to using obj dir as temp, to ge…


radical Dec 18, 2023
af9344e

cleanup


radical Dec 18, 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


1 change: 1 addition & 0 deletions
eng/testing/workloads-testing.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -211,6 +211,7 @@
 LocalNuGetsPath="$(LibrariesShippingPackagesDir)"
 TemplateNuGetConfigPath="$(RepoRoot)NuGet.config"
 SdkWithNoWorkloadInstalledPath="$(_SdkWithNoWorkloadPath)"
 IntermediateOutputPath="$(ArtifactsObjDir)wasm"
 />

 <Touch Files="$(_SdkWithNoWorkloadStampPath)" AlwaysCreate="true" />
Expand Down

10 changes: 7 additions & 3 deletions
...et/Microsoft.NET.Sdk.WebAssembly.Pack/build/Microsoft.NET.Sdk.WebAssembly.Browser.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ Copyright (c) .NET Foundation. All rights reserved.
 <_RunWorkingDirectory>$(OutputPath)</_RunWorkingDirectory>
 <_RunWorkingDirectory Condition="'$(_RunWorkingDirectory)' != '' and !$([System.IO.Path]::IsPathRooted($(_RunWorkingDirectory)))">$([System.IO.Path]::Combine($(MSBuildProjectDirectory), $(_RunWorkingDirectory)))</_RunWorkingDirectory>
 <_RuntimeConfigJsonPath>$([MSBuild]::NormalizePath($(_RunWorkingDirectory), '$(AssemblyName).runtimeconfig.json'))</_RuntimeConfigJsonPath>

 <RunArguments>exec &quot;$([MSBuild]::NormalizePath($(WasmAppHostDir), 'WasmAppHost.dll'))&quot; --use-staticwebassets --runtime-config &quot;$(_RuntimeConfigJsonPath)&quot; $(WasmHostArguments)</RunArguments>
 <RunWorkingDirectory>$(_RunWorkingDirectory)</RunWorkingDirectory>
 </PropertyGroup>
Expand DownExpand Up@@ -395,7 +395,7 @@ Copyright (c) .NET Foundation. All rights reserved.
 BeforeTargets="PrepareForPublish" />

 <!-- Wasm's Nested publish is run just to build the native bits. We don't need to run blazor targets for that -->
 <Target Name="ProcessPublishFilesForWasm" DependsOnTargets="_ResolveWasmConfiguration;LoadStaticWebAssetsBuildManifest;_GetWasmRuntimePackVersion" AfterTargets="ILLink" Condition="'$(WasmBuildingForNestedPublish)' != 'true'">
 <Target Name="ProcessPublishFilesForWasm" DependsOnTargets="_ResolveWasmConfiguration;LoadStaticWebAssetsBuildManifest;_GetWasmRuntimePackVersion;_GatherWasmFilesToPublish" AfterTargets="ILLink" Condition="'$(WasmBuildingForNestedPublish)' != 'true'">
 <!-- The list of static web assets already contains all the assets from the build. We want to correct certain assets that might
 have changed as part of the publish process. We are going to do so as follows:
 * We will update Blazor runtime asset dlls if we are running PublishTrimmed
Expand All@@ -419,7 +419,10 @@ Copyright (c) .NET Foundation. All rights reserved.
 </ItemGroup>
 <ItemGroup Condition="@(WasmAssembliesFinal->Count()) > 0">
 <_WasmResolvedFilesToPublish Include="@(WasmAssembliesFinal)" />
 <_WasmResolvedFilesToPublish Include="@(ResolvedFileToPublish)" Condition="'%(Extension)' != '.dll'" />

 <!-- remove the original assemblies -->
 <ResolvedFileToPublish Remove="@(WasmAssembliesToBundle)" />
 <_WasmResolvedFilesToPublish Include="@(ResolvedFileToPublish)" />
 </ItemGroup>

 <ComputeWasmPublishAssets
Expand DownExpand Up@@ -600,6 +603,7 @@ Copyright (c) .NET Foundation. All rights reserved.
 Code="BLAZORSDK1002" />
 </Target>

 <!-- called twice, once in the regular publish, and the other in the nested publish -->
 <Target Name="_GatherWasmFilesToPublish">
 <ItemGroup>
 <WasmAssembliesToBundle Remove="@(WasmAssembliesToBundle)" />
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -155,11 +155,11 @@ public void DefaultTemplate_WithResources_Publish(string config)
 if (config == "Release")
 {
 // relinking in publish for Release config
 BlazorPublish(new BlazorBuildOptions(id, config, NativeFilesType.Relinked, ExpectRelinkDirWhenPublishing: true));
 BlazorPublish(new BlazorBuildOptions(id, config, NativeFilesType.Relinked, ExpectRelinkDirWhenPublishing: true, IsPublish: true));
 }
 else
 {
 BlazorPublish(new BlazorBuildOptions(id, config, NativeFilesType.FromRuntimePack, ExpectRelinkDirWhenPublishing: true));
 BlazorPublish(new BlazorBuildOptions(id, config, NativeFilesType.FromRuntimePack, ExpectRelinkDirWhenPublishing: true, IsPublish: true));
 }

 AssertResourcesDlls(FindBlazorBinFrameworkDir(config, true));
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ public abstract class ProjectProviderBase(ITestOutputHelper _testOutput, string?
 };

 public string? ProjectDir { get; set; } = _projectDir;
 protected ITestOutputHelper _testOutput = _testOutput;
 protected ITestOutputHelper _testOutput = new TestOutputWrapper(_testOutput);
 protected BuildEnvironment _buildEnv = BuildTestBase.s_buildEnv;
 public string BundleDirName { get; set; } = "wwwroot";

Expand Down

13 changes: 13 additions & 0 deletions
src/mono/wasm/Wasm.Build.Tests/WasmSdkBasedProjectProvider.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@
using System;
using System.IO;
using System.Collections.Generic;
using Xunit;
using Xunit.Abstractions;
using Xunit.Sdk;
using System.Linq;
Expand DownExpand Up@@ -76,6 +77,18 @@ public void AssertBundle(AssertWasmSdkBundleOptions assertOptions)
 {
 IReadOnlyDictionary<string, DotNetFileName> actualDotnetFiles = AssertBasicBundle(assertOptions);

 if (assertOptions.IsPublish)
 {
 string publishPath = Path.GetFullPath(Path.Combine(assertOptions.BinFrameworkDir, "..", ".."));
 Assert.Equal("publish", Path.GetFileName(publishPath));

 var dlls = Directory.EnumerateFiles(publishPath, "*.dll");
 Assert.False(dlls.Any(), $"Did not expect to find any .dll in {publishPath} but found {string.Join(",", dlls)}");

 var wasmAssemblies = Directory.EnumerateFiles(publishPath, "*.wasm");
 Assert.False(wasmAssemblies.Any(), $"Did not expect to find any .wasm files in {publishPath} but found {string.Join(",", wasmAssemblies)}");
 }

 if (!BuildTestBase.IsUsingWorkloads)
 return;

Expand Down

3 changes: 2 additions & 1 deletion
src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,7 @@ public partial class InstallWorkloadFromArtifacts : Task
 [Required, NotNull]
 public string SdkWithNoWorkloadInstalledPath { get; set; } = string.Empty;

 public string? IntermediateOutputPath { get; set; }
 public bool OnlyUpdateManifests{ get; set; }

 private const string s_nugetInsertionTag = "<!-- TEST_RESTORE_SOURCES_INSERTION_LINE -->";
Expand All@@ -59,7 +60,7 @@ public partial class InstallWorkloadFromArtifacts : Task

 public override bool Execute()
 {
 _tempDir = Path.Combine(Path.GetTempPath(), $"workload-{Path.GetRandomFileName()}");
 _tempDir = Path.Combine(IntermediateOutputPath ?? Path.GetTempPath(), $"workload-{Path.GetRandomFileName()}");
 if (Directory.Exists(_tempDir))
 Directory.Delete(_tempDir, recursive: true);
 Directory.CreateDirectory(_tempDir);
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
[wasm] Browser.targets: Fix .dlls being deployed to publish/#96045

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 4 commits into

from

Dec 19, 2023
 Merged


[wasm] Browser.targets: Fix .dlls being deployed to publish/#96045
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
00e1d67

[wasm] Browser.targets: Fix .dlls being deployed to `publish/`


radical Dec 15, 2023
7acfc2e

add tests


radical Dec 18, 2023
3113830

InstallWorkloadFromArtifacts: default to using obj dir as temp, to ge…


radical Dec 18, 2023
af9344e

cleanup


radical Dec 18, 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


1 change: 1 addition & 0 deletions
eng/testing/workloads-testing.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -211,6 +211,7 @@
 LocalNuGetsPath="$(LibrariesShippingPackagesDir)"
 TemplateNuGetConfigPath="$(RepoRoot)NuGet.config"
 SdkWithNoWorkloadInstalledPath="$(_SdkWithNoWorkloadPath)"
 IntermediateOutputPath="$(ArtifactsObjDir)wasm"
 />

 <Touch Files="$(_SdkWithNoWorkloadStampPath)" AlwaysCreate="true" />
Expand Down

10 changes: 7 additions & 3 deletions
...et/Microsoft.NET.Sdk.WebAssembly.Pack/build/Microsoft.NET.Sdk.WebAssembly.Browser.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ Copyright (c) .NET Foundation. All rights reserved.
 <_RunWorkingDirectory>$(OutputPath)</_RunWorkingDirectory>
 <_RunWorkingDirectory Condition="'$(_RunWorkingDirectory)' != '' and !$([System.IO.Path]::IsPathRooted($(_RunWorkingDirectory)))">$([System.IO.Path]::Combine($(MSBuildProjectDirectory), $(_RunWorkingDirectory)))</_RunWorkingDirectory>
 <_RuntimeConfigJsonPath>$([MSBuild]::NormalizePath($(_RunWorkingDirectory), '$(AssemblyName).runtimeconfig.json'))</_RuntimeConfigJsonPath>

 <RunArguments>exec &quot;$([MSBuild]::NormalizePath($(WasmAppHostDir), 'WasmAppHost.dll'))&quot; --use-staticwebassets --runtime-config &quot;$(_RuntimeConfigJsonPath)&quot; $(WasmHostArguments)</RunArguments>
 <RunWorkingDirectory>$(_RunWorkingDirectory)</RunWorkingDirectory>
 </PropertyGroup>
Expand DownExpand Up@@ -395,7 +395,7 @@ Copyright (c) .NET Foundation. All rights reserved.
 BeforeTargets="PrepareForPublish" />

 <!-- Wasm's Nested publish is run just to build the native bits. We don't need to run blazor targets for that -->
 <Target Name="ProcessPublishFilesForWasm" DependsOnTargets="_ResolveWasmConfiguration;LoadStaticWebAssetsBuildManifest;_GetWasmRuntimePackVersion" AfterTargets="ILLink" Condition="'$(WasmBuildingForNestedPublish)' != 'true'">
 <Target Name="ProcessPublishFilesForWasm" DependsOnTargets="_ResolveWasmConfiguration;LoadStaticWebAssetsBuildManifest;_GetWasmRuntimePackVersion;_GatherWasmFilesToPublish" AfterTargets="ILLink" Condition="'$(WasmBuildingForNestedPublish)' != 'true'">
 <!-- The list of static web assets already contains all the assets from the build. We want to correct certain assets that might
 have changed as part of the publish process. We are going to do so as follows:
 * We will update Blazor runtime asset dlls if we are running PublishTrimmed
Expand All@@ -419,7 +419,10 @@ Copyright (c) .NET Foundation. All rights reserved.
 </ItemGroup>
 <ItemGroup Condition="@(WasmAssembliesFinal->Count()) > 0">
 <_WasmResolvedFilesToPublish Include="@(WasmAssembliesFinal)" />
 <_WasmResolvedFilesToPublish Include="@(ResolvedFileToPublish)" Condition="'%(Extension)' != '.dll'" />

 <!-- remove the original assemblies -->
 <ResolvedFileToPublish Remove="@(WasmAssembliesToBundle)" />
 <_WasmResolvedFilesToPublish Include="@(ResolvedFileToPublish)" />
 </ItemGroup>

 <ComputeWasmPublishAssets
Expand DownExpand Up@@ -600,6 +603,7 @@ Copyright (c) .NET Foundation. All rights reserved.
 Code="BLAZORSDK1002" />
 </Target>

 <!-- called twice, once in the regular publish, and the other in the nested publish -->
 <Target Name="_GatherWasmFilesToPublish">
 <ItemGroup>
 <WasmAssembliesToBundle Remove="@(WasmAssembliesToBundle)" />
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -155,11 +155,11 @@ public void DefaultTemplate_WithResources_Publish(string config)
 if (config == "Release")
 {
 // relinking in publish for Release config
 BlazorPublish(new BlazorBuildOptions(id, config, NativeFilesType.Relinked, ExpectRelinkDirWhenPublishing: true));
 BlazorPublish(new BlazorBuildOptions(id, config, NativeFilesType.Relinked, ExpectRelinkDirWhenPublishing: true, IsPublish: true));
 }
 else
 {
 BlazorPublish(new BlazorBuildOptions(id, config, NativeFilesType.FromRuntimePack, ExpectRelinkDirWhenPublishing: true));
 BlazorPublish(new BlazorBuildOptions(id, config, NativeFilesType.FromRuntimePack, ExpectRelinkDirWhenPublishing: true, IsPublish: true));
 }

 AssertResourcesDlls(FindBlazorBinFrameworkDir(config, true));
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ public abstract class ProjectProviderBase(ITestOutputHelper _testOutput, string?
 };

 public string? ProjectDir { get; set; } = _projectDir;
 protected ITestOutputHelper _testOutput = _testOutput;
 protected ITestOutputHelper _testOutput = new TestOutputWrapper(_testOutput);
 protected BuildEnvironment _buildEnv = BuildTestBase.s_buildEnv;
 public string BundleDirName { get; set; } = "wwwroot";

Expand Down

13 changes: 13 additions & 0 deletions
src/mono/wasm/Wasm.Build.Tests/WasmSdkBasedProjectProvider.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@
using System;
using System.IO;
using System.Collections.Generic;
using Xunit;
using Xunit.Abstractions;
using Xunit.Sdk;
using System.Linq;
Expand DownExpand Up@@ -76,6 +77,18 @@ public void AssertBundle(AssertWasmSdkBundleOptions assertOptions)
 {
 IReadOnlyDictionary<string, DotNetFileName> actualDotnetFiles = AssertBasicBundle(assertOptions);

 if (assertOptions.IsPublish)
 {
 string publishPath = Path.GetFullPath(Path.Combine(assertOptions.BinFrameworkDir, "..", ".."));
 Assert.Equal("publish", Path.GetFileName(publishPath));

 var dlls = Directory.EnumerateFiles(publishPath, "*.dll");
 Assert.False(dlls.Any(), $"Did not expect to find any .dll in {publishPath} but found {string.Join(",", dlls)}");

 var wasmAssemblies = Directory.EnumerateFiles(publishPath, "*.wasm");
 Assert.False(wasmAssemblies.Any(), $"Did not expect to find any .wasm files in {publishPath} but found {string.Join(",", wasmAssemblies)}");
 }

 if (!BuildTestBase.IsUsingWorkloads)
 return;

Expand Down

3 changes: 2 additions & 1 deletion
src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,7 @@ public partial class InstallWorkloadFromArtifacts : Task
 [Required, NotNull]
 public string SdkWithNoWorkloadInstalledPath { get; set; } = string.Empty;

 public string? IntermediateOutputPath { get; set; }
 public bool OnlyUpdateManifests{ get; set; }

 private const string s_nugetInsertionTag = "<!-- TEST_RESTORE_SOURCES_INSERTION_LINE -->";
Expand All@@ -59,7 +60,7 @@ public partial class InstallWorkloadFromArtifacts : Task

 public override bool Execute()
 {
 _tempDir = Path.Combine(Path.GetTempPath(), $"workload-{Path.GetRandomFileName()}");
 _tempDir = Path.Combine(IntermediateOutputPath ?? Path.GetTempPath(), $"workload-{Path.GetRandomFileName()}");
 if (Directory.Exists(_tempDir))
 Directory.Delete(_tempDir, recursive: true);
 Directory.CreateDirectory(_tempDir);
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
[wasm] Browser.targets: Fix .dlls being deployed to publish/#96045

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 4 commits into

from

Dec 19, 2023
 Merged


[wasm] Browser.targets: Fix .dlls being deployed to publish/#96045
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
00e1d67

[wasm] Browser.targets: Fix .dlls being deployed to `publish/`


radical Dec 15, 2023
7acfc2e

add tests


radical Dec 18, 2023
3113830

InstallWorkloadFromArtifacts: default to using obj dir as temp, to ge…


radical Dec 18, 2023
af9344e

cleanup


radical Dec 18, 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


1 change: 1 addition & 0 deletions
eng/testing/workloads-testing.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -211,6 +211,7 @@
 LocalNuGetsPath="$(LibrariesShippingPackagesDir)"
 TemplateNuGetConfigPath="$(RepoRoot)NuGet.config"
 SdkWithNoWorkloadInstalledPath="$(_SdkWithNoWorkloadPath)"
 IntermediateOutputPath="$(ArtifactsObjDir)wasm"
 />

 <Touch Files="$(_SdkWithNoWorkloadStampPath)" AlwaysCreate="true" />
Expand Down

10 changes: 7 additions & 3 deletions
...et/Microsoft.NET.Sdk.WebAssembly.Pack/build/Microsoft.NET.Sdk.WebAssembly.Browser.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ Copyright (c) .NET Foundation. All rights reserved.
 <_RunWorkingDirectory>$(OutputPath)</_RunWorkingDirectory>
 <_RunWorkingDirectory Condition="'$(_RunWorkingDirectory)' != '' and !$([System.IO.Path]::IsPathRooted($(_RunWorkingDirectory)))">$([System.IO.Path]::Combine($(MSBuildProjectDirectory), $(_RunWorkingDirectory)))</_RunWorkingDirectory>
 <_RuntimeConfigJsonPath>$([MSBuild]::NormalizePath($(_RunWorkingDirectory), '$(AssemblyName).runtimeconfig.json'))</_RuntimeConfigJsonPath>

 <RunArguments>exec &quot;$([MSBuild]::NormalizePath($(WasmAppHostDir), 'WasmAppHost.dll'))&quot; --use-staticwebassets --runtime-config &quot;$(_RuntimeConfigJsonPath)&quot; $(WasmHostArguments)</RunArguments>
 <RunWorkingDirectory>$(_RunWorkingDirectory)</RunWorkingDirectory>
 </PropertyGroup>
Expand DownExpand Up@@ -395,7 +395,7 @@ Copyright (c) .NET Foundation. All rights reserved.
 BeforeTargets="PrepareForPublish" />

 <!-- Wasm's Nested publish is run just to build the native bits. We don't need to run blazor targets for that -->
 <Target Name="ProcessPublishFilesForWasm" DependsOnTargets="_ResolveWasmConfiguration;LoadStaticWebAssetsBuildManifest;_GetWasmRuntimePackVersion" AfterTargets="ILLink" Condition="'$(WasmBuildingForNestedPublish)' != 'true'">
 <Target Name="ProcessPublishFilesForWasm" DependsOnTargets="_ResolveWasmConfiguration;LoadStaticWebAssetsBuildManifest;_GetWasmRuntimePackVersion;_GatherWasmFilesToPublish" AfterTargets="ILLink" Condition="'$(WasmBuildingForNestedPublish)' != 'true'">
 <!-- The list of static web assets already contains all the assets from the build. We want to correct certain assets that might
 have changed as part of the publish process. We are going to do so as follows:
 * We will update Blazor runtime asset dlls if we are running PublishTrimmed
Expand All@@ -419,7 +419,10 @@ Copyright (c) .NET Foundation. All rights reserved.
 </ItemGroup>
 <ItemGroup Condition="@(WasmAssembliesFinal->Count()) > 0">
 <_WasmResolvedFilesToPublish Include="@(WasmAssembliesFinal)" />
 <_WasmResolvedFilesToPublish Include="@(ResolvedFileToPublish)" Condition="'%(Extension)' != '.dll'" />

 <!-- remove the original assemblies -->
 <ResolvedFileToPublish Remove="@(WasmAssembliesToBundle)" />
 <_WasmResolvedFilesToPublish Include="@(ResolvedFileToPublish)" />
 </ItemGroup>

 <ComputeWasmPublishAssets
Expand DownExpand Up@@ -600,6 +603,7 @@ Copyright (c) .NET Foundation. All rights reserved.
 Code="BLAZORSDK1002" />
 </Target>

 <!-- called twice, once in the regular publish, and the other in the nested publish -->
 <Target Name="_GatherWasmFilesToPublish">
 <ItemGroup>
 <WasmAssembliesToBundle Remove="@(WasmAssembliesToBundle)" />
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -155,11 +155,11 @@ public void DefaultTemplate_WithResources_Publish(string config)
 if (config == "Release")
 {
 // relinking in publish for Release config
 BlazorPublish(new BlazorBuildOptions(id, config, NativeFilesType.Relinked, ExpectRelinkDirWhenPublishing: true));
 BlazorPublish(new BlazorBuildOptions(id, config, NativeFilesType.Relinked, ExpectRelinkDirWhenPublishing: true, IsPublish: true));
 }
 else
 {
 BlazorPublish(new BlazorBuildOptions(id, config, NativeFilesType.FromRuntimePack, ExpectRelinkDirWhenPublishing: true));
 BlazorPublish(new BlazorBuildOptions(id, config, NativeFilesType.FromRuntimePack, ExpectRelinkDirWhenPublishing: true, IsPublish: true));
 }

 AssertResourcesDlls(FindBlazorBinFrameworkDir(config, true));
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ public abstract class ProjectProviderBase(ITestOutputHelper _testOutput, string?
 };

 public string? ProjectDir { get; set; } = _projectDir;
 protected ITestOutputHelper _testOutput = _testOutput;
 protected ITestOutputHelper _testOutput = new TestOutputWrapper(_testOutput);
 protected BuildEnvironment _buildEnv = BuildTestBase.s_buildEnv;
 public string BundleDirName { get; set; } = "wwwroot";

Expand Down

13 changes: 13 additions & 0 deletions
src/mono/wasm/Wasm.Build.Tests/WasmSdkBasedProjectProvider.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@
using System;
using System.IO;
using System.Collections.Generic;
using Xunit;
using Xunit.Abstractions;
using Xunit.Sdk;
using System.Linq;
Expand DownExpand Up@@ -76,6 +77,18 @@ public void AssertBundle(AssertWasmSdkBundleOptions assertOptions)
 {
 IReadOnlyDictionary<string, DotNetFileName> actualDotnetFiles = AssertBasicBundle(assertOptions);

 if (assertOptions.IsPublish)
 {
 string publishPath = Path.GetFullPath(Path.Combine(assertOptions.BinFrameworkDir, "..", ".."));
 Assert.Equal("publish", Path.GetFileName(publishPath));

 var dlls = Directory.EnumerateFiles(publishPath, "*.dll");
 Assert.False(dlls.Any(), $"Did not expect to find any .dll in {publishPath} but found {string.Join(",", dlls)}");

 var wasmAssemblies = Directory.EnumerateFiles(publishPath, "*.wasm");
 Assert.False(wasmAssemblies.Any(), $"Did not expect to find any .wasm files in {publishPath} but found {string.Join(",", wasmAssemblies)}");
 }

 if (!BuildTestBase.IsUsingWorkloads)
 return;

Expand Down

3 changes: 2 additions & 1 deletion
src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,7 @@ public partial class InstallWorkloadFromArtifacts : Task
 [Required, NotNull]
 public string SdkWithNoWorkloadInstalledPath { get; set; } = string.Empty;

 public string? IntermediateOutputPath { get; set; }
 public bool OnlyUpdateManifests{ get; set; }

 private const string s_nugetInsertionTag = "<!-- TEST_RESTORE_SOURCES_INSERTION_LINE -->";
Expand All@@ -59,7 +60,7 @@ public partial class InstallWorkloadFromArtifacts : Task

 public override bool Execute()
 {
 _tempDir = Path.Combine(Path.GetTempPath(), $"workload-{Path.GetRandomFileName()}");
 _tempDir = Path.Combine(IntermediateOutputPath ?? Path.GetTempPath(), $"workload-{Path.GetRandomFileName()}");
 if (Directory.Exists(_tempDir))
 Directory.Delete(_tempDir, recursive: true);
 Directory.CreateDirectory(_tempDir);
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
[wasm] Browser.targets: Fix .dlls being deployed to publish/#96045

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 4 commits into

from

Dec 19, 2023
 Merged


[wasm] Browser.targets: Fix .dlls being deployed to publish/#96045
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
00e1d67

[wasm] Browser.targets: Fix .dlls being deployed to `publish/`


radical Dec 15, 2023
7acfc2e

add tests


radical Dec 18, 2023
3113830

InstallWorkloadFromArtifacts: default to using obj dir as temp, to ge…


radical Dec 18, 2023
af9344e

cleanup


radical Dec 18, 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


1 change: 1 addition & 0 deletions
eng/testing/workloads-testing.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -211,6 +211,7 @@
 LocalNuGetsPath="$(LibrariesShippingPackagesDir)"
 TemplateNuGetConfigPath="$(RepoRoot)NuGet.config"
 SdkWithNoWorkloadInstalledPath="$(_SdkWithNoWorkloadPath)"
 IntermediateOutputPath="$(ArtifactsObjDir)wasm"
 />

 <Touch Files="$(_SdkWithNoWorkloadStampPath)" AlwaysCreate="true" />
Expand Down

10 changes: 7 additions & 3 deletions
...et/Microsoft.NET.Sdk.WebAssembly.Pack/build/Microsoft.NET.Sdk.WebAssembly.Browser.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ Copyright (c) .NET Foundation. All rights reserved.
 <_RunWorkingDirectory>$(OutputPath)</_RunWorkingDirectory>
 <_RunWorkingDirectory Condition="'$(_RunWorkingDirectory)' != '' and !$([System.IO.Path]::IsPathRooted($(_RunWorkingDirectory)))">$([System.IO.Path]::Combine($(MSBuildProjectDirectory), $(_RunWorkingDirectory)))</_RunWorkingDirectory>
 <_RuntimeConfigJsonPath>$([MSBuild]::NormalizePath($(_RunWorkingDirectory), '$(AssemblyName).runtimeconfig.json'))</_RuntimeConfigJsonPath>

 <RunArguments>exec &quot;$([MSBuild]::NormalizePath($(WasmAppHostDir), 'WasmAppHost.dll'))&quot; --use-staticwebassets --runtime-config &quot;$(_RuntimeConfigJsonPath)&quot; $(WasmHostArguments)</RunArguments>
 <RunWorkingDirectory>$(_RunWorkingDirectory)</RunWorkingDirectory>
 </PropertyGroup>
Expand DownExpand Up@@ -395,7 +395,7 @@ Copyright (c) .NET Foundation. All rights reserved.
 BeforeTargets="PrepareForPublish" />

 <!-- Wasm's Nested publish is run just to build the native bits. We don't need to run blazor targets for that -->
 <Target Name="ProcessPublishFilesForWasm" DependsOnTargets="_ResolveWasmConfiguration;LoadStaticWebAssetsBuildManifest;_GetWasmRuntimePackVersion" AfterTargets="ILLink" Condition="'$(WasmBuildingForNestedPublish)' != 'true'">
 <Target Name="ProcessPublishFilesForWasm" DependsOnTargets="_ResolveWasmConfiguration;LoadStaticWebAssetsBuildManifest;_GetWasmRuntimePackVersion;_GatherWasmFilesToPublish" AfterTargets="ILLink" Condition="'$(WasmBuildingForNestedPublish)' != 'true'">
 <!-- The list of static web assets already contains all the assets from the build. We want to correct certain assets that might
 have changed as part of the publish process. We are going to do so as follows:
 * We will update Blazor runtime asset dlls if we are running PublishTrimmed
Expand All@@ -419,7 +419,10 @@ Copyright (c) .NET Foundation. All rights reserved.
 </ItemGroup>
 <ItemGroup Condition="@(WasmAssembliesFinal->Count()) > 0">
 <_WasmResolvedFilesToPublish Include="@(WasmAssembliesFinal)" />
 <_WasmResolvedFilesToPublish Include="@(ResolvedFileToPublish)" Condition="'%(Extension)' != '.dll'" />

 <!-- remove the original assemblies -->
 <ResolvedFileToPublish Remove="@(WasmAssembliesToBundle)" />
 <_WasmResolvedFilesToPublish Include="@(ResolvedFileToPublish)" />
 </ItemGroup>

 <ComputeWasmPublishAssets
Expand DownExpand Up@@ -600,6 +603,7 @@ Copyright (c) .NET Foundation. All rights reserved.
 Code="BLAZORSDK1002" />
 </Target>

 <!-- called twice, once in the regular publish, and the other in the nested publish -->
 <Target Name="_GatherWasmFilesToPublish">
 <ItemGroup>
 <WasmAssembliesToBundle Remove="@(WasmAssembliesToBundle)" />
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -155,11 +155,11 @@ public void DefaultTemplate_WithResources_Publish(string config)
 if (config == "Release")
 {
 // relinking in publish for Release config
 BlazorPublish(new BlazorBuildOptions(id, config, NativeFilesType.Relinked, ExpectRelinkDirWhenPublishing: true));
 BlazorPublish(new BlazorBuildOptions(id, config, NativeFilesType.Relinked, ExpectRelinkDirWhenPublishing: true, IsPublish: true));
 }
 else
 {
 BlazorPublish(new BlazorBuildOptions(id, config, NativeFilesType.FromRuntimePack, ExpectRelinkDirWhenPublishing: true));
 BlazorPublish(new BlazorBuildOptions(id, config, NativeFilesType.FromRuntimePack, ExpectRelinkDirWhenPublishing: true, IsPublish: true));
 }

 AssertResourcesDlls(FindBlazorBinFrameworkDir(config, true));
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ public abstract class ProjectProviderBase(ITestOutputHelper _testOutput, string?
 };

 public string? ProjectDir { get; set; } = _projectDir;
 protected ITestOutputHelper _testOutput = _testOutput;
 protected ITestOutputHelper _testOutput = new TestOutputWrapper(_testOutput);
 protected BuildEnvironment _buildEnv = BuildTestBase.s_buildEnv;
 public string BundleDirName { get; set; } = "wwwroot";

Expand Down

13 changes: 13 additions & 0 deletions
src/mono/wasm/Wasm.Build.Tests/WasmSdkBasedProjectProvider.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@
using System;
using System.IO;
using System.Collections.Generic;
using Xunit;
using Xunit.Abstractions;
using Xunit.Sdk;
using System.Linq;
Expand DownExpand Up@@ -76,6 +77,18 @@ public void AssertBundle(AssertWasmSdkBundleOptions assertOptions)
 {
 IReadOnlyDictionary<string, DotNetFileName> actualDotnetFiles = AssertBasicBundle(assertOptions);

 if (assertOptions.IsPublish)
 {
 string publishPath = Path.GetFullPath(Path.Combine(assertOptions.BinFrameworkDir, "..", ".."));
 Assert.Equal("publish", Path.GetFileName(publishPath));

 var dlls = Directory.EnumerateFiles(publishPath, "*.dll");
 Assert.False(dlls.Any(), $"Did not expect to find any .dll in {publishPath} but found {string.Join(",", dlls)}");

 var wasmAssemblies = Directory.EnumerateFiles(publishPath, "*.wasm");
 Assert.False(wasmAssemblies.Any(), $"Did not expect to find any .wasm files in {publishPath} but found {string.Join(",", wasmAssemblies)}");
 }

 if (!BuildTestBase.IsUsingWorkloads)
 return;

Expand Down

3 changes: 2 additions & 1 deletion
src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,7 @@ public partial class InstallWorkloadFromArtifacts : Task
 [Required, NotNull]
 public string SdkWithNoWorkloadInstalledPath { get; set; } = string.Empty;

 public string? IntermediateOutputPath { get; set; }
 public bool OnlyUpdateManifests{ get; set; }

 private const string s_nugetInsertionTag = "<!-- TEST_RESTORE_SOURCES_INSERTION_LINE -->";
Expand All@@ -59,7 +60,7 @@ public partial class InstallWorkloadFromArtifacts : Task

 public override bool Execute()
 {
 _tempDir = Path.Combine(Path.GetTempPath(), $"workload-{Path.GetRandomFileName()}");
 _tempDir = Path.Combine(IntermediateOutputPath ?? Path.GetTempPath(), $"workload-{Path.GetRandomFileName()}");
 if (Directory.Exists(_tempDir))
 Directory.Delete(_tempDir, recursive: true);
 Directory.CreateDirectory(_tempDir);
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
[wasm] Browser.targets: Fix .dlls being deployed to publish/#96045

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 4 commits into

from

Dec 19, 2023
 Merged


[wasm] Browser.targets: Fix .dlls being deployed to publish/#96045
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
00e1d67

[wasm] Browser.targets: Fix .dlls being deployed to `publish/`


radical Dec 15, 2023
7acfc2e

add tests


radical Dec 18, 2023
3113830

InstallWorkloadFromArtifacts: default to using obj dir as temp, to ge…


radical Dec 18, 2023
af9344e

cleanup


radical Dec 18, 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


1 change: 1 addition & 0 deletions
eng/testing/workloads-testing.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -211,6 +211,7 @@
 LocalNuGetsPath="$(LibrariesShippingPackagesDir)"
 TemplateNuGetConfigPath="$(RepoRoot)NuGet.config"
 SdkWithNoWorkloadInstalledPath="$(_SdkWithNoWorkloadPath)"
 IntermediateOutputPath="$(ArtifactsObjDir)wasm"
 />

 <Touch Files="$(_SdkWithNoWorkloadStampPath)" AlwaysCreate="true" />
Expand Down

10 changes: 7 additions & 3 deletions
...et/Microsoft.NET.Sdk.WebAssembly.Pack/build/Microsoft.NET.Sdk.WebAssembly.Browser.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ Copyright (c) .NET Foundation. All rights reserved.
 <_RunWorkingDirectory>$(OutputPath)</_RunWorkingDirectory>
 <_RunWorkingDirectory Condition="'$(_RunWorkingDirectory)' != '' and !$([System.IO.Path]::IsPathRooted($(_RunWorkingDirectory)))">$([System.IO.Path]::Combine($(MSBuildProjectDirectory), $(_RunWorkingDirectory)))</_RunWorkingDirectory>
 <_RuntimeConfigJsonPath>$([MSBuild]::NormalizePath($(_RunWorkingDirectory), '$(AssemblyName).runtimeconfig.json'))</_RuntimeConfigJsonPath>

 <RunArguments>exec &quot;$([MSBuild]::NormalizePath($(WasmAppHostDir), 'WasmAppHost.dll'))&quot; --use-staticwebassets --runtime-config &quot;$(_RuntimeConfigJsonPath)&quot; $(WasmHostArguments)</RunArguments>
 <RunWorkingDirectory>$(_RunWorkingDirectory)</RunWorkingDirectory>
 </PropertyGroup>
Expand DownExpand Up@@ -395,7 +395,7 @@ Copyright (c) .NET Foundation. All rights reserved.
 BeforeTargets="PrepareForPublish" />

 <!-- Wasm's Nested publish is run just to build the native bits. We don't need to run blazor targets for that -->
 <Target Name="ProcessPublishFilesForWasm" DependsOnTargets="_ResolveWasmConfiguration;LoadStaticWebAssetsBuildManifest;_GetWasmRuntimePackVersion" AfterTargets="ILLink" Condition="'$(WasmBuildingForNestedPublish)' != 'true'">
 <Target Name="ProcessPublishFilesForWasm" DependsOnTargets="_ResolveWasmConfiguration;LoadStaticWebAssetsBuildManifest;_GetWasmRuntimePackVersion;_GatherWasmFilesToPublish" AfterTargets="ILLink" Condition="'$(WasmBuildingForNestedPublish)' != 'true'">
 <!-- The list of static web assets already contains all the assets from the build. We want to correct certain assets that might
 have changed as part of the publish process. We are going to do so as follows:
 * We will update Blazor runtime asset dlls if we are running PublishTrimmed
Expand All@@ -419,7 +419,10 @@ Copyright (c) .NET Foundation. All rights reserved.
 </ItemGroup>
 <ItemGroup Condition="@(WasmAssembliesFinal->Count()) > 0">
 <_WasmResolvedFilesToPublish Include="@(WasmAssembliesFinal)" />
 <_WasmResolvedFilesToPublish Include="@(ResolvedFileToPublish)" Condition="'%(Extension)' != '.dll'" />

 <!-- remove the original assemblies -->
 <ResolvedFileToPublish Remove="@(WasmAssembliesToBundle)" />
 <_WasmResolvedFilesToPublish Include="@(ResolvedFileToPublish)" />
 </ItemGroup>

 <ComputeWasmPublishAssets
Expand DownExpand Up@@ -600,6 +603,7 @@ Copyright (c) .NET Foundation. All rights reserved.
 Code="BLAZORSDK1002" />
 </Target>

 <!-- called twice, once in the regular publish, and the other in the nested publish -->
 <Target Name="_GatherWasmFilesToPublish">
 <ItemGroup>
 <WasmAssembliesToBundle Remove="@(WasmAssembliesToBundle)" />
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -155,11 +155,11 @@ public void DefaultTemplate_WithResources_Publish(string config)
 if (config == "Release")
 {
 // relinking in publish for Release config
 BlazorPublish(new BlazorBuildOptions(id, config, NativeFilesType.Relinked, ExpectRelinkDirWhenPublishing: true));
 BlazorPublish(new BlazorBuildOptions(id, config, NativeFilesType.Relinked, ExpectRelinkDirWhenPublishing: true, IsPublish: true));
 }
 else
 {
 BlazorPublish(new BlazorBuildOptions(id, config, NativeFilesType.FromRuntimePack, ExpectRelinkDirWhenPublishing: true));
 BlazorPublish(new BlazorBuildOptions(id, config, NativeFilesType.FromRuntimePack, ExpectRelinkDirWhenPublishing: true, IsPublish: true));
 }

 AssertResourcesDlls(FindBlazorBinFrameworkDir(config, true));
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ public abstract class ProjectProviderBase(ITestOutputHelper _testOutput, string?
 };

 public string? ProjectDir { get; set; } = _projectDir;
 protected ITestOutputHelper _testOutput = _testOutput;
 protected ITestOutputHelper _testOutput = new TestOutputWrapper(_testOutput);
 protected BuildEnvironment _buildEnv = BuildTestBase.s_buildEnv;
 public string BundleDirName { get; set; } = "wwwroot";

Expand Down

13 changes: 13 additions & 0 deletions
src/mono/wasm/Wasm.Build.Tests/WasmSdkBasedProjectProvider.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@
using System;
using System.IO;
using System.Collections.Generic;
using Xunit;
using Xunit.Abstractions;
using Xunit.Sdk;
using System.Linq;
Expand DownExpand Up@@ -76,6 +77,18 @@ public void AssertBundle(AssertWasmSdkBundleOptions assertOptions)
 {
 IReadOnlyDictionary<string, DotNetFileName> actualDotnetFiles = AssertBasicBundle(assertOptions);

 if (assertOptions.IsPublish)
 {
 string publishPath = Path.GetFullPath(Path.Combine(assertOptions.BinFrameworkDir, "..", ".."));
 Assert.Equal("publish", Path.GetFileName(publishPath));

 var dlls = Directory.EnumerateFiles(publishPath, "*.dll");
 Assert.False(dlls.Any(), $"Did not expect to find any .dll in {publishPath} but found {string.Join(",", dlls)}");

 var wasmAssemblies = Directory.EnumerateFiles(publishPath, "*.wasm");
 Assert.False(wasmAssemblies.Any(), $"Did not expect to find any .wasm files in {publishPath} but found {string.Join(",", wasmAssemblies)}");
 }

 if (!BuildTestBase.IsUsingWorkloads)
 return;

Expand Down

3 changes: 2 additions & 1 deletion
src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,7 @@ public partial class InstallWorkloadFromArtifacts : Task
 [Required, NotNull]
 public string SdkWithNoWorkloadInstalledPath { get; set; } = string.Empty;

 public string? IntermediateOutputPath { get; set; }
 public bool OnlyUpdateManifests{ get; set; }

 private const string s_nugetInsertionTag = "<!-- TEST_RESTORE_SOURCES_INSERTION_LINE -->";
Expand All@@ -59,7 +60,7 @@ public partial class InstallWorkloadFromArtifacts : Task

 public override bool Execute()
 {
 _tempDir = Path.Combine(Path.GetTempPath(), $"workload-{Path.GetRandomFileName()}");
 _tempDir = Path.Combine(IntermediateOutputPath ?? Path.GetTempPath(), $"workload-{Path.GetRandomFileName()}");
 if (Directory.Exists(_tempDir))
 Directory.Delete(_tempDir, recursive: true);
 Directory.CreateDirectory(_tempDir);
Expand Down