Split WebAssembly SDK from Blazor SDK #31154

maraf · 2023-03-13T10:57:24Z

Overall implementation plan in the [wasm] Tracking issue for build/bundler changes runtime#70762
This PR doesn't produce any change in the build output (some will come after integration on the runtime side in following PRs).
- All blazor properties, items and targets should work as before.
All tests remain unchanged (some parts might be moved after runtime side integration).
All existing boot config options are generated from wasm boot generator. We will probably move some to blazor config extension after integration with blazor JS side. In the meanwhile new blazor-only flags should go to blazor config extension.
Wasm SDK will probably go through some clean up later as we will integrate runtime side.

# Conflicts: # sdk.sln # src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmBuildIntegrationTest.cs

ghost · 2023-03-16T18:34:27Z

Thanks for your PR, @maraf.
To learn about the PR process and branching schedule of this repo, please take a look at the SDK PR Guide.

javiercn · 2023-03-21T16:09:50Z

src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/GenerateBlazorBootJsonTest.cs

@@ -91,7 +92,7 @@ public void GroupsResourcesByType()
                        ("FileHash", "my-custom-extensionhash"),
                        ("RelativePath", "my-custom-extension.blz"),
                        ("TargetPath", "_bin/my-custom-extension.blz"),
-                        ("AssetTraitName", "BlazorWebAssemblyResource"),
+                        ("AssetTraitName", "WasmResource"),


We need to be careful here because I believe we use this on the service worker. Just making a note here so that I don't forget as I haven't gone through the entire PR

javiercn · 2023-03-21T16:17:58Z

src/WasmSdk/Sdk/Sdk.props

+<Project ToolsVersion="14.0" TreatAsLocalProperty="RuntimeIdentifier">
+  <PropertyGroup>
+    <!-- FIXME: Important to get rid of missing workload -->
+    <UsingMicrosoftNETSdkBlazorWebAssembly>true</UsingMicrosoftNETSdkBlazorWebAssembly>


Is this temporary?

Yes, I'll update the property during the migration to runtime repo once I update the wasm-tools workload manifest

src/WasmSdk/Sdk/Sdk.props

src/WasmSdk/Targets/Microsoft.NET.Sdk.WebAssembly.Current.props

src/WasmSdk/Targets/Microsoft.NET.Sdk.WebAssembly.Current.targets

javiercn · 2023-03-21T16:28:35Z

src/WasmSdk/Tasks/BootJsonData.cs

+        /// <summary>
+        /// "debug" (.pdb) resources
+        /// </summary>
+        [DataMember(EmitDefaultValue = false)]


FYI, this can be updated to use System.Text.Json. It used datacontractserializer because it predates it, but I did support to add System.Text.Json support to the SDK tasks, so you should be able to use it. (It might be that I only did it in the RazorSDK, but it should be "copiable")

Not asking you to change it, just letting you know

I would love to do it. I think I struggled on the package version when I tried it last week.

So you are saying that I can use version 6.0 like in here https://github.com/dotnet/razor/blob/33e06ed0fd64c8b67b80d464370ee0380f9ab32c/eng/Versions.props#L179, right?

9ed247b#diff-8bd75765f34d87f1dcad4a428355ceb7e78e7be3febb15e66bbae735c60ae374R42

javiercn · 2023-03-21T16:31:11Z

src/WasmSdk/Tasks/FileHasher.cs

@@ -6,7 +6,7 @@
 using System.Security.Cryptography;
 using System.Text;

