Skip to content

Commit b1fa143

Browse files
ChrisJollyAUlauxjpn
ChrisJollyAU
and
lauxjpn
authored
Update to .Net 5 (#99)
* update to net 5 * Add DecimalTypeKey to the logger * fix build * fix sdk version for script * Update dependencies. * Fix version and dependencies. * Readd necessary code paths, fix smaller upgrade issues, cleanup code. * Fix project files. * Fix tests. * Readd removed JetQueryTranslationPostprocessorFactory injection. Fix date/time related millisecond (double) support. * Fix value generation. Co-authored-by: Laurents Meyer <[email protected]>
1 parent c096607 commit b1fa143

File tree

113 files changed

+4131
-5542
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

113 files changed

+4131
-5542
lines changed

‎Dependencies.targets

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
11
<Project>
22
<PropertyGroup>
3-
<EFCoreVersion>[3.1.15, 5.0.0)</EFCoreVersion>
4-
<MicrosoftExtensionsVersion>3.1.15</MicrosoftExtensionsVersion>
3+
<DotnetRuntimeVersion>5.0.6</DotnetRuntimeVersion>
4+
<EFCoreVersion>[$(DotnetRuntimeVersion), 6.0.0)</EFCoreVersion>
55
</PropertyGroup>
66

77
<ItemGroup>
88
<!-- Common -->
9-
<PackageReference Update="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionsVersion)" />
10-
<PackageReference Update="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionsVersion)" />
11-
<PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="$(MicrosoftExtensionsVersion)" />
9+
<PackageReference Update="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="5.0.0" />
10+
<PackageReference Update="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
11+
<PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="5.0.0" />
1212
<PackageReference Update="Microsoft.EntityFrameworkCore" Version="$(EFCoreVersion)" />
1313
<PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="$(EFCoreVersion)" />
14-
<PackageReference Update="System.Diagnostics.DiagnosticSource" Version="4.7.1" />
14+
<PackageReference Update="System.Diagnostics.DiagnosticSource" Version="5.0.1" />
1515
<PackageReference Update="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0" />
1616
<PackageReference Update="DotNetAnalyzers.DocumentationAnalyzers" Version="1.0.0-beta.59" />
1717
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.0.0" />
1818

1919
<!-- EntityFrameworkCore.Jet.Data -->
2020
<PackageReference Update="System.ValueTuple" Version="4.5.0" />
2121
<PackageReference Update="Microsoft.CSharp" Version="4.7.0" />
22-
<PackageReference Update="Microsoft.Win32.Registry" Version="4.7.0" />
22+
<PackageReference Update="Microsoft.Win32.Registry" Version="5.0.0" />
2323

2424
<!-- EFCore.Jet -->
25-
<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsVersion)" />
26-
<PackageReference Update="Microsoft.Extensions.Configuration" Version="$(MicrosoftExtensionsVersion)" />
27-
<PackageReference Update="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsVersion)" />
28-
<PackageReference Update="Microsoft.Bcl.AsyncInterfaces" Version="1.1.1" />
25+
<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
26+
<PackageReference Update="Microsoft.Extensions.Configuration" Version="5.0.0" />
27+
<PackageReference Update="Microsoft.Extensions.Logging" Version="5.0.0" />
28+
<PackageReference Update="Microsoft.Bcl.AsyncInterfaces" Version="5.0.0" />
2929
<PackageReference Update="Microsoft.Bcl.HashCode" Version="1.1.1" />
30-
<PackageReference Update="System.Collections.Immutable" Version="1.7.1" />
31-
<PackageReference Update="System.ComponentModel.Annotations" Version="4.7.0" />
30+
<PackageReference Update="System.Collections.Immutable" Version="5.0.0" />
31+
<PackageReference Update="System.ComponentModel.Annotations" Version="5.0.0" />
3232
<!--<PackageReference Update="Microsoft.EntityFrameworkCore" Version="$(MicrosoftEntityFrameworkCoreVersion)" />-->
3333
<!--<PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="$(MicrosoftEntityFrameworkCoreRelationalVersion)" />-->
3434
<!--<PackageReference Update="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionsConfigurationJsonVersion)" />-->
@@ -41,10 +41,11 @@
4141
<PackageReference Update="System.Data.OleDb" Version="5.0.0" />
4242
<PackageReference Update="Microsoft.EntityFrameworkCore.Design" Version="$(EFCoreVersion)" />
4343
<PackageReference Update="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="$(EFCoreVersion)" />
44-
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.5.0" />
45-
<PackageReference Update="MSTest.TestAdapter" Version="2.1.0" />
46-
<PackageReference Update="MSTest.TestFramework" Version="2.1.0" />
47-
<PackageReference Update="coverlet.collector" Version="1.2.0" />
44+
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.9.4" />
45+
<PackageReference Update="MSTest.TestAdapter" Version="2.2.4" />
46+
<PackageReference Update="MSTest.TestFramework" Version="2.2.4" />
47+
<PackageReference Update="coverlet.collector" Version="3.0.3" />
48+
<PackageReference Update="Newtonsoft.Json" Version="13.0.1" />
4849

