Skip to content

Commit 9eae405

Browse files
author
zzzprojects
committed
Update solution with shared project
Update solution with shared project
1 parent 9ad15c1 commit 9eae405

File tree

304 files changed

+6766
-4333
lines changed

Some content is hidden

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

304 files changed

+6766
-4333
lines changed

.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@ Z.Lab/
88
*.userprefs
99
_ReSharper.*
1010
*.ReSharper.user
11-
*.resharper.user
11+
*.resharper.user
12+
*.pfx

src/Z.EntityFramework.Plus.EF5.NET40/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@
1818
[assembly: AssemblyCulture("")]
1919
[assembly: ComVisible(false)]
2020
[assembly: Guid("e4c2af73-caeb-4429-bcb6-0a359484e064")]
21-
[assembly: AssemblyVersion("1.5.5")]
22-
[assembly: AssemblyFileVersion("1.5.5")]
21+
[assembly: AssemblyVersion("1.6.0")]
22+
[assembly: AssemblyFileVersion("1.6.0")]

src/Z.EntityFramework.Plus.EF5.NET40/Z.EntityFramework.Plus.EF5.NET40.csproj

+11-202
Large diffs are not rendered by default.

src/Z.EntityFramework.Plus.EF5/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@
1818
[assembly: AssemblyCulture("")]
1919
[assembly: ComVisible(false)]
2020
[assembly: Guid("abcbb878-043c-4957-a334-90e9872e684e")]
21-
[assembly: AssemblyVersion("1.5.5")]
22-
[assembly: AssemblyFileVersion("1.5.5")]
21+
[assembly: AssemblyVersion("1.6.0")]
22+
[assembly: AssemblyFileVersion("1.6.0")]

src/Z.EntityFramework.Plus.EF5/Z.EntityFramework.Plus.EF5.csproj

+13-206
Large diffs are not rendered by default.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="EntityFramework" version="5.0.0" targetFramework="net45" />
4+
</packages>

src/Z.EntityFramework.Plus.EF6.NET40/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@
1818
[assembly: AssemblyCulture("")]
1919
[assembly: ComVisible(false)]
2020
[assembly: Guid("ac398eb8-0a31-4d06-a804-84d10b6da96d")]
21-
[assembly: AssemblyVersion("1.5.5")]
22-
[assembly: AssemblyFileVersion("1.5.5")]
21+
[assembly: AssemblyVersion("1.6.0")]
22+
[assembly: AssemblyFileVersion("1.6.0")]

src/Z.EntityFramework.Plus.EF6.NET40/Z.EntityFramework.Plus.EF6.NET40.csproj

+12-225
Large diffs are not rendered by default.
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
32
<packages>
4-
<package id="EntityFramework" version="6.0.0" targetFramework="net4" />
3+
<package id="EntityFramework" version="6.0.0" targetFramework="net45" />
54
</packages>

src/Z.EntityFramework.Plus.EF6/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@
1818
[assembly: AssemblyCulture("")]
1919
[assembly: ComVisible(false)]
2020
[assembly: Guid("89f47e22-ff83-4ac8-be90-c6755748cf89")]
21-
[assembly: AssemblyVersion("1.5.5")]
22-
[assembly: AssemblyFileVersion("1.5.5")]
21+
[assembly: AssemblyVersion("1.6.0")]
22+
[assembly: AssemblyFileVersion("1.6.0")]

src/Z.EntityFramework.Plus.EF6/Z.EntityFramework.Plus.EF6.csproj

+15-237
Large diffs are not rendered by default.
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
32
<packages>
4-
<package id="Z.Expressions.Eval" version="1.0.0" targetFramework="net45" />
3+
<package id="EntityFramework" version="6.0.0" targetFramework="net45" />
54
</packages>

