Skip to content

Commit aebd118

Browse files
author
Anthony Sneed
authored
Merge pull request #5 from TrackableEntities/update-ef-core-2.2
Update to EF Core v2.2, TE v1.2.
2 parents 30e21af + 2de70a3 commit aebd118

14 files changed

Lines changed: 50 additions & 56 deletions

File tree

‎NetCoreSample.ConsoleClient/App.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
88
<dependentAssembly>
99
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
10-
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
10+
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
1111
</dependentAssembly>
1212
<dependentAssembly>
1313
<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
14-
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
14+
<bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
1515
</dependentAssembly>
1616
</assemblyBinding>
1717
</runtime>

‎NetCoreSample.ConsoleClient/NetCoreSample.ConsoleClient.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@
3535
<Reference Include="AspnetWebApi2Helpers.Serialization, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
3636
<HintPath>..\packages\AspNetWebApi2Helpers.Serialization.1.0.0\lib\portable-net45+win+wpa81+wp80\AspnetWebApi2Helpers.Serialization.dll</HintPath>
3737
</Reference>
38-
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
39-
<HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
38+
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
39+
<HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
4040
</Reference>
4141
<Reference Include="System" />
4242
<Reference Include="System.Core" />
43-
<Reference Include="System.Net.Http.Formatting, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
44-
<HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll</HintPath>
43+
<Reference Include="System.Net.Http.Formatting, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
44+
<HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll</HintPath>
4545
</Reference>
4646
<Reference Include="System.Xml.Linq" />
4747
<Reference Include="System.Data.DataSetExtensions" />
@@ -50,10 +50,10 @@
5050
<Reference Include="System.Net.Http" />
5151
<Reference Include="System.Xml" />
5252
<Reference Include="TrackableEntities.Client, Version=2.5.0.0, Culture=neutral, PublicKeyToken=b10b51e7b9be6a2e, processorArchitecture=MSIL">
53-
<HintPath>..\packages\TrackableEntities.Client.2.5.6\lib\net45\TrackableEntities.Client.dll</HintPath>
53+
<HintPath>..\packages\TrackableEntities.Client.2.5.7\lib\net45\TrackableEntities.Client.dll</HintPath>
5454
</Reference>
5555
<Reference Include="TrackableEntities.Common, Version=2.5.0.0, Culture=neutral, PublicKeyToken=b10b51e7b9be6a2e, processorArchitecture=MSIL">
56-
<HintPath>..\packages\TrackableEntities.Common.2.5.6\lib\portable-net40+sl50+win+wpa81+wp80\TrackableEntities.Common.dll</HintPath>
56+
<HintPath>..\packages\TrackableEntities.Common.2.5.7\lib\portable40-net40+sl5+win8+wp8+wpa81\TrackableEntities.Common.dll</HintPath>
5757
</Reference>
5858
</ItemGroup>
5959
<ItemGroup>

‎NetCoreSample.ConsoleClient/Program.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,15 @@ static void Main(string[] args)
7878
PrintOrderWithDetails(createdOrder);
7979

8080
// Update the order
81-
Console.WriteLine("\nPress Enter to update order details");
81+
Console.WriteLine("\nPress Enter to update order and details");
8282
Console.ReadLine();
8383

8484
// Start change-tracking the order
8585
var changeTracker = new ChangeTrackingCollection<Order>(createdOrder);
8686

87+
// Modify order
88+
createdOrder.OrderDate = createdOrder.OrderDate.GetValueOrDefault().AddDays(1);
89+
8790
// Modify order details
8891
createdOrder.OrderDetails[0].UnitPrice++;
8992
createdOrder.OrderDetails.RemoveAt(1);

‎NetCoreSample.ConsoleClient/packages.config‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="AspNetWebApi2Helpers.Serialization" version="1.0.0" targetFramework="net461" />
4-
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net461" />
5-
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net461" />
6-
<package id="TrackableEntities.Client" version="2.5.6" targetFramework="net461" />
7-
<package id="TrackableEntities.Common" version="2.5.6" targetFramework="net461" />
4+
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.7" targetFramework="net461" />
5+
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="net461" />
6+
<package id="TrackableEntities.Client" version="2.5.7" targetFramework="net461" />
7+
<package id="TrackableEntities.Common" version="2.5.7" targetFramework="net461" />
88
</packages>

‎NetCoreSample.Entities.Client/App.config‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
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 -->
4+
55
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
6-
</configSections>
6+
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 --></configSections>
77
<entityFramework>
88
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
99
<parameters>
@@ -17,4 +17,12 @@
1717
<connectionStrings>
1818
<add name="NorthwindSlim" connectionString="data source=(localdb)\MsSqlLocalDb;initial catalog=NorthwindSlim;integrated security=True;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />
1919
</connectionStrings>
20+
<runtime>
21+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
22+
<dependentAssembly>
23+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
24+
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
25+
</dependentAssembly>
26+
</assemblyBinding>
27+
</runtime>
2028
</configuration>

