Migrate to .NET Standard 2.0. 🚚

HISTORY.md

@@ -1,3 +1,6 @@
+## v17.0.1
+* Migration to **.NET Standard 2.0**.
+
 ## v16.0.3
 * With additional overloads for `.PickRandom(IList)` and `.PickRandom(ICollection)` we can now add `.PickRandom("cat", "dog", "fish")` back to the API. 
 

Source/Bogus/Bogus.csproj

@@ -5,7 +5,7 @@
     </PackageReleaseNotes>
     <Version>0.0.0-localbuild</Version>
     <Authors>Brian Chavez</Authors>
-    <TargetFrameworks>net40;netstandard1.3</TargetFrameworks>
+    <TargetFrameworks>net40;netstandard2.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyOriginatorKeyFile>
     </AssemblyOriginatorKeyFile>
@@ -18,7 +18,6 @@
     <PackageLicenseUrl>https://raw.githubusercontent.com/bchavez/Bogus/master/LICENSE</PackageLicenseUrl>
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/bchavez/Bogus</RepositoryUrl>
-    <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.3' ">$(PackageTargetFallback);portable-net451+win8;dnxcore50</PackageTargetFallback>
     <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
@@ -28,7 +27,7 @@
     <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
     <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
     <DefineConstants>$(DefineConstants);STANDARD</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
@@ -37,9 +36,6 @@
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
-    <PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0" />
-  </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'net40' ">
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />

Source/Bogus/DataSet.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Text.RegularExpressions;
-using Bogus.Extensions;
+using Bogus.Platform;
 using Newtonsoft.Json.Linq;
 
 namespace Bogus

Source/Bogus/Database.cs

@@ -24,8 +24,7 @@ public static class Database
         /// </summary>
         private static JObject Initialize()
         {
-            //var asm = typeof(Database).Assembly;
-            var asm = typeof(Database).GetAssembly();
+            var asm = typeof(Database).Assembly;
             var root = new JObject();
 
             var resourcesFound = false;
@@ -35,7 +34,7 @@ private static JObject Initialize()
                 resourcesFound = true;
                 if( resourceName.EndsWith(".locale.json") )
                 {
-                    using( var s = typeof(Database).GetAssembly().GetManifestResourceStream(resourceName) )
+                    using( var s = asm.GetManifestResourceStream(resourceName) )
                     using( var sr = new StreamReader(s) )
                     {
                         var serializer = new JsonSerializer();

Source/Bogus/Platform/ExtensionsForType.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Reflection;
+
+namespace Bogus.Platform
+{
+    internal static class ExtensionsForType
+    {
+        public static T GetCustomAttributeX<T>(this Type type) where T : Attribute 
+        {
+#if STANDARD
+            return type.GetCustomAttribute<T>();
+#else
+            return Attribute.GetCustomAttribute(type, typeof(T)) as T;
+#endif
+        }
+    }
+}

Source/Bogus/Properties/AssemblyInfo.cs

@@ -21,7 +21,7 @@ internal static class AssemblyVersionInformation {
         internal const System.String AssemblyVersion = "0.0.0";
         internal const System.String AssemblyFileVersion = "0.0.0";
         internal const System.String AssemblyInformationalVersion = "0.0.0-localbuild built on 1/1/2015 12:00:00 AM";
-        internal const System.String AssemblyTrademark = "Apache License v2.0";
+        internal const System.String AssemblyTrademark = "MIT License";
         internal const System.String AssemblyDescription = "https://github.com/bchavez/Bogus";
         internal const System.String InternalsVisibleTo = "Bogus.Tests";
     }

Source/Bogus/Randomizer.cs

@@ -391,7 +391,7 @@ public string Replace(string format)
         public T Enum<T>(params T[] exclude) where T : struct
         {
             var e = typeof(T);
-            if(!e.IsEnum())
+            if(!e.IsEnum)
                 throw new ArgumentException("When calling Enum<T>() with no parameters T must be an enum.");
 
             var selection = System.Enum.GetNames(e);