diff --git a/ClosedXML_Examples/ClosedXML_Examples.csproj b/ClosedXML_Examples/ClosedXML_Examples.csproj
index 47defdd..c9c99e8 100644
--- a/ClosedXML_Examples/ClosedXML_Examples.csproj
+++ b/ClosedXML_Examples/ClosedXML_Examples.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0;net40;net461</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net40;net461</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
diff --git a/ClosedXML_Sandbox/ClosedXML_Sandbox.csproj b/ClosedXML_Sandbox/ClosedXML_Sandbox.csproj
index df514a3..9edaef4 100644
--- a/ClosedXML_Sandbox/ClosedXML_Sandbox.csproj
+++ b/ClosedXML_Sandbox/ClosedXML_Sandbox.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp2.0;net40;net461</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net40;net461</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
@@ -17,9 +17,20 @@
     <DefineConstants>$(DefineConstants);_NETFRAMEWORK_;_NET461_</DefineConstants>
   </PropertyGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
+    <PackageReference Include="System.ComponentModel.Annotations" Version="4.4.0" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net40'">
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net461'">
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\ClosedXML\ClosedXML.csproj" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
   </ItemGroup>
 
 </Project>
diff --git a/ClosedXML_Tests/ClosedXML_Tests.csproj b/ClosedXML_Tests/ClosedXML_Tests.csproj
index 3cae8d7..9e7f4bf 100644
--- a/ClosedXML_Tests/ClosedXML_Tests.csproj
+++ b/ClosedXML_Tests/ClosedXML_Tests.csproj
@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
-    <DefineConstants>$(DefineConstants);_NETSTANDARD_;_NETSTANDARD2_0_</DefineConstants>
+    <DefineConstants>$(DefineConstants);_NETSTANDARD_;_netcoreapp2_0_</DefineConstants>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'net40' ">
@@ -29,8 +29,6 @@
     <DefineConstants>$(DefineConstants);_NETFRAMEWORK_;_NET461_</DefineConstants>
   </PropertyGroup>
 
-
-
   <ItemGroup>
     <EmbeddedResource Include="**\*.xlsx" />
     <EmbeddedResource Include="Resource\Images\*.png" />
diff --git a/ClosedXML_Tests/OleDb/OleDbTests.cs b/ClosedXML_Tests/OleDb/OleDbTests.cs
index a687b35..48f1855 100644
--- a/ClosedXML_Tests/OleDb/OleDbTests.cs
+++ b/ClosedXML_Tests/OleDb/OleDbTests.cs
@@ -1,4 +1,5 @@
-using ClosedXML.Excel;
+#if !APPVEYOR && _NETFRAMEWORK_
+using ClosedXML.Excel;
 using NUnit.Framework;
 using System;
 using System.Collections.Generic;
@@ -12,7 +13,6 @@
     [TestFixture]
     public class OleDbTests
     {
-#if !APPVEYOR && _NETFRAMEWORK_
         [Test]
         public void TestOleDbValues()
         {
@@ -77,7 +77,6 @@
                 }
             }
         }
-#endif
 
         private string CreateTestFile()
         {
@@ -144,3 +143,4 @@
         }
     }
 }
+#endif
diff --git a/appveyor.yml b/appveyor.yml
index b79f00a..3330f60 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -8,7 +8,7 @@
   except:
     - gh-pages
 # Build worker image (VM template)
-image: Visual Studio 2017 Preview
+image: Visual Studio 2017
 environment:
   AppVeyor: APPVEYOR
 
@@ -28,7 +28,7 @@
 platform: Any CPU
 
 build:
-  parallel: true                                            # enable MSBuild parallel builds
+  parallel: true               # enable MSBuild parallel builds
   project: ClosedXML.sln       # path to Visual Studio solution or project
   verbosity: minimal
 
@@ -36,7 +36,11 @@
 
 #Restore
 before_build:
-  - cmd: nuget sources add -name OpenXML-MyGet -Source https://dotnet.myget.org/F/open-xml-sdk/api/v3/index.json
+  - ps: if (Test-Path 'C:\Tools\NuGet43') { $nugetDir = 'C:\Tools\NuGet43' } else { $nugetDir = 'C:\Tools\NuGet' }
+  - ps: (New-Object Net.WebClient).DownloadFile('https://dist.nuget.org/win-x86-commandline/v4.3.0/nuget.exe', "$nugetDir\NuGet.exe")
+  - cmd: nuget update -self
+  - cmd: nuget
+#  - cmd: nuget sources add -name OpenXML-MyGet -Source https://dotnet.myget.org/F/open-xml-sdk/api/v3/index.json
   - nuget restore
 
 artifacts: