From 7fb276a1f820afc06c1e425732e0a32add17fa8c Mon Sep 17 00:00:00 2001
From: Jerome Laban <jerome.laban@nventive.com>
Date: Mon, 8 Nov 2021 11:29:41 -0500
Subject: [PATCH] feat(vsix): Restore Xamarin template for VS2022

---
 .../UnoSolutionTemplate.VSIX.2022.csproj                   | 7 +++++++
 .../source.extension.vsixmanifest                          | 1 +
 .../UnoSolutionTemplate.net6/UnoApp.vstemplate             | 2 +-
 src/SolutionTemplate/UnoSolutionTemplate/UnoApp.vstemplate | 2 +-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/SolutionTemplate/UnoSolutionTemplate.VSIX.2022/UnoSolutionTemplate.VSIX.2022.csproj b/src/SolutionTemplate/UnoSolutionTemplate.VSIX.2022/UnoSolutionTemplate.VSIX.2022.csproj
index f4bf3868dc58..7b9571415810 100644
--- a/src/SolutionTemplate/UnoSolutionTemplate.VSIX.2022/UnoSolutionTemplate.VSIX.2022.csproj
+++ b/src/SolutionTemplate/UnoSolutionTemplate.VSIX.2022/UnoSolutionTemplate.VSIX.2022.csproj
@@ -99,6 +99,13 @@
       <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bBuiltProjectOutputGroupDependencies%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
       <IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
     </ProjectReference>
+    <ProjectReference Include="..\UnoSolutionTemplate\UnoSolutionTemplate.csproj">
+      <Project>{5C7C339E-B73C-4FDA-87AF-E8003C0FF2AB}</Project>
+      <Name>UnoSolutionTemplate</Name>
+      <VSIXSubPath>ProjectTemplates</VSIXSubPath>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+      <IncludeOutputGroupsInVSIX>TemplateProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Content Include="logo.png">
diff --git a/src/SolutionTemplate/UnoSolutionTemplate.VSIX.2022/source.extension.vsixmanifest b/src/SolutionTemplate/UnoSolutionTemplate.VSIX.2022/source.extension.vsixmanifest
index 52bf82625f36..183b81c6ce75 100644
--- a/src/SolutionTemplate/UnoSolutionTemplate.VSIX.2022/source.extension.vsixmanifest
+++ b/src/SolutionTemplate/UnoSolutionTemplate.VSIX.2022/source.extension.vsixmanifest
@@ -26,5 +26,6 @@
         <Asset Type="Microsoft.VisualStudio.ItemTemplate" d:Source="Project" d:ProjectName="UnoItemTemplate" d:TargetPath="|UnoItemTemplate;TemplateProjectOutputGroup|" Path="ItemTemplates" d:VsixSubPath="ItemTemplates" />
         <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:ProjectName="UnoLibraryTemplate.net6" d:TargetPath="|UnoLibraryTemplate.net6;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
         <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%|" />
+        <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:ProjectName="UnoSolutionTemplate" d:TargetPath="|UnoSolutionTemplate;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
     </Assets>
 </PackageManifest>
diff --git a/src/SolutionTemplate/UnoSolutionTemplate.net6/UnoApp.vstemplate b/src/SolutionTemplate/UnoSolutionTemplate.net6/UnoApp.vstemplate
index df22ee80ce64..5b06cd5bcf94 100644
--- a/src/SolutionTemplate/UnoSolutionTemplate.net6/UnoApp.vstemplate
+++ b/src/SolutionTemplate/UnoSolutionTemplate.net6/UnoApp.vstemplate
@@ -1,6 +1,6 @@
 <VSTemplate Version="3.0.0" Type="ProjectGroup" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
   <TemplateData>
-	<Name>Multi-Platform App (Uno Platform)</Name>
+	<Name>Multi-Platform App (Uno Platform|net6)</Name>
 	<Description>Template for creating a multi-platform C# &amp; XAML application targeting UWP, WebAssembly, Android, iOS, macOS and Linux</Description>
 	<ProjectType>CSharp</ProjectType>
 	<ProjectSubType />
diff --git a/src/SolutionTemplate/UnoSolutionTemplate/UnoApp.vstemplate b/src/SolutionTemplate/UnoSolutionTemplate/UnoApp.vstemplate
index 74994aa5a57e..92346f60ed09 100644
--- a/src/SolutionTemplate/UnoSolutionTemplate/UnoApp.vstemplate
+++ b/src/SolutionTemplate/UnoSolutionTemplate/UnoApp.vstemplate
@@ -1,6 +1,6 @@
 <VSTemplate Version="3.0.0" Type="ProjectGroup" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
   <TemplateData>
-	<Name>Multi-Platform App (Uno Platform)</Name>
+	<Name>Multi-Platform App (Uno Platform|Xamarin)</Name>
 	<Description>Template for creating a multi-platform C# &amp; XAML application targeting UWP, WebAssembly, Android, iOS, macOS and Linux</Description>
 	<ProjectType>CSharp</ProjectType>
 	<ProjectSubType />