From a71fcc1b698b5f7b8c375846ba9cf6b72b2b58d6 Mon Sep 17 00:00:00 2001
From: Lau <laucomm@gmail.com>
Date: Wed, 18 Mar 2020 01:10:03 +0100
Subject: [PATCH] Update solution and build/infrastructure files.

---
 .gitignore                                    |  4 +-
 Directory.Build.props                         | 41 +++++++++++++++++++
 EntityFrameworkCore.Jet.sln                   | 21 +++++-----
 build/.gitignore                              |  1 +
 build/Development.props.sample                | 26 ++++++++++++
 build/GlobalAssemblyInfo.cs                   | 22 ----------
 build/dependencies.props                      | 29 ++++++++++++-
 src/Directory.Build.props                     |  1 +
 src/EFCore.Jet/EFCore.Jet.csproj              |  1 +
 test/Directory.Build.props                    |  9 ++++
 test/EFCore.Jet.Tests/EFCore.Jet.Tests.csproj |  1 -
 test/xunit.runner.json                        |  5 ++-
 12 files changed, 124 insertions(+), 37 deletions(-)
 create mode 100644 Directory.Build.props
 create mode 100644 build/.gitignore
 create mode 100644 build/Development.props.sample
 delete mode 100644 build/GlobalAssemblyInfo.cs
 create mode 100644 test/Directory.Build.props

