Skip to content

Commit

Permalink
[wasm] Fix templates patch in the bench (#110779)
Browse files Browse the repository at this point in the history
The templates were updated recently. It also updates the copying of the files again as the tfm's are in sync now.
  • Loading branch information
radekdoulik authored Dec 17, 2024
1 parent 6d6f2bd commit 040cbe2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions src/mono/sample/wasm/blazor-frame/blazor-frame.diff
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ diff -urw blazor/blazor.csproj blazor/blazor.csproj
--- a/blazor/blazor.csproj 2024-01-22 16:01:30
+++ b/blazor/blazor.csproj 2024-01-23 12:04:59
@@ -4,6 +4,8 @@
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
+ <StaticWebAssetBasePath>blazor-template/</StaticWebAssetBasePath>
Expand All @@ -59,7 +59,7 @@ diff -urw blazor/wwwroot/index.html blazor/wwwroot/index.html
<title>blazor</title>
- <base href="/" />
+ <base href="./" />
<link rel="stylesheet" href="css/bootstrap/bootstrap.min.css" />
<link rel="stylesheet" href="lib/bootstrap/dist/css/bootstrap.min.css" />
<link rel="stylesheet" href="css/app.css" />
<link rel="icon" type="image/png" href="favicon.png" />
@@ -23,10 +23,11 @@
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
<Exec EnvironmentVariables="MSBuildSDKsPath=$(WBTSdksPath);NUGET_PACKAGES=$(NugetPackagesPath);DOTNET_ROOT=$(ArtifactsDir)bin/dotnet-latest;PATH=$(ArtifactsDir)bin/dotnet-latest:$(PATH)" WorkingDirectory="$(MSBuildThisFileDirectory)../blazor-frame/blazor" Command="dotnet publish blazor.csproj -c $(Configuration) -p:WBTOverrideRuntimePack=true -p:TargetOS=browser -p:TargetArchitecture=wasm $(BuildAdditionalArgs)" />

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

<Copy
Expand Down Expand Up @@ -143,7 +143,7 @@
<Exec EnvironmentVariables="MSBuildSDKsPath=$(WBTSdksPath);NUGET_PACKAGES=$(NugetPackagesPath);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/browser-frame/bin/$(Configuration)/*/publish/wwwroot/**/*.*"/>
<BrowserSourceFiles Include="$(MSBuildThisFileDirectory)../browser-frame/browser-frame/bin/$(Configuration)/$(NetCoreAppCurrent)/publish/wwwroot/**/*.*"/>
</ItemGroup>

<Copy
Expand Down

0 comments on commit 040cbe2

Please sign in to comment.