From e6fc05999980210dc3be393ddaa7e58c3f2fdb52 Mon Sep 17 00:00:00 2001 From: Gregory Oschwald Date: Fri, 4 Dec 2015 16:00:00 -0500 Subject: [PATCH] Upgrade GeoIP2 and NUnit --- .travis.yml | 4 ++-- .../MaxMind.MinFraud.UnitTest.csproj | 8 ++++---- MaxMind.MinFraud.UnitTest/packages.config | 4 ++-- MaxMind.MinFraud/MaxMind.MinFraud.csproj | 4 ++-- MaxMind.MinFraud/Properties/AssemblyInfo.cs | 6 +++--- MaxMind.MinFraud/Response/GeoIP2Country.cs | 2 +- MaxMind.MinFraud/Response/IPAddress.cs | 7 ++++--- MaxMind.MinFraud/packages.config | 2 +- appveyor.yml | 4 ++++ releasenotes.md | 6 ++++++ 10 files changed, 29 insertions(+), 18 deletions(-) diff --git a/.travis.yml b/.travis.yml index ba08c9b7..411c100f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,11 +2,11 @@ language: csharp before_install: - nuget restore MaxMind.MinFraud.sln - - nuget install NUnit.Runners -Version 2.6.4 -OutputDirectory testrunner + - nuget install NUnit.Console -Version 3.0.0 script: - xbuild /p:TargetFrameworkVersion="v4.5" - - mono ./testrunner/NUnit.Runners.2.6.4/tools/nunit-console.exe ./MaxMind.MinFraud.UnitTest/bin/Debug/MaxMind.MinFraud.UnitTest.dll + - mono ./NUnit.Console.3.0.0/tools/nunit3-console.exe ./MaxMind.MinFraud.UnitTest/bin/Debug/MaxMind.MinFraud.UnitTest.dll sudo: false diff --git a/MaxMind.MinFraud.UnitTest/MaxMind.MinFraud.UnitTest.csproj b/MaxMind.MinFraud.UnitTest/MaxMind.MinFraud.UnitTest.csproj index ca7d5f01..4d325055 100644 --- a/MaxMind.MinFraud.UnitTest/MaxMind.MinFraud.UnitTest.csproj +++ b/MaxMind.MinFraud.UnitTest/MaxMind.MinFraud.UnitTest.csproj @@ -42,8 +42,8 @@ ..\packages\MaxMind.Db.1.2.0\lib\net40\MaxMind.Db.dll True - - ..\packages\MaxMind.GeoIP2.2.4.0\lib\net40\MaxMind.GeoIP2.dll + + ..\packages\MaxMind.GeoIP2.2.5.0\lib\net452\MaxMind.GeoIP2.dll True @@ -64,8 +64,8 @@ ..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll True - - ..\packages\NUnit.2.6.4\lib\nunit.framework.dll + + ..\packages\NUnit.3.0.1\lib\net45\nunit.framework.dll True diff --git a/MaxMind.MinFraud.UnitTest/packages.config b/MaxMind.MinFraud.UnitTest/packages.config index 8e7ca8f5..044ac081 100644 --- a/MaxMind.MinFraud.UnitTest/packages.config +++ b/MaxMind.MinFraud.UnitTest/packages.config @@ -1,12 +1,12 @@  - + - + \ No newline at end of file diff --git a/MaxMind.MinFraud/MaxMind.MinFraud.csproj b/MaxMind.MinFraud/MaxMind.MinFraud.csproj index 59d39786..97ce9b3c 100644 --- a/MaxMind.MinFraud/MaxMind.MinFraud.csproj +++ b/MaxMind.MinFraud/MaxMind.MinFraud.csproj @@ -47,8 +47,8 @@ ..\packages\MaxMind.Db.1.2.0\lib\net40\MaxMind.Db.dll True - - ..\packages\MaxMind.GeoIP2.2.4.0\lib\net40\MaxMind.GeoIP2.dll + + ..\packages\MaxMind.GeoIP2.2.5.0\lib\net452\MaxMind.GeoIP2.dll True diff --git a/MaxMind.MinFraud/Properties/AssemblyInfo.cs b/MaxMind.MinFraud/Properties/AssemblyInfo.cs index 4210b679..a2b1a380 100644 --- a/MaxMind.MinFraud/Properties/AssemblyInfo.cs +++ b/MaxMind.MinFraud/Properties/AssemblyInfo.cs @@ -37,6 +37,6 @@ // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.2.0.0")] -[assembly: AssemblyFileVersion("0.2.0")] -[assembly: AssemblyInformationalVersion("0.2.0")] \ No newline at end of file +[assembly: AssemblyVersion("0.3.0.0")] +[assembly: AssemblyFileVersion("0.3.0")] +[assembly: AssemblyInformationalVersion("0.3.0")] \ No newline at end of file diff --git a/MaxMind.MinFraud/Response/GeoIP2Country.cs b/MaxMind.MinFraud/Response/GeoIP2Country.cs index ad9ef39e..a4842e76 100644 --- a/MaxMind.MinFraud/Response/GeoIP2Country.cs +++ b/MaxMind.MinFraud/Response/GeoIP2Country.cs @@ -16,7 +16,7 @@ public sealed class GeoIP2Country : Country [JsonProperty("is_high_risk")] public bool? IsHighRisk { get; internal set; } - internal void SetLocales(List locales) => base.Locales = locales; + internal void SetLocales(IEnumerable locales) => base.Locales = locales; /// /// Returns a string that represents the current object. diff --git a/MaxMind.MinFraud/Response/IPAddress.cs b/MaxMind.MinFraud/Response/IPAddress.cs index 784e297a..39a096bc 100644 --- a/MaxMind.MinFraud/Response/IPAddress.cs +++ b/MaxMind.MinFraud/Response/IPAddress.cs @@ -29,10 +29,11 @@ public sealed class IPAddress : InsightsResponse [JsonProperty("risk")] public double? Risk { get; internal set; } - internal new void SetLocales(List locales) + internal new void SetLocales(IEnumerable locales) { - base.SetLocales(locales); - Country.SetLocales(locales); + var l = new List(locales); + base.SetLocales(l); + Country.SetLocales(l); } /// diff --git a/MaxMind.MinFraud/packages.config b/MaxMind.MinFraud/packages.config index 35b5202f..06f4750a 100644 --- a/MaxMind.MinFraud/packages.config +++ b/MaxMind.MinFraud/packages.config @@ -1,7 +1,7 @@  - + diff --git a/appveyor.yml b/appveyor.yml index dc78e5c2..2c8ce73c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,10 +4,14 @@ os: Visual Studio 2015 before_build: - nuget restore -verbosity detailed + - nuget install NUnit.Console -version 3.0.0 install: - set PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;%PATH% +test_script: + - NUnit.Console.3.0.0\tools\nunit3-console.exe ".\MaxMind.MinFraud.UnitTest\bin\Debug\MaxMind.MinFraud.UnitTest.dll" + build: verbosity: minimal diff --git a/releasenotes.md b/releasenotes.md index a198985a..925b5291 100644 --- a/releasenotes.md +++ b/releasenotes.md @@ -1,6 +1,12 @@ Release Notes ============= +0.3.0 (2015-12-04) +------------------ + +* Update `MaxMind.GeoIP2` to 2.5.0. This removes the BCL dependency. +* Upgrade to NUnit 3. + 0.2.0 (2015-09-23) ------------------