diff --git a/src/EFCore.Jet/EFCore.Jet.csproj b/src/EFCore.Jet/EFCore.Jet.csproj
index 5530d4b..8ee5b37 100644
--- a/src/EFCore.Jet/EFCore.Jet.csproj
+++ b/src/EFCore.Jet/EFCore.Jet.csproj
@@ -1,137 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\build\common.props" />
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{D6966B04-4C38-4925-BCDE-F8655F38D04C}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <RootNamespace>EntityFrameworkCore.Jet</RootNamespace>
     <AssemblyName>EntityFrameworkCore.Jet</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
+    <Platforms>AnyCPU;x86</Platforms>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <LangVersion>latest</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <LangVersion>latest</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <NoWarn>1701;1702;1705;xUnit1004;CS1591;SA1200</NoWarn>
-    <LangVersion>latest</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <LangVersion>latest</LangVersion>
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\..\build\Key.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.EntityFrameworkCore, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.EntityFrameworkCore.2.2.0\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.EntityFrameworkCore.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.EntityFrameworkCore.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.EntityFrameworkCore.Relational, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.EntityFrameworkCore.Relational.2.2.0\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Relational.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.Caching.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.Caching.Memory, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.Caching.Memory.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.Configuration, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.Configuration.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.Configuration.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.Configuration.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.Configuration.Binder, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.Configuration.Binder.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.DependencyInjection, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.DependencyInjection.2.2.0\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.Logging, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.Logging.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.Logging.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.Options, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.Options.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.Primitives, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.Primitives.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
-    </Reference>
-    <Reference Include="Remotion.Linq, Version=2.2.0.0, Culture=neutral, PublicKeyToken=fee00910d6e5f53b, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Remotion.Linq.2.2.0\lib\net45\Remotion.Linq.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Collections.Immutable, Version=1.2.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Collections.Immutable.1.5.0\lib\netstandard2.0\System.Collections.Immutable.dll</HintPath>
-    </Reference>
-    <Reference Include="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.ComponentModel.Annotations.4.5.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
-    </Reference>
-    <Reference Include="System.ComponentModel.Composition" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.Core" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.3.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Diagnostics.DiagnosticSource.4.5.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Interactive.Async, Version=3.2.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Interactive.Async.3.2.0\lib\net46\System.Interactive.Async.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Memory, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Memory.4.5.1\lib\netstandard2.0\System.Memory.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Numerics" />
-    <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Xml" />
-  </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\build\GlobalAssemblyInfo.cs">
       <Link>Properties\GlobalAssemblyInfo.cs</Link>
@@ -154,123 +33,11 @@
     <Compile Include="..\Shared\StringBuilderExtensions.cs">
       <Link>StringBuilderExtensions.cs</Link>
     </Compile>
