Fix SupportsTargetFramework for tests - 7.0.3xx (#30235)

dsplaisted · web-flow · commit b14a7932d39d · 2023-02-01T13:26:51.000-05:00
diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAHelloWorldProject.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAHelloWorldProject.cs
@@ -70,10 +70,16 @@ public void It_publishes_portable_apps_to_the_publish_folder_and_the_app_should_
         }
 
         [Theory]
+        [InlineData("netcoreapp1.1")]
         [InlineData("netcoreapp2.0")]
         [InlineData(ToolsetInfo.CurrentTargetFramework)]
         public void It_publishes_self_contained_apps_to_the_publish_folder_and_the_app_should_run(string targetFramework)
         {
+            if (!EnvironmentInfo.SupportsTargetFramework(targetFramework))
+            {
+                return;
+            }
+
             var rid = EnvironmentInfo.GetCompatibleRid(targetFramework);
 
             var helloWorldAsset = _testAssetsManager
diff --git a/src/Tests/Microsoft.NET.TestFramework/EnvironmentInfo.cs b/src/Tests/Microsoft.NET.TestFramework/EnvironmentInfo.cs
@@ -54,7 +54,21 @@ public static string GetCompatibleRid(string targetFramework = null)
         //  able to run on the current OS
         public static bool SupportsTargetFramework(string targetFramework)
         {
-            var nugetFramework = NuGetFramework.Parse(targetFramework);
+            NuGetFramework nugetFramework = null;
+            try
+            {
+                nugetFramework = NuGetFramework.Parse(targetFramework);
+            }
+            catch
+            {
+                return false;
+            }
+
+            if (nugetFramework == null)
+            {
+                return false;
+            }
+
             string currentRid = RuntimeInformation.RuntimeIdentifier;
 
             string ridOS = currentRid.Split('.')[0];
@@ -125,9 +139,9 @@ public static bool SupportsTargetFramework(string targetFramework)
             {
                 string restOfRid = currentRid.Substring(ridOS.Length + 1);
                 string ubuntuVersionString = restOfRid.Split('-')[0];
-                if (float.TryParse(ubuntuVersionString, out float ubuntuVersion))
+                if (float.TryParse(ubuntuVersionString, System.Globalization.CultureInfo.InvariantCulture, out float ubuntuVersion))
                 {
-                    if (ubuntuVersion > 16.04)
+                    if (ubuntuVersion > 16.04f)
                     {
                         if (nugetFramework.Version < new Version(2, 0, 0, 0))
                         {
@@ -144,59 +158,31 @@ public static bool SupportsTargetFramework(string targetFramework)
             {
                 string restOfRid = currentRid.Substring(ridOS.Length + 1);
                 string osxVersionString = restOfRid.Split('-')[0];
-                //  From a string such as "10.14", get the second part, e.g. "14"
-                if (osxVersionString.Contains('.'))
+                if (float.TryParse(osxVersionString, System.Globalization.CultureInfo.InvariantCulture, out float osxVersion))
                 {
-                    string osxVersionString2 = osxVersionString.Split('.')[1];
-                    if (int.TryParse(osxVersionString2, out int osxVersion))
+                    //  .NET Core 1.1 - 10.11, 10.12
+                    //  .NET Core 2.0 - 10.12+
+                    if (osxVersion <= 10.11f)
                     {
-                        //  .NET Core 1.1 - 10.11, 10.12
-                        //  .NET Core 2.0 - 10.12+
-                        if (osxVersion <= 11)
-                        {
-                            if (nugetFramework.Version >= new Version(2, 0, 0, 0))
-                            {
-                                return false;
-                            }
-                        }
-                        else if (osxVersion == 12)
-                        {
-                            if (nugetFramework.Version < new Version(2, 0, 0, 0))
-                            {
-                                return false;
-                            }
-                        }
-                        else if (osxVersion > 12)
+                        if (nugetFramework.Version >= new Version(2, 0, 0, 0))
                         {
-                            //  .NET Core 2.0 is out of support, and doesn't seem to work with OS X 10.14
-                            //  (it finds no assets for the RID), even though the support page says "10.12+"
-                            if (nugetFramework.Version < new Version(2, 1, 0, 0))
-                            {
-                                return false;
-                            }
+                            return false;
                         }
                     }
-                }
-                else
-                {
-                    if (int.TryParse(osxVersionString, out int osxVersionMajor))
+                    else if (osxVersion == 10.12f)
                     {
-                        //  .NET 5 <= 11.0
-                        //  .NET 6 <= 12
-                        //  .NET 7 <= 13
-                        if (osxVersionMajor == 12)
+                        if (nugetFramework.Version < new Version(2, 0, 0, 0))
                         {
-                            if (nugetFramework.Version < new Version(6, 0, 0, 0))
-                            {
-                                return false;
-                            }
+                            return false;
                         }
-                        else if (osxVersionMajor > 12)
+                    }
+                    else if (osxVersion > 10.12f)
+                    {
+                        //  .NET Core 2.0 is out of support, and doesn't seem to work with OS X 10.14
+                        //  (it finds no assets for the RID), even though the support page says "10.12+"
+                        if (nugetFramework.Version < new Version(2, 1, 0, 0))
                         {
-                            if (nugetFramework.Version < new Version(7, 0, 0, 0))
-                            {
-                                return false;
-                            }
+                            return false;
                         }
                     }
                 }
