fix(reg): Adjust wpf+skia target

unoplatform · Jul 24, 2021 · 3a0cf57 · 3a0cf57
1 parent f949574
commit 3a0cf57
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/build/Uno.WinUI.nuspec b/build/Uno.WinUI.nuspec
@@ -465,13 +465,13 @@
 	<file src="..\src\SourceGenerators\Uno.UI.Tasks\Content\Uno.UI.Tasks.targets" target="buildTransitive\net6.0-macos" />
 
 	<!-- Force UAP to ignore netstandard 2.0 -->
-	<file src="uno.winui.uap.targets" target="buildTransitive\uap10.0.16299\uno.winui.targets" />
+	<file src="uno.winui.win.targets" target="buildTransitive\uap10.0.16299\uno.winui.targets" />
 	<file src="uno.winui.runtime-replace.targets" target="buildTransitive\uap10.0.16299" />
 
-	<file src="uno.winui.uap.targets" target="buildTransitive\uap10.0.17763\uno.winui.targets" />
+	<file src="uno.winui.win.targets" target="buildTransitive\uap10.0.17763\uno.winui.targets" />
 	<file src="uno.winui.runtime-replace.targets" target="buildTransitive\uap10.0.17763" />
 
-	<file src="uno.winui.uap.targets" target="buildTransitive\net5.0-windows\uno.winui.targets" />
+	<file src="uno.winui.win.targets" target="buildTransitive\net5.0-windows\uno.winui.targets" />
 	<file src="uno.winui.runtime-replace.targets" target="buildTransitive\net5.0-windows" />
 
 	<file src="..\src\SourceGenerators\Uno.UI.SourceGenerators\Content\Uno.UI.SourceGenerators.props" target="buildTransitive" />

diff --git a/build/uno.winui.uap.targets → build/uno.winui.win.targets b/build/uno.winui.uap.targets → build/uno.winui.win.targets
@@ -12,6 +12,14 @@
 	</ItemGroup>
   </Target>
 
+  <!--
+  List of packages that provide an uno-runtime folder. Needed for WPF target.
+  -->
+  <ItemGroup Condition="'$(UseWPF)'=='True'">
+	<UnoRuntimeEnabledPackage Include="Uno.UI" PackageBasePath="$(MSBuildThisFileDirectory).." Condition="'$(MSBuildThisFile)'=='uno.ui.targets'" />
+	<UnoRuntimeEnabledPackage Include="Uno.WinUI" PackageBasePath="$(MSBuildThisFileDirectory).." Condition="'$(MSBuildThisFile)'=='uno.winui.targets'" />
+  </ItemGroup>
+
   <Import Project="uno.winui.runtime-replace.targets" />
 
 </Project>