Skip to content

[net10.0-pre1 ONLY] Add workaround for missing blazor.modules.json file #27807

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 14, 2025
Merged

[net10.0-pre1 ONLY] Add workaround for missing blazor.modules.json file #27807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2317b3a
Add workaround for missing blazor.modules.json file
mattleibow Feb 14, 2025
44d2dec
Fix condition in Maui targets file
mattleibow Feb 14, 2025
2b46904
Update device-tests.yml
mattleibow Feb 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 11 additions & 12 deletions eng/pipelines/device-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

27 changes: 26 additions & 1 deletion src/BlazorWebView/src/Maui/build/Microsoft.AspNetCore.Components.WebView.Maui.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down Expand Up @@ -121,4 +121,29 @@
</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>