From f086526d02ce3634b3ca66bde98ff6c30f10cf61 Mon Sep 17 00:00:00 2001 From: Laurents Meyer Date: Tue, 10 Oct 2023 13:54:56 +0200 Subject: [PATCH 1/3] Fix and update dependencies and project files. (#144) --- .gitignore | 1 + Dependencies.targets | 52 ++++--------------- Development.props.sample | 4 +- Directory.Build.props | 13 ++--- EFCore.Jet.sln | 2 +- NuGet.Config | 2 +- src/EFCore.Jet.Data/EFCore.Jet.Data.csproj | 2 +- src/EFCore.Jet.Odbc/EFCore.Jet.Odbc.csproj | 8 +-- src/EFCore.Jet.OleDb/EFCore.Jet.OleDb.csproj | 8 +-- src/EFCore.Jet/EFCore.Jet.csproj | 15 +++--- .../EFCore.Jet.CustomBaseTests.csproj | 44 ++++++++++++++-- .../EFCore.Jet.Data.Tests.csproj | 14 ++--- .../EFCore.Jet.FunctionalTests.csproj | 46 ++++++++-------- .../TestUtilities/JetTestStore.cs | 1 - .../EFCore.Jet.IntegrationTests.csproj | 35 +++++++++---- test/EFCore.Jet.Tests/EFCore.Jet.Tests.csproj | 31 +++++------ .../JetProviderExceptionTests.csproj | 35 ++++++------- version.xml | 8 --- 18 files changed, 164 insertions(+), 157 deletions(-) delete mode 100644 version.xml diff --git a/.gitignore b/.gitignore index ae38a82..6a68b5b 100644 --- a/.gitignore +++ b/.gitignore @@ -164,5 +164,6 @@ $RECYCLE.BIN/ /msbuild/Compile /msbuild/Output /.vs/EntityFrameworkCore.Jet +/.dotnet*/ .idea Development.props \ No newline at end of file diff --git a/Dependencies.targets b/Dependencies.targets index 4561020..c37d19e 100644 --- a/Dependencies.targets +++ b/Dependencies.targets @@ -1,6 +1,5 @@ - 8.0.100-rc.1.23455.8 [8.0.0-rc.1.23419.6, 9.0.0) @@ -8,79 +7,46 @@ - + - - - + + - + - - - - - - - - + - + + - - - - - - - - - - - - - + - - - - - - - - - - - - + - - - \ No newline at end of file diff --git a/Development.props.sample b/Development.props.sample index 46ac672..3800498 100644 --- a/Development.props.sample +++ b/Development.props.sample @@ -14,12 +14,12 @@ 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"). + (e.g. "8.0.0.0"). To achive that, run the following command in your EntityFrameworkCore base directory: - dotnet build "/p:AssemblyVersion=3.1.0.0" + dotnet build "/p:AssemblyVersion=8.0.0.0" --> C:\Repositories\EntityFrameworkCore diff --git a/Directory.Build.props b/Directory.Build.props index a816f23..206d2b4 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -4,7 +4,7 @@ EntityFrameworkCore.Jet - Laurents Meyer, Bubi + Christopher Jolly, Laurents Meyer, Bubi Bubi Copyright © 2017-$([System.DateTime]::Now.Year) Bubi True @@ -19,14 +19,15 @@ git - https://github.com/bubibubi/EntityFrameworkCore.Jet.git + https://github.com/bubibubi/EntityFrameworkCore.Jet - net6.0 - net6.0-windows - netcoreapp6.0 - netstandard2.1 + net8.0 + $(EfCoreTargetFramework) + $(EfCoreTargetFramework) + $(JetTargetFramework) + $(JetTestTargetFramework)-windows7.0 diff --git a/EFCore.Jet.sln b/EFCore.Jet.sln index 2fd5e53..369ca9f 100644 --- a/EFCore.Jet.sln +++ b/EFCore.Jet.sln @@ -32,7 +32,6 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "root", "root", "{76210BB4-A506-4838-8BBF-57DA18C8FA03}" ProjectSection(SolutionItems) = preProject Dependencies.targets = Dependencies.targets - Development.props = Development.props Development.props.sample = Development.props.sample Directory.Build.props = Directory.Build.props Directory.Build.targets = Directory.Build.targets @@ -41,6 +40,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "root", "root", "{76210BB4-A NuGet.Config = NuGet.Config docs\README.md = docs\README.md Version.props = Version.props + .gitignore = .gitignore EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Jet.Tests", "test\EFCore.Jet.Tests\EFCore.Jet.Tests.csproj", "{770A076B-A448-499C-BB86-A37994C04523}" diff --git a/NuGet.Config b/NuGet.Config index 3446731..c0b5ddf 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/src/EFCore.Jet.Data/EFCore.Jet.Data.csproj b/src/EFCore.Jet.Data/EFCore.Jet.Data.csproj index b03c00a..99720a5 100644 --- a/src/EFCore.Jet.Data/EFCore.Jet.Data.csproj +++ b/src/EFCore.Jet.Data/EFCore.Jet.Data.csproj @@ -2,7 +2,7 @@ Jet/ACE data provider for .NET used by EntityFramworkCore.Jet (Microsoft Access MDB/ACCDB files). - net8.0 + $(JetTargetFramework) AnyCPU;x86;x64 EntityFrameworkCore.Jet.Data EntityFrameworkCore.Jet.Data diff --git a/src/EFCore.Jet.Odbc/EFCore.Jet.Odbc.csproj b/src/EFCore.Jet.Odbc/EFCore.Jet.Odbc.csproj index 4965272..86004eb 100644 --- a/src/EFCore.Jet.Odbc/EFCore.Jet.Odbc.csproj +++ b/src/EFCore.Jet.Odbc/EFCore.Jet.Odbc.csproj @@ -2,7 +2,7 @@ Explicit ODBC support for Jet/ACE database provider for Entity Framework Core (Microsoft Access MDB/ACCDB files). - net8.0 + $(JetTargetFramework) EntityFrameworkCore.Jet.Odbc EntityFrameworkCore.Jet $(PackageTags);ODBC;System.Data.Odbc @@ -18,15 +18,15 @@ - + - $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(DefaultNetStandardTargetFramework)\Microsoft.EntityFrameworkCore.dll + $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(EfCoreTargetFramework)\Microsoft.EntityFrameworkCore.dll - $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(DefaultNetStandardTargetFramework)\Microsoft.EntityFrameworkCore.Abstractions.dll + $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(EfCoreTargetFramework)\Microsoft.EntityFrameworkCore.Abstractions.dll diff --git a/src/EFCore.Jet.OleDb/EFCore.Jet.OleDb.csproj b/src/EFCore.Jet.OleDb/EFCore.Jet.OleDb.csproj index 596d3f0..236e49b 100644 --- a/src/EFCore.Jet.OleDb/EFCore.Jet.OleDb.csproj +++ b/src/EFCore.Jet.OleDb/EFCore.Jet.OleDb.csproj @@ -2,7 +2,7 @@ Explicit OLE DB support for Jet/ACE database provider for Entity Framework Core (Microsoft Access MDB/ACCDB files). - net8.0 + $(JetTargetFramework) EntityFrameworkCore.Jet.OleDb EntityFrameworkCore.Jet $(PackageTags);OLE DB;OLEDB;System.Data.OleDb @@ -18,15 +18,15 @@ - + - $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(DefaultNetStandardTargetFramework)\Microsoft.EntityFrameworkCore.dll + $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(EfCoreTargetFramework)\Microsoft.EntityFrameworkCore.dll - $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(DefaultNetStandardTargetFramework)\Microsoft.EntityFrameworkCore.Abstractions.dll + $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(EfCoreTargetFramework)\Microsoft.EntityFrameworkCore.Abstractions.dll diff --git a/src/EFCore.Jet/EFCore.Jet.csproj b/src/EFCore.Jet/EFCore.Jet.csproj index 5a87b51..ee2e6b5 100644 --- a/src/EFCore.Jet/EFCore.Jet.csproj +++ b/src/EFCore.Jet/EFCore.Jet.csproj @@ -2,7 +2,7 @@ Jet/ACE database provider for Entity Framework Core (Microsoft Access MDB/ACCDB files). - net8.0 + $(JetTargetFramework) EntityFrameworkCore.Jet EntityFrameworkCore.Jet AnyCPU;x86;x64 @@ -14,22 +14,22 @@ - - + + - $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(TargetFramework)\Microsoft.EntityFrameworkCore.dll + $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(EfCoreTargetFramework)\Microsoft.EntityFrameworkCore.dll - $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(TargetFramework)\Microsoft.EntityFrameworkCore.Abstractions.dll + $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(EfCoreTargetFramework)\Microsoft.EntityFrameworkCore.Abstractions.dll - $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(TargetFramework)\Microsoft.EntityFrameworkCore.Analyzers.dll + $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(EfCoreTargetFramework)\Microsoft.EntityFrameworkCore.Analyzers.dll - $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(TargetFramework)\Microsoft.EntityFrameworkCore.Relational.dll + $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(EfCoreTargetFramework)\Microsoft.EntityFrameworkCore.Relational.dll @@ -42,7 +42,6 @@ - diff --git a/test/EFCore.Jet.CustomBaseTests/EFCore.Jet.CustomBaseTests.csproj b/test/EFCore.Jet.CustomBaseTests/EFCore.Jet.CustomBaseTests.csproj index 97cd266..4b99268 100644 --- a/test/EFCore.Jet.CustomBaseTests/EFCore.Jet.CustomBaseTests.csproj +++ b/test/EFCore.Jet.CustomBaseTests/EFCore.Jet.CustomBaseTests.csproj @@ -1,18 +1,54 @@ - net8.0 + $(JetTestTargetFramework) enable AnyCPU;x86 + + + + + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + + + + + + $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.dll + + + $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.Abstractions.dll + + + $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.Analyzers.dll + + + $(LocalEFCoreRepository)\artifacts\bin\EFCore.Design.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.Design.dll + + + $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.Proxies.dll + + + $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.Relational.dll + + + $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.Relational.Specification.Tests.dll + + + $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.Specification.Tests.dll + + + + + diff --git a/test/EFCore.Jet.Data.Tests/EFCore.Jet.Data.Tests.csproj b/test/EFCore.Jet.Data.Tests/EFCore.Jet.Data.Tests.csproj index 99bfbca..7865a91 100644 --- a/test/EFCore.Jet.Data.Tests/EFCore.Jet.Data.Tests.csproj +++ b/test/EFCore.Jet.Data.Tests/EFCore.Jet.Data.Tests.csproj @@ -1,7 +1,7 @@  - net8.0-windows7.0 + $(JetTestWindowsOnlyTargetFramework) AnyCPU;x86;x64 EntityFrameworkCore.Jet.Data.Tests @@ -20,12 +20,12 @@ - - - - - - + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/EFCore.Jet.FunctionalTests/EFCore.Jet.FunctionalTests.csproj b/test/EFCore.Jet.FunctionalTests/EFCore.Jet.FunctionalTests.csproj index 8062fa0..687fcf9 100644 --- a/test/EFCore.Jet.FunctionalTests/EFCore.Jet.FunctionalTests.csproj +++ b/test/EFCore.Jet.FunctionalTests/EFCore.Jet.FunctionalTests.csproj @@ -1,7 +1,7 @@  - net8.0-windows7.0 + $(JetTestWindowsOnlyTargetFramework) EntityFrameworkCore.Jet.FunctionalTests EntityFrameworkCore.Jet.FunctionalTests AnyCPU;x86;x64 @@ -12,53 +12,53 @@ - + - - - - + + + + - - + + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + - $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(DefaultNetCoreLegacyTargetFramework)\Microsoft.EntityFrameworkCore.dll + $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.dll - $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(DefaultNetCoreLegacyTargetFramework)\Microsoft.EntityFrameworkCore.Abstractions.dll + $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.Abstractions.dll - $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(DefaultNetCoreLegacyTargetFramework)\Microsoft.EntityFrameworkCore.Analyzers.dll + $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.Analyzers.dll - $(LocalEFCoreRepository)\artifacts\bin\EFCore.Design.Tests\Debug\$(DefaultNetCoreLegacyTargetFramework)\Microsoft.EntityFrameworkCore.Design.dll + $(LocalEFCoreRepository)\artifacts\bin\EFCore.Design.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.Design.dll - $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(DefaultNetCoreLegacyTargetFramework)\Microsoft.EntityFrameworkCore.Proxies.dll + $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.Proxies.dll - $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(DefaultNetCoreLegacyTargetFramework)\Microsoft.EntityFrameworkCore.Relational.dll + $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.Relational.dll - $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(DefaultNetCoreLegacyTargetFramework)\Microsoft.EntityFrameworkCore.Relational.Specification.Tests.dll + $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.Relational.Specification.Tests.dll - $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(DefaultNetCoreLegacyTargetFramework)\Microsoft.EntityFrameworkCore.Specification.Tests.dll + $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.Specification.Tests.dll @@ -82,10 +82,10 @@ - - - - + + + + diff --git a/test/EFCore.Jet.FunctionalTests/TestUtilities/JetTestStore.cs b/test/EFCore.Jet.FunctionalTests/TestUtilities/JetTestStore.cs index 36d81df..8815a93 100644 --- a/test/EFCore.Jet.FunctionalTests/TestUtilities/JetTestStore.cs +++ b/test/EFCore.Jet.FunctionalTests/TestUtilities/JetTestStore.cs @@ -11,7 +11,6 @@ using System.Reflection; using System.Text.RegularExpressions; using System.Threading.Tasks; using EntityFrameworkCore.Jet.Data; -using Humanizer; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.TestUtilities; diff --git a/test/EFCore.Jet.IntegrationTests/EFCore.Jet.IntegrationTests.csproj b/test/EFCore.Jet.IntegrationTests/EFCore.Jet.IntegrationTests.csproj index f84fd09..db52d0b 100644 --- a/test/EFCore.Jet.IntegrationTests/EFCore.Jet.IntegrationTests.csproj +++ b/test/EFCore.Jet.IntegrationTests/EFCore.Jet.IntegrationTests.csproj @@ -1,7 +1,7 @@  - net8.0-windows7.0 + $(JetTestWindowsOnlyTargetFramework) EntityFrameworkCore.Jet.IntegrationTests false AnyCPU;x86;x64 @@ -74,18 +74,35 @@ - - - - - - - - + + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.dll + + + $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.Relational.dll + + + $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.Abstractions.dll + + + + diff --git a/test/EFCore.Jet.Tests/EFCore.Jet.Tests.csproj b/test/EFCore.Jet.Tests/EFCore.Jet.Tests.csproj index 95d92a5..89a2c4a 100644 --- a/test/EFCore.Jet.Tests/EFCore.Jet.Tests.csproj +++ b/test/EFCore.Jet.Tests/EFCore.Jet.Tests.csproj @@ -1,7 +1,7 @@  - net8.0-windows7.0 + $(JetTestWindowsOnlyTargetFramework) EntityFrameworkCore.Jet.Tests EntityFrameworkCore.Jet AnyCPU;x86 @@ -31,47 +31,44 @@ - - - - - + + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + - $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(DefaultNetCoreLegacyTargetFramework)\Microsoft.EntityFrameworkCore.dll + $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.dll - $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(DefaultNetCoreLegacyTargetFramework)\Microsoft.EntityFrameworkCore.Abstractions.dll + $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.Abstractions.dll - $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(DefaultNetCoreLegacyTargetFramework)\Microsoft.EntityFrameworkCore.Analyzers.dll + $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.Analyzers.dll - $(LocalEFCoreRepository)\artifacts\bin\EFCore.Design.Tests\Debug\$(DefaultNetCoreLegacyTargetFramework)\Microsoft.EntityFrameworkCore.Design.dll + $(LocalEFCoreRepository)\artifacts\bin\EFCore.Design.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.Design.dll - $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(DefaultNetCoreLegacyTargetFramework)\Microsoft.EntityFrameworkCore.Proxies.dll + $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.Proxies.dll - $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(DefaultNetCoreLegacyTargetFramework)\Microsoft.EntityFrameworkCore.Relational.dll + $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.Relational.dll - $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(DefaultNetCoreLegacyTargetFramework)\Microsoft.EntityFrameworkCore.Relational.Specification.Tests.dll + $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.Relational.Specification.Tests.dll - $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(DefaultNetCoreLegacyTargetFramework)\Microsoft.EntityFrameworkCore.Specification.Tests.dll + $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.Specification.Tests.dll diff --git a/test/JetProviderExceptionTests/JetProviderExceptionTests.csproj b/test/JetProviderExceptionTests/JetProviderExceptionTests.csproj index 75ce934..16c1e6c 100644 --- a/test/JetProviderExceptionTests/JetProviderExceptionTests.csproj +++ b/test/JetProviderExceptionTests/JetProviderExceptionTests.csproj @@ -2,49 +2,48 @@ Exe - net8.0-windows7.0 + $(JetTestWindowsOnlyTargetFramework) AnyCPU;x86;x64 - - - - - - - - + + + + + + + - + - $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(DefaultNetCoreLegacyTargetFramework)\Microsoft.EntityFrameworkCore.dll + $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.dll - $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(DefaultNetCoreLegacyTargetFramework)\Microsoft.EntityFrameworkCore.Abstractions.dll + $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.Abstractions.dll - $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(DefaultNetCoreLegacyTargetFramework)\Microsoft.EntityFrameworkCore.Analyzers.dll + $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.Analyzers.dll - $(LocalEFCoreRepository)\artifacts\bin\EFCore.Design.Tests\Debug\$(DefaultNetCoreLegacyTargetFramework)\Microsoft.EntityFrameworkCore.Design.dll + $(LocalEFCoreRepository)\artifacts\bin\EFCore.Design.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.Design.dll - $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(DefaultNetCoreLegacyTargetFramework)\Microsoft.EntityFrameworkCore.Proxies.dll + $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.Proxies.dll - $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(DefaultNetCoreLegacyTargetFramework)\Microsoft.EntityFrameworkCore.Relational.dll + $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.Relational.dll - $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(DefaultNetCoreLegacyTargetFramework)\Microsoft.EntityFrameworkCore.Relational.Specification.Tests.dll + $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.Relational.Specification.Tests.dll - $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(DefaultNetCoreLegacyTargetFramework)\Microsoft.EntityFrameworkCore.Specification.Tests.dll + $(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational.Specification.Tests\Debug\$(EfCoreTestTargetFramework)\Microsoft.EntityFrameworkCore.Specification.Tests.dll diff --git a/version.xml b/version.xml deleted file mode 100644 index 3c363ab..0000000 --- a/version.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - dev - 2.1.0 - preview1 - - From 914bd5a2ee0262360da3272d1795e7dbbebcfaa8 Mon Sep 17 00:00:00 2001 From: Laurents Meyer Date: Tue, 10 Oct 2023 14:03:37 +0200 Subject: [PATCH 2/3] Fix namespace. --- test/EFCore.Jet.FunctionalTests/KeysWithConvertersJetTest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/EFCore.Jet.FunctionalTests/KeysWithConvertersJetTest.cs b/test/EFCore.Jet.FunctionalTests/KeysWithConvertersJetTest.cs index 744f608..ebdca2a 100644 --- a/test/EFCore.Jet.FunctionalTests/KeysWithConvertersJetTest.cs +++ b/test/EFCore.Jet.FunctionalTests/KeysWithConvertersJetTest.cs @@ -5,7 +5,7 @@ using EntityFrameworkCore.Jet.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.TestUtilities; -namespace EntityFrameworkCore.Jet.FunctionalTest; +namespace EntityFrameworkCore.Jet.FunctionalTests; public class KeysWithConvertersJetTest : KeysWithConvertersTestBase< KeysWithConvertersJetTest.KeysWithConvertersJetFixture> From 2155c12963cec636dbf7983fcf7feb6cae237608 Mon Sep 17 00:00:00 2001 From: Laurents Meyer Date: Tue, 10 Oct 2023 13:58:56 +0200 Subject: [PATCH 3/3] Update branding to 8.0.0-alpha.2. --- Version.props | 89 ++++++++++++++++++++++++++------------------------- 1 file changed, 46 insertions(+), 43 deletions(-) diff --git a/Version.props b/Version.props index 596fe02..c9d24cd 100644 --- a/Version.props +++ b/Version.props @@ -1,49 +1,52 @@ - - - 8.0.0 - alpha - 1 + + - + Bump-up to the next iteration immediately after a release, so that subsequent daily builds are named + correctly. + --> + 8.0.0 + alpha + 2 - - - true - true - + + - - $(PreReleaseVersionLabel).$(PreReleaseVersionIteration) - $(VersionSuffix).ci.$(ContinuousIntegrationTimestamp) - $(VersionSuffix)+sha.$(BuildSha) - + + + true + true + - - - - - - - + + $(PreReleaseVersionLabel).$(PreReleaseVersionIteration) + $(VersionSuffix).ci.$(ContinuousIntegrationTimestamp) + $(VersionSuffix)+sha.$(BuildSha) + + + + + + + + +