-    <Compile Include="Design\Internal\JetAnnotationCodeGenerator.cs" />
-    <Compile Include="Design\Internal\JetDesignTimeServices.cs" />
-    <Compile Include="Diagnostics\JetEventId.cs" />
-    <Compile Include="Extensions\JetDatabaseFacadeExtensions.cs" />
-    <Compile Include="Extensions\JetDbContextOptionsExtensions.cs" />
-    <Compile Include="Extensions\JetEntityTypeBuilderExtensions.cs" />
-    <Compile Include="Extensions\JetIndexBuilderExtensions.cs" />
-    <Compile Include="Extensions\JetKeyBuilderExtensions.cs" />
-    <Compile Include="Extensions\JetMetadataExtensions.cs" />
-    <Compile Include="Extensions\JetModelBuilderExtensions.cs" />
-    <Compile Include="Extensions\JetPropertyBuilderExtensions.cs" />
-    <Compile Include="Extensions\JetReferenceOwnershipBuilderExtensions.cs" />
-    <Compile Include="Extensions\JetServiceCollectionExtensions.cs" />
-    <Compile Include="Infrastructure\Internal\IJetOptions.cs" />
-    <Compile Include="Infrastructure\Internal\JetOptionsExtension.cs" />
-    <Compile Include="Infrastructure\JetDbContextOptionsBuilder.cs" />
-    <Compile Include="Internal\JetLoggerExtensions.cs" />
-    <Compile Include="Internal\JetModelValidator.cs" />
-    <Compile Include="Internal\JetOptions.cs" />
-    <Compile Include="Metadata\Conventions\Internal\JetDbFunctionConvention.cs" />
-    <Compile Include="Metadata\Conventions\Internal\JetIndexConvention.cs" />
-    <Compile Include="Metadata\Conventions\Internal\JetMemoryOptimizedTablesConvention.cs" />
-    <Compile Include="Metadata\Conventions\Internal\JetValueGenerationStrategyConvention.cs" />
-    <Compile Include="Metadata\Conventions\Internal\JetValueGeneratorConvention.cs" />
-    <Compile Include="Metadata\Conventions\JetConventionSetBuilder.cs" />
-    <Compile Include="Metadata\IJetEntityTypeAnnotations.cs" />
-    <Compile Include="Metadata\IJetIndexAnnotations.cs" />
-    <Compile Include="Metadata\IJetKeyAnnotations.cs" />
-    <Compile Include="Metadata\IJetModelAnnotations.cs" />
-    <Compile Include="Metadata\IJetPropertyAnnotations.cs" />
-    <Compile Include="Metadata\Internal\JetAnnotationNames.cs" />
-    <Compile Include="Metadata\Internal\JetEntityMaterializerSource.cs" />
-    <Compile Include="Metadata\Internal\JetEntityTypeBuilderAnnotations.cs" />
-    <Compile Include="Metadata\Internal\JetIndexBuilderAnnotations.cs" />
-    <Compile Include="Metadata\Internal\JetInternalMetadataBuilderExtensions.cs" />
-    <Compile Include="Metadata\Internal\JetKeyBuilderAnnotations.cs" />
-    <Compile Include="Metadata\Internal\JetModelBuilderAnnotations.cs" />
-    <Compile Include="Metadata\Internal\JetPropertyBuilderAnnotations.cs" />
-    <Compile Include="Metadata\JetEntityTypeAnnotations.cs" />
-    <Compile Include="Metadata\JetIndexAnnotations.cs" />
-    <Compile Include="Metadata\JetKeyAnnotations.cs" />
-    <Compile Include="Metadata\JetModelAnnotations.cs" />
-    <Compile Include="Metadata\JetPropertyAnnotations.cs" />
-    <Compile Include="Metadata\JetValueGenerationStrategy.cs" />
-    <Compile Include="Migrations\Internal\JetHistoryRepository.cs" />
-    <Compile Include="Migrations\Internal\JetMigrationsAnnotationProvider.cs" />
-    <Compile Include="Migrations\JetMigrationsSqlGenerator.cs" />
-    <Compile Include="Migrations\Operations\JetCreateDatabaseOperation.cs" />
-    <Compile Include="Migrations\Operations\JetDropDatabaseOperation.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\InternalsVisibleTo.cs" />
-    <Compile Include="Properties\JetStrings.Designer1.cs">
+    <Compile Update="Properties\JetStrings.Designer1.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
       <DependentUpon>JetStrings.Designer.tt</DependentUpon>
     </Compile>
