Skip to content

Commit 2d256b2

Browse files
JonathanMagnanJonathanMagnan
committed
Update source for .NET Standard 2.1 support
1 parent 359b041 commit 2d256b2

22 files changed

+102
-31
lines changed

‎src/EntityFramework.DynamicFilters.Example/App.config‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<configSections>
4-
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
54
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
5+
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
66
</configSections>
77
<startup>
88
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
@@ -14,21 +14,22 @@
1414
</parameters>
1515
</defaultConnectionFactory>
1616
<providers>
17+
<provider invariantName="MySql.Data.MySqlClient" type="MySql.Data.MySqlClient.MySqlProviderServices, MySql.Data.Entity.EF6, Version=6.9.5.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"></provider>
1718
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
18-
<provider invariantName="MySql.Data.MySqlClient" type="MySql.Data.MySqlClient.MySqlProviderServices, MySql.Data.Entity.EF6, Version=6.9.5.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d">
19-
</provider></providers>
19+
</providers>
2020
</entityFramework>
2121
<connectionStrings>
22-
<add name="ExampleContext" connectionString="data source=(localdb)\v11.0;initial catalog=DynamicFiltersExample1;integrated security=True;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />
23-
<add name="SecondContext" connectionString="data source=(localdb)\v11.0;initial catalog=DynamicFiltersExample2;integrated security=True;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />
22+
<add name="ExampleContext" connectionString="data source=localhost;initial catalog=DynamicFiltersExample1;integrated security=True;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />
23+
<add name="SecondContext" connectionString="data source=localhost;initial catalog=DynamicFiltersExample2;integrated security=True;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />
2424
<!--<add name="ExampleContext" connectionString="Data Source=.;Initial Catalog=DynamicFiltersExample1;Integrated Security=SSPI;" providerName="System.Data.SqlClient" />-->
2525
<!--<add name="SecondContext" connectionString="Data Source=.;Initial Catalog=DynamicFiltersExample2;Integrated Security=SSPI;" providerName="System.Data.SqlClient" />-->
2626
<!--<add name="ExampleContext" connectionString="SERVER=127.0.0.1; DATABASE=DynamicFiltersExample1; Uid=root;Pwd=;" providerName="MySql.Data.MySqlClient" />-->
2727
<!--<add name="SecondContext" connectionString="SERVER=127.0.0.1; DATABASE=DynamicFiltersExample2; Uid=root;Pwd=;" providerName="MySql.Data.MySqlClient" />-->
2828
</connectionStrings>
29-
<system.data>
29+
<system.data>
3030
<DbProviderFactories>
3131
<remove invariant="MySql.Data.MySqlClient" />
3232
<add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.9.5.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
3333
</DbProviderFactories>
34-
</system.data></configuration>
34+
</system.data>
35+
</configuration>

‎src/EntityFramework.DynamicFilters.Example/EntityFramework.DynamicFilters.Example.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@
3333
<WarningLevel>4</WarningLevel>
3434
</PropertyGroup>
3535
<ItemGroup>
36-
<Reference Include="EntityFramework">
37-
<HintPath>..\packages\EntityFramework.6.1.1\lib\net45\EntityFramework.dll</HintPath>
36+
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
37+
<HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>
3838
</Reference>
39-
<Reference Include="EntityFramework.SqlServer">
40-
<HintPath>..\packages\EntityFramework.6.1.1\lib\net45\EntityFramework.SqlServer.dll</HintPath>
39+
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
40+
<HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
4141
</Reference>
4242
<Reference Include="MySql.Data, Version=6.9.5.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
4343
<SpecificVersion>False</SpecificVersion>

‎src/EntityFramework.DynamicFilters.Example/Program.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ static void Main(string[] args)
1313
var context1 = new ExampleContext();
1414

