Skip to content

Commit 24e0ea7

Browse files
tonysneedtonysneed
authored
Merge pull request #8 from TrackableEntities/update-3-1-1
Update to v 3.1.1
2 parents aebd118 + 05cd832 commit 24e0ea7

37 files changed

Lines changed: 1416 additions & 121 deletions

‎NetCoreSample.ConsoleClient/App.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<startup>
4-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
55
</startup>
66
<runtime>
77
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
@@ -15,4 +15,4 @@
1515
</dependentAssembly>
1616
</assemblyBinding>
1717
</runtime>
18-
</configuration>
18+
</configuration>

‎NetCoreSample.ConsoleClient/NetCoreSample.ConsoleClient.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@
88
<OutputType>Exe</OutputType>
99
<RootNamespace>NetCoreSample.ConsoleClient</RootNamespace>
1010
<AssemblyName>NetCoreSample.ConsoleClient</AssemblyName>
11-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
11+
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
1212
<FileAlignment>512</FileAlignment>
1313
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
14+
<TargetFrameworkProfile />
1415
</PropertyGroup>
1516
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1617
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -36,7 +37,7 @@
3637
<HintPath>..\packages\AspNetWebApi2Helpers.Serialization.1.0.0\lib\portable-net45+win+wpa81+wp80\AspnetWebApi2Helpers.Serialization.dll</HintPath>
3738
</Reference>
3839
<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>
40+
<HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
4041
</Reference>
4142
<Reference Include="System" />
4243
<Reference Include="System.Core" />

‎NetCoreSample.ConsoleClient/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<packages>
33
<package id="AspNetWebApi2Helpers.Serialization" version="1.0.0" targetFramework="net461" />
44
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.7" targetFramework="net461" />
5-
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="net461" />
5+
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net48" />
66
<package id="TrackableEntities.Client" version="2.5.7" targetFramework="net461" />
77
<package id="TrackableEntities.Common" version="2.5.7" targetFramework="net461" />
88
</packages>

‎NetCoreSample.Entities.Client/App.config‎

Lines changed: 4 additions & 4 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-
5-
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
6-
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 --></configSections>
4+
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
5+
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
6+
</configSections>
77
<entityFramework>
88
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
99
<parameters>
@@ -25,4 +25,4 @@
2525
</dependentAssembly>
2626
</assemblyBinding>
2727
</runtime>
28-
</configuration>
28+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" /></startup></configuration>

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

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
34
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
45
<PropertyGroup>
56
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -9,8 +10,11 @@
910
<AppDesignerFolder>Properties</AppDesignerFolder>
1011
<RootNamespace>NetCoreSample.Entities.Client</RootNamespace>
1112
<AssemblyName>NetCoreSample.Entities.Client</AssemblyName>
12-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
1314
<FileAlignment>512</FileAlignment>
15+
<NuGetPackageImportStamp>
16+
</NuGetPackageImportStamp>
17+
<TargetFrameworkProfile />
1418
</PropertyGroup>
1519
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1620
<DebugSymbols>true</DebugSymbols>
@@ -31,13 +35,13 @@
3135
</PropertyGroup>
3236
<ItemGroup>
3337
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
34-
<HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>
38+
<HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
3539
</Reference>
3640
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
37-
<HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
41+
<HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
3842
</Reference>
3943
<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>
44+
<HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
4145
</Reference>
4246
<Reference Include="System" />
4347
<Reference Include="System.ComponentModel.DataAnnotations" />
@@ -82,4 +86,12 @@
8286
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
8387
</ItemGroup>
8488
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
89+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
90+
<PropertyGroup>
91+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
92+
</PropertyGroup>
93+
<Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
94+
<Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
95+
</Target>
96+
<Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
8597
</Project>

‎NetCoreSample.Entities.Client/packages.config‎

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

