Merge remote-tracking branch 'visSoft/EFHooks/master'

Conflicts: .gitignore EFHooks.Tests/App.config EFHooks.Tests/EFHooks.Tests.csproj EFHooks.Tests/HookedDbContextTests.cs EFHooks.Tests/packages.config EFHooks/App.config EFHooks/EFHooks.csproj EFHooks/HookEntityMetadata.cs EFHooks/HookedDbContext.cs EFHooks/packages.config
visoft · May 28, 2013 · 2603a4f · 2603a4f
2 parents 07e999d + e1e6d7d
commit 2603a4f
Show file tree

Hide file tree

Showing 75 changed files with 80,921 additions and 111 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,7 +7,10 @@ build/
 *.suo
 *.sln.cache
 _ReSharper.*/
+*.dotCover
 *.user
 *.vs10x
 *.docstates
-EFHooks.ncrunchsolution
+*.ncrunchsolution
+*.nupkg
+*.ncrunchproject
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,17 @@
+## 1.0.2.0
+
+* Upgraded Entity Framework to v4.2.0.0
+
+## 1.0.3.0
+
+* Stopped checking validation on Unchanged entities as this prevents stubs from being used (for things like associations)
+
+## 1.0.4.0
+
+* Upgraded Entity Framework to v5.0.0
+* New .NET 4.0 and .NET 4.5 assemblies
+
+
+## 1.0.5.0
+
+* Merged branches of Visoft and Robert Sirre, adding metadata validation upon save (4.5 feature)
diff --git a/EFHooks.NET45/App.config b/EFHooks.NET45/App.config
@@ -0,0 +1,14 @@
+<?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, EntityFramework, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+  </configSections>
+  <entityFramework>
+    <defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
+      <parameters>
+        <parameter value="v11.0" />
+      </parameters>
+    </defaultConnectionFactory>
+  </entityFramework>
+</configuration>
diff --git a/EFHooks.NET45/EFHooks.NET45.csproj b/EFHooks.NET45/EFHooks.NET45.csproj
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{A06C0D39-588B-4F1D-8F4B-A9BAC5930E5C}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>EFHooks</RootNamespace>
+    <AssemblyName>EFHooks</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\lib\net45\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>..\lib\net45\EFHooks.XML</DocumentationFile>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>..\EFHooks\EFHooks.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="EntityFramework">
+      <HintPath>..\packages\EntityFramework.5.0.0\lib\net45\EntityFramework.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Data.Entity" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\EFHooks\HookedDbContext.cs">
+      <Link>HookedDbContext.cs</Link>
+    </Compile>
+    <Compile Include="..\EFHooks\HookedEntityEntry.cs">
+      <Link>HookedEntityEntry.cs</Link>
+    </Compile>
+    <Compile Include="..\EFHooks\HookEntityMetadata.cs">
+      <Link>HookEntityMetadata.cs</Link>
+    </Compile>
+    <Compile Include="..\EFHooks\IHook.cs">
+      <Link>IHook.cs</Link>
+    </Compile>
+    <Compile Include="..\EFHooks\IPostActionHook.cs">
+      <Link>IPostActionHook.cs</Link>
+    </Compile>
+    <Compile Include="..\EFHooks\IPreActionHook.cs">
+      <Link>IPreActionHook.cs</Link>
+    </Compile>
+    <Compile Include="..\EFHooks\PostActionHook.cs">
+      <Link>PostActionHook.cs</Link>
+    </Compile>
+    <Compile Include="..\EFHooks\PostDeleteHook.cs">
+      <Link>PostDeleteHook.cs</Link>
+    </Compile>
+    <Compile Include="..\EFHooks\PostInsertHook.cs">
+      <Link>PostInsertHook.cs</Link>
+    </Compile>
+    <Compile Include="..\EFHooks\PostUpdateHook.cs">
+      <Link>PostUpdateHook.cs</Link>
+    </Compile>
+    <Compile Include="..\EFHooks\PreActionHook.cs">
+      <Link>PreActionHook.cs</Link>
+    </Compile>
+    <Compile Include="..\EFHooks\PreDeleteHook.cs">
+      <Link>PreDeleteHook.cs</Link>
+    </Compile>
+    <Compile Include="..\EFHooks\PreInsertHook.cs">
+      <Link>PreInsertHook.cs</Link>
+    </Compile>
+    <Compile Include="..\EFHooks\PreUpdateHook.cs">
+      <Link>PreUpdateHook.cs</Link>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\EFHooks\EFHooks.snk">
+      <Link>EFHooks.snk</Link>
+    </None>
+    <None Include="App.config" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
diff --git a/EFHooks.NET45/Properties/AssemblyInfo.cs b/EFHooks.NET45/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("EFHooks.NET45")]
+[assembly: AssemblyDescription("Entity Framework Hooking Tools")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Visoft, Inc., Robert Sirre software development")]
+[assembly: AssemblyProduct("EFHooks.NET45")]
+[assembly: AssemblyCopyright("Copyright © 2013")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("57602e84-5d5c-485e-99f9-a7841dd929c9")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// 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("1.0.5.0")]
+[assembly: AssemblyFileVersion("1.0.5.0")]
diff --git a/EFHooks.NET45/packages.config b/EFHooks.NET45/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="EntityFramework" version="5.0.0" targetFramework="net45" />
+</packages>
diff --git a/EFHooks.Tests.NET45/App.config b/EFHooks.Tests.NET45/App.config
@@ -0,0 +1,14 @@
+<?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, EntityFramework, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+  </configSections>
+  <entityFramework>
+    <defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
+      <parameters>
+        <parameter value="v11.0" />
+      </parameters>
+    </defaultConnectionFactory>
+  </entityFramework>
+</configuration>
diff --git a/EFHooks.Tests.NET45/EFHooks.Tests.NET45.csproj b/EFHooks.Tests.NET45/EFHooks.Tests.NET45.csproj
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{D9C0300F-4E3A-4A79-9E1B-236224B013E7}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>EFHooks.Tests</RootNamespace>
+    <AssemblyName>EFHooks.Tests</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="EntityFramework">
+      <HintPath>..\packages\EntityFramework.5.0.0\lib\net45\EntityFramework.dll</HintPath>
+    </Reference>
+    <Reference Include="FakeItEasy">
+      <HintPath>..\packages\FakeItEasy.1.11.0\lib\net40\FakeItEasy.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.framework, Version=2.6.2.12296, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.2.6.2\lib\nunit.framework.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Data.Entity" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\EFHooks.Tests\HookedDbContextTests.cs">
+      <Link>HookedDbContextTests.cs</Link>
+    </Compile>
+    <Compile Include="..\EFHooks.Tests\Hooks\HookEntityMetadataTests.cs">
+      <Link>Hooks\HookEntityMetadataTests.cs</Link>
+    </Compile>
+    <Compile Include="..\EFHooks.Tests\Hooks\ISoftDeleted.cs">
+      <Link>Hooks\ISoftDeleted.cs</Link>
+    </Compile>
+    <Compile Include="..\EFHooks.Tests\Hooks\ITimeStamped.cs">
+      <Link>Hooks\ITimeStamped.cs</Link>
+    </Compile>
+    <Compile Include="..\EFHooks.Tests\Hooks\PostDeleteHookTests.cs">
+      <Link>Hooks\PostDeleteHookTests.cs</Link>
+    </Compile>
+    <Compile Include="..\EFHooks.Tests\Hooks\PostInsertHookTests.cs">
+      <Link>Hooks\PostInsertHookTests.cs</Link>
+    </Compile>
+    <Compile Include="..\EFHooks.Tests\Hooks\PostUpdateHookTests.cs">
+      <Link>Hooks\PostUpdateHookTests.cs</Link>
+    </Compile>
+    <Compile Include="..\EFHooks.Tests\Hooks\PreDeleteHookTests.cs">
+      <Link>Hooks\PreDeleteHookTests.cs</Link>
+    </Compile>
+    <Compile Include="..\EFHooks.Tests\Hooks\PreInsertHookTests.cs">
+      <Link>Hooks\PreInsertHookTests.cs</Link>
+    </Compile>
+    <Compile Include="..\EFHooks.Tests\Hooks\PreUpdateHookTests.cs">
+      <Link>Hooks\PreUpdateHookTests.cs</Link>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\EFHooks.NET45\EFHooks.NET45.csproj">
+      <Project>{a06c0d39-588b-4f1d-8f4b-a9bac5930e5c}</Project>
+      <Name>EFHooks.NET45</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
diff --git a/EFHooks.Tests.NET45/Properties/AssemblyInfo.cs b/EFHooks.Tests.NET45/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("EFHooks.Tests.NET45")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Visoft, Inc., Robert Sirre software development")]
+[assembly: AssemblyProduct("EFHooks.Tests.NET45")]
+[assembly: AssemblyCopyright("Copyright © 2013")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("975ad2da-d91c-4ca0-b14f-64bb9b0e5907")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// 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("1.0.5.0")]
+[assembly: AssemblyFileVersion("1.0.5.0")]
diff --git a/EFHooks.Tests.NET45/packages.config b/EFHooks.Tests.NET45/packages.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="EntityFramework" version="5.0.0" targetFramework="net45" />
+  <package id="FakeItEasy" version="1.11.0" targetFramework="net45" />
+  <package id="NUnit" version="2.6.2" targetFramework="net45" />
+</packages>
diff --git a/EFHooks.Tests/App.config b/EFHooks.Tests/App.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <configSections>
-    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
     <!-- 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, EntityFramework, Version=4.4.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
   </configSections>
   <entityFramework>
     <defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
@@ -11,7 +11,4 @@
       </parameters>
     </defaultConnectionFactory>
   </entityFramework>
-  <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
-  </startup>
 </configuration>