1515
// Test for multiple navigation properties - issue #17
16-
var list = context1.EntityASet.Include(a => a.Nav1).Include(a => a.Nav2).Include(a => a.Nav3).ToList();
17-
System.Diagnostics.Debug.Assert((list.Count == 2) && (list[0].Nav1 != null) && (list[0].Nav2 == null) && (list[1].Nav1 != null) && (list[1].Nav2 == null));
16+
//var list = context1.EntityASet.Include(a => a.Nav1).Include(a => a.Nav2).Include(a => a.Nav3).ToList();
17+
//System.Diagnostics.Debug.Assert((list.Count == 2) && (list[0].Nav1 != null) && (list[0].Nav2 == null) && (list[1].Nav1 != null) && (list[1].Nav2 == null));
1818

1919
//var secondContext = new SecondContext();
2020

‎src/EntityFramework.DynamicFilters.Example/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="EntityFramework" version="6.1.1" targetFramework="net45" />
3+
<package id="EntityFramework" version="6.2.0" targetFramework="net45" />
44
<package id="MySql.Data" version="6.9.5" targetFramework="net45" />
55
<package id="MySql.Data.Entity" version="6.9.5" targetFramework="net45" />
66
</packages>

‎src/EntityFramework.DynamicFilters.NetStandard21/EntityFramework.DynamicFilters.NetStandard21.csproj‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>netstandard2.1</TargetFramework>
5+
<SignAssembly>true</SignAssembly>
6+
<AssemblyOriginatorKeyFile>zzzproject.pfx</AssemblyOriginatorKeyFile>
7+
<DelaySign>false</DelaySign>
8+
<PackageId>EntityFramework.DynamicFilters</PackageId>
9+
<Authors>EntityFramework.DynamicFilters</Authors>
10+
<Product>EntityFramework.DynamicFilters</Product>
11+
<Company>ZZZ Projects</Company>
12+
<Version>3.0.2</Version>
13+
<Copyright>Copyright © ZZZ Projects, John Cachat</Copyright>
14+
</PropertyGroup>
15+
16+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
17+
<DefineConstants>TRACE;USE_CSPACE</DefineConstants>
18+
</PropertyGroup>
19+
20+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
21+
<DefineConstants>TRACE;USE_CSPACE</DefineConstants>
22+
<DocumentationFile>bin\Release\EntityFramework.DynamicFilters.NetStandard21.xml</DocumentationFile>
23+
</PropertyGroup>
24+
25+
<ItemGroup>
26+
<PackageReference Include="EntityFramework" Version="6.3.0-preview6-19304-03" />
27+
</ItemGroup>
28+
29+
<Import Project="..\EntityFramework.DynamicFilters.Shared\EntityFramework.DynamicFilters.Shared.projitems" Label="Shared" />
30+
31+
</Project>

‎src/EntityFramework.DynamicFilters/DynamicFilterCommandInterceptor.cs‎ renamed to ‎src/EntityFramework.DynamicFilters.Shared/DynamicFilterCommandInterceptor.cs‎

File renamed without changes.

‎src/EntityFramework.DynamicFilters/DynamicFilterConstants.cs‎ renamed to ‎src/EntityFramework.DynamicFilters.Shared/DynamicFilterConstants.cs‎

File renamed without changes.

‎src/EntityFramework.DynamicFilters/DynamicFilterConvention.cs‎ renamed to ‎src/EntityFramework.DynamicFilters.Shared/DynamicFilterConvention.cs‎

File renamed without changes.

‎src/EntityFramework.DynamicFilters/DynamicFilterDefinition.cs‎ renamed to ‎src/EntityFramework.DynamicFilters.Shared/DynamicFilterDefinition.cs‎

File renamed without changes.

‎src/EntityFramework.DynamicFilters/DynamicFilterExtensions.cs‎ renamed to ‎src/EntityFramework.DynamicFilters.Shared/DynamicFilterExtensions.cs‎

File renamed without changes.

0 commit comments

Comments
 (0)