Delegate extra file creation to the specific installation

Author: sailro

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/ProjectGeneration.cs

@@ -108,7 +108,7 @@ public bool SyncIfNeeded(IEnumerable<string> affectedFiles, IEnumerable<string>
 
 				// See https://devblogs.microsoft.com/setup/configure-visual-studio-across-your-organization-with-vsconfig/
 				// We create a .vsconfig file to make sure our ManagedGame workload is installed
-				CreateVsConfigIfNotFound();
+				CreateExtraFiles(m_CurrentInstallation);
 
 				// Don't sync if we haven't synced before
 				var affected = affectedFiles as ICollection<string> ?? affectedFiles.ToArray();
@@ -148,28 +148,9 @@ public bool SyncIfNeeded(IEnumerable<string> affectedFiles, IEnumerable<string>
 			}
 		}
 
-		private void CreateVsConfigIfNotFound()
+		private void CreateExtraFiles(IVisualStudioInstallation installation)
 		{
-			const string ManagedWorkload = "Microsoft.VisualStudio.Workload.ManagedGame";
-
-			try
-			{
-				var vsConfigFile = VsConfigFile();
-				if (m_FileIOProvider.Exists(vsConfigFile))
-					return;
-
-				var content = $@"{{
-  ""version"": ""1.0"",
-  ""components"": [
-    ""{ManagedWorkload}""
-  ]
-}}
-";
-				m_FileIOProvider.WriteAllText(vsConfigFile, content);
-			}
-			catch (IOException)
-			{
-			}
+			installation.CreateExtraFiles(ProjectDirectory);
 		}
 
 		private bool HasFilesBeenModified(IEnumerable<string> affectedFiles, IEnumerable<string> reimportedFiles)
@@ -201,7 +182,7 @@ public void Sync()
 
 			// See https://devblogs.microsoft.com/setup/configure-visual-studio-across-your-organization-with-vsconfig/
 			// We create a .vsconfig file to make sure our ManagedGame workload is installed
-			CreateVsConfigIfNotFound();
+			CreateExtraFiles(m_CurrentInstallation);
 
 			var externalCodeAlreadyGeneratedProjects = OnPreGeneratingCSProjectFiles();
 
@@ -618,11 +599,6 @@ public string SolutionFile()
 			return Path.Combine(ProjectDirectory.NormalizePathSeparators(), $"{InvalidCharactersRegexPattern.Replace(m_ProjectName, "_")}.sln");
 		}
 
-		internal string VsConfigFile()
-		{
-			return Path.Combine(ProjectDirectory.NormalizePathSeparators(), ".vsconfig");
-		}
-
 		internal string GetLangVersion(Assembly assembly)
 		{
 			var targetLanguageVersion = "latest"; // danger: latest is not the same absolute value depending on the VS version.

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

@@ -158,6 +158,10 @@ public static IEnumerable<IVisualStudioInstallation> GetVisualStudioInstallation
 		[DllImport("AppleEventIntegration")]
 		private static extern bool OpenVisualStudio(string appPath, string solutionPath, string filePath, int line);
 
+		public override void CreateExtraFiles(string projectDirectory)
+		{
+		}
+
 		public override bool Open(string path, int line, int column, string solution)
 		{
 			string absolutePath = "";

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

@@ -241,6 +241,28 @@ private enum COMIntegrationState
 			Exited
 		}
 
+		public override void CreateExtraFiles(string projectDirectory)
+		{
+			try
+			{
+				var vsConfigFile = IOPath.Combine(projectDirectory.NormalizePathSeparators(), ".vsconfig");
+				if (File.Exists(vsConfigFile))
+					return;
+
+				const string content = @"{
+  ""version"": ""1.0"",
+  ""components"": [
+    ""Microsoft.VisualStudio.Workload.ManagedGame""
+  ]
+}
+";
+				File.WriteAllText(vsConfigFile, content);
+			}
+			catch (IOException)
+			{
+			}			
+		}
+
 		public override bool Open(string path, int line, int column, string solution)
 		{
 			var progpath = FileUtility.GetPackageAssetFullPath("Editor", "COMIntegration", "Release", "COMIntegration.exe");

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

@@ -18,6 +18,7 @@ internal interface IVisualStudioInstallation
 		CodeEditor.Installation ToCodeEditorInstallation();
 		bool Open(string path, int line, int column, string solutionPath);
 		IGenerator ProjectGenerator { get; }
+		void CreateExtraFiles(string projectDirectory);
 	}
 
 	internal abstract class VisualStudioInstallation : IVisualStudioInstallation
@@ -31,6 +32,7 @@ internal abstract class VisualStudioInstallation : IVisualStudioInstallation
 		public abstract Version LatestLanguageVersionSupported { get; }
 		public abstract string[] GetAnalyzers();
 		public abstract IGenerator ProjectGenerator { get; }
+		public abstract void CreateExtraFiles(string projectDirectory);
 		public abstract bool Open(string path, int line, int column, string solutionPath);
 
 		protected Version GetLatestLanguageVersionSupported(VersionPair[] versions)