[browser] Wasm SDK packed as a nuget package by maraf · Pull Request #84082 · dotnet/runtime

maraf · 2023-03-29T18:02:43Z

Produce a Microsoft.NET.Sdk.WebAssembly.Pack package containing most of the Wasm SDK bits.

Original sources https://github.com/dotnet/sdk/tree/main/src/WasmSdk
This PR tries to make a minimal change
Tests and integration with in-tree building will come in follow-up PRs

Contributes to #81367

ghost · 2023-03-29T18:02:54Z

Tagging subscribers to 'arch-wasm': @lewing
See info in area-owners.md if you want to be subscribed.

Issue Details

TBD

Author:	maraf
Assignees:	maraf
Labels:	`arch-wasm`, `area-Build-mono`
Milestone:	8.0.0

… validation

…sFile.

This reverts commit 93b48b6.

lewing · 2023-04-11T05:18:32Z

kicked this over now that the baseline is green. Cursory reading looks fine, what is left to do?

radical · 2023-04-11T12:26:05Z

Just curious - why do we have Pack in the name?

radical

Just some comments at a glance. I'm guessing that most of the code is being moved from elsewhere (could you point to the original sources?), so I didn't really review in detail.

radical · 2023-04-11T12:18:16Z

+ [Output]
+ public ITaskItem[] FilesToRemove { get; set; }
+
+ public override bool Execute()


nit: I would suggest renaming this to ExecuteInternal, called by Execute which has:
runtime/src/tasks/WasmAppBuilder/ManagedToNativeGenerator.cs
Lines 55 to 64 in 19ff978
try
{
ExecuteInternal();
return!Log.HasLoggedErrors;
}
catch(LogAsErrorExceptione)
{
Log.LogError(e.Message);
returnfalse;
}
This would make the main method simpler, and allow use of
thrownewLogAsErrorException("Invalid number of project assemblies '{0}'",string.Join(","+Environment.NewLine,ProjectAssembly.Select(a =>a.ItemSpec)));

I'll do it in follow-up PR. I would like to focus on the functional part at the moment

radical · 2023-04-11T18:19:00Z

+ <!-- Avoid having the rid show up in output paths -->
+ <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>


What's the reason for this?

It's taken from blazor. I would like to be as similar as possible

maraf · 2023-04-12T08:31:30Z

Just curious - why do we have Pack in the name?

The Microsoft.NET.Sdk.WebAssembly is taken by tasks in the SDK repo https://github.com/dotnet/sdk/blob/767d13a675a2b03f22d36c1ae62a242cc9523603/src/WasmSdk/Tasks/Microsoft.NET.Sdk.WebAssembly.Tasks.csproj.

Just some comments at a glance. I'm guessing that most of the code is being moved from elsewhere (could you point to the original sources?), so I didn't really review in detail.

This is the original PR dotnet/sdk#31154 that split common bits from Blazor SDK

maraf · 2023-04-12T09:25:57Z

Nupkg built on CI is correct

@lewing @steveisok @radical @pavelsavara Any more feedback? This is needed to unblock SDK change dotnet/sdk#31519

steveisok

Looks good!

This reverts commit 063adfe.

