Update assembly and dependencies version

zzzprojects · Feb 25, 2020 · d85a544 · d85a544
1 parent 23c0d4b
commit d85a544
Show file tree

Hide file tree

Showing 10 changed files with 55 additions and 26 deletions.
diff --git a/Main/Source/Z.EntityFramework.Classic.Effort.Net40/App.config b/Main/Source/Z.EntityFramework.Classic.Effort.Net40/App.config
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
+  <configSections>
+    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
+    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, Z.EntityFramework.Classic, Version=7.0.0.0, Culture=neutral, PublicKeyToken=afc61983f100d280" requirePermission="false" />
+  </configSections>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
@@ -8,4 +12,10 @@
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
+  <entityFramework>
+    <defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, Z.EntityFramework.Classic" />
+    <providers>
+      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, Z.EntityFramework.Classic.SqlServer" />
+    </providers>
+  </entityFramework>
 </configuration>
diff --git a/Main/Source/Z.EntityFramework.Classic.Effort.Net40/Properties/AssemblyInfo.cs b/Main/Source/Z.EntityFramework.Classic.Effort.Net40/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.0.0")]
-[assembly: AssemblyFileVersion("2.0.0.0")]
+[assembly: AssemblyVersion("2.2.9")]
+[assembly: AssemblyFileVersion("2.2.9")]
diff --git a/...urce/Z.EntityFramework.Classic.Effort.Net40/Z.EntityFramework.Classic.Effort.Net40.csproj b/...urce/Z.EntityFramework.Classic.Effort.Net40/Z.EntityFramework.Classic.Effort.Net40.csproj
@@ -38,6 +38,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
+    <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Transactions" />
@@ -47,16 +48,16 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
     <Reference Include="Z.EntityFramework.Classic, Version=7.0.0.0, Culture=neutral, PublicKeyToken=afc61983f100d280, processorArchitecture=MSIL">
-      <HintPath>..\packages\Z.EntityFramework.Classic.7.0.15\lib\net40\Z.EntityFramework.Classic.dll</HintPath>
+      <HintPath>..\packages\Z.EntityFramework.Classic.7.1.24\lib\net40\Z.EntityFramework.Classic.dll</HintPath>
     </Reference>
     <Reference Include="Z.EntityFramework.Classic.SqlServer, Version=7.0.0.0, Culture=neutral, PublicKeyToken=afc61983f100d280, processorArchitecture=MSIL">
-      <HintPath>..\packages\Z.EntityFramework.Classic.7.0.15\lib\net40\Z.EntityFramework.Classic.SqlServer.dll</HintPath>
+      <HintPath>..\packages\Z.EntityFramework.Classic.7.1.24\lib\net40\Z.EntityFramework.Classic.SqlServer.dll</HintPath>
     </Reference>
-    <Reference Include="Z.EntityFramework.Extensions.Classic, Version=3.15.21.0, Culture=neutral, PublicKeyToken=59b66d028979105b, processorArchitecture=MSIL">
-      <HintPath>..\packages\Z.EntityFramework.Extensions.Classic.3.15.21\lib\net40\Z.EntityFramework.Extensions.Classic.dll</HintPath>
+    <Reference Include="Z.EntityFramework.Extensions.Classic, Version=4.0.52.0, Culture=neutral, PublicKeyToken=59b66d028979105b, processorArchitecture=MSIL">
+      <HintPath>..\packages\Z.EntityFramework.Extensions.Classic.4.0.52\lib\net40\Z.EntityFramework.Extensions.Classic.dll</HintPath>
     </Reference>
-    <Reference Include="Z.Expressions.Eval, Version=2.7.7.0, Culture=neutral, PublicKeyToken=59b66d028979105b, processorArchitecture=MSIL">
-      <HintPath>..\packages\Z.Expressions.Eval.2.7.7\lib\net40\Z.Expressions.Eval.dll</HintPath>
+    <Reference Include="Z.Expressions.Eval, Version=3.1.6.0, Culture=neutral, PublicKeyToken=59b66d028979105b, processorArchitecture=MSIL">
+      <HintPath>..\packages\Z.Expressions.Eval.3.1.6\lib\net40\Z.Expressions.Eval.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -75,4 +76,4 @@
   </ItemGroup>
   <Import Project="..\Effort.Shared\Effort.Shared.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>
diff --git a/Main/Source/Z.EntityFramework.Classic.Effort.Net40/packages.config b/Main/Source/Z.EntityFramework.Classic.Effort.Net40/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Z.EntityFramework.Classic" version="7.0.15" targetFramework="net40" />
-  <package id="Z.EntityFramework.Extensions.Classic" version="3.15.21" targetFramework="net40" />
-  <package id="Z.Expressions.Eval" version="2.7.7" targetFramework="net40" />
+  <package id="Z.EntityFramework.Classic" version="7.1.24" targetFramework="net40" />
+  <package id="Z.EntityFramework.Extensions.Classic" version="4.0.52" targetFramework="net40" />
+  <package id="Z.Expressions.Eval" version="3.1.6" targetFramework="net40" />
 </packages>
diff --git a/Main/Source/Z.EntityFramework.Classic.Effort.Net45/App.config b/Main/Source/Z.EntityFramework.Classic.Effort.Net45/App.config
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
+  <configSections>
+    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
+    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, Z.EntityFramework.Classic, Version=7.0.0.0, Culture=neutral, PublicKeyToken=afc61983f100d280" requirePermission="false" />
+  </configSections>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
@@ -8,4 +12,10 @@
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
+  <entityFramework>
+    <defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, Z.EntityFramework.Classic" />
+    <providers>
+      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, Z.EntityFramework.Classic.SqlServer" />
+    </providers>
+  </entityFramework>
 </configuration>
