Christopher Jolly 2 years ago
commit 6f31403f13

1
.gitignore vendored

@ -164,5 +164,6 @@ $RECYCLE.BIN/
/msbuild/Compile /msbuild/Compile
/msbuild/Output /msbuild/Output
/.vs/EntityFrameworkCore.Jet /.vs/EntityFrameworkCore.Jet
/.dotnet*/
.idea .idea
Development.props Development.props

@ -1,6 +1,5 @@
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<DotnetRuntimeVersion>8.0.100-rc.1.23455.8</DotnetRuntimeVersion>
<EFCoreVersion>[8.0.0-rc.1.23419.6, 9.0.0)</EFCoreVersion> <EFCoreVersion>[8.0.0-rc.1.23419.6, 9.0.0)</EFCoreVersion>
</PropertyGroup> </PropertyGroup>
@ -8,79 +7,46 @@
<!-- Common --> <!-- Common -->
<PackageReference Update="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0-rc.1.23419.4" /> <PackageReference Update="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0-rc.1.23419.4" />
<PackageReference Update="Microsoft.Extensions.Configuration.Json" Version="8.0.0-rc.1.23419.4" /> <PackageReference Update="Microsoft.Extensions.Configuration.Json" Version="8.0.0-rc.1.23419.4" />
<PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="6.0.0" /> <PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="8.0.0-rc.1.23419.4" />
<PackageReference Update="Microsoft.EntityFrameworkCore" Version="$(EFCoreVersion)" /> <PackageReference Update="Microsoft.EntityFrameworkCore" Version="$(EFCoreVersion)" />
<PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="$(EFCoreVersion)" /> <PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="$(EFCoreVersion)" />
<PackageReference Update="System.Diagnostics.DiagnosticSource" Version="8.0.0-rc.1.23419.4" /> <PackageReference Update="System.Diagnostics.DiagnosticSource" Version="8.0.0-rc.1.23419.4" />
<PackageReference Update="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0" />
<PackageReference Update="DotNetAnalyzers.DocumentationAnalyzers" Version="1.0.0-beta.59" /> <PackageReference Update="DotNetAnalyzers.DocumentationAnalyzers" Version="1.0.0-beta.59" />
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" /> <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
<!-- EFCore.Jet --> <!-- EFCore.Jet -->
<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="5.0.1" /> <PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="8.0.0-rc.1.23419.4" />
<PackageReference Update="Microsoft.Extensions.Configuration" Version="6.0.0" /> <PackageReference Update="Microsoft.Extensions.Configuration" Version="8.0.0-rc.1.23419.4" />
<PackageReference Update="Microsoft.Extensions.Logging" Version="8.0.0-rc.1.23419.4" /> <PackageReference Update="Microsoft.Extensions.Logging" Version="8.0.0-rc.1.23419.4" />
<PackageReference Update="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" /> <PackageReference Update="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0-rc.1.23419.4" />
<PackageReference Update="Microsoft.Bcl.HashCode" Version="1.1.1" /> <PackageReference Update="Microsoft.Bcl.HashCode" Version="1.1.1" />
<PackageReference Update="System.Collections.Immutable" Version="6.0.0" /> <PackageReference Update="System.Collections.Immutable" Version="8.0.0-rc.1.23419.4" />
<PackageReference Update="System.ComponentModel.Annotations" Version="6.0.0" />
<!--<PackageReference Update="Microsoft.EntityFrameworkCore" Version="$(MicrosoftEntityFrameworkCoreVersion)" />-->
<!--<PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="$(MicrosoftEntityFrameworkCoreRelationalVersion)" />-->
<!--<PackageReference Update="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionsConfigurationJsonVersion)" />-->
<!--<PackageReference Update="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionsConfigurationEnvironmentVariablesVersion)" />-->
<!--<PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="$(MicrosoftExtensionsCachingMemoryVersion)" />-->
<!--<PackageReference Update="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourceVersion)" />-->
<!-- Tests --> <!-- Tests -->
<PackageReference Update="System.Data.Odbc" Version="8.0.0-rc.1.23419.4" /> <PackageReference Update="System.Data.Odbc" Version="8.0.0-rc.1.23419.4" />
<PackageReference Update="System.Data.OleDb" Version="8.0.0-rc.1.23419.4" /> <PackageReference Update="System.Data.OleDb" Version="8.0.0-rc.1.23419.4" />
<PackageReference Update="Microsoft.EntityFrameworkCore.Design" Version="$(EFCoreVersion)" /> <PackageReference Update="Microsoft.EntityFrameworkCore.Design" Version="$(EFCoreVersion)" />
<PackageReference Update="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="$(EFCoreVersion)" /> <PackageReference Update="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="$(EFCoreVersion)" />
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.8.0-preview-23424-02" /> <PackageReference Update="Microsoft.Extensions.Logging.Console" Version="8.0.0-rc.1.23419.4" />
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.7.2" />
<PackageReference Update="MSTest.TestAdapter" Version="3.1.1" /> <PackageReference Update="MSTest.TestAdapter" Version="3.1.1" />
<PackageReference Update="MSTest.TestFramework" Version="3.1.1" /> <PackageReference Update="MSTest.TestFramework" Version="3.1.1" />
<PackageReference Update="coverlet.collector" Version="6.0.0" /> <PackageReference Update="coverlet.collector" Version="6.0.0" />
<PackageReference Update="Newtonsoft.Json" Version="13.0.3" /> <PackageReference Update="Newtonsoft.Json" Version="13.0.3" />
<!-- EntityFrameworkCore.Jet.Data.Tests -->
<!--<PackageReference Update="System.Data.Odbc" Version="$(SystemDataOdbcVersion)" />-->
<!--<PackageReference Update="System.Data.OleDb" Version="$(SystemDataOleDbVersion)" />-->
<!--<PackageReference Update="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNetTestSdk)" />-->
<!--<PackageReference Update="MSTest.TestAdapter" Version="$(MSTestTestAdapter)" />-->
<!--<PackageReference Update="MSTest.TestFramework" Version="$(MSTestTestFramework)" />-->
<!--<PackageReference Update="coverlet.collector" Version="$(CoverletCollector)" />-->
<!-- EFCore.Jet.FunctionalTests --> <!-- EFCore.Jet.FunctionalTests -->
<PackageReference Update="xunit.core" Version="2.4.2" /> <PackageReference Update="xunit.core" Version="2.4.2" />
<PackageReference Update="xunit.assert" Version="2.4.2" /> <PackageReference Update="xunit.assert" Version="2.4.2" />
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.5" /> <PackageReference Update="xunit.runner.visualstudio" Version="2.4.5" />
<PackageReference Update="xunit.runner.console" Version="2.4.2" /> <PackageReference Update="xunit.runner.console" Version="2.4.2" />
<PackageReference Update="Microsoft.Extensions.Configuration.FileExtensions" Version="8.0.0-rc.1.23419.4" /> <PackageReference Update="Microsoft.Extensions.Configuration.FileExtensions" Version="8.0.0-rc.1.23419.4" />
<!--<PackageReference Update="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionsConfigurationEnvironmentVariablesVersion)" />--> <PackageReference Update="NetTopologySuite" Version="2.5.0" />
<!--<PackageReference Update="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionsConfigurationJsonVersion)" />-->
<!--<PackageReference Update="System.Data.Odbc" Version="$(SystemDataOdbcVersion)" />-->
<!--<PackageReference Update="System.Data.OleDb" Version="$(SystemDataOleDbVersion)" />-->
<PackageReference Update="NetTopologySuite" Version="2.2.0" />
<PackageReference Update="System.ComponentModel.TypeConverter" Version="4.3.0" /> <PackageReference Update="System.ComponentModel.TypeConverter" Version="4.3.0" />
<PackageReference Update="Castle.Core" Version="4.4.1" /> <PackageReference Update="Castle.Core" Version="5.1.1" />
<!--<PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="$(MicrosoftExtensionsCachingMemoryVersion)" />-->
<!-- EFCore.Jet.IntegrationTests -->
<!--<PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="$(MicrosoftEntityFrameworkCoreRelationalVersion)" />-->
<!--<PackageReference Update="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourceVersion)" />-->
<!--<PackageReference Update="System.Data.Odbc" Version="$(SystemDataOdbcVersion)" />-->
<!--<PackageReference Update="System.Data.OleDb" Version="$(SystemDataOleDbVersion)" />-->
<!--<PackageReference Update="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNetTestSdk)" />-->
<!--<PackageReference Update="MSTest.TestAdapter" Version="$(MSTestTestAdapter)" />-->
<!--<PackageReference Update="MSTest.TestFramework" Version="$(MSTestTestFramework)" />-->
<!--<PackageReference Update="coverlet.collector" Version="$(CoverletCollector)" />-->
<!-- EFCore.Jet.Tests --> <!-- EFCore.Jet.Tests -->
<PackageReference Update="Microsoft.CodeAnalysis.CSharp" Version="4.7.0" /> <PackageReference Update="Microsoft.CodeAnalysis.CSharp" Version="4.7.0" />
<PackageReference Update="Microsoft.Extensions.DependencyModel" Version="8.0.0-rc.1.23419.4" /> <PackageReference Update="Microsoft.Extensions.DependencyModel" Version="8.0.0-rc.1.23419.4" />
<PackageReference Update="Moq" Version="4.20.69" /> <PackageReference Update="Moq" Version="4.20.69" />
<!--<PackageReference Update="Microsoft.EntityFrameworkCore.Design" Version="$(MicrosoftEntityFrameworkCoreDesignVersion)" />-->
<!--<PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="$(MicrosoftEntityFrameworkCoreRelationalVersion)" />-->
<!--<PackageReference Update="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="$(MicrosoftEntityFrameworkCoreRelationalSpecificationTestsVersion)" />-->
</ItemGroup> </ItemGroup>
</Project> </Project>

