Delete Ubuntu 14.04 conditions (dotnet#34361)

jkotas · web-flow · commit 45f58f96196a · 2020-04-01T19:38:22.000-07:00
Ubuntu 14.04 is no longer supported.
diff --git a/src/libraries/Common/tests/CoreFx.Private.TestUtilities/System/PlatformDetection.Unix.cs b/src/libraries/Common/tests/CoreFx.Private.TestUtilities/System/PlatformDetection.Unix.cs
@@ -17,14 +17,12 @@ public static partial class PlatformDetection
         //
 
         private static bool IsLinux => RuntimeInformation.IsOSPlatform(OSPlatform.Linux);
-        public static bool IsCentos6 => IsDistroAndVersion("centos", 6);
         public static bool IsOpenSUSE => IsDistroAndVersion("opensuse");
         public static bool IsUbuntu => IsDistroAndVersion("ubuntu");
         public static bool IsDebian => IsDistroAndVersion("debian");
         public static bool IsAlpine => IsDistroAndVersion("alpine");
         public static bool IsDebian8 => IsDistroAndVersion("debian", 8);
         public static bool IsDebian10 => IsDistroAndVersion("debian", 10);
-        public static bool IsUbuntu1404 => IsDistroAndVersion("ubuntu", 14, 4);
         public static bool IsUbuntu1604 => IsDistroAndVersion("ubuntu", 16, 4);
         public static bool IsUbuntu1704 => IsDistroAndVersion("ubuntu", 17, 4);
         public static bool IsUbuntu1710 => IsDistroAndVersion("ubuntu", 17, 10);
diff --git a/src/libraries/Common/tests/System/Drawing/Helpers.cs b/src/libraries/Common/tests/System/Drawing/Helpers.cs
@@ -59,8 +59,8 @@ public static bool GetIsWindowsOrAtLeastLibgdiplus6()
 
         public static bool GetRecentGdiPlusIsAvailable2()
         {
-            // RedHat and Ubuntu 14.04, as well as Fedora 25 and OpenSUSE 4.22 are running outdated versions of libgdiplus
-            if (PlatformDetection.IsRedHatFamily || PlatformDetection.IsUbuntu1404 || PlatformDetection.IsFedora || PlatformDetection.IsOpenSUSE)
+            // RedHat as well as Fedora 25 and OpenSUSE 4.22 are running outdated versions of libgdiplus
+            if (PlatformDetection.IsRedHatFamily || PlatformDetection.IsFedora || PlatformDetection.IsOpenSUSE)
             {
                 return false;
             }
@@ -90,8 +90,8 @@ public static bool GetGdiPlusIsAvailableNotWindows7()
 
         public static bool GetRecentGdiPlusIsAvailable()
         {
-            // RedHat and Ubuntu 14.04 are running outdated versions of libgdiplus
-            if (PlatformDetection.IsRedHatFamily || PlatformDetection.IsUbuntu1404)
+            // RedHat is running outdated versions of libgdiplus
+            if (PlatformDetection.IsRedHatFamily)
             {
                 return false;
             }
diff --git a/src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoGetAbbreviatedDayName.cs b/src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoGetAbbreviatedDayName.cs
@@ -16,7 +16,7 @@ public static IEnumerable<object[]> GetAbbreviatedDayName_TestData()
             yield return new object[] { new CultureInfo("en-US").DateTimeFormat, englishAbbreviatedDayNames };
             yield return new object[] { new DateTimeFormatInfo(), englishAbbreviatedDayNames };
 
-            if (!PlatformDetection.IsUbuntu || PlatformDetection.IsUbuntu1404)
+            if (!PlatformDetection.IsUbuntu)
             {
                 yield return new object[] { new CultureInfo("fr-FR").DateTimeFormat, DateTimeFormatInfoData.FrFRAbbreviatedDayNames() };
             }
diff --git a/src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoGetAbbreviatedMonthName.cs b/src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoGetAbbreviatedMonthName.cs
@@ -19,7 +19,7 @@ public static IEnumerable<object[]> GetAbbreviatedMonthName_TestData()
             yield return new object[] { new CultureInfo("en-US").DateTimeFormat, englishAbbreviatedMonthNames };
             yield return new object[] { new DateTimeFormatInfo(), englishAbbreviatedMonthNames };
 
-            if (!PlatformDetection.IsUbuntu || PlatformDetection.IsUbuntu1404)
+            if (!PlatformDetection.IsUbuntu)
             {
                 yield return new object[] { new CultureInfo("fr-FR").DateTimeFormat, new string[] { "", "janv.", "f\u00E9vr.", "mars", "avr.", "mai", "juin", "juil.", "ao\u00FBt", "sept.", "oct.", "nov.", "d\u00E9c.", "" } };
             }
diff --git a/src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoGetDayName.cs b/src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoGetDayName.cs
@@ -17,7 +17,7 @@ public static IEnumerable<object[]> GetDayName_TestData()
             yield return new object[] { new CultureInfo("en-US").DateTimeFormat, englishDayNames };
             yield return new object[] { new DateTimeFormatInfo(), englishDayNames };
 
-            if (!PlatformDetection.IsUbuntu || PlatformDetection.IsUbuntu1404)
+            if (!PlatformDetection.IsUbuntu)
             {
                 yield return new object[] { new CultureInfo("fr-FR").DateTimeFormat, DateTimeFormatInfoData.FrFRDayNames() };
             }
diff --git a/src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoGetMonthName.cs b/src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoGetMonthName.cs
@@ -19,7 +19,7 @@ public static IEnumerable<object[]> GetMonthName_TestData()
             yield return new object[] { new DateTimeFormatInfo(), englishMonthNames };
             yield return new object[] { new CultureInfo("en-US").DateTimeFormat, englishMonthNames };
 
-            if (!PlatformDetection.IsUbuntu || PlatformDetection.IsUbuntu1404)
+            if (!PlatformDetection.IsUbuntu)
             {
                 yield return new object[] { new CultureInfo("fr-FR").DateTimeFormat, new string[] { "", "janvier", "f\u00E9vrier", "mars", "avril", "mai", "juin", "juillet", "ao\u00FBt", "septembre", "octobre", "novembre", "d\u00E9cembre", "" } };
             }
diff --git a/src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoCurrencyGroupSizes.cs b/src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoCurrencyGroupSizes.cs
@@ -14,8 +14,7 @@ public static IEnumerable<object[]> CurrencyGroupSizes_TestData()
             yield return new object[] { NumberFormatInfo.InvariantInfo, new int[] { 3 } };
             yield return new object[] { CultureInfo.GetCultureInfo("en-US").NumberFormat, new int[] { 3 } };
 
-            if ((!PlatformDetection.IsUbuntu || PlatformDetection.IsUbuntu1404)
-                && !PlatformDetection.IsWindows7 && !PlatformDetection.IsWindows8x && !PlatformDetection.IsFedora)
+            if (!PlatformDetection.IsUbuntu && !PlatformDetection.IsWindows7 && !PlatformDetection.IsWindows8x && !PlatformDetection.IsFedora)
             {
                 yield return new object[] { CultureInfo.GetCultureInfo("ur-IN").NumberFormat, new int[] { 3, 2 } };
             }
diff --git a/src/libraries/System.Security.Cryptography.X509Certificates/tests/PfxTests.cs b/src/libraries/System.Security.Cryptography.X509Certificates/tests/PfxTests.cs
@@ -249,9 +249,9 @@ public static void ReadECDsaPrivateKey_BrainpoolP160r1_Pfx(byte[] pfxData)
             }
             catch (CryptographicException)
             {
-                // Windows 7, Windows 8, Ubuntu 14, CentOS, macOS can fail. Verify known good platforms don't fail.
+                // Windows 7, Windows 8, CentOS, macOS can fail. Verify known good platforms don't fail.
                 Assert.False(PlatformDetection.IsWindows && PlatformDetection.WindowsVersion >= 10, "Is Windows 10");
-                Assert.False(PlatformDetection.IsUbuntu && !PlatformDetection.IsUbuntu1404, "Is Ubuntu 16.04 or up");
+                Assert.False(PlatformDetection.IsUbuntu, "Is Ubuntu");
             }
         }
 
diff --git a/src/libraries/System.Security.Cryptography.X509Certificates/tests/PublicKeyTests.cs b/src/libraries/System.Security.Cryptography.X509Certificates/tests/PublicKeyTests.cs
@@ -330,9 +330,9 @@ public static void TestKey_ECDsabrainpool_PublicKey(byte[] curveData, byte[] not
             }
             catch (CryptographicException)
             {
-                // Windows 7, Windows 8, Ubuntu 14, CentOS can fail. Verify known good platforms don't fail.
+                // Windows 7, Windows 8, CentOS can fail. Verify known good platforms don't fail.
                 Assert.False(PlatformDetection.IsWindows && PlatformDetection.WindowsVersion >= 10);
-                Assert.False(PlatformDetection.IsUbuntu && !PlatformDetection.IsUbuntu1404);
+                Assert.False(PlatformDetection.IsUbuntu);
             }
         }
 
