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 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..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 @@ - + @@ -121,4 +121,29 @@ + + + + + + <_MauiBlazorWebViewModulesJsonPath>$(IntermediateOutputPath)blazor.modules.json + + + + + + + <_WebViewAssetCandidates Include="$(_MauiBlazorWebViewModulesJsonPath)"> + _framework/blazor.modules.json + + + +