diff --git a/Development.props b/Development.props
new file mode 100644
index 0000000..6836ac0
--- /dev/null
+++ b/Development.props
@@ -0,0 +1,26 @@
+<Project>
+  <PropertyGroup>
+    <!--
+      Specify the absolute path to the EntityFrameworkCore base directory,
+      to compile against that version for better development and local
+      debugging support.
+      
+      Rename this file "development.props".
+
+      The EFCore assemblies are being compiled with an AssemblyVersion of
+      "42.42.42.42" by default. To not get any compilation errors
+      for the EFCore.MySql.IntegrationTests project, which uses
+      Microsoft.AspNetCore.Identity.EntityFrameworkCore, which references
+      it's own version of EFCore, you have to make sure, that your local
+      EFCore assemblies are compiled with an AssemblyVersion <= the one
+      referenced by Microsoft.AspNetCore.Identity.EntityFrameworkCore
+      (e.g. "3.1.0.0").
+
+      To achive that, run the following command in your EntityFrameworkCore
+      base directory:
+      
+      dotnet build "/p:AssemblyVersion=3.1.0.0"
+    -->
+    <LocalEFCoreRepository>E:\Sources\EntityFrameworkCore-3.1</LocalEFCoreRepository>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/build/Development.props.sample b/Development.props.sample
similarity index 100%
rename from build/Development.props.sample
rename to Development.props.sample
diff --git a/Directory.Build.props b/Directory.Build.props
index bb6c2a2..2d35a8b 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,38 +1,33 @@
 <Project>
-  <PropertyGroup>
-    <DefaultNetCoreTargetFramework>netcoreapp3.1</DefaultNetCoreTargetFramework>
-    <DefaultNetStandardTargetFramework>netstandard2.0</DefaultNetStandardTargetFramework>
-  </PropertyGroup>
-  
+  <Import Project="Version.props" />
   <Import Project=".\build\Development.props" Condition="Exists('.\build\Development.props')" />
 
   <PropertyGroup>
-    <VersionPrefix>3.1.0</VersionPrefix>
-    <VersionSuffix>alpha</VersionSuffix>
-    
     <Product>EntityFrameworkCore.Jet</Product>
     <Description>Jet (Microsoft Access mdb or accdb files) provider for Entity Framework Core (EFCore)</Description>
     <Authors>Laurents Meyer, Bubi</Authors>
     <Company>Bubi</Company>
-    <Copyright>Copyright © 2017-2020 - Bubi</Copyright>
+    <Copyright>Copyright © 2017-2020 Bubi</Copyright>
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
     <LangVersion>8.0</LangVersion>
     <DebugType>portable</DebugType>
     <IsPackable>False</IsPackable>
-    <PublishRepositoryUrl>True</PublishRepositoryUrl>
-
-    <PackageProjectUrl>https://github.com/bubibubi/EntityFrameworkCore.Jet</PackageProjectUrl>
     <!-- <PackageReleaseNotes>TODO</PackageReleaseNotes> -->
+    <PackageTags>Entity Framework Core Jet;Entity Framework Core Access;Entity Framework Core MS Access;entity-framework-core-jet;entity-framework-core-access;entity-framework-core-msaccess;EF Jet;EF Access;EF MS Access;Data;O/RM;EntityFramework;EntityFrameworkCore;EFCore;Jet;Access;MS Access</PackageTags>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
+    <PackageProjectUrl>https://github.com/bubibubi/EntityFrameworkCore.Jet</PackageProjectUrl>
     <!-- <PackageIconUrl>TODO</PackageIconUrl> -->
     <!-- <PackageIcon>packageIcon.png</PackageIcon> -->
     <!-- <PackageIconFullPath>$(MSBuildThisFileDirectory)packageIcon.png</PackageIconFullPath> -->
-    <PackageTags>Entity Framework Core Jet;Entity Framework Core Access;Entity Framework Core MS Access;entity-framework-core-jet;entity-framework-core-access;entity-framework-core-msaccess;EF Jet;EF Access;EF MS Access;Data;O/RM;EntityFramework;EntityFrameworkCore;EFCore;Jet;Access;MS Access</PackageTags>
-
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/bubibubi/EntityFrameworkCore.Jet.git</RepositoryUrl>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <DefaultNetCoreTargetFramework>netcoreapp3.1</DefaultNetCoreTargetFramework>
+    <DefaultNetStandardTargetFramework>netstandard2.0</DefaultNetStandardTargetFramework>
+  </PropertyGroup>
+
   <ItemGroup>
     <EmbeddedResource Include="**\*.rd.xml" />
     <!-- <None Include="$(PackageIconFullPath)" Pack="true" PackagePath="\"/> -->
diff --git a/Directory.Build.targets b/Directory.Build.targets
index 08f9f2e..46b45a2 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -1,4 +1,3 @@
 <Project>
