diff --git a/MaxMind.Db.Benchmark/MaxMind.Db.Benchmark.csproj b/MaxMind.Db.Benchmark/MaxMind.Db.Benchmark.csproj index 242b116..6bd7079 100644 --- a/MaxMind.Db.Benchmark/MaxMind.Db.Benchmark.csproj +++ b/MaxMind.Db.Benchmark/MaxMind.Db.Benchmark.csproj @@ -57,9 +57,9 @@ prompt - + False - ..\packages\Newtonsoft.Json.5.0.8\lib\net40\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.6.0.2\lib\net40\Newtonsoft.Json.dll @@ -99,4 +99,4 @@ --> - + \ No newline at end of file diff --git a/MaxMind.Db.Benchmark/packages.config b/MaxMind.Db.Benchmark/packages.config index b47d3a3..3b9430a 100644 --- a/MaxMind.Db.Benchmark/packages.config +++ b/MaxMind.Db.Benchmark/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/MaxMind.Db.Test/MaxMind.DB.Test.csproj b/MaxMind.Db.Test/MaxMind.DB.Test.csproj index 008371a..a54efde 100644 --- a/MaxMind.Db.Test/MaxMind.DB.Test.csproj +++ b/MaxMind.Db.Test/MaxMind.DB.Test.csproj @@ -33,8 +33,9 @@ 4 - - ..\packages\Newtonsoft.Json.5.0.8\lib\net40\Newtonsoft.Json.dll + + False + ..\packages\Newtonsoft.Json.6.0.2\lib\net40\Newtonsoft.Json.dll False @@ -73,4 +74,4 @@ --> - + \ No newline at end of file diff --git a/MaxMind.Db.Test/packages.config b/MaxMind.Db.Test/packages.config index b252fa0..afbf1cc 100644 --- a/MaxMind.Db.Test/packages.config +++ b/MaxMind.Db.Test/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/MaxMind.Db/MaxMind.Db.csproj b/MaxMind.Db/MaxMind.Db.csproj index 3168e5a..58dc6dd 100644 --- a/MaxMind.Db/MaxMind.Db.csproj +++ b/MaxMind.Db/MaxMind.Db.csproj @@ -72,8 +72,9 @@ prompt - - ..\packages\Newtonsoft.Json.5.0.8\lib\net40\Newtonsoft.Json.dll + + False + ..\packages\Newtonsoft.Json.6.0.2\lib\net40\Newtonsoft.Json.dll diff --git a/MaxMind.Db/Properties/AssemblyInfo.cs b/MaxMind.Db/Properties/AssemblyInfo.cs index 01f60a2..285844d 100644 --- a/MaxMind.Db/Properties/AssemblyInfo.cs +++ b/MaxMind.Db/Properties/AssemblyInfo.cs @@ -32,6 +32,6 @@ // 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("0.2.2")] -[assembly: AssemblyFileVersion("0.2.2")] +[assembly: AssemblyVersion("0.2.3")] +[assembly: AssemblyFileVersion("0.2.3")] [assembly: InternalsVisibleTo("MaxMind.Db.Test")] diff --git a/MaxMind.Db/packages.config b/MaxMind.Db/packages.config index b47d3a3..3b9430a 100644 --- a/MaxMind.Db/packages.config +++ b/MaxMind.Db/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/releasenotes.md b/releasenotes.md index 5102a37..ddf5c1b 100644 --- a/releasenotes.md +++ b/releasenotes.md @@ -1,5 +1,9 @@ # Release Nodes # +## 0.2.3 (2014-04-09) ## + +* The database is now loadable from a `Stream`. + ## 0.2.2 (2013-12-24) ## * Fixed a bug that occurred when using the memory-mode in a multi-threaded