@ -14,12 +14,12 @@
it's own version of EFCore, you have to make sure, that your local it's own version of EFCore, you have to make sure, that your local
EFCore assemblies are compiled with an AssemblyVersion <= the one EFCore assemblies are compiled with an AssemblyVersion <= the one
referenced by Microsoft.AspNetCore.Identity.EntityFrameworkCore referenced by Microsoft.AspNetCore.Identity.EntityFrameworkCore
(e.g. "3.1.0.0"). (e.g. "8.0.0.0").
To achive that, run the following command in your EntityFrameworkCore To achive that, run the following command in your EntityFrameworkCore
base directory: base directory:
dotnet build "/p:AssemblyVersion=3.1.0.0" dotnet build "/p:AssemblyVersion=8.0.0.0"
--> -->
<LocalEFCoreRepository>C:\Repositories\EntityFrameworkCore</LocalEFCoreRepository> <LocalEFCoreRepository>C:\Repositories\EntityFrameworkCore</LocalEFCoreRepository>
</PropertyGroup> </PropertyGroup>

@ -4,7 +4,7 @@
<PropertyGroup> <PropertyGroup>
<Product>EntityFrameworkCore.Jet</Product> <Product>EntityFrameworkCore.Jet</Product>
<Authors>Laurents Meyer, Bubi</Authors> <Authors>Christopher Jolly, Laurents Meyer, Bubi</Authors>
<Company>Bubi</Company> <Company>Bubi</Company>
<Copyright>Copyright © 2017-$([System.DateTime]::Now.Year) Bubi</Copyright> <Copyright>Copyright © 2017-$([System.DateTime]::Now.Year) Bubi</Copyright>
<TreatWarningsAsErrors>True</TreatWarningsAsErrors> <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
@ -19,14 +19,15 @@
<!-- <PackageIcon>packageIcon.png</PackageIcon> --> <!-- <PackageIcon>packageIcon.png</PackageIcon> -->
<!-- <PackageIconFullPath>$(MSBuildThisFileDirectory)packageIcon.png</PackageIconFullPath> --> <!-- <PackageIconFullPath>$(MSBuildThisFileDirectory)packageIcon.png</PackageIconFullPath> -->
<RepositoryType>git</RepositoryType> <RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/bubibubi/EntityFrameworkCore.Jet.git</RepositoryUrl> <RepositoryUrl>https://github.com/bubibubi/EntityFrameworkCore.Jet</RepositoryUrl>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<DefaultNetCoreTargetFramework>net6.0</DefaultNetCoreTargetFramework> <EfCoreTargetFramework>net8.0</EfCoreTargetFramework>
<WindowsOnlyNetCoreTargetFramework>net6.0-windows</WindowsOnlyNetCoreTargetFramework> <EfCoreTestTargetFramework>$(EfCoreTargetFramework)</EfCoreTestTargetFramework>
<DefaultNetCoreLegacyTargetFramework>netcoreapp6.0</DefaultNetCoreLegacyTargetFramework> <JetTargetFramework>$(EfCoreTargetFramework)</JetTargetFramework>
<DefaultNetStandardTargetFramework>netstandard2.1</DefaultNetStandardTargetFramework> <JetTestTargetFramework>$(JetTargetFramework)</JetTestTargetFramework>
<JetTestWindowsOnlyTargetFramework>$(JetTestTargetFramework)-windows7.0</JetTestWindowsOnlyTargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

