From fde903cb5c6892aed37c994a796e9fcf90f75ca5 Mon Sep 17 00:00:00 2001
From: Jerome Laban <jerome.laban@nventive.com>
Date: Thu, 1 Oct 2020 14:44:17 -0400
Subject: [PATCH] feat(vsix): Include Skia targets

---
 .../UnoSolutionTemplate.VISX.csproj           |   2 +-
 .../source.extension.vsixmanifest             |   2 +-
 .../UnoSolutionTemplate/Skia.Gtk/Program.cs   |   2 +-
 .../Skia.Gtk/SkiaGtk.vstemplate               |  26 +++++
 .../Skia.WPF.Host/Properties/AssemblyInfo.cs  |  26 -----
 .../Skia.WPF.Host/SkiaWpfHost.vstemplate      |  38 +++++++
 .../UnoQuickStart.Skia.Wpf.Host.csproj        |  18 +++
 .../UnoQuickStart.Wpf.Host.csproj             | 105 ------------------
 .../UnoSolutionTemplate/Skia.WPF/Program.cs   |   3 +
 .../Skia.WPF/SkiaWpf.vstemplate               |  21 ++++
 .../UnoSolutionTemplate/UnoApp.vstemplate     |   4 +
 .../UnoSolutionTemplate.csproj                |  20 +++-
 12 files changed, 128 insertions(+), 139 deletions(-)
 create mode 100644 src/SolutionTemplate/UnoSolutionTemplate/Skia.Gtk/SkiaGtk.vstemplate
 create mode 100644 src/SolutionTemplate/UnoSolutionTemplate/Skia.WPF.Host/SkiaWpfHost.vstemplate
 create mode 100644 src/SolutionTemplate/UnoSolutionTemplate/Skia.WPF.Host/UnoQuickStart.Skia.Wpf.Host.csproj
 delete mode 100644 src/SolutionTemplate/UnoSolutionTemplate/Skia.WPF.Host/UnoQuickStart.Wpf.Host.csproj
 create mode 100644 src/SolutionTemplate/UnoSolutionTemplate/Skia.WPF/Program.cs
 create mode 100644 src/SolutionTemplate/UnoSolutionTemplate/Skia.WPF/SkiaWpf.vstemplate

diff --git a/src/SolutionTemplate/UnoSolutionTemplate.VISX/UnoSolutionTemplate.VISX.csproj b/src/SolutionTemplate/UnoSolutionTemplate.VISX/UnoSolutionTemplate.VISX.csproj
index 0ff4850e2838..1a85614504af 100644
--- a/src/SolutionTemplate/UnoSolutionTemplate.VISX/UnoSolutionTemplate.VISX.csproj
+++ b/src/SolutionTemplate/UnoSolutionTemplate.VISX/UnoSolutionTemplate.VISX.csproj
@@ -207,4 +207,4 @@
     <Reference Include="System.Xml" />
     <Reference Include="WindowsBase" />
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/SolutionTemplate/UnoSolutionTemplate.VISX/source.extension.vsixmanifest b/src/SolutionTemplate/UnoSolutionTemplate.VISX/source.extension.vsixmanifest
index 94b07134361d..a1fc4b14aa97 100644
--- a/src/SolutionTemplate/UnoSolutionTemplate.VISX/source.extension.vsixmanifest
+++ b/src/SolutionTemplate/UnoSolutionTemplate.VISX/source.extension.vsixmanifest
@@ -3,7 +3,7 @@
     <Metadata>
         <Identity Id="UnoSolutionTemplate.b8e0806a-a194-4442-8634-474e089e479e" Version="1.43.0.657" Language="en-US" Publisher="nventive" />
         <DisplayName>Uno Platform Solution Templates</DisplayName>
-        <Description xml:space="preserve">A solution template for Uno Platform enabled projects.</Description>
+        <Description xml:space="preserve">Solution templates for Uno Platform enabled projects</Description>
         <MoreInfo>https://github.com/unoplatform/uno</MoreInfo>
         <GettingStartedGuide>https://github.com/unoplatform/uno/blob/master/doc/index.md</GettingStartedGuide>
         <Icon>logo.png</Icon>
