Disable legacy package

Author: sailro

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

@@ -4,11 +4,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using UnityEngine;
 
 namespace Microsoft.Unity.VisualStudio.Editor
 {
@@ -24,19 +21,6 @@ public static IEnumerable<IVisualStudioInstallation> GetVisualStudioInstallation
 
 			foreach (var installation in VisualStudioCodeInstallation.GetVisualStudioInstallations())
 				yield return installation;
-
-			if (IsLegacyVSCodePackageLoaded())
-			{
-				Debug.LogWarning("[Visual Studio Editor] package has now built-in support for the whole Visual Studio family of products, including Visual Studio code. Please remove the legacy [Visual Studio Code Editor] package to avoid incompatibilities.");
-			}
-		}
-
-		private static bool IsLegacyVSCodePackageLoaded()
-		{
-			return AppDomain
-				.CurrentDomain
-				.GetAssemblies()
-				.Any(a => a.FullName.StartsWith("Unity.VSCode.Editor"));
 		}
 
 		public static bool TryDiscoverInstallation(string editorPath, out IVisualStudioInstallation installation)

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

@@ -96,13 +96,17 @@ public static bool TryDiscoverInstallation(string editorPath, out IVisualStudioI
 
 			try
 			{
-				var manifestBase = editorPath;
+				string manifestBase;
+
 				if (VisualStudioEditor.IsWindows)  // on Windows, editorPath is a file, resources as subdirectory
 					manifestBase = IOPath.GetDirectoryName(editorPath);
 				else if (VisualStudioEditor.IsOSX) // on Mac, editorPath is a directory
 					manifestBase = IOPath.Combine(editorPath, "Contents");
 				else                               // on Linux, editorPath is a file, in a bin sub-directory
-					manifestBase = Directory.GetParent(editorPath).Parent.FullName;
+					manifestBase = Directory.GetParent(editorPath)?.Parent?.FullName;
+
+				if (manifestBase == null)
+					return false;
 
 				var manifestFullPath = IOPath.Combine(manifestBase, @"resources", "app", "package.json");
 				if (File.Exists(manifestFullPath))

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

@@ -43,6 +43,20 @@ static VisualStudioEditor()
 			_discoverInstallations = AsyncOperation<Dictionary<string, IVisualStudioInstallation>>.Run(DiscoverInstallations);
 		}
 
+		[InitializeOnLoadMethod]
+		static void LegacyVisualStudioCodePackageDisabler()
+		{
+			// disable legacy Visual Studio Code packages
+			var editor = CodeEditor.Editor.GetCodeEditorForPath("code.cmd");
+			if (editor == null)
+				return;
+
+			if (editor is VisualStudioEditor)
+				return;
+
+			CodeEditor.Unregister(editor);
+		}
+
 		private static Dictionary<string, IVisualStudioInstallation> DiscoverInstallations()
 		{
 			try