Merge pull request #273 from unoplatform/dev/ds/appxmanifest

Fix appxmanifest merge

Author: dansiegel

samples/5.2/Uno52ResizetizerTests/Uno52ResizetizerTests/Package.appxmanifest

@@ -1,19 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <Package
   xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
   xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
   xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
   IgnorableNamespaces="uap rescap">
 
   <Identity
-    Name="Uno52ResizetizerTests"
+    Name="$placeholder$"
     Publisher="O=Uno52ResizetizerTests"
-    Version="1.0.0.0" />
+    Version="0.0.0.0" />
 
   <Properties>
-    <DisplayName>Uno52ResizetizerTests</DisplayName>
-    <PublisherDisplayName>Uno52ResizetizerTests</PublisherDisplayName>
+    <DisplayName>$placeholder$</DisplayName>
+    <PublisherDisplayName>$placeholder$</PublisherDisplayName>
   </Properties>
 
   <Dependencies>

src/.nuspec/Uno.Resizetizer.windows.skia.targets

@@ -68,26 +68,16 @@
 			Inputs="$(MSBuildThisFileFullPath);$(_UnoResizetizerTaskAssemblyName);$(_UnoResizetizerInputsFile);$(_UnoSplashInputsFile);@(AppxManifest);@(_UnoAppxManifest)"
 			Outputs="$(_UnoManifestStampFile);$(_UnoIntermediateManifest)Package.appxmanifest">
 
-
-		<PropertyGroup>
-			<_UnoWindowsApplicationId
-					Condition="'$(_UnoWindowsApplicationId)' == '' and '$(ApplicationIdGuid)' != ''">
-				$(ApplicationIdGuid)
-			</_UnoWindowsApplicationId>
-			<_UnoWindowsApplicationId
-					Condition="'$(_UnoWindowsApplicationId)' == '' and '$(ApplicationId)' != ''">
-				$(ApplicationId)
-			</_UnoWindowsApplicationId>
-		</PropertyGroup>
-
 		<GeneratePackageAppxManifest_v0
 				IntermediateOutputPath="$(_UnoIntermediateManifest)"
 				AppxManifest="@(AppxManifest);@(_UnoAppxManifest);@(_SkiaManifest)"
 				GeneratedFilename="Package.appxmanifest"
-				ApplicationId="$(_UnoWindowsApplicationId)"
+				ApplicationId="$(ApplicationId)"
 				ApplicationDisplayVersion="$(ApplicationDisplayVersion)"
 				ApplicationVersion="$(ApplicationVersion)"
 				ApplicationTitle="$(ApplicationTitle)"
+				AssemblyName="$(AssemblyName)"
+				Description="$(Description)"
 				AppIcon="@(UnoImage->WithMetadataValue('IsAppIcon', 'true'))"
 				TargetFramework="$(_UnoResizetizerPlatformIdentifier)"
 				SplashScreen="@(UnoSplashScreen)">