Skip to content

[WebAssembly] Remove temporary workarounds #40809

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 2 commits into from
May 10, 2024
Merged

[WebAssembly] Remove temporary workarounds #40809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4aa4a8b
[WebAssembly] Remove temporary workarounds
javiercn May 10, 2024
5018531
Merge branch 'main' into javiercn/remove-remaining-workarounds
javiercn May 10, 2024
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
13 changes: 0 additions & 13 deletions src/WasmSdk/Sdk/Sdk.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,4 @@ Copyright (c) .NET Foundation. All rights reserved.
<Import Sdk="Microsoft.NET.Sdk.StaticWebAssets" Project="Sdk.targets" Condition="'$(_WasmSdkImportsMicrosoftNETSdkStaticWebAssets)' == 'true'" />
<Import Sdk="Microsoft.NET.Sdk.Publish" Project="Sdk.targets" Condition="'$(_WasmSdkImportsMicrosoftNETSdkPublish)' == 'true'" />
<Import Project="$(_WebAssemblyTargetsFile)" Condition="'$(_WebAssemblyTargetsFile)' != ''" />

<!-- Temporary, we need to generate blazor.boot.json before we define it,
so we hook a target that does the same thing as _ResolveWasmOutputs but
in addition generates blazor.boot.json so that the build passes.

This will go away once the wasm build is updated to do this directly.
-->

<PropertyGroup>
<_TempWasmWorkaroundsDisabled>true</_TempWasmWorkaroundsDisabled>
</PropertyGroup>

<Import Project="$(MSBuildThisFileDirectory)..\targets\Microsoft.NET.Sdk.WebAssembly.9_0.temp.targets" Condition="'$(_TempWasmWorkaroundsDisabled)' == ''" />
</Project>
35 changes: 0 additions & 35 deletions src/WasmSdk/Tasks/PatchWasmPublishStaticWebAsset.cs
View file
Open in desktop

This file was deleted.

92 changes: 0 additions & 92 deletions src/WasmSdk/targets/Microsoft.NET.Sdk.WebAssembly.9_0.temp.targets
View file
Open in desktop

This file was deleted.