-    <Compile Include="Query\Expressions\Internal\IIfSqlFunctionExpression.cs" />
-    <Compile Include="Query\Expressions\Internal\IsNullSqlFunctionExpression.cs" />
-    <Compile Include="Query\Expressions\Internal\NullCheckedConvertSqlFunctionExpression.cs" />
-    <Compile Include="Query\Expressions\Internal\RowNumberExpression.cs" />
-    <Compile Include="Query\ExpressionTranslators\Internal\JetCompositeMemberTranslator.cs" />
-    <Compile Include="Query\ExpressionTranslators\Internal\JetCompositeMethodCallTranslator.cs" />
-    <Compile Include="Query\ExpressionTranslators\Internal\JetContainsOptimizedTranslator.cs" />
-    <Compile Include="Query\ExpressionTranslators\Internal\JetConvertTranslator.cs" />
-    <Compile Include="Query\ExpressionTranslators\Internal\JetDateAddTranslator.cs" />
-    <Compile Include="Query\ExpressionTranslators\Internal\JetDateTimeDateComponentTranslator.cs" />
-    <Compile Include="Query\ExpressionTranslators\Internal\JetDateTimeDatePartComponentTranslator.cs" />
-    <Compile Include="Query\ExpressionTranslators\Internal\JetDateTimeNowTranslator.cs" />
-    <Compile Include="Query\ExpressionTranslators\Internal\JetEndsWithTranslator.cs" />
-    <Compile Include="Query\ExpressionTranslators\Internal\JetMathTranslator.cs" />
-    <Compile Include="Query\ExpressionTranslators\Internal\JetNewGuidTranslator.cs" />
-    <Compile Include="Query\ExpressionTranslators\Internal\JetObjectToStringTranslator.cs" />
-    <Compile Include="Query\ExpressionTranslators\Internal\JetStartsWithTranslator.cs" />
-    <Compile Include="Query\ExpressionTranslators\Internal\JetStringIsNullOrWhiteSpaceTranslator.cs" />
-    <Compile Include="Query\ExpressionTranslators\Internal\JetStringLengthTranslator.cs" />
-    <Compile Include="Query\ExpressionTranslators\Internal\JetStringReplaceTranslator.cs" />
-    <Compile Include="Query\ExpressionTranslators\Internal\JetStringSubstringTranslator.cs" />
-    <Compile Include="Query\ExpressionTranslators\Internal\JetStringToLowerTranslator.cs" />
-    <Compile Include="Query\ExpressionTranslators\Internal\JetStringToUpperTranslator.cs" />
-    <Compile Include="Query\ExpressionTranslators\Internal\JetStringTrimEndTranslator.cs" />
-    <Compile Include="Query\ExpressionTranslators\Internal\JetStringTrimStartTranslator.cs" />
-    <Compile Include="Query\ExpressionTranslators\Internal\JetStringTrimTranslator.cs" />
-    <Compile Include="Query\Internal\JetCompiledQueryCacheKeyGenerator.cs" />
-    <Compile Include="Query\Internal\JetQueryCompilationContext.cs" />
-    <Compile Include="Query\Internal\JetQueryCompilationContextFactory.cs" />
-    <Compile Include="Query\Sql\Internal\IJetExpressionVisitor.cs" />
-    <Compile Include="Query\Sql\Internal\JetQuerySqlGenerator.cs" />
-    <Compile Include="Query\Sql\Internal\JetQuerySqlGeneratorFactory.cs" />
-    <Compile Include="Scaffolding\Internal\JetDatabaseModelFactory.cs" />
-    <Compile Include="Scaffolding\Internal\JetDataReaderExtension.cs" />
-    <Compile Include="Scaffolding\Internal\JetCodeGenerator.cs" />
-    <Compile Include="Storage\Internal\IJetRelationalConnection.cs" />
-    <Compile Include="Storage\Internal\JetBoolTypeMapping.cs" />
-    <Compile Include="Storage\Internal\JetByteArrayTypeMapping.cs" />
-    <Compile Include="Storage\Internal\JetRelationalConnection.cs" />
-    <Compile Include="Storage\Internal\JetDatabaseCreator.cs" />
-    <Compile Include="Storage\Internal\JetDateTimeOffsetTypeMapping.cs" />
-    <Compile Include="Storage\Internal\JetDateTimeTypeMapping.cs" />
-    <Compile Include="Storage\Internal\JetDoubleTypeMapping.cs" />
-    <Compile Include="Storage\Internal\JetFloatTypeMapping.cs" />
-    <Compile Include="Storage\Internal\JetSqlGenerationHelper.cs" />
-    <Compile Include="Storage\Internal\JetStringTypeMapping.cs" />
-    <Compile Include="Storage\Internal\JetTimeSpanTypeMapping.cs" />
-    <Compile Include="Storage\Internal\JetTransientExceptionDetector.cs" />
-    <Compile Include="Storage\Internal\JetTypeMappingSource.cs" />
-    <Compile Include="Update\Internal\IJetUpdateSqlGenerator.cs" />
-    <Compile Include="Update\Internal\JetModificationCommandBatch.cs" />
-    <Compile Include="Update\Internal\JetModificationCommandBatchFactory.cs" />
-    <Compile Include="Update\Internal\JetUpdateSqlGenerator.cs" />
-    <Compile Include="Utilities\EnumerableExtensions.cs" />
-    <Compile Include="ValueGeneration\Internal\IJetSequenceValueGeneratorFactory.cs" />
-    <Compile Include="ValueGeneration\Internal\IJetValueGeneratorCache.cs" />
-    <Compile Include="ValueGeneration\Internal\JetSequenceHiLoValueGenerator.cs" />
-    <Compile Include="ValueGeneration\Internal\JetSequenceValueGeneratorFactory.cs" />
-    <Compile Include="ValueGeneration\Internal\JetSequenceValueGeneratorState.cs" />
-    <Compile Include="ValueGeneration\Internal\JetValueGeneratorCache.cs" />
-    <Compile Include="ValueGeneration\Internal\JetValueGeneratorSelector.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Update="Properties\JetStrings.Designer.tt">
@@ -290,18 +57,12 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Properties\JetStrings.resx">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="2.2.0" />
   </ItemGroup>
   <ItemGroup>
-    <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
+    <ProjectReference Include="..\System.Data.Jet\System.Data.Jet.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\System.Data.Jet\System.Data.Jet.csproj">
-      <Project>{88be8b4f-8da9-42b9-9a1f-839451ba5f8c}</Project>
-      <Name>System.Data.Jet</Name>
-    </ProjectReference>
+    <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/System.Data.Jet/JetProviderFactory.cs b/src/System.Data.Jet/JetProviderFactory.cs
index 50d00a5..62fd808 100644
--- a/src/System.Data.Jet/JetProviderFactory.cs
+++ b/src/System.Data.Jet/JetProviderFactory.cs
@@ -103,18 +103,5 @@ namespace System.Data.Jet
         {
             return new OleDbParameter();
         }