‎NetCoreSample.Entities.Generated/App.config‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<configSections>
4-
5-
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
6-
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 --></configSections>
4+
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
5+
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
6+
</configSections>
77
<entityFramework>
88
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
99
<parameters>
10-
<parameter value="mssqllocaldb" />
10+
<parameter value="mssqllocaldb"/>
1111
</parameters>
1212
</defaultConnectionFactory>
1313
<providers>
14-
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
14+
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer"/>
1515
</providers>
1616
</entityFramework>
1717
<connectionStrings>
18-
<add name="NorthwindSlim" connectionString="data source=(localdb)\MsSqlLocalDb;initial catalog=NorthwindSlim;integrated security=True;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />
18+
<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-
</configuration>
20+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>

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

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
34
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
45
<PropertyGroup>
56
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -9,8 +10,11 @@
910
<AppDesignerFolder>Properties</AppDesignerFolder>
1011
<RootNamespace>NetCoreSample.Entities</RootNamespace>
1112
<AssemblyName>NetCoreSample.Entities.Generated</AssemblyName>
12-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
1314
<FileAlignment>512</FileAlignment>
15+
<NuGetPackageImportStamp>
16+
</NuGetPackageImportStamp>
17+
<TargetFrameworkProfile />
1418
</PropertyGroup>
1519
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1620
<DebugSymbols>true</DebugSymbols>
@@ -31,10 +35,10 @@
3135
</PropertyGroup>
3236
<ItemGroup>
3337
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
34-
<HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>
38+
<HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
3539
</Reference>
3640
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
37-
<HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
41+
<HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
3842
</Reference>
3943
<Reference Include="System" />
4044
<Reference Include="System.ComponentModel.DataAnnotations" />
@@ -47,7 +51,7 @@
4751
<Reference Include="System.Data" />
4852
<Reference Include="System.Xml" />
4953
<Reference Include="TrackableEntities.Common.Core, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
50-
<HintPath>..\packages\TrackableEntities.Common.Core.1.2.0\lib\netstandard2.0\TrackableEntities.Common.Core.dll</HintPath>
54+
<HintPath>..\packages\TrackableEntities.Common.Core.3.1.1\lib\netstandard2.0\TrackableEntities.Common.Core.dll</HintPath>
5155
</Reference>
5256
</ItemGroup>
5357
<ItemGroup>
@@ -77,4 +81,12 @@
7781
<Content Include="CodeTemplates\ReverseEngineerCodeFirst\Mapping.tt" />
7882
</ItemGroup>
7983
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
84+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
85+
<PropertyGroup>
86+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
87+
</PropertyGroup>
88+
<Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
89+
<Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
90+
</Target>
91+
<Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
8092
</Project>

‎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.2.0" targetFramework="net461" />
3+
<package id="EntityFramework" version="6.4.4" targetFramework="net461" />
44
<package id="TrackableEntities.CodeTemplates.Service.Net45" version="2.5.2" targetFramework="net461" />
5-
<package id="TrackableEntities.Common.Core" version="1.2.0" targetFramework="net461" />
5+
<package id="TrackableEntities.Common.Core" version="3.1.1" targetFramework="net48" />
66
</packages>

‎NetCoreSample.Entities/NetCoreSample.Entities.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
</ItemGroup>
1717

1818
<ItemGroup>
19-
<PackageReference Include="TrackableEntities.Common.Core" Version="1.2.0" />
19+
<PackageReference Include="TrackableEntities.Common.Core" Version="3.1.1" />
2020
</ItemGroup>
2121

2222
<ItemGroup>
2323
<Reference Include="System.ComponentModel.DataAnnotations">
24-
<HintPath>..\..\..\..\..\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\System.ComponentModel.DataAnnotations.dll</HintPath>
24+
<HintPath>..\..\..\..\..\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.8\System.ComponentModel.DataAnnotations.dll</HintPath>
2525
</Reference>
2626
</ItemGroup>
2727

0 commit comments

Comments
 (0)