From 2317b3a6498b56e07b706df688257448f5a9df22 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Sat, 15 Feb 2025 01:07:11 +0800
Subject: [PATCH 1/3] Add workaround for missing blazor.modules.json file

See https://devdiv.visualstudio.com/DevDiv/_workitems/edit/2360915
Related to https://github.com/dotnet/aspnetcore/pull/60368
Fixes https://github.com/dotnet/maui/issues/27806
---
 ...AspNetCore.Components.WebView.Maui.targets | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

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 614de50283cd..296688a82999 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,4 +121,28 @@
     </ItemGroup>
   </Target>
 
+  <!-- 
+    Workaround the issue where the empty json file is not included. 
+    Remove for preview 2 as it is fixed in https://github.com/dotnet/aspnetcore/pull/60368
+    See: https://github.com/dotnet/maui/issues/27806
+  -->
+  <Target Name="_Maui_Before_AddBlazorWebViewAssets"
+    BeforeTargets="_AddBlazorWebViewAssets"
+    DependsOnTargets="_MauiAddEmptyBlazorModulesJson"
+    Condition="'$(_MauiSkipAddEmptyBlazorModulesJson)' == 'true'" />
+  <Target Name="_MauiAddEmptyBlazorModulesJson" Condition="'@(_ExistingBuildJSModules)' == ''">
+    <PropertyGroup>
+      <_MauiBlazorWebViewModulesJsonPath>$(IntermediateOutputPath)blazor.modules.json</_MauiBlazorWebViewModulesJsonPath>
+    </PropertyGroup>
+    <WriteLinesToFile File="$(_MauiBlazorWebViewModulesJsonPath)" Lines="[]" Overwrite="true" WriteOnlyWhenDifferent="True" />
+    <ItemGroup>
+      <FileWrites Include="$(_MauiBlazorWebViewModulesJsonPath)" />
+    </ItemGroup>
+    <ItemGroup>
+      <_WebViewAssetCandidates Include="$(_MauiBlazorWebViewModulesJsonPath)">
+        <RelativePath>_framework/blazor.modules.json</RelativePath>
+      </_WebViewAssetCandidates>
+    </ItemGroup>
+  </Target>
+
 </Project>

From 44d2decd71133c5e20064329f19a099622a38894 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Sat, 15 Feb 2025 01:11:35 +0800
Subject: [PATCH 2/3] Fix condition in Maui targets file

---
 .../Microsoft.AspNetCore.Components.WebView.Maui.targets     | 5 +++--
 1 file changed, 3 insertions(+), 2 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 296688a82999..30e905303bd3 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
@@ -1,4 +1,4 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <!-- Enable Razor files to be visible in Solution Explorer because they are not Content files in .NET MAUI projects -->
   <ItemGroup>
@@ -129,7 +129,8 @@
   <Target Name="_Maui_Before_AddBlazorWebViewAssets"
     BeforeTargets="_AddBlazorWebViewAssets"
     DependsOnTargets="_MauiAddEmptyBlazorModulesJson"
-    Condition="'$(_MauiSkipAddEmptyBlazorModulesJson)' == 'true'" />
+    Condition="'$(_MauiSkipAddEmptyBlazorModulesJson)' != 'true'" />
+
   <Target Name="_MauiAddEmptyBlazorModulesJson" Condition="'@(_ExistingBuildJSModules)' == ''">
     <PropertyGroup>
       <_MauiBlazorWebViewModulesJsonPath>$(IntermediateOutputPath)blazor.modules.json</_MauiBlazorWebViewModulesJsonPath>

From 2b4690402d34f2d90f36f786282c76c13afc0b07 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Sat, 15 Feb 2025 01:18:06 +0800
Subject: [PATCH 3/3] Update device-tests.yml

---
 eng/pipelines/device-tests.yml | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/eng/pipelines/device-tests.yml b/eng/pipelines/device-tests.yml
index 2a199307ecdd..4fe9f4a7c1e6 100644
--- a/eng/pipelines/device-tests.yml
+++ b/eng/pipelines/device-tests.yml
@@ -176,16 +176,15 @@ stages:
           ios: $(System.DefaultWorkingDirectory)/src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj
           catalyst: $(System.DefaultWorkingDirectory)/src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj
           windows: $(System.DefaultWorkingDirectory)/src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj
-        # Disable BlazorWebView tests until we figure why they are not working https://github.com/dotnet/maui/issues/27556  
-        # - name: blazorwebview
-        #   desc: BlazorWebView
-        #   androidApiLevelsExclude: [ 30, 29, 28, 27, 26, 25, 24, 23, 22, 21 ] # BlazorWebView requires a recent version of Chrome
-        #   androidConfiguration: 'Release'
-        #   iOSConfiguration: 'Debug'
-        #   windowsConfiguration: 'Debug'
-        #   windowsPackageId: 'Microsoft.Maui.MauiBlazorWebView.DeviceTests'
-        #   android: $(System.DefaultWorkingDirectory)/src/BlazorWebView/tests/MauiDeviceTests/MauiBlazorWebView.DeviceTests.csproj
-        #   ios: $(System.DefaultWorkingDirectory)/src/BlazorWebView/tests/MauiDeviceTests/MauiBlazorWebView.DeviceTests.csproj
-        #   catalyst: $(System.DefaultWorkingDirectory)/src/BlazorWebView/tests/MauiDeviceTests/MauiBlazorWebView.DeviceTests.csproj
-        #   windows: $(System.DefaultWorkingDirectory)/src/BlazorWebView/tests/MauiDeviceTests/MauiBlazorWebView.DeviceTests.csproj
+        - name: blazorwebview
+          desc: BlazorWebView
+          androidApiLevelsExclude: [ 30, 29, 28, 27, 26, 25, 24, 23, 22, 21 ] # BlazorWebView requires a recent version of Chrome
+          androidConfiguration: 'Release'
+          iOSConfiguration: 'Debug'
+          windowsConfiguration: 'Debug'
+          windowsPackageId: 'Microsoft.Maui.MauiBlazorWebView.DeviceTests'
+          android: $(System.DefaultWorkingDirectory)/src/BlazorWebView/tests/MauiDeviceTests/MauiBlazorWebView.DeviceTests.csproj
+          ios: $(System.DefaultWorkingDirectory)/src/BlazorWebView/tests/MauiDeviceTests/MauiBlazorWebView.DeviceTests.csproj
+          catalyst: $(System.DefaultWorkingDirectory)/src/BlazorWebView/tests/MauiDeviceTests/MauiBlazorWebView.DeviceTests.csproj
+          windows: $(System.DefaultWorkingDirectory)/src/BlazorWebView/tests/MauiDeviceTests/MauiBlazorWebView.DeviceTests.csproj