@ -32,7 +32,6 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "root", "root", "{76210BB4-A506-4838-8BBF-57DA18C8FA03}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "root", "root", "{76210BB4-A506-4838-8BBF-57DA18C8FA03}"
ProjectSection(SolutionItems) = preProject ProjectSection(SolutionItems) = preProject
Dependencies.targets = Dependencies.targets Dependencies.targets = Dependencies.targets
Development.props = Development.props
Development.props.sample = Development.props.sample Development.props.sample = Development.props.sample
Directory.Build.props = Directory.Build.props Directory.Build.props = Directory.Build.props
Directory.Build.targets = Directory.Build.targets Directory.Build.targets = Directory.Build.targets
@ -41,6 +40,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "root", "root", "{76210BB4-A
NuGet.Config = NuGet.Config NuGet.Config = NuGet.Config
docs\README.md = docs\README.md docs\README.md = docs\README.md
Version.props = Version.props Version.props = Version.props
.gitignore = .gitignore
EndProjectSection EndProjectSection
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Jet.Tests", "test\EFCore.Jet.Tests\EFCore.Jet.Tests.csproj", "{770A076B-A448-499C-BB86-A37994C04523}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Jet.Tests", "test\EFCore.Jet.Tests\EFCore.Jet.Tests.csproj", "{770A076B-A448-499C-BB86-A37994C04523}"

@ -2,6 +2,6 @@
<configuration> <configuration>
<packageSources> <packageSources>
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" /> <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
<add key="dotnet-core (nightly)" value="https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet5/nuget/v3/index.json" /> <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
</packageSources> </packageSources>
</configuration> </configuration>

