fix(wasm): Adjust TS compiler dependency on CompileTypeScriptWithTSCo…

…nfig
jeromelaban · Oct 3, 2022 · ab0e1d8 · ab0e1d8
1 parent b872d46
commit ab0e1d8
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/src/SourceGenerators/Uno.UI.Tasks/Content/Uno.UI.Tasks.targets b/src/SourceGenerators/Uno.UI.Tasks/Content/Uno.UI.Tasks.targets
@@ -110,13 +110,18 @@
 
 	</Target>
 
+	<ItemGroup>
+		<_UnoEmbeddedResourcesInjectionAfterTargets Include="CoreCompile" />
+		<_UnoEmbeddedResourcesInjectionAfterTargets Include="_UnoLinkerHintsSubstitutionsMerge" />
+	</ItemGroup>
+
 	<Target Name="_UnoEmbeddedResourcesInjection"
 	  Condition="
 		'$(DesignTimeBuild)' != 'true'
 		and '$(BuildingInsideUnoSourceGenerator)' == ''
 		and '$(SkipCompilerExecution)' == ''
 		and ('$(UnoXamlResourcesTrimming)'=='true' or '$(UnoRewriteEmbeddedResources)'=='true')"
-		AfterTargets="CoreCompile;_UnoLinkerHintsSubstitutionsMerge;CompileTypeScriptWithTSConfig">
+		AfterTargets="@(_UnoEmbeddedResourcesInjectionAfterTargets)">
 
 		<ItemGroup>
 			<!-- Filter ReferenceCopyLocalPaths as it may contain pdbs as well -->

diff --git a/src/Uno.UI.Wasm.Tests/Uno.UI.Wasm.Tests.csproj b/src/Uno.UI.Wasm.Tests/Uno.UI.Wasm.Tests.csproj
@@ -21,6 +21,10 @@
 		<CompilerVisibleProperty Include="TSBindingAssemblySource" />
 	</ItemGroup>
 
+	<ItemGroup>
+		<_UnoEmbeddedResourcesInjectionAfterTargets Include="CompileTypeScriptWithTSConfig" />
+	</ItemGroup>
+
 	<ItemGroup>
 		<None Remove="tsconfig.json" />
 		<Content Include="tsconfig.json" />

diff --git a/src/Uno.UI/Uno.UI.Wasm.csproj b/src/Uno.UI/Uno.UI.Wasm.csproj
@@ -50,6 +50,10 @@
 		<CompilerVisibleProperty Include="TSBindingAssemblySource" />
 	</ItemGroup>
 
+	<ItemGroup>
+		<_UnoEmbeddedResourcesInjectionAfterTargets Include="CompileTypeScriptWithTSConfig" />
+	</ItemGroup>
+
 	<ItemGroup>
 	  <EmbeddedResource Include="LinkerDefinition.Wasm.xml">
 			<LogicalName>$(AssemblyName).xml</LogicalName>