Upgrade GeoIP2 and NUnit

maxmind · Dec 4, 2015 · e6fc059 · e6fc059
1 parent 87e4bf3
commit e6fc059
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 18 deletions.
diff --git 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
@@ -42,8 +42,8 @@
       <HintPath>..\packages\MaxMind.Db.1.2.0\lib\net40\MaxMind.Db.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="MaxMind.GeoIP2, Version=2.3.0.0, Culture=neutral, PublicKeyToken=66afa4cc5ae853ac, processorArchitecture=MSIL">
-      <HintPath>..\packages\MaxMind.GeoIP2.2.4.0\lib\net40\MaxMind.GeoIP2.dll</HintPath>
+    <Reference Include="MaxMind.GeoIP2, Version=2.5.0.0, Culture=neutral, PublicKeyToken=66afa4cc5ae853ac, processorArchitecture=MSIL">
+      <HintPath>..\packages\MaxMind.GeoIP2.2.5.0\lib\net452\MaxMind.GeoIP2.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
@@ -64,8 +64,8 @@
       <HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=3.0.5813.39031, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.0.1\lib\net45\nunit.framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="RichardSzalay.MockHttp, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">

diff --git a/MaxMind.MinFraud.UnitTest/packages.config b/MaxMind.MinFraud.UnitTest/packages.config
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="MaxMind.Db" version="1.2.0" targetFramework="net452" />
-  <package id="MaxMind.GeoIP2" version="2.4.0" targetFramework="net452" />
+  <package id="MaxMind.GeoIP2" version="2.5.0" targetFramework="net452" />
   <package id="Microsoft.Bcl" version="1.1.10" targetFramework="net452" />
   <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net452" />
   <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net452" />
   <package id="Microsoft.Net.Http" version="2.2.29" targetFramework="net452" />
   <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net452" />
-  <package id="NUnit" version="2.6.4" targetFramework="net452" />
+  <package id="NUnit" version="3.0.1" targetFramework="net452" />
   <package id="RichardSzalay.MockHttp" version="1.2.1" targetFramework="net452" />
 </packages>
diff --git a/MaxMind.MinFraud/MaxMind.MinFraud.csproj b/MaxMind.MinFraud/MaxMind.MinFraud.csproj
@@ -47,8 +47,8 @@
       <HintPath>..\packages\MaxMind.Db.1.2.0\lib\net40\MaxMind.Db.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="MaxMind.GeoIP2, Version=2.3.0.0, Culture=neutral, PublicKeyToken=66afa4cc5ae853ac, processorArchitecture=MSIL">
-      <HintPath>..\packages\MaxMind.GeoIP2.2.4.0\lib\net40\MaxMind.GeoIP2.dll</HintPath>
+    <Reference Include="MaxMind.GeoIP2, Version=2.5.0.0, Culture=neutral, PublicKeyToken=66afa4cc5ae853ac, processorArchitecture=MSIL">
+      <HintPath>..\packages\MaxMind.GeoIP2.2.5.0\lib\net452\MaxMind.GeoIP2.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">

diff --git 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")]
+[assembly: AssemblyVersion("0.3.0.0")]
+[assembly: AssemblyFileVersion("0.3.0")]
+[assembly: AssemblyInformationalVersion("0.3.0")]
diff --git 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<string> locales) => base.Locales = locales;
+        internal void SetLocales(IEnumerable<string> locales) => base.Locales = locales;
 
         /// <summary>
         /// Returns a string that represents the current object.

diff --git 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<string> locales)
+        internal new void SetLocales(IEnumerable<string> locales)
         {
-            base.SetLocales(locales);
-            Country.SetLocales(locales);
+            var l = new List<string>(locales);
+            base.SetLocales(l);
+            Country.SetLocales(l);
         }
 
         /// <summary>

diff --git a/MaxMind.MinFraud/packages.config b/MaxMind.MinFraud/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="MaxMind.Db" version="1.2.0" targetFramework="net452" />
-  <package id="MaxMind.GeoIP2" version="2.4.0" targetFramework="net452" />
+  <package id="MaxMind.GeoIP2" version="2.5.0" targetFramework="net452" />
   <package id="Microsoft.Bcl" version="1.1.10" targetFramework="net452" />
   <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net452" />
   <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net452" />

diff --git 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
@@ -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)
 ------------------