-namespace Microsoft.NET.Sdk.BlazorWebAssembly
+namespace Microsoft.NET.Sdk.WebAssembly
 {
    public static class FileHasher


@MackinnonBuck this will move to static web assets as part of dotnet/aspnetcore#47000

# Conflicts: # src/BlazorWasmSdk/Targets/Microsoft.NET.Sdk.BlazorWebAssembly.6_0.targets # src/BlazorWasmSdk/Tasks/BootJsonData.cs # src/WasmSdk/Tasks/GenerateWasmBootJson.cs

# Conflicts: # src/BlazorWasmSdk/Targets/Microsoft.NET.Sdk.BlazorWebAssembly.6_0.targets # src/WasmSdk/Tasks/ComputeWasmBuildAssets.cs # src/WasmSdk/Tasks/ComputeWasmPublishAssets.cs # src/WasmSdk/Tasks/GenerateWasmBootJson.cs

`Microsoft.NET.Sdk.BlazorWebAssembly.Current.targets` unconditionally imports: ```xml <Import Sdk="Microsoft.NET.Sdk.Razor" Project="Sdk.targets" /> <Import Sdk="Microsoft.NET.Sdk.Web.ProjectSystem" Project="Sdk.targets" /> <Import Sdk="Microsoft.NET.Sdk.Publish" Project="Sdk.targets" /> ``` .. *after* which it can import `Microsoft.NET.Sdk.BlazorWebAssembly.5_0.targets`, which then unconditionally imports: ```xml <Import Sdk="Microsoft.NET.Sdk.Razor" Project="Sdk.targets" /> <Import Sdk="Microsoft.NET.Sdk.Web.ProjectSystem" Project="Sdk.targets" /> <Import Sdk="Microsoft.NET.Sdk.Publish" Project="Sdk.targets" /> ``` .. which produces warning: ``` [2023/05/24 07:06:03][INFO] /home/helixbot/work/BAA509D0/p/dotnet/sdk/8.0.100-preview.5.23273.2/Sdks/Microsoft.NET.Sdk.BlazorWebAssembly/targets/Microsoft.NET.Sdk.BlazorWebAssembly.5_0.targets(13,3): warning MSB4011: "/home/helixbot/work/BAA509D0/p/dotnet/sdk/8.0.100-preview.5.23273.2/Sdks/Microsoft.NET.Sdk.Razor/Sdk/Sdk.targets" cannot be imported again. It was already imported at "/home/helixbot/work/BAA509D0/p/dotnet/sdk/8.0.100-preview.5.23273.2/Sdks/Microsoft.NET.Sdk.BlazorWebAssembly/targets/Microsoft.NET.Sdk.BlazorWebAssembly.Current.targets (25,3)". This is most likely a build authoring error. This subsequent import will be ignored. ``` .. and the same for `Microsoft.NET.Sdk.Web.ProjectSystem`, and `Microsoft.NET.Sdk.Publish`. Since the `5_0.targets` is only ever imported from the `Current.targets`, it does not need to import the same SDKs again. This was introduced in: ``` commit 3e34299 Author: Marek Fišera <mara@neptuo.com> Date: Tue Mar 28 15:47:55 2023 +0200 Split WebAssembly SDK from Blazor SDK (dotnet#31154) ``` .. and the blazor scenario perf runs have been broken since it got merged.

`Microsoft.NET.Sdk.BlazorWebAssembly.Current.targets` unconditionally imports: ```xml <Import Sdk="Microsoft.NET.Sdk.Razor" Project="Sdk.targets" /> <Import Sdk="Microsoft.NET.Sdk.Web.ProjectSystem" Project="Sdk.targets" /> <Import Sdk="Microsoft.NET.Sdk.Publish" Project="Sdk.targets" /> ``` .. *after* which it can import `Microsoft.NET.Sdk.BlazorWebAssembly.5_0.targets`, which then unconditionally imports: ```xml <Import Sdk="Microsoft.NET.Sdk.Razor" Project="Sdk.targets" /> <Import Sdk="Microsoft.NET.Sdk.Web.ProjectSystem" Project="Sdk.targets" /> <Import Sdk="Microsoft.NET.Sdk.Publish" Project="Sdk.targets" /> ``` .. which produces warning: ``` [2023/05/24 07:06:03][INFO] /home/helixbot/work/BAA509D0/p/dotnet/sdk/8.0.100-preview.5.23273.2/Sdks/Microsoft.NET.Sdk.BlazorWebAssembly/targets/Microsoft.NET.Sdk.BlazorWebAssembly.5_0.targets(13,3): warning MSB4011: "/home/helixbot/work/BAA509D0/p/dotnet/sdk/8.0.100-preview.5.23273.2/Sdks/Microsoft.NET.Sdk.Razor/Sdk/Sdk.targets" cannot be imported again. It was already imported at "/home/helixbot/work/BAA509D0/p/dotnet/sdk/8.0.100-preview.5.23273.2/Sdks/Microsoft.NET.Sdk.BlazorWebAssembly/targets/Microsoft.NET.Sdk.BlazorWebAssembly.Current.targets (25,3)". This is most likely a build authoring error. This subsequent import will be ignored. ``` .. and the same for `Microsoft.NET.Sdk.Web.ProjectSystem`, and `Microsoft.NET.Sdk.Publish`. Since the `5_0.targets` is only ever imported from the `Current.targets`, it does not need to import the same SDKs again. This was introduced in: ``` commit 3e34299 Author: Marek Fišera <mara@neptuo.com> Date: Tue Mar 28 15:47:55 2023 +0200 Split WebAssembly SDK from Blazor SDK (#31154) ``` .. and the blazor scenario perf runs have been broken since it got merged.

maraf added 5 commits March 9, 2023 15:35

Copy blazor sdk to new wasm sdk

322b5d5

Fix tasks dll name

b92d406

Drop compression + spare tasks

abf61fd

Integration blazor+wasm

48cea7d

Make blazor build working

34a8268

maraf self-assigned this Mar 13, 2023

dotnet-issue-labeler bot added the Area-Infrastructure label Mar 13, 2023

maraf added 4 commits March 14, 2023 14:30

Fix 5.0 blazor

c77ec8f

Fix target names.

6efefdf

Include blazor.js directly in SWA

f346ca8

Blazor SDK has BootJsonData only for 5.0 compatibility.

b1ece4e

pavelsavara self-requested a review March 15, 2023 08:14

maraf added 7 commits March 15, 2023 09:53

Renames, round 1

f84f6c5

Renames, round 2

f5ff40e

Boot config extensibility.

49f6a7a

Renames, round 3

2befef7

Merge remote-tracking branch 'upstream/main' into WasmSdk

260bd58

# Conflicts: # sdk.sln # src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmBuildIntegrationTest.cs

Fix sln.

c570401

Fix 5.0

2949338

maraf requested a review from radical March 15, 2023 16:07

maraf added 6 commits March 16, 2023 09:28

Blazor extension for boot config (empty)

62ad886

Fix property assingments

4d3ead0

Use StaticWebAssets SDK

b410bfc

Allow to disable dotnet.js fingerprint.

c39e307

Vanilla wasm unit test

55409a8

Fix property assingments.

6d6bc93

maraf added Area-AspNetCore RazorSDK, BlazorWebAssemblySDK, dotnet-watch and removed Area-Infrastructure labels Mar 16, 2023

maraf mentioned this pull request Mar 17, 2023

[wasm] Tracking issue for build/bundler changes dotnet/runtime#70762

Closed

49 tasks

maraf added 4 commits March 18, 2023 10:15

Clean up

1d8ab0c

Merge remote-tracking branch 'upstream/main' into WasmSdk

7511309

Fix importing other SDKs

232f6f0

Workaround in test case

4b24d55

maraf marked this pull request as ready for review March 20, 2023 12:30

maraf requested review from a team and vijayrkn as code owners March 20, 2023 12:30

maraf changed the title ~~WebAssembly SDK~~ Split WebAssembly SDK from Blazor SDK Mar 20, 2023

javiercn reviewed Mar 21, 2023

View reviewed changes

src/WasmSdk/Sdk/Sdk.props Outdated Show resolved Hide resolved

javiercn reviewed Mar 21, 2023

View reviewed changes

src/WasmSdk/Targets/Microsoft.NET.Sdk.WebAssembly.Current.props Outdated Show resolved Hide resolved

javiercn reviewed Mar 21, 2023

View reviewed changes

src/WasmSdk/Targets/Microsoft.NET.Sdk.WebAssembly.Current.targets Outdated Show resolved Hide resolved

javiercn reviewed Mar 21, 2023

View reviewed changes

Feedback

6428f67

MackinnonBuck mentioned this pull request Mar 22, 2023

Only enable scoped CSS when using Razor SDK #31359

Merged

maraf added 4 commits March 23, 2023 09:18

Merge remote-tracking branch 'upstream/main' into WasmSdk

1708cfd

Drop workaround in vanilla wasm test

a050ce4

Merge remote-tracking branch 'upstream/main' into WasmSdk

4f199a4

# Conflicts: # src/BlazorWasmSdk/Targets/Microsoft.NET.Sdk.BlazorWebAssembly.6_0.targets # src/BlazorWasmSdk/Tasks/BootJsonData.cs # src/WasmSdk/Tasks/GenerateWasmBootJson.cs

Fix merge

9734bf1

javiercn approved these changes Mar 27, 2023

View reviewed changes

Merge remote-tracking branch 'upstream/main' into WasmSdk

e202c04

# Conflicts: # src/BlazorWasmSdk/Targets/Microsoft.NET.Sdk.BlazorWebAssembly.6_0.targets # src/WasmSdk/Tasks/ComputeWasmBuildAssets.cs # src/WasmSdk/Tasks/ComputeWasmPublishAssets.cs # src/WasmSdk/Tasks/GenerateWasmBootJson.cs

maraf merged commit 3e34299 into dotnet:main Mar 28, 2023

maraf deleted the WasmSdk branch March 28, 2023 13:48

This was referenced Apr 6, 2023

Fix order of targets in WasmNestedPublishAppDependsOn #31640

Merged

[browser] Wasm SDK packed as a nuget package dotnet/runtime#84082

Merged

maraf mentioned this pull request Jul 21, 2023

Move GenerateRuntimeConfigurationFiles=false back to Blazor SDK from Wasm SDK #34177

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Split WebAssembly SDK from Blazor SDK #31154

Split WebAssembly SDK from Blazor SDK #31154

maraf commented Mar 13, 2023 •

edited

Loading

ghost commented Mar 16, 2023

javiercn Mar 21, 2023

javiercn Mar 21, 2023

maraf Mar 22, 2023

javiercn Mar 21, 2023

javiercn Mar 21, 2023

maraf Mar 22, 2023 •

edited

Loading

javiercn Mar 27, 2023

javiercn Mar 21, 2023

Split WebAssembly SDK from Blazor SDK #31154

Split WebAssembly SDK from Blazor SDK #31154

Conversation

maraf commented Mar 13, 2023 • edited Loading

ghost commented Mar 16, 2023

javiercn Mar 21, 2023

Choose a reason for hiding this comment

javiercn Mar 21, 2023

Choose a reason for hiding this comment

maraf Mar 22, 2023

Choose a reason for hiding this comment

javiercn Mar 21, 2023

Choose a reason for hiding this comment

javiercn Mar 21, 2023

Choose a reason for hiding this comment

maraf Mar 22, 2023 • edited Loading

Choose a reason for hiding this comment

javiercn Mar 27, 2023

Choose a reason for hiding this comment

javiercn Mar 21, 2023

Choose a reason for hiding this comment

maraf commented Mar 13, 2023 •

edited

Loading

maraf Mar 22, 2023 •

edited

Loading