Drop .Net40 support, v3.0.0

l8nite · Nov 17, 2016 · ec26120 · ec26120
1 parent 777bacd
commit ec26120
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 55 deletions.
diff --git a/JsonApiNet.Tests/JsonApiNet.Tests.csproj b/JsonApiNet.Tests/JsonApiNet.Tests.csproj
@@ -30,17 +30,7 @@
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Net40|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Net45|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>

diff --git a/JsonApiNet.sln b/JsonApiNet.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.30723.0
+# Visual Studio 14
+VisualStudioVersion = 14.0.25123.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JsonApiNet", "JsonApiNet\JsonApiNet.csproj", "{3DE2919D-C351-4355-93DB-4C1EB77B8D1C}"
 EndProject
@@ -24,22 +24,17 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
-		Net40|Any CPU = Net40|Any CPU
-		Net45|Any CPU = Net45|Any CPU
+		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{3DE2919D-C351-4355-93DB-4C1EB77B8D1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3DE2919D-C351-4355-93DB-4C1EB77B8D1C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3DE2919D-C351-4355-93DB-4C1EB77B8D1C}.Net40|Any CPU.ActiveCfg = Net40|Any CPU
-		{3DE2919D-C351-4355-93DB-4C1EB77B8D1C}.Net40|Any CPU.Build.0 = Net40|Any CPU
-		{3DE2919D-C351-4355-93DB-4C1EB77B8D1C}.Net45|Any CPU.ActiveCfg = Net45|Any CPU
-		{3DE2919D-C351-4355-93DB-4C1EB77B8D1C}.Net45|Any CPU.Build.0 = Net45|Any CPU
+		{3DE2919D-C351-4355-93DB-4C1EB77B8D1C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3DE2919D-C351-4355-93DB-4C1EB77B8D1C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{20C6F447-C0D6-4574-B8C1-D93BB006DDF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{20C6F447-C0D6-4574-B8C1-D93BB006DDF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{20C6F447-C0D6-4574-B8C1-D93BB006DDF5}.Net40|Any CPU.ActiveCfg = Net40|Any CPU
-		{20C6F447-C0D6-4574-B8C1-D93BB006DDF5}.Net40|Any CPU.Build.0 = Net40|Any CPU
-		{20C6F447-C0D6-4574-B8C1-D93BB006DDF5}.Net45|Any CPU.ActiveCfg = Net45|Any CPU
-		{20C6F447-C0D6-4574-B8C1-D93BB006DDF5}.Net45|Any CPU.Build.0 = Net45|Any CPU
+		{20C6F447-C0D6-4574-B8C1-D93BB006DDF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{20C6F447-C0D6-4574-B8C1-D93BB006DDF5}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/JsonApiNet/JsonApiNet.csproj b/JsonApiNet/JsonApiNet.csproj
@@ -24,18 +24,8 @@
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Net40|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\net40</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Net45|AnyCPU'">
-    <OutputPath>bin\Release\net45</OutputPath>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -130,4 +120,4 @@
     <!-- Package the project -->
     <Exec WorkingDirectory="$(BuildDir)" Command="NuGet.exe pack -Verbosity detailed -Symbols -OutputDir &quot;NuGet&quot; -Version %(OutputAssemblyInfo.Version) -Properties &quot;Configuration=$(Configuration)&quot; $(AssemblyName).nuspec" />
   </Target>
-</Project>
+</Project>
diff --git a/JsonApiNet/JsonApiNet.nuspec b/JsonApiNet/JsonApiNet.nuspec
@@ -2,13 +2,16 @@
 <package >
   <metadata>
     <id>JsonApiNet</id>
-    <version>2.0.1</version>
+    <version>3.0.0</version>
     <authors>Shaun Guth</authors>
     <licenseUrl>http://www.gnu.org/licenses/gpl-2.0.txt</licenseUrl>
     <projectUrl>https://github.com/l8nite/JsonApiNet</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Deserialize JSON API documents with ease</description>
     <releaseNotes>
+        [v3.0.0]
+        - Drop .Net 4.0 support
+        - Add support for null relationships (kprilux)
         [v2.0.1]
         - Support .Net 4.0 in addition to .Net 4.5
         [v2.0.0]
@@ -19,23 +22,12 @@
     <copyright>Copyright 2015</copyright>
     <tags>JSON JSONAPI</tags>
     <dependencies>
-      <group>
-        <dependency id="Humanizer" version="1.37.7" />
-      </group>
-
-      <group targetFramework="net40">
-        <dependency id="Newtonsoft.Json" version="7.0.1"/>
-      </group>
-
-      <group targetFramework="net45">
-        <dependency id="Newtonsoft.Json" version="7.0.1"/>
-      </group>
+      <dependency id="Humanizer.Core" version="2.1.0" />
+      <dependency id="Newtonsoft.Json" version="9.0.1"/>
     </dependencies>
   </metadata>
   <files>
-    <file src="bin\Release\net40\JsonApiNet.dll" target="lib\net40\JsonApiNet.dll" />
-    <file src="bin\Release\net40\JsonApiNet.pdb" target="lib\net40\JsonApiNet.pdb" />
-    <file src="bin\Release\net45\JsonApiNet.dll" target="lib\net45\JsonApiNet.dll" />
-    <file src="bin\Release\net45\JsonApiNet.pdb" target="lib\net45\JsonApiNet.pdb" />
+    <file src="bin\Release\JsonApiNet.dll" target="lib\net45\JsonApiNet.dll" />
+    <file src="bin\Release\JsonApiNet.pdb" target="lib\net45\JsonApiNet.pdb" />
   </files>
-</package>
+</package>
diff --git a/JsonApiNet/Properties/AssemblyInfo.cs b/JsonApiNet/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.1.0")]
-[assembly: AssemblyFileVersion("2.0.1.0")]
+[assembly: AssemblyVersion("3.0.0.0")]
+[assembly: AssemblyFileVersion("3.0.0.0")]