4950
<!-- EntityFrameworkCore.Jet.Data.Tests -->
5051
<!--<PackageReference Update="System.Data.Odbc" Version="$(SystemDataOdbcVersion)" />-->
@@ -57,16 +58,16 @@
5758
<!-- EFCore.Jet.FunctionalTests -->
5859
<PackageReference Update="xunit.core" Version="2.4.1" />
5960
<PackageReference Update="xunit.assert" Version="2.4.1" />
60-
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.1" />
61+
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.3" />
6162
<PackageReference Update="xunit.runner.console" Version="2.4.1" />
62-
<PackageReference Update="Microsoft.Extensions.Configuration.FileExtensions" Version="$(MicrosoftExtensionsVersion)" />
63+
<PackageReference Update="Microsoft.Extensions.Configuration.FileExtensions" Version="5.0.0" />
6364
<!--<PackageReference Update="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionsConfigurationEnvironmentVariablesVersion)" />-->
6465
<!--<PackageReference Update="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionsConfigurationJsonVersion)" />-->
6566
<!--<PackageReference Update="System.Data.Odbc" Version="$(SystemDataOdbcVersion)" />-->
6667
<!--<PackageReference Update="System.Data.OleDb" Version="$(SystemDataOleDbVersion)" />-->
67-
<PackageReference Update="NetTopologySuite" Version="2.0.0" />
68+
<PackageReference Update="NetTopologySuite" Version="2.2.0" />
6869
<PackageReference Update="System.ComponentModel.TypeConverter" Version="4.3.0" />
69-
<PackageReference Update="Castle.Core" Version="4.4.0" />
70+
<PackageReference Update="Castle.Core" Version="4.4.1" />
7071
<!--<PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="$(MicrosoftExtensionsCachingMemoryVersion)" />-->
7172

7273
<!-- EFCore.Jet.IntegrationTests -->
@@ -80,9 +81,9 @@
8081
<!--<PackageReference Update="coverlet.collector" Version="$(CoverletCollector)" />-->
8182

8283
<!-- EFCore.Jet.Tests -->
83-
<PackageReference Update="Microsoft.CodeAnalysis.CSharp" Version="3.4.0" />
84-
<PackageReference Update="Microsoft.Extensions.DependencyModel" Version="3.1.6" />
85-
<PackageReference Update="Moq" Version="4.13.1" />
84+
<PackageReference Update="Microsoft.CodeAnalysis.CSharp" Version="3.9.0" />
85+
<PackageReference Update="Microsoft.Extensions.DependencyModel" Version="5.0.0" />
86+
<PackageReference Update="Moq" Version="4.16.1" />
8687
<!--<PackageReference Update="Microsoft.EntityFrameworkCore.Design" Version="$(MicrosoftEntityFrameworkCoreDesignVersion)" />-->
8788
<!--<PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="$(MicrosoftEntityFrameworkCoreRelationalVersion)" />-->
8889
<!--<PackageReference Update="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="$(MicrosoftEntityFrameworkCoreRelationalSpecificationTestsVersion)" />-->

‎Directory.Build.props

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
<Product>EntityFrameworkCore.Jet</Product>
77
<Authors>Laurents Meyer, Bubi</Authors>
88
<Company>Bubi</Company>
9-
<Copyright>Copyright © 2017-2020 Bubi</Copyright>
9+
<Copyright>Copyright © 2017-2021 Bubi</Copyright>
1010
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
11-
<LangVersion>8.0</LangVersion>
11+
<LangVersion>latest</LangVersion>
1212
<DebugType>portable</DebugType>
1313
<IsPackable>False</IsPackable>
1414
<!-- <PackageReleaseNotes>TODO</PackageReleaseNotes> -->
@@ -23,8 +23,10 @@
2323
</PropertyGroup>
2424

