Merge pull request #196 from sfoslund/AllowNetWithoutCore

Update to support both .NET and .NET Core branding
dotnet · Sep 8, 2021 · 0ed6f8f · 0ed6f8f
2 parents 53be691 + 45b90ce
commit 0ed6f8f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/dotnet-core-uninstall/Windows/RegistryQuery.cs b/src/dotnet-core-uninstall/Windows/RegistryQuery.cs
@@ -72,7 +72,7 @@ internal static bool IsNetCoreBundle(string displayName, string displayVersion,
                     (displayName.IndexOf("Visual Studio", StringComparison.OrdinalIgnoreCase) < 0) &&
                     (displayName.IndexOf("VS 2015", StringComparison.OrdinalIgnoreCase) < 0) &&
                     (displayName.IndexOf("Local Feed", StringComparison.OrdinalIgnoreCase) < 0) &&
-                    ((displayName.IndexOf(".NET Core", StringComparison.OrdinalIgnoreCase) >= 0) ||
+                    ((displayName.IndexOf(".NET", StringComparison.OrdinalIgnoreCase) >= 0) ||
                      (displayName.IndexOf(".NET Runtime", StringComparison.OrdinalIgnoreCase) >= 0) ||
                      (displayName.IndexOf(".NET SDK", StringComparison.OrdinalIgnoreCase) >= 0) ||
                      (displayName.IndexOf("Dotnet Shared Framework for Windows Desktop", StringComparison.OrdinalIgnoreCase) >= 0)) &&

diff --git a/test/dotnet-core-uninstall.Tests/Windows/RegistryQueryTests.cs b/test/dotnet-core-uninstall.Tests/Windows/RegistryQueryTests.cs
@@ -44,6 +44,7 @@ public class RegistryQueryTests
         [InlineData("Microsoft .NET Core 3.0.0 Preview 5 Build 19227-01 - Windows Server Hosting")]
         [InlineData("Microsoft .NET Core 3.0.0 Preview 6 Build 19307.2 - Windows Server Hosting")]
         [InlineData("Microsoft .NET Core 3.1.0 Preview 1 Build preview1.19307.20 - Windows Server Hosting")]
+        [InlineData("Microsoft .NET 5.0.9 - Windows Server Hosting")]
         internal void TestIsNetCoreBundleAccept(string input)
         {
             RegistryQuery.IsNetCoreBundle(input, "0.0", "mockuninstall.exe", "0.0")