From 07f5eda4ae3785c3066eff8b0fb27aed9c5b01cb Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Mon, 15 Jan 2024 22:12:30 -0800
Subject: [PATCH] Property support StaticWebAssets SDK when it's available

---
 .gitignore                                    |  1 +
 .../ControlCatalog.Browser.Blazor.csproj      |  4 ++--
 .../ControlCatalog.Browser.csproj             |  5 ++---
 .../MobileSandbox.Browser.csproj              |  4 ++--
 .../Avalonia.Browser.Blazor.csproj            | 21 +-----------------
 .../BlazorSingleViewLifetime.cs               |  3 ---
 .../Avalonia.Browser/Avalonia.Browser.csproj  | 16 +++++++++-----
 .../Avalonia.Browser/Avalonia.Browser.props   | 10 ---------
 .../build/Avalonia.Browser.props              | 15 +++++++++++++
 .../{ => build}/Avalonia.Browser.targets      |  7 +++---
 ...Microsoft.AspNetCore.StaticWebAssets.props | 22 +++++++++++++++++++
 .../Avalonia.Browser/{ => build}/interop.js   |  0
 src/Browser/Avalonia.Browser/webapp/build.js  |  2 +-
 13 files changed, 60 insertions(+), 50 deletions(-)
 delete mode 100644 src/Browser/Avalonia.Browser/Avalonia.Browser.props
 create mode 100644 src/Browser/Avalonia.Browser/build/Avalonia.Browser.props
 rename src/Browser/Avalonia.Browser/{ => build}/Avalonia.Browser.targets (87%)
 create mode 100644 src/Browser/Avalonia.Browser/build/Microsoft.AspNetCore.StaticWebAssets.props
 rename src/Browser/Avalonia.Browser/{ => build}/interop.js (100%)

diff --git a/.gitignore b/.gitignore
index ddbe436d3a..32ada6ca2b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -218,3 +218,4 @@ src/Browser/Avalonia.Browser.Blazor/webapp/package-lock.json
 src/Browser/Avalonia.Browser.Blazor/wwwroot
 src/Browser/Avalonia.Browser/wwwroot
 api/diff
+src/Browser/Avalonia.Browser/staticwebassets
diff --git a/samples/ControlCatalog.Browser.Blazor/ControlCatalog.Browser.Blazor.csproj b/samples/ControlCatalog.Browser.Blazor/ControlCatalog.Browser.Blazor.csproj
index 733a4b7194..363c6a8b27 100644
--- a/samples/ControlCatalog.Browser.Blazor/ControlCatalog.Browser.Blazor.csproj
+++ b/samples/ControlCatalog.Browser.Blazor/ControlCatalog.Browser.Blazor.csproj
@@ -22,8 +22,8 @@
   <Import Project="..\..\build\ReferenceCoreLibraries.props" />
   <Import Project="..\..\build\BuildTargets.targets" />
 
-  <Import Project="..\..\src\Browser\Avalonia.Browser\Avalonia.Browser.props" />
-  <Import Project="..\..\src\Browser\Avalonia.Browser\Avalonia.Browser.targets" />
+  <Import Project="..\..\src\Browser\Avalonia.Browser\build\Avalonia.Browser.props" />
+  <Import Project="..\..\src\Browser\Avalonia.Browser\build\Avalonia.Browser.targets" />
 
 </Project>
 
diff --git a/samples/ControlCatalog.Browser/ControlCatalog.Browser.csproj b/samples/ControlCatalog.Browser/ControlCatalog.Browser.csproj
index 12338d615e..232cccfeaf 100644
--- a/samples/ControlCatalog.Browser/ControlCatalog.Browser.csproj
+++ b/samples/ControlCatalog.Browser/ControlCatalog.Browser.csproj
@@ -1,6 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../src/Browser/Avalonia.Browser/Avalonia.Browser.props" />
-
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
     <RuntimeIdentifier>browser-wasm</RuntimeIdentifier>
@@ -20,5 +18,6 @@
     <WasmExtraFilesToDeploy Include="AppBundle/**" />
   </ItemGroup>
 
-  <Import Project="../../src/Browser/Avalonia.Browser/Avalonia.Browser.targets" />
+  <Import Project="../../src/Browser/Avalonia.Browser/build/Avalonia.Browser.props" />
+  <Import Project="../../src/Browser/Avalonia.Browser/build/Avalonia.Browser.targets" />
 </Project>
diff --git a/samples/MobileSandbox.Browser/MobileSandbox.Browser.csproj b/samples/MobileSandbox.Browser/MobileSandbox.Browser.csproj
index 001fe94c7f..4d1b2b5e47 100644
--- a/samples/MobileSandbox.Browser/MobileSandbox.Browser.csproj
+++ b/samples/MobileSandbox.Browser/MobileSandbox.Browser.csproj
@@ -38,6 +38,6 @@
     <WasmExtraFilesToDeploy Include="app.css" />
   </ItemGroup>
 
