Merge pull request #3065 from unoplatform/dev/jela/prism-template

Update `dotnet new` templates to use CI versions for uno references
unoplatform · Apr 28, 2020 · 726ee32 · 726ee32
2 parents 8a90f56 + 79f41dc
commit 726ee32
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 16 deletions.
diff --git a/build/Uno.UI.Build.csproj b/build/Uno.UI.Build.csproj
@@ -79,30 +79,33 @@
 		<ItemGroup>
 			<_PackageToUpdate Include="Uno.UI" />
 			<_PackageToUpdate Include="Uno.UI.RemoteControl" />
+
+			<_legacyProject Include="..\src\SolutionTemplate\**\*.Droid.csproj"/>
+			<_legacyProject Include="..\src\SolutionTemplate\**\*.iOS.csproj"/>
+			<_legacyProject Include="..\src\SolutionTemplate\**\*.macOS.csproj"/>
+
+			<_sdkProject Include="..\src\SolutionTemplate\**\*.Wasm.csproj"/>
+			<_sdkProject Include="..\src\SolutionTemplate\UnoLibraryTemplate\CrossTargetedLibrary.csproj"/>
 		</ItemGroup>
 
-		<XmlUpdate XmlFileName="..\src\SolutionTemplate\UnoSolutionTemplate\Droid\UnoQuickStart.Droid.csproj"
-							 XPath="//x:PackageReference[@Include='%(_PackageToUpdate.Identity)']/@Version" Value="$(GitVersion_FullSemVer)"
+		<XmlUpdate XmlFileName="%(_legacyProject.Identity)"
+							 XPath="//x:PackageReference[@Include='Uno.UI.RemoteControl']/@Version"
+							 Value="$(GitVersion_FullSemVer)"
 							 Namespace="http://schemas.microsoft.com/developer/msbuild/2003"
 							 Prefix="x" />
-
-		<XmlUpdate XmlFileName="..\src\SolutionTemplate\UnoSolutionTemplate\iOS\UnoQuickStart.iOS.csproj"
-							 XPath="//x:PackageReference[@Include='%(_PackageToUpdate.Identity)']/@Version" Value="$(GitVersion_FullSemVer)"
+
+		<XmlUpdate XmlFileName="%(_legacyProject.Identity)"
+							 XPath="//x:PackageReference[@Include='Uno.UI']/@Version"
+							 Value="$(GitVersion_FullSemVer)"
 							 Namespace="http://schemas.microsoft.com/developer/msbuild/2003"
 							 Prefix="x" />
 
-		<XmlUpdate XmlFileName="..\src\SolutionTemplate\UnoSolutionTemplate\Wasm\UnoQuickStart.Wasm.csproj"
-							 XPath="//PackageReference[@Include='%(_PackageToUpdate.Identity)']/@Version"
+		<XmlUpdate XmlFileName="%(_sdkProject.Identity)"
+							 XPath="//PackageReference[@Include='Uno.UI']/@Version"
 							 Value="$(GitVersion_FullSemVer)" />
-
-		<XmlUpdate XmlFileName="..\src\SolutionTemplate\UnoSolutionTemplate\macOS\UnoQuickStart.macOS.csproj"
-							 XPath="//PackageReference[@Include='%(_PackageToUpdate.Identity)']/@Version"
+		<XmlUpdate XmlFileName="%(_sdkProject.Identity)"
+							 XPath="//PackageReference[@Include='Uno.UI.RemoteControl']/@Version"
 							 Value="$(GitVersion_FullSemVer)" />
-
-		<XmlUpdate XmlFileName="..\src\SolutionTemplate\UnoLibraryTemplate\CrossTargetedLibrary.csproj"
-							 XPath="//PackageReference[@Include='%(_PackageToUpdate.Identity)']/@Version"
-							 Value="$(GitVersion_FullSemVer)" />
-
 	</Target>
 
 	<Target Name="UpdateTasksSHA">

diff --git a/...mplate/Uno.ProjectTemplates.Dotnet/content/unoapp-prism/BlankApp.UWP/Package.appxmanifest b/...mplate/Uno.ProjectTemplates.Dotnet/content/unoapp-prism/BlankApp.UWP/Package.appxmanifest
@@ -8,7 +8,7 @@
 
   <Identity
     Name="a99917c8-9110-4177-a5b0-b12f1ae4bbfe"
-    Publisher="MyCompany"
+    Publisher="$XmlEscapedPublisherDistinguishedName$"
     Version="1.0.0.0" />
 
   <mp:PhoneIdentity PhoneProductId="d92515f1-7d7f-4ac3-8d24-a663e04517d6" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>