Merge pull request #269 from Particular/support-json-11

Use Newtonsoft.Json 11 in V4
Particular · Mar 26, 2018 · a856d0b · a856d0b
2 parents dffc61b + 84a1177
commit a856d0b
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 5 deletions.
diff --git a/GitVersion.yml b/GitVersion.yml
@@ -2,6 +2,6 @@ assembly-versioning-scheme: Major
 next-version: 4.0
 branches:
   develop:
-    tag: alpha
+    tag: beta
   release:
     tag: rc
diff --git a/src/ScriptBuilder.Tests/CecilExtensions/CustomAttributeMock.cs b/src/ScriptBuilder.Tests/CecilExtensions/CustomAttributeMock.cs
@@ -32,10 +32,13 @@ TypeReference GetTypeReference(object value)
     public TypeReference AttributeType => throw new NotImplementedException();
     public bool HasFields => throw new NotImplementedException();
     public bool HasProperties => true;
+    public bool HasConstructorArguments => false;
     public Collection<CustomAttributeNamedArgument> Fields => throw new NotImplementedException();
 
     public Collection<CustomAttributeNamedArgument> Properties
     {
         get;
     }
+
+    public Collection<CustomAttributeArgument> ConstructorArguments { get; } = new Collection<CustomAttributeArgument>();
 }
diff --git a/src/ScriptBuilder.Tests/ScriptBuilder.Tests.csproj b/src/ScriptBuilder.Tests/ScriptBuilder.Tests.csproj
@@ -21,7 +21,7 @@
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net452'">
     <PackageReference Include="Microsoft.SqlServer.TransactSql.ScriptDom" Version="14.*" />
-    <PackageReference Include="ObjectApproval" Version="1.*" />
+    <PackageReference Include="ObjectApproval" Version="2.*" />
     <PackageReference Include="PublicApiGenerator" Version="6.*" />
   </ItemGroup>
 

diff --git a/src/ScriptBuilder.Tests/SetUpFixture.cs b/src/ScriptBuilder.Tests/SetUpFixture.cs
@@ -1,6 +1,7 @@
 using System;
 using System.IO;
 using System.Runtime.CompilerServices;
+using Newtonsoft.Json;
 using NUnit.Framework;
 
 [SetUpFixture]
@@ -9,6 +10,9 @@ public class SetUpFixture
     [OneTimeSetUp]
     public void SetUp()
     {
+#if NET452
+        ObjectApproval.ObjectApprover.JsonSerializer.DefaultValueHandling = DefaultValueHandling.Include;
+#endif
         FixCurrentDirectory();
     }
 

diff --git a/src/ScriptBuilderTask.Tests/ScriptBuilderTask.Tests.csproj b/src/ScriptBuilderTask.Tests/ScriptBuilderTask.Tests.csproj
@@ -20,7 +20,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net452'">
-    <PackageReference Include="ObjectApproval" Version="1.*" />
+    <PackageReference Include="ObjectApproval" Version="2.*" />
   </ItemGroup>
 
 </Project>
diff --git a/src/ScriptBuilderTask.Tests/SetUpFixture.cs b/src/ScriptBuilderTask.Tests/SetUpFixture.cs
@@ -0,0 +1,23 @@
+using System;
+using System.IO;
+using System.Runtime.CompilerServices;
+using Newtonsoft.Json;
+using NUnit.Framework;
+
+[SetUpFixture]
+public class SetUpFixture
+{
+    [OneTimeSetUp]
+    public void SetUp()
+    {
+#if NET452
+        ObjectApproval.ObjectApprover.JsonSerializer.DefaultValueHandling = DefaultValueHandling.Include;
+#endif
+        FixCurrentDirectory();
+    }
+
+    void FixCurrentDirectory([CallerFilePath] string callerFilePath="")
+    {
+        Environment.CurrentDirectory = Directory.GetParent(callerFilePath).FullName;
+    }
+}
diff --git a/src/SqlPersistence.Tests/SetUpFixture.cs b/src/SqlPersistence.Tests/SetUpFixture.cs
@@ -1,6 +1,7 @@
 using System;
 using System.IO;
 using System.Runtime.CompilerServices;
+using Newtonsoft.Json;
 using NUnit.Framework;
 
 [SetUpFixture]
@@ -9,6 +10,9 @@ public class SetUpFixture
     [OneTimeSetUp]
     public void SetUp()
     {
+#if NET452
+        ObjectApproval.ObjectApprover.JsonSerializer.DefaultValueHandling = DefaultValueHandling.Include;
+#endif
         FixCurrentDirectory();
         using (var connection = MsSqlConnectionBuilder.Build())
         {

diff --git a/src/SqlPersistence.Tests/SqlPersistence.Tests.csproj b/src/SqlPersistence.Tests/SqlPersistence.Tests.csproj
@@ -22,7 +22,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net452'">
-    <PackageReference Include="ObjectApproval" Version="1.*" />
+    <PackageReference Include="ObjectApproval" Version="2.*" />
     <PackageReference Include="PublicApiGenerator" Version="6.*" />
   </ItemGroup>
 

diff --git a/src/SqlPersistence/SqlPersistence.csproj b/src/SqlPersistence/SqlPersistence.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="[10.0.1, 11.0.0)" />
+    <PackageReference Include="Newtonsoft.Json" Version="[11.0.1, 12.0.0)" />
     <PackageReference Include="NServiceBus" Version="[7.0.0-rc0001, 8.0.0)" />
     <PackageReference Include="Fody" Version="2.1.2" PrivateAssets="All" />
     <PackageReference Include="Obsolete.Fody" Version="4.3.2" PrivateAssets="All" />