-  <Import Project="..\..\src\Browser\Avalonia.Browser\Avalonia.Browser.props" />
-  <Import Project="..\..\src\Browser\Avalonia.Browser\Avalonia.Browser.targets" />
+  <Import Project="..\..\src\Browser\Avalonia.Browser\build\Avalonia.Browser.props" />
+  <Import Project="..\..\src\Browser\Avalonia.Browser\build\Avalonia.Browser.targets" />
 </Project>
diff --git a/src/Browser/Avalonia.Browser.Blazor/Avalonia.Browser.Blazor.csproj b/src/Browser/Avalonia.Browser.Blazor/Avalonia.Browser.Blazor.csproj
index 19d18e2e29..66cb6f7780 100644
--- a/src/Browser/Avalonia.Browser.Blazor/Avalonia.Browser.Blazor.csproj
+++ b/src/Browser/Avalonia.Browser.Blazor/Avalonia.Browser.Blazor.csproj
@@ -1,8 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk.Razor">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
-    <ResolveStaticWebAssetsInputsDependsOn>_IncludeGeneratedAvaloniaStaticFiles;$(ResolveStaticWebAssetsInputsDependsOn)</ResolveStaticWebAssetsInputsDependsOn>
   </PropertyGroup>
 
   <ItemGroup>
@@ -20,22 +19,4 @@
   <ItemGroup>
     <ProjectReference Include="../Avalonia.Browser/Avalonia.Browser.csproj" />
   </ItemGroup>
-
-  <Target Name="_IncludeGeneratedAvaloniaStaticFiles">
-    <ItemGroup>
-      <_AvaloniaWebAssets Include="$(MSBuildThisFileDirectory)../Avalonia.Browser/wwwroot/**/*.*" />
-    </ItemGroup>
-    <DefineStaticWebAssets SourceId="$(PackageId)"
-                           SourceType="Computed"
-                           AssetKind="All"
-                           AssetRole="Primary"
-                           CopyToOutputDirectory="PreserveNewest"
-                           CopyToPublishDirectory="PreserveNewest"
-                           ContentRoot="$(MSBuildThisFileDirectory)../Avalonia.Browser/wwwroot/"
-                           BasePath="_content/$(PackageId)"
-                           CandidateAssets="@(_AvaloniaWebAssets)"
-                           RelativePathFilter="**.js">
-      <Output TaskParameter="Assets" ItemName="StaticWebAsset" />
-    </DefineStaticWebAssets>
-  </Target>
 </Project>