@ -1,49 +1,52 @@
<Project> <Project>
<PropertyGroup Label="Version settings"> <PropertyGroup Label="Version settings">
<!-- <!--
Use the following values for the different release types: Use the following values for the different release types:
- "alpha" - "alpha"
- "beta" - "beta"
- "rc" - "rc"
- "rtm" - "rtm"
- "servicing" - "servicing"
-->
<VersionPrefix>8.0.0</VersionPrefix>
<PreReleaseVersionLabel>alpha</PreReleaseVersionLabel>
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
<!-- Bump-up to the next iteration immediately after a release, so that subsequent daily builds are named
The following properties will automatically be set by CI builds when appropriate: correctly.
OfficialVersion -->
ContinuousIntegrationTimestamp <VersionPrefix>8.0.0</VersionPrefix>
BuildSha <PreReleaseVersionLabel>alpha</PreReleaseVersionLabel>
--> <PreReleaseVersionIteration>2</PreReleaseVersionIteration>
</PropertyGroup>
<!-- <!--
If no version or version suffix or official version has been explicitly set, we generate a version suffix in the following format: The following properties will automatically be set by CI builds when appropriate:
alpha.1.ci.20201004T181121Z+sha.0a1b2c3 OfficialVersion
--> ContinuousIntegrationTimestamp
<PropertyGroup> BuildSha
<UseVersionOverride Condition="'$(Version)' != ''">true</UseVersionOverride> -->
<UseVersionSuffixOverride Condition="'$(VersionSuffix)' != ''">true</UseVersionSuffixOverride> </PropertyGroup>
</PropertyGroup>
<PropertyGroup Label="Version Suffix Handling" Condition="'$(UseVersionOverride)' != 'true' And '$(UseVersionSuffixOverride)' != 'true' And ('$(OfficialVersion)' == '' Or $(OfficialVersion.Contains('-')))"> <!--
<VersionSuffix>$(PreReleaseVersionLabel).$(PreReleaseVersionIteration)</VersionSuffix> If no version or version suffix or official version has been explicitly set, we generate a version suffix in the following format:
<VersionSuffix Condition="'$(ContinuousIntegrationTimestamp)' != ''">$(VersionSuffix).ci.$(ContinuousIntegrationTimestamp)</VersionSuffix> alpha.1.ci.20201004T181121Z+sha.0a1b2c3
<VersionSuffix Condition="'$(BuildSha)' != ''">$(VersionSuffix)+sha.$(BuildSha)</VersionSuffix> -->
</PropertyGroup> <PropertyGroup>
<UseVersionOverride Condition="'$(Version)' != ''">true</UseVersionOverride>
<UseVersionSuffixOverride Condition="'$(VersionSuffix)' != ''">true</UseVersionSuffixOverride>
</PropertyGroup>
<Target Name="EnsureVersionParameters" BeforeTargets="CoreBuild" Condition="'$(UseVersionOverride)' != 'true' And '$(UseVersionSuffixOverride)' != 'true'"> <PropertyGroup Label="Version Suffix Handling" Condition="'$(UseVersionOverride)' != 'true' And '$(UseVersionSuffixOverride)' != 'true' And ('$(OfficialVersion)' == '' Or $(OfficialVersion.Contains('-')))">
<Error Condition="'$(VersionPrefix)' == ''" Text="The 'VersionPrefix' property needs to be set." /> <VersionSuffix>$(PreReleaseVersionLabel).$(PreReleaseVersionIteration)</VersionSuffix>
<Error Condition="'$(PreReleaseVersionLabel)' == ''" Text="The 'PreReleaseVersionLabel' property needs to be set." /> <VersionSuffix Condition="'$(ContinuousIntegrationTimestamp)' != ''">$(VersionSuffix).ci.$(ContinuousIntegrationTimestamp)</VersionSuffix>
<Error Condition="'$(PreReleaseVersionIteration)' == ''" Text="The 'PreReleaseVersionIteration' property needs to be set." /> <VersionSuffix Condition="'$(BuildSha)' != ''">$(VersionSuffix)+sha.$(BuildSha)</VersionSuffix>
<Error Condition="'$(OfficialVersion)' != '' And '$(OfficialVersion)' != '$(VersionPrefix)' And '$(OfficialVersion)' != '$(VersionPrefix)-$(VersionSuffix)'" Text="The 'OfficialVersion' property needs to be identical to the 'VersionPrefix' property or to a combination of the 'VersionPrefix' and the 'VersionSuffix' properties." /> </PropertyGroup>
<!--
<Message Importance="high" Text="VersionPrefix: $(VersionPrefix)" /> <Target Name="EnsureVersionParameters" BeforeTargets="CoreBuild" Condition="'$(UseVersionOverride)' != 'true' And '$(UseVersionSuffixOverride)' != 'true'">
<Message Importance="high" Text="VersionSuffix: $(VersionSuffix)" /> <Error Condition="'$(VersionPrefix)' == ''" Text="The 'VersionPrefix' property needs to be set."/>
<Message Importance="high" Text="Version: $(Version)" /> <Error Condition="'$(PreReleaseVersionLabel)' == ''" Text="The 'PreReleaseVersionLabel' property needs to be set."/>
--> <Error Condition="'$(PreReleaseVersionIteration)' == ''" Text="The 'PreReleaseVersionIteration' property needs to be set."/>
</Target> <Error Condition="'$(OfficialVersion)' != '' And '$(OfficialVersion)' != '$(VersionPrefix)' And '$(OfficialVersion)' != '$(VersionPrefix)-$(VersionSuffix)'" Text="The 'OfficialVersion' property needs to be identical to the 'VersionPrefix' property or to a combination of the 'VersionPrefix' and the 'VersionSuffix' properties."/>
<!--
<Message Importance="high" Text="VersionPrefix: $(VersionPrefix)" />
<Message Importance="high" Text="VersionSuffix: $(VersionSuffix)" />
<Message Importance="high" Text="Version: $(Version)" />
-->
</Target>
</Project> </Project>

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<Description>Jet/ACE data provider for .NET used by EntityFramworkCore.Jet (Microsoft Access MDB/ACCDB files).</Description> <Description>Jet/ACE data provider for .NET used by EntityFramworkCore.Jet (Microsoft Access MDB/ACCDB files).</Description>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>$(JetTargetFramework)</TargetFramework>
<Platforms>AnyCPU;x86;x64</Platforms> <Platforms>AnyCPU;x86;x64</Platforms>
<AssemblyName>EntityFrameworkCore.Jet.Data</AssemblyName> <AssemblyName>EntityFrameworkCore.Jet.Data</AssemblyName>
<RootNamespace>EntityFrameworkCore.Jet.Data</RootNamespace> <RootNamespace>EntityFrameworkCore.Jet.Data</RootNamespace>

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<Description>Explicit ODBC support for Jet/ACE database provider for Entity Framework Core (Microsoft Access MDB/ACCDB files).</Description> <Description>Explicit ODBC support for Jet/ACE database provider for Entity Framework Core (Microsoft Access MDB/ACCDB files).</Description>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>$(JetTargetFramework)</TargetFramework>
<AssemblyName>EntityFrameworkCore.Jet.Odbc</AssemblyName> <AssemblyName>EntityFrameworkCore.Jet.Odbc</AssemblyName>
<RootNamespace>EntityFrameworkCore.Jet</RootNamespace> <RootNamespace>EntityFrameworkCore.Jet</RootNamespace>
<PackageTags>$(PackageTags);ODBC;System.Data.Odbc</PackageTags> <PackageTags>$(PackageTags);ODBC;System.Data.Odbc</PackageTags>
@ -18,15 +18,15 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="System.Data.Odbc" Version="8.0.0-rc.1.23419.4" /> <PackageReference Include="System.Data.Odbc" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(LocalEFCoreRepository)' != ''"> <ItemGroup Condition="'$(LocalEFCoreRepository)' != ''">
<Reference Include="Microsoft.EntityFrameworkCore"> <Reference Include="Microsoft.EntityFrameworkCore">
<HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(DefaultNetStandardTargetFramework)\Microsoft.EntityFrameworkCore.dll</HintPath> <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(EfCoreTargetFramework)\Microsoft.EntityFrameworkCore.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.EntityFrameworkCore.Abstractions"> <Reference Include="Microsoft.EntityFrameworkCore.Abstractions">
<HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(DefaultNetStandardTargetFramework)\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath> <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(EfCoreTargetFramework)\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
</Reference> </Reference>
</ItemGroup> </ItemGroup>

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<Description>Explicit OLE DB support for Jet/ACE database provider for Entity Framework Core (Microsoft Access MDB/ACCDB files).</Description> <Description>Explicit OLE DB support for Jet/ACE database provider for Entity Framework Core (Microsoft Access MDB/ACCDB files).</Description>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>$(JetTargetFramework)</TargetFramework>
<AssemblyName>EntityFrameworkCore.Jet.OleDb</AssemblyName> <AssemblyName>EntityFrameworkCore.Jet.OleDb</AssemblyName>
<RootNamespace>EntityFrameworkCore.Jet</RootNamespace> <RootNamespace>EntityFrameworkCore.Jet</RootNamespace>
<PackageTags>$(PackageTags);OLE DB;OLEDB;System.Data.OleDb</PackageTags> <PackageTags>$(PackageTags);OLE DB;OLEDB;System.Data.OleDb</PackageTags>
@ -18,15 +18,15 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="System.Data.OleDb" Version="8.0.0-rc.1.23419.4" /> <PackageReference Include="System.Data.OleDb" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(LocalEFCoreRepository)' != ''"> <ItemGroup Condition="'$(LocalEFCoreRepository)' != ''">
<Reference Include="Microsoft.EntityFrameworkCore"> <Reference Include="Microsoft.EntityFrameworkCore">
<HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(DefaultNetStandardTargetFramework)\Microsoft.EntityFrameworkCore.dll</HintPath> <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(EfCoreTargetFramework)\Microsoft.EntityFrameworkCore.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.EntityFrameworkCore.Abstractions"> <Reference Include="Microsoft.EntityFrameworkCore.Abstractions">
<HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(DefaultNetStandardTargetFramework)\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath> <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(EfCoreTargetFramework)\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
</Reference> </Reference>
</ItemGroup> </ItemGroup>

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<Description>Jet/ACE database provider for Entity Framework Core (Microsoft Access MDB/ACCDB files).</Description> <Description>Jet/ACE database provider for Entity Framework Core (Microsoft Access MDB/ACCDB files).</Description>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>$(JetTargetFramework)</TargetFramework>
<RootNamespace>EntityFrameworkCore.Jet</RootNamespace> <RootNamespace>EntityFrameworkCore.Jet</RootNamespace>
<AssemblyName>EntityFrameworkCore.Jet</AssemblyName> <AssemblyName>EntityFrameworkCore.Jet</AssemblyName>
<Platforms>AnyCPU;x86;x64</Platforms> <Platforms>AnyCPU;x86;x64</Platforms>
@ -14,22 +14,22 @@
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(LocalEFCoreRepository)' == ''"> <ItemGroup Condition="'$(LocalEFCoreRepository)' == ''">
<PackageReference Include="Microsoft.EntityFrameworkCore" PrivateAssets="none" Version="$(EFCoreVersion)" /> <PackageReference Include="Microsoft.EntityFrameworkCore" PrivateAssets="none" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" PrivateAssets="none" Version="$(EFCoreVersion)" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" PrivateAssets="none" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(LocalEFCoreRepository)' != ''"> <ItemGroup Condition="'$(LocalEFCoreRepository)' != ''">
<Reference Include="Microsoft.EntityFrameworkCore"> <Reference Include="Microsoft.EntityFrameworkCore">
<HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(TargetFramework)\Microsoft.EntityFrameworkCore.dll</HintPath> <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(EfCoreTargetFramework)\Microsoft.EntityFrameworkCore.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.EntityFrameworkCore.Abstractions"> <Reference Include="Microsoft.EntityFrameworkCore.Abstractions">
<HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(TargetFramework)\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath> <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(EfCoreTargetFramework)\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.EntityFrameworkCore.Analyzers"> <Reference Include="Microsoft.EntityFrameworkCore.Analyzers">
<HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(TargetFramework)\Microsoft.EntityFrameworkCore.Analyzers.dll</HintPath> <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(EfCoreTargetFramework)\Microsoft.EntityFrameworkCore.Analyzers.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.EntityFrameworkCore.Relational"> <Reference Include="Microsoft.EntityFrameworkCore.Relational">
<HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(TargetFramework)\Microsoft.EntityFrameworkCore.Relational.dll</HintPath> <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(EfCoreTargetFramework)\Microsoft.EntityFrameworkCore.Relational.dll</HintPath>
</Reference> </Reference>
<PackageReference Include="Microsoft.Extensions.Configuration.Json" /> <PackageReference Include="Microsoft.Extensions.Configuration.Json" />
@ -42,7 +42,6 @@
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" /> <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
<PackageReference Include="Microsoft.Bcl.HashCode" /> <PackageReference Include="Microsoft.Bcl.HashCode" />
<PackageReference Include="System.Collections.Immutable" /> <PackageReference Include="System.Collections.Immutable" />
<PackageReference Include="System.ComponentModel.Annotations" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