src/Z.EntityFramework.Plus.EFCore/Properties/AssemblyInfo.cs renamed to src/Z.EntityFramework.Plus.EFCore.NET451/Properties/AssemblyInfo.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
[assembly: AssemblyTrademark("SQL & .NET Tools")]
1818
[assembly: AssemblyCulture("")]
1919
[assembly: ComVisible(false)]
20-
[assembly: Guid("c41195f5-937e-4f2b-9f36-20650a804caa")]
21-
[assembly: AssemblyVersion("1.4.42")]
22-
[assembly: AssemblyFileVersion("1.4.42")]
20+
[assembly: Guid("035d058a-0dd2-4a74-b1e7-68e482c7c806")]
21+
[assembly: AssemblyVersion("1.6.0")]
22+
[assembly: AssemblyFileVersion("1.6.0")]
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4+
<PropertyGroup>
5+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7+
<ProjectGuid>{035D058A-0DD2-4A74-B1E7-68E482C7C806}</ProjectGuid>
8+
<OutputType>Library</OutputType>
9+
<AppDesignerFolder>Properties</AppDesignerFolder>
10+
<RootNamespace>Z.EntityFramework.Plus.EFCore.NET451</RootNamespace>
11+
<AssemblyName>Z.EntityFramework.Plus.EFCore</AssemblyName>
12+
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
13+
<FileAlignment>512</FileAlignment>
14+
<SccProjectName>SAK</SccProjectName>
15+
<SccLocalPath>SAK</SccLocalPath>
16+
<SccAuxPath>SAK</SccAuxPath>
17+
<SccProvider>SAK</SccProvider>
18+
</PropertyGroup>
19+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
20+
<DebugSymbols>true</DebugSymbols>
21+
<DebugType>full</DebugType>
22+
<Optimize>false</Optimize>
23+
<OutputPath>bin\Debug\</OutputPath>
24+
<DefineConstants>TRACE;DEBUG;EFCORE NET45 FULL</DefineConstants>
25+
<ErrorReport>prompt</ErrorReport>
26+
<WarningLevel>4</WarningLevel>
27+
</PropertyGroup>
28+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
29+
<DebugType>pdbonly</DebugType>
30+
<Optimize>true</Optimize>
31+
<OutputPath>bin\Release\</OutputPath>
32+
<DefineConstants>TRACE;EFCORE NET45 FULL</DefineConstants>
33+
<ErrorReport>prompt</ErrorReport>
34+
<WarningLevel>4</WarningLevel>
35+
</PropertyGroup>
36+
<PropertyGroup>
37+
<SignAssembly>true</SignAssembly>
38+
</PropertyGroup>
39+
<PropertyGroup>
40+
<AssemblyOriginatorKeyFile>zzzproject.pfx</AssemblyOriginatorKeyFile>
41+
</PropertyGroup>
42+
<ItemGroup>
43+
<Reference Include="Microsoft.EntityFrameworkCore, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
44+
<HintPath>..\packages\Microsoft.EntityFrameworkCore.1.0.0\lib\net451\Microsoft.EntityFrameworkCore.dll</HintPath>
45+
</Reference>
46+
<Reference Include="Microsoft.EntityFrameworkCore.Relational, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
47+
<HintPath>..\packages\Microsoft.EntityFrameworkCore.Relational.1.0.0\lib\net451\Microsoft.EntityFrameworkCore.Relational.dll</HintPath>
48+
</Reference>
49+
<Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
50+
<HintPath>..\packages\Microsoft.Extensions.Caching.Abstractions.1.0.0\lib\netstandard1.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
51+
</Reference>
52+
<Reference Include="Microsoft.Extensions.Caching.Memory, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
53+
<HintPath>..\packages\Microsoft.Extensions.Caching.Memory.1.0.0\lib\net451\Microsoft.Extensions.Caching.Memory.dll</HintPath>
54+
</Reference>
55+
<Reference Include="Microsoft.Extensions.DependencyInjection, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
56+
<HintPath>..\packages\Microsoft.Extensions.DependencyInjection.1.0.0\lib\netstandard1.1\Microsoft.Extensions.DependencyInjection.dll</HintPath>
57+
</Reference>
58+
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
59+
<HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.1.0.0\lib\netstandard1.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
60+
</Reference>
61+
<Reference Include="Microsoft.Extensions.Logging, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
62+
<HintPath>..\packages\Microsoft.Extensions.Logging.1.0.0\lib\netstandard1.1\Microsoft.Extensions.Logging.dll</HintPath>
63+
</Reference>
64+
<Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
65+
<HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.1.0.0\lib\netstandard1.1\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
66+
</Reference>
67+
<Reference Include="Microsoft.Extensions.Options, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
68+
<HintPath>..\packages\Microsoft.Extensions.Options.1.0.0\lib\netstandard1.0\Microsoft.Extensions.Options.dll</HintPath>
69+
</Reference>
70+
<Reference Include="Microsoft.Extensions.Primitives, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
71+
<HintPath>..\packages\Microsoft.Extensions.Primitives.1.0.0\lib\netstandard1.0\Microsoft.Extensions.Primitives.dll</HintPath>
72+
</Reference>
73+
<Reference Include="Remotion.Linq, Version=2.1.0.0, Culture=neutral, PublicKeyToken=fee00910d6e5f53b, processorArchitecture=MSIL">
74+
<HintPath>..\packages\Remotion.Linq.2.1.1\lib\net45\Remotion.Linq.dll</HintPath>
75+
</Reference>
76+
<Reference Include="System" />
77+
<Reference Include="System.Collections.Immutable, Version=1.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
78+
<HintPath>..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
79+
</Reference>
80+
<Reference Include="System.ComponentModel.Composition" />
81+
<Reference Include="System.ComponentModel.DataAnnotations" />
82+
<Reference Include="System.Core" />
83+
<Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
84+
<HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.0.0\lib\portable-net45+win8+wpa81\System.Diagnostics.DiagnosticSource.dll</HintPath>
85+
</Reference>
86+
<Reference Include="System.Interactive.Async, Version=3.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
87+
<HintPath>..\packages\System.Interactive.Async.3.0.0\lib\net45\System.Interactive.Async.dll</HintPath>
88+
</Reference>
89+
<Reference Include="System.IO.Compression" />
90+
<Reference Include="System.Numerics" />
91+
<Reference Include="System.Transactions" />
92+
<Reference Include="System.Xml.Linq" />
93+
<Reference Include="System.Data.DataSetExtensions" />
94+
<Reference Include="Microsoft.CSharp" />
95+
<Reference Include="System.Data" />
96+
<Reference Include="System.Net.Http" />
97+
<Reference Include="System.Xml" />
98+
</ItemGroup>
99+
<ItemGroup>
100+
<Compile Include="Properties\AssemblyInfo.cs" />
101+
</ItemGroup>
102+
<ItemGroup>
103+
<None Include="packages.config" />
104+
<None Include="zzzproject.pfx" />
105+
</ItemGroup>
106+
<Import Project="..\shared\Z.EF.Plus._Core.Shared\Z.EF.Plus._Core.Shared.projitems" Label="Shared" />
107+
<Import Project="..\shared\Z.EF.Plus._ExceptionMessage.Shared\Z.EF.Plus._ExceptionMessage.Shared.projitems" Label="Shared" />
108+
<Import Project="..\shared\Z.EF.Plus.Audit.Shared\Z.EF.Plus.Audit.Shared.projitems" Label="Shared" />
109+
<Import Project="..\shared\Z.EF.Plus.BatchDelete.Shared\Z.EF.Plus.BatchDelete.Shared.projitems" Label="Shared" />
110+
<Import Project="..\shared\Z.EF.Plus.BatchUpdate.Shared\Z.EF.Plus.BatchUpdate.Shared.projitems" Label="Shared" />
111+
<Import Project="..\shared\Z.EF.Plus.QueryCache.Shared\Z.EF.Plus.QueryCache.Shared.projitems" Label="Shared" />
112+
<Import Project="..\shared\Z.EF.Plus.QueryDeferred.Shared\Z.EF.Plus.QueryDeferred.Shared.projitems" Label="Shared" />
113+
<Import Project="..\shared\Z.EF.Plus.QueryFilter.Shared\Z.EF.Plus.QueryFilter.Shared.projitems" Label="Shared" />
114+
<Import Project="..\shared\Z.EF.Plus.QueryFuture.Shared\Z.EF.Plus.QueryFuture.Shared.projitems" Label="Shared" />
115+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
116+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
117+
Other similar extension points exist, see Microsoft.Common.targets.
118+
<Target Name="BeforeBuild">
119+
</Target>
120+
<Target Name="AfterBuild">
121+
</Target>
122+
-->
123+
</Project>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="Microsoft.EntityFrameworkCore" version="1.0.0" targetFramework="net451" />
4+
<package id="Microsoft.EntityFrameworkCore.Relational" version="1.0.0" targetFramework="net451" />
5+
<package id="Microsoft.Extensions.Caching.Abstractions" version="1.0.0" targetFramework="net451" />
6+
<package id="Microsoft.Extensions.Caching.Memory" version="1.0.0" targetFramework="net451" />
7+
<package id="Microsoft.Extensions.DependencyInjection" version="1.0.0" targetFramework="net451" />
8+
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="1.0.0" targetFramework="net451" />
9+
<package id="Microsoft.Extensions.Logging" version="1.0.0" targetFramework="net451" />
10+
<package id="Microsoft.Extensions.Logging.Abstractions" version="1.0.0" targetFramework="net451" />
11+
<package id="Microsoft.Extensions.Options" version="1.0.0" targetFramework="net451" />
12+
<package id="Microsoft.Extensions.Primitives" version="1.0.0" targetFramework="net451" />
13+
<package id="Remotion.Linq" version="2.1.1" targetFramework="net451" />
14+
<package id="System.Collections" version="4.0.11" targetFramework="net451" />
15+
<package id="System.Collections.Concurrent" version="4.0.12" targetFramework="net451" />
16+
<package id="System.Collections.Immutable" version="1.2.0" targetFramework="net451" />
17+
<package id="System.ComponentModel" version="4.0.1" targetFramework="net451" />
18+
<package id="System.Diagnostics.Debug" version="4.0.11" targetFramework="net451" />
19+
<package id="System.Diagnostics.DiagnosticSource" version="4.0.0" targetFramework="net451" />
20+
<package id="System.Globalization" version="4.0.11" targetFramework="net451" />
21+
<package id="System.Interactive.Async" version="3.0.0" targetFramework="net451" />
22+
<package id="System.Linq" version="4.1.0" targetFramework="net451" />
23+
<package id="System.Linq.Expressions" version="4.1.0" targetFramework="net451" />
24+
<package id="System.Linq.Queryable" version="4.0.1" targetFramework="net451" />
25+
<package id="System.ObjectModel" version="4.0.12" targetFramework="net451" />
26+
<package id="System.Reflection" version="4.1.0" targetFramework="net451" />
27+
<package id="System.Reflection.Extensions" version="4.0.1" targetFramework="net451" />
28+
<package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net451" />
29+
<package id="System.Runtime" version="4.1.0" targetFramework="net451" />
30+
<package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net451" />
31+
<package id="System.Runtime.InteropServices" version="4.1.0" targetFramework="net451" />
32+
<package id="System.Threading" version="4.0.11" targetFramework="net451" />
33+
<package id="System.Threading.Tasks" version="4.0.11" targetFramework="net451" />
34+
</packages>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup Label="Globals">
4+
<SccProjectName>SAK</SccProjectName>
5+
<SccProvider>SAK</SccProvider>
6+
<SccAuxPath>SAK</SccAuxPath>
7+
<SccLocalPath>SAK</SccLocalPath>
8+
</PropertyGroup>
9+
10+
<PropertyGroup>
11+
<TargetFramework>netstandard1.3</TargetFramework>
12+
<SignAssembly>True</SignAssembly>
13+
<AssemblyOriginatorKeyFile>zzzproject.pfx</AssemblyOriginatorKeyFile>
14+
<DelaySign>False</DelaySign>
15+
<Version>1.6.0</Version>
16+
<Description>Description: EF Bulk Operations &amp; Utilities | Bulk Insert, Update, Delete, Merge from database.</Description>
17+
<AssemblyName>Z.EntityFramework.Plus.EFCore</AssemblyName>
18+
<AssemblyVersion>1.6.0.0</AssemblyVersion>
19+
<FileVersion>1.6.0.0</FileVersion>
20+
</PropertyGroup>
21+
22+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
23+
<DefineConstants>TRACE;RELEASE;NETSTANDARD1_3 EFCORE NET45 FULL</DefineConstants>
24+
</PropertyGroup>
25+
26+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
27+
<DefineConstants>TRACE;DEBUG;NETSTANDARD1_3 EFCORE NET45 FULL</DefineConstants>
28+
</PropertyGroup>
29+
30+
<ItemGroup>
31+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="1.0.0" />
32+
<PackageReference Include="System.Reflection.Emit" Version="4.0.1" />
33+
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.1.0" />
34+
</ItemGroup>
35+
36+
<Import Project="..\shared\Z.EF.Plus._Core.Shared\Z.EF.Plus._Core.Shared.projitems" Label="Shared" />
37+
38+
<Import Project="..\shared\Z.EF.Plus._ExceptionMessage.Shared\Z.EF.Plus._ExceptionMessage.Shared.projitems" Label="Shared" />
39+
40+
<Import Project="..\shared\Z.EF.Plus.Audit.Shared\Z.EF.Plus.Audit.Shared.projitems" Label="Shared" />
41+
42+
<Import Project="..\shared\Z.EF.Plus.BatchDelete.Shared\Z.EF.Plus.BatchDelete.Shared.projitems" Label="Shared" />
43+
44+
<Import Project="..\shared\Z.EF.Plus.BatchUpdate.Shared\Z.EF.Plus.BatchUpdate.Shared.projitems" Label="Shared" />
45+
46+
<Import Project="..\shared\Z.EF.Plus.QueryCache.Shared\Z.EF.Plus.QueryCache.Shared.projitems" Label="Shared" />
47+
48+
<Import Project="..\shared\Z.EF.Plus.QueryDeferred.Shared\Z.EF.Plus.QueryDeferred.Shared.projitems" Label="Shared" />
49+
50+
<Import Project="..\shared\Z.EF.Plus.QueryFilter.Shared\Z.EF.Plus.QueryFilter.Shared.projitems" Label="Shared" />
51+
52+
<Import Project="..\shared\Z.EF.Plus.QueryFuture.Shared\Z.EF.Plus.QueryFuture.Shared.projitems" Label="Shared" />
53+
54+
</Project>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
""
2+
{
3+
"FILE_VERSION" = "9237"
4+
"ENLISTMENT_CHOICE" = "NEVER"
5+
"PROJECT_FILE_RELATIVE_PATH" = ""
6+
"NUMBER_OF_EXCLUDED_FILES" = "0"
7+
"ORIGINAL_PROJECT_FILE_PATH" = ""
8+
"NUMBER_OF_NESTED_PROJECTS" = "0"
9+
"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER"
10+
}

src/Z.EntityFramework.Plus.EFCore/Z.EntityFramework.Plus.EFCore.xproj

-33
This file was deleted.

src/Z.EntityFramework.Plus.EFCore/project.json

-35
This file was deleted.

0 commit comments

Comments
 (0)