From 458d2bc1dec00ce87409d8c379e4b389f7a76136 Mon Sep 17 00:00:00 2001
From: Javier Calvarro Nelson <jacalvar@microsoft.com>
Date: Thu, 30 Nov 2023 15:27:08 +0100
Subject: [PATCH 1/4] [Blazor] Fix concurrency problem in Android builds

* Disable static web assets on nested Rid builds as its not necessary
  it runs there.
* The outer build already collects the assets and transforms them into
  Maui assets.
---
 .../build/Microsoft.AspNetCore.Components.WebView.Maui.props   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/BlazorWebView/src/Maui/build/Microsoft.AspNetCore.Components.WebView.Maui.props b/src/BlazorWebView/src/Maui/build/Microsoft.AspNetCore.Components.WebView.Maui.props
index 7bc91e44385a..1db0d9cb7ec6 100644
--- a/src/BlazorWebView/src/Maui/build/Microsoft.AspNetCore.Components.WebView.Maui.props
+++ b/src/BlazorWebView/src/Maui/build/Microsoft.AspNetCore.Components.WebView.Maui.props
@@ -1,2 +1,5 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <StaticWebAssetsEnabled Condition="'$(_OuterIntermediateOutputPath)' != ''">false</StaticWebAssetsEnabled>
+  </PropertyGroup>
 </Project>

From 4b0e0b8215fac70c316a8c5231e74800a94261cc Mon Sep 17 00:00:00 2001
From: Javier Calvarro Nelson <jacalvar@microsoft.com>
Date: Thu, 30 Nov 2023 18:09:44 +0100
Subject: [PATCH 2/4] Cleanup

---
 .../Microsoft.AspNetCore.Components.WebView.Maui.targets | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/BlazorWebView/src/Maui/build/Microsoft.AspNetCore.Components.WebView.Maui.targets b/src/BlazorWebView/src/Maui/build/Microsoft.AspNetCore.Components.WebView.Maui.targets
index 764d03d581c4..614de50283cd 100644
--- a/src/BlazorWebView/src/Maui/build/Microsoft.AspNetCore.Components.WebView.Maui.targets
+++ b/src/BlazorWebView/src/Maui/build/Microsoft.AspNetCore.Components.WebView.Maui.targets
@@ -121,13 +121,4 @@
     </ItemGroup>
   </Target>
 
-  <!-- Microsoft.Android.Sdk.AssemblyResolution.targets _ResolveAssemblies triggers a nested build to
-       resolve publish files in a Maui specific way and that breaks elements depending on the '$(IntermediateOutputPath)'.
-       This target detects we are running inside one of such builds and adjust the relevant paths. -->
-  <Target Name="_AdjustStaticWebAssetPathBaseWhenBuildingWithRid" BeforeTargets="ResolveStaticWebAssetsConfiguration" Condition="'$(_OuterIntermediateOutputPath)' != ''">
-    <PropertyGroup>
-      <_StaticWebAssetsManifestBase>$(_OuterIntermediateOutputPath)</_StaticWebAssetsManifestBase>
-    </PropertyGroup>
-  </Target>
-
 </Project>

From 5605e40a950f5e3c8a4e068776cf3de90be71408 Mon Sep 17 00:00:00 2001
From: Javier Calvarro Nelson <jacalvar@microsoft.com>
Date: Thu, 30 Nov 2023 19:29:30 +0100
Subject: [PATCH 3/4] Update DeviceTests.csproj

---
 .../tests/MauiDeviceTests/MauiBlazorWebView.DeviceTests.csproj  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/BlazorWebView/tests/MauiDeviceTests/MauiBlazorWebView.DeviceTests.csproj b/src/BlazorWebView/tests/MauiDeviceTests/MauiBlazorWebView.DeviceTests.csproj
index b1ba88e654e6..eb3e1a7a1777 100644
--- a/src/BlazorWebView/tests/MauiDeviceTests/MauiBlazorWebView.DeviceTests.csproj
+++ b/src/BlazorWebView/tests/MauiDeviceTests/MauiBlazorWebView.DeviceTests.csproj
@@ -1,5 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
+<Import Condition=" '$(UseMaui)' != 'true' " Project="..\..\src\Maui\build\Microsoft.AspNetCore.Components.WebView.Maui.props" />
+
   <PropertyGroup>
     <TargetFrameworks>$(MauiDeviceTestsPlatforms)</TargetFrameworks>
     <OutputType>Exe</OutputType>

From 56e8361fd31bfe0e40f731bc21144daba0eaeca2 Mon Sep 17 00:00:00 2001
From: Javier Calvarro Nelson <jacalvar@microsoft.com>
Date: Thu, 30 Nov 2023 20:42:37 +0100
Subject: [PATCH 4/4] Update all other locations

---
 .../tests/MauiDeviceTests/MauiBlazorWebView.DeviceTests.csproj  | 2 +-
 .../samples/Controls.Sample/Maui.Controls.Sample.csproj         | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/BlazorWebView/tests/MauiDeviceTests/MauiBlazorWebView.DeviceTests.csproj b/src/BlazorWebView/tests/MauiDeviceTests/MauiBlazorWebView.DeviceTests.csproj
index eb3e1a7a1777..3de22bdf30a8 100644
--- a/src/BlazorWebView/tests/MauiDeviceTests/MauiBlazorWebView.DeviceTests.csproj
+++ b/src/BlazorWebView/tests/MauiDeviceTests/MauiBlazorWebView.DeviceTests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
-<Import Condition=" '$(UseMaui)' != 'true' " Project="..\..\src\Maui\build\Microsoft.AspNetCore.Components.WebView.Maui.props" />
+  <Import Condition=" '$(UseMaui)' != 'true' " Project="..\..\src\Maui\build\Microsoft.AspNetCore.Components.WebView.Maui.props" />
 
   <PropertyGroup>
     <TargetFrameworks>$(MauiDeviceTestsPlatforms)</TargetFrameworks>
diff --git a/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj b/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj
index d922b3cecc56..ebf4fca2e869 100644
--- a/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj
+++ b/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj
@@ -1,5 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
+  <Import Condition=" '$(UseMaui)' != 'true' " Project="..\..\..\BlazorWebView\src\Maui\build\Microsoft.AspNetCore.Components.WebView.Maui.props" />
+
   <PropertyGroup>
     <TargetFrameworks>$(MauiPlatforms);$(_MauiDotNetTfm)</TargetFrameworks>
     <OutputType Condition="$(TargetFramework.Contains('-'))">Exe</OutputType>