Merge remote-tracking branch 'upstream/master' into liveshare

clowe-byte · Nov 27, 2018 · 21f8854 · 21f8854
2 parents 35eee35 + abbbe57
commit 21f8854
Show file tree

Hide file tree

Showing 18 changed files with 1 addition and 1,015 deletions.
diff --git a/Python/Product/AnacondaInstallLauncher/AnacondaInstallLauncher.csproj b/Python/Product/AnacondaInstallLauncher/AnacondaInstallLauncher.csproj
diff --git a/Python/Product/AnacondaInstallLauncher/Program.cs b/Python/Product/AnacondaInstallLauncher/Program.cs
diff --git a/Python/Product/AnacondaInstallLauncher/Properties/AssemblyInfo.cs b/Python/Product/AnacondaInstallLauncher/Properties/AssemblyInfo.cs
diff --git a/Python/Product/Cookiecutter/Model/GitClientProvider.cs b/Python/Product/Cookiecutter/Model/GitClientProvider.cs
@@ -29,12 +29,6 @@ public static IGitClient Create(Redirector redirector, string commonIdeFolderPat
                 gitExeFilePath = GetTeamExplorerGitFilePathFromIdeFolderPath(commonIdeFolderPath);
             }
 
-            // Try to locate Team Explorer's git.exe using the Dev 15 install path from registry
-            // (for tests with no running instance of VS, or when running in Dev 14)
-            if (!File.Exists(gitExeFilePath)) {
-                gitExeFilePath = GetTeamExplorerGitFilePathFromRegistry();
-            }
-
             // Just use git.exe, and it will work if it's in PATH
             // If it's not, the error will be output in redirector at time of use
             if (!File.Exists(gitExeFilePath)) {
@@ -50,20 +44,6 @@ private static string GitExecutableName {
             }
         }
 
-        private static string GetTeamExplorerGitFilePathFromRegistry() {
-            try {
-                using (var key = Registry.LocalMachine.OpenSubKey(@"Software\\Microsoft\VisualStudio\SxS\VS7")) {
-                    var installRoot = (string)key.GetValue(AssemblyVersionInfo.VSVersion);
-                    if (installRoot != null) {
-                        return GetTeamExplorerGitFilePathFromIdeFolderPath(Path.Combine(installRoot, @"Common7\IDE"));
-                    }
-                }
-            } catch (Exception e) when (!e.IsCriticalException()) {
-            }
-
-            return null;
-        }
-
         private static string GetTeamExplorerGitFilePathFromIdeFolderPath(string ideFolderPath) {
             // git.exe is in a folder path with a symlink to the actual extension dir with random name
             var gitFolder = Path.Combine(ideFolderPath, @"CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\mingw32\bin");

diff --git a/Python/Product/EnvironmentsListHost/App.config b/Python/Product/EnvironmentsListHost/App.config