Skip to content

Commit a71fcc1

Browse files
lauxjpnlauxjpn
committed
Update solution and build/infrastructure files.
1 parent e040941 commit a71fcc1

12 files changed

+124
-37
lines changed

‎.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,6 @@ UpgradeLog*.htm
135135
App_Data/*.mdf
136136
App_Data/*.ldf
137137

138-
139138
#LightSwitch generated files
140139
GeneratedArtifacts/
141140
_Pvt_Extensions/
@@ -157,10 +156,13 @@ $RECYCLE.BIN/
157156

158157
# Mac desktop service store files
159158
.DS_Store
159+
160160
/_External_Dependencies
161161
/packages
162162
/NuGet.Packager
163163
/.vs/EntityFrameworkCore.Jet/v15/sqlite3/storage.ide
164164
/msbuild/Compile
165165
/msbuild/Output
166166
/.vs/EntityFrameworkCore.Jet
167+
.idea
168+
!/build/

‎Directory.Build.props

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
<Project>
2+
<PropertyGroup>
3+
<DefaultNetCoreTargetFramework>netcoreapp3.1</DefaultNetCoreTargetFramework>
4+
<DefaultNetStandardTargetFramework>netstandard2.0</DefaultNetStandardTargetFramework>
5+
</PropertyGroup>
6+
7+
<Import Project=".\build\Dependencies.props" />
8+
<Import Project=".\build\Development.props" Condition="Exists('.\build\Development.props')" />
9+
10+
<PropertyGroup>
11+
<VersionPrefix>3.1.0</VersionPrefix>
12+
<VersionSuffix>alpha</VersionSuffix>
13+
14+
<Product>EntityFrameworkCore.Jet</Product>
15+
<Description>Jet (Microsoft Access mdb or accdb files) provider for Entity Framework Core (EFCore)</Description>
16+
<Authors>Bubi</Authors>
17+
<Company>Bubi</Company>
18+
<Copyright>Copyright © 2017-2020 - Bubi</Copyright>
19+
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
20+
<LangVersion>8.0</LangVersion>
21+
<DebugType>portable</DebugType>
22+
<IsPackable>False</IsPackable>
23+
<PublishRepositoryUrl>True</PublishRepositoryUrl>
24+
25+
<PackageProjectUrl>https://github.com/bubibubi/EntityFrameworkCore.Jet/</PackageProjectUrl>
26+
<!-- <PackageReleaseNotes>TODO</PackageReleaseNotes> -->
27+
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
28+
<!-- <PackageIconUrl>TODO</PackageIconUrl> -->
29+
<!-- <PackageIcon>packageIcon.png</PackageIcon> -->
30+
<!-- <PackageIconFullPath>$(MSBuildThisFileDirectory)packageIcon.png</PackageIconFullPath> -->
31+
<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>
32+
33+
<RepositoryType>git</RepositoryType>
34+
<RepositoryUrl>git://github.com/bubibubi/EntityFrameworkCore.Jet.git</RepositoryUrl>
35+
</PropertyGroup>
36+
37+
<ItemGroup>
38+
<EmbeddedResource Include="**\*.rd.xml" />
39+
<!-- <None Include="$(PackageIconFullPath)" Pack="true" PackagePath="\"/> -->
40+
</ItemGroup>
41+
</Project>

‎EntityFrameworkCore.Jet.sln

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,14 @@ Microsoft Visual Studio Solution File, Format Version 12.00
44
VisualStudioVersion = 16.0.29806.167
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F68095EE-6CD1-43A2-B498-6CA72CE2A0CB}"
7+
ProjectSection(SolutionItems) = preProject
8+
src\Directory.Build.props = src\Directory.Build.props
9+
EndProjectSection
710
EndProject
811
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{6A8DE399-1804-4113-A408-F23B7F5C9CAC}"
912
ProjectSection(SolutionItems) = preProject
1013
SkipMessages.txt = SkipMessages.txt
14+
test\Directory.Build.props = test\Directory.Build.props
1115
EndProjectSection
1216
EndProject
1317
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
1620
EndProject
1721
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Jet", "src\EFCore.Jet\EFCore.Jet.csproj", "{D6966B04-4C38-4925-BCDE-F8655F38D04C}"
1822
EndProject
19-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{A56C261D-351C-449B-8130-75F6FA76842C}"
20-
ProjectSection(SolutionItems) = preProject
21-
tools\Resources.tt = tools\Resources.tt
22-
EndProjectSection
23-
EndProject
2423
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Jet.IntegrationTests", "test\EFCore.Jet.IntegrationTests\EFCore.Jet.IntegrationTests.csproj", "{50CA2970-B995-4D28-9F6C-F7CA4940F23A}"
2524
EndProject
2625
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
3130
docs\README.md = docs\README.md
3231
EndProjectSection
3332
EndProject
34-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build help", "build help", "{20B764C9-8664-4609-A743-8CF32BA6CA69}"
35-
ProjectSection(SolutionItems) = preProject
36-
NuGet.Config = NuGet.Config
37-
EndProjectSection
38-
EndProject
3933
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{DC0C1C50-ED7E-4BC0-B45C-E3115ECCCF76}"
4034
ProjectSection(SolutionItems) = preProject
4135
build\Dependencies.props = build\Dependencies.props
42-
build\GlobalAssemblyInfo.cs = build\GlobalAssemblyInfo.cs
4336
build\Key.snk = build\Key.snk
4437
build\Development.props = build\Development.props
4538
build\Development.props.sample = build\Development.props.sample
4639
EndProjectSection
4740
EndProject
41+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "root", "root", "{76210BB4-A506-4838-8BBF-57DA18C8FA03}"
42+
ProjectSection(SolutionItems) = preProject
43+
Directory.Build.props = Directory.Build.props
44+
NuGet.Config = NuGet.Config
45+
EndProjectSection
46+
EndProject
4847
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EFCore.Jet.Tests", "test\EFCore.Jet.Tests\EFCore.Jet.Tests.csproj", "{770A076B-A448-499C-BB86-A37994C04523}"
4948
EndProject
5049
Global

‎build/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Development.props

‎build/Development.props.sample

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<Project>
2+
<PropertyGroup>
3+
<!--
4+
Specify the absolute path to the EntityFrameworkCore base directory,
5+
to compile against that version for better development and local
6+
debugging support.
7+
8+
Rename this file "development.props".
9+
10+
The EFCore assemblies are being compiled with an AssemblyVersion of
11+
"42.42.42.42" by default. To not get any compilation errors
12+
for the EFCore.MySql.IntegrationTests project, which uses
13+
Microsoft.AspNetCore.Identity.EntityFrameworkCore, which references
14+
it's own version of EFCore, you have to make sure, that your local
15+
EFCore assemblies are compiled with an AssemblyVersion <= the one
16+
referenced by Microsoft.AspNetCore.Identity.EntityFrameworkCore
17+
(e.g. "3.1.0.0").
18+
19+
To achive that, run the following command in your EntityFrameworkCore
20+
base directory:
21+
22+
dotnet build "/p:AssemblyVersion=3.1.0.0"
23+
-->
24+
<LocalEFCoreRepository>C:\Repositories\EntityFrameworkCore</LocalEFCoreRepository>
25+
</PropertyGroup>
26+
</Project>

‎build/GlobalAssemblyInfo.cs

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎build/dependencies.props

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<PropertyGroup>
3+
<MicrosoftEntityFrameworkCoreVersion>3.1.2</MicrosoftEntityFrameworkCoreVersion>
34
<MicrosoftEntityFrameworkCoreRelationalVersion>3.1.2</MicrosoftEntityFrameworkCoreRelationalVersion>
45
<MicrosoftExtensionsConfigurationJsonVersion>3.1.2</MicrosoftExtensionsConfigurationJsonVersion>
56
<MicrosoftExtensionsDependencyInjection>3.1.2</MicrosoftExtensionsDependencyInjection>
@@ -13,7 +14,11 @@
1314
<MicrosoftBclHashCodeVersion>1.1.0</MicrosoftBclHashCodeVersion>
1415
<SystemCollectionsImmutableVersion>1.7.0</SystemCollectionsImmutableVersion>
1516
<SystemComponentModelAnnotationsVersion>4.7.0</SystemComponentModelAnnotationsVersion>
16-
<SystemDataOleDbVersion>5.0.0-preview.3.20160.5</SystemDataOleDbVersion>
17+
<SystemDataOleDbVersion>5.0.0-preview.3.20171.3</SystemDataOleDbVersion>
18+
</PropertyGroup>
19+
<!-- System.Data.Jet -->
20+
<PropertyGroup>
21+
<MicrosoftCSharp>4.7.0</MicrosoftCSharp>
1722
</PropertyGroup>
1823
<!-- System.Data.Jet.Test -->
1924
<!-- System.Data.Jet.PerformanceTest -->
@@ -23,4 +28,26 @@
2328
<MSTestTestFramework>2.1.0</MSTestTestFramework>
2429
<CoverletCollector>1.2.0</CoverletCollector>
2530
</PropertyGroup>
31+
<!-- EFCore.Jet.FunctionalTests -->
32+
<PropertyGroup>
33+
<XunitCorePackageVersion>2.4.1</XunitCorePackageVersion>
34+
<XunitAssertPackageVersion>2.4.1</XunitAssertPackageVersion>
35+
<XunitRunnerVisualStudioPackageVersion>2.4.1</XunitRunnerVisualStudioPackageVersion>
36+
<XunitRunnerConsolePackageVersion>2.4.1</XunitRunnerConsolePackageVersion>
37+
<NetTopologySuiteVersion>2.0.0</NetTopologySuiteVersion>
38+
<SystemComponentModelTypeConverterVersion>4.3.0</SystemComponentModelTypeConverterVersion>
39+
<CastleCoreVersion>4.4.0</CastleCoreVersion>
40+
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>3.1.0</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
41+
<MicrosoftExtensionsConfigurationFileExtensionsVersion>3.1.2</MicrosoftExtensionsConfigurationFileExtensionsVersion>
42+
</PropertyGroup>
43+
<!-- EFCore.Jet.Tests -->
44+
<PropertyGroup>
45+
<MicrosoftEntityFrameworkCoreDesignVersion>3.1.0</MicrosoftEntityFrameworkCoreDesignVersion>
46+
<MicrosoftEntityFrameworkCoreTestsVersion>3.1.0</MicrosoftEntityFrameworkCoreTestsVersion>
47+
<MicrosoftEntityFrameworkCoreRelationalTestsVersion>3.1.0</MicrosoftEntityFrameworkCoreRelationalTestsVersion>
48+
<MicrosoftEntityFrameworkCoreRelationalSpecificationTestsVersion>3.1.0</MicrosoftEntityFrameworkCoreRelationalSpecificationTestsVersion>
49+
<MicrosoftCodeAnalysisCSharpPackageVersion>3.4.0</MicrosoftCodeAnalysisCSharpPackageVersion>
50+
<MicrosoftExtensionsDependencyModelPackageVersion>3.1.0</MicrosoftExtensionsDependencyModelPackageVersion>
51+
<MoqVersion>4.13.1</MoqVersion>
52+
</PropertyGroup>
2653
</Project>

‎src/Directory.Build.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<Import Project="..\Directory.Build.props" />
33

44
<PropertyGroup>
5+
<NoWarn>$(NoWarn);EF1001</NoWarn>
56
<IsPackable>True</IsPackable>
67
<IncludeSymbols>True</IncludeSymbols>
78
<SignAssembly>True</SignAssembly>

‎src/EFCore.Jet/EFCore.Jet.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
</ItemGroup>
5252

5353
<ItemGroup Condition="'$(LocalEFCoreRepository)' == ''">
54+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="$(MicrosoftEntityFrameworkCoreVersion)" />
5455
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="$(MicrosoftEntityFrameworkCoreRelationalVersion)" />
5556
</ItemGroup>
5657

‎test/Directory.Build.props

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<Project>
2+
<Import Project="..\Directory.Build.props" />
3+
4+
<PropertyGroup>
5+
<NoWarn>$(NoWarn);EF1001;xUnit1003</NoWarn>
6+
<TreatWarningsAsErrors>False</TreatWarningsAsErrors>
7+
</PropertyGroup>
8+
9+
</Project>

0 commit comments

Comments
 (0)