@ -1,18 +1,54 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>$(JetTestTargetFramework)</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Platforms>AnyCPU;x86</Platforms> <Platforms>AnyCPU;x86</Platforms>
</PropertyGroup> </PropertyGroup>
<ItemGroup>
<PackageReference Include="xunit.core" />
<PackageReference Include="xunit.assert" />
</ItemGroup>
<ItemGroup Condition="'$(LocalEFCoreRepository)' == ''"> <ItemGroup Condition="'$(LocalEFCoreRepository)' == ''">
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.0" /> <PackageReference Include="Microsoft.EntityFrameworkCore" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.0"> <PackageReference Include="Microsoft.EntityFrameworkCore.Design">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="7.0.0" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" />
</ItemGroup>
<ItemGroup Condition="'$(LocalEFCoreRepository)' != ''">
<Reference Include="Microsoft.EntityFrameworkCore">
<HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.dll</HintPath>
</Reference>
<Reference Include="Microsoft.EntityFrameworkCore.Abstractions">
<HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
</Reference>
<Reference Include="Microsoft.EntityFrameworkCore.Analyzers">
<HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.Analyzers.dll</HintPath>
</Reference>
<Reference Include="Microsoft.EntityFrameworkCore.Design">
<HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Design.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.Design.dll</HintPath>
</Reference>
<Reference Include="Microsoft.EntityFrameworkCore.Proxies">
<HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.Proxies.dll</HintPath>
</Reference>
<Reference Include="Microsoft.EntityFrameworkCore.Relational">
<HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.Relational.dll</HintPath>
</Reference>
<Reference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests">
<HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.Relational.Specification.Tests.dll</HintPath>
</Reference>
<Reference Include="Microsoft.EntityFrameworkCore.Specification.Tests">
<HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.Specification.Tests.dll</HintPath>
</Reference>
<PackageReference Include="Microsoft.Extensions.Caching.Memory" />
<PackageReference Include="NetTopologySuite" />
<PackageReference Include="System.ComponentModel.TypeConverter" />
<PackageReference Include="Castle.Core" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0-windows7.0</TargetFramework> <TargetFramework>$(JetTestWindowsOnlyTargetFramework)</TargetFramework>
<Platforms>AnyCPU;x86;x64</Platforms> <Platforms>AnyCPU;x86;x64</Platforms>
<RootNamespace>EntityFrameworkCore.Jet.Data.Tests</RootNamespace> <RootNamespace>EntityFrameworkCore.Jet.Data.Tests</RootNamespace>
</PropertyGroup> </PropertyGroup>
@ -20,12 +20,12 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="System.Data.Odbc" Version="8.0.0-preview.7.23375.6" /> <PackageReference Include="System.Data.Odbc" />
<PackageReference Include="System.Data.OleDb" Version="8.0.0-preview.7.23375.6" /> <PackageReference Include="System.Data.OleDb" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0-preview-23424-02" /> <PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="MSTest.TestAdapter" Version="2.3.0-preview-20220810-02" /> <PackageReference Include="MSTest.TestAdapter" />
<PackageReference Include="MSTest.TestFramework" Version="2.3.0-preview-20220810-02" /> <PackageReference Include="MSTest.TestFramework" />
<PackageReference Include="coverlet.collector" Version="3.2.0"> <PackageReference Include="coverlet.collector">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0-windows7.0</TargetFramework> <TargetFramework>$(JetTestWindowsOnlyTargetFramework)</TargetFramework>
<RootNamespace>EntityFrameworkCore.Jet.FunctionalTests</RootNamespace> <RootNamespace>EntityFrameworkCore.Jet.FunctionalTests</RootNamespace>
<AssemblyName>EntityFrameworkCore.Jet.FunctionalTests</AssemblyName> <AssemblyName>EntityFrameworkCore.Jet.FunctionalTests</AssemblyName>
<Platforms>AnyCPU;x86;x64</Platforms> <Platforms>AnyCPU;x86;x64</Platforms>
@ -12,53 +12,53 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="MSTest.TestFramework" Version="2.3.0-preview-20220810-02" /> <PackageReference Include="MSTest.TestFramework" />
<PackageReference Include="xunit.core" /> <PackageReference Include="xunit.core" />
<PackageReference Include="xunit.assert" /> <PackageReference Include="xunit.assert" />
<PackageReference Include="xunit.runner.visualstudio" /> <PackageReference Include="xunit.runner.visualstudio" />
<PackageReference Include="xunit.runner.console" /> <PackageReference Include="xunit.runner.console" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0-preview-23424-02" /> <PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" /> <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="7.0.0" /> <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" /> <PackageReference Include="Microsoft.Extensions.Configuration.Json" />
<PackageReference Include="Newtonsoft.Json" /> <PackageReference Include="Newtonsoft.Json" />
<PackageReference Include="System.Data.Odbc" Version="8.0.0-preview.7.23375.6" /> <PackageReference Include="System.Data.Odbc" />
<PackageReference Include="System.Data.OleDb" Version="8.0.0-preview.7.23375.6" /> <PackageReference Include="System.Data.OleDb" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(LocalEFCoreRepository)' == ''"> <ItemGroup Condition="'$(LocalEFCoreRepository)' == ''">
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.0" /> <PackageReference Include="Microsoft.EntityFrameworkCore" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.0"> <PackageReference Include="Microsoft.EntityFrameworkCore.Design">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="7.0.0" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(LocalEFCoreRepository)' != ''"> <ItemGroup Condition="'$(LocalEFCoreRepository)' != ''">
<Reference Include="Microsoft.EntityFrameworkCore"> <Reference Include="Microsoft.EntityFrameworkCore">
<HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(DefaultNetCoreLegacyTargetFramework)\Microsoft.EntityFrameworkCore.dll</HintPath> <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.EntityFrameworkCore.Abstractions"> <Reference Include="Microsoft.EntityFrameworkCore.Abstractions">
<HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(DefaultNetCoreLegacyTargetFramework)\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath> <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.EntityFrameworkCore.Analyzers"> <Reference Include="Microsoft.EntityFrameworkCore.Analyzers">
<HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(DefaultNetCoreLegacyTargetFramework)\Microsoft.EntityFrameworkCore.Analyzers.dll</HintPath> <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.Analyzers.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.EntityFrameworkCore.Design"> <Reference Include="Microsoft.EntityFrameworkCore.Design">
<HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Design.Tests\Debug\$(DefaultNetCoreLegacyTargetFramework)\Microsoft.EntityFrameworkCore.Design.dll</HintPath> <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Design.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.Design.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.EntityFrameworkCore.Proxies"> <Reference Include="Microsoft.EntityFrameworkCore.Proxies">
<HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(DefaultNetCoreLegacyTargetFramework)\Microsoft.EntityFrameworkCore.Proxies.dll</HintPath> <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.Proxies.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.EntityFrameworkCore.Relational"> <Reference Include="Microsoft.EntityFrameworkCore.Relational">
<HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(DefaultNetCoreLegacyTargetFramework)\Microsoft.EntityFrameworkCore.Relational.dll</HintPath> <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.Relational.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests"> <Reference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests">
<HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(DefaultNetCoreLegacyTargetFramework)\Microsoft.EntityFrameworkCore.Relational.Specification.Tests.dll</HintPath> <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.Relational.Specification.Tests.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.EntityFrameworkCore.Specification.Tests"> <Reference Include="Microsoft.EntityFrameworkCore.Specification.Tests">
<HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(DefaultNetCoreLegacyTargetFramework)\Microsoft.EntityFrameworkCore.Specification.Tests.dll</HintPath> <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.Specification.Tests.dll</HintPath>
</Reference> </Reference>
<PackageReference Include="Microsoft.Extensions.Caching.Memory" /> <PackageReference Include="Microsoft.Extensions.Caching.Memory" />
<PackageReference Include="NetTopologySuite" /> <PackageReference Include="NetTopologySuite" />
@ -80,10 +80,10 @@
<None Remove="TestResults\**" /> <None Remove="TestResults\**" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\src\EFCore.Jet\EFCore.Jet.csproj" /> <ProjectReference Include="..\..\src\EFCore.Jet\EFCore.Jet.csproj" />
<ProjectReference Include="..\EFCore.Jet.CustomBaseTests\EFCore.Jet.CustomBaseTests.csproj" /> <ProjectReference Include="..\EFCore.Jet.CustomBaseTests\EFCore.Jet.CustomBaseTests.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Update="config.json"> <None Update="config.json">

