diff --git a/binding/HarfBuzzSharp.NativeAssets.WebAssembly/buildTransitive/HarfBuzzSharp.targets b/binding/HarfBuzzSharp.NativeAssets.WebAssembly/buildTransitive/HarfBuzzSharp.targets index 7198786ae6..6e2fdd3bb6 100644 --- a/binding/HarfBuzzSharp.NativeAssets.WebAssembly/buildTransitive/HarfBuzzSharp.targets +++ b/binding/HarfBuzzSharp.NativeAssets.WebAssembly/buildTransitive/HarfBuzzSharp.targets @@ -31,4 +31,22 @@ + + + + <_WasmLinkStepArgs Remove="@(_EmccLinkStepArgs)" /> + <_EmccLinkStepArgs Remove=""%(_WasmNativeFileForLinking.Identity)"" /> + <_WasmLinkDependencies Remove="@(_WasmNativeFileForLinking)" /> + + <_SkiaSharpToReorder Include="@(_WasmNativeFileForLinking)" Condition="$([System.String]::Copy('%(FullPath)').Contains('libSkiaSharp.a'))" /> + <_WasmNativeFileForLinking Remove="@(_SkiaSharpToReorder)" /> + <_WasmNativeFileForLinking Include="@(_SkiaSharpToReorder)" /> + + <_EmccLinkStepArgs Include=""%(_WasmNativeFileForLinking.Identity)"" /> + <_WasmLinkDependencies Include="@(_WasmNativeFileForLinking)" /> + <_WasmLinkStepArgs Include="@(_EmccLinkStepArgs)" /> + + + \ No newline at end of file diff --git a/binding/IncludeNativeAssets.SkiaSharp.targets b/binding/IncludeNativeAssets.SkiaSharp.targets index 4596f8942d..ac82a653ea 100644 --- a/binding/IncludeNativeAssets.SkiaSharp.targets +++ b/binding/IncludeNativeAssets.SkiaSharp.targets @@ -79,7 +79,24 @@ - + + + + <_WasmLinkStepArgs Remove="@(_EmccLinkStepArgs)" /> + <_EmccLinkStepArgs Remove=""%(_WasmNativeFileForLinking.Identity)"" /> + <_WasmLinkDependencies Remove="@(_WasmNativeFileForLinking)" /> + + <_SkiaSharpToReorder Include="@(_WasmNativeFileForLinking)" Condition="$([System.String]::Copy('%(FullPath)').Contains('libSkiaSharp.a'))" /> + <_WasmNativeFileForLinking Remove="@(_SkiaSharpToReorder)" /> + <_WasmNativeFileForLinking Include="@(_SkiaSharpToReorder)" /> + + <_EmccLinkStepArgs Include=""%(_WasmNativeFileForLinking.Identity)"" /> + <_WasmLinkDependencies Include="@(_WasmNativeFileForLinking)" /> + <_WasmLinkStepArgs Include="@(_EmccLinkStepArgs)" /> + + + \ No newline at end of file diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.Blazor/nuget/buildTransitive/SkiaSharp.Views.Blazor.Local.props b/source/SkiaSharp.Views/SkiaSharp.Views.Blazor/nuget/buildTransitive/SkiaSharp.Views.Blazor.Local.props index 0e0d66dbf9..cbbeafa27a 100644 --- a/source/SkiaSharp.Views/SkiaSharp.Views.Blazor/nuget/buildTransitive/SkiaSharp.Views.Blazor.Local.props +++ b/source/SkiaSharp.Views/SkiaSharp.Views.Blazor/nuget/buildTransitive/SkiaSharp.Views.Blazor.Local.props @@ -6,22 +6,4 @@ $(EmccExtraLDFlags) --js-library="$(MSBuildThisFileDirectory)SkiaSharpInterop.js" - - - - <_WasmLinkStepArgs Remove="@(_EmccLinkStepArgs)" /> - <_EmccLinkStepArgs Remove=""%(_WasmNativeFileForLinking.Identity)"" /> - <_WasmLinkDependencies Remove="@(_WasmNativeFileForLinking)" /> - - <_SkiaSharpToReorder Include="@(_WasmNativeFileForLinking)" Condition="$([System.String]::Copy('%(FullPath)').Contains('libSkiaSharp.a'))" /> - <_WasmNativeFileForLinking Remove="@(_SkiaSharpToReorder)" /> - <_WasmNativeFileForLinking Include="@(_SkiaSharpToReorder)" /> - - <_EmccLinkStepArgs Include=""%(_WasmNativeFileForLinking.Identity)"" /> - <_WasmLinkDependencies Include="@(_WasmNativeFileForLinking)" /> - <_WasmLinkStepArgs Include="@(_EmccLinkStepArgs)" /> - - - diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.Blazor/nuget/buildTransitive/SkiaSharp.Views.Blazor.props b/source/SkiaSharp.Views/SkiaSharp.Views.Blazor/nuget/buildTransitive/SkiaSharp.Views.Blazor.props index ba56e78057..0cb7002efc 100644 --- a/source/SkiaSharp.Views/SkiaSharp.Views.Blazor/nuget/buildTransitive/SkiaSharp.Views.Blazor.props +++ b/source/SkiaSharp.Views/SkiaSharp.Views.Blazor/nuget/buildTransitive/SkiaSharp.Views.Blazor.props @@ -6,24 +6,6 @@ $(EmccExtraLDFlags) --js-library="$(MSBuildThisFileDirectory)SkiaSharpInterop.js" - - - - <_WasmLinkStepArgs Remove="@(_EmccLinkStepArgs)" /> - <_EmccLinkStepArgs Remove=""%(_WasmNativeFileForLinking.Identity)"" /> - <_WasmLinkDependencies Remove="@(_WasmNativeFileForLinking)" /> - - <_SkiaSharpToReorder Include="@(_WasmNativeFileForLinking)" Condition="$([System.String]::Copy('%(FullPath)').Contains('libSkiaSharp.a'))" /> - <_WasmNativeFileForLinking Remove="@(_SkiaSharpToReorder)" /> - <_WasmNativeFileForLinking Include="@(_SkiaSharpToReorder)" /> - - <_EmccLinkStepArgs Include=""%(_WasmNativeFileForLinking.Identity)"" /> - <_WasmLinkDependencies Include="@(_WasmNativeFileForLinking)" /> - <_WasmLinkStepArgs Include="@(_EmccLinkStepArgs)" /> - - -