diff --git a/src/SolutionTemplate/UnoSolutionTemplate/Skia.Gtk/Program.cs b/src/SolutionTemplate/UnoSolutionTemplate/Skia.Gtk/Program.cs
index b1088f400fc6..17877de20566 100644
--- a/src/SolutionTemplate/UnoSolutionTemplate/Skia.Gtk/Program.cs
+++ b/src/SolutionTemplate/UnoSolutionTemplate/Skia.Gtk/Program.cs
@@ -2,7 +2,7 @@
 using GLib;
 using Uno.UI.Runtime.Skia;
 
-namespace UnoQuickStart.Skia.Gtk
+namespace $ext_safeprojectname$.Skia.Gtk
 {
 	class Program
 	{
diff --git a/src/SolutionTemplate/UnoSolutionTemplate/Skia.Gtk/SkiaGtk.vstemplate b/src/SolutionTemplate/UnoSolutionTemplate/Skia.Gtk/SkiaGtk.vstemplate
new file mode 100644
index 000000000000..2035c9fc5920
--- /dev/null
+++ b/src/SolutionTemplate/UnoSolutionTemplate/Skia.Gtk/SkiaGtk.vstemplate
@@ -0,0 +1,26 @@
+<VSTemplate Version="3.0.0" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005" Type="Project">
+  <TemplateData>
+	<Name>UnoQuickStart.Skia.Gtk</Name>
+	<Description>No Description</Description>
+	<Icon>__TemplateIcon.png</Icon>
+	<PreviewImage>__PreviewImage.png</PreviewImage>
+	<ProjectType>CSharp</ProjectType>
+	<ProjectSubType />
+	<SortOrder>1000</SortOrder>
+	<DefaultName>UnoQuickStart.Skia.Gtk</DefaultName>
+	<ProvideDefaultName>true</ProvideDefaultName>
+	<EnableLocationBrowseButton>true</EnableLocationBrowseButton>
+	<LocationField>Enabled</LocationField>
+	<CreateInPlace>true</CreateInPlace>
+  </TemplateData>
+  <TemplateContent>
+	<Project File="UnoQuickStart.Skia.Gtk.csproj" TargetFileName="$ext_safeprojectname$.Skia.Gtk.csproj" ReplaceParameters="true">
+	  <Folder Name="Assets" TargetFolderName="Assets">
+		<Folder Name="Fonts" TargetFolderName="Fonts">
+		  <ProjectItem TargetFileName="uno-fluentui-assets.ttf" ReplaceParameters="false">uno-fluentui-assets.ttf</ProjectItem>
+		</Folder>
+	  </Folder>
+	  <ProjectItem TargetFileName="Program.cs" ReplaceParameters="true">Program.cs</ProjectItem>
+	</Project>
+  </TemplateContent>
+</VSTemplate>
diff --git a/src/SolutionTemplate/UnoSolutionTemplate/Skia.WPF.Host/Properties/AssemblyInfo.cs b/src/SolutionTemplate/UnoSolutionTemplate/Skia.WPF.Host/Properties/AssemblyInfo.cs
index 56798ce86f85..992bb34d27c9 100644
--- a/src/SolutionTemplate/UnoSolutionTemplate/Skia.WPF.Host/Properties/AssemblyInfo.cs
+++ b/src/SolutionTemplate/UnoSolutionTemplate/Skia.WPF.Host/Properties/AssemblyInfo.cs
@@ -4,18 +4,6 @@
 using System.Runtime.InteropServices;
 using System.Windows;
 
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("$ext_safeprojectname$.WPF.Host")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("$ext_safeprojectname$.WPF.Host")]
-[assembly: AssemblyCopyright("Copyright ©  2020")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
 // Setting ComVisible to false makes the types in this assembly not visible
 // to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
@@ -39,17 +27,3 @@
 											  //(used if a resource is not found in the page,
 											  // app, or any theme specific resource dictionaries)
 )]