@ -11,7 +11,6 @@ using System.Reflection;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Threading.Tasks; using System.Threading.Tasks;
using EntityFrameworkCore.Jet.Data; using EntityFrameworkCore.Jet.Data;
using Humanizer;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.TestUtilities; using Microsoft.EntityFrameworkCore.TestUtilities;

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0-windows7.0</TargetFramework> <TargetFramework>$(JetTestWindowsOnlyTargetFramework)</TargetFramework>
<RootNamespace>EntityFrameworkCore.Jet.IntegrationTests</RootNamespace> <RootNamespace>EntityFrameworkCore.Jet.IntegrationTests</RootNamespace>
<GenerateProgramFile>false</GenerateProgramFile> <GenerateProgramFile>false</GenerateProgramFile>
<Platforms>AnyCPU;x86;x64</Platforms> <Platforms>AnyCPU;x86;x64</Platforms>
@ -74,18 +74,35 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.0" /> <PackageReference Include="System.Diagnostics.DiagnosticSource" />
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="7.0.0" /> <PackageReference Include="System.Data.Odbc" />
<PackageReference Include="System.Data.Odbc" Version="$(EFCoreVersion)" /> <PackageReference Include="System.Data.OleDb" />
<PackageReference Include="System.Data.OleDb" Version="$(EFCoreVersion)" /> <PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0-preview-23424-02" /> <PackageReference Include="MSTest.TestAdapter" />
<PackageReference Include="MSTest.TestAdapter" Version="2.3.0-preview-20220810-02" /> <PackageReference Include="MSTest.TestFramework" />
<PackageReference Include="MSTest.TestFramework" Version="2.3.0-preview-20220810-02" /> <PackageReference Include="coverlet.collector">
<PackageReference Include="coverlet.collector" Version="3.2.0">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
</ItemGroup>
<ItemGroup Condition="'$(LocalEFCoreRepository)' == ''">
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" />
</ItemGroup>
<ItemGroup Condition="'$(LocalEFCoreRepository)' != ''">
<Reference Include="Microsoft.EntityFrameworkCore">
<HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.dll</HintPath>
</Reference>
<Reference Include="Microsoft.EntityFrameworkCore.Relational">
<HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.Relational.dll</HintPath>
</Reference>
<Reference Include="Microsoft.EntityFrameworkCore.Abstractions">
<HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\EFCore.Jet\EFCore.Jet.csproj" /> <ProjectReference Include="..\..\src\EFCore.Jet\EFCore.Jet.csproj" />
</ItemGroup> </ItemGroup>

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0-windows7.0</TargetFramework> <TargetFramework>$(JetTestWindowsOnlyTargetFramework)</TargetFramework>
<AssemblyName>EntityFrameworkCore.Jet.Tests</AssemblyName> <AssemblyName>EntityFrameworkCore.Jet.Tests</AssemblyName>
<RootNamespace>EntityFrameworkCore.Jet</RootNamespace> <RootNamespace>EntityFrameworkCore.Jet</RootNamespace>
<Platforms>AnyCPU;x86</Platforms> <Platforms>AnyCPU;x86</Platforms>
@ -31,47 +31,44 @@
<PackageReference Include="xunit.assert" /> <PackageReference Include="xunit.assert" />
<PackageReference Include="xunit.runner.visualstudio" /> <PackageReference Include="xunit.runner.visualstudio" />
<PackageReference Include="xunit.runner.console" /> <PackageReference Include="xunit.runner.console" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0-preview-23424-02" /> <PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.7.0" /> <PackageReference Include="Microsoft.Extensions.DependencyModel" />
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.7.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.7.0" />
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="8.0.0-preview.7.23375.6" />
<PackageReference Include="Moq" /> <PackageReference Include="Moq" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(LocalEFCoreRepository)' == ''"> <ItemGroup Condition="'$(LocalEFCoreRepository)' == ''">
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.0"> <PackageReference Include="Microsoft.EntityFrameworkCore.Design">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.0" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="7.0.0" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(LocalEFCoreRepository)' != ''"> <ItemGroup Condition="'$(LocalEFCoreRepository)' != ''">
<Reference Include="Microsoft.EntityFrameworkCore"> <Reference Include="Microsoft.EntityFrameworkCore">
<HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(DefaultNetCoreLegacyTargetFramework)\Microsoft.EntityFrameworkCore.dll</HintPath> <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.EntityFrameworkCore.Abstractions"> <Reference Include="Microsoft.EntityFrameworkCore.Abstractions">
<HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(DefaultNetCoreLegacyTargetFramework)\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath> <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.EntityFrameworkCore.Analyzers"> <Reference Include="Microsoft.EntityFrameworkCore.Analyzers">
<HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(DefaultNetCoreLegacyTargetFramework)\Microsoft.EntityFrameworkCore.Analyzers.dll</HintPath> <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.Analyzers.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.EntityFrameworkCore.Design"> <Reference Include="Microsoft.EntityFrameworkCore.Design">
<HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Design.Tests\Debug\$(DefaultNetCoreLegacyTargetFramework)\Microsoft.EntityFrameworkCore.Design.dll</HintPath> <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Design.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.Design.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.EntityFrameworkCore.Proxies"> <Reference Include="Microsoft.EntityFrameworkCore.Proxies">
<HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(DefaultNetCoreLegacyTargetFramework)\Microsoft.EntityFrameworkCore.Proxies.dll</HintPath> <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.Proxies.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.EntityFrameworkCore.Relational"> <Reference Include="Microsoft.EntityFrameworkCore.Relational">
<HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(DefaultNetCoreLegacyTargetFramework)\Microsoft.EntityFrameworkCore.Relational.dll</HintPath> <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.Relational.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests"> <Reference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests">
<HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(DefaultNetCoreLegacyTargetFramework)\Microsoft.EntityFrameworkCore.Relational.Specification.Tests.dll</HintPath> <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.Relational.Specification.Tests.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.EntityFrameworkCore.Specification.Tests"> <Reference Include="Microsoft.EntityFrameworkCore.Specification.Tests">
<HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(DefaultNetCoreLegacyTargetFramework)\Microsoft.EntityFrameworkCore.Specification.Tests.dll</HintPath> <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.Specification.Tests.dll</HintPath>
</Reference> </Reference>
</ItemGroup> </ItemGroup>

