Merge pull request #80 from unoplatform/dev/jela/uap-updates

fix: Add more uap targets to avoid `System.Runtime.InteropServices.WindowsRuntime` mismatches in desktop packaging
unoplatform · May 28, 2021 · ec8402d · ec8402d
2 parents f3652f8 + b99f947
commit ec8402d
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/Uno.Core/Uno.Core.csproj b/src/Uno.Core/Uno.Core.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="MSBuild.Sdk.Extras" ToolsVersion="15.0">
 	<PropertyGroup>
-		<TargetFrameworks>uap10.0;net46;netstandard2.0;netstandard2.1;net5.0</TargetFrameworks>
+		<TargetFrameworks>uap10.0;uap10.0.17763;uap10.0.19041;net46;netstandard2.0;netstandard2.1;net5.0</TargetFrameworks>
 		<AssemblyName>Uno.Core</AssemblyName>
 		<RootNamespace>Uno.Core</RootNamespace>
 		<Product>$(AssemblyName) ($(TargetFramework))</Product>
@@ -32,10 +32,10 @@
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="System.Memory" Version="4.5.2" Condition="'$(TargetFramework)'=='uap10.0' or '$(TargetFramework)'=='netstandard2.0' or '$(TargetFramework)'=='net46'"/>
+		<PackageReference Include="System.Memory" Version="4.5.2" Condition="$(TargetFramework.StartsWith('uap10.0')) or '$(TargetFramework)'=='netstandard2.0' or '$(TargetFramework)'=='net46'"/>
 	</ItemGroup>
 
-	<PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">
+	<PropertyGroup Condition="$(TargetFramework.StartsWith('uap10.0'))">
 		<DefineConstants>$(DefineConstants);NETFX_CORE;WINDOWS_UWP;HAS_DICT_GETVALUEORDEFAULT</DefineConstants>
 	</PropertyGroup>
 	<PropertyGroup Condition="'$(TargetFramework)' == 'net46'">