diff --git a/Main/Source/Z.EntityFramework.Classic.Effort.Net45/Properties/AssemblyInfo.cs b/Main/Source/Z.EntityFramework.Classic.Effort.Net45/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.0.0")]
-[assembly: AssemblyFileVersion("2.0.0.0")]
+[assembly: AssemblyVersion("2.2.9")]
+[assembly: AssemblyFileVersion("2.2.9")]
diff --git a/...urce/Z.EntityFramework.Classic.Effort.Net45/Z.EntityFramework.Classic.Effort.Net45.csproj b/...urce/Z.EntityFramework.Classic.Effort.Net45/Z.EntityFramework.Classic.Effort.Net45.csproj
@@ -49,16 +49,16 @@
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
     <Reference Include="Z.EntityFramework.Classic, Version=7.0.0.0, Culture=neutral, PublicKeyToken=afc61983f100d280, processorArchitecture=MSIL">
-      <HintPath>..\packages\Z.EntityFramework.Classic.7.0.15\lib\net45\Z.EntityFramework.Classic.dll</HintPath>
+      <HintPath>..\packages\Z.EntityFramework.Classic.7.1.24\lib\net45\Z.EntityFramework.Classic.dll</HintPath>
     </Reference>
     <Reference Include="Z.EntityFramework.Classic.SqlServer, Version=7.0.0.0, Culture=neutral, PublicKeyToken=afc61983f100d280, processorArchitecture=MSIL">
-      <HintPath>..\packages\Z.EntityFramework.Classic.7.0.15\lib\net45\Z.EntityFramework.Classic.SqlServer.dll</HintPath>
+      <HintPath>..\packages\Z.EntityFramework.Classic.7.1.24\lib\net45\Z.EntityFramework.Classic.SqlServer.dll</HintPath>
     </Reference>
-    <Reference Include="Z.EntityFramework.Extensions.Classic, Version=3.15.21.0, Culture=neutral, PublicKeyToken=59b66d028979105b, processorArchitecture=MSIL">
-      <HintPath>..\packages\Z.EntityFramework.Extensions.Classic.3.15.21\lib\net45\Z.EntityFramework.Extensions.Classic.dll</HintPath>
+    <Reference Include="Z.EntityFramework.Extensions.Classic, Version=4.0.52.0, Culture=neutral, PublicKeyToken=59b66d028979105b, processorArchitecture=MSIL">
+      <HintPath>..\packages\Z.EntityFramework.Extensions.Classic.4.0.52\lib\net45\Z.EntityFramework.Extensions.Classic.dll</HintPath>
     </Reference>
-    <Reference Include="Z.Expressions.Eval, Version=2.7.7.0, Culture=neutral, PublicKeyToken=59b66d028979105b, processorArchitecture=MSIL">
-      <HintPath>..\packages\Z.Expressions.Eval.2.7.7\lib\net45\Z.Expressions.Eval.dll</HintPath>
+    <Reference Include="Z.Expressions.Eval, Version=3.1.6.0, Culture=neutral, PublicKeyToken=59b66d028979105b, processorArchitecture=MSIL">
+      <HintPath>..\packages\Z.Expressions.Eval.3.1.6\lib\net45\Z.Expressions.Eval.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -77,4 +77,4 @@
   </ItemGroup>
   <Import Project="..\Effort.Shared\Effort.Shared.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>
diff --git a/Main/Source/Z.EntityFramework.Classic.Effort.Net45/packages.config b/Main/Source/Z.EntityFramework.Classic.Effort.Net45/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Z.EntityFramework.Classic" version="7.0.15" targetFramework="net45" />
-  <package id="Z.EntityFramework.Extensions.Classic" version="3.15.21" targetFramework="net45" />
-  <package id="Z.Expressions.Eval" version="2.7.7" targetFramework="net45" />
+  <package id="Z.EntityFramework.Classic" version="7.1.24" targetFramework="net45" />
+  <package id="Z.EntityFramework.Extensions.Classic" version="4.0.52" targetFramework="net45" />
+  <package id="Z.Expressions.Eval" version="3.1.6" targetFramework="net45" />
 </packages>
diff --git a/...mework.Classic.Effort.NetStandard20/Z.EntityFramework.Classic.Effort.NetStandard20.csproj b/...mework.Classic.Effort.NetStandard20/Z.EntityFramework.Classic.Effort.NetStandard20.csproj
@@ -7,7 +7,7 @@
     <AssemblyName>Z.EntityFramework.Classic.Effort</AssemblyName>
     <RootNamespace>Z.EntityFramework.Classic.Effort</RootNamespace>
     <Authors>ZZZ Projects</Authors>
-    <Version>2.0.0</Version>
+    <Version>2.2.9</Version>
     <DelaySign>false</DelaySign>
   </PropertyGroup>
 
@@ -26,7 +26,7 @@
     <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
     <PackageReference Include="System.Reflection.Emit" Version="4.3.0" />
     <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.3.0" />
-    <PackageReference Include="Z.EntityFramework.Classic" Version="7.0.15" />
+    <PackageReference Include="Z.EntityFramework.Classic" Version="7.1.24" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Main/Source/lab/Z.Lab.EFClassic/App.config b/Main/Source/lab/Z.Lab.EFClassic/App.config
@@ -14,4 +14,12 @@
       <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, Z.EntityFramework.Classic.SqlServer" />
     </providers>
   </entityFrameworkClassic>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Z.Expressions.Eval" publicKeyToken="59b66d028979105b" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.7.9.0" newVersion="2.7.9.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
 </configuration>