Skip to content
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.

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

[wasm][bench] Use dotnet new wasmbrowser for browser-frame #99400

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -84,25 +84,36 @@
DestinationFolder="$(MSBuildThisFileDirectory)/bin/$(Configuration)/AppBundle/blazor-template/%(RecursiveDir)" />
</Target>

<Target Name="BuildBrowserFrame" AfterTargets="BuildSampleInTree" Condition="'$(BrowserStartup)' == 'true'" DependsOnTargets="BuildWBT">
<Target Name="PrepareBrowserTemplate" Condition="!Exists('$(MonoProjectRoot)sample/wasm/browser-frame/browser-frame')">
<ItemGroup>
<OverrideFiles Include="$(MonoProjectRoot)wasm/Wasm.Build.Tests/data/WasmOverridePacks.targets" />
<OverrideFiles Include="$(MonoProjectRoot)wasm/Wasm.Build.Tests/data/Blazor.Directory.Build.targets" />
<OverrideDestFiles Include="$(MonoProjectRoot)sample/wasm/browser-frame/WasmOverridePacks.targets" />
<OverrideDestFiles Include="$(MonoProjectRoot)sample/wasm/browser-frame/Directory.Build.targets" />
<OverrideFiles Include="$(MonoProjectRoot)sample/wasm/browser-frame/AppStart.cs" />
<OverrideFiles Include="$(MonoProjectRoot)sample/wasm/browser-frame/frame.js" />
<OverrideDestFiles Include="$(MonoProjectRoot)sample/wasm/browser-frame/browser-frame/WasmOverridePacks.targets" />
<OverrideDestFiles Include="$(MonoProjectRoot)sample/wasm/browser-frame/browser-frame/Directory.Build.targets" />
<OverrideDestFiles Include="$(MonoProjectRoot)sample/wasm/browser-frame/browser-frame/AppStart.cs" />
<OverrideDestFiles Include="$(MonoProjectRoot)sample/wasm/browser-frame/browser-frame/wwwroot/frame.js" />
</ItemGroup>

<MakeDir Directories="$(MonoProjectRoot)sample/wasm/blazor-frame/browser-frame"/>
<Copy SourceFiles="@(OverrideFiles)" DestinationFiles="@(OverrideDestFiles)" UseSymbolicLinksIfPossible="true" OverwriteReadOnlyFiles="true" />

<WriteLinesToFile
File="$(MSBuildThisFileDirectory)../browser-frame/nuget.config"
File="$(MSBuildThisFileDirectory)../browser-frame/browser-frame/nuget.config"
Overwrite="true"
Lines="$(NugetConfigContent)" />

<Exec EnvironmentVariables="MSBuildSDKsPath=;DOTNET_ROOT=$(ArtifactsDir)bin/dotnet-latest;PATH=$(ArtifactsDir)bin/dotnet-latest:$(PATH)" WorkingDirectory="$(MSBuildThisFileDirectory)../browser-frame" Command="dotnet publish browser-frame.csproj -c $(Configuration) -p:WBTOverrideRuntimePack=true -p:TargetOS=browser -p:TargetArchitecture=wasm $(BuildAdditionalArgs)" />
<Exec EnvironmentVariables="MSBuildSDKsPath=;DOTNET_ROOT=$(ArtifactsDir)bin/dotnet-latest;PATH=$(ArtifactsDir)bin/dotnet-latest:$(PATH)" WorkingDirectory="$(MSBuildThisFileDirectory)../browser-frame/browser-frame/" Command="dotnet new wasmbrowser" />
<Exec WorkingDirectory="$(MSBuildThisFileDirectory)../browser-frame" Command="git apply browser-frame.diff" />
</Target>

<Target Name="BuildBrowserFrame" AfterTargets="BuildSampleInTree" Condition="'$(BrowserStartup)' == 'true'" DependsOnTargets="BuildWBT;PrepareBrowserTemplate">

<Exec EnvironmentVariables="MSBuildSDKsPath=;DOTNET_ROOT=$(ArtifactsDir)bin/dotnet-latest;PATH=$(ArtifactsDir)bin/dotnet-latest:$(PATH)" WorkingDirectory="$(MSBuildThisFileDirectory)../browser-frame/browser-frame" Command="dotnet publish browser-frame.csproj -c $(Configuration) -p:WBTOverrideRuntimePack=true -p:TargetOS=browser -p:TargetArchitecture=wasm $(BuildAdditionalArgs)" />

<ItemGroup>
<BrowserSourceFiles Include="$(MSBuildThisFileDirectory)../browser-frame/bin/$(Configuration)/$(NetCoreAppCurrent)/publish/wwwroot/**/*.*"/>
<BrowserSourceFiles Include="$(MSBuildThisFileDirectory)../browser-frame/browser-frame/bin/$(Configuration)/$(NetCoreAppCurrent)/publish/wwwroot/**/*.*"/>
</ItemGroup>

<Copy
Expand Down
20 changes: 0 additions & 20 deletions src/mono/sample/wasm/browser-frame/Program.cs

This file was deleted.

23 changes: 23 additions & 0 deletions src/mono/sample/wasm/browser-frame/browser-frame.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
diff -ru browser-frame/Program.cs browser-frame/Program.cs
--- a/browser-frame/Program.cs 2024-03-07 09:00:37
+++ b/browser-frame/Program.cs 2024-03-05 15:38:42
@@ -1,6 +1,8 @@
using System;
using System.Runtime.InteropServices.JavaScript;

+BrowserBench.FrameApp.ReachedManaged();
+
Console.WriteLine("Hello, Browser!");

public partial class MyClass
diff -ru browser-frame/wwwroot/index.html browser-frame/wwwroot/index.html
--- a/browser-frame/wwwroot/index.html 2024-03-07 09:00:37
+++ b/browser-frame/wwwroot/index.html 2024-03-05 15:38:42
@@ -8,6 +8,7 @@
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<script type='module' src="./main.js"></script>
+ <script type="module" src="./frame.js"></script>
</head>

<body>
10 changes: 0 additions & 10 deletions src/mono/sample/wasm/browser-frame/runtimeconfig.template.json

This file was deleted.

18 changes: 0 additions & 18 deletions src/mono/sample/wasm/browser-frame/wwwroot/index.html

This file was deleted.

25 changes: 0 additions & 25 deletions src/mono/sample/wasm/browser-frame/wwwroot/main.js

This file was deleted.

18 changes: 0 additions & 18 deletions src/mono/sample/wasm/browser-frame/wwwroot/start.html

This file was deleted.

25 changes: 0 additions & 25 deletions src/mono/sample/wasm/browser-frame/wwwroot/start.js

This file was deleted.

Loading