@ -2,49 +2,48 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>net8.0-windows7.0</TargetFramework> <TargetFramework>$(JetTestWindowsOnlyTargetFramework)</TargetFramework>
<Platforms>AnyCPU;x86;x64</Platforms> <Platforms>AnyCPU;x86;x64</Platforms>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" /> <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="7.0.0" /> <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" /> <PackageReference Include="Microsoft.Extensions.Configuration.Json" />
<PackageReference Include="Microsoft.Extensions.Logging" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0-rc.1.23419.4" /> <PackageReference Include="Microsoft.Extensions.Logging.Console" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0-rc.1.23419.4" /> <PackageReference Include="System.Data.Odbc" />
<PackageReference Include="System.Data.Odbc" Version="$(EFCoreVersion)" /> <PackageReference Include="System.Data.OleDb" />
<PackageReference Include="System.Data.OleDb" Version="$(EFCoreVersion)" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(LocalEFCoreRepository)' == ''"> <ItemGroup Condition="'$(LocalEFCoreRepository)' == ''">
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="$(EFCoreVersion)" /> <PackageReference Include="Microsoft.EntityFrameworkCore" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(LocalEFCoreRepository)' != ''"> <ItemGroup Condition="'$(LocalEFCoreRepository)' != ''">
<Reference Include="Microsoft.EntityFrameworkCore"> <Reference Include="Microsoft.EntityFrameworkCore">
<HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(DefaultNetCoreLegacyTargetFramework)\Microsoft.EntityFrameworkCore.dll</HintPath> <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.EntityFrameworkCore.Abstractions"> <Reference Include="Microsoft.EntityFrameworkCore.Abstractions">
<HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(DefaultNetCoreLegacyTargetFramework)\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath> <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.EntityFrameworkCore.Analyzers"> <Reference Include="Microsoft.EntityFrameworkCore.Analyzers">
<HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(DefaultNetCoreLegacyTargetFramework)\Microsoft.EntityFrameworkCore.Analyzers.dll</HintPath> <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.Analyzers.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.EntityFrameworkCore.Design"> <Reference Include="Microsoft.EntityFrameworkCore.Design">
<HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Design.Tests\Debug\$(DefaultNetCoreLegacyTargetFramework)\Microsoft.EntityFrameworkCore.Design.dll</HintPath> <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Design.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.Design.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.EntityFrameworkCore.Proxies"> <Reference Include="Microsoft.EntityFrameworkCore.Proxies">
<HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(DefaultNetCoreLegacyTargetFramework)\Microsoft.EntityFrameworkCore.Proxies.dll</HintPath> <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.Proxies.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.EntityFrameworkCore.Relational"> <Reference Include="Microsoft.EntityFrameworkCore.Relational">
<HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(DefaultNetCoreLegacyTargetFramework)\Microsoft.EntityFrameworkCore.Relational.dll</HintPath> <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.Relational.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests"> <Reference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests">
<HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(DefaultNetCoreLegacyTargetFramework)\Microsoft.EntityFrameworkCore.Relational.Specification.Tests.dll</HintPath> <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.Relational.Specification.Tests.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.EntityFrameworkCore.Specification.Tests"> <Reference Include="Microsoft.EntityFrameworkCore.Specification.Tests">
<HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(DefaultNetCoreLegacyTargetFramework)\Microsoft.EntityFrameworkCore.Specification.Tests.dll</HintPath> <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.Specification.Tests.dll</HintPath>
</Reference> </Reference>
<PackageReference Include="Microsoft.Extensions.Caching.Memory" /> <PackageReference Include="Microsoft.Extensions.Caching.Memory" />
<PackageReference Include="NetTopologySuite" /> <PackageReference Include="NetTopologySuite" />

@ -1,8 +0,0 @@
<!-- This file may be overwritten by automation. -->
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<KoreBuildChannel>dev</KoreBuildChannel>
<VersionPrefix>2.1.0</VersionPrefix>
<VersionSuffix>preview1</VersionSuffix>
</PropertyGroup>
</Project>
Loading…
Cancel
Save