Merge pull request #36 from mookid8000/master

update Serilog dep to 2.3.0 and Newtonsoft dep to 9.0.1
asgerhallas · Nov 9, 2016 · 60118d6 · 60118d6
2 parents 1ce5348 + 5753826
commit 60118d6
Show file tree

Hide file tree

Showing 66 changed files with 80,870 additions and 66,360 deletions.
diff --git a/HybridDb.NewtonsoftJson.nuspec b/HybridDb.NewtonsoftJson.nuspec
@@ -15,10 +15,10 @@
     <tags></tags>
     <dependencies>
       <dependency id="HybridDb" version="{VERSION}" />
-      <dependency id="Newtonsoft.Json" version="6.0.8" />
+      <dependency id="Newtonsoft.Json" version="9.0.1" />
     </dependencies>
   </metadata>
   <files>
-    <file src="NewtonsoftJson\lib\*.*" target="lib\net40" />
+    <file src="NewtonsoftJson\lib\*.*" target="lib\net45" />
   </files>
 </package>
diff --git a/HybridDb.nuspec b/HybridDb.nuspec
@@ -14,11 +14,11 @@
     <copyright>Copyright 2013</copyright>
     <tags></tags>
     <dependencies>
-      <dependency id="Serilog" version="1.4" />
+      <dependency id="Serilog" version="2.3.0" />
     </dependencies>
   </metadata>
   <files>
-    <file src="HybridDb\lib\*.*" target="lib\net40" />
+    <file src="HybridDb\lib\*.*" target="lib\net45" />
     <file src="HybridDb\tools\*.*" target="tools" />
   </files>
 </package>
diff --git a/src/HybridDb.NewtonsoftJson/HybridDb.NewtonsoftJson.csproj b/src/HybridDb.NewtonsoftJson/HybridDb.NewtonsoftJson.csproj
@@ -32,8 +32,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -49,15 +50,15 @@
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\HybridDb\HybridDb.csproj">
       <Project>{97e49da1-c846-4900-ba32-e17c0163a331}</Project>
       <Name>HybridDb</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/src/HybridDb.NewtonsoftJson/packages.config b/src/HybridDb.NewtonsoftJson/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
 </packages>
diff --git a/src/HybridDb.Studio/HybridDb.Studio.csproj b/src/HybridDb.Studio/HybridDb.Studio.csproj
@@ -52,9 +52,9 @@
     <Reference Include="Castle.Windsor">
       <HintPath>..\packages\Castle.Windsor.3.1.0\lib\net40\Castle.Windsor.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />

diff --git a/src/HybridDb.Studio/packages.config b/src/HybridDb.Studio/packages.config
@@ -3,5 +3,5 @@
   <package id="Caliburn.Micro" version="1.4.1" targetFramework="net45" />
   <package id="Castle.Core" version="3.1.0" targetFramework="net45" />
   <package id="Castle.Windsor" version="3.1.0" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
 </packages>
diff --git a/src/HybridDb.Tests/HybridDb.Tests.csproj b/src/HybridDb.Tests/HybridDb.Tests.csproj
@@ -43,15 +43,17 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\FakeItEasy.1.25.2\lib\net40\FakeItEasy.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Serilog">
-      <HintPath>..\packages\Serilog.1.4.204\lib\net45\Serilog.dll</HintPath>
+    <Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
+      <HintPath>..\packages\Serilog.2.3.0\lib\net45\Serilog.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Serilog.FullNetFx">
-      <HintPath>..\packages\Serilog.1.4.204\lib\net45\Serilog.FullNetFx.dll</HintPath>
+    <Reference Include="Serilog.Sinks.ColoredConsole, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
+      <HintPath>..\packages\Serilog.Sinks.ColoredConsole.2.0.0\lib\net45\Serilog.Sinks.ColoredConsole.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Shouldly, Version=2.4.0.0, Culture=neutral, PublicKeyToken=6042cbcb05cbc941, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -123,6 +125,7 @@
     <Compile Include="ZipBackupDecoratorTests.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="packages.config" />
     <None Include="Performance\large.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>

diff --git a/src/HybridDb.Tests/HybridDbTests.cs b/src/HybridDb.Tests/HybridDbTests.cs
@@ -7,7 +7,6 @@
 using Dapper;
 using HybridDb.Config;
 using HybridDb.Migrations;
-using HybridDb.Serialization;
 using Newtonsoft.Json.Linq;
 using Serilog;
 using Serilog.Events;

