Skip to content

Commit cdf767a

Browse files
authored
[net10.0-pre1 ONLY] Add workaround for missing blazor.modules.json file (#27807)
* Add workaround for missing blazor.modules.json file See https://devdiv.visualstudio.com/DevDiv/_workitems/edit/2360915 Related to dotnet/aspnetcore#60368 Fixes #27806 * Fix condition in Maui targets file * Update device-tests.yml
1 parent 4389ba3 commit cdf767a

File tree

2 files changed

+37
-13
lines changed

2 files changed

+37
-13
lines changed

eng/pipelines/device-tests.yml

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -176,16 +176,15 @@ stages:
176176
ios: $(System.DefaultWorkingDirectory)/src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj
177177
catalyst: $(System.DefaultWorkingDirectory)/src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj
178178
windows: $(System.DefaultWorkingDirectory)/src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj
179-
# Disable BlazorWebView tests until we figure why they are not working https://github.com/dotnet/maui/issues/27556
180-
# - name: blazorwebview
181-
# desc: BlazorWebView
182-
# androidApiLevelsExclude: [ 30, 29, 28, 27, 26, 25, 24, 23, 22, 21 ] # BlazorWebView requires a recent version of Chrome
183-
# androidConfiguration: 'Release'
184-
# iOSConfiguration: 'Debug'
185-
# windowsConfiguration: 'Debug'
186-
# windowsPackageId: 'Microsoft.Maui.MauiBlazorWebView.DeviceTests'
187-
# android: $(System.DefaultWorkingDirectory)/src/BlazorWebView/tests/MauiDeviceTests/MauiBlazorWebView.DeviceTests.csproj
188-
# ios: $(System.DefaultWorkingDirectory)/src/BlazorWebView/tests/MauiDeviceTests/MauiBlazorWebView.DeviceTests.csproj
189-
# catalyst: $(System.DefaultWorkingDirectory)/src/BlazorWebView/tests/MauiDeviceTests/MauiBlazorWebView.DeviceTests.csproj
190-
# windows: $(System.DefaultWorkingDirectory)/src/BlazorWebView/tests/MauiDeviceTests/MauiBlazorWebView.DeviceTests.csproj
179+
- name: blazorwebview
180+
desc: BlazorWebView
181+
androidApiLevelsExclude: [ 30, 29, 28, 27, 26, 25, 24, 23, 22, 21 ] # BlazorWebView requires a recent version of Chrome
182+
androidConfiguration: 'Release'
183+
iOSConfiguration: 'Debug'
184+
windowsConfiguration: 'Debug'
185+
windowsPackageId: 'Microsoft.Maui.MauiBlazorWebView.DeviceTests'
186+
android: $(System.DefaultWorkingDirectory)/src/BlazorWebView/tests/MauiDeviceTests/MauiBlazorWebView.DeviceTests.csproj
187+
ios: $(System.DefaultWorkingDirectory)/src/BlazorWebView/tests/MauiDeviceTests/MauiBlazorWebView.DeviceTests.csproj
188+
catalyst: $(System.DefaultWorkingDirectory)/src/BlazorWebView/tests/MauiDeviceTests/MauiBlazorWebView.DeviceTests.csproj
189+
windows: $(System.DefaultWorkingDirectory)/src/BlazorWebView/tests/MauiDeviceTests/MauiBlazorWebView.DeviceTests.csproj
191190

src/BlazorWebView/src/Maui/build/Microsoft.AspNetCore.Components.WebView.Maui.targets

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22

33
<!-- Enable Razor files to be visible in Solution Explorer because they are not Content files in .NET MAUI projects -->
44
<ItemGroup>
@@ -121,4 +121,29 @@
121121
</ItemGroup>
122122
</Target>
123123

124+
<!--
125+
Workaround the issue where the empty json file is not included.
126+
Remove for preview 2 as it is fixed in https://github.com/dotnet/aspnetcore/pull/60368
127+
See: https://github.com/dotnet/maui/issues/27806
128+
-->
129+
<Target Name="_Maui_Before_AddBlazorWebViewAssets"
130+
BeforeTargets="_AddBlazorWebViewAssets"
131+
DependsOnTargets="_MauiAddEmptyBlazorModulesJson"
132+
Condition="'$(_MauiSkipAddEmptyBlazorModulesJson)' != 'true'" />
133+
134+
<Target Name="_MauiAddEmptyBlazorModulesJson" Condition="'@(_ExistingBuildJSModules)' == ''">
135+
<PropertyGroup>
136+
<_MauiBlazorWebViewModulesJsonPath>$(IntermediateOutputPath)blazor.modules.json</_MauiBlazorWebViewModulesJsonPath>
137+
</PropertyGroup>
138+
<WriteLinesToFile File="$(_MauiBlazorWebViewModulesJsonPath)" Lines="[]" Overwrite="true" WriteOnlyWhenDifferent="True" />
139+
<ItemGroup>
140+
<FileWrites Include="$(_MauiBlazorWebViewModulesJsonPath)" />
141+
</ItemGroup>
142+
<ItemGroup>
143+
<_WebViewAssetCandidates Include="$(_MauiBlazorWebViewModulesJsonPath)">
144+
<RelativePath>_framework/blazor.modules.json</RelativePath>
145+
</_WebViewAssetCandidates>
146+
</ItemGroup>
147+
</Target>
148+
124149
</Project>

0 commit comments

Comments
 (0)