‎NetCoreSample.Entities.Client/NetCoreSample.Entities.Client.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@
3131
</PropertyGroup>
3232
<ItemGroup>
3333
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
34-
<HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
34+
<HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>
3535
</Reference>
3636
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
37-
<HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll</HintPath>
37+
<HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
3838
</Reference>
39-
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
40-
<HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
39+
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
40+
<HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
4141
</Reference>
4242
<Reference Include="System" />
4343
<Reference Include="System.ComponentModel.DataAnnotations" />
@@ -51,10 +51,10 @@
5151
<Reference Include="System.Net.Http" />
5252
<Reference Include="System.Xml" />
5353
<Reference Include="TrackableEntities.Client, Version=2.5.0.0, Culture=neutral, PublicKeyToken=b10b51e7b9be6a2e, processorArchitecture=MSIL">
54-
<HintPath>..\packages\TrackableEntities.Client.2.5.6\lib\net45\TrackableEntities.Client.dll</HintPath>
54+
<HintPath>..\packages\TrackableEntities.Client.2.5.7\lib\net45\TrackableEntities.Client.dll</HintPath>
5555
</Reference>
5656
<Reference Include="TrackableEntities.Common, Version=2.5.0.0, Culture=neutral, PublicKeyToken=b10b51e7b9be6a2e, processorArchitecture=MSIL">
57-
<HintPath>..\packages\TrackableEntities.Common.2.5.6\lib\portable-net40+sl50+win+wpa81+wp80\TrackableEntities.Common.dll</HintPath>
57+
<HintPath>..\packages\TrackableEntities.Common.2.5.7\lib\portable40-net40+sl5+win8+wp8+wpa81\TrackableEntities.Common.dll</HintPath>
5858
</Reference>
5959
</ItemGroup>
6060
<ItemGroup>

‎NetCoreSample.Entities.Client/packages.config‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="EntityFramework" version="6.1.3" targetFramework="net461" />
4-
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net461" />
5-
<package id="TrackableEntities.Client" version="2.5.6" targetFramework="net461" />
3+
<package id="EntityFramework" version="6.2.0" targetFramework="net461" />
4+
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="net461" />
5+
<package id="TrackableEntities.Client" version="2.5.7" targetFramework="net461" />
66
<package id="TrackableEntities.CodeTemplates.Client.Net45" version="2.5.2" targetFramework="net461" />
7-
<package id="TrackableEntities.Common" version="2.5.6" targetFramework="net461" />
7+
<package id="TrackableEntities.Common" version="2.5.7" targetFramework="net461" />
88
</packages>

‎NetCoreSample.Entities.Generated/App.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
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 -->
4+
55
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
6-
</configSections>
6+
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 --></configSections>
77
<entityFramework>
88
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
99
<parameters>

‎NetCoreSample.Entities.Generated/NetCoreSample.Entities.Generated.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@
3131
</PropertyGroup>
3232
<ItemGroup>
3333
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
34-
<HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
34+
<HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>
3535
</Reference>
3636
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
37-
<HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll</HintPath>
37+
<HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
3838
</Reference>
3939
<Reference Include="System" />
4040
<Reference Include="System.ComponentModel.DataAnnotations" />
@@ -47,7 +47,7 @@
4747
<Reference Include="System.Data" />
4848
<Reference Include="System.Xml" />
4949
<Reference Include="TrackableEntities.Common.Core, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
50-
<HintPath>..\packages\TrackableEntities.Common.Core.1.0.0-alpha\lib\netstandard2.0\TrackableEntities.Common.Core.dll</HintPath>
50+
<HintPath>..\packages\TrackableEntities.Common.Core.1.2.0\lib\netstandard2.0\TrackableEntities.Common.Core.dll</HintPath>
5151
</Reference>
5252
</ItemGroup>
5353
<ItemGroup>

‎NetCoreSample.Entities.Generated/packages.config‎

Lines changed: 2 additions & 2 deletions
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.3" targetFramework="net461" />
3+
<package id="EntityFramework" version="6.2.0" targetFramework="net461" />
44
<package id="TrackableEntities.CodeTemplates.Service.Net45" version="2.5.2" targetFramework="net461" />
5-
<package id="TrackableEntities.Common.Core" version="1.0.0-alpha" targetFramework="net461" />
5+
<package id="TrackableEntities.Common.Core" version="1.2.0" targetFramework="net461" />
66
</packages>

0 commit comments

Comments
 (0)