@@ -420,9 +420,9 @@ public static void TestECDsaPublicKey_BrainpoolP160r1_ValidatesSignature(byte[]
             }
             catch (CryptographicException)
             {
-                // Windows 7, Windows 8, Ubuntu 14, CentOS can fail. Verify known good platforms don't fail.
+                // Windows 7, Windows 8, CentOS can fail. Verify known good platforms don't fail.
                 Assert.False(PlatformDetection.IsWindows && PlatformDetection.WindowsVersion >= 10);
-                Assert.False(PlatformDetection.IsUbuntu && !PlatformDetection.IsUbuntu1404);
+                Assert.False(PlatformDetection.IsUbuntu);
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -59,8 +59,8 @@ public static bool GetIsWindowsOrAtLeastLibgdiplus6()`
`59`	`59`
`60`	`60`	`public static bool GetRecentGdiPlusIsAvailable2()`
`61`	`61`	`{`
`62`		`- // RedHat and Ubuntu 14.04, as well as Fedora 25 and OpenSUSE 4.22 are running outdated versions of libgdiplus`
`63`		`- if (PlatformDetection.IsRedHatFamily \|\| PlatformDetection.IsUbuntu1404 \|\| PlatformDetection.IsFedora \|\| PlatformDetection.IsOpenSUSE)`
	`62`	`+ // RedHat as well as Fedora 25 and OpenSUSE 4.22 are running outdated versions of libgdiplus`
	`63`	`+ if (PlatformDetection.IsRedHatFamily \|\| PlatformDetection.IsFedora \|\| PlatformDetection.IsOpenSUSE)`
`64`	`64`	`{`
`65`	`65`	`return false;`
`66`	`66`	`}`
`@@ -90,8 +90,8 @@ public static bool GetGdiPlusIsAvailableNotWindows7()`
`90`	`90`
`91`	`91`	`public static bool GetRecentGdiPlusIsAvailable()`
`92`	`92`	`{`
`93`		`- // RedHat and Ubuntu 14.04 are running outdated versions of libgdiplus`
`94`		`- if (PlatformDetection.IsRedHatFamily \|\| PlatformDetection.IsUbuntu1404)`
	`93`	`+ // RedHat is running outdated versions of libgdiplus`
	`94`	`+ if (PlatformDetection.IsRedHatFamily)`
`95`	`95`	`{`
`96`	`96`	`return false;`
`97`	`97`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public static IEnumerable<object[]> GetAbbreviatedDayName_TestData()`
`16`	`16`	`yield return new object[] { new CultureInfo("en-US").DateTimeFormat, englishAbbreviatedDayNames };`
`17`	`17`	`yield return new object[] { new DateTimeFormatInfo(), englishAbbreviatedDayNames };`
`18`	`18`
`19`		`- if (!PlatformDetection.IsUbuntu \|\| PlatformDetection.IsUbuntu1404)`
	`19`	`+ if (!PlatformDetection.IsUbuntu)`
`20`	`20`	`{`
`21`	`21`	`yield return new object[] { new CultureInfo("fr-FR").DateTimeFormat, DateTimeFormatInfoData.FrFRAbbreviatedDayNames() };`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public static IEnumerable<object[]> GetAbbreviatedMonthName_TestData()`
`19`	`19`	`yield return new object[] { new CultureInfo("en-US").DateTimeFormat, englishAbbreviatedMonthNames };`
`20`	`20`	`yield return new object[] { new DateTimeFormatInfo(), englishAbbreviatedMonthNames };`
`21`	`21`
`22`		`- if (!PlatformDetection.IsUbuntu \|\| PlatformDetection.IsUbuntu1404)`
	`22`	`+ if (!PlatformDetection.IsUbuntu)`
`23`	`23`	`{`
`24`	`24`	`yield return new object[] { new CultureInfo("fr-FR").DateTimeFormat, new string[] { "", "janv.", "f\u00E9vr.", "mars", "avr.", "mai", "juin", "juil.", "ao\u00FBt", "sept.", "oct.", "nov.", "d\u00E9c.", "" } };`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public static IEnumerable<object[]> GetDayName_TestData()`
`17`	`17`	`yield return new object[] { new CultureInfo("en-US").DateTimeFormat, englishDayNames };`
`18`	`18`	`yield return new object[] { new DateTimeFormatInfo(), englishDayNames };`
`19`	`19`
`20`		`- if (!PlatformDetection.IsUbuntu \|\| PlatformDetection.IsUbuntu1404)`
	`20`	`+ if (!PlatformDetection.IsUbuntu)`
`21`	`21`	`{`
`22`	`22`	`yield return new object[] { new CultureInfo("fr-FR").DateTimeFormat, DateTimeFormatInfoData.FrFRDayNames() };`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,7 @@ public static IEnumerable<object[]> CurrencyGroupSizes_TestData()`
`14`	`14`	`yield return new object[] { NumberFormatInfo.InvariantInfo, new int[] { 3 } };`
`15`	`15`	`yield return new object[] { CultureInfo.GetCultureInfo("en-US").NumberFormat, new int[] { 3 } };`
`16`	`16`
`17`		`- if ((!PlatformDetection.IsUbuntu \|\| PlatformDetection.IsUbuntu1404)`
`18`		`- && !PlatformDetection.IsWindows7 && !PlatformDetection.IsWindows8x && !PlatformDetection.IsFedora)`
	`17`	`+ if (!PlatformDetection.IsUbuntu && !PlatformDetection.IsWindows7 && !PlatformDetection.IsWindows8x && !PlatformDetection.IsFedora)`
`19`	`18`	`{`
`20`	`19`	`yield return new object[] { CultureInfo.GetCultureInfo("ur-IN").NumberFormat, new int[] { 3, 2 } };`
`21`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -249,9 +249,9 @@ public static void ReadECDsaPrivateKey_BrainpoolP160r1_Pfx(byte[] pfxData)`
`249`	`249`	`}`
`250`	`250`	`catch (CryptographicException)`
`251`	`251`	`{`
`252`		`- // Windows 7, Windows 8, Ubuntu 14, CentOS, macOS can fail. Verify known good platforms don't fail.`
	`252`	`+ // Windows 7, Windows 8, CentOS, macOS can fail. Verify known good platforms don't fail.`
`253`	`253`	`Assert.False(PlatformDetection.IsWindows && PlatformDetection.WindowsVersion >= 10, "Is Windows 10");`
`254`		`- Assert.False(PlatformDetection.IsUbuntu && !PlatformDetection.IsUbuntu1404, "Is Ubuntu 16.04 or up");`
	`254`	`+ Assert.False(PlatformDetection.IsUbuntu, "Is Ubuntu");`
`255`	`255`	`}`
`256`	`256`	`}`
`257`	`257`
Original file line number	Diff line number	Diff line change
`@@ -330,9 +330,9 @@ public static void TestKey_ECDsabrainpool_PublicKey(byte[] curveData, byte[] not`
`330`	`330`	`}`
`331`	`331`	`catch (CryptographicException)`
`332`	`332`	`{`
`333`		`- // Windows 7, Windows 8, Ubuntu 14, CentOS can fail. Verify known good platforms don't fail.`
	`333`	`+ // Windows 7, Windows 8, CentOS can fail. Verify known good platforms don't fail.`
`334`	`334`	`Assert.False(PlatformDetection.IsWindows && PlatformDetection.WindowsVersion >= 10);`
`335`		`- Assert.False(PlatformDetection.IsUbuntu && !PlatformDetection.IsUbuntu1404);`
	`335`	`+ Assert.False(PlatformDetection.IsUbuntu);`
`336`	`336`	`}`
`337`	`337`	`}`
`338`	`338`
`@@ -420,9 +420,9 @@ public static void TestECDsaPublicKey_BrainpoolP160r1_ValidatesSignature(byte[]`
`420`	`420`	`}`
`421`	`421`	`catch (CryptographicException)`
`422`	`422`	`{`
`423`		`- // Windows 7, Windows 8, Ubuntu 14, CentOS can fail. Verify known good platforms don't fail.`
	`423`	`+ // Windows 7, Windows 8, CentOS can fail. Verify known good platforms don't fail.`
`424`	`424`	`Assert.False(PlatformDetection.IsWindows && PlatformDetection.WindowsVersion >= 10);`
`425`		`- Assert.False(PlatformDetection.IsUbuntu && !PlatformDetection.IsUbuntu1404);`
	`425`	`+ Assert.False(PlatformDetection.IsUbuntu);`
`426`	`426`	`}`
`427`	`427`	`}`
`428`	`428`