Merge pull request #66 from maxmind/greg/core-1.0

Update for .NET Core 1.0
maxmind · Jul 6, 2016 · 66b5e8a · 66b5e8a
2 parents e90113a + 065b025
commit 66b5e8a
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 24 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -40,7 +40,7 @@ before_install:
   - export DOTNET_INSTALL_DIR="$PWD/.dotnetcli"
 
   # Install the latest versio of dotnet CLI
-  - bash ./scripts/install.sh --channel "preview" --version "$CLI_VERSION" --install-dir "$DOTNET_INSTALL_DIR" --no-path
+  - bash ./scripts/install.sh --version "$CLI_VERSION" --install-dir "$DOTNET_INSTALL_DIR" --no-path
 
   # Add dotnet to PATH
   - export PATH="$DOTNET_INSTALL_DIR:$PATH"

diff --git a/GeoIP2.Benchmark/project.json b/GeoIP2.Benchmark/project.json
@@ -28,7 +28,7 @@
       "dependencies": {
         "Microsoft.NETCore.App": {
           "type": "platform",
-          "version": "1.0.0-rc2-3002702"
+          "version": "1.0.0"
         }
       }
     }

diff --git a/GeoIP2.UnitTests/project.json b/GeoIP2.UnitTests/project.json
@@ -35,7 +35,7 @@
       "dependencies": {
         "Microsoft.NETCore.App": {
           "type": "platform",
-          "version": "1.0.0-rc2-3002702"
+          "version": "1.0.0"
         }
       }
     }

diff --git a/GeoIP2/project.json b/GeoIP2/project.json
@@ -30,25 +30,25 @@
     },
     "netstandard1.4": {
       "dependencies": {
-        "Microsoft.CSharp": "4.0.1-rc2-24027",
-        "System.Collections": "4.0.11-rc2-24027",
-        "System.Collections.Concurrent": "4.0.12-rc2-24027",
-        "System.Globalization": "4.0.11-rc2-24027",
-        "System.IO.MemoryMappedFiles": "4.0.0-rc2-24027",
-        "System.Linq": "4.1.0-rc2-24027",
-        "System.Linq.Expressions": "4.0.11-rc2-24027",
-        "System.Net.Http": "4.0.1-rc2-24027",
-        "System.Net.Primitives": "4.0.11-rc2-24027",
-        "System.Net.Requests": "4.0.11-rc2-24027",
-        "System.Reflection": "4.1.0-rc2-24027",
-        "System.Reflection.Extensions": "4.0.1-rc2-24027",
-        "System.Reflection.TypeExtensions": "4.1.0-rc2-24027",
-        "System.Resources.ResourceManager": "4.0.1-rc2-24027",
-        "System.Runtime": "4.1.0-rc2-24027",
-        "System.Runtime.Extensions": "4.1.0-rc2-24027",
-        "System.Runtime.Numerics": "4.0.1-rc2-24027",
-        "System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
-        "System.Threading": "4.0.11-rc2-24027"
+        "Microsoft.CSharp": "4.0.1",
+        "System.Collections": "4.0.11",
+        "System.Collections.Concurrent": "4.0.12",
+        "System.Globalization": "4.0.11",
+        "System.IO.MemoryMappedFiles": "4.0.0",
+        "System.Linq": "4.1.0",
+        "System.Linq.Expressions": "4.1.0",
+        "System.Net.Http": "4.1.0",
+        "System.Net.Primitives": "4.0.11",
+        "System.Net.Requests": "4.0.11",
+        "System.Reflection": "4.1.0",
+        "System.Reflection.Extensions": "4.0.1",
+        "System.Reflection.TypeExtensions": "4.1.0",
+        "System.Resources.ResourceManager": "4.0.1",
+        "System.Runtime": "4.1.0",
+        "System.Runtime.Extensions": "4.1.0",
+        "System.Runtime.Numerics": "4.0.1",
+        "System.Runtime.Serialization.Primitives": "4.1.1",
+        "System.Threading": "4.0.11"
       }
     }
   }

diff --git a/dev-bin/release.sh b/dev-bin/release.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 
-set -e
-set -u
+set -eu -o pipefail
 
 shopt -s extglob