Merge pull request #164 from unity/sdk-style

LegacyStyle / SdkStyle generators

Author: sailro

Assets/Editor/CSProjAssetTests.cs

@@ -40,7 +40,7 @@ void Start()
 		public virtual void SetUp()
 		{
 			var projectDirectory = Directory.GetParent(Application.dataPath).FullName;
-			m_ProjectGeneration = new ProjectGeneration(projectDirectory);
+			m_ProjectGeneration = new LegacyStyleProjectGeneration(projectDirectory);
 		}
 
 		[UnityTearDown]

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

@@ -233,10 +233,10 @@ public void WontSynchronize_WhenNoFilesChanged()
 				var synchronizer = m_Builder.Build();
 
 				synchronizer.Sync();
-				Assert.AreEqual(3, m_Builder.WriteTimes, "3 writes for solution + csproj + .vsconfig");
+				Assert.AreEqual(2, m_Builder.WriteTimes, "2 writes for solution + csproj");
 
 				synchronizer.Sync();
-				Assert.AreEqual(3, m_Builder.WriteTimes, "No more files should be written");
+				Assert.AreEqual(2, m_Builder.WriteTimes, "No more files should be written");
 			}
 
 			[Test]

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

@@ -46,10 +46,10 @@ public void ContentWithoutChanges_WhenSynced_DoesNotReSync()
 				var synchronizer = m_Builder.Build();
 
 				synchronizer.Sync();
-				Assert.AreEqual(3, m_Builder.WriteTimes); // 3 writes for csproj / solution / .vsconfig
+				Assert.AreEqual(2, m_Builder.WriteTimes); // 2 writes for csproj / solution
 
 				synchronizer.Sync();
-				Assert.AreEqual(3, m_Builder.WriteTimes, "When content doesn't change we shouldn't re-sync");
+				Assert.AreEqual(2, m_Builder.WriteTimes, "When content doesn't change we shouldn't re-sync");
 			}
 
 			[Test]
@@ -58,12 +58,12 @@ public void AssemblyChanged_AfterSync_PerformsReSync()
 				var synchronizer = m_Builder.Build();
 
 				synchronizer.Sync();
-				Assert.AreEqual(3, m_Builder.WriteTimes); // 3 writes for csproj / solution / .vsconfig
+				Assert.AreEqual(2, m_Builder.WriteTimes); // 2 writes for csproj / solution
 
 				m_Builder.WithAssemblies(new[] { new Assembly("Another", "path/to/Assembly.dll", new[] { "file.cs" }, new string[0], new Assembly[0], new string[0], AssemblyFlags.None) });
 
 				synchronizer.Sync();
-				Assert.AreEqual(3 + 2, m_Builder.WriteTimes, "Should only re-sync the solution file and the 'Another' csproj");
+				Assert.AreEqual(2 + 2, m_Builder.WriteTimes, "Should only re-sync the solution file and the 'Another' csproj");
 			}
 
 			[Test]

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

@@ -52,7 +52,7 @@ public SynchronizerBuilder()
 
 		public ProjectGeneration Build()
 		{
-			return m_ProjectGeneration = new ProjectGeneration(projectDirectory, m_AssemblyProvider.Object, m_FileIoMock, m_GUIDGenerator.Object);
+			return m_ProjectGeneration = new LegacyStyleProjectGeneration(projectDirectory, m_AssemblyProvider.Object, m_FileIoMock, m_GUIDGenerator.Object);
 		}
 
 		public SynchronizerBuilder WithSolutionText(string solutionText)
@@ -248,7 +248,7 @@ public override bool TryGetInstallationForPath(string editorPath, out CodeEditor
 				return true;
 			}
 