-
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/SolutionTemplate/UnoSolutionTemplate/Skia.WPF.Host/SkiaWpfHost.vstemplate b/src/SolutionTemplate/UnoSolutionTemplate/Skia.WPF.Host/SkiaWpfHost.vstemplate
new file mode 100644
index 000000000000..959a3fa4f643
--- /dev/null
+++ b/src/SolutionTemplate/UnoSolutionTemplate/Skia.WPF.Host/SkiaWpfHost.vstemplate
@@ -0,0 +1,38 @@
+<VSTemplate Version="3.0.0" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005" Type="Project">
+  <TemplateData>
+	<Name>UnoQuickStart.Skia.Wpf.Host</Name>
+	<Description>No Description</Description>
+	<Icon>__TemplateIcon.png</Icon>
+	<PreviewImage>__PreviewImage.png</PreviewImage>
+	<ProjectType>CSharp</ProjectType>
+	<ProjectSubType />
+	<SortOrder>1000</SortOrder>
+	<DefaultName>UnoQuickStart.Skia.Wpf.Host</DefaultName>
+	<ProvideDefaultName>true</ProvideDefaultName>
+	<EnableLocationBrowseButton>true</EnableLocationBrowseButton>
+	<LocationField>Enabled</LocationField>
+	<CreateInPlace>true</CreateInPlace>
+  </TemplateData>
+  <TemplateContent>
+	<Project File="UnoQuickStart.Skia.Wpf.Host.csproj" TargetFileName="$ext_safeprojectname$.Skia.Wpf.Host.csproj" ReplaceParameters="true">
+	  <Folder Name="Assets" TargetFolderName="Assets">
+		<Folder Name="Fonts" TargetFolderName="Fonts">
+		  <ProjectItem TargetFileName="uno-fluentui-assets.ttf" ReplaceParameters="false">uno-fluentui-assets.ttf</ProjectItem>
+		</Folder>
+	  </Folder>
+	  <Folder Name="Properties" TargetFolderName="Properties">
+		<ProjectItem TargetFileName="AssemblyInfo.cs" ReplaceParameters="true">assemblyinfo.cs</ProjectItem>
+		<ProjectItem TargetFileName="Resources.Designer.cs" ReplaceParameters="true">Resources.Designer.cs</ProjectItem>
+		<ProjectItem TargetFileName="Resources.resx" ReplaceParameters="true">Resources.resx</ProjectItem>
+		<ProjectItem TargetFileName="Settings.Designer.cs" ReplaceParameters="true">Settings.Designer.cs</ProjectItem>
+		<ProjectItem TargetFileName="Settings.settings" ReplaceParameters="true">Settings.settings</ProjectItem>
+	  </Folder>
+
+	  <ProjectItem TargetFileName="App.config" ReplaceParameters="true">App.config</ProjectItem>
+	  <ProjectItem TargetFileName="App.xaml" ReplaceParameters="true">App.xaml</ProjectItem>
+	  <ProjectItem TargetFileName="App.xaml.cs" ReplaceParameters="true">App.xaml.cs</ProjectItem>
+	  <ProjectItem TargetFileName="MainWindow.xaml" ReplaceParameters="true">MainWindow.xaml</ProjectItem>
+	  <ProjectItem TargetFileName="MainWindow.xaml.cs" ReplaceParameters="true">MainWindow.xaml.cs</ProjectItem>
+	</Project>
+  </TemplateContent>
+</VSTemplate>
diff --git a/src/SolutionTemplate/UnoSolutionTemplate/Skia.WPF.Host/UnoQuickStart.Skia.Wpf.Host.csproj b/src/SolutionTemplate/UnoSolutionTemplate/Skia.WPF.Host/UnoQuickStart.Skia.Wpf.Host.csproj
new file mode 100644
index 000000000000..8cacda05e1df
--- /dev/null
+++ b/src/SolutionTemplate/UnoSolutionTemplate/Skia.WPF.Host/UnoQuickStart.Skia.Wpf.Host.csproj
@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+
+  <PropertyGroup>
+    <OutputType Condition="'$(Configuration)'=='Release'">WinExe</OutputType>
+    <OutputType Condition="'$(Configuration)'=='Debug'">Exe</OutputType>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <UseWPF>true</UseWPF>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Uno.UI.Skia.Wpf" Version="3.1.0-dev.568" />
+    <PackageReference Include="Uno.UI.RemoteControl" Version="3.1.0-dev.568" Condition="'$(Configuration)'=='Debug'" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\$ext_safeprojectname$.Skia.WPF\$ext_safeprojectname$.Skia.WPF.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/src/SolutionTemplate/UnoSolutionTemplate/Skia.WPF.Host/UnoQuickStart.Wpf.Host.csproj b/src/SolutionTemplate/UnoSolutionTemplate/Skia.WPF.Host/UnoQuickStart.Wpf.Host.csproj
deleted file mode 100644
index 864b758b5ac2..000000000000
--- a/src/SolutionTemplate/UnoSolutionTemplate/Skia.WPF.Host/UnoQuickStart.Wpf.Host.csproj
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>$guid5$</ProjectGuid>
-    <OutputType>WinExe</OutputType>
-    <RootNamespace>$ext_safeprojectname$.Wpf.Host</RootNamespace>
-    <AssemblyName>$ext_safeprojectname$.Wpf.Host</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <WarningLevel>4</WarningLevel>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <Deterministic>true</Deterministic>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xaml">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-  </ItemGroup>
-  <ItemGroup>
-		<PackageReference Include="Uno.UI.Skia.Wpf" Version="3.0.0-dev.1447" />
-		<PackageReference Include="Uno.UI.RemoteControl" Version="3.0.0-dev.1447" Condition="'$(Configuration)'=='Debug'" />
-	</ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\$ext_safeprojectname$.Skia.WPF\$ext_safeprojectname$.Skia.WPF.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <ApplicationDefinition Include="App.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </ApplicationDefinition>
-    <Page Include="MainWindow.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Compile Include="App.xaml.cs">
-      <DependentUpon>App.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="MainWindow.xaml.cs">
-      <DependentUpon>MainWindow.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
diff --git a/src/SolutionTemplate/UnoSolutionTemplate/Skia.WPF/Program.cs b/src/SolutionTemplate/UnoSolutionTemplate/Skia.WPF/Program.cs
new file mode 100644
index 000000000000..2bcbba20b8e6
--- /dev/null
+++ b/src/SolutionTemplate/UnoSolutionTemplate/Skia.WPF/Program.cs
@@ -0,0 +1,3 @@
+namespace $ext_safeprojectname$.Skia.Gtk
+{
+}
diff --git a/src/SolutionTemplate/UnoSolutionTemplate/Skia.WPF/SkiaWpf.vstemplate b/src/SolutionTemplate/UnoSolutionTemplate/Skia.WPF/SkiaWpf.vstemplate
new file mode 100644
index 000000000000..0914ee541e5c
--- /dev/null
+++ b/src/SolutionTemplate/UnoSolutionTemplate/Skia.WPF/SkiaWpf.vstemplate
@@ -0,0 +1,21 @@
+<VSTemplate Version="3.0.0" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005" Type="Project">
+  <TemplateData>
+	<Name>UnoQuickStart.Skia.Wpf</Name>
+	<Description>No Description</Description>
+	<Icon>__TemplateIcon.png</Icon>
+	<PreviewImage>__PreviewImage.png</PreviewImage>
+	<ProjectType>CSharp</ProjectType>
+	<ProjectSubType />
+	<SortOrder>1000</SortOrder>
+	<DefaultName>UnoQuickStart.Skia.Wpf</DefaultName>
+	<ProvideDefaultName>true</ProvideDefaultName>
+	<EnableLocationBrowseButton>true</EnableLocationBrowseButton>
+	<LocationField>Enabled</LocationField>
+	<CreateInPlace>true</CreateInPlace>
+  </TemplateData>
+  <TemplateContent>
+	<Project File="UnoQuickStart.Skia.Wpf.csproj" TargetFileName="$ext_safeprojectname$.Skia.Wpf.csproj" ReplaceParameters="true">
+	  <ProjectItem TargetFileName="Program.cs" ReplaceParameters="true">Program.cs</ProjectItem>
+	</Project>
+  </TemplateContent>
+</VSTemplate>
diff --git a/src/SolutionTemplate/UnoSolutionTemplate/UnoApp.vstemplate b/src/SolutionTemplate/UnoSolutionTemplate/UnoApp.vstemplate
index bb95c0139a10..f2af86cb4655 100644
--- a/src/SolutionTemplate/UnoSolutionTemplate/UnoApp.vstemplate
+++ b/src/SolutionTemplate/UnoSolutionTemplate/UnoApp.vstemplate
@@ -33,6 +33,10 @@
 	  <ProjectTemplateLink ProjectName="$projectname$.UWP" CopyParameters="true">UWP\UWP.vstemplate</ProjectTemplateLink>
 	  <ProjectTemplateLink ProjectName="$projectname$.Wasm" CopyParameters="true">Wasm\Wasm.vstemplate</ProjectTemplateLink>
 	  <ProjectTemplateLink ProjectName="$projectname$.macOS" CopyParameters="true">macOS\macOS.vstemplate</ProjectTemplateLink>
