diff --git a/.travis.yml b/.travis.yml
index 1652f7d..76d1cd3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ matrix:
       dist: trusty
       sudo: required
       mono: none
-      dotnet: 1.0.4
+      dotnet: 2.1.4
 
 env:
   global:
diff --git a/Directory.Build.props b/Directory.Build.props
index 5955897..9d40b1b 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <PropertyGroup>
     <VersionPrefix>0.11.0</VersionPrefix>
-    <VersionSuffix></VersionSuffix>
     <Authors>The OpenTracing Authors</Authors>
     <PackageIconUrl>https://avatars0.githubusercontent.com/u/15482765</PackageIconUrl>
     <PackageProjectUrl>https://github.com/opentracing/opentracing-csharp</PackageProjectUrl>
@@ -11,6 +10,11 @@
 
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <DebugType>portable</DebugType>
+
+    <!-- There's currently a pack-warning because of the long "Description" tag. However, "Summary" is no longer supported.
+    This will be fixed in an upcoming version of nuget. The workaround for now is to just disable analysis.
+    https://github.com/NuGet/Home/issues/4587#issuecomment-288913324 -->
+    <NoPackageAnalysis>true</NoPackageAnalysis>
   </PropertyGroup>
 
   <!-- Create XML documentation for libraries -->
diff --git a/build-definition.ps1 b/build-definition.ps1
index 5b0f5f1..b72a8f9 100644
--- a/build-definition.ps1
+++ b/build-definition.ps1
@@ -24,7 +24,7 @@ Properties {
 
 FormatTaskName ("`n" + ("-"*25) + "[{0}]" + ("-"*25) + "`n")
 
-Task Default -depends init, clean, dotnet-install, dotnet-restore, dotnet-build, dotnet-test, dotnet-pack
+Task Default -depends init, clean, dotnet-install, dotnet-build, dotnet-test, dotnet-pack
 
 Task init {
 
@@ -66,13 +66,6 @@ Task dotnet-install {
     }
 }
 
-Task dotnet-restore {
-
-    # If VersionSuffix isn't supplied here, dotnet pack will use wrong version numbers
-    # for dependant packages: https://github.com/NuGet/Home/issues/4337
-    exec { dotnet restore -v Minimal /p:VersionSuffix=$BuildNumber }
-}
-
 Task dotnet-build {
 
     # --no-incremental to ensure that CI builds always result in a clean build
@@ -122,8 +115,6 @@ Task dotnet-pack {
         Write-Host "Packaging $library to $libraryOutput"
         Write-Host ""
 
-        $versionSuffixArg = if ([String]::IsNullOrWhiteSpace($BuildNumber)) { "" } else { "--version-suffix $BuildNumber" }
-
-        exec { dotnet pack $library -c $BuildConfiguration $versionSuffixArg --no-build --include-source --include-symbols -o $libraryOutput }
+        exec { dotnet pack $library -c $BuildConfiguration --version-suffix $BuildNumber --no-build --include-source --include-symbols -o $libraryOutput }
     }
 }
\ No newline at end of file
diff --git a/build.sh b/build.sh
index fdb7032..419a339 100755
--- a/build.sh
+++ b/build.sh
@@ -10,18 +10,12 @@ CONFIGURATION="Release"
 # validations
 
 if ! [ -x "$(command -v dotnet)" ]; then
-    echo "dotnet cli is not installed."
+    echo ".NET Core SDK is not installed."
     exit 1
 fi
 
 # tasks
 
-echo
-echo dotnet-restore
-echo ----------------------
-
-dotnet restore
-
 echo
 echo dotnet-build
 echo ----------------------
@@ -32,4 +26,6 @@ echo
 echo dotnet-test
 echo ----------------------
 
-dotnet test test/OpenTracing.Tests/OpenTracing.Tests.csproj -c $CONFIGURATION --no-build
\ No newline at end of file
+for d in test/*/*.csproj; do
+    dotnet test $d -c $CONFIGURATION --no-build
+done
\ No newline at end of file
diff --git a/global.json b/global.json
new file mode 100644
index 0000000..00b3f36
--- /dev/null
+++ b/global.json
@@ -0,0 +1,5 @@
+{
+  "sdk": {
+    "version": "2.1.4"
+  }
+}
\ No newline at end of file
diff --git a/src/OpenTracing/OpenTracing.csproj b/src/OpenTracing/OpenTracing.csproj
index c86d943..0f4d3fd 100644
--- a/src/OpenTracing/OpenTracing.csproj
+++ b/src/OpenTracing/OpenTracing.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.0</TargetFramework>
+    <TargetFrameworks>netstandard1.0</TargetFrameworks>
     <Description>This library is a .NET implementation of the OpenTracing API. To fully understand this platform API, it's helpful to be familiar with the OpenTracing project and terminology more generally.
 
 For the time being, mild backwards-incompatible changes may be made without changing the major version number. As OpenTracing and opentracing-csharp mature, backwards compatibility will become more of a priority.</Description>
@@ -11,4 +11,8 @@ For the time being, mild backwards-incompatible changes may be made without chan
     <NoWarn>1591</NoWarn>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(OS)'=='Windows_NT'">
+    <TargetFrameworks>$(TargetFrameworks);net45</TargetFrameworks>
+  </PropertyGroup>
+
 </Project>
diff --git a/test/OpenTracing.Tests/OpenTracing.Tests.csproj b/test/OpenTracing.Tests/OpenTracing.Tests.csproj
index 887807e..a3dba6e 100644
--- a/test/OpenTracing.Tests/OpenTracing.Tests.csproj
+++ b/test/OpenTracing.Tests/OpenTracing.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>