2525
<PropertyGroup>
26-
<DefaultNetCoreTargetFramework>netcoreapp3.1</DefaultNetCoreTargetFramework>
27-
<DefaultNetStandardTargetFramework>netstandard2.0</DefaultNetStandardTargetFramework>
26+
<DefaultNetCoreTargetFramework>net5.0</DefaultNetCoreTargetFramework>
27+
<WindowsOnlyNetCoreTargetFramework>net5.0-windows</WindowsOnlyNetCoreTargetFramework>
28+
<DefaultNetCoreLegacyTargetFramework>netcoreapp5.0</DefaultNetCoreLegacyTargetFramework>
29+
<DefaultNetStandardTargetFramework>netstandard2.1</DefaultNetStandardTargetFramework>
2830
</PropertyGroup>
2931

3032
<ItemGroup>

‎EFCore.Jet.sln

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +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
7+
ProjectSection(SolutionItems) = preProject
8+
src\Directory.Build.props = src\Directory.Build.props
9+
EndProjectSection
1010
EndProject
1111
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{6A8DE399-1804-4113-A408-F23B7F5C9CAC}"
1212
ProjectSection(SolutionItems) = preProject
13-
SkipMessages.txt = SkipMessages.txt
1413
test\Directory.Build.props = test\Directory.Build.props
14+
SkipMessages.txt = SkipMessages.txt
1515
EndProjectSection
1616
EndProject
1717
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Jet.Data", "src\EFCore.Jet.Data\EFCore.Jet.Data.csproj", "{88BE8B4F-8DA9-42B9-9A1F-839451BA5F8C}"
@@ -43,14 +43,14 @@ ProjectSection(SolutionItems) = preProject
4343
docs\README.md = docs\README.md
4444
EndProjectSection
4545
EndProject
46-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EFCore.Jet.Tests", "test\EFCore.Jet.Tests\EFCore.Jet.Tests.csproj", "{770A076B-A448-499C-BB86-A37994C04523}"
46+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Jet.Tests", "test\EFCore.Jet.Tests\EFCore.Jet.Tests.csproj", "{770A076B-A448-499C-BB86-A37994C04523}"
4747
EndProject
48-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JetProviderExceptionTests", "test\JetProviderExceptionTests\JetProviderExceptionTests.csproj", "{5CD8B47D-E32C-480A-8331-55549EC8E12E}"
48+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JetProviderExceptionTests", "test\JetProviderExceptionTests\JetProviderExceptionTests.csproj", "{5CD8B47D-E32C-480A-8331-55549EC8E12E}"
4949
EndProject
5050
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{84E4151A-DA0B-43C0-B1DD-F027241FE49F}"
51-
ProjectSection(SolutionItems) = preProject
52-
tools\Resources.tt = tools\Resources.tt
53-
EndProjectSection
51+
ProjectSection(SolutionItems) = preProject
52+
tools\Resources.tt = tools\Resources.tt
53+
EndProjectSection
5454
EndProject
5555
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EFCore.Jet.Odbc", "src\EFCore.Jet.Odbc\EFCore.Jet.Odbc.csproj", "{1E0729DA-B861-46EA-B1F1-3AE20EA1E00A}"
5656
EndProject
@@ -140,12 +140,12 @@ Global
140140
{770A076B-A448-499C-BB86-A37994C04523}.Release|x86.Build.0 = Release|Any CPU
141141
{5CD8B47D-E32C-480A-8331-55549EC8E12E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
142142
{5CD8B47D-E32C-480A-8331-55549EC8E12E}.Debug|Any CPU.Build.0 = Debug|Any CPU
143-
{5CD8B47D-E32C-480A-8331-55549EC8E12E}.Release|Any CPU.ActiveCfg = Release|Any CPU
144-
{5CD8B47D-E32C-480A-8331-55549EC8E12E}.Release|Any CPU.Build.0 = Release|Any CPU
145143
{5CD8B47D-E32C-480A-8331-55549EC8E12E}.Debug|x64.ActiveCfg = Debug|x64
146144
{5CD8B47D-E32C-480A-8331-55549EC8E12E}.Debug|x64.Build.0 = Debug|x64
147145
{5CD8B47D-E32C-480A-8331-55549EC8E12E}.Debug|x86.ActiveCfg = Debug|x86
148146
{5CD8B47D-E32C-480A-8331-55549EC8E12E}.Debug|x86.Build.0 = Debug|x86
147+
{5CD8B47D-E32C-480A-8331-55549EC8E12E}.Release|Any CPU.ActiveCfg = Release|Any CPU
148+
{5CD8B47D-E32C-480A-8331-55549EC8E12E}.Release|Any CPU.Build.0 = Release|Any CPU
149149
{5CD8B47D-E32C-480A-8331-55549EC8E12E}.Release|x64.ActiveCfg = Release|x64
150150
{5CD8B47D-E32C-480A-8331-55549EC8E12E}.Release|x64.Build.0 = Release|x64
151151
{5CD8B47D-E32C-480A-8331-55549EC8E12E}.Release|x86.ActiveCfg = Release|x86

‎Version.props

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,14 @@
22
<PropertyGroup Label="Version settings">
33
<!--
44
Use the following values for the different release types:
5-
- "alpha" - EF Core release independent, code quality unstable, major changes
6-
- "beta" - EF Core release independent, code quality stable, can introduce breaking changes
7-
- "silver" - EF Core release independent, code quality stable, can introduce breaking changes
8-
9-
- "preview" - EF Core release targeted, code quality stable, can introduce breaking changes
10-
- "rc" - EF Core release targeted, code quality production ready, only minor changes are expected
11-
12-
- "rtm" - EF Core release independent, code quality production ready, major release
13-
- "servicing" - EF Core release independent, code quality production ready, mainly bugfixes
5+
- "alpha"
6+
- "beta"
7+
- "rc"
8+
- "rtm"
9+
- "servicing"
1410
-->
15-
<VersionPrefix>3.1.1</VersionPrefix>
16-
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
11+
<VersionPrefix>5.0.0</VersionPrefix>
12+
<PreReleaseVersionLabel>alpha</PreReleaseVersionLabel>
1713
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
1814

1915
<!--
@@ -33,7 +29,7 @@
3329
<UseVersionSuffixOverride Condition="'$(VersionSuffix)' != ''">true</UseVersionSuffixOverride>
3430
</PropertyGroup>
3531

36-
<PropertyGroup Label="Version Suffix Handling" Condition="'$(UseVersionOverride)' != 'true' And '$(UseVersionSuffixOverride)' != 'true' And ('$(OfficialVersion)' == '' Or $(OfficialVersion.Contains('-')))">
32+
<PropertyGroup Label="Version Suffix Handling" Condition="'$(UseVersionOverride)' != 'true' And '$(UseVersionSuffixOverride)' != 'true' And '$(OfficialVersion)' == ''">
3733
<VersionSuffix>$(PreReleaseVersionLabel).$(PreReleaseVersionIteration)</VersionSuffix>
3834
<VersionSuffix Condition="'$(ContinuousIntegrationTimestamp)' != ''">$(VersionSuffix).ci.$(ContinuousIntegrationTimestamp)</VersionSuffix>
3935
<VersionSuffix Condition="'$(BuildSha)' != ''">$(VersionSuffix)+sha.$(BuildSha)</VersionSuffix>
@@ -43,7 +39,7 @@
4339
<Error Condition="'$(VersionPrefix)' == ''" Text="The 'VersionPrefix' property needs to be set." />
4440
<Error Condition="'$(PreReleaseVersionLabel)' == ''" Text="The 'PreReleaseVersionLabel' property needs to be set." />
4541
<Error Condition="'$(PreReleaseVersionIteration)' == ''" Text="The 'PreReleaseVersionIteration' property needs to be set." />
46-
<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." />
42+
<Error Condition="'$(OfficialVersion)' != '' And '$(OfficialVersion)' != '$(VersionPrefix)'" Text="The 'OfficialVersion' property needs to be identical to the 'VersionPrefix' property." />
4743
<!--
4844
<Message Importance="high" Text="VersionPrefix: $(VersionPrefix)" />
4945
<Message Importance="high" Text="VersionSuffix: $(VersionSuffix)" />

‎global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "3.1.409",
3+
"version": "5.0.203",
44
"allowPrerelease": false,
55
"rollForward": "latestFeature"
66
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<Description>Jet/ACE data provider for .NET used by EntityFramworkCore.Jet (Microsoft Access MDB/ACCDB files).</Description>
5-
<TargetFrameworks>$(DefaultNetStandardTargetFramework);netcoreapp2.1;net461</TargetFrameworks>
5+
<TargetFramework>$(DefaultNetStandardTargetFramework)</TargetFramework>
66
<Platforms>AnyCPU;x86;x64</Platforms>
77
<AssemblyName>EntityFrameworkCore.Jet.Data</AssemblyName>
88
<RootNamespace>EntityFrameworkCore.Jet.Data</RootNamespace>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<Description>Explicit ODBC support for Jet/ACE database provider for Entity Framework Core (Microsoft Access MDB/ACCDB files).</Description>
5-
<TargetFramework>$(DefaultNetStandardTargetFramework)</TargetFramework>
5+
<TargetFramework>$(WindowsOnlyNetCoreTargetFramework)</TargetFramework>
66
<AssemblyName>EntityFrameworkCore.Jet.Odbc</AssemblyName>
77
<RootNamespace>EntityFrameworkCore.Jet</RootNamespace>
88
<PackageTags>$(PackageTags);ODBC;System.Data.Odbc</PackageTags>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<Description>Explicit OLE DB support for Jet/ACE database provider for Entity Framework Core (Microsoft Access MDB/ACCDB files).</Description>
5-
<TargetFramework>$(DefaultNetStandardTargetFramework)</TargetFramework>
5+
<TargetFramework>$(WindowsOnlyNetCoreTargetFramework)</TargetFramework>
66
<AssemblyName>EntityFrameworkCore.Jet.OleDb</AssemblyName>
77
<RootNamespace>EntityFrameworkCore.Jet</RootNamespace>
88
<PackageTags>$(PackageTags);OLE DB;OLEDB;System.Data.OleDb</PackageTags>

‎src/EFCore.Jet/Design/Internal/JetAnnotationCodeGenerator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public JetAnnotationCodeGenerator([NotNull] AnnotationCodeGeneratorDependencies
3535
/// any release. You should only use it directly in your code with extreme caution and knowing that
3636
/// doing so can result in application failures when updating to a new Entity Framework Core release.
3737
/// </summary>
38-
public override bool IsHandledByConvention(IModel model, IAnnotation annotation)
38+
protected override bool IsHandledByConvention(IModel model, IAnnotation annotation)
3939
{
4040
Check.NotNull(model, nameof(model));
4141
Check.NotNull(annotation, nameof(annotation));

‎src/EFCore.Jet/Diagnostics/ConflictingValueGenerationStrategiesEventData.cs

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
// Copyright (c) .NET Foundation. All rights reserved.
2+
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
3+
4+
using System;
5+
using System.Diagnostics;
6+
using EntityFrameworkCore.Jet.Metadata;
7+
using JetBrains.Annotations;
8+
using Microsoft.EntityFrameworkCore.Metadata;
9+
10+
namespace Microsoft.EntityFrameworkCore.Diagnostics
11+
{
12+
/// <summary>
13+
/// A <see cref="DiagnosticSource" /> event payload class for events that have
14+
/// a property.
15+
/// </summary>
16+
public class ConflictingValueGenerationStrategiesEventData : EventData
17+
{
18+
/// <summary>
19+
/// Constructs the event payload.
20+
/// </summary>
21+
/// <param name="eventDefinition"> The event definition. </param>
22+
/// <param name="messageGenerator"> A delegate that generates a log message for this event. </param>
23+
/// <param name="jetValueGenerationStrategy"> The JET value generation strategy. </param>
24+
/// <param name="otherValueGenerationStrategy"> The other value generation strategy. </param>
25+
/// <param name="property"> The property. </param>
26+
public ConflictingValueGenerationStrategiesEventData(
27+
[NotNull] EventDefinitionBase eventDefinition,
28+
[NotNull] Func<EventDefinitionBase, EventData, string> messageGenerator,
29+
JetValueGenerationStrategy jetValueGenerationStrategy,
30+
[NotNull] string otherValueGenerationStrategy,
31+
[NotNull] IProperty property)
32+
: base(eventDefinition, messageGenerator)
33+
{
34+
JetValueGenerationStrategy = jetValueGenerationStrategy;
35+
OtherValueGenerationStrategy = otherValueGenerationStrategy;
36+
Property = property;
37+
}
38+
39+
/// <summary>
40+
/// The Jet value generation strategy.
41+
/// </summary>
42+
public virtual JetValueGenerationStrategy JetValueGenerationStrategy { get; }
43+
44+
/// <summary>
45+
/// The other value generation strategy.
46+
/// </summary>
47+
public virtual string OtherValueGenerationStrategy { get; }
48+
49+
/// <summary>
50+
/// The property.
51+
/// </summary>
52+
public virtual IProperty Property { get; }
53+
}
54+
}

0 commit comments

Comments
 (0)