Adding Visual Studio dummy version protection

sfoslund · sfoslund · commit abca350ee25e · 2019-10-22T09:25:28.000-07:00
diff --git a/src/dotnet-core-uninstall/Windows/RegistryQuery.cs b/src/dotnet-core-uninstall/Windows/RegistryQuery.cs
@@ -49,7 +49,13 @@ private static bool IsDotNetCoreBundle(RegistryKey registryKey)
         {
             return IsDotNetCoreBundleDisplayName(registryKey.GetValue("DisplayName") as string)
                 && IsDotNetCoreBundlePublisher(registryKey.GetValue("Publisher") as string)
-                && IsDotNetCoreBundleUninstaller(registryKey.GetValue("WindowsInstaller") as int?);
+                && IsDotNetCoreBundleUninstaller(registryKey.GetValue("WindowsInstaller") as int?)
+                && IsNotVisualStudioDummyVersion(registryKey.GetValue("DisplayName") as string);
+        }
+
+        private static bool IsNotVisualStudioDummyVersion(string displayName)
+        {
+            return !displayName.Contains(" from Visual Studio");
         }
 
         private static bool IsDotNetCoreBundleDisplayName(string displayName)

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,13 @@ private static bool IsDotNetCoreBundle(RegistryKey registryKey)`
`49`	`49`	`{`
`50`	`50`	`return IsDotNetCoreBundleDisplayName(registryKey.GetValue("DisplayName") as string)`
`51`	`51`	`&& IsDotNetCoreBundlePublisher(registryKey.GetValue("Publisher") as string)`
`52`		`- && IsDotNetCoreBundleUninstaller(registryKey.GetValue("WindowsInstaller") as int?);`
	`52`	`+ && IsDotNetCoreBundleUninstaller(registryKey.GetValue("WindowsInstaller") as int?)`
	`53`	`+ && IsNotVisualStudioDummyVersion(registryKey.GetValue("DisplayName") as string);`
	`54`	`+ }`
	`55`	`+`
	`56`	`+ private static bool IsNotVisualStudioDummyVersion(string displayName)`
	`57`	`+ {`
	`58`	`+ return !displayName.Contains(" from Visual Studio");`
`53`	`59`	`}`
`54`	`60`
`55`	`61`	`private static bool IsDotNetCoreBundleDisplayName(string displayName)`