Merge pull request #183 from unity/generator-style

Add UnityProjectGeneratorStyle to Telemetry properties

Author: sailro

Packages/com.unity.ide.visualstudio.tests/Tests/Editor/CSProjectTests.cs

@@ -173,6 +173,7 @@ public void DefaultSyncSettings_WhenSynced_CreatesProjectFileFromDefaultTemplate
 					"    <ProjectTypeGuids>{E097FAD1-6243-4DAD-9C02-E9B9EFC3FFC1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>",
 					"    <UnityProjectGenerator>Package</UnityProjectGenerator>",
 					$"    <UnityProjectGeneratorVersion>{packageVersion}</UnityProjectGeneratorVersion>",
+					"    <UnityProjectGeneratorStyle>Legacy</UnityProjectGeneratorStyle>",
 					$"    <UnityProjectType>{buildTarget}</UnityProjectType>",
 					$"    <UnityBuildTarget>{EditorUserBuildSettings.activeBuildTarget + ":" + (int)EditorUserBuildSettings.activeBuildTarget}</UnityBuildTarget>",
 					$"    <UnityVersion>{unityVersion}</UnityVersion>",

Packages/com.unity.ide.visualstudio/Editor/ProjectGeneration/LegacyStyleProjectGeneration.cs

@@ -12,6 +12,8 @@ namespace Microsoft.Unity.VisualStudio.Editor
 
 	internal class LegacyStyleProjectGeneration : ProjectGeneration
 	{
+		internal override string StyleName => "Legacy";
+
 		public LegacyStyleProjectGeneration(string tempDirectory, IAssemblyNameProvider assemblyNameProvider, IFileIO fileIoProvider, IGUIDGenerator guidGenerator) : base(tempDirectory, assemblyNameProvider, fileIoProvider, guidGenerator)
 		{
 		}

Packages/com.unity.ide.visualstudio/Editor/ProjectGeneration/ProjectGeneration.cs

@@ -87,6 +87,8 @@ public ProjectGeneration(string tempDirectory, IAssemblyNameProvider assemblyNam
 			SetupProjectSupportedExtensions();
 		}
 
+		internal virtual string StyleName => "";
+
 		/// <summary>
 		/// Syncs the scripting solution if any affected files are relevant.
 		/// </summary>
@@ -824,7 +826,7 @@ internal static void GetProjectHeaderAnalyzers(ProjectProperties properties, Str
 			}
 		}
 
-		internal static void GetProjectHeaderVstuFlavoring(ProjectProperties properties, StringBuilder headerBuilder, bool includeProjectTypeGuids = true)
+		internal void GetProjectHeaderVstuFlavoring(ProjectProperties properties, StringBuilder headerBuilder, bool includeProjectTypeGuids = true)
 		{
 			// Flavoring
 			headerBuilder.Append(@"  <PropertyGroup>").Append(k_WindowsNewline);
@@ -836,6 +838,7 @@ internal static void GetProjectHeaderVstuFlavoring(ProjectProperties properties,
 
 			headerBuilder.Append(@"    <UnityProjectGenerator>Package</UnityProjectGenerator>").Append(k_WindowsNewline);
 			headerBuilder.Append(@"    <UnityProjectGeneratorVersion>").Append(properties.FlavoringPackageVersion).Append(@"</UnityProjectGeneratorVersion>").Append(k_WindowsNewline);
+			headerBuilder.Append(@"    <UnityProjectGeneratorStyle>").Append(StyleName).Append("</UnityProjectGeneratorStyle>").Append(k_WindowsNewline);
 			headerBuilder.Append(@"    <UnityProjectType>").Append(properties.FlavoringProjectType).Append(@"</UnityProjectType>").Append(k_WindowsNewline);
 			headerBuilder.Append(@"    <UnityBuildTarget>").Append(properties.FlavoringBuildTarget).Append(@"</UnityBuildTarget>").Append(k_WindowsNewline);
 			headerBuilder.Append(@"    <UnityVersion>").Append(properties.FlavoringUnityVersion).Append(@"</UnityVersion>").Append(k_WindowsNewline);

Packages/com.unity.ide.visualstudio/Editor/ProjectGeneration/SdkStyleProjectGeneration.cs

@@ -13,6 +13,8 @@ namespace Microsoft.Unity.VisualStudio.Editor
 {
 	internal class SdkStyleProjectGeneration : ProjectGeneration
 	{
+		internal override string StyleName => "SDK";
+
 		internal class SdkStyleAssemblyNameProvider : AssemblyNameProvider
 		{
 			// disable PlayerGeneration with SdkStyle projects