* [browser] Wasm SDK packed as a nuget package (#84082) * Update pattern for matching RidAgnosticNupkgToPublishFile to include Microsoft.NET.Sdk.WebAssembly.Pack

maraf added 2 commits March 29, 2023 18:20

Wasm SDK as nuget package.
2788669

Include project in the mono-packages.proj
aac1aaa

maraf added arch-wasm WebAssembly architecture area-Build-mono labels Mar 29, 2023

maraf added this to the 8.0.0 milestone Mar 29, 2023

maraf self-assigned this Mar 29, 2023

Drop debug nuget source.
ff71159

maraf mentioned this pull request Mar 30, 2023
[wasm] Tracking issue for build/bundler changes #70762
Closed
49 tasks

maraf added 4 commits March 30, 2023 14:14

Rename package to Microsoft.NET.Sdk.WebAssembly.Pack, disable package…
0bb15b3
… validation

Drop debug nuget source.
609386f

Include .cs and .config files
d5bd817

Import using overridable _WebAssemblyPropsFile and _WebAssemblyTarget…
d079e6a
…sFile.

steveisok self-requested a review March 30, 2023 16:18

Rewrite bundling as pkgproj.
735368d

maraf commented Mar 31, 2023
View reviewed changes

Comment threadsrc/mono/nuget/Microsoft.NET.Sdk.WebAssembly.Pack/Microsoft.NET.Sdk.WebAssembly.Pack.pkgproj Outdated

This was referenced Mar 31, 2023
Checkout failure: "Git fetch failed with exit code 128" dotnet/arcade#9009
Open
WasmTestOnBrowser-System.* test failures in CI #83655
Closed

Drop BuildOutputTargetFolder.
5e94346

build-analysisBot mentioned this pull request Apr 4, 2023
CI System.Text.RegularExpressions.Tests failure #84323
Closed

maraf added 3 commits April 6, 2023 18:07

Rename WebAssemblySdk.Pack to WebAssemblySdk.Browser
93b48b6

Revert "Rename WebAssemblySdk.Pack to WebAssemblySdk.Browser"
31f492e
This reverts commit 93b48b6.

Move the RID condition to pack props.
b25e9ec

This was referenced Apr 6, 2023
StackallocTests.Test4096 failing EnsureZeroed check #84398
Open
WindowsServiceLifetimeTests.ServiceCanStopItself fails in CI #84438
Closed

lewing closed this Apr 11, 2023

lewing reopened this Apr 11, 2023

lewing requested a review from pavelsavara April 11, 2023 05:16

Update UsingMicrosoftNETSdkBlazorWebAssembly conditions
2e268b6

Fix including tasks dlls
5dd1c93

maraf marked this pull request as ready for review April 11, 2023 11:31

maraf requested review from marek-safar and radical as code owners April 11, 2023 11:31

radical reviewed Apr 11, 2023
View reviewed changes

Fix default value for RID
c2812d2

radical reviewed Apr 11, 2023
View reviewed changes

maraf added 2 commits April 12, 2023 10:14

Proper way to pack tasks dll
39a9ddd

Formatting
4117c5c

maraf requested review from lewing and radical April 12, 2023 09:26

pavelsavara approved these changes Apr 12, 2023
View reviewed changes

steveisok approved these changes Apr 12, 2023
View reviewed changes

lewing approved these changes Apr 12, 2023
View reviewed changes

maraf merged commit 063adfe into dotnet:mainApr 12, 2023

maraf deleted the WasmSdkPackaged branch April 12, 2023 15:38

sbomer mentioned this pull request Apr 12, 2023
Official build failure trying to sign Microsoft.NET.Sdk.WebAssembly.Pack #84742
Closed

lewing added a commit that referenced this pull request Apr 13, 2023
Revert "[browser] Wasm SDK packed as a nuget package (#84082)"
a3a0ea5
This reverts commit 063adfe.

lewing mentioned this pull request Apr 13, 2023
Revert "[browser] Wasm SDK packed as a nuget package" #84743
Merged

ViktorHofer pushed a commit that referenced this pull request Apr 13, 2023
Revert "[browser] Wasm SDK packed as a nuget package (#84082)" (#84743)
d0a287a
This reverts commit 063adfe.

maraf added a commit to maraf/runtime that referenced this pull request Apr 13, 2023
[browser] Wasm SDK packed as a nuget package (dotnet#84082)
3fc842b

maraf mentioned this pull request Apr 13, 2023
[browser] Wasm SDK packed as a nuget package #84761
Merged

lewing pushed a commit that referenced this pull request Apr 14, 2023
[browser] Wasm SDK packed as a nuget package (#84761)
27b8a24
* [browser] Wasm SDK packed as a nuget package (#84082) * Update pattern for matching RidAgnosticNupkgToPublishFile to include Microsoft.NET.Sdk.WebAssembly.Pack

ghost locked as resolved and limited conversation to collaborators May 12, 2023

	try
	{
	ExecuteInternal();
	return!Log.HasLoggedErrors;
	}
	catch(LogAsErrorExceptione)
	{
	Log.LogError(e.Message);
	returnfalse;
	}

		<!-- Avoid having the rid show up in output paths -->
		<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>

Uh oh!

Conversation

maraf commented Mar 29, 2023• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ghost commented Mar 29, 2023

Uh oh!

Uh oh!

lewing commented Apr 11, 2023

Uh oh!

radical commented Apr 11, 2023

Uh oh!

radical left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

radicalApr 11, 2023

Choose a reason for hiding this comment

Uh oh!

marafApr 12, 2023• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

radicalApr 11, 2023

Choose a reason for hiding this comment

Uh oh!

marafApr 12, 2023

Choose a reason for hiding this comment

Uh oh!

maraf commented Apr 12, 2023

Uh oh!

maraf commented Apr 12, 2023

Uh oh!

steveisok left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

maraf commented Mar 29, 2023•
edited
Loading

marafApr 12, 2023•
edited
Loading