fix: [uap10] Fix ElevateView Generic.xaml packaging

unoplatform · Apr 6, 2020 · 1c48cfd · 1c48cfd
1 parent 8d2d710
commit 1c48cfd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/build/Uno.UI.nuspec b/build/Uno.UI.nuspec
@@ -116,6 +116,8 @@
     <!-- Uno.UI.Toolkit -->
     <file src="..\src\Uno.UI.Toolkit\bin\Release\uap10.0.17763\Uno.UI.Toolkit.dll" target="lib\UAP" />
     <file src="..\src\Uno.UI.Toolkit\bin\Release\uap10.0.17763\Uno.UI.Toolkit.pdb" target="lib\UAP" />
+    <file src="..\src\Uno.UI.Toolkit\bin\Release\uap10.0.17763\Uno.UI.Toolkit.pri" target="lib\UAP" />
+    <file src="..\src\Uno.UI.Toolkit\bin\Release\uap10.0.17763\Uno.UI.Toolkit\**" target="lib\UAP\Uno.UI.Toolkit" />
     <file src="..\src\Uno.UI.Toolkit\bin\Release\MonoAndroid90\Uno.UI.Toolkit.dll" target="lib\MonoAndroid90" />
     <file src="..\src\Uno.UI.Toolkit\bin\Release\MonoAndroid90\Uno.UI.Toolkit.pdb" target="lib\MonoAndroid90" />
     <file src="..\src\Uno.UI.Toolkit\bin\Release\xamarinios10\Uno.UI.Toolkit.dll" target="lib\xamarinios10" />

diff --git a/src/Uno.CrossTargetting.props b/src/Uno.CrossTargetting.props
@@ -59,7 +59,7 @@
 	<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'uap10.0' ">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'uap10.0.17763' ">
 	<TargetPlatformVersion>10.0.17763.0</TargetPlatformVersion>
 	<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
 	<DefineConstants>$(DefineConstants);NETFX_CORE</DefineConstants>

diff --git a/src/Uno.UI.Toolkit/Uno.UI.Toolkit.csproj b/src/Uno.UI.Toolkit/Uno.UI.Toolkit.csproj
@@ -84,10 +84,7 @@
 		<Compile Include="$(MSBuildThisFileDirectory)..\Uno.UI\Extensions\DependencyObjectExtensions.cs">
 			<Link>Uno.UI\Extensions\%(RecursiveDir)%(FileName)%(Extension)</Link>
 		</Compile>
-	</ItemGroup>
-
-	<ItemGroup>
-	  <Page Update="Themes\Generic.xaml" />
+		<Page Include="Themes\Generic.xaml" />
 	</ItemGroup>
 
 	<!-- Override existing target, this project cannot be published -->