diff --git a/.gitignore b/.gitignore
index 55ffa7f..d7b765d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -135,7 +135,6 @@ UpgradeLog*.htm
 App_Data/*.mdf
 App_Data/*.ldf
 
-
 #LightSwitch generated files
 GeneratedArtifacts/
 _Pvt_Extensions/
@@ -157,6 +156,7 @@ $RECYCLE.BIN/
 
 # Mac desktop service store files
 .DS_Store
+
 /_External_Dependencies
 /packages
 /NuGet.Packager
@@ -164,3 +164,5 @@ $RECYCLE.BIN/
 /msbuild/Compile
 /msbuild/Output
 /.vs/EntityFrameworkCore.Jet
+.idea
+!/build/
\ No newline at end of file
diff --git a/Directory.Build.props b/Directory.Build.props
new file mode 100644
index 0000000..a04c448
--- /dev/null
+++ b/Directory.Build.props
@@ -0,0 +1,41 @@
+<Project>
+  <PropertyGroup>
+    <DefaultNetCoreTargetFramework>netcoreapp3.1</DefaultNetCoreTargetFramework>
+    <DefaultNetStandardTargetFramework>netstandard2.0</DefaultNetStandardTargetFramework>
+  </PropertyGroup>
+
+  <Import Project=".\build\Dependencies.props" />
+  <Import Project=".\build\Development.props" Condition="Exists('.\build\Development.props')" />
+
+  <PropertyGroup>
+    <VersionPrefix>3.1.0</VersionPrefix>
+    <VersionSuffix>alpha</VersionSuffix>
+    
+    <Product>EntityFrameworkCore.Jet</Product>
+    <Description>Jet (Microsoft Access mdb or accdb files) provider for Entity Framework Core (EFCore)</Description>
+    <Authors>Bubi</Authors>
+    <Company>Bubi</Company>
+    <Copyright>Copyright © 2017-2020 - Bubi</Copyright>
+    <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
+    <LangVersion>8.0</LangVersion>
+    <DebugType>portable</DebugType>
+    <IsPackable>False</IsPackable>
+    <PublishRepositoryUrl>True</PublishRepositoryUrl>
+
+    <PackageProjectUrl>https://github.com/bubibubi/EntityFrameworkCore.Jet/</PackageProjectUrl>
+    <!-- <PackageReleaseNotes>TODO</PackageReleaseNotes> -->
+    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
+    <!-- <PackageIconUrl>TODO</PackageIconUrl> -->
+    <!-- <PackageIcon>packageIcon.png</PackageIcon> -->
+    <!-- <PackageIconFullPath>$(MSBuildThisFileDirectory)packageIcon.png</PackageIconFullPath> -->
+    <PackageTags>Entity Framework Core Jet;Entity Framework Core Access;Entity Framework Core MS Access;entity-framework-core-jet;entity-framework-core-access;entity-framework-core-msaccess;EF Jet;EF Access;EF MS Access;Data;O/RM;EntityFramework;EntityFrameworkCore;EFCore;Jet;Access;MS Access</PackageTags>
+
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>git://github.com/bubibubi/EntityFrameworkCore.Jet.git</RepositoryUrl>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="**\*.rd.xml" />
+    <!-- <None Include="$(PackageIconFullPath)" Pack="true" PackagePath="\"/> -->
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/EntityFrameworkCore.Jet.sln b/EntityFrameworkCore.Jet.sln
index 0145ef9..1710d69 100644
--- a/EntityFrameworkCore.Jet.sln
+++ b/EntityFrameworkCore.Jet.sln
@@ -4,10 +4,14 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 VisualStudioVersion = 16.0.29806.167
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F68095EE-6CD1-43A2-B498-6CA72CE2A0CB}"
+ProjectSection(SolutionItems) = preProject
+	src\Directory.Build.props = src\Directory.Build.props
+EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{6A8DE399-1804-4113-A408-F23B7F5C9CAC}"
 	ProjectSection(SolutionItems) = preProject
 		SkipMessages.txt = SkipMessages.txt
+		test\Directory.Build.props = test\Directory.Build.props
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Data.Jet", "src\System.Data.Jet\System.Data.Jet.csproj", "{88BE8B4F-8DA9-42B9-9A1F-839451BA5F8C}"
@@ -16,11 +20,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Data.Jet.Test", "tes
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Jet", "src\EFCore.Jet\EFCore.Jet.csproj", "{D6966B04-4C38-4925-BCDE-F8655F38D04C}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{A56C261D-351C-449B-8130-75F6FA76842C}"
-	ProjectSection(SolutionItems) = preProject
-		tools\Resources.tt = tools\Resources.tt
-	EndProjectSection
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Jet.IntegrationTests", "test\EFCore.Jet.IntegrationTests\EFCore.Jet.IntegrationTests.csproj", "{50CA2970-B995-4D28-9F6C-F7CA4940F23A}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Jet.FunctionalTests", "test\EFCore.Jet.FunctionalTests\EFCore.Jet.FunctionalTests.csproj", "{3C88D49A-7EF2-42BA-A8D7-9DF7D358FD24}"
@@ -31,20 +30,20 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{B7FF1850-2
 		docs\README.md = docs\README.md
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build help", "build help", "{20B764C9-8664-4609-A743-8CF32BA6CA69}"
-	ProjectSection(SolutionItems) = preProject
-		NuGet.Config = NuGet.Config
-	EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{DC0C1C50-ED7E-4BC0-B45C-E3115ECCCF76}"
 ProjectSection(SolutionItems) = preProject
 	build\Dependencies.props = build\Dependencies.props
-	build\GlobalAssemblyInfo.cs = build\GlobalAssemblyInfo.cs
 	build\Key.snk = build\Key.snk
 	build\Development.props = build\Development.props
 	build\Development.props.sample = build\Development.props.sample
 EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "root", "root", "{76210BB4-A506-4838-8BBF-57DA18C8FA03}"
+ProjectSection(SolutionItems) = preProject
+	Directory.Build.props = Directory.Build.props
+	NuGet.Config = NuGet.Config
+EndProjectSection
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EFCore.Jet.Tests", "test\EFCore.Jet.Tests\EFCore.Jet.Tests.csproj", "{770A076B-A448-499C-BB86-A37994C04523}"
 EndProject
 Global
diff --git a/build/.gitignore b/build/.gitignore
new file mode 100644
index 0000000..1cc820a
--- /dev/null
+++ b/build/.gitignore
@@ -0,0 +1 @@
+Development.props
\ No newline at end of file
diff --git a/build/Development.props.sample b/build/Development.props.sample
new file mode 100644
index 0000000..46ac672
--- /dev/null
+++ b/build/Development.props.sample
@@ -0,0 +1,26 @@
+<Project>
+  <PropertyGroup>
+    <!--
+      Specify the absolute path to the EntityFrameworkCore base directory,
+      to compile against that version for better development and local
+      debugging support.
+      
+      Rename this file "development.props".
+
+      The EFCore assemblies are being compiled with an AssemblyVersion of
+      "42.42.42.42" by default. To not get any compilation errors
+      for the EFCore.MySql.IntegrationTests project, which uses
+      Microsoft.AspNetCore.Identity.EntityFrameworkCore, which references
+      it's own version of EFCore, you have to make sure, that your local
+      EFCore assemblies are compiled with an AssemblyVersion <= the one
+      referenced by Microsoft.AspNetCore.Identity.EntityFrameworkCore
+      (e.g. "3.1.0.0").
+
+      To achive that, run the following command in your EntityFrameworkCore
+      base directory:
+      
+      dotnet build "/p:AssemblyVersion=3.1.0.0"
+    -->
+    <LocalEFCoreRepository>C:\Repositories\EntityFrameworkCore</LocalEFCoreRepository>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/build/GlobalAssemblyInfo.cs b/build/GlobalAssemblyInfo.cs
deleted file mode 100644
index c0442b2..0000000
--- a/build/GlobalAssemblyInfo.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-#if DEBUG
-[assembly: AssemblyConfiguration("Debug")]
-#else
-[assembly: AssemblyConfiguration("Release")]
-#endif
-
-[assembly: AssemblyCompany("Bubi")]
-[assembly: AssemblyProduct("EntityFrameworkCore.Jet")]
-[assembly: AssemblyCopyright("Copyright © 2017-2019 - Bubi")]
-[assembly: AssemblyTrademark("Before use any of the trademarks, check if they are registered")]
-[assembly: AssemblyCulture("")]
-
-[assembly: ComVisible(false)]
-
-[assembly: Guid("e77112b7-b6ba-43a8-b21f-dd79a7a47a2f")]
-
-[assembly: AssemblyVersion("2.2.0")]
-[assembly: AssemblyFileVersion("2.2.0.0")]
-[assembly: AssemblyInformationalVersion("2.2.0")]
\ No newline at end of file
diff --git a/build/dependencies.props b/build/dependencies.props
index 8debdc9..093c6f5 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -1,5 +1,6 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
+    <MicrosoftEntityFrameworkCoreVersion>3.1.2</MicrosoftEntityFrameworkCoreVersion>
     <MicrosoftEntityFrameworkCoreRelationalVersion>3.1.2</MicrosoftEntityFrameworkCoreRelationalVersion>
     <MicrosoftExtensionsConfigurationJsonVersion>3.1.2</MicrosoftExtensionsConfigurationJsonVersion>
     <MicrosoftExtensionsDependencyInjection>3.1.2</MicrosoftExtensionsDependencyInjection>
@@ -13,7 +14,11 @@
     <MicrosoftBclHashCodeVersion>1.1.0</MicrosoftBclHashCodeVersion>
     <SystemCollectionsImmutableVersion>1.7.0</SystemCollectionsImmutableVersion>
     <SystemComponentModelAnnotationsVersion>4.7.0</SystemComponentModelAnnotationsVersion>
-    <SystemDataOleDbVersion>5.0.0-preview.3.20160.5</SystemDataOleDbVersion>
+    <SystemDataOleDbVersion>5.0.0-preview.3.20171.3</SystemDataOleDbVersion>
+  </PropertyGroup>
+  <!-- System.Data.Jet -->
+  <PropertyGroup>
+    <MicrosoftCSharp>4.7.0</MicrosoftCSharp>
   </PropertyGroup>
   <!-- System.Data.Jet.Test -->
   <!-- System.Data.Jet.PerformanceTest -->
@@ -23,4 +28,26 @@
     <MSTestTestFramework>2.1.0</MSTestTestFramework>
     <CoverletCollector>1.2.0</CoverletCollector>
   </PropertyGroup>
+  <!-- EFCore.Jet.FunctionalTests -->
+  <PropertyGroup>
+    <XunitCorePackageVersion>2.4.1</XunitCorePackageVersion>
+    <XunitAssertPackageVersion>2.4.1</XunitAssertPackageVersion>
+    <XunitRunnerVisualStudioPackageVersion>2.4.1</XunitRunnerVisualStudioPackageVersion>
+    <XunitRunnerConsolePackageVersion>2.4.1</XunitRunnerConsolePackageVersion>
+    <NetTopologySuiteVersion>2.0.0</NetTopologySuiteVersion>
+    <SystemComponentModelTypeConverterVersion>4.3.0</SystemComponentModelTypeConverterVersion>
+    <CastleCoreVersion>4.4.0</CastleCoreVersion>
+    <MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>3.1.0</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
+    <MicrosoftExtensionsConfigurationFileExtensionsVersion>3.1.2</MicrosoftExtensionsConfigurationFileExtensionsVersion>
+  </PropertyGroup>
+  <!-- EFCore.Jet.Tests -->
+  <PropertyGroup>
+    <MicrosoftEntityFrameworkCoreDesignVersion>3.1.0</MicrosoftEntityFrameworkCoreDesignVersion>
+    <MicrosoftEntityFrameworkCoreTestsVersion>3.1.0</MicrosoftEntityFrameworkCoreTestsVersion>
+    <MicrosoftEntityFrameworkCoreRelationalTestsVersion>3.1.0</MicrosoftEntityFrameworkCoreRelationalTestsVersion>
+    <MicrosoftEntityFrameworkCoreRelationalSpecificationTestsVersion>3.1.0</MicrosoftEntityFrameworkCoreRelationalSpecificationTestsVersion>
+    <MicrosoftCodeAnalysisCSharpPackageVersion>3.4.0</MicrosoftCodeAnalysisCSharpPackageVersion>
+    <MicrosoftExtensionsDependencyModelPackageVersion>3.1.0</MicrosoftExtensionsDependencyModelPackageVersion>
+    <MoqVersion>4.13.1</MoqVersion>
+  </PropertyGroup>
 </Project>
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index b1e33b8..1bb89e5 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -2,6 +2,7 @@
   <Import Project="..\Directory.Build.props" />
   
   <PropertyGroup>
+    <NoWarn>$(NoWarn);EF1001</NoWarn>
     <IsPackable>True</IsPackable>
     <IncludeSymbols>True</IncludeSymbols>
     <SignAssembly>True</SignAssembly>
diff --git a/src/EFCore.Jet/EFCore.Jet.csproj b/src/EFCore.Jet/EFCore.Jet.csproj
index be3597a..5d465c7 100644
--- a/src/EFCore.Jet/EFCore.Jet.csproj
+++ b/src/EFCore.Jet/EFCore.Jet.csproj
@@ -51,6 +51,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(LocalEFCoreRepository)' == ''">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="$(MicrosoftEntityFrameworkCoreVersion)" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="$(MicrosoftEntityFrameworkCoreRelationalVersion)" />
   </ItemGroup>
 
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
new file mode 100644
index 0000000..fe2e9c8
--- /dev/null
+++ b/test/Directory.Build.props
@@ -0,0 +1,9 @@
+<Project>
+  <Import Project="..\Directory.Build.props" />
+
+  <PropertyGroup>
+    <NoWarn>$(NoWarn);EF1001;xUnit1003</NoWarn>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+  </PropertyGroup>
+
+</Project>
diff --git a/test/EFCore.Jet.Tests/EFCore.Jet.Tests.csproj b/test/EFCore.Jet.Tests/EFCore.Jet.Tests.csproj
index da64245..89db749 100644
--- a/test/EFCore.Jet.Tests/EFCore.Jet.Tests.csproj
+++ b/test/EFCore.Jet.Tests/EFCore.Jet.Tests.csproj
@@ -26,7 +26,6 @@
   <ItemGroup Condition="'$(LocalEFCoreRepository)' == ''">
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="$(MicrosoftEntityFrameworkCoreDesignVersion)" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="$(MicrosoftEntityFrameworkCoreRelationalVersion)" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Tests" Version="$(MicrosoftEntityFrameworkCoreRelationalTestsVersion)" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="$(MicrosoftEntityFrameworkCoreRelationalSpecificationTestsVersion)" />
   </ItemGroup>
 
diff --git a/test/xunit.runner.json b/test/xunit.runner.json
index c276745..751643d 100644
--- a/test/xunit.runner.json
+++ b/test/xunit.runner.json
@@ -1,3 +1,6 @@
 {
-  "appDomain": "denied"
+  "appDomain": "denied",
+  "parallelizeAssembly": false,
+  "parallelizeTestCollections": false,
+  "diagnosticMessages": true
 }