Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge develop to master #9

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System;

namespace EntityFramework.Toolkit.EF6.Contracts.Auditing
namespace EntityFramework.Toolkit.Core.Auditing
{
/// <summary>
/// Base class for audit entities.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System;

namespace EntityFramework.Toolkit.EF6.Contracts.Auditing
namespace EntityFramework.Toolkit.Core.Auditing
{
/// <summary>
/// Describes the state of an audit entity.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System;

namespace EntityFramework.Toolkit.EF6.Contracts.Auditing
namespace EntityFramework.Toolkit.Core.Auditing
{
/// <summary>
/// Any class used for auditing an entity must implement this inteface.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System;

namespace EntityFramework.Toolkit.EF6.Contracts.Auditing
namespace EntityFramework.Toolkit.Core.Auditing
{
public interface ICreatedDate
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System;

namespace EntityFramework.Toolkit.EF6.Contracts.Auditing
namespace EntityFramework.Toolkit.Core.Auditing
{
public interface IUpdatedDate
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Diagnostics;

namespace EntityFramework.Toolkit.EF6.Contracts
namespace EntityFramework.Toolkit.Core
{
[DebuggerDisplay("ChangedEntity='{ChangedEntity}', State={State}", Type = "Change")]
public class Change : IChange
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using System.Diagnostics;
using System.Linq;

namespace EntityFramework.Toolkit.EF6.Contracts
namespace EntityFramework.Toolkit.Core
{
[DebuggerDisplay("ChangeSet: Context='{this.Context.Name}', Changes={this.Changes.Count()}", Type = "Change")]
public class ChangeSet
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace EntityFramework.Toolkit.EF6.Contracts
namespace EntityFramework.Toolkit.Core
{
public enum ChangeState
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<Version>1.0.0</Version>
<Authors>Thomas Galliker</Authors>
<TargetFrameworks>net40;net45</TargetFrameworks>
<AssemblyName>EntityFramework.Toolkit.EF6.Contracts</AssemblyName>
<PackageId>EntityFramework.Toolkit.Contracts</PackageId>
<AssemblyName>EntityFramework.Toolkit.Core</AssemblyName>
<PackageId>EntityFramework.Toolkit.Core</PackageId>
<PackageTags>Entity Framework EntityFramework EF6 UnitOfWork IUnitOfWork Repository IRepository GenericRepository IGenericRepository DbContext DbContextBase ContextTestBase</PackageTags>
<PackageIconUrl>https://raw.githubusercontent.com/thomasgalliker/EntityFramework.Toolkit/master/EntityFramework.Toolkit.png</PackageIconUrl>
<PackageProjectUrl>https://github.com/thomasgalliker/EntityFramework.Toolkit</PackageProjectUrl>
Expand All @@ -34,7 +34,7 @@
<Company>superdev GmbH</Company>
<Product>EntityFramework.Toolkit.Contracts</Product>
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
<RootNamespace>EntityFramework.Toolkit.EF6.Contracts</RootNamespace>
<RootNamespace>EntityFramework.Toolkit.Core</RootNamespace>
<PackageReleaseNotes>2.0.0
- Renamed namespaces to EntityFramework.Toolkit.EF6
- Removed obsolete code from version 1.x
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System;

namespace EntityFramework.Toolkit.EF6.Contracts.Extensions
namespace EntityFramework.Toolkit.Core.Extensions
{
public static class DateTimeExtensions
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using System.Linq;
using System.Linq.Expressions;

namespace EntityFramework.Toolkit.EF6.Contracts.Extensions
namespace EntityFramework.Toolkit.Core.Extensions
{
public static class GenericRepositoryExtensions
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using System.Linq;
using System.Linq.Expressions;

namespace EntityFramework.Toolkit.EF6.Contracts.Extensions
namespace EntityFramework.Toolkit.Core.Extensions
{
public static class ReadOnlyRepositoryExtensions
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using System.Threading.Tasks;
#endif

namespace EntityFramework.Toolkit.EF6.Contracts
namespace EntityFramework.Toolkit.Core
{
public interface IAuditContext : IContext
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.Collections.Generic;

namespace EntityFramework.Toolkit.EF6.Contracts
namespace EntityFramework.Toolkit.Core
{
/// <summary>
/// Interface for changed objects and object properties.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using System.Threading.Tasks;
#endif

namespace EntityFramework.Toolkit.EF6.Contracts
namespace EntityFramework.Toolkit.Core
{
public interface IContext : IDisposable
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System;
using System.Linq.Expressions;

namespace EntityFramework.Toolkit.EF6.Contracts
namespace EntityFramework.Toolkit.Core
{
public interface IDataSeed
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace EntityFramework.Toolkit.EF6.Contracts
namespace EntityFramework.Toolkit.Core
{
public interface IDbConnection
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Linq.Expressions;

namespace EntityFramework.Toolkit.EF6.Contracts
namespace EntityFramework.Toolkit.Core
{
/// <summary>
/// Abstraction of a generic repository.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using System.Linq;
using System.Linq.Expressions;

namespace EntityFramework.Toolkit.EF6.Contracts
namespace EntityFramework.Toolkit.Core
{
public interface IQueryableIncluding<T> : IQueryable<T>
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using System.Linq;
using System.Linq.Expressions;

namespace EntityFramework.Toolkit.EF6.Contracts
namespace EntityFramework.Toolkit.Core
{
public interface IReadOnlyRepository<T> : IRepository
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System;

namespace EntityFramework.Toolkit.EF6.Contracts
namespace EntityFramework.Toolkit.Core
{
public interface IRepository : IDisposable
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using System.Threading.Tasks;
#endif

namespace EntityFramework.Toolkit.EF6.Contracts
namespace EntityFramework.Toolkit.Core
{
public interface IUnitOfWork : IDisposable
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using System.Threading.Tasks;
#endif

namespace EntityFramework.Toolkit.EF6.Contracts
namespace EntityFramework.Toolkit.Core
{
public interface IWritableRepository : IRepository
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace EntityFramework.Toolkit.EF6.Contracts
namespace EntityFramework.Toolkit.Core
{
public class PropertyChangeInfo
{
Expand Down
3 changes: 0 additions & 3 deletions EntityFramework.Toolkit.EF6/AssemblyInfo.cs

This file was deleted.

39 changes: 0 additions & 39 deletions EntityFramework.Toolkit.EF6/Extensions/ReflectionApi.cs

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ToolkitSample.DataAccess.Co
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ToolkitSample.Model", "Samples\ToolkitSample.Model\ToolkitSample.Model.csproj", "{F73B662B-33EB-4D15-9DA7-2798645AAFAA}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EntityFramework.Toolkit.EF6.Tests", "Tests\EntityFramework.Toolkit.EF6.Tests\EntityFramework.Toolkit.EF6.Tests.csproj", "{139723B2-B2E4-469A-93EF-08F88981A5DC}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EntityFramework.Toolkit.Tests", "Tests\EntityFramework.Toolkit.Tests\EntityFramework.Toolkit.Tests.csproj", "{139723B2-B2E4-469A-93EF-08F88981A5DC}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EntityFramework.Toolkit.EF6", "EntityFramework.Toolkit.EF6\EntityFramework.Toolkit.EF6.csproj", "{BB2CFD38-0F40-4C10-AD5E-2C79F50F95F2}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EntityFramework.Toolkit", "EntityFramework.Toolkit\EntityFramework.Toolkit.csproj", "{BB2CFD38-0F40-4C10-AD5E-2C79F50F95F2}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EntityFramework.Toolkit.EF6.Contracts", "EntityFramework.Toolkit.EF6.Contracts\EntityFramework.Toolkit.EF6.Contracts.csproj", "{88F192BE-A2C5-4533-8376-B7838004947C}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EntityFramework.Toolkit.Core", "EntityFramework.Toolkit.Core\EntityFramework.Toolkit.Core.csproj", "{88F192BE-A2C5-4533-8376-B7838004947C}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{BB44A112-C76D-4710-8BD4-3544D394D62E}"
ProjectSection(SolutionItems) = preProject
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpRenamePlacementToArrangementMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
Expand Down
3 changes: 3 additions & 0 deletions EntityFramework.Toolkit/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
using System.Runtime.CompilerServices;

[assembly: InternalsVisibleTo("EntityFramework.Toolkit.Tests")]
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,17 @@
using System.Data.Entity.Infrastructure;
using System.Linq;
using System.Security.Principal;
using EntityFramework.Toolkit.EF6.Auditing.Extensions;
using EntityFramework.Toolkit.EF6.Contracts;
using EntityFramework.Toolkit.EF6.Contracts.Auditing;
using EntityFramework.Toolkit.EF6.Contracts.Extensions;
using EntityFramework.Toolkit.EF6.Extensions;
using EntityFramework.Toolkit.Auditing.Extensions;
using EntityFramework.Toolkit.Core;
using EntityFramework.Toolkit.Core.Auditing;
using EntityFramework.Toolkit.Core.Extensions;
using EntityFramework.Toolkit.Extensions;

#if !NET40
using System.Threading.Tasks;
#endif

namespace EntityFramework.Toolkit.EF6.Auditing
namespace EntityFramework.Toolkit.Auditing
{
/// <summary>
/// AuditDbContextBase adds auditing capabilities to the DbContextBase.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

using System;

namespace EntityFramework.Toolkit.EF6.Auditing
namespace EntityFramework.Toolkit.Auditing
{
public class AuditDbContextConfiguration
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using System;
using System.Collections.Generic;
using System.Configuration;
using EntityFramework.Toolkit.EF6.Auditing.ConfigFile;
using EntityFramework.Toolkit.Auditing.ConfigFile;

namespace EntityFramework.Toolkit.EF6.Auditing
namespace EntityFramework.Toolkit.Auditing
{
internal static class AuditDbContextConfigurationManager
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
using System.Data.Entity.ModelConfiguration;
using EntityFramework.Toolkit.EF6.Contracts.Auditing;
using EntityFramework.Toolkit.Core.Auditing;

namespace EntityFramework.Toolkit.EF6.Auditing
namespace EntityFramework.Toolkit.Auditing
{
public abstract class AuditEntityTypeConfiguration<TAuditEntity, TAuditKey> :
EntityTypeConfiguration<TAuditEntity> where TAuditEntity : class,
IAuditEntity<TAuditKey>
EntityTypeConfiguration<TAuditEntity> where TAuditEntity : class, IAuditEntity<TAuditKey>
{
protected AuditEntityTypeConfiguration()
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using System;
using System.Collections.ObjectModel;
using EntityFramework.Toolkit.EF6.Contracts.Auditing;
using EntityFramework.Toolkit.Core.Auditing;

namespace EntityFramework.Toolkit.EF6.Auditing
namespace EntityFramework.Toolkit.Auditing
{
public class AuditTypeInfo
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System;
using System.Configuration;

namespace EntityFramework.Toolkit.EF6.Auditing.ConfigFile
namespace EntityFramework.Toolkit.Auditing.ConfigFile
{
internal class AuditConfigurationSection : ConfigurationSection
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.Configuration;

namespace EntityFramework.Toolkit.EF6.Auditing.ConfigFile
namespace EntityFramework.Toolkit.Auditing.ConfigFile
{
internal class EntityElement : ConfigurationElement
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.Configuration;

namespace EntityFramework.Toolkit.EF6.Auditing.ConfigFile
namespace EntityFramework.Toolkit.Auditing.ConfigFile
{
internal class EntityElementCollection : ConfigurationElementCollection
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using System;
using System.Data.Entity;
using EntityFramework.Toolkit.EF6.Contracts.Auditing;
using EntityFramework.Toolkit.Core.Auditing;

namespace EntityFramework.Toolkit.EF6.Auditing.Extensions
namespace EntityFramework.Toolkit.Auditing.Extensions
{
public static class AuditEntityStateExtensions
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace EntityFramework.Toolkit.EF6.Concurrency
namespace EntityFramework.Toolkit.Concurrency
{
public sealed class ClientWinsConcurrencyResolveStrategy : IConcurrencyResolveStrategy
{
Expand Down
Loading