-			internal override bool TryGetVisualStudioInstallationForPath(string editorPath, bool searchInstallations, out IVisualStudioInstallation installation)
+			internal override bool TryGetVisualStudioInstallationForPath(string editorPath, bool lookupDiscoveredInstallations, out IVisualStudioInstallation installation)
 			{
 				var mock = new Mock<IVisualStudioInstallation>();
 				mock.Setup(x => x.SupportsAnalyzers).Returns(true);

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

@@ -23,7 +23,7 @@ internal static string GetInstallationDetails(IVisualStudioInstallation installa
 
 		internal static void GenerateSolutionWith(VisualStudioEditor vse, string installationPath)
 		{
-			if (vse != null && vse.TryGetVisualStudioInstallationForPath(installationPath, searchInstallations: true, out var vsi))
+			if (vse != null && vse.TryGetVisualStudioInstallationForPath(installationPath, lookupDiscoveredInstallations: true, out var vsi))
 			{
 				Log($"Using {GetInstallationDetails(vsi)}");
 				vse.SyncAll();

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

@@ -3,162 +3,44 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-using System;
-using System.IO;
 using System.Collections.Generic;
-using System.Diagnostics;
-using System.Text.RegularExpressions;
-using System.Linq;
-using UnityEngine;
+using System.IO;
 
 namespace Microsoft.Unity.VisualStudio.Editor
 {
 	internal static class Discovery
 	{
-		internal const string ManagedWorkload = "Microsoft.VisualStudio.Workload.ManagedGame";
-
-		internal static string _vsWherePath;
-
-		public static void FindVSWhere()
-		{
-			_vsWherePath = FileUtility.GetPackageAssetFullPath("Editor", "VSWhere", "vswhere.exe");
-		}
-
 		public static IEnumerable<IVisualStudioInstallation> GetVisualStudioInstallations()
 		{
-			if (VisualStudioEditor.IsWindows)
-			{
-				foreach (var installation in QueryVsWhere())
-					yield return installation;
-			}
-
-			if (VisualStudioEditor.IsOSX)
-			{
-				var candidates = Directory.EnumerateDirectories("/Applications", "*.app");
-				foreach (var candidate in candidates)
-				{
-					if (TryDiscoverInstallation(candidate, out var installation))
-						yield return installation;
-				}
-			}
-		}
-
-		private static bool IsCandidateForDiscovery(string path)
-		{
-			if (File.Exists(path) && VisualStudioEditor.IsWindows && Regex.IsMatch(path, "devenv.exe$", RegexOptions.IgnoreCase))
-				return true;
-
-			if (Directory.Exists(path) && VisualStudioEditor.IsOSX && Regex.IsMatch(path, "Visual\\s?Studio(?!.*Code.*).*.app$", RegexOptions.IgnoreCase))
-				return true;
+			foreach (var installation in VisualStudioForWindowsInstallation.GetVisualStudioInstallations())
+				yield return installation;
 
-			return false;
+			foreach (var installation in VisualStudioForMacInstallation.GetVisualStudioInstallations())
+				yield return installation;
 		}
 
 		public static bool TryDiscoverInstallation(string editorPath, out IVisualStudioInstallation installation)
 		{
-			installation = null;
-
-			if (string.IsNullOrEmpty(editorPath))
-				return false;
-
-			if (!IsCandidateForDiscovery(editorPath))
-				return false;
-
-			// On windows we use the executable directly, so we can query extra information
-			var fvi = editorPath;
-
-			// On Mac we use the .app folder, so we need to access to main assembly
-			if (VisualStudioEditor.IsOSX)
+			try
 			{
-				fvi = Path.Combine(editorPath, "Contents/Resources/lib/monodevelop/bin/VisualStudio.exe");
-
-				if (!File.Exists(fvi))
-					fvi = Path.Combine(editorPath, "Contents/MonoBundle/VisualStudio.exe");
+				if (VisualStudioForWindowsInstallation.TryDiscoverInstallation(editorPath, out installation))
+					return true;
 
-				if (!File.Exists(fvi))
-					fvi = Path.Combine(editorPath, "Contents/MonoBundle/VisualStudio.dll");				
+				if (VisualStudioForMacInstallation.TryDiscoverInstallation(editorPath, out installation))
+					return true;
 			}
-
-			if (!File.Exists(fvi))
-				return false;
-
-			// VS preview are not using the isPrerelease flag so far
-			// On Windows FileDescription contains "Preview", but not on Mac
-			var vi = FileVersionInfo.GetVersionInfo(fvi);
-			var version = new Version(vi.ProductVersion);
-			var isPrerelease = vi.IsPreRelease || string.Concat(editorPath, "/" + vi.FileDescription).ToLower().Contains("preview");
-
-			installation = new VisualStudioInstallation()
+			catch (IOException)
 			{
-				IsPrerelease = isPrerelease,
-				Name = $"{vi.FileDescription}{(isPrerelease && VisualStudioEditor.IsOSX ? " Preview" : string.Empty)} [{version.ToString(3)}]",
-				Path = editorPath,
-				Version = version
-			};
-			return true;
-		}
-
-		#region VsWhere Json Schema
-#pragma warning disable CS0649
-		[Serializable]
-		internal class VsWhereResult
-		{
-			public VsWhereEntry[] entries;
-
-			public static VsWhereResult FromJson(string json)
-			{
-				return JsonUtility.FromJson<VsWhereResult>("{ \"" + nameof(VsWhereResult.entries) + "\": " + json + " }");
+				installation = null;
 			}
 
-			public IEnumerable<VisualStudioInstallation> ToVisualStudioInstallations()
-			{
-				foreach (var entry in entries)
-				{
-					yield return new VisualStudioInstallation()
-					{
-						Name = $"{entry.displayName} [{entry.catalog.productDisplayVersion}]",
-						Path = entry.productPath,
-						IsPrerelease = entry.isPrerelease,
-						Version = Version.Parse(entry.catalog.buildVersion)
-					};
-				}
-			}
-		}
-
-		[Serializable]
-		internal class VsWhereEntry
-		{
-			public string displayName;
-			public bool isPrerelease;
-			public string productPath;
-			public VsWhereCatalog catalog;
-		}
-
-		[Serializable]
-		internal class VsWhereCatalog
-		{
-			public string productDisplayVersion; // non parseable like "16.3.0 Preview 3.0"
-			public string buildVersion;
+			return false;
 		}
-#pragma warning restore CS3021
-		#endregion
 
-		private static IEnumerable<VisualStudioInstallation> QueryVsWhere()
+		public static void Initialize()
 		{
-			var progpath = _vsWherePath;
-
-			if (string.IsNullOrWhiteSpace(progpath))
-				return Enumerable.Empty<VisualStudioInstallation>();
-
-			var result = ProcessRunner.StartAndWaitForExit(progpath, "-prerelease -format json -utf8");
-
-			if (!result.Success)
-				throw new Exception($"Failure while running vswhere: {result.Error}");
-
-			// Do not catch any JsonException here, this will be handled by the caller
-			return VsWhereResult
-				.FromJson(result.Output)
-				.ToVisualStudioInstallations();
+			VisualStudioForWindowsInstallation.Initialize();
+			VisualStudioForMacInstallation.Initialize();
 		}
 	}
 }

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

@@ -6,6 +6,7 @@
 using System;
 using System.Diagnostics;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace Microsoft.Unity.VisualStudio.Editor
@@ -21,19 +22,34 @@ internal static class ProcessRunner
 	{
 		public const int DefaultTimeoutInMilliseconds = 300000;
 
-		public static ProcessStartInfo ProcessStartInfoFor(string filename, string arguments)
+		public static ProcessStartInfo ProcessStartInfoFor(string filename, string arguments, bool redirect = true, bool shell = false)
 		{
 			return new ProcessStartInfo
 			{
-				UseShellExecute = false,
+				UseShellExecute = shell,
 				CreateNoWindow = true, 
-				RedirectStandardOutput = true,
-				RedirectStandardError = true,
+				RedirectStandardOutput = redirect,
+				RedirectStandardError = redirect,
 				FileName = filename,
 				Arguments = arguments
 			};
 		}
 
+		public static void Start(string filename, string arguments)
+		{
+			Start(ProcessStartInfoFor(filename, arguments, false));
+		}
+
+		public static void Start(ProcessStartInfo processStartInfo)
+		{
+			var process = new Process { StartInfo = processStartInfo };
+
+			using (process)
+			{
+				process.Start();
+			}
+		}
+
 		public static ProcessRunnerResult StartAndWaitForExit(string filename, string arguments, int timeoutms = DefaultTimeoutInMilliseconds, Action<string> onOutputReceived = null)
 		{
 			return StartAndWaitForExit(ProcessStartInfoFor(filename, arguments), timeoutms, onOutputReceived);

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

@@ -40,7 +40,7 @@ public class AssemblyNameProvider : IAssemblyNameProvider
 
 		public string ProjectGenerationRootNamespace => EditorSettings.projectGenerationRootNamespace;
 
-		public ProjectGenerationFlag ProjectGenerationFlag
+		public virtual ProjectGenerationFlag ProjectGenerationFlag
 		{
 			get => m_ProjectGenerationFlag;
 			private set