From 7ca5c81f28cdbd7cc40db96d401ae734f75d4bfe Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Mon, 13 Dec 2021 11:38:43 +0000
Subject: [PATCH] Merge pull request #7144 from AvaloniaUI/fixes/wasm-props

Fixes/wasm props
---
 samples/ControlCatalog.Web/ControlCatalog.Web.csproj       | 1 +
 .../Avalonia.Web.Blazor.CompilationTuning.props            | 7 +++++++
 src/Web/Avalonia.Web.Blazor/Avalonia.Web.Blazor.csproj     | 3 ++-
 src/Web/Avalonia.Web.Blazor/Avalonia.Web.Blazor.props      | 7 ++-----
 src/Web/Avalonia.Web.Blazor/AvaloniaView.razor.cs          | 4 ++--
 5 files changed, 14 insertions(+), 8 deletions(-)
 create mode 100644 src/Web/Avalonia.Web.Blazor/Avalonia.Web.Blazor.CompilationTuning.props

diff --git a/samples/ControlCatalog.Web/ControlCatalog.Web.csproj b/samples/ControlCatalog.Web/ControlCatalog.Web.csproj
index 96936f3000..d463dfa84a 100644
--- a/samples/ControlCatalog.Web/ControlCatalog.Web.csproj
+++ b/samples/ControlCatalog.Web/ControlCatalog.Web.csproj
@@ -29,6 +29,7 @@
   </ItemGroup>
 
   <Import Project="..\..\src\Web\Avalonia.Web.Blazor\Avalonia.Web.Blazor.targets" />
+  <Import Project="..\..\src\Web\Avalonia.Web.Blazor\Avalonia.Web.Blazor.CompilationTuning.props" />
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Web\Avalonia.Web.Blazor\Avalonia.Web.Blazor.csproj"/>
diff --git a/src/Web/Avalonia.Web.Blazor/Avalonia.Web.Blazor.CompilationTuning.props b/src/Web/Avalonia.Web.Blazor/Avalonia.Web.Blazor.CompilationTuning.props
new file mode 100644
index 0000000000..eb5e5dd733
--- /dev/null
+++ b/src/Web/Avalonia.Web.Blazor/Avalonia.Web.Blazor.CompilationTuning.props
@@ -0,0 +1,7 @@
+<Project>
+  <PropertyGroup>
+    <EmccTotalMemory>16777216</EmccTotalMemory>
+    <BlazorEnableTimeZoneSupport>false</BlazorEnableTimeZoneSupport>
+    <BlazorWebAssemblyPreserveCollationData>false</BlazorWebAssemblyPreserveCollationData>
+  </PropertyGroup>
+</Project>
diff --git a/src/Web/Avalonia.Web.Blazor/Avalonia.Web.Blazor.csproj b/src/Web/Avalonia.Web.Blazor/Avalonia.Web.Blazor.csproj
index b89bc556f7..b0101891b1 100644
--- a/src/Web/Avalonia.Web.Blazor/Avalonia.Web.Blazor.csproj
+++ b/src/Web/Avalonia.Web.Blazor/Avalonia.Web.Blazor.csproj
@@ -6,6 +6,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <PackageId>Avalonia.Web.Blazor</PackageId>
     <LangVersion>preview</LangVersion>
+    <StaticWebAssetsDisableProjectBuildPropsFileGeneration>true</StaticWebAssetsDisableProjectBuildPropsFileGeneration>
   </PropertyGroup>
   
   <ItemGroup>
@@ -36,7 +37,7 @@
     <AvaloniaResource Include="Assets\*" />
     <Content Include="*.props">
       <Pack>true</Pack>
-      <PackagePath>build\;buildTransitive\</PackagePath>
+      <PackagePath>build\</PackagePath>
     </Content>
     <Content Include="*.targets">
       <Pack>true</Pack>
diff --git a/src/Web/Avalonia.Web.Blazor/Avalonia.Web.Blazor.props b/src/Web/Avalonia.Web.Blazor/Avalonia.Web.Blazor.props
index 81666106b4..dd96a60c6a 100644
--- a/src/Web/Avalonia.Web.Blazor/Avalonia.Web.Blazor.props
+++ b/src/Web/Avalonia.Web.Blazor/Avalonia.Web.Blazor.props
@@ -1,7 +1,4 @@
 <Project>
-  <PropertyGroup>
-    <EmccTotalMemory>16777216</EmccTotalMemory>
-    <BlazorEnableTimeZoneSupport>false</BlazorEnableTimeZoneSupport>
-    <BlazorWebAssemblyPreserveCollationData>false</BlazorWebAssemblyPreserveCollationData>
-  </PropertyGroup>
+  <Import Project="Microsoft.AspNetCore.StaticWebAssets.props" />
+  <Import Project="Avalonia.Web.Blazor.CompilationTuning.props" />
 </Project>
diff --git a/src/Web/Avalonia.Web.Blazor/AvaloniaView.razor.cs b/src/Web/Avalonia.Web.Blazor/AvaloniaView.razor.cs
index ec3d665597..e1f8cd5b72 100644
--- a/src/Web/Avalonia.Web.Blazor/AvaloniaView.razor.cs
+++ b/src/Web/Avalonia.Web.Blazor/AvaloniaView.razor.cs
@@ -278,9 +278,9 @@ namespace Avalonia.Web.Blazor
                         _glInterface = GRGlInterface.Create();
                         _context = GRContext.CreateGl(_glInterface);
 
-
+                        var options = AvaloniaLocator.Current.GetService<SkiaOptions>();
                         // bump the default resource cache limit
-                        _context.SetResourceCacheLimit(256 * 1024 * 1024);
+                        _context.SetResourceCacheLimit(options.MaxGpuResourceSizeBytes ?? 32 * 1024 * 1024);
                         Console.WriteLine("glcontext created and resource limit set");
                     }