diff --git a/src/HybridDb.Tests/app.config b/src/HybridDb.Tests/app.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Serilog" publicKeyToken="24c2f752a8e58a10" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
diff --git a/src/HybridDb.Tests/packages.config b/src/HybridDb.Tests/packages.config
@@ -2,8 +2,9 @@
 <packages>
   <package id="Dapper" version="1.13" targetFramework="net45" />
   <package id="FakeItEasy" version="1.25.2" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
-  <package id="Serilog" version="1.4.204" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
+  <package id="Serilog" version="2.3.0" targetFramework="net45" />
+  <package id="Serilog.Sinks.ColoredConsole" version="2.0.0" targetFramework="net45" />
   <package id="Shouldly" version="2.4.0" targetFramework="net45" />
   <package id="xunit" version="1.9.2" targetFramework="net45" />
   <package id="xunit.extensions" version="1.9.2" targetFramework="net45" />

diff --git a/src/HybridDb/Config/Configuration.cs b/src/HybridDb/Config/Configuration.cs
@@ -5,6 +5,7 @@
 using HybridDb.Migrations;
 using HybridDb.Serialization;
 using Serilog;
+using Serilog.Core;
 
 namespace HybridDb.Config
 {
@@ -17,10 +18,11 @@ internal Configuration()
             Tables = new ConcurrentDictionary<string, Table>();
             DocumentDesigns = new List<DocumentDesign>();
 
-            Logger = new LoggerConfiguration()
-                .MinimumLevel.Debug()
-                .WriteTo.ColoredConsole()
-                .CreateLogger();
+            Logger = Log.Logger;
+            //Logger = new LoggerConfiguration()
+            //    .MinimumLevel.Debug()
+            //    .WriteTo.ColoredConsole()
+            //    .CreateLogger();
 
             Serializer = new DefaultSerializer();
             TypeMapper = new AssemblyQualifiedNameTypeMapper();

diff --git a/src/HybridDb/HybridDb.csproj b/src/HybridDb/HybridDb.csproj
@@ -46,15 +46,13 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Inflector.1.0.0.0\lib\net45\Inflector.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="Serilog">
-      <HintPath>..\packages\Serilog.1.4.204\lib\net45\Serilog.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Serilog.FullNetFx">
-      <HintPath>..\packages\Serilog.1.4.204\lib\net45\Serilog.FullNetFx.dll</HintPath>
+    <Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
+      <HintPath>..\packages\Serilog.2.3.0\lib\net45\Serilog.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />

diff --git a/src/HybridDb/packages.config b/src/HybridDb/packages.config
@@ -2,6 +2,6 @@
 <packages>
   <package id="Dapper" version="1.13" targetFramework="net45" />
   <package id="Inflector" version="1.0.0.0" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
-  <package id="Serilog" version="1.4.204" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
+  <package id="Serilog" version="2.3.0" targetFramework="net45" />
 </packages>
diff --git a/src/packages/Newtonsoft.Json.6.0.8/Newtonsoft.Json.6.0.8.nupkg b/src/packages/Newtonsoft.Json.6.0.8/Newtonsoft.Json.6.0.8.nupkg
diff --git a/src/packages/Newtonsoft.Json.6.0.8/lib/net20/Newtonsoft.Json.dll b/src/packages/Newtonsoft.Json.6.0.8/lib/net20/Newtonsoft.Json.dll
diff --git a/src/packages/Newtonsoft.Json.6.0.8/lib/net35/Newtonsoft.Json.dll b/src/packages/Newtonsoft.Json.6.0.8/lib/net35/Newtonsoft.Json.dll
diff --git a/src/packages/Newtonsoft.Json.6.0.8/lib/net40/Newtonsoft.Json.dll b/src/packages/Newtonsoft.Json.6.0.8/lib/net40/Newtonsoft.Json.dll
diff --git a/src/packages/Newtonsoft.Json.6.0.8/lib/net45/Newtonsoft.Json.dll b/src/packages/Newtonsoft.Json.6.0.8/lib/net45/Newtonsoft.Json.dll
diff --git a/src/packages/Newtonsoft.Json.6.0.8/lib/netcore45/Newtonsoft.Json.dll b/src/packages/Newtonsoft.Json.6.0.8/lib/netcore45/Newtonsoft.Json.dll
diff --git a/...packages/Newtonsoft.Json.6.0.8/lib/portable-net40+sl5+wp80+win8+wpa81/Newtonsoft.Json.dll b/...packages/Newtonsoft.Json.6.0.8/lib/portable-net40+sl5+wp80+win8+wpa81/Newtonsoft.Json.dll