Updated ObjectApproval to 2.*

Particular · Mar 23, 2018 · 84a1177 · 84a1177
1 parent e0aed55
commit 84a1177
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 6 deletions.
diff --git a/src/ScriptBuilder.Tests/ScriptBuilder.Tests.csproj b/src/ScriptBuilder.Tests/ScriptBuilder.Tests.csproj
@@ -14,15 +14,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="11.0.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
     <PackageReference Include="NUnit" Version="3.7.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.8.0-alpha1" />
   </ItemGroup>
 
   <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
@@ -14,14 +14,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="11.0.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
     <PackageReference Include="NUnit" Version="3.7.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.8.0-alpha1" />
   </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
@@ -15,15 +15,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="11.0.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
     <PackageReference Include="NServiceBus.SqlServer" Version="4.0.0-beta0006" />
     <PackageReference Include="NUnit" Version="3.7.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.8.0-alpha1" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net452'">
-    <PackageReference Include="ObjectApproval" Version="1.*" />
+    <PackageReference Include="ObjectApproval" Version="2.*" />
     <PackageReference Include="PublicApiGenerator" Version="6.*" />
   </ItemGroup>