-    <Import Project="Version.targets" />
     <Import Project="Dependencies.targets" />
 </Project>
\ No newline at end of file
diff --git a/EntityFrameworkCore.Jet.sln b/EntityFrameworkCore.Jet.sln
index 5b6548e..9cb44fd 100644
--- a/EntityFrameworkCore.Jet.sln
+++ b/EntityFrameworkCore.Jet.sln
@@ -30,14 +30,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{B7FF1850-2
 		docs\README.md = docs\README.md
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{DC0C1C50-ED7E-4BC0-B45C-E3115ECCCF76}"
-ProjectSection(SolutionItems) = preProject
-	build\Key.snk = build\Key.snk
-	build\Development.props = build\Development.props
-	build\Development.props.sample = build\Development.props.sample
-	global.json = global.json
-EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "root", "root", "{76210BB4-A506-4838-8BBF-57DA18C8FA03}"
 ProjectSection(SolutionItems) = preProject
 	Directory.Build.props = Directory.Build.props
@@ -45,7 +37,10 @@ ProjectSection(SolutionItems) = preProject
 	Directory.Build.targets = Directory.Build.targets
 	global.json = global.json
 	Dependencies.targets = Dependencies.targets
-	Version.targets = Version.targets
+	Version.props = Version.props
+	Development.props = Development.props
+	Development.props.sample = Development.props.sample
+	Key.snk = Key.snk
 EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EFCore.Jet.Tests", "test\EFCore.Jet.Tests\EFCore.Jet.Tests.csproj", "{770A076B-A448-499C-BB86-A37994C04523}"
diff --git a/build/Key.snk b/Key.snk
similarity index 100%
rename from build/Key.snk
rename to Key.snk
diff --git a/Version.targets b/Version.props
similarity index 99%
rename from Version.targets
rename to Version.props
index 2a87545..a0b5142 100644
--- a/Version.targets
+++ b/Version.props
@@ -38,6 +38,7 @@
     <Error Condition="'$(VersionPrefix)' == ''" Text="The 'VersionPrefix' property needs to be set." />
     <Error Condition="'$(PreReleaseVersionLabel)' == ''" Text="The 'PreReleaseVersionLabel' property needs to be set." />
     <Error Condition="'$(PreReleaseVersionIteration)' == ''" Text="The 'PreReleaseVersionIteration' property needs to be set." />
+
     <!--
     <Message Importance="high" Text="VersionPrefix: $(VersionPrefix)" />
     <Message Importance="high" Text="VersionSuffix: $(VersionSuffix)" />
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 430b7c6..b686cb7 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -77,47 +77,49 @@ jobs:
         echo "dotnetInstallDirectory: $(dotnetInstallDirectory)"
         echo "dotnetPath: $(dotnetPath)"
       displayName: Output Variables
-#    - pwsh: |
-#        try { dotnet --info } catch { echo 'No $(aceArchitecture) .NET SDK installed' }
-#      displayName: .NET Information Before SDK Install
-#    - pwsh: |
-#        [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;
-#        &([scriptblock]::Create((Invoke-WebRequest -UseBasicParsing 'https://dot.net/v1/dotnet-install.ps1'))) -JSonFile global.json -Architecture $(aceArchitecture) -InstallDir '$(dotnetInstallDirectory)' -Verbose
-#      displayName: Install .NET SDK
-#    - pwsh: |
-#        try { dotnet --info } catch { echo 'No $(aceArchitecture) .NET SDK installed' }
-#      displayName: .NET Information After SDK Install
-#    - pwsh: |
-#        $setupFileName = 'AccessDatabaseEngine_$(aceVersion)_$(aceArchitecture).exe'
-#        Invoke-WebRequest '$(aceUrl)' -OutFile $setupFileName
-#        & ".\$setupFileName" $(aceSilentInstallArgument)
-#      displayName: Install Access Database Engine
-#    - pwsh: |
-#        dotnet build --configuration $(buildConfiguration)
-#      displayName: Build Solution
-#    - pwsh: |
-#        $env:EFCoreJet_DefaultConnection = '$(defaultConnection)'
-#        dotnet test .\test\System.Data.Jet.Test -c $(buildConfiguration) --no-build --logger trx --verbosity detailed
-#      displayName: 'Run Tests: System.Data.Jet.Test'
-#      continueOnError: true
-#    - pwsh: |
-#        $env:EFCoreJet_DefaultConnection = '$(defaultConnection)'
-#        dotnet test .\test\EFCore.Jet.FunctionalTests -c $(buildConfiguration) --no-build --logger trx --verbosity detailed
-#      displayName: 'Run Tests: EFCore.Jet.FunctionalTests'
-#      continueOnError: true
-#    - task: PublishTestResults@2
-#      displayName: Publish Test Results
-#      condition: succeededOrFailed()
-#      inputs:
-#        testResultsFormat: VSTest
-#        testResultsFiles: test/**/*.trx
-#        testRunTitle: ACE $(aceVersion) $(aceArchitecture) with $(dataAccessProviderType)
-#        mergeTestResults: true
-#        failTaskOnFailedTests: false
+    - pwsh: |
+        try { dotnet --info } catch { echo 'No $(aceArchitecture) .NET SDK installed' }
+      displayName: .NET Information Before SDK Install
+    - pwsh: |
+        [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;
+        &([scriptblock]::Create((Invoke-WebRequest -UseBasicParsing 'https://dot.net/v1/dotnet-install.ps1'))) -JSonFile global.json -Architecture $(aceArchitecture) -InstallDir '$(dotnetInstallDirectory)' -Verbose
+      displayName: Install .NET SDK
+    - pwsh: |
+        try { dotnet --info } catch { echo 'No $(aceArchitecture) .NET SDK installed' }
+      displayName: .NET Information After SDK Install
+    - pwsh: |
+        $setupFileName = 'AccessDatabaseEngine_$(aceVersion)_$(aceArchitecture).exe'
+        Invoke-WebRequest '$(aceUrl)' -OutFile $setupFileName
+        & ".\$setupFileName" $(aceSilentInstallArgument)
+      displayName: Install Access Database Engine
+    - pwsh: |
+        dotnet build --configuration $(buildConfiguration)
+      displayName: Build Solution
+    - pwsh: |
+        $env:EFCoreJet_DefaultConnection = '$(defaultConnection)'
+        dotnet test .\test\System.Data.Jet.Test -c $(buildConfiguration) --no-build --logger trx --verbosity detailed
+        exit 0
+      displayName: 'Run Tests: System.Data.Jet.Test'
+      continueOnError: true
+    - pwsh: |
+        $env:EFCoreJet_DefaultConnection = '$(defaultConnection)'
+        dotnet test .\test\EFCore.Jet.FunctionalTests -c $(buildConfiguration) --no-build --logger trx --verbosity detailed
+        exit 0
+      displayName: 'Run Tests: EFCore.Jet.FunctionalTests'
+      continueOnError: true
+    - task: PublishTestResults@2
+      displayName: Publish Test Results
+      condition: succeededOrFailed()
+      inputs:
+        testResultsFormat: VSTest
+        testResultsFiles: test/**/*.trx
+        testRunTitle: ACE $(aceVersion) $(aceArchitecture) with $(dataAccessProviderType)
+        mergeTestResults: true
+        failTaskOnFailedTests: false
   - job: NuGet
     dependsOn:
       - BuildAndTest
-    condition: and(ne(variables['isPullRequest'], true), in(dependencies.BuildAndTest.result, 'Succeeded', 'SucceededWithIssues'))
+    condition: and(ne(variables['isPullRequest'], true), eq(dependencies.BuildAndTest.result, 'Succeeded'))
     pool:
       vmImage: 'windows-latest' # must be Windows for PublishSymbols task
     steps:
@@ -128,11 +130,9 @@ jobs:
       - pwsh: dotnet --info
         displayName: .NET Information
       - pwsh: |
-          Set-PsDebug -Trace 1
-          
           $officialBuild = '$(Build.SourceBranch)' -match '^refs/tags/[0-9]+\.[0-9]+\.[0-9]+'
           $wipBuild = '$(Build.SourceBranch)' -match '^refs/heads/.*-wip$'
-          $ciBuildOnly = $wipBuild -or ('$(Build.SourceBranch)' -match '^refs/heads/(?:master|.*-servicing)$') 
+          $ciBuildOnly = $wipBuild -or ('$(Build.SourceBranch)' -match '^refs/heads/(?:master|.*-servicing)$')
           $continuousIntegrationTimestamp = Get-Date -Format yyyyMMddHHmmss
           $buildSha = '$(Build.SourceVersion)'.SubString(0, 7);
           $pack = $officialBuild -or $ciBuildOnly -or $wipBuild
diff --git a/build/.gitignore b/build/.gitignore
deleted file mode 100644
index 1cc820a..0000000
--- a/build/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Development.props
\ No newline at end of file
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 7db6cbf..e7474aa 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>..\..\build\Key.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)..\Key.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
 
diff --git a/src/EFCore.Jet/EFCore.Jet.csproj b/src/EFCore.Jet/EFCore.Jet.csproj
index e418865..c97022f 100644
--- a/src/EFCore.Jet/EFCore.Jet.csproj
+++ b/src/EFCore.Jet/EFCore.Jet.csproj
@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFrameworks>$(DefaultNetStandardTargetFramework);netcoreapp2.1;net461</TargetFrameworks>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <RootNamespace>EntityFrameworkCore.Jet</RootNamespace>
     <AssemblyName>EntityFrameworkCore.Jet</AssemblyName>
     <Platforms>AnyCPU;x86;x64</Platforms>