diff --git a/src/Browser/Avalonia.Browser.Blazor/BlazorSingleViewLifetime.cs b/src/Browser/Avalonia.Browser.Blazor/BlazorSingleViewLifetime.cs
index 7c5ee27c66..cf3c034b00 100644
--- a/src/Browser/Avalonia.Browser.Blazor/BlazorSingleViewLifetime.cs
+++ b/src/Browser/Avalonia.Browser.Blazor/BlazorSingleViewLifetime.cs
@@ -17,9 +17,6 @@ public static class BlazorAppBuilder
     /// <param name="options">Browser backend specific options.</param>
     public static async Task StartBlazorAppAsync(this AppBuilder builder, BrowserPlatformOptions? options = null)
     {
-        options ??= new BrowserPlatformOptions();
-        options.FrameworkAssetPathResolver ??= filePath => $"/_content/Avalonia.Browser.Blazor/{filePath}";
-
         builder = await BrowserAppBuilder.PreSetupBrowser(builder, options);
 
         builder.SetupWithLifetime(new BlazorSingleViewLifetime());
diff --git a/src/Browser/Avalonia.Browser/Avalonia.Browser.csproj b/src/Browser/Avalonia.Browser/Avalonia.Browser.csproj
index ec65717cbb..83f4b8c75f 100644
--- a/src/Browser/Avalonia.Browser/Avalonia.Browser.csproj
+++ b/src/Browser/Avalonia.Browser/Avalonia.Browser.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
-    <Nullable>enable</Nullable>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
@@ -22,21 +21,26 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Content Include="*.props">
+    <!-- See https://github.com/dotnet/sdk/blob/9d4d2c4ca35b0856af7df63d6a38b3259aa6917c/src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.Pack.targets#L64-L66 -->
+    <Content Include="build\Microsoft.AspNetCore.StaticWebAssets.props">
       <Pack>true</Pack>
       <PackagePath>build/</PackagePath>
     </Content>
-    <Content Include="*.targets">
+    <Content Include="build\Avalonia.Browser.props">
+      <Pack>true</Pack>
+      <PackagePath>build/;buildTransitive/;buildMultiTargeting/</PackagePath>
+    </Content>
+    <Content Include="build\Avalonia.Browser.targets">
       <Pack>true</Pack>
       <PackagePath>build/;buildTransitive/</PackagePath>
     </Content>
-    <Content Include="interop.js">
+    <Content Include="build\interop.js">
       <Pack>true</Pack>
       <PackagePath>build/interop.js;buildTransitive/interop.js</PackagePath>
     </Content>
-    <Content Include="wwwroot/**/*.*">
+    <Content Include="staticwebassets/**/*.*">
       <Pack>true</Pack>
-      <PackagePath>build/wwwroot;buildTransitive/wwwroot</PackagePath>
+      <PackagePath>staticwebassets/</PackagePath>
     </Content>
   </ItemGroup>
 
diff --git a/src/Browser/Avalonia.Browser/Avalonia.Browser.props b/src/Browser/Avalonia.Browser/Avalonia.Browser.props
deleted file mode 100644
index 2c3942de1f..0000000000
--- a/src/Browser/Avalonia.Browser/Avalonia.Browser.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <ShouldIncludeAvaloniaJavaScript Condition=" '$(ShouldIncludeAvaloniaJavaScript)' == '' ">True</ShouldIncludeAvaloniaJavaScript>
-    <ShouldIncludeNativeSkiaSharp Condition=" '$(ShouldIncludeNativeSkiaSharp)' == '' ">True</ShouldIncludeNativeSkiaSharp>
-    <ShouldIncludeNativeHarfBuzzSharp Condition=" '$(ShouldIncludeNativeHarfBuzzSharp)' == '' ">True</ShouldIncludeNativeHarfBuzzSharp>
-    <!-- .NET 8 changes default location for dotnet script to the "_framework" subfolder, -->
-    <!-- But this change would introduce a breaking change to Avalonia users, so we revert it back to the .NET 7 state. -->
-    <WasmRuntimeAssetsLocation Condition="'$(WasmRuntimeAssetsLocation)' == ''">./</WasmRuntimeAssetsLocation>
-  </PropertyGroup>
-</Project>
diff --git a/src/Browser/Avalonia.Browser/build/Avalonia.Browser.props b/src/Browser/Avalonia.Browser/build/Avalonia.Browser.props
new file mode 100644
index 0000000000..76343db8e9
--- /dev/null
+++ b/src/Browser/Avalonia.Browser/build/Avalonia.Browser.props
@@ -0,0 +1,15 @@
+<Project>
+  <PropertyGroup>
+    <ShouldIncludeAvaloniaAssets Condition=" '$(ShouldIncludeAvaloniaAssets)' == '' ">True</ShouldIncludeAvaloniaAssets>
+    <ShouldIncludeAvaloniaLegacyAssets Condition=" '$(ShouldIncludeAvaloniaLegacyAssets)' == '' AND '$(ShouldIncludeAvaloniaAssets)' == 'True' AND '$(StaticWebAssetsEnabled)' != 'True'">True</ShouldIncludeAvaloniaLegacyAssets>
+    <ShouldIncludeAvaloniaStaticAsset Condition=" '$(ShouldIncludeAvaloniaStaticAsset)' == '' AND '$(ShouldIncludeAvaloniaAssets)' == 'True' AND '$(StaticWebAssetsEnabled)' == 'True'">True</ShouldIncludeAvaloniaStaticAsset>
+
+    <ShouldIncludeNativeSkiaSharp Condition=" '$(ShouldIncludeNativeSkiaSharp)' == '' ">True</ShouldIncludeNativeSkiaSharp>
+    <ShouldIncludeNativeHarfBuzzSharp Condition=" '$(ShouldIncludeNativeHarfBuzzSharp)' == '' ">True</ShouldIncludeNativeHarfBuzzSharp>
+    <!-- .NET 8 changes default location for dotnet script to the "_framework" subfolder, -->
+    <!-- But this change would introduce a breaking change to Avalonia users, so we revert it back to the .NET 7 state. -->
+    <WasmRuntimeAssetsLocation Condition="'$(WasmRuntimeAssetsLocation)' == ''">./</WasmRuntimeAssetsLocation>
+  </PropertyGroup>
+
+  <Import Project="$(MSBuildThisFileDirectory)/../build/Microsoft.AspNetCore.StaticWebAssets.props" />
+</Project>
diff --git a/src/Browser/Avalonia.Browser/Avalonia.Browser.targets b/src/Browser/Avalonia.Browser/build/Avalonia.Browser.targets
similarity index 87%
rename from src/Browser/Avalonia.Browser/Avalonia.Browser.targets
rename to src/Browser/Avalonia.Browser/build/Avalonia.Browser.targets
index 8740564ea9..ea263408b0 100644
--- a/src/Browser/Avalonia.Browser/Avalonia.Browser.targets
+++ b/src/Browser/Avalonia.Browser/build/Avalonia.Browser.targets
@@ -4,9 +4,10 @@
     <EmccFlags>$(EmccExtraLDFlags) -sERROR_ON_UNDEFINED_SYMBOLS=0</EmccFlags>
   </PropertyGroup>
 
-  <ItemGroup>
-    <WasmExtraFilesToDeploy Condition="'$(WasmRuntimeAssetsLocation)' == ''" Include="$(MSBuildThisFileDirectory)/wwwroot/**/*.*" />
-    <WasmExtraFilesToDeploy Condition="'$(WasmRuntimeAssetsLocation)' != ''" Include="$(MSBuildThisFileDirectory)/wwwroot/**/*.*" TargetPath="$(WasmRuntimeAssetsLocation)/%(FileName)%(Extension)" />
+  <!-- Fallback for applications without StaticWebAssetsEnabled (legacy WASM SDK) -->
+  <ItemGroup Condition="'$(ShouldIncludeAvaloniaLegacyAssets)' == 'True'">
+    <WasmExtraFilesToDeploy Condition="'$(WasmRuntimeAssetsLocation)' == ''" Include="$(MSBuildThisFileDirectory)/../staticwebassets/**/*.*" />
+    <WasmExtraFilesToDeploy Condition="'$(WasmRuntimeAssetsLocation)' != ''" Include="$(MSBuildThisFileDirectory)/../staticwebassets/**/*.*" TargetPath="$(WasmRuntimeAssetsLocation)/%(FileName)%(Extension)" />
   </ItemGroup>
 
   <PropertyGroup Condition="'$(ShouldIncludeNativeSkiaSharp)' == 'True' or '$(ShouldIncludeNativeHarfBuzzSharp)' == 'True'">
diff --git a/src/Browser/Avalonia.Browser/build/Microsoft.AspNetCore.StaticWebAssets.props b/src/Browser/Avalonia.Browser/build/Microsoft.AspNetCore.StaticWebAssets.props
new file mode 100644
index 0000000000..c598f46dd6
--- /dev/null
+++ b/src/Browser/Avalonia.Browser/build/Microsoft.AspNetCore.StaticWebAssets.props
@@ -0,0 +1,22 @@
+<Project>
+  <PropertyGroup>
+    <_AvaloniaWebAssetsFolder>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)../staticwebassets/))</_AvaloniaWebAssetsFolder>
+  </PropertyGroup>
+  <ItemGroup Condition="'$(ShouldIncludeAvaloniaStaticAsset)' == 'True'">
+    <!-- This file repricates how StaticWebAsset SDK generates static web assets for Blazor nuget packages, which we don't use here. -->
+    <_AvaloniaWebAssets Include="$(_AvaloniaWebAssetsFolder)**/*.*" />
+    <StaticWebAsset Include="@(_AvaloniaWebAssets)">
+      <SourceType>Package</SourceType>
+      <SourceId>Avalonia.Browser</SourceId>
+      <ContentRoot>$(_AvaloniaWebAssetsFolder)</ContentRoot>
+      <BasePath>/</BasePath>
+      <RelativePath>$(WasmRuntimeAssetsLocation)/%(FileName)%(Extension)</RelativePath>
+      <AssetKind>All</AssetKind>
+      <AssetMode>All</AssetMode>
+      <AssetRole>Primary</AssetRole>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+      <OriginalItemSpec>$(_AvaloniaWebAssetsFolder)%(FileName)%(Extension)</OriginalItemSpec>
+    </StaticWebAsset>
+  </ItemGroup>
+</Project>
diff --git a/src/Browser/Avalonia.Browser/interop.js b/src/Browser/Avalonia.Browser/build/interop.js
similarity index 100%
rename from src/Browser/Avalonia.Browser/interop.js
rename to src/Browser/Avalonia.Browser/build/interop.js
diff --git a/src/Browser/Avalonia.Browser/webapp/build.js b/src/Browser/Avalonia.Browser/webapp/build.js
index e8e49554cd..3b278e7dcb 100644
--- a/src/Browser/Avalonia.Browser/webapp/build.js
+++ b/src/Browser/Avalonia.Browser/webapp/build.js
@@ -4,7 +4,7 @@ require("esbuild").build({
         "./modules/storage.ts",
         "./modules/sw.ts"
     ],
-    outdir: "../wwwroot",
+    outdir: "../staticwebassets",
     bundle: true,
     minify: true,
     format: "esm",