Add .NET 5.0 target (#2246)

Author: ob-stripe

src/Stripe.net/Infrastructure/Public/SystemNetHttpClient.cs

@@ -25,7 +25,9 @@ public class SystemNetHttpClient : IHttpClient
         public const int DefaultMaxNumberRetries = 2;
 
         private const string StripeNetTargetFramework =
-#if NETSTANDARD2_0
+#if NET5_0
+            "net5.0"
+#elif NETSTANDARD2_0
             "netstandard2.0"
 #elif NET461
             "net461"

src/Stripe.net/Infrastructure/RuntimeInformation.cs

@@ -21,13 +21,15 @@ internal static class RuntimeInformation
 
         internal static bool IsFullFramework => FrameworkDescription.StartsWith(".NET Framework", StringComparison.OrdinalIgnoreCase);
 
-        internal static bool IsNetCore => FrameworkDescription.StartsWith(".NET Core", StringComparison.OrdinalIgnoreCase) && !string.IsNullOrEmpty(typeof(object).Assembly.Location);
+        internal static bool IsNetCore
+            => ((Environment.Version.Major >= 5) || FrameworkDescription.StartsWith(".NET Core", StringComparison.OrdinalIgnoreCase))
+                && !string.IsNullOrEmpty(typeof(object).Assembly.Location);
 
         /// <summary>
         /// "The north star for CoreRT is to be a flavor of .NET Core" -> CoreRT reports .NET Core everywhere.
         /// </summary>
         internal static bool IsCoreRT
-            => FrameworkDescription.StartsWith(".NET Core", StringComparison.OrdinalIgnoreCase)
+            => ((Environment.Version.Major >= 5) || FrameworkDescription.StartsWith(".NET Core", StringComparison.OrdinalIgnoreCase))
                && string.IsNullOrEmpty(typeof(object).Assembly.Location); // but it's merged to a single .exe and .Location returns null here ;)
 
         internal static bool IsRunningInContainer => string.Equals(Environment.GetEnvironmentVariable("DOTNET_RUNNING_IN_CONTAINER"), "true");
@@ -110,27 +112,7 @@ internal static string GetFullFrameworkVersion()
 
         internal static string MapToReleaseVersion(string servicingVersion)
         {
-            // the following code assumes that .NET 4.5 is the oldest supported version
-            if (string.Compare(servicingVersion, "4.5.1") < 0)
-            {
-                return "4.5";
-            }
-
-            if (string.Compare(servicingVersion, "4.5.2") < 0)
-            {
-                return "4.5.1";
-            }
-
-            if (string.Compare(servicingVersion, "4.6") < 0)
-            {
-                return "4.5.2";
-            }
-
-            if (string.Compare(servicingVersion, "4.6.1") < 0)
-            {
-                return "4.6";
-            }
-
+            // the following code assumes that .NET 4.6.1 is the oldest supported version
             if (string.Compare(servicingVersion, "4.6.2") < 0)
             {
                 return "4.6.1";
@@ -161,15 +143,30 @@ internal static string MapToReleaseVersion(string servicingVersion)
 
         internal static string GetNetCoreVersion()
         {
-            string runtimeVersion = TryGetCoreRuntimeVersion(out var version) ? version.ToString() : "?";
+            if (TryGetCoreRuntimeVersion(out var version) && version >= new Version(5, 0))
+            {
+                return $".NET {version}";
+            }
+            else
+            {
+                string runtimeVersion = version != default ? version.ToString() : "?";
 
-            return $".NET Core {runtimeVersion}";
+                return $".NET Core {runtimeVersion}";
+            }
         }
 
         internal static bool TryGetCoreRuntimeVersion(out Version version)
         {
             // we can't just use System.Runtime.InteropServices.RuntimeInformation.FrameworkDescription
             // because it can be null and it reports versions like 4.6.* for .NET Core 2.*
+
+            // for .NET 5+ we can use Environment.Version
+            if (Environment.Version.Major >= 5)
+            {
+                version = Environment.Version;
+                return true;
+            }
+
             string runtimeDirectory = System.Runtime.InteropServices.RuntimeEnvironment.GetRuntimeDirectory();
             if (TryGetVersionFromRuntimeDirectory(runtimeDirectory, out version))
             {

src/Stripe.net/Stripe.net.csproj

@@ -8,7 +8,7 @@
     <Version>39.29.0</Version>
     <LangVersion>8</LangVersion>
     <Authors>Stripe, Jayme Davis</Authors>
-    <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
+    <TargetFrameworks>net5.0;netstandard2.0;net461</TargetFrameworks>
     <AssemblyName>Stripe.net</AssemblyName>
     <PackageId>Stripe.net</PackageId>
     <PackageTags>stripe;payment;credit;cards;money;gateway;paypal;braintree</PackageTags>
@@ -39,6 +39,11 @@
     <CodeAnalysisRuleSet>..\_stylecop\StyleCopRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
+  </ItemGroup>
+
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="1.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.1" />

src/StripeTests/StripeTests.csproj

@@ -2,7 +2,7 @@
   <Import Project="..\..\netfx.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;netcoreapp2.1;net461</TargetFrameworks>
+    <TargetFrameworks>net5.0;netcoreapp3.1;netcoreapp2.1;net461</TargetFrameworks>
     <AssemblyName>StripeTests</AssemblyName>
     <LangVersion>8</LangVersion>
     <PackageId>StripeTests</PackageId>
@@ -27,6 +27,11 @@
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
+    <PackageReference Include="System.Linq.Async" Version="4.1.1" />
+  </ItemGroup>
+
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
     <PackageReference Include="System.Linq.Async" Version="4.1.1" />