Skip to content
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

Jump to bottom

[Blazor] Fix concurrency problem in Android builds #19140

Merged
merged 4 commits into from Dec 1, 2023
Merged

[Blazor] Fix concurrency problem in Android builds #19140

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
458d2bc
[Blazor] Fix concurrency problem in Android builds
javiercn Nov 30, 2023
4b0e0b8
Cleanup
javiercn Nov 30, 2023
5605e40
Update DeviceTests.csproj
javiercn Nov 30, 2023
56e8361
Update all other locations
javiercn Nov 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/BlazorWebView/src/Maui/build/Microsoft.AspNetCore.Components.WebView.Maui.props
View file
Open in desktop
@@ -1,2 +1,5 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
javiercn marked this conversation as resolved.
Show resolved Hide resolved
<StaticWebAssetsEnabled Condition="'$(_OuterIntermediateOutputPath)' != ''">false</StaticWebAssetsEnabled>
</PropertyGroup>
</Project>
9 changes: 0 additions & 9 deletions src/BlazorWebView/src/Maui/build/Microsoft.AspNetCore.Components.WebView.Maui.targets
View file
Open in desktop
Expand Up @@ -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>