-
-        /// <summary>
-        /// Returns a new instance of the provider's class that implements the provider's version of the <see cref="T:System.Security.CodeAccessPermission" /> class.
-        /// </summary>
-        /// <param name="state">One of the <see cref="T:System.Security.Permissions.PermissionState" /> values.</param>
-        /// <returns>
-        /// A <see cref="T:System.Security.CodeAccessPermission" /> object for the specified <see cref="T:System.Security.Permissions.PermissionState" />.
-        /// </returns>
-        public override System.Security.CodeAccessPermission CreatePermission(System.Security.Permissions.PermissionState state)
-        {
-            return new OleDbPermission(state);
-        }
-
     }
 }
diff --git a/src/System.Data.Jet/System.Data.Jet.csproj b/src/System.Data.Jet/System.Data.Jet.csproj
index 10bd780..5fe270c 100644
--- a/src/System.Data.Jet/System.Data.Jet.csproj
+++ b/src/System.Data.Jet/System.Data.Jet.csproj
@@ -1,107 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\build\common.props" />
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{88BE8B4F-8DA9-42B9-9A1F-839451BA5F8C}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>System.Data.Jet</RootNamespace>
-    <AssemblyName>System.Data.Jet</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <LangVersion>latest</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <LangVersion>latest</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <LangVersion>latest</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <LangVersion>latest</LangVersion>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <Platforms>AnyCPU;x86</Platforms>
   </PropertyGroup>
   <PropertyGroup>
     <SignAssembly>true</SignAssembly>
-  </PropertyGroup>
-  <PropertyGroup>
     <AssemblyOriginatorKeyFile>..\..\build\Key.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Transactions" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\..\build\GlobalAssemblyInfo.cs">
-      <Link>Properties\GlobalAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="AdoxWrapper.cs" />
-    <Compile Include="ConnectionPooling\ConnectionSet.cs" />
-    <Compile Include="ConnectionPooling\ConnectionSetCollection.cs" />
-    <Compile Include="InnerConnectionFactory.cs" />
-    <Compile Include="JetCommand.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="JetConfiguration.cs" />
-    <Compile Include="JetConnection.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="JetDataReader.cs" />
-    <Compile Include="JetParameterHelper.cs" />
-    <Compile Include="JetProviderFactory.cs" />
-    <Compile Include="JetProviderManifest.cs" />
-    <Compile Include="JetStoreSchemaDefinition\JetRenameHandling.cs" />
-    <Compile Include="JetStoreSchemaDefinition\JetStoreDatabaseHandling.cs" />
-    <Compile Include="JetStoreSchemaDefinition\Column.cs" />
-    <Compile Include="JetStoreSchemaDefinition\ColumnCollection.cs" />
-    <Compile Include="JetStoreSchemaDefinition\JetStoreSchemaDefinitionRetrieve.cs" />
-    <Compile Include="JetStoreSchemaDefinition\SystemTable.cs" />
-    <Compile Include="JetStoreSchemaDefinition\SystemTableCollection.cs" />
-    <Compile Include="JetSyntaxHelper.cs" />
-    <Compile Include="JetTransaction.cs" />
-    <Compile Include="LogHelper.cs" />
-    <Compile Include="Messages.cs" />
-    <Compile Include="OleDbColumnFlagEnum.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\Resources.Designer.cs" />
-    <Compile Include="XmlObjectSerializer.cs" />
-  </ItemGroup>
-  <ItemGroup>
+
+<ItemGroup>
     <Content Include="Properties\System.Data.Jet.rd.xml" />
     <Content Include="Resources\JetProviderServices.ProviderManifest.xml" />
     <Content Include="Resources\StoreSchemaDefinition.CheckConstraints.xml" />
@@ -126,11 +35,6 @@
     <Content Include="Resources\StoreSchemaDefinitionRetrieve_QueryHack1.txt" />
     <Content Include="Resources\StoreSchemaDefinitionRetrieve_QueryHack2.txt" />
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Resources\JetProviderServices.StoreSchemaDefinition.ssdl" />
     <EmbeddedResource Include="Resources\JetProviderServices.StoreSchemaMapping.msl" />
@@ -140,5 +44,10 @@
       <Link>Key.snk</Link>
     </None>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageReference Include="System.Data.OleDb" Version="4.7.0" />
+    <PackageReference Include="System.Dynamic.Runtime" Version="4.3.0" />
+  </ItemGroup>
+
 </Project>
\ No newline at end of file