+	
+	  <ProjectTemplateLink ProjectName="$projectname$.Skia.Wpf.Host" CopyParameters="true">Skia.Wpf.Host\SkiaWpfHost.vstemplate</ProjectTemplateLink>
+	  <ProjectTemplateLink ProjectName="$projectname$.Skia.Wpf" CopyParameters="true">Skia.Wpf\SkiaWpf.vstemplate</ProjectTemplateLink>
+	  <ProjectTemplateLink ProjectName="$projectname$.Skia.Gtk" CopyParameters="true">Skia.Gtk\SkiaGtk.vstemplate</ProjectTemplateLink>
 	</ProjectCollection>
   </TemplateContent>
   <WizardExtension>
diff --git a/src/SolutionTemplate/UnoSolutionTemplate/UnoSolutionTemplate.csproj b/src/SolutionTemplate/UnoSolutionTemplate/UnoSolutionTemplate.csproj
index dcaa1994cd34..4b9c10a5ae33 100644
--- a/src/SolutionTemplate/UnoSolutionTemplate/UnoSolutionTemplate.csproj
+++ b/src/SolutionTemplate/UnoSolutionTemplate/UnoSolutionTemplate.csproj
@@ -75,6 +75,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="Skia.WPF\Program.cs" />
     <None Include="Skia.WPF.Host\App.xaml.cs" />
     <None Include="Skia.WPF.Host\MainWindow.xaml.cs" />
     <None Include="Skia.WPF.Host\Properties\AssemblyInfo.cs" />
