Added dotnet5.4 moniker support.

bchavez · Feb 25, 2016 · 6527521 · 6527521
1 parent 03efcf8
commit 6527521
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 46 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -2,9 +2,10 @@
 * Roll-up Release for .NET Framework since v4.0.1.
 * CoreCLR users please continue using latest beta release until CoreCLR is RTM.
 
-## v5.0.1-beta-1
+## v5.0.1-beta-2
 * JvanderStad PR15: Lazy load Person. Avoids extra Seed.Next calls that may interfere with seeded content.
 * JvanderStad PR16: Better address generation. Respects locale address formats.
+* Added "dotnet5.4" moniker support.
 * BREAKING: Fake "seeded" data generated by Bogus may be different from previous versions.
 
 ## v4.0.1

diff --git a/Source/Bogus/Extensions/CrossPlatform.cs b/Source/Bogus/Extensions/CrossPlatform.cs
@@ -1,10 +1,6 @@
 using System;
 using System.Reflection;
 
-#if DNX
-using System.Reflection;
-#endif
-
 namespace Bogus.Extensions
 {
     internal static class ExtensionsForType

diff --git a/Source/Bogus/Faker.cs b/Source/Bogus/Faker.cs
@@ -1,7 +1,5 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
 using Bogus.DataSets;
 
 namespace Bogus

diff --git a/Source/Bogus/project.json b/Source/Bogus/project.json
@@ -22,32 +22,49 @@
   "dependencies": {
     "Newtonsoft.Json": "8.0.2"
   },
-  "frameworks": {
-    "net40": {},
-    "dnx451": {
-      "compilationOptions": {
-        "define": [
-          "DNX"
-        ]
-      }
+    "frameworks": {
+        "net40": { },
+        "dnx451": {
+            "compilationOptions": {
+                "define": [
+                    "DNX"
+                ]
+            }
+        },
+        "dnxcore50": {
+            "dependencies": {
+                "System.Text.Encoding": "4.0.11-beta-23516",
+                "System.Dynamic.Runtime": "4.0.11-beta-23516",
+                "System.IO": "4.0.11-beta-23516",
+                "System.ComponentModel": "4.0.1-beta-23516",
+                "System.Reflection.Extensions": "4.0.1-beta-23516",
+                "System.Reflection.TypeExtensions": "4.0.1-beta-23409",
+                "System.Text.RegularExpressions": "4.0.11-beta-23516"
+            },
+            "compilationOptions": {
+                "define": [
+                    "DNX"
+                ]
+            }
+        },
+        "dotnet5.4": {
+            "dependencies": {
+                "System.Text.Encoding": "4.0.11-beta-23516",
+                "System.Dynamic.Runtime": "4.0.11-beta-23516",
+                "System.IO": "4.0.11-beta-23516",
+                "System.ComponentModel": "4.0.1-beta-23516",
+                "System.Reflection.Extensions": "4.0.1-beta-23516",
+                "System.Reflection.TypeExtensions": "4.0.1-beta-23409",
+                "System.Text.RegularExpressions": "4.0.11-beta-23516",
+                "System.Linq": "4.0.0"
+            },
+            "compilationOptions": {
+                "define": [
+                    "DNX"
+                ]
+            }
+        }
     },
-    "dnxcore50": {
-      "dependencies": {
-        "System.Text.Encoding": "4.0.11-beta-23516",
-        "System.Dynamic.Runtime": "4.0.11-beta-23516",
-        "System.IO": "4.0.11-beta-23516",
-        "System.ComponentModel": "4.0.1-beta-23516",
-        "System.Reflection.Extensions": "4.0.1-beta-23516",
-        "System.Reflection.TypeExtensions": "4.0.1-beta-23409",
-        "System.Text.RegularExpressions": "4.0.11-beta-23516"
-      },
-      "compilationOptions": {
-        "define": [
-          "DNX"
-        ]
-      }
-    }
-  },
   "resource": [
     "data/*.locale.json"
   ]

diff --git a/Source/Builder/NuGet/Bogus.nuspec b/Source/Builder/NuGet/Bogus.nuspec
@@ -35,22 +35,20 @@
               <dependency id="System.Reflection.Extensions" version="4.0.1-beta-23516" />
               <dependency id="System.Reflection.TypeExtensions" version="4.0.1-beta-23409" />
               <dependency id="System.Text.RegularExpressions" version="4.0.11-beta-23516" />
-
+          </group>
+          <group targetFramework=".NETPlatform5.4">
+              <dependency id="Newtonsoft.Json" version="8.0.2" />
+              <dependency id="System.Text.Encoding" version="4.0.11-beta-23516" />
+              <dependency id="System.Dynamic.Runtime" version="4.0.11-beta-23516" />
+              <dependency id="System.IO" version="4.0.11-beta-23516" />
+              <dependency id="System.ComponentModel" version="4.0.1-beta-23516" />
+              <dependency id="System.Reflection.Extensions" version="4.0.1-beta-23516" />
+              <dependency id="System.Reflection.TypeExtensions" version="4.0.1-beta-23409" />
+              <dependency id="System.Text.RegularExpressions" version="4.0.11-beta-23516" />
+              <dependency id="System.Linq" version="4.0.0" />
           </group>
 
       </dependencies>
-
-
-      <frameworkAssemblies>
-          <frameworkAssembly assemblyName="mscorlib" targetFramework=".NETFramework4.0" />
-          <frameworkAssembly assemblyName="System" targetFramework=".NETFramework4.0" />
-          <frameworkAssembly assemblyName="System.Core" targetFramework=".NETFramework4.0" />
-          <frameworkAssembly assemblyName="Microsoft.CSharp" targetFramework=".NETFramework4.0" />
-          <frameworkAssembly assemblyName="mscorlib" targetFramework="DNX4.5.1" />
-          <frameworkAssembly assemblyName="System" targetFramework="DNX4.5.1" />
-          <frameworkAssembly assemblyName="System.Core" targetFramework="DNX4.5.1" />
-          <frameworkAssembly assemblyName="Microsoft.CSharp" targetFramework="DNX4.5.1" />
-      </frameworkAssemblies>
 
   </metadata>