chore: Fix transitive assets support

unoplatform · Sep 17, 2024 · d93c4cd · d93c4cd
1 parent 6c698d8
commit d93c4cd
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 6 deletions.
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
@@ -75,8 +75,8 @@
 		<PackageReference Update="Uno.Core.Extensions.Disposables" Version="4.0.1" />
 		<PackageReference Update="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
 		<PackageReference Update="Uno.Diagnostics.Eventing" Version="2.0.1" />
-		<PackageReference Update="Uno.Wasm.Bootstrap" Version="9.0.0-dev.284" />
-		<PackageReference Update="Uno.Wasm.Bootstrap.DevServer" Version="9.0.0-dev.284" />
+		<PackageReference Update="Uno.Wasm.Bootstrap" Version="9.0.0-dev.286" />
+		<PackageReference Update="Uno.Wasm.Bootstrap.DevServer" Version="9.0.0-dev.286" />
 		<PackageReference Update="MSTest" Version="3.3.1" />
 		<PackageReference Update="MSTest.TestFramework" Version="3.3.1" />
 		<PackageReference Update="MSTest.TestAdapter" Version="3.3.1" />

diff --git a/src/SamplesApp/SamplesApp.Wasm/SamplesApp.Wasm.csproj b/src/SamplesApp/SamplesApp.Wasm/SamplesApp.Wasm.csproj
@@ -26,6 +26,9 @@
 
 		<PublishTrimmed>false</PublishTrimmed>
 
+		<!-- Include all satellite	assemblies -->
+		<WasmShellLoadAllSatelliteResources>true</WasmShellLoadAllSatelliteResources>
+
 		<!--
 		IL Linking is disabled in Debug configuration.
 		When building in Release, see https://platform.uno/docs/articles/features/using-il-linker-webassembly.html

diff --git a/src/SamplesApp/UITests.Shared/Assets/colors300-transitive.png b/src/SamplesApp/UITests.Shared/Assets/colors300-transitive.png
diff --git a/src/SamplesApp/UITests.Shared/UITests.Shared.projitems b/src/SamplesApp/UITests.Shared/UITests.Shared.projitems
@@ -9617,6 +9617,7 @@
     <Content Include="$(MSBuildThisFileDirectory)Assets\closeIcon.png" />
     <Content Include="$(MSBuildThisFileDirectory)Assets\colored-ellipse.jpg" />
     <Content Include="$(MSBuildThisFileDirectory)Assets\ColorPicker.png" />
+    <None Include="$(MSBuildThisFileDirectory)Assets\colors300-transitive.png" />
     <Content Include="$(MSBuildThisFileDirectory)Assets\colors300.png" />
     <Content Include="$(MSBuildThisFileDirectory)Assets\ComboBox.png" />
     <Content Include="$(MSBuildThisFileDirectory)Assets\CommandBarFlyout.png" />

diff --git a/src/SourceGenerators/Uno.UI.Tasks/Content/uno.ui.tasks.assets.targets b/src/SourceGenerators/Uno.UI.Tasks/Content/uno.ui.tasks.assets.targets
@@ -259,7 +259,8 @@
 				<Link>wwwroot/%(TargetPath)</Link>
 				<TargetPath></TargetPath>
 			</_UnoTransitiveItems>
-			<_UnoTransitiveItems Remove="@(StaticWebAsset)" />
+
+			<_UnoTransitiveItems Remove="@(StaticWebAsset)" Condition="'%(StaticWebAsset.Link)' == '%(_UnoTransitiveItems.Link)'" />
 		</ItemGroup>
 
 		<DefineStaticWebAssets

diff --git a/src/Uno.Foundation.Runtime.WebAssembly/Interop/WebAssembly.Runtime.cs b/src/Uno.Foundation.Runtime.WebAssembly/Interop/WebAssembly.Runtime.cs
@@ -28,8 +28,12 @@ internal static class InternalCalls
 		{
 			// Uno-Specific implementation for https://github.com/dotnet/runtime/issues/69409.
 			// To be removed when the runtime will support the main SynchronizationContext.
-			[MethodImplAttribute(MethodImplOptions.InternalCall)]
-			public static extern void InvokeOnMainThread();
+			// [MethodImplAttribute(MethodImplOptions.InternalCall)]
+			public static void InvokeOnMainThread()
+			{
+				Console.WriteLine("invoking InvokeOnMainThread");
+				throw new Exception("InvokeOnMainThread not supported");
+			}
 		}
 	}
 }
diff --git a/src/Uno.UI.RuntimeTests/Directory.Build.targets b/src/Uno.UI.RuntimeTests/Directory.Build.targets
@@ -5,7 +5,7 @@
 	<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
 
 	<ItemGroup>
-		<Content Include="$(MSBuildThisFileDirectory)..\SamplesApp\UITests.Shared\Assets\colors300.png" Link="Assets\TransitiveTest\colors300.png" />
+		<Content Include="$(MSBuildThisFileDirectory)..\SamplesApp\UITests.Shared\Assets\colors300-transitive.png" Link="Assets\TransitiveTest\colors300.png" />
 	</ItemGroup>
 
 	<!--