@@ -116,8 +117,8 @@
     <None Include="Skia.WPF.Host\App.config" />
     <None Include="Skia.WPF.Host\Assets\Fonts\uno-fluentui-assets.ttf" />
     <None Include="Skia.WPF.Host\Properties\Settings.settings" />
-    <None Include="Skia.WPF.Host\UnoQuickStart.Wpf.Host.csproj" />
-    <None Include="Skia.WPF\UnoQuickStart.Skia.WPF.csproj" />
+    <None Include="Skia.WPF.Host\UnoQuickStart.Skia.Wpf.Host.csproj" />
+    <None Include="Skia.WPF\UnoQuickStart.Skia.Wpf.csproj" />
     <None Include="Wasm\Program.cs" />
     <None Include="Droid\MainActivity.cs" />
     <None Include="Droid\Properties\AssemblyInfo.cs" />
@@ -227,6 +228,15 @@
     <None Include="macOS\Assets.xcassets\AppIcon.appiconset\AppIcon-512%402x.png" />
     <None Include="macOS\Assets.xcassets\AppIcon.appiconset\AppIcon-512.png" />
     <None Include="macOS\Assets.xcassets\unologo.imageset\unoplatform.jpg" />
+    <None Include="Skia.WPF.Host\SkiaWpfHost.vstemplate">
+      <SubType>Designer</SubType>
+    </None>
+    <None Include="Skia.WPF\SkiaWpf.vstemplate">
+      <SubType>Designer</SubType>
+    </None>
+    <None Include="Skia.Gtk\SkiaGtk.vstemplate">
+      <SubType>Designer</SubType>
+    </None>
     <Content Include="UWP\Assets\LockScreenLogo.scale-200.png" />
     <Content Include="UWP\Assets\SplashScreen.scale-200.png" />
     <Content Include="UWP\Assets\Square150x150Logo.scale-200.png" />
@@ -246,8 +256,8 @@
     <EmbeddedResource Include="Skia.WPF.Host\Properties\Resources.resx" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Skia.WPF.Host\App.xaml"/>
-    <None Include="Skia.WPF.Host\MainWindow.xaml"/>
+    <None Include="Skia.WPF.Host\App.xaml" />
+    <None Include="Skia.WPF.Host\MainWindow.xaml" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
@@ -259,4 +269,4 @@
   </Target>
   -->
   <Import Project="..\..\Common.targets" />
-</Project>
+</Project>
\ No newline at end of file