From 8ccea3915f445828e51c2990210b95722bf70c62 Mon Sep 17 00:00:00 2001 From: Thomas Galliker Date: Sat, 10 Nov 2018 09:40:36 +0100 Subject: [PATCH 1/6] Namespace refactoring back to EntityFramework.Toolkit --- .../Auditing/AuditEntity.cs | 2 +- .../Auditing/AuditEntityState.cs | 2 +- .../Auditing/IAuditEntity.cs | 2 +- .../Auditing/ICreatedDate.cs | 2 +- .../Auditing/IUpdatedDate.cs | 2 +- .../Change.cs | 2 +- .../ChangeSet.cs | 2 +- .../ChangeState.cs | 2 +- ...oj => EntityFramework.Toolkit.Core.csproj} | 6 +-- .../Extensions/DateTimeExtensions.cs | 2 +- .../Extensions/GenericRepositoryExtensions.cs | 2 +- .../ReadOnlyRepositoryExtensions.cs | 2 +- .../IAuditContext.cs | 2 +- .../IChange.cs | 2 +- .../IContext.cs | 2 +- .../IDataSeed.cs | 2 +- .../IDbConnection.cs | 2 +- .../IGenericRepository.cs | 2 +- .../IQueryableIncluding.cs | 2 +- .../IReadOnlyRepository.cs | 2 +- .../IRepository.cs | 2 +- .../IUnitOfWork.cs | 2 +- .../IWritableRepository.cs | 2 +- .../PropertyChangeInfo.cs | 2 +- EntityFramework.Toolkit.EF6.sln | 6 +-- EntityFramework.Toolkit.EF6/AssemblyInfo.cs | 2 +- .../Auditing/AuditDbContextBase.cs | 13 ++++--- .../Auditing/AuditDbContextConfiguration.cs | 2 +- .../AuditDbContextConfigurationManager.cs | 4 +- .../Auditing/AuditEntityTypeConfiguration.cs | 4 +- .../Auditing/AuditTypeInfo.cs | 4 +- .../ConfigFile/AuditConfigurationSection.cs | 2 +- .../Auditing/ConfigFile/EntityElement.cs | 2 +- .../ConfigFile/EntityElementCollection.cs | 2 +- .../Extensions/AuditEntityStateExtensions.cs | 4 +- .../ClientWinsConcurrencyResolveStrategy.cs | 2 +- .../DatabaseWinsConcurrencyResolveStrategy.cs | 2 +- .../IConcurrencyResolveStrategy.cs | 2 +- .../RethrowConcurrencyResolveStrategy.cs | 4 +- .../ConstructorInfoAndParameters.cs | 2 +- EntityFramework.Toolkit.EF6/DataSeedBase.cs | 4 +- EntityFramework.Toolkit.EF6/DbConnection.cs | 4 +- EntityFramework.Toolkit.EF6/DbContextBase.cs | 10 ++--- EntityFramework.Toolkit.EF6/EdmxTools.cs | 2 +- ....csproj => EntityFramework.Toolkit.csproj} | 12 +++--- .../Exceptions/UnitOfWorkException.cs | 2 +- .../Exceptions/UpdateConcurrencyException.cs | 2 +- .../Extensions/AssemblyExtensions.cs | 2 +- .../Extensions/DatabaseExtensions.cs | 2 +- .../Extensions/DbConnectionExtensions.cs | 4 +- .../Extensions/DbContextExtensions.cs | 6 +-- .../Extensions/DbEntityEntryExtensions.cs | 2 +- .../DbEntityValidationExceptionFormatter.cs | 2 +- .../Extensions/DbUpdateExceptionFormatter.cs | 2 +- .../Extensions/ExpressionExtensions.cs | 2 +- .../Extensions/MappingExtensions.cs | 4 +- .../Extensions/QueryableExtensions.cs | 4 +- .../Extensions/ReflectionApi.cs | 38 +------------------ .../Extensions/TableRowCounts.cs | 2 +- .../Extensions/TypeExtensions.cs | 20 +++++++++- .../GenericRepository.cs | 9 +++-- EntityFramework.Toolkit.EF6/IDbContext.cs | 4 +- EntityFramework.Toolkit.EF6/IndexConstants.cs | 2 +- EntityFramework.Toolkit.EF6/PrimaryKey.cs | 2 +- .../QueryableIncluding.cs | 8 ++-- .../Testing/ConnectionStringGenerator.cs | 2 +- .../Testing/ContextTestBase.cs | 6 +-- .../Testing/RandomizedDbConnection.cs | 2 +- EntityFramework.Toolkit.EF6/UnitOfWork.cs | 6 +-- .../Utils/DbHelpers.cs | 4 +- .../Utils/ReflectionHelper.cs | 4 +- .../Repository/IDepartmentRepository.cs | 4 +- .../Repository/IEmployeeReadOnlyRepository.cs | 4 +- .../Repository/IEmployeeRepository.cs | 2 +- .../Repository/IPersonRepository.cs | 2 +- .../ToolkitSample.DataAccess.Contracts.csproj | 4 +- .../CustomConcurrencyResolveStrategy.cs | 2 +- .../Context/Auditing/TestAuditDbContext.cs | 4 +- .../Context/CountryEntityConfiguration.cs | 2 +- .../Context/DepartmentEntityConfiguration.cs | 2 +- .../EmployeeAuditEntityTypeConfiguration.cs | 2 +- .../Context/EmployeeContext.cs | 6 +-- .../Context/EmployeeContextDbConnection.cs | 2 +- .../Context/IEmployeeContext.cs | 2 +- .../Context/ISampleContext.cs | 2 +- .../Context/ISampleContextTwo.cs | 2 +- .../Context/RoomConfiguration.cs | 2 +- .../Context/SampleContext.cs | 2 +- .../TestEntityAuditEntityTypeConfiguration.cs | 2 +- .../EmployeeContextMigrationConfiguration.cs | 4 +- .../Modularity/DataAccessModule.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Repository/DepartmentRepository.cs | 2 +- .../Repository/EmployeeReadOnlyRepository.cs | 2 +- .../Repository/EmployeeRepository.cs | 2 +- .../Repository/PersonRepository.cs | 2 +- .../Seed/ApplicationSettingDataSeed.cs | 2 +- .../Seed/CountryDataSeed.cs | 2 +- .../Seed/DepartmentDataSeed.cs | 2 +- .../ToolkitSample.DataAccess.csproj | 8 ++-- .../Auditing/EmployeeAudit.cs | 2 +- .../Auditing/TestEntity.cs | 2 +- .../Auditing/TestEntityAudit.cs | 2 +- Samples/ToolkitSample.Model/Person.cs | 2 +- Samples/ToolkitSample.Model/Room.cs | 2 +- .../ToolkitSample.Model.csproj | 4 +- .../Auditing/AuditDbContextBaseTests.cs | 6 +-- .../Auditing/AuditTypeInfoTests.cs | 2 +- .../ContextTestBaseTests.cs | 6 +-- .../DataSeedTests.IntegrationTests.cs | 4 +- .../DataSeedTests.UnitTests.cs | 2 +- .../DbContextBaseTests.cs | 6 +-- .../DbContextExtensionsTests.cs | 4 +- .../EdmxToolsTests.cs | 4 +- .../EmployeeContextTestDbConnection.cs | 4 +- ...j => EntityFramework.Toolkit.Tests.csproj} | 8 ++-- .../Extensions/ChangeSetExtensions.cs | 2 +- .../Extensions/DateTimeExtensionsTests.cs | 2 +- .../Extensions/DbConnectionExtensionsTests.cs | 6 +-- .../DbUpdateExceptionFormatterTests.cs | 6 +-- .../Extensions/TypeExtensionsTests.cs | 6 +-- .../IndexTests.cs | 4 +- .../EmployeeReadOnlyRepositoryTests.cs | 6 +-- .../Repository/GenericRepositoryTests.cs | 10 ++--- .../Repository/PersonRepositoryTests.cs | 4 +- .../Testing/ConnectionStringGeneratorTests.cs | 2 +- .../UnitOfWork.IntegrationTests.cs | 8 ++-- .../UnitOfWork.UnitTests.cs | 6 +-- .../Utils/DbHelpersTests.cs | 2 +- build.yml | 10 ++--- 130 files changed, 240 insertions(+), 256 deletions(-) rename EntityFramework.Toolkit.EF6.Contracts/{EntityFramework.Toolkit.EF6.Contracts.csproj => EntityFramework.Toolkit.Core.csproj} (93%) rename EntityFramework.Toolkit.EF6/{EntityFramework.Toolkit.EF6.csproj => EntityFramework.Toolkit.csproj} (96%) rename Tests/EntityFramework.Toolkit.EF6.Tests/{EntityFramework.Toolkit.EF6.Tests.csproj => EntityFramework.Toolkit.Tests.csproj} (86%) diff --git a/EntityFramework.Toolkit.EF6.Contracts/Auditing/AuditEntity.cs b/EntityFramework.Toolkit.EF6.Contracts/Auditing/AuditEntity.cs index 2948025..6a93678 100644 --- a/EntityFramework.Toolkit.EF6.Contracts/Auditing/AuditEntity.cs +++ b/EntityFramework.Toolkit.EF6.Contracts/Auditing/AuditEntity.cs @@ -1,6 +1,6 @@ using System; -namespace EntityFramework.Toolkit.EF6.Contracts.Auditing +namespace EntityFramework.Toolkit.Core.Auditing { /// /// Base class for audit entities. diff --git a/EntityFramework.Toolkit.EF6.Contracts/Auditing/AuditEntityState.cs b/EntityFramework.Toolkit.EF6.Contracts/Auditing/AuditEntityState.cs index 163a4c4..dea6546 100644 --- a/EntityFramework.Toolkit.EF6.Contracts/Auditing/AuditEntityState.cs +++ b/EntityFramework.Toolkit.EF6.Contracts/Auditing/AuditEntityState.cs @@ -1,6 +1,6 @@ using System; -namespace EntityFramework.Toolkit.EF6.Contracts.Auditing +namespace EntityFramework.Toolkit.Core.Auditing { /// /// Describes the state of an audit entity. diff --git a/EntityFramework.Toolkit.EF6.Contracts/Auditing/IAuditEntity.cs b/EntityFramework.Toolkit.EF6.Contracts/Auditing/IAuditEntity.cs index 09eeebe..8945cf4 100644 --- a/EntityFramework.Toolkit.EF6.Contracts/Auditing/IAuditEntity.cs +++ b/EntityFramework.Toolkit.EF6.Contracts/Auditing/IAuditEntity.cs @@ -1,6 +1,6 @@ using System; -namespace EntityFramework.Toolkit.EF6.Contracts.Auditing +namespace EntityFramework.Toolkit.Core.Auditing { /// /// Any class used for auditing an entity must implement this inteface. diff --git a/EntityFramework.Toolkit.EF6.Contracts/Auditing/ICreatedDate.cs b/EntityFramework.Toolkit.EF6.Contracts/Auditing/ICreatedDate.cs index dc2f23c..d4b0d68 100644 --- a/EntityFramework.Toolkit.EF6.Contracts/Auditing/ICreatedDate.cs +++ b/EntityFramework.Toolkit.EF6.Contracts/Auditing/ICreatedDate.cs @@ -1,6 +1,6 @@ using System; -namespace EntityFramework.Toolkit.EF6.Contracts.Auditing +namespace EntityFramework.Toolkit.Core.Auditing { public interface ICreatedDate { diff --git a/EntityFramework.Toolkit.EF6.Contracts/Auditing/IUpdatedDate.cs b/EntityFramework.Toolkit.EF6.Contracts/Auditing/IUpdatedDate.cs index 3d36252..9c9f8d5 100644 --- a/EntityFramework.Toolkit.EF6.Contracts/Auditing/IUpdatedDate.cs +++ b/EntityFramework.Toolkit.EF6.Contracts/Auditing/IUpdatedDate.cs @@ -1,6 +1,6 @@ using System; -namespace EntityFramework.Toolkit.EF6.Contracts.Auditing +namespace EntityFramework.Toolkit.Core.Auditing { public interface IUpdatedDate { diff --git a/EntityFramework.Toolkit.EF6.Contracts/Change.cs b/EntityFramework.Toolkit.EF6.Contracts/Change.cs index a2086ae..bb733ed 100644 --- a/EntityFramework.Toolkit.EF6.Contracts/Change.cs +++ b/EntityFramework.Toolkit.EF6.Contracts/Change.cs @@ -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 diff --git a/EntityFramework.Toolkit.EF6.Contracts/ChangeSet.cs b/EntityFramework.Toolkit.EF6.Contracts/ChangeSet.cs index bc84db9..1a90c5c 100644 --- a/EntityFramework.Toolkit.EF6.Contracts/ChangeSet.cs +++ b/EntityFramework.Toolkit.EF6.Contracts/ChangeSet.cs @@ -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 diff --git a/EntityFramework.Toolkit.EF6.Contracts/ChangeState.cs b/EntityFramework.Toolkit.EF6.Contracts/ChangeState.cs index 4d25c12..4bcb645 100644 --- a/EntityFramework.Toolkit.EF6.Contracts/ChangeState.cs +++ b/EntityFramework.Toolkit.EF6.Contracts/ChangeState.cs @@ -1,4 +1,4 @@ -namespace EntityFramework.Toolkit.EF6.Contracts +namespace EntityFramework.Toolkit.Core { public enum ChangeState { diff --git a/EntityFramework.Toolkit.EF6.Contracts/EntityFramework.Toolkit.EF6.Contracts.csproj b/EntityFramework.Toolkit.EF6.Contracts/EntityFramework.Toolkit.Core.csproj similarity index 93% rename from EntityFramework.Toolkit.EF6.Contracts/EntityFramework.Toolkit.EF6.Contracts.csproj rename to EntityFramework.Toolkit.EF6.Contracts/EntityFramework.Toolkit.Core.csproj index 4228d27..08ecb03 100644 --- a/EntityFramework.Toolkit.EF6.Contracts/EntityFramework.Toolkit.EF6.Contracts.csproj +++ b/EntityFramework.Toolkit.EF6.Contracts/EntityFramework.Toolkit.Core.csproj @@ -7,8 +7,8 @@ 1.0.0 Thomas Galliker net40;net45 - EntityFramework.Toolkit.EF6.Contracts - EntityFramework.Toolkit.Contracts + EntityFramework.Toolkit.Core + EntityFramework.Toolkit.Core Entity Framework EntityFramework EF6 UnitOfWork IUnitOfWork Repository IRepository GenericRepository IGenericRepository DbContext DbContextBase ContextTestBase https://raw.githubusercontent.com/thomasgalliker/EntityFramework.Toolkit/master/EntityFramework.Toolkit.png https://github.com/thomasgalliker/EntityFramework.Toolkit @@ -34,7 +34,7 @@ superdev GmbH EntityFramework.Toolkit.Contracts false - EntityFramework.Toolkit.EF6.Contracts + EntityFramework.Toolkit.Core 2.0.0 - Renamed namespaces to EntityFramework.Toolkit.EF6 - Removed obsolete code from version 1.x diff --git a/EntityFramework.Toolkit.EF6.Contracts/Extensions/DateTimeExtensions.cs b/EntityFramework.Toolkit.EF6.Contracts/Extensions/DateTimeExtensions.cs index ddab640..ddf4330 100644 --- a/EntityFramework.Toolkit.EF6.Contracts/Extensions/DateTimeExtensions.cs +++ b/EntityFramework.Toolkit.EF6.Contracts/Extensions/DateTimeExtensions.cs @@ -1,6 +1,6 @@ using System; -namespace EntityFramework.Toolkit.EF6.Contracts.Extensions +namespace EntityFramework.Toolkit.Core.Extensions { public static class DateTimeExtensions { diff --git a/EntityFramework.Toolkit.EF6.Contracts/Extensions/GenericRepositoryExtensions.cs b/EntityFramework.Toolkit.EF6.Contracts/Extensions/GenericRepositoryExtensions.cs index c6b3650..ef82236 100644 --- a/EntityFramework.Toolkit.EF6.Contracts/Extensions/GenericRepositoryExtensions.cs +++ b/EntityFramework.Toolkit.EF6.Contracts/Extensions/GenericRepositoryExtensions.cs @@ -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 { diff --git a/EntityFramework.Toolkit.EF6.Contracts/Extensions/ReadOnlyRepositoryExtensions.cs b/EntityFramework.Toolkit.EF6.Contracts/Extensions/ReadOnlyRepositoryExtensions.cs index 42cbdb5..0cf4439 100644 --- a/EntityFramework.Toolkit.EF6.Contracts/Extensions/ReadOnlyRepositoryExtensions.cs +++ b/EntityFramework.Toolkit.EF6.Contracts/Extensions/ReadOnlyRepositoryExtensions.cs @@ -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 { diff --git a/EntityFramework.Toolkit.EF6.Contracts/IAuditContext.cs b/EntityFramework.Toolkit.EF6.Contracts/IAuditContext.cs index 38d2134..dd559a3 100644 --- a/EntityFramework.Toolkit.EF6.Contracts/IAuditContext.cs +++ b/EntityFramework.Toolkit.EF6.Contracts/IAuditContext.cs @@ -2,7 +2,7 @@ using System.Threading.Tasks; #endif -namespace EntityFramework.Toolkit.EF6.Contracts +namespace EntityFramework.Toolkit.Core { public interface IAuditContext : IContext { diff --git a/EntityFramework.Toolkit.EF6.Contracts/IChange.cs b/EntityFramework.Toolkit.EF6.Contracts/IChange.cs index 8ae98a0..1879db0 100644 --- a/EntityFramework.Toolkit.EF6.Contracts/IChange.cs +++ b/EntityFramework.Toolkit.EF6.Contracts/IChange.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace EntityFramework.Toolkit.EF6.Contracts +namespace EntityFramework.Toolkit.Core { /// /// Interface for changed objects and object properties. diff --git a/EntityFramework.Toolkit.EF6.Contracts/IContext.cs b/EntityFramework.Toolkit.EF6.Contracts/IContext.cs index 6198db6..2062f94 100644 --- a/EntityFramework.Toolkit.EF6.Contracts/IContext.cs +++ b/EntityFramework.Toolkit.EF6.Contracts/IContext.cs @@ -5,7 +5,7 @@ using System.Threading.Tasks; #endif -namespace EntityFramework.Toolkit.EF6.Contracts +namespace EntityFramework.Toolkit.Core { public interface IContext : IDisposable { diff --git a/EntityFramework.Toolkit.EF6.Contracts/IDataSeed.cs b/EntityFramework.Toolkit.EF6.Contracts/IDataSeed.cs index a605aee..78ef0ab 100644 --- a/EntityFramework.Toolkit.EF6.Contracts/IDataSeed.cs +++ b/EntityFramework.Toolkit.EF6.Contracts/IDataSeed.cs @@ -1,7 +1,7 @@ using System; using System.Linq.Expressions; -namespace EntityFramework.Toolkit.EF6.Contracts +namespace EntityFramework.Toolkit.Core { public interface IDataSeed { diff --git a/EntityFramework.Toolkit.EF6.Contracts/IDbConnection.cs b/EntityFramework.Toolkit.EF6.Contracts/IDbConnection.cs index e15da16..af6dde9 100644 --- a/EntityFramework.Toolkit.EF6.Contracts/IDbConnection.cs +++ b/EntityFramework.Toolkit.EF6.Contracts/IDbConnection.cs @@ -1,4 +1,4 @@ -namespace EntityFramework.Toolkit.EF6.Contracts +namespace EntityFramework.Toolkit.Core { public interface IDbConnection { diff --git a/EntityFramework.Toolkit.EF6.Contracts/IGenericRepository.cs b/EntityFramework.Toolkit.EF6.Contracts/IGenericRepository.cs index d058e4a..2be4e9e 100644 --- a/EntityFramework.Toolkit.EF6.Contracts/IGenericRepository.cs +++ b/EntityFramework.Toolkit.EF6.Contracts/IGenericRepository.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq.Expressions; -namespace EntityFramework.Toolkit.EF6.Contracts +namespace EntityFramework.Toolkit.Core { /// /// Abstraction of a generic repository. diff --git a/EntityFramework.Toolkit.EF6.Contracts/IQueryableIncluding.cs b/EntityFramework.Toolkit.EF6.Contracts/IQueryableIncluding.cs index d6d713b..0337313 100644 --- a/EntityFramework.Toolkit.EF6.Contracts/IQueryableIncluding.cs +++ b/EntityFramework.Toolkit.EF6.Contracts/IQueryableIncluding.cs @@ -2,7 +2,7 @@ using System.Linq; using System.Linq.Expressions; -namespace EntityFramework.Toolkit.EF6.Contracts +namespace EntityFramework.Toolkit.Core { public interface IQueryableIncluding : IQueryable { diff --git a/EntityFramework.Toolkit.EF6.Contracts/IReadOnlyRepository.cs b/EntityFramework.Toolkit.EF6.Contracts/IReadOnlyRepository.cs index ed65a10..fda3871 100644 --- a/EntityFramework.Toolkit.EF6.Contracts/IReadOnlyRepository.cs +++ b/EntityFramework.Toolkit.EF6.Contracts/IReadOnlyRepository.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Linq.Expressions; -namespace EntityFramework.Toolkit.EF6.Contracts +namespace EntityFramework.Toolkit.Core { public interface IReadOnlyRepository : IRepository { diff --git a/EntityFramework.Toolkit.EF6.Contracts/IRepository.cs b/EntityFramework.Toolkit.EF6.Contracts/IRepository.cs index 2474f86..a5e993d 100644 --- a/EntityFramework.Toolkit.EF6.Contracts/IRepository.cs +++ b/EntityFramework.Toolkit.EF6.Contracts/IRepository.cs @@ -1,6 +1,6 @@ using System; -namespace EntityFramework.Toolkit.EF6.Contracts +namespace EntityFramework.Toolkit.Core { public interface IRepository : IDisposable { diff --git a/EntityFramework.Toolkit.EF6.Contracts/IUnitOfWork.cs b/EntityFramework.Toolkit.EF6.Contracts/IUnitOfWork.cs index c291ed4..7efa72a 100644 --- a/EntityFramework.Toolkit.EF6.Contracts/IUnitOfWork.cs +++ b/EntityFramework.Toolkit.EF6.Contracts/IUnitOfWork.cs @@ -5,7 +5,7 @@ using System.Threading.Tasks; #endif -namespace EntityFramework.Toolkit.EF6.Contracts +namespace EntityFramework.Toolkit.Core { public interface IUnitOfWork : IDisposable { diff --git a/EntityFramework.Toolkit.EF6.Contracts/IWritableRepository.cs b/EntityFramework.Toolkit.EF6.Contracts/IWritableRepository.cs index 3d3ae61..ebf38e8 100644 --- a/EntityFramework.Toolkit.EF6.Contracts/IWritableRepository.cs +++ b/EntityFramework.Toolkit.EF6.Contracts/IWritableRepository.cs @@ -2,7 +2,7 @@ using System.Threading.Tasks; #endif -namespace EntityFramework.Toolkit.EF6.Contracts +namespace EntityFramework.Toolkit.Core { public interface IWritableRepository : IRepository { diff --git a/EntityFramework.Toolkit.EF6.Contracts/PropertyChangeInfo.cs b/EntityFramework.Toolkit.EF6.Contracts/PropertyChangeInfo.cs index f29aedf..c3debb8 100644 --- a/EntityFramework.Toolkit.EF6.Contracts/PropertyChangeInfo.cs +++ b/EntityFramework.Toolkit.EF6.Contracts/PropertyChangeInfo.cs @@ -1,4 +1,4 @@ -namespace EntityFramework.Toolkit.EF6.Contracts +namespace EntityFramework.Toolkit.Core { public class PropertyChangeInfo { diff --git a/EntityFramework.Toolkit.EF6.sln b/EntityFramework.Toolkit.EF6.sln index caedde1..06d48eb 100644 --- a/EntityFramework.Toolkit.EF6.sln +++ b/EntityFramework.Toolkit.EF6.sln @@ -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.EF6.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.EF6\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.EF6.Contracts\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 diff --git a/EntityFramework.Toolkit.EF6/AssemblyInfo.cs b/EntityFramework.Toolkit.EF6/AssemblyInfo.cs index a3635ff..93e24d7 100644 --- a/EntityFramework.Toolkit.EF6/AssemblyInfo.cs +++ b/EntityFramework.Toolkit.EF6/AssemblyInfo.cs @@ -1,3 +1,3 @@ using System.Runtime.CompilerServices; -[assembly: InternalsVisibleTo("EntityFramework.Toolkit.EF6.Tests")] \ No newline at end of file +[assembly: InternalsVisibleTo("EntityFramework.Toolkit.Tests")] diff --git a/EntityFramework.Toolkit.EF6/Auditing/AuditDbContextBase.cs b/EntityFramework.Toolkit.EF6/Auditing/AuditDbContextBase.cs index 75d0587..5978002 100644 --- a/EntityFramework.Toolkit.EF6/Auditing/AuditDbContextBase.cs +++ b/EntityFramework.Toolkit.EF6/Auditing/AuditDbContextBase.cs @@ -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 { /// /// AuditDbContextBase adds auditing capabilities to the DbContextBase. diff --git a/EntityFramework.Toolkit.EF6/Auditing/AuditDbContextConfiguration.cs b/EntityFramework.Toolkit.EF6/Auditing/AuditDbContextConfiguration.cs index 5dc8e3d..ae6d33e 100644 --- a/EntityFramework.Toolkit.EF6/Auditing/AuditDbContextConfiguration.cs +++ b/EntityFramework.Toolkit.EF6/Auditing/AuditDbContextConfiguration.cs @@ -1,7 +1,7 @@  using System; -namespace EntityFramework.Toolkit.EF6.Auditing +namespace EntityFramework.Toolkit.Auditing { public class AuditDbContextConfiguration { diff --git a/EntityFramework.Toolkit.EF6/Auditing/AuditDbContextConfigurationManager.cs b/EntityFramework.Toolkit.EF6/Auditing/AuditDbContextConfigurationManager.cs index 0cbccf7..5e592b2 100644 --- a/EntityFramework.Toolkit.EF6/Auditing/AuditDbContextConfigurationManager.cs +++ b/EntityFramework.Toolkit.EF6/Auditing/AuditDbContextConfigurationManager.cs @@ -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 { diff --git a/EntityFramework.Toolkit.EF6/Auditing/AuditEntityTypeConfiguration.cs b/EntityFramework.Toolkit.EF6/Auditing/AuditEntityTypeConfiguration.cs index 1800754..e2f87c5 100644 --- a/EntityFramework.Toolkit.EF6/Auditing/AuditEntityTypeConfiguration.cs +++ b/EntityFramework.Toolkit.EF6/Auditing/AuditEntityTypeConfiguration.cs @@ -1,7 +1,7 @@ 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 : EntityTypeConfiguration where TAuditEntity : class, diff --git a/EntityFramework.Toolkit.EF6/Auditing/AuditTypeInfo.cs b/EntityFramework.Toolkit.EF6/Auditing/AuditTypeInfo.cs index 2be48d9..96b4405 100644 --- a/EntityFramework.Toolkit.EF6/Auditing/AuditTypeInfo.cs +++ b/EntityFramework.Toolkit.EF6/Auditing/AuditTypeInfo.cs @@ -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 { diff --git a/EntityFramework.Toolkit.EF6/Auditing/ConfigFile/AuditConfigurationSection.cs b/EntityFramework.Toolkit.EF6/Auditing/ConfigFile/AuditConfigurationSection.cs index 099d43b..7aced5b 100644 --- a/EntityFramework.Toolkit.EF6/Auditing/ConfigFile/AuditConfigurationSection.cs +++ b/EntityFramework.Toolkit.EF6/Auditing/ConfigFile/AuditConfigurationSection.cs @@ -1,7 +1,7 @@ using System; using System.Configuration; -namespace EntityFramework.Toolkit.EF6.Auditing.ConfigFile +namespace EntityFramework.Toolkit.Auditing.ConfigFile { internal class AuditConfigurationSection : ConfigurationSection { diff --git a/EntityFramework.Toolkit.EF6/Auditing/ConfigFile/EntityElement.cs b/EntityFramework.Toolkit.EF6/Auditing/ConfigFile/EntityElement.cs index 594ddac..0b87f95 100644 --- a/EntityFramework.Toolkit.EF6/Auditing/ConfigFile/EntityElement.cs +++ b/EntityFramework.Toolkit.EF6/Auditing/ConfigFile/EntityElement.cs @@ -1,6 +1,6 @@ using System.Configuration; -namespace EntityFramework.Toolkit.EF6.Auditing.ConfigFile +namespace EntityFramework.Toolkit.Auditing.ConfigFile { internal class EntityElement : ConfigurationElement { diff --git a/EntityFramework.Toolkit.EF6/Auditing/ConfigFile/EntityElementCollection.cs b/EntityFramework.Toolkit.EF6/Auditing/ConfigFile/EntityElementCollection.cs index fb1f07a..d76411f 100644 --- a/EntityFramework.Toolkit.EF6/Auditing/ConfigFile/EntityElementCollection.cs +++ b/EntityFramework.Toolkit.EF6/Auditing/ConfigFile/EntityElementCollection.cs @@ -1,6 +1,6 @@ using System.Configuration; -namespace EntityFramework.Toolkit.EF6.Auditing.ConfigFile +namespace EntityFramework.Toolkit.Auditing.ConfigFile { internal class EntityElementCollection : ConfigurationElementCollection { diff --git a/EntityFramework.Toolkit.EF6/Auditing/Extensions/AuditEntityStateExtensions.cs b/EntityFramework.Toolkit.EF6/Auditing/Extensions/AuditEntityStateExtensions.cs index 559c556..5702737 100644 --- a/EntityFramework.Toolkit.EF6/Auditing/Extensions/AuditEntityStateExtensions.cs +++ b/EntityFramework.Toolkit.EF6/Auditing/Extensions/AuditEntityStateExtensions.cs @@ -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 { diff --git a/EntityFramework.Toolkit.EF6/Concurrency/ClientWinsConcurrencyResolveStrategy.cs b/EntityFramework.Toolkit.EF6/Concurrency/ClientWinsConcurrencyResolveStrategy.cs index e42f95b..85e0a81 100644 --- a/EntityFramework.Toolkit.EF6/Concurrency/ClientWinsConcurrencyResolveStrategy.cs +++ b/EntityFramework.Toolkit.EF6/Concurrency/ClientWinsConcurrencyResolveStrategy.cs @@ -1,4 +1,4 @@ -namespace EntityFramework.Toolkit.EF6.Concurrency +namespace EntityFramework.Toolkit.Concurrency { public sealed class ClientWinsConcurrencyResolveStrategy : IConcurrencyResolveStrategy { diff --git a/EntityFramework.Toolkit.EF6/Concurrency/DatabaseWinsConcurrencyResolveStrategy.cs b/EntityFramework.Toolkit.EF6/Concurrency/DatabaseWinsConcurrencyResolveStrategy.cs index d7439f8..e947864 100644 --- a/EntityFramework.Toolkit.EF6/Concurrency/DatabaseWinsConcurrencyResolveStrategy.cs +++ b/EntityFramework.Toolkit.EF6/Concurrency/DatabaseWinsConcurrencyResolveStrategy.cs @@ -1,4 +1,4 @@ -namespace EntityFramework.Toolkit.EF6.Concurrency +namespace EntityFramework.Toolkit.Concurrency { public sealed class DatabaseWinsConcurrencyResolveStrategy : IConcurrencyResolveStrategy { diff --git a/EntityFramework.Toolkit.EF6/Concurrency/IConcurrencyResolveStrategy.cs b/EntityFramework.Toolkit.EF6/Concurrency/IConcurrencyResolveStrategy.cs index e2fec12..17c1a09 100644 --- a/EntityFramework.Toolkit.EF6/Concurrency/IConcurrencyResolveStrategy.cs +++ b/EntityFramework.Toolkit.EF6/Concurrency/IConcurrencyResolveStrategy.cs @@ -1,6 +1,6 @@ using System.Data.Entity.Infrastructure; -namespace EntityFramework.Toolkit.EF6.Concurrency +namespace EntityFramework.Toolkit.Concurrency { public interface IConcurrencyResolveStrategy { diff --git a/EntityFramework.Toolkit.EF6/Concurrency/RethrowConcurrencyResolveStrategy.cs b/EntityFramework.Toolkit.EF6/Concurrency/RethrowConcurrencyResolveStrategy.cs index 43037f0..e2f1588 100644 --- a/EntityFramework.Toolkit.EF6/Concurrency/RethrowConcurrencyResolveStrategy.cs +++ b/EntityFramework.Toolkit.EF6/Concurrency/RethrowConcurrencyResolveStrategy.cs @@ -1,6 +1,6 @@ -using EntityFramework.Toolkit.EF6.Exceptions; +using EntityFramework.Toolkit.Exceptions; -namespace EntityFramework.Toolkit.EF6.Concurrency +namespace EntityFramework.Toolkit.Concurrency { /// /// Rethrow strategy throws an in case of a conflicting update. diff --git a/EntityFramework.Toolkit.EF6/ConstructorInfoAndParameters.cs b/EntityFramework.Toolkit.EF6/ConstructorInfoAndParameters.cs index c44969d..f93a17b 100644 --- a/EntityFramework.Toolkit.EF6/ConstructorInfoAndParameters.cs +++ b/EntityFramework.Toolkit.EF6/ConstructorInfoAndParameters.cs @@ -2,7 +2,7 @@ using System.Diagnostics; using System.Reflection; -namespace EntityFramework.Toolkit.EF6 +namespace EntityFramework.Toolkit { [DebuggerDisplay("{this.ConstructorInfo.Name}")] public class ConstructorInfoAndParameters diff --git a/EntityFramework.Toolkit.EF6/DataSeedBase.cs b/EntityFramework.Toolkit.EF6/DataSeedBase.cs index 684c950..499f9c5 100644 --- a/EntityFramework.Toolkit.EF6/DataSeedBase.cs +++ b/EntityFramework.Toolkit.EF6/DataSeedBase.cs @@ -1,9 +1,9 @@ using System; using System.Linq; using System.Linq.Expressions; -using EntityFramework.Toolkit.EF6.Contracts; +using EntityFramework.Toolkit.Core; -namespace EntityFramework.Toolkit.EF6 +namespace EntityFramework.Toolkit { /// /// Provides a template for generic seed implementors. diff --git a/EntityFramework.Toolkit.EF6/DbConnection.cs b/EntityFramework.Toolkit.EF6/DbConnection.cs index 178269a..5e7674d 100644 --- a/EntityFramework.Toolkit.EF6/DbConnection.cs +++ b/EntityFramework.Toolkit.EF6/DbConnection.cs @@ -1,7 +1,7 @@ using System.Diagnostics; -using EntityFramework.Toolkit.EF6.Contracts; +using EntityFramework.Toolkit.Core; -namespace EntityFramework.Toolkit.EF6 +namespace EntityFramework.Toolkit { [DebuggerDisplay("Name={this.Name}, ConnectionString={this.ConnectionString}")] public class DbConnection : IDbConnection diff --git a/EntityFramework.Toolkit.EF6/DbContextBase.cs b/EntityFramework.Toolkit.EF6/DbContextBase.cs index 0246201..b0b422d 100644 --- a/EntityFramework.Toolkit.EF6/DbContextBase.cs +++ b/EntityFramework.Toolkit.EF6/DbContextBase.cs @@ -7,17 +7,17 @@ using System.Diagnostics; using System.Linq; using System.Linq.Expressions; -using EntityFramework.Toolkit.EF6.Concurrency; -using EntityFramework.Toolkit.EF6.Contracts; -using EntityFramework.Toolkit.EF6.Exceptions; -using EntityFramework.Toolkit.EF6.Extensions; +using EntityFramework.Toolkit.Concurrency; +using EntityFramework.Toolkit.Core; +using EntityFramework.Toolkit.Exceptions; +using EntityFramework.Toolkit.Extensions; #if !NET40 using System.Threading.Tasks; #endif -namespace EntityFramework.Toolkit.EF6 +namespace EntityFramework.Toolkit { public abstract class DbContextBase : DbContext, IDbContext where TContext : DbContext diff --git a/EntityFramework.Toolkit.EF6/EdmxTools.cs b/EntityFramework.Toolkit.EF6/EdmxTools.cs index d336e8d..ca8c49d 100644 --- a/EntityFramework.Toolkit.EF6/EdmxTools.cs +++ b/EntityFramework.Toolkit.EF6/EdmxTools.cs @@ -7,7 +7,7 @@ using System.Xml; using System.Xml.Linq; -namespace EntityFramework.Toolkit.EF6 +namespace EntityFramework.Toolkit { public static class EdmxTools { diff --git a/EntityFramework.Toolkit.EF6/EntityFramework.Toolkit.EF6.csproj b/EntityFramework.Toolkit.EF6/EntityFramework.Toolkit.csproj similarity index 96% rename from EntityFramework.Toolkit.EF6/EntityFramework.Toolkit.EF6.csproj rename to EntityFramework.Toolkit.EF6/EntityFramework.Toolkit.csproj index 88c9d4a..dc1e0e6 100644 --- a/EntityFramework.Toolkit.EF6/EntityFramework.Toolkit.EF6.csproj +++ b/EntityFramework.Toolkit.EF6/EntityFramework.Toolkit.csproj @@ -7,7 +7,7 @@ 1.0.0 Thomas Galliker net40;net45 - EntityFramework.Toolkit.EF6 + EntityFramework.Toolkit EntityFramework.Toolkit Entity Framework EntityFramework EF6 UnitOfWork IUnitOfWork Repository IRepository GenericRepository IGenericRepository DbContext DbContextBase ContextTestBase https://raw.githubusercontent.com/thomasgalliker/EntityFramework.Toolkit/master/EntityFramework.Toolkit.png @@ -34,7 +34,7 @@ superdev GmbH EntityFramework.Toolkit false - EntityFramework.Toolkit.EF6 + EntityFramework.Toolkit 2.0.0 - Renamed namespaces to EntityFramework.Toolkit.EF6 - Removed obsolete code from version 1.x @@ -91,16 +91,16 @@ true - - - - 6.1.2 + + + + diff --git a/EntityFramework.Toolkit.EF6/Exceptions/UnitOfWorkException.cs b/EntityFramework.Toolkit.EF6/Exceptions/UnitOfWorkException.cs index 93f4292..4780eda 100644 --- a/EntityFramework.Toolkit.EF6/Exceptions/UnitOfWorkException.cs +++ b/EntityFramework.Toolkit.EF6/Exceptions/UnitOfWorkException.cs @@ -1,6 +1,6 @@ using System; -namespace EntityFramework.Toolkit.EF6.Exceptions +namespace EntityFramework.Toolkit.Exceptions { public class UnitOfWorkException : Exception { diff --git a/EntityFramework.Toolkit.EF6/Exceptions/UpdateConcurrencyException.cs b/EntityFramework.Toolkit.EF6/Exceptions/UpdateConcurrencyException.cs index 19a5ad7..94ced96 100644 --- a/EntityFramework.Toolkit.EF6/Exceptions/UpdateConcurrencyException.cs +++ b/EntityFramework.Toolkit.EF6/Exceptions/UpdateConcurrencyException.cs @@ -1,6 +1,6 @@ using System; -namespace EntityFramework.Toolkit.EF6.Exceptions +namespace EntityFramework.Toolkit.Exceptions { public class UpdateConcurrencyException : Exception { diff --git a/EntityFramework.Toolkit.EF6/Extensions/AssemblyExtensions.cs b/EntityFramework.Toolkit.EF6/Extensions/AssemblyExtensions.cs index 71b6dd5..c73f5f8 100644 --- a/EntityFramework.Toolkit.EF6/Extensions/AssemblyExtensions.cs +++ b/EntityFramework.Toolkit.EF6/Extensions/AssemblyExtensions.cs @@ -2,7 +2,7 @@ using System.Linq; using System.Reflection; -namespace EntityFramework.Toolkit.EF6.Extensions +namespace EntityFramework.Toolkit.Extensions { internal static class AssemblyExtensions { diff --git a/EntityFramework.Toolkit.EF6/Extensions/DatabaseExtensions.cs b/EntityFramework.Toolkit.EF6/Extensions/DatabaseExtensions.cs index fefcba5..46d33ad 100644 --- a/EntityFramework.Toolkit.EF6/Extensions/DatabaseExtensions.cs +++ b/EntityFramework.Toolkit.EF6/Extensions/DatabaseExtensions.cs @@ -2,7 +2,7 @@ using System.Data; using System.Data.Entity; -namespace EntityFramework.Toolkit.EF6.Extensions +namespace EntityFramework.Toolkit.Extensions { public static class DatabaseExtensions { diff --git a/EntityFramework.Toolkit.EF6/Extensions/DbConnectionExtensions.cs b/EntityFramework.Toolkit.EF6/Extensions/DbConnectionExtensions.cs index 294cf22..72de745 100644 --- a/EntityFramework.Toolkit.EF6/Extensions/DbConnectionExtensions.cs +++ b/EntityFramework.Toolkit.EF6/Extensions/DbConnectionExtensions.cs @@ -2,9 +2,9 @@ using System.Data; using System.Data.Common; using System.Data.SqlClient; -using IDbConnection = EntityFramework.Toolkit.EF6.Contracts.IDbConnection; +using IDbConnection = EntityFramework.Toolkit.Core.IDbConnection; -namespace EntityFramework.Toolkit.EF6.Extensions +namespace EntityFramework.Toolkit.Extensions { public static class DbConnectionExtensions { diff --git a/EntityFramework.Toolkit.EF6/Extensions/DbContextExtensions.cs b/EntityFramework.Toolkit.EF6/Extensions/DbContextExtensions.cs index 9a723b6..e86cb92 100644 --- a/EntityFramework.Toolkit.EF6/Extensions/DbContextExtensions.cs +++ b/EntityFramework.Toolkit.EF6/Extensions/DbContextExtensions.cs @@ -8,10 +8,10 @@ using System.Linq; using System.Linq.Expressions; using System.Reflection; -using EntityFramework.Toolkit.EF6.Contracts; -using EntityFramework.Toolkit.EF6.Utils; +using EntityFramework.Toolkit.Core; +using EntityFramework.Toolkit.Utils; -namespace EntityFramework.Toolkit.EF6.Extensions +namespace EntityFramework.Toolkit.Extensions { public static class DbContextExtensions { diff --git a/EntityFramework.Toolkit.EF6/Extensions/DbEntityEntryExtensions.cs b/EntityFramework.Toolkit.EF6/Extensions/DbEntityEntryExtensions.cs index 9c50586..c5aa179 100644 --- a/EntityFramework.Toolkit.EF6/Extensions/DbEntityEntryExtensions.cs +++ b/EntityFramework.Toolkit.EF6/Extensions/DbEntityEntryExtensions.cs @@ -3,7 +3,7 @@ using System.Data.Entity.Infrastructure; using System.Linq.Expressions; -namespace EntityFramework.Toolkit.EF6.Extensions +namespace EntityFramework.Toolkit.Extensions { public static class DbEntityEntryExtensions { diff --git a/EntityFramework.Toolkit.EF6/Extensions/DbEntityValidationExceptionFormatter.cs b/EntityFramework.Toolkit.EF6/Extensions/DbEntityValidationExceptionFormatter.cs index bba9d16..8de641c 100644 --- a/EntityFramework.Toolkit.EF6/Extensions/DbEntityValidationExceptionFormatter.cs +++ b/EntityFramework.Toolkit.EF6/Extensions/DbEntityValidationExceptionFormatter.cs @@ -1,7 +1,7 @@ using System.Data.Entity.Validation; using System.Text; -namespace EntityFramework.Toolkit.EF6.Extensions +namespace EntityFramework.Toolkit.Extensions { internal static class DbEntityValidationExceptionFormatter { diff --git a/EntityFramework.Toolkit.EF6/Extensions/DbUpdateExceptionFormatter.cs b/EntityFramework.Toolkit.EF6/Extensions/DbUpdateExceptionFormatter.cs index fd48a0e..98fc304 100644 --- a/EntityFramework.Toolkit.EF6/Extensions/DbUpdateExceptionFormatter.cs +++ b/EntityFramework.Toolkit.EF6/Extensions/DbUpdateExceptionFormatter.cs @@ -5,7 +5,7 @@ using System.Data.SqlTypes; using System.Text; -namespace EntityFramework.Toolkit.EF6.Extensions +namespace EntityFramework.Toolkit.Extensions { internal static class DbUpdateExceptionFormatter { diff --git a/EntityFramework.Toolkit.EF6/Extensions/ExpressionExtensions.cs b/EntityFramework.Toolkit.EF6/Extensions/ExpressionExtensions.cs index 3038907..529311a 100644 --- a/EntityFramework.Toolkit.EF6/Extensions/ExpressionExtensions.cs +++ b/EntityFramework.Toolkit.EF6/Extensions/ExpressionExtensions.cs @@ -2,7 +2,7 @@ using System.Linq.Expressions; using System.Reflection; -namespace EntityFramework.Toolkit.EF6.Extensions +namespace EntityFramework.Toolkit.Extensions { internal static class ExpressionExtensions { diff --git a/EntityFramework.Toolkit.EF6/Extensions/MappingExtensions.cs b/EntityFramework.Toolkit.EF6/Extensions/MappingExtensions.cs index 251372e..8cf4878 100644 --- a/EntityFramework.Toolkit.EF6/Extensions/MappingExtensions.cs +++ b/EntityFramework.Toolkit.EF6/Extensions/MappingExtensions.cs @@ -8,9 +8,9 @@ using System.Linq; using System.Linq.Expressions; using System.Reflection; -using EntityFramework.Toolkit.EF6.Utils; +using EntityFramework.Toolkit.Utils; -namespace EntityFramework.Toolkit.EF6.Extensions +namespace EntityFramework.Toolkit.Extensions { public static class MappingExtensions { diff --git a/EntityFramework.Toolkit.EF6/Extensions/QueryableExtensions.cs b/EntityFramework.Toolkit.EF6/Extensions/QueryableExtensions.cs index 703aaae..1514305 100644 --- a/EntityFramework.Toolkit.EF6/Extensions/QueryableExtensions.cs +++ b/EntityFramework.Toolkit.EF6/Extensions/QueryableExtensions.cs @@ -2,9 +2,9 @@ using System.Data.Entity; using System.Linq; using System.Linq.Expressions; -using EntityFramework.Toolkit.EF6.Utils; +using EntityFramework.Toolkit.Utils; -namespace EntityFramework.Toolkit.EF6.Extensions +namespace EntityFramework.Toolkit.Extensions { public static class QueryableExtensions { diff --git a/EntityFramework.Toolkit.EF6/Extensions/ReflectionApi.cs b/EntityFramework.Toolkit.EF6/Extensions/ReflectionApi.cs index e27cdd1..12dbd56 100644 --- a/EntityFramework.Toolkit.EF6/Extensions/ReflectionApi.cs +++ b/EntityFramework.Toolkit.EF6/Extensions/ReflectionApi.cs @@ -1,39 +1,3 @@ -using System.Reflection; - -#if NET40 - -namespace System -{ - internal static class TypeExtensions - { - internal static bool IsGenericType(this Type t) - { - return t.IsGenericType; - } - } - - internal static class PropertyInfoExtensions - { - internal static void SetValue(this PropertyInfo propertyInfo, object obj, object value) - { - propertyInfo.SetValue(obj, value, null); - } - } -} - -#else - +using System; using System.Reflection; -namespace System -{ - internal static class TypeExtensions - { - internal static bool IsGenericType(this Type t) - { - return t.GetTypeInfo().IsGenericType; - } - } -} - -#endif \ No newline at end of file diff --git a/EntityFramework.Toolkit.EF6/Extensions/TableRowCounts.cs b/EntityFramework.Toolkit.EF6/Extensions/TableRowCounts.cs index 84954fa..a084c58 100644 --- a/EntityFramework.Toolkit.EF6/Extensions/TableRowCounts.cs +++ b/EntityFramework.Toolkit.EF6/Extensions/TableRowCounts.cs @@ -1,4 +1,4 @@ -namespace EntityFramework.Toolkit.EF6.Extensions +namespace EntityFramework.Toolkit.Extensions { public class TableRowCounts { diff --git a/EntityFramework.Toolkit.EF6/Extensions/TypeExtensions.cs b/EntityFramework.Toolkit.EF6/Extensions/TypeExtensions.cs index 53d2706..9a922ba 100644 --- a/EntityFramework.Toolkit.EF6/Extensions/TypeExtensions.cs +++ b/EntityFramework.Toolkit.EF6/Extensions/TypeExtensions.cs @@ -4,10 +4,28 @@ using System.Reflection; using System.Text; -namespace EntityFramework.Toolkit.EF6.Extensions +namespace EntityFramework.Toolkit.Extensions { internal static class TypeExtensions { +#if NET40 + internal static bool IsGenericType(this Type t) + { + return t.IsGenericType; + } + + internal static void SetValue(this PropertyInfo propertyInfo, object obj, object value) + { + propertyInfo.SetValue(obj, value, null); + } + +#else + internal static bool IsGenericType(this Type t) + { + return t.GetTypeInfo().IsGenericType; + } +#endif + /// /// Gets the raw entity type without dynamic proxy type. /// diff --git a/EntityFramework.Toolkit.EF6/GenericRepository.cs b/EntityFramework.Toolkit.EF6/GenericRepository.cs index 7c029ab..d5b2024 100644 --- a/EntityFramework.Toolkit.EF6/GenericRepository.cs +++ b/EntityFramework.Toolkit.EF6/GenericRepository.cs @@ -3,14 +3,15 @@ using System.Data.Entity; using System.Linq; using System.Linq.Expressions; -using EntityFramework.Toolkit.EF6.Contracts; -using EntityFramework.Toolkit.EF6.Extensions; -using EntityFramework.Toolkit.EF6.Utils; +using EntityFramework.Toolkit.Core; +using EntityFramework.Toolkit.Extensions; +using EntityFramework.Toolkit.Utils; + #if !NET40 using System.Threading.Tasks; #endif -namespace EntityFramework.Toolkit.EF6 +namespace EntityFramework.Toolkit { /// /// Implementation of a generic repository. diff --git a/EntityFramework.Toolkit.EF6/IDbContext.cs b/EntityFramework.Toolkit.EF6/IDbContext.cs index 922ea8e..c71d3d6 100644 --- a/EntityFramework.Toolkit.EF6/IDbContext.cs +++ b/EntityFramework.Toolkit.EF6/IDbContext.cs @@ -1,7 +1,7 @@ using System.Data.Entity; -using EntityFramework.Toolkit.EF6.Contracts; +using EntityFramework.Toolkit.Core; -namespace EntityFramework.Toolkit.EF6 +namespace EntityFramework.Toolkit { public interface IDbContext : IContext { diff --git a/EntityFramework.Toolkit.EF6/IndexConstants.cs b/EntityFramework.Toolkit.EF6/IndexConstants.cs index 9d210c5..7d386d2 100644 --- a/EntityFramework.Toolkit.EF6/IndexConstants.cs +++ b/EntityFramework.Toolkit.EF6/IndexConstants.cs @@ -1,4 +1,4 @@ -namespace EntityFramework.Toolkit.EF6 +namespace EntityFramework.Toolkit { public static class IndexConstants { diff --git a/EntityFramework.Toolkit.EF6/PrimaryKey.cs b/EntityFramework.Toolkit.EF6/PrimaryKey.cs index 4058c24..0f5534e 100644 --- a/EntityFramework.Toolkit.EF6/PrimaryKey.cs +++ b/EntityFramework.Toolkit.EF6/PrimaryKey.cs @@ -1,6 +1,6 @@ using System.Reflection; -namespace EntityFramework.Toolkit.EF6 +namespace EntityFramework.Toolkit { public class PrimaryKey { diff --git a/EntityFramework.Toolkit.EF6/QueryableIncluding.cs b/EntityFramework.Toolkit.EF6/QueryableIncluding.cs index 9068995..6dbdf3e 100644 --- a/EntityFramework.Toolkit.EF6/QueryableIncluding.cs +++ b/EntityFramework.Toolkit.EF6/QueryableIncluding.cs @@ -4,11 +4,11 @@ using System.Data.Entity; using System.Linq; using System.Linq.Expressions; -using EntityFramework.Toolkit.EF6.Contracts; -using EntityFramework.Toolkit.EF6.Extensions; -using QueryableExtensions = EntityFramework.Toolkit.EF6.Extensions.QueryableExtensions; +using EntityFramework.Toolkit.Core; +using EntityFramework.Toolkit.Extensions; +using QueryableExtensions = EntityFramework.Toolkit.Extensions.QueryableExtensions; -namespace EntityFramework.Toolkit.EF6 +namespace EntityFramework.Toolkit { internal class QueryableIncluding : IQueryableIncluding where T : class diff --git a/EntityFramework.Toolkit.EF6/Testing/ConnectionStringGenerator.cs b/EntityFramework.Toolkit.EF6/Testing/ConnectionStringGenerator.cs index 16fab8b..80e6aae 100644 --- a/EntityFramework.Toolkit.EF6/Testing/ConnectionStringGenerator.cs +++ b/EntityFramework.Toolkit.EF6/Testing/ConnectionStringGenerator.cs @@ -1,7 +1,7 @@ using System; using System.Data.SqlClient; -namespace EntityFramework.Toolkit.EF6.Testing +namespace EntityFramework.Toolkit.Testing { public static class ConnectionStringGenerator { diff --git a/EntityFramework.Toolkit.EF6/Testing/ContextTestBase.cs b/EntityFramework.Toolkit.EF6/Testing/ContextTestBase.cs index 8ad34b8..58e7392 100644 --- a/EntityFramework.Toolkit.EF6/Testing/ContextTestBase.cs +++ b/EntityFramework.Toolkit.EF6/Testing/ContextTestBase.cs @@ -2,10 +2,10 @@ using System.Collections.Generic; using System.Data.Entity; using System.Linq; -using EntityFramework.Toolkit.EF6.Contracts; -using EntityFramework.Toolkit.EF6.Extensions; +using EntityFramework.Toolkit.Core; +using EntityFramework.Toolkit.Extensions; -namespace EntityFramework.Toolkit.EF6.Testing +namespace EntityFramework.Toolkit.Testing { /// /// ContextTestBase for context using IDbConnection diff --git a/EntityFramework.Toolkit.EF6/Testing/RandomizedDbConnection.cs b/EntityFramework.Toolkit.EF6/Testing/RandomizedDbConnection.cs index fc76544..cb2978e 100644 --- a/EntityFramework.Toolkit.EF6/Testing/RandomizedDbConnection.cs +++ b/EntityFramework.Toolkit.EF6/Testing/RandomizedDbConnection.cs @@ -1,4 +1,4 @@ -namespace EntityFramework.Toolkit.EF6.Testing +namespace EntityFramework.Toolkit.Testing { public class RandomizedDbConnection : DbConnection { diff --git a/EntityFramework.Toolkit.EF6/UnitOfWork.cs b/EntityFramework.Toolkit.EF6/UnitOfWork.cs index 60cd29f..7657ed6 100644 --- a/EntityFramework.Toolkit.EF6/UnitOfWork.cs +++ b/EntityFramework.Toolkit.EF6/UnitOfWork.cs @@ -2,14 +2,14 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.Transactions; -using EntityFramework.Toolkit.EF6.Contracts; -using EntityFramework.Toolkit.EF6.Exceptions; +using EntityFramework.Toolkit.Core; +using EntityFramework.Toolkit.Exceptions; #if !NET40 using System.Threading.Tasks; #endif -namespace EntityFramework.Toolkit.EF6 +namespace EntityFramework.Toolkit { public sealed class UnitOfWork : IUnitOfWork { diff --git a/EntityFramework.Toolkit.EF6/Utils/DbHelpers.cs b/EntityFramework.Toolkit.EF6/Utils/DbHelpers.cs index 17747e9..a55fab8 100644 --- a/EntityFramework.Toolkit.EF6/Utils/DbHelpers.cs +++ b/EntityFramework.Toolkit.EF6/Utils/DbHelpers.cs @@ -1,7 +1,7 @@ using System.Linq.Expressions; -using EntityFramework.Toolkit.EF6.Extensions; +using EntityFramework.Toolkit.Extensions; -namespace EntityFramework.Toolkit.EF6.Utils +namespace EntityFramework.Toolkit.Utils { internal static class DbHelpers { diff --git a/EntityFramework.Toolkit.EF6/Utils/ReflectionHelper.cs b/EntityFramework.Toolkit.EF6/Utils/ReflectionHelper.cs index 487f1f8..bf66cb8 100644 --- a/EntityFramework.Toolkit.EF6/Utils/ReflectionHelper.cs +++ b/EntityFramework.Toolkit.EF6/Utils/ReflectionHelper.cs @@ -1,9 +1,9 @@ using System; using System.Linq.Expressions; using System.Reflection; -using EntityFramework.Toolkit.EF6.Extensions; +using EntityFramework.Toolkit.Extensions; -namespace EntityFramework.Toolkit.EF6.Utils +namespace EntityFramework.Toolkit.Utils { internal static class ReflectionHelper { diff --git a/Samples/ToolkitSample.DataAccess.Contracts/Repository/IDepartmentRepository.cs b/Samples/ToolkitSample.DataAccess.Contracts/Repository/IDepartmentRepository.cs index 61efb0f..5d34038 100644 --- a/Samples/ToolkitSample.DataAccess.Contracts/Repository/IDepartmentRepository.cs +++ b/Samples/ToolkitSample.DataAccess.Contracts/Repository/IDepartmentRepository.cs @@ -1,5 +1,5 @@ -using EntityFramework.Toolkit.EF6; -using EntityFramework.Toolkit.EF6.Contracts; +using EntityFramework.Toolkit; +using EntityFramework.Toolkit.Core; using ToolkitSample.Model; namespace ToolkitSample.DataAccess.Contracts.Repository diff --git a/Samples/ToolkitSample.DataAccess.Contracts/Repository/IEmployeeReadOnlyRepository.cs b/Samples/ToolkitSample.DataAccess.Contracts/Repository/IEmployeeReadOnlyRepository.cs index 6bb0b9d..ee1b6b9 100644 --- a/Samples/ToolkitSample.DataAccess.Contracts/Repository/IEmployeeReadOnlyRepository.cs +++ b/Samples/ToolkitSample.DataAccess.Contracts/Repository/IEmployeeReadOnlyRepository.cs @@ -1,5 +1,5 @@ -using EntityFramework.Toolkit.EF6; -using EntityFramework.Toolkit.EF6.Contracts; +using EntityFramework.Toolkit; +using EntityFramework.Toolkit.Core; using ToolkitSample.Model; namespace ToolkitSample.DataAccess.Contracts.Repository diff --git a/Samples/ToolkitSample.DataAccess.Contracts/Repository/IEmployeeRepository.cs b/Samples/ToolkitSample.DataAccess.Contracts/Repository/IEmployeeRepository.cs index 7eac81c..cd7d071 100644 --- a/Samples/ToolkitSample.DataAccess.Contracts/Repository/IEmployeeRepository.cs +++ b/Samples/ToolkitSample.DataAccess.Contracts/Repository/IEmployeeRepository.cs @@ -1,4 +1,4 @@ -using EntityFramework.Toolkit.EF6.Contracts; +using EntityFramework.Toolkit.Core; using ToolkitSample.Model; namespace ToolkitSample.DataAccess.Contracts.Repository diff --git a/Samples/ToolkitSample.DataAccess.Contracts/Repository/IPersonRepository.cs b/Samples/ToolkitSample.DataAccess.Contracts/Repository/IPersonRepository.cs index 23e6fc4..5501e50 100644 --- a/Samples/ToolkitSample.DataAccess.Contracts/Repository/IPersonRepository.cs +++ b/Samples/ToolkitSample.DataAccess.Contracts/Repository/IPersonRepository.cs @@ -1,4 +1,4 @@ -using EntityFramework.Toolkit.EF6.Contracts; +using EntityFramework.Toolkit.Core; using ToolkitSample.Model; namespace ToolkitSample.DataAccess.Contracts.Repository diff --git a/Samples/ToolkitSample.DataAccess.Contracts/ToolkitSample.DataAccess.Contracts.csproj b/Samples/ToolkitSample.DataAccess.Contracts/ToolkitSample.DataAccess.Contracts.csproj index f7ed747..63f6d80 100644 --- a/Samples/ToolkitSample.DataAccess.Contracts/ToolkitSample.DataAccess.Contracts.csproj +++ b/Samples/ToolkitSample.DataAccess.Contracts/ToolkitSample.DataAccess.Contracts.csproj @@ -48,9 +48,9 @@ - + {88f192be-a2c5-4533-8376-b7838004947c} - EntityFramework.Toolkit.EF6.Contracts + EntityFramework.Toolkit.Core {f73b662b-33eb-4d15-9da7-2798645aafaa} diff --git a/Samples/ToolkitSample.DataAccess/Concurrency/CustomConcurrencyResolveStrategy.cs b/Samples/ToolkitSample.DataAccess/Concurrency/CustomConcurrencyResolveStrategy.cs index cee98aa..085cd19 100644 --- a/Samples/ToolkitSample.DataAccess/Concurrency/CustomConcurrencyResolveStrategy.cs +++ b/Samples/ToolkitSample.DataAccess/Concurrency/CustomConcurrencyResolveStrategy.cs @@ -1,5 +1,5 @@ using System; -using EntityFramework.Toolkit.EF6.Concurrency; +using EntityFramework.Toolkit.Concurrency; namespace ToolkitSample.DataAccess.Concurrency { diff --git a/Samples/ToolkitSample.DataAccess/Context/Auditing/TestAuditDbContext.cs b/Samples/ToolkitSample.DataAccess/Context/Auditing/TestAuditDbContext.cs index 9dcd515..b10eb33 100644 --- a/Samples/ToolkitSample.DataAccess/Context/Auditing/TestAuditDbContext.cs +++ b/Samples/ToolkitSample.DataAccess/Context/Auditing/TestAuditDbContext.cs @@ -1,7 +1,7 @@ using System; using System.Data.Entity; -using EntityFramework.Toolkit.EF6.Auditing; -using EntityFramework.Toolkit.EF6.Contracts; +using EntityFramework.Toolkit.Auditing; +using EntityFramework.Toolkit.Core; using ToolkitSample.Model; using ToolkitSample.Model.Auditing; diff --git a/Samples/ToolkitSample.DataAccess/Context/CountryEntityConfiguration.cs b/Samples/ToolkitSample.DataAccess/Context/CountryEntityConfiguration.cs index 042ee19..83ec002 100644 --- a/Samples/ToolkitSample.DataAccess/Context/CountryEntityConfiguration.cs +++ b/Samples/ToolkitSample.DataAccess/Context/CountryEntityConfiguration.cs @@ -1,5 +1,5 @@ using System.Data.Entity.ModelConfiguration; -using EntityFramework.Toolkit.EF6.Extensions; +using EntityFramework.Toolkit.Extensions; namespace ToolkitSample.DataAccess.Context { diff --git a/Samples/ToolkitSample.DataAccess/Context/DepartmentEntityConfiguration.cs b/Samples/ToolkitSample.DataAccess/Context/DepartmentEntityConfiguration.cs index fe74748..d0c07bc 100644 --- a/Samples/ToolkitSample.DataAccess/Context/DepartmentEntityConfiguration.cs +++ b/Samples/ToolkitSample.DataAccess/Context/DepartmentEntityConfiguration.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations.Schema; using System.Data.Entity.ModelConfiguration; -using EntityFramework.Toolkit.EF6.Extensions; +using EntityFramework.Toolkit.Extensions; namespace ToolkitSample.DataAccess.Context { diff --git a/Samples/ToolkitSample.DataAccess/Context/EmployeeAuditEntityTypeConfiguration.cs b/Samples/ToolkitSample.DataAccess/Context/EmployeeAuditEntityTypeConfiguration.cs index 7f0941d..4462303 100644 --- a/Samples/ToolkitSample.DataAccess/Context/EmployeeAuditEntityTypeConfiguration.cs +++ b/Samples/ToolkitSample.DataAccess/Context/EmployeeAuditEntityTypeConfiguration.cs @@ -1,4 +1,4 @@ -using EntityFramework.Toolkit.EF6.Auditing; +using EntityFramework.Toolkit.Auditing; using ToolkitSample.Model.Auditing; namespace ToolkitSample.DataAccess.Context diff --git a/Samples/ToolkitSample.DataAccess/Context/EmployeeContext.cs b/Samples/ToolkitSample.DataAccess/Context/EmployeeContext.cs index fe291fb..c0780de 100644 --- a/Samples/ToolkitSample.DataAccess/Context/EmployeeContext.cs +++ b/Samples/ToolkitSample.DataAccess/Context/EmployeeContext.cs @@ -1,8 +1,8 @@ using System; using System.Data.Entity; -using EntityFramework.Toolkit.EF6.Auditing; -using EntityFramework.Toolkit.EF6.Contracts; -using EntityFramework.Toolkit.EF6.Extensions; +using EntityFramework.Toolkit.Auditing; +using EntityFramework.Toolkit.Core; +using EntityFramework.Toolkit.Extensions; using ToolkitSample.Model; namespace ToolkitSample.DataAccess.Context diff --git a/Samples/ToolkitSample.DataAccess/Context/EmployeeContextDbConnection.cs b/Samples/ToolkitSample.DataAccess/Context/EmployeeContextDbConnection.cs index bd0559d..9723c4a 100644 --- a/Samples/ToolkitSample.DataAccess/Context/EmployeeContextDbConnection.cs +++ b/Samples/ToolkitSample.DataAccess/Context/EmployeeContextDbConnection.cs @@ -1,5 +1,5 @@ using System; -using EntityFramework.Toolkit.EF6; +using EntityFramework.Toolkit; namespace ToolkitSample.DataAccess.Context { diff --git a/Samples/ToolkitSample.DataAccess/Context/IEmployeeContext.cs b/Samples/ToolkitSample.DataAccess/Context/IEmployeeContext.cs index ab29cad..683173f 100644 --- a/Samples/ToolkitSample.DataAccess/Context/IEmployeeContext.cs +++ b/Samples/ToolkitSample.DataAccess/Context/IEmployeeContext.cs @@ -1,4 +1,4 @@ -using EntityFramework.Toolkit.EF6; +using EntityFramework.Toolkit; namespace ToolkitSample.DataAccess.Context { diff --git a/Samples/ToolkitSample.DataAccess/Context/ISampleContext.cs b/Samples/ToolkitSample.DataAccess/Context/ISampleContext.cs index c21342a..d126060 100644 --- a/Samples/ToolkitSample.DataAccess/Context/ISampleContext.cs +++ b/Samples/ToolkitSample.DataAccess/Context/ISampleContext.cs @@ -1,4 +1,4 @@ -using EntityFramework.Toolkit.EF6; +using EntityFramework.Toolkit; namespace ToolkitSample.DataAccess.Context { diff --git a/Samples/ToolkitSample.DataAccess/Context/ISampleContextTwo.cs b/Samples/ToolkitSample.DataAccess/Context/ISampleContextTwo.cs index aec1f3a..bf5a86b 100644 --- a/Samples/ToolkitSample.DataAccess/Context/ISampleContextTwo.cs +++ b/Samples/ToolkitSample.DataAccess/Context/ISampleContextTwo.cs @@ -1,4 +1,4 @@ -using EntityFramework.Toolkit.EF6; +using EntityFramework.Toolkit; namespace ToolkitSample.DataAccess.Context { diff --git a/Samples/ToolkitSample.DataAccess/Context/RoomConfiguration.cs b/Samples/ToolkitSample.DataAccess/Context/RoomConfiguration.cs index a7d29fb..9b2adaa 100644 --- a/Samples/ToolkitSample.DataAccess/Context/RoomConfiguration.cs +++ b/Samples/ToolkitSample.DataAccess/Context/RoomConfiguration.cs @@ -1,6 +1,6 @@  using System.Data.Entity.ModelConfiguration; -using EntityFramework.Toolkit.EF6.Extensions; +using EntityFramework.Toolkit.Extensions; using ToolkitSample.Model; namespace ToolkitSample.DataAccess.Context diff --git a/Samples/ToolkitSample.DataAccess/Context/SampleContext.cs b/Samples/ToolkitSample.DataAccess/Context/SampleContext.cs index fff8721..703c6d6 100644 --- a/Samples/ToolkitSample.DataAccess/Context/SampleContext.cs +++ b/Samples/ToolkitSample.DataAccess/Context/SampleContext.cs @@ -3,7 +3,7 @@ using System.Data.Entity; using System.Linq.Expressions; using System.Threading.Tasks; -using EntityFramework.Toolkit.EF6.Contracts; +using EntityFramework.Toolkit.Core; using ToolkitSample.DataAccess.Stubs; using ToolkitSample.Model; diff --git a/Samples/ToolkitSample.DataAccess/Context/TestEntityAuditEntityTypeConfiguration.cs b/Samples/ToolkitSample.DataAccess/Context/TestEntityAuditEntityTypeConfiguration.cs index d622321..ac00afd 100644 --- a/Samples/ToolkitSample.DataAccess/Context/TestEntityAuditEntityTypeConfiguration.cs +++ b/Samples/ToolkitSample.DataAccess/Context/TestEntityAuditEntityTypeConfiguration.cs @@ -1,4 +1,4 @@ -using EntityFramework.Toolkit.EF6.Auditing; +using EntityFramework.Toolkit.Auditing; using ToolkitSample.Model.Auditing; namespace ToolkitSample.DataAccess.Context diff --git a/Samples/ToolkitSample.DataAccess/Migrations/EmployeeContextMigrationConfiguration.cs b/Samples/ToolkitSample.DataAccess/Migrations/EmployeeContextMigrationConfiguration.cs index d225a8f..70448f5 100644 --- a/Samples/ToolkitSample.DataAccess/Migrations/EmployeeContextMigrationConfiguration.cs +++ b/Samples/ToolkitSample.DataAccess/Migrations/EmployeeContextMigrationConfiguration.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Data.Entity.Migrations; -using EntityFramework.Toolkit.EF6.Contracts; -using EntityFramework.Toolkit.EF6.Extensions; +using EntityFramework.Toolkit.Core; +using EntityFramework.Toolkit.Extensions; using ToolkitSample.DataAccess.Context; namespace ToolkitSample.DataAccess.Migrations diff --git a/Samples/ToolkitSample.DataAccess/Modularity/DataAccessModule.cs b/Samples/ToolkitSample.DataAccess/Modularity/DataAccessModule.cs index 10aa81e..404dbea 100644 --- a/Samples/ToolkitSample.DataAccess/Modularity/DataAccessModule.cs +++ b/Samples/ToolkitSample.DataAccess/Modularity/DataAccessModule.cs @@ -2,7 +2,7 @@ using System.Data.Entity; using Autofac; -using EntityFramework.Toolkit.EF6.Contracts; +using EntityFramework.Toolkit.Core; using ToolkitSample.DataAccess.Context; using ToolkitSample.DataAccess.Contracts.Repository; using ToolkitSample.DataAccess.Repository; diff --git a/Samples/ToolkitSample.DataAccess/Properties/AssemblyInfo.cs b/Samples/ToolkitSample.DataAccess/Properties/AssemblyInfo.cs index f6484d5..22127b7 100644 --- a/Samples/ToolkitSample.DataAccess/Properties/AssemblyInfo.cs +++ b/Samples/ToolkitSample.DataAccess/Properties/AssemblyInfo.cs @@ -35,4 +35,4 @@ [assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: InternalsVisibleTo("EntityFramework.Toolkit.EF6.Tests")] \ No newline at end of file +[assembly: InternalsVisibleTo("EntityFramework.Toolkit.Tests")] diff --git a/Samples/ToolkitSample.DataAccess/Repository/DepartmentRepository.cs b/Samples/ToolkitSample.DataAccess/Repository/DepartmentRepository.cs index 23371a6..8aad2d2 100644 --- a/Samples/ToolkitSample.DataAccess/Repository/DepartmentRepository.cs +++ b/Samples/ToolkitSample.DataAccess/Repository/DepartmentRepository.cs @@ -1,4 +1,4 @@ -using EntityFramework.Toolkit.EF6; +using EntityFramework.Toolkit; using ToolkitSample.DataAccess.Context; using ToolkitSample.DataAccess.Contracts.Repository; diff --git a/Samples/ToolkitSample.DataAccess/Repository/EmployeeReadOnlyRepository.cs b/Samples/ToolkitSample.DataAccess/Repository/EmployeeReadOnlyRepository.cs index 2353c16..7612124 100644 --- a/Samples/ToolkitSample.DataAccess/Repository/EmployeeReadOnlyRepository.cs +++ b/Samples/ToolkitSample.DataAccess/Repository/EmployeeReadOnlyRepository.cs @@ -1,5 +1,5 @@  -using EntityFramework.Toolkit.EF6; +using EntityFramework.Toolkit; using ToolkitSample.DataAccess.Context; using ToolkitSample.DataAccess.Contracts.Repository; diff --git a/Samples/ToolkitSample.DataAccess/Repository/EmployeeRepository.cs b/Samples/ToolkitSample.DataAccess/Repository/EmployeeRepository.cs index 3256f7d..7017e7b 100644 --- a/Samples/ToolkitSample.DataAccess/Repository/EmployeeRepository.cs +++ b/Samples/ToolkitSample.DataAccess/Repository/EmployeeRepository.cs @@ -1,4 +1,4 @@ -using EntityFramework.Toolkit.EF6; +using EntityFramework.Toolkit; using ToolkitSample.DataAccess.Context; using ToolkitSample.DataAccess.Contracts.Repository; diff --git a/Samples/ToolkitSample.DataAccess/Repository/PersonRepository.cs b/Samples/ToolkitSample.DataAccess/Repository/PersonRepository.cs index 0623553..9f7cc93 100644 --- a/Samples/ToolkitSample.DataAccess/Repository/PersonRepository.cs +++ b/Samples/ToolkitSample.DataAccess/Repository/PersonRepository.cs @@ -1,4 +1,4 @@ -using EntityFramework.Toolkit.EF6; +using EntityFramework.Toolkit; using ToolkitSample.DataAccess.Context; using ToolkitSample.DataAccess.Contracts.Repository; diff --git a/Samples/ToolkitSample.DataAccess/Seed/ApplicationSettingDataSeed.cs b/Samples/ToolkitSample.DataAccess/Seed/ApplicationSettingDataSeed.cs index 7c79a15..4a2fcf5 100644 --- a/Samples/ToolkitSample.DataAccess/Seed/ApplicationSettingDataSeed.cs +++ b/Samples/ToolkitSample.DataAccess/Seed/ApplicationSettingDataSeed.cs @@ -1,7 +1,7 @@ using System; using System.Linq.Expressions; -using EntityFramework.Toolkit.EF6; +using EntityFramework.Toolkit; using ToolkitSample.Model; diff --git a/Samples/ToolkitSample.DataAccess/Seed/CountryDataSeed.cs b/Samples/ToolkitSample.DataAccess/Seed/CountryDataSeed.cs index ffae47c..59b0788 100644 --- a/Samples/ToolkitSample.DataAccess/Seed/CountryDataSeed.cs +++ b/Samples/ToolkitSample.DataAccess/Seed/CountryDataSeed.cs @@ -1,7 +1,7 @@ using System; using System.Linq.Expressions; -using EntityFramework.Toolkit.EF6; +using EntityFramework.Toolkit; using ToolkitSample.Model; diff --git a/Samples/ToolkitSample.DataAccess/Seed/DepartmentDataSeed.cs b/Samples/ToolkitSample.DataAccess/Seed/DepartmentDataSeed.cs index 8dc8e05..bb2ff22 100644 --- a/Samples/ToolkitSample.DataAccess/Seed/DepartmentDataSeed.cs +++ b/Samples/ToolkitSample.DataAccess/Seed/DepartmentDataSeed.cs @@ -1,7 +1,7 @@ using System; using System.Linq.Expressions; -using EntityFramework.Toolkit.EF6; +using EntityFramework.Toolkit; using ToolkitSample.Model; diff --git a/Samples/ToolkitSample.DataAccess/ToolkitSample.DataAccess.csproj b/Samples/ToolkitSample.DataAccess/ToolkitSample.DataAccess.csproj index 20d4c0a..6fc0713 100644 --- a/Samples/ToolkitSample.DataAccess/ToolkitSample.DataAccess.csproj +++ b/Samples/ToolkitSample.DataAccess/ToolkitSample.DataAccess.csproj @@ -106,13 +106,13 @@ - + {88f192be-a2c5-4533-8376-b7838004947c} - EntityFramework.Toolkit.EF6.Contracts + EntityFramework.Toolkit.Core - + {bb2cfd38-0f40-4c10-ad5e-2c79f50f95f2} - EntityFramework.Toolkit.EF6 + EntityFramework.Toolkit {8b9396bc-1312-409a-bc0e-6888443c06b9} diff --git a/Samples/ToolkitSample.Model/Auditing/EmployeeAudit.cs b/Samples/ToolkitSample.Model/Auditing/EmployeeAudit.cs index 29f7069..31c455e 100644 --- a/Samples/ToolkitSample.Model/Auditing/EmployeeAudit.cs +++ b/Samples/ToolkitSample.Model/Auditing/EmployeeAudit.cs @@ -1,4 +1,4 @@ -using EntityFramework.Toolkit.EF6.Contracts.Auditing; +using EntityFramework.Toolkit.Core.Auditing; namespace ToolkitSample.Model.Auditing { diff --git a/Samples/ToolkitSample.Model/Auditing/TestEntity.cs b/Samples/ToolkitSample.Model/Auditing/TestEntity.cs index fd44780..00aa6cd 100644 --- a/Samples/ToolkitSample.Model/Auditing/TestEntity.cs +++ b/Samples/ToolkitSample.Model/Auditing/TestEntity.cs @@ -1,5 +1,5 @@ using System; -using EntityFramework.Toolkit.EF6.Contracts.Auditing; +using EntityFramework.Toolkit.Core.Auditing; namespace ToolkitSample.Model.Auditing { diff --git a/Samples/ToolkitSample.Model/Auditing/TestEntityAudit.cs b/Samples/ToolkitSample.Model/Auditing/TestEntityAudit.cs index e1a4a0e..037b2c0 100644 --- a/Samples/ToolkitSample.Model/Auditing/TestEntityAudit.cs +++ b/Samples/ToolkitSample.Model/Auditing/TestEntityAudit.cs @@ -1,5 +1,5 @@ using System; -using EntityFramework.Toolkit.EF6.Contracts.Auditing; +using EntityFramework.Toolkit.Core.Auditing; namespace ToolkitSample.Model.Auditing { diff --git a/Samples/ToolkitSample.Model/Person.cs b/Samples/ToolkitSample.Model/Person.cs index e501d40..81a2976 100644 --- a/Samples/ToolkitSample.Model/Person.cs +++ b/Samples/ToolkitSample.Model/Person.cs @@ -1,6 +1,6 @@ using System; using System.Diagnostics; -using EntityFramework.Toolkit.EF6.Contracts.Auditing; +using EntityFramework.Toolkit.Core.Auditing; namespace ToolkitSample.Model { diff --git a/Samples/ToolkitSample.Model/Room.cs b/Samples/ToolkitSample.Model/Room.cs index 2c5178d..e906308 100644 --- a/Samples/ToolkitSample.Model/Room.cs +++ b/Samples/ToolkitSample.Model/Room.cs @@ -1,6 +1,6 @@ using System; using System.Diagnostics; -using EntityFramework.Toolkit.EF6.Contracts.Auditing; +using EntityFramework.Toolkit.Core.Auditing; namespace ToolkitSample.Model { diff --git a/Samples/ToolkitSample.Model/ToolkitSample.Model.csproj b/Samples/ToolkitSample.Model/ToolkitSample.Model.csproj index d1c60a2..5f68021 100644 --- a/Samples/ToolkitSample.Model/ToolkitSample.Model.csproj +++ b/Samples/ToolkitSample.Model/ToolkitSample.Model.csproj @@ -58,9 +58,9 @@ - + {88f192be-a2c5-4533-8376-b7838004947c} - EntityFramework.Toolkit.EF6.Contracts + EntityFramework.Toolkit.Core diff --git a/Tests/EntityFramework.Toolkit.EF6.Tests/Auditing/AuditDbContextBaseTests.cs b/Tests/EntityFramework.Toolkit.EF6.Tests/Auditing/AuditDbContextBaseTests.cs index f77035c..875bf2a 100644 --- a/Tests/EntityFramework.Toolkit.EF6.Tests/Auditing/AuditDbContextBaseTests.cs +++ b/Tests/EntityFramework.Toolkit.EF6.Tests/Auditing/AuditDbContextBaseTests.cs @@ -4,9 +4,9 @@ using System.IO; using System.Linq; using System.Threading.Tasks; -using EntityFramework.Toolkit.EF6.Auditing; -using EntityFramework.Toolkit.EF6.Contracts.Auditing; -using EntityFramework.Toolkit.EF6.Testing; +using EntityFramework.Toolkit.Auditing; +using EntityFramework.Toolkit.Core.Auditing; +using EntityFramework.Toolkit.Testing; using FluentAssertions; using ToolkitSample.DataAccess.Context.Auditing; using ToolkitSample.Model; diff --git a/Tests/EntityFramework.Toolkit.EF6.Tests/Auditing/AuditTypeInfoTests.cs b/Tests/EntityFramework.Toolkit.EF6.Tests/Auditing/AuditTypeInfoTests.cs index c3caa69..6171a52 100644 --- a/Tests/EntityFramework.Toolkit.EF6.Tests/Auditing/AuditTypeInfoTests.cs +++ b/Tests/EntityFramework.Toolkit.EF6.Tests/Auditing/AuditTypeInfoTests.cs @@ -1,5 +1,5 @@ using System; -using EntityFramework.Toolkit.EF6.Auditing; +using EntityFramework.Toolkit.Auditing; using FluentAssertions; using ToolkitSample.Model.Auditing; diff --git a/Tests/EntityFramework.Toolkit.EF6.Tests/ContextTestBaseTests.cs b/Tests/EntityFramework.Toolkit.EF6.Tests/ContextTestBaseTests.cs index 0b47b2a..eec129e 100644 --- a/Tests/EntityFramework.Toolkit.EF6.Tests/ContextTestBaseTests.cs +++ b/Tests/EntityFramework.Toolkit.EF6.Tests/ContextTestBaseTests.cs @@ -1,7 +1,7 @@ using System.Data.Entity; -using EntityFramework.Toolkit.EF6; -using EntityFramework.Toolkit.EF6.Contracts; -using EntityFramework.Toolkit.EF6.Testing; +using EntityFramework.Toolkit; +using EntityFramework.Toolkit.Core; +using EntityFramework.Toolkit.Testing; using FluentAssertions; using Xunit; diff --git a/Tests/EntityFramework.Toolkit.EF6.Tests/DataSeedTests.IntegrationTests.cs b/Tests/EntityFramework.Toolkit.EF6.Tests/DataSeedTests.IntegrationTests.cs index 5fb9aa7..5169e16 100644 --- a/Tests/EntityFramework.Toolkit.EF6.Tests/DataSeedTests.IntegrationTests.cs +++ b/Tests/EntityFramework.Toolkit.EF6.Tests/DataSeedTests.IntegrationTests.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; -using EntityFramework.Toolkit.EF6.Contracts; -using EntityFramework.Toolkit.EF6.Testing; +using EntityFramework.Toolkit.Core; +using EntityFramework.Toolkit.Testing; using FluentAssertions; using ToolkitSample.DataAccess; diff --git a/Tests/EntityFramework.Toolkit.EF6.Tests/DataSeedTests.UnitTests.cs b/Tests/EntityFramework.Toolkit.EF6.Tests/DataSeedTests.UnitTests.cs index d60c037..d79bbf5 100644 --- a/Tests/EntityFramework.Toolkit.EF6.Tests/DataSeedTests.UnitTests.cs +++ b/Tests/EntityFramework.Toolkit.EF6.Tests/DataSeedTests.UnitTests.cs @@ -1,5 +1,5 @@ using System.Linq; -using EntityFramework.Toolkit.EF6.Contracts; +using EntityFramework.Toolkit.Core; using FluentAssertions; using ToolkitSample.DataAccess.Seed; diff --git a/Tests/EntityFramework.Toolkit.EF6.Tests/DbContextBaseTests.cs b/Tests/EntityFramework.Toolkit.EF6.Tests/DbContextBaseTests.cs index 0e17471..29e074e 100644 --- a/Tests/EntityFramework.Toolkit.EF6.Tests/DbContextBaseTests.cs +++ b/Tests/EntityFramework.Toolkit.EF6.Tests/DbContextBaseTests.cs @@ -1,9 +1,9 @@ using System; using System.Data.Entity.Infrastructure; using System.Linq; -using EntityFramework.Toolkit.EF6.Concurrency; -using EntityFramework.Toolkit.EF6.Contracts; -using EntityFramework.Toolkit.EF6.Testing; +using EntityFramework.Toolkit.Concurrency; +using EntityFramework.Toolkit.Core; +using EntityFramework.Toolkit.Testing; using EntityFramework.Toolkit.Tests.Stubs; using FluentAssertions; diff --git a/Tests/EntityFramework.Toolkit.EF6.Tests/DbContextExtensionsTests.cs b/Tests/EntityFramework.Toolkit.EF6.Tests/DbContextExtensionsTests.cs index 6ebb622..8d4855c 100644 --- a/Tests/EntityFramework.Toolkit.EF6.Tests/DbContextExtensionsTests.cs +++ b/Tests/EntityFramework.Toolkit.EF6.Tests/DbContextExtensionsTests.cs @@ -2,8 +2,8 @@ using System.Data.Entity; using System.Linq; using System.Reflection; -using EntityFramework.Toolkit.EF6.Extensions; -using EntityFramework.Toolkit.EF6.Testing; +using EntityFramework.Toolkit.Extensions; +using EntityFramework.Toolkit.Testing; using EntityFramework.Toolkit.Tests.Stubs; using FluentAssertions; diff --git a/Tests/EntityFramework.Toolkit.EF6.Tests/EdmxToolsTests.cs b/Tests/EntityFramework.Toolkit.EF6.Tests/EdmxToolsTests.cs index aafe847..8bb9437 100644 --- a/Tests/EntityFramework.Toolkit.EF6.Tests/EdmxToolsTests.cs +++ b/Tests/EntityFramework.Toolkit.EF6.Tests/EdmxToolsTests.cs @@ -1,5 +1,5 @@ -using EntityFramework.Toolkit.EF6; -using EntityFramework.Toolkit.EF6.Testing; +using EntityFramework.Toolkit; +using EntityFramework.Toolkit.Testing; using ToolkitSample.DataAccess.Context; using Xunit; diff --git a/Tests/EntityFramework.Toolkit.EF6.Tests/EmployeeContextTestDbConnection.cs b/Tests/EntityFramework.Toolkit.EF6.Tests/EmployeeContextTestDbConnection.cs index 2a82985..c142531 100644 --- a/Tests/EntityFramework.Toolkit.EF6.Tests/EmployeeContextTestDbConnection.cs +++ b/Tests/EntityFramework.Toolkit.EF6.Tests/EmployeeContextTestDbConnection.cs @@ -1,6 +1,6 @@ using System; -using EntityFramework.Toolkit.EF6; -using EntityFramework.Toolkit.EF6.Testing; +using EntityFramework.Toolkit; +using EntityFramework.Toolkit.Testing; namespace EntityFramework.Toolkit.Tests { diff --git a/Tests/EntityFramework.Toolkit.EF6.Tests/EntityFramework.Toolkit.EF6.Tests.csproj b/Tests/EntityFramework.Toolkit.EF6.Tests/EntityFramework.Toolkit.Tests.csproj similarity index 86% rename from Tests/EntityFramework.Toolkit.EF6.Tests/EntityFramework.Toolkit.EF6.Tests.csproj rename to Tests/EntityFramework.Toolkit.EF6.Tests/EntityFramework.Toolkit.Tests.csproj index d4e8d16..d910b6a 100644 --- a/Tests/EntityFramework.Toolkit.EF6.Tests/EntityFramework.Toolkit.EF6.Tests.csproj +++ b/Tests/EntityFramework.Toolkit.EF6.Tests/EntityFramework.Toolkit.Tests.csproj @@ -2,11 +2,11 @@ net45 - EntityFramework.Toolkit.EF6.Tests + EntityFramework.Toolkit.Tests EntityFramework.Toolkit.EF6.Tests win10-x64 false - EntityFramework.Toolkit.EF6.Tests + EntityFramework.Toolkit.Tests en @@ -27,8 +27,8 @@ - - + + diff --git a/Tests/EntityFramework.Toolkit.EF6.Tests/Extensions/ChangeSetExtensions.cs b/Tests/EntityFramework.Toolkit.EF6.Tests/Extensions/ChangeSetExtensions.cs index afff4b2..7d22ba2 100644 --- a/Tests/EntityFramework.Toolkit.EF6.Tests/Extensions/ChangeSetExtensions.cs +++ b/Tests/EntityFramework.Toolkit.EF6.Tests/Extensions/ChangeSetExtensions.cs @@ -1,7 +1,7 @@ using System; using System.Linq; using System.Text; -using EntityFramework.Toolkit.EF6.Contracts; +using EntityFramework.Toolkit.Core; using FluentAssertions.Execution; namespace EntityFramework.Toolkit.Tests.Extensions diff --git a/Tests/EntityFramework.Toolkit.EF6.Tests/Extensions/DateTimeExtensionsTests.cs b/Tests/EntityFramework.Toolkit.EF6.Tests/Extensions/DateTimeExtensionsTests.cs index 124cf1f..14ecb7c 100644 --- a/Tests/EntityFramework.Toolkit.EF6.Tests/Extensions/DateTimeExtensionsTests.cs +++ b/Tests/EntityFramework.Toolkit.EF6.Tests/Extensions/DateTimeExtensionsTests.cs @@ -1,5 +1,5 @@ using System; -using EntityFramework.Toolkit.EF6.Contracts.Extensions; +using EntityFramework.Toolkit.Core.Extensions; using FluentAssertions; using Xunit; diff --git a/Tests/EntityFramework.Toolkit.EF6.Tests/Extensions/DbConnectionExtensionsTests.cs b/Tests/EntityFramework.Toolkit.EF6.Tests/Extensions/DbConnectionExtensionsTests.cs index 945e767..a6ccbf0 100644 --- a/Tests/EntityFramework.Toolkit.EF6.Tests/Extensions/DbConnectionExtensionsTests.cs +++ b/Tests/EntityFramework.Toolkit.EF6.Tests/Extensions/DbConnectionExtensionsTests.cs @@ -1,6 +1,6 @@ -using EntityFramework.Toolkit.EF6.Contracts; -using EntityFramework.Toolkit.EF6.Extensions; -using EntityFramework.Toolkit.EF6.Testing; +using EntityFramework.Toolkit.Core; +using EntityFramework.Toolkit.Extensions; +using EntityFramework.Toolkit.Testing; using FluentAssertions; using ToolkitSample.DataAccess.Context; using Xunit; diff --git a/Tests/EntityFramework.Toolkit.EF6.Tests/Extensions/DbUpdateExceptionFormatterTests.cs b/Tests/EntityFramework.Toolkit.EF6.Tests/Extensions/DbUpdateExceptionFormatterTests.cs index 72a2d98..bb2a90b 100644 --- a/Tests/EntityFramework.Toolkit.EF6.Tests/Extensions/DbUpdateExceptionFormatterTests.cs +++ b/Tests/EntityFramework.Toolkit.EF6.Tests/Extensions/DbUpdateExceptionFormatterTests.cs @@ -1,9 +1,9 @@ using System; using System.Data.Entity; using System.Data.Entity.Infrastructure; -using EntityFramework.Toolkit.EF6; -using EntityFramework.Toolkit.EF6.Contracts; -using EntityFramework.Toolkit.EF6.Testing; +using EntityFramework.Toolkit; +using EntityFramework.Toolkit.Core; +using EntityFramework.Toolkit.Testing; using EntityFramework.Toolkit.Tests.Stubs; using FluentAssertions; diff --git a/Tests/EntityFramework.Toolkit.EF6.Tests/Extensions/TypeExtensionsTests.cs b/Tests/EntityFramework.Toolkit.EF6.Tests/Extensions/TypeExtensionsTests.cs index 4e594f8..d338be7 100644 --- a/Tests/EntityFramework.Toolkit.EF6.Tests/Extensions/TypeExtensionsTests.cs +++ b/Tests/EntityFramework.Toolkit.EF6.Tests/Extensions/TypeExtensionsTests.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using System.Data.Entity; using System.Linq; -using EntityFramework.Toolkit.EF6; -using EntityFramework.Toolkit.EF6.Contracts; -using EntityFramework.Toolkit.EF6.Extensions; +using EntityFramework.Toolkit; +using EntityFramework.Toolkit.Core; +using EntityFramework.Toolkit.Extensions; using FluentAssertions; using ToolkitSample.DataAccess.Context.Auditing; diff --git a/Tests/EntityFramework.Toolkit.EF6.Tests/IndexTests.cs b/Tests/EntityFramework.Toolkit.EF6.Tests/IndexTests.cs index 0ea943f..7e6acc1 100644 --- a/Tests/EntityFramework.Toolkit.EF6.Tests/IndexTests.cs +++ b/Tests/EntityFramework.Toolkit.EF6.Tests/IndexTests.cs @@ -3,8 +3,8 @@ using System.Data.Entity; using System.Data.Entity.Infrastructure; using System.Linq; -using EntityFramework.Toolkit.EF6.Contracts; -using EntityFramework.Toolkit.EF6.Testing; +using EntityFramework.Toolkit.Core; +using EntityFramework.Toolkit.Testing; using EntityFramework.Toolkit.Tests.Extensions; using FluentAssertions; diff --git a/Tests/EntityFramework.Toolkit.EF6.Tests/Repository/EmployeeReadOnlyRepositoryTests.cs b/Tests/EntityFramework.Toolkit.EF6.Tests/Repository/EmployeeReadOnlyRepositoryTests.cs index 9259804..955e6b4 100644 --- a/Tests/EntityFramework.Toolkit.EF6.Tests/Repository/EmployeeReadOnlyRepositoryTests.cs +++ b/Tests/EntityFramework.Toolkit.EF6.Tests/Repository/EmployeeReadOnlyRepositoryTests.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; using System.Data.Entity; using System.Linq; -using EntityFramework.Toolkit.EF6.Contracts; -using EntityFramework.Toolkit.EF6.Contracts.Extensions; -using EntityFramework.Toolkit.EF6.Testing; +using EntityFramework.Toolkit.Core; +using EntityFramework.Toolkit.Core.Extensions; +using EntityFramework.Toolkit.Testing; using EntityFramework.Toolkit.Tests.Stubs; using FluentAssertions; diff --git a/Tests/EntityFramework.Toolkit.EF6.Tests/Repository/GenericRepositoryTests.cs b/Tests/EntityFramework.Toolkit.EF6.Tests/Repository/GenericRepositoryTests.cs index c8bec42..a93051b 100644 --- a/Tests/EntityFramework.Toolkit.EF6.Tests/Repository/GenericRepositoryTests.cs +++ b/Tests/EntityFramework.Toolkit.EF6.Tests/Repository/GenericRepositoryTests.cs @@ -3,11 +3,11 @@ using System.Data.Entity; using System.Diagnostics; using System.Linq; -using EntityFramework.Toolkit.EF6; -using EntityFramework.Toolkit.EF6.Contracts; -using EntityFramework.Toolkit.EF6.Contracts.Extensions; -using EntityFramework.Toolkit.EF6.Exceptions; -using EntityFramework.Toolkit.EF6.Testing; +using EntityFramework.Toolkit; +using EntityFramework.Toolkit.Core; +using EntityFramework.Toolkit.Core.Extensions; +using EntityFramework.Toolkit.Exceptions; +using EntityFramework.Toolkit.Testing; using EntityFramework.Toolkit.Tests.Extensions; using EntityFramework.Toolkit.Tests.Stubs; diff --git a/Tests/EntityFramework.Toolkit.EF6.Tests/Repository/PersonRepositoryTests.cs b/Tests/EntityFramework.Toolkit.EF6.Tests/Repository/PersonRepositoryTests.cs index 96c9276..5bac97e 100644 --- a/Tests/EntityFramework.Toolkit.EF6.Tests/Repository/PersonRepositoryTests.cs +++ b/Tests/EntityFramework.Toolkit.EF6.Tests/Repository/PersonRepositoryTests.cs @@ -3,8 +3,8 @@ using System.Collections.Generic; using System.Data.Entity; using System.Linq; -using EntityFramework.Toolkit.EF6.Contracts; -using EntityFramework.Toolkit.EF6.Testing; +using EntityFramework.Toolkit.Core; +using EntityFramework.Toolkit.Testing; using ToolkitSample.DataAccess; using ToolkitSample.DataAccess.Context; using ToolkitSample.DataAccess.Contracts.Repository; diff --git a/Tests/EntityFramework.Toolkit.EF6.Tests/Testing/ConnectionStringGeneratorTests.cs b/Tests/EntityFramework.Toolkit.EF6.Tests/Testing/ConnectionStringGeneratorTests.cs index 556a09b..42089db 100644 --- a/Tests/EntityFramework.Toolkit.EF6.Tests/Testing/ConnectionStringGeneratorTests.cs +++ b/Tests/EntityFramework.Toolkit.EF6.Tests/Testing/ConnectionStringGeneratorTests.cs @@ -1,6 +1,6 @@ using System; using System.Data.SqlClient; -using EntityFramework.Toolkit.EF6.Testing; +using EntityFramework.Toolkit.Testing; using FluentAssertions; using Xunit; diff --git a/Tests/EntityFramework.Toolkit.EF6.Tests/UnitOfWork.IntegrationTests.cs b/Tests/EntityFramework.Toolkit.EF6.Tests/UnitOfWork.IntegrationTests.cs index e21f377..4b9553b 100644 --- a/Tests/EntityFramework.Toolkit.EF6.Tests/UnitOfWork.IntegrationTests.cs +++ b/Tests/EntityFramework.Toolkit.EF6.Tests/UnitOfWork.IntegrationTests.cs @@ -1,10 +1,10 @@ using System; using System.Data.Entity; using System.Linq; -using EntityFramework.Toolkit.EF6; -using EntityFramework.Toolkit.EF6.Contracts; -using EntityFramework.Toolkit.EF6.Exceptions; -using EntityFramework.Toolkit.EF6.Testing; +using EntityFramework.Toolkit; +using EntityFramework.Toolkit.Core; +using EntityFramework.Toolkit.Exceptions; +using EntityFramework.Toolkit.Testing; using EntityFramework.Toolkit.Tests.Stubs; using FluentAssertions; diff --git a/Tests/EntityFramework.Toolkit.EF6.Tests/UnitOfWork.UnitTests.cs b/Tests/EntityFramework.Toolkit.EF6.Tests/UnitOfWork.UnitTests.cs index 78c043c..c266f93 100644 --- a/Tests/EntityFramework.Toolkit.EF6.Tests/UnitOfWork.UnitTests.cs +++ b/Tests/EntityFramework.Toolkit.EF6.Tests/UnitOfWork.UnitTests.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; -using EntityFramework.Toolkit.EF6; -using EntityFramework.Toolkit.EF6.Contracts; -using EntityFramework.Toolkit.EF6.Exceptions; +using EntityFramework.Toolkit; +using EntityFramework.Toolkit.Core; +using EntityFramework.Toolkit.Exceptions; using FluentAssertions; using Moq; diff --git a/Tests/EntityFramework.Toolkit.EF6.Tests/Utils/DbHelpersTests.cs b/Tests/EntityFramework.Toolkit.EF6.Tests/Utils/DbHelpersTests.cs index d50c77f..ddedd31 100644 --- a/Tests/EntityFramework.Toolkit.EF6.Tests/Utils/DbHelpersTests.cs +++ b/Tests/EntityFramework.Toolkit.EF6.Tests/Utils/DbHelpersTests.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Linq.Expressions; -using EntityFramework.Toolkit.EF6.Utils; +using EntityFramework.Toolkit.Utils; using FluentAssertions; using Xunit; diff --git a/build.yml b/build.yml index 243ab69..cae5825 100644 --- a/build.yml +++ b/build.yml @@ -23,10 +23,10 @@ steps: displayName: 'Set Assembly Manifest Data' inputs: FileNames: | - EntityFramework.Toolkit.EF6.csproj - EntityFramework.Toolkit.EF6.Contracts.csproj + EntityFramework.Toolkit.csproj + EntityFramework.Toolkit.Core.csproj InsertAttributes: true - Title: 'EntityFramework.Toolkit.EF6' + Title: 'EntityFramework.Toolkit' Description: '' Company: 'superdev GmbH' Copyright: '(c) $(date:yyyy) superdev GmbH' @@ -70,7 +70,7 @@ steps: displayName: 'Pack NuGet PreRelease' inputs: command: pack - packagesToPack: '**\EntityFramework.Toolkit.EF6*.csproj' + packagesToPack: '**\EntityFramework.Toolkit*.csproj' versioningScheme: byEnvVar versionEnvVar: PackageVersionPre @@ -78,7 +78,7 @@ steps: displayName: 'Pack NuGet Prod' inputs: command: pack - packagesToPack: '**\EntityFramework.Toolkit.EF6*.csproj' + packagesToPack: '**\EntityFramework.Toolkit*.csproj' versioningScheme: byEnvVar versionEnvVar: PackageVersion From a1eae1d9c246f10f2408f6a495e7f23af66513f1 Mon Sep 17 00:00:00 2001 From: Thomas Galliker Date: Sat, 10 Nov 2018 09:52:46 +0100 Subject: [PATCH 2/6] Replace net45 with 452 in test project --- .../EntityFramework.Toolkit.Tests.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tests/EntityFramework.Toolkit.EF6.Tests/EntityFramework.Toolkit.Tests.csproj b/Tests/EntityFramework.Toolkit.EF6.Tests/EntityFramework.Toolkit.Tests.csproj index d910b6a..4fc9823 100644 --- a/Tests/EntityFramework.Toolkit.EF6.Tests/EntityFramework.Toolkit.Tests.csproj +++ b/Tests/EntityFramework.Toolkit.EF6.Tests/EntityFramework.Toolkit.Tests.csproj @@ -1,9 +1,9 @@  - net45 + net452 EntityFramework.Toolkit.Tests - EntityFramework.Toolkit.EF6.Tests + EntityFramework.Toolkit.Tests win10-x64 false EntityFramework.Toolkit.Tests From 808b8ba8a7127aa99d6d19ebc3ecefbaf41a9149 Mon Sep 17 00:00:00 2001 From: Thomas Galliker Date: Sat, 10 Nov 2018 10:00:57 +0100 Subject: [PATCH 3/6] Move files to new folder structure --- .../Auditing/AuditEntity.cs | 0 .../Auditing/AuditEntityState.cs | 0 .../Auditing/IAuditEntity.cs | 0 .../Auditing/ICreatedDate.cs | 0 .../Auditing/IUpdatedDate.cs | 0 .../Change.cs | 0 .../ChangeSet.cs | 0 .../ChangeState.cs | 0 .../EntityFramework.Toolkit.Core.csproj | 0 .../Extensions/DateTimeExtensions.cs | 0 .../Extensions/GenericRepositoryExtensions.cs | 0 .../Extensions/ReadOnlyRepositoryExtensions.cs | 0 .../IAuditContext.cs | 0 .../IChange.cs | 0 .../IContext.cs | 0 .../IDataSeed.cs | 0 .../IDbConnection.cs | 0 .../IGenericRepository.cs | 0 .../IQueryableIncluding.cs | 0 .../IReadOnlyRepository.cs | 0 .../IRepository.cs | 0 .../IUnitOfWork.cs | 0 .../IWritableRepository.cs | 0 .../PropertyChangeInfo.cs | 0 ...Framework.Toolkit.EF6.sln => EntityFramework.Toolkit.sln | 6 +++--- ...n.DotSettings => EntityFramework.Toolkit.sln.DotSettings | 0 .../AssemblyInfo.cs | 0 .../Auditing/AuditDbContextBase.cs | 0 .../Auditing/AuditDbContextConfiguration.cs | 0 .../Auditing/AuditDbContextConfigurationManager.cs | 0 .../Auditing/AuditEntityTypeConfiguration.cs | 0 .../Auditing/AuditTypeInfo.cs | 0 .../Auditing/ConfigFile/AuditConfigurationSection.cs | 0 .../Auditing/ConfigFile/EntityElement.cs | 0 .../Auditing/ConfigFile/EntityElementCollection.cs | 0 .../Auditing/Extensions/AuditEntityStateExtensions.cs | 0 .../Concurrency/ClientWinsConcurrencyResolveStrategy.cs | 0 .../Concurrency/DatabaseWinsConcurrencyResolveStrategy.cs | 0 .../Concurrency/IConcurrencyResolveStrategy.cs | 0 .../Concurrency/RethrowConcurrencyResolveStrategy.cs | 0 .../ConstructorInfoAndParameters.cs | 0 .../DataSeedBase.cs | 0 .../DbConnection.cs | 0 .../DbContextBase.cs | 0 .../EdmxTools.cs | 0 .../EntityFramework.Toolkit.csproj | 4 ++-- .../Exceptions/UnitOfWorkException.cs | 0 .../Exceptions/UpdateConcurrencyException.cs | 0 .../Extensions/AssemblyExtensions.cs | 0 .../Extensions/DatabaseExtensions.cs | 0 .../Extensions/DbConnectionExtensions.cs | 0 .../Extensions/DbContextExtensions.cs | 0 .../Extensions/DbEntityEntryExtensions.cs | 0 .../Extensions/DbEntityValidationExceptionFormatter.cs | 0 .../Extensions/DbUpdateExceptionFormatter.cs | 0 .../Extensions/ExpressionExtensions.cs | 0 .../Extensions/MappingExtensions.cs | 0 .../Extensions/QueryableExtensions.cs | 0 .../Extensions/ReflectionApi.cs | 0 .../Extensions/TableRowCounts.cs | 0 .../Extensions/TypeExtensions.cs | 0 .../GenericRepository.cs | 0 .../IDbContext.cs | 0 .../IndexConstants.cs | 0 .../PrimaryKey.cs | 0 .../QueryableIncluding.cs | 0 .../Testing/ConnectionStringGenerator.cs | 0 .../Testing/ContextTestBase.cs | 0 .../Testing/RandomizedDbConnection.cs | 0 .../UnitOfWork.cs | 0 .../Utils/DbHelpers.cs | 0 .../Utils/ReflectionHelper.cs | 0 .../ToolkitSample.DataAccess.Contracts.csproj | 2 +- .../ToolkitSample.DataAccess.csproj | 4 ++-- Samples/ToolkitSample.Model/ToolkitSample.Model.csproj | 2 +- .../App.config | 0 .../Auditing/AuditDbContextBaseTests.cs | 0 .../Auditing/AuditTypeInfoTests.cs | 0 .../ContextTestBaseTests.cs | 0 .../DataSeedTests.IntegrationTests.cs | 0 .../DataSeedTests.UnitTests.cs | 0 .../DbContextBaseTests.cs | 0 .../DbContextExtensionsTests.cs | 0 .../EdmxToolsTests.cs | 0 .../EmployeeContextTestDbConnection.cs | 0 .../EntityFramework.Toolkit.Tests.csproj | 4 ++-- .../Extensions/AssertionExtensions.cs | 0 .../Extensions/ChangeSetExtensions.cs | 0 .../Extensions/DateTimeExtensionsTests.cs | 0 .../Extensions/DbConnectionExtensionsTests.cs | 0 .../Extensions/DbUpdateExceptionFormatterTests.cs | 0 .../Extensions/TypeExtensionsTests.cs | 0 .../IndexTests.cs | 0 .../Modularity/DataAccessModuleTests.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../Properties/xunit.assembly.config.cs | 0 .../Repository/EmployeeReadOnlyRepositoryTests.cs | 0 .../Repository/GenericRepositoryTests.cs | 0 .../Repository/PersonRepositoryTests.cs | 0 .../Stubs/Testdata.cs | 0 .../Testing/ConnectionStringGeneratorTests.cs | 0 .../UnitOfWork.IntegrationTests.cs | 0 .../UnitOfWork.UnitTests.cs | 0 .../Utils/DbHelpersTests.cs | 0 104 files changed, 11 insertions(+), 11 deletions(-) rename {EntityFramework.Toolkit.EF6.Contracts => EntityFramework.Toolkit.Core}/Auditing/AuditEntity.cs (100%) rename {EntityFramework.Toolkit.EF6.Contracts => EntityFramework.Toolkit.Core}/Auditing/AuditEntityState.cs (100%) rename {EntityFramework.Toolkit.EF6.Contracts => EntityFramework.Toolkit.Core}/Auditing/IAuditEntity.cs (100%) rename {EntityFramework.Toolkit.EF6.Contracts => EntityFramework.Toolkit.Core}/Auditing/ICreatedDate.cs (100%) rename {EntityFramework.Toolkit.EF6.Contracts => EntityFramework.Toolkit.Core}/Auditing/IUpdatedDate.cs (100%) rename {EntityFramework.Toolkit.EF6.Contracts => EntityFramework.Toolkit.Core}/Change.cs (100%) rename {EntityFramework.Toolkit.EF6.Contracts => EntityFramework.Toolkit.Core}/ChangeSet.cs (100%) rename {EntityFramework.Toolkit.EF6.Contracts => EntityFramework.Toolkit.Core}/ChangeState.cs (100%) rename {EntityFramework.Toolkit.EF6.Contracts => EntityFramework.Toolkit.Core}/EntityFramework.Toolkit.Core.csproj (100%) rename {EntityFramework.Toolkit.EF6.Contracts => EntityFramework.Toolkit.Core}/Extensions/DateTimeExtensions.cs (100%) rename {EntityFramework.Toolkit.EF6.Contracts => EntityFramework.Toolkit.Core}/Extensions/GenericRepositoryExtensions.cs (100%) rename {EntityFramework.Toolkit.EF6.Contracts => EntityFramework.Toolkit.Core}/Extensions/ReadOnlyRepositoryExtensions.cs (100%) rename {EntityFramework.Toolkit.EF6.Contracts => EntityFramework.Toolkit.Core}/IAuditContext.cs (100%) rename {EntityFramework.Toolkit.EF6.Contracts => EntityFramework.Toolkit.Core}/IChange.cs (100%) rename {EntityFramework.Toolkit.EF6.Contracts => EntityFramework.Toolkit.Core}/IContext.cs (100%) rename {EntityFramework.Toolkit.EF6.Contracts => EntityFramework.Toolkit.Core}/IDataSeed.cs (100%) rename {EntityFramework.Toolkit.EF6.Contracts => EntityFramework.Toolkit.Core}/IDbConnection.cs (100%) rename {EntityFramework.Toolkit.EF6.Contracts => EntityFramework.Toolkit.Core}/IGenericRepository.cs (100%) rename {EntityFramework.Toolkit.EF6.Contracts => EntityFramework.Toolkit.Core}/IQueryableIncluding.cs (100%) rename {EntityFramework.Toolkit.EF6.Contracts => EntityFramework.Toolkit.Core}/IReadOnlyRepository.cs (100%) rename {EntityFramework.Toolkit.EF6.Contracts => EntityFramework.Toolkit.Core}/IRepository.cs (100%) rename {EntityFramework.Toolkit.EF6.Contracts => EntityFramework.Toolkit.Core}/IUnitOfWork.cs (100%) rename {EntityFramework.Toolkit.EF6.Contracts => EntityFramework.Toolkit.Core}/IWritableRepository.cs (100%) rename {EntityFramework.Toolkit.EF6.Contracts => EntityFramework.Toolkit.Core}/PropertyChangeInfo.cs (100%) rename EntityFramework.Toolkit.EF6.sln => EntityFramework.Toolkit.sln (91%) rename EntityFramework.Toolkit.EF6.sln.DotSettings => EntityFramework.Toolkit.sln.DotSettings (100%) rename {EntityFramework.Toolkit.EF6 => EntityFramework.Toolkit}/AssemblyInfo.cs (100%) rename {EntityFramework.Toolkit.EF6 => EntityFramework.Toolkit}/Auditing/AuditDbContextBase.cs (100%) rename {EntityFramework.Toolkit.EF6 => EntityFramework.Toolkit}/Auditing/AuditDbContextConfiguration.cs (100%) rename {EntityFramework.Toolkit.EF6 => EntityFramework.Toolkit}/Auditing/AuditDbContextConfigurationManager.cs (100%) rename {EntityFramework.Toolkit.EF6 => EntityFramework.Toolkit}/Auditing/AuditEntityTypeConfiguration.cs (100%) rename {EntityFramework.Toolkit.EF6 => EntityFramework.Toolkit}/Auditing/AuditTypeInfo.cs (100%) rename {EntityFramework.Toolkit.EF6 => EntityFramework.Toolkit}/Auditing/ConfigFile/AuditConfigurationSection.cs (100%) rename {EntityFramework.Toolkit.EF6 => EntityFramework.Toolkit}/Auditing/ConfigFile/EntityElement.cs (100%) rename {EntityFramework.Toolkit.EF6 => EntityFramework.Toolkit}/Auditing/ConfigFile/EntityElementCollection.cs (100%) rename {EntityFramework.Toolkit.EF6 => EntityFramework.Toolkit}/Auditing/Extensions/AuditEntityStateExtensions.cs (100%) rename {EntityFramework.Toolkit.EF6 => EntityFramework.Toolkit}/Concurrency/ClientWinsConcurrencyResolveStrategy.cs (100%) rename {EntityFramework.Toolkit.EF6 => EntityFramework.Toolkit}/Concurrency/DatabaseWinsConcurrencyResolveStrategy.cs (100%) rename {EntityFramework.Toolkit.EF6 => EntityFramework.Toolkit}/Concurrency/IConcurrencyResolveStrategy.cs (100%) rename {EntityFramework.Toolkit.EF6 => EntityFramework.Toolkit}/Concurrency/RethrowConcurrencyResolveStrategy.cs (100%) rename {EntityFramework.Toolkit.EF6 => EntityFramework.Toolkit}/ConstructorInfoAndParameters.cs (100%) rename {EntityFramework.Toolkit.EF6 => EntityFramework.Toolkit}/DataSeedBase.cs (100%) rename {EntityFramework.Toolkit.EF6 => EntityFramework.Toolkit}/DbConnection.cs (100%) rename {EntityFramework.Toolkit.EF6 => EntityFramework.Toolkit}/DbContextBase.cs (100%) rename {EntityFramework.Toolkit.EF6 => EntityFramework.Toolkit}/EdmxTools.cs (100%) rename {EntityFramework.Toolkit.EF6 => EntityFramework.Toolkit}/EntityFramework.Toolkit.csproj (97%) rename {EntityFramework.Toolkit.EF6 => EntityFramework.Toolkit}/Exceptions/UnitOfWorkException.cs (100%) rename {EntityFramework.Toolkit.EF6 => EntityFramework.Toolkit}/Exceptions/UpdateConcurrencyException.cs (100%) rename {EntityFramework.Toolkit.EF6 => EntityFramework.Toolkit}/Extensions/AssemblyExtensions.cs (100%) rename {EntityFramework.Toolkit.EF6 => EntityFramework.Toolkit}/Extensions/DatabaseExtensions.cs (100%) rename {EntityFramework.Toolkit.EF6 => EntityFramework.Toolkit}/Extensions/DbConnectionExtensions.cs (100%) rename {EntityFramework.Toolkit.EF6 => EntityFramework.Toolkit}/Extensions/DbContextExtensions.cs (100%) rename {EntityFramework.Toolkit.EF6 => EntityFramework.Toolkit}/Extensions/DbEntityEntryExtensions.cs (100%) rename {EntityFramework.Toolkit.EF6 => EntityFramework.Toolkit}/Extensions/DbEntityValidationExceptionFormatter.cs (100%) rename {EntityFramework.Toolkit.EF6 => EntityFramework.Toolkit}/Extensions/DbUpdateExceptionFormatter.cs (100%) rename {EntityFramework.Toolkit.EF6 => EntityFramework.Toolkit}/Extensions/ExpressionExtensions.cs (100%) rename {EntityFramework.Toolkit.EF6 => EntityFramework.Toolkit}/Extensions/MappingExtensions.cs (100%) rename {EntityFramework.Toolkit.EF6 => EntityFramework.Toolkit}/Extensions/QueryableExtensions.cs (100%) rename {EntityFramework.Toolkit.EF6 => EntityFramework.Toolkit}/Extensions/ReflectionApi.cs (100%) rename {EntityFramework.Toolkit.EF6 => EntityFramework.Toolkit}/Extensions/TableRowCounts.cs (100%) rename {EntityFramework.Toolkit.EF6 => EntityFramework.Toolkit}/Extensions/TypeExtensions.cs (100%) rename {EntityFramework.Toolkit.EF6 => EntityFramework.Toolkit}/GenericRepository.cs (100%) rename {EntityFramework.Toolkit.EF6 => EntityFramework.Toolkit}/IDbContext.cs (100%) rename {EntityFramework.Toolkit.EF6 => EntityFramework.Toolkit}/IndexConstants.cs (100%) rename {EntityFramework.Toolkit.EF6 => EntityFramework.Toolkit}/PrimaryKey.cs (100%) rename {EntityFramework.Toolkit.EF6 => EntityFramework.Toolkit}/QueryableIncluding.cs (100%) rename {EntityFramework.Toolkit.EF6 => EntityFramework.Toolkit}/Testing/ConnectionStringGenerator.cs (100%) rename {EntityFramework.Toolkit.EF6 => EntityFramework.Toolkit}/Testing/ContextTestBase.cs (100%) rename {EntityFramework.Toolkit.EF6 => EntityFramework.Toolkit}/Testing/RandomizedDbConnection.cs (100%) rename {EntityFramework.Toolkit.EF6 => EntityFramework.Toolkit}/UnitOfWork.cs (100%) rename {EntityFramework.Toolkit.EF6 => EntityFramework.Toolkit}/Utils/DbHelpers.cs (100%) rename {EntityFramework.Toolkit.EF6 => EntityFramework.Toolkit}/Utils/ReflectionHelper.cs (100%) rename Tests/{EntityFramework.Toolkit.EF6.Tests => EntityFramework.Toolkit.Tests}/App.config (100%) rename Tests/{EntityFramework.Toolkit.EF6.Tests => EntityFramework.Toolkit.Tests}/Auditing/AuditDbContextBaseTests.cs (100%) rename Tests/{EntityFramework.Toolkit.EF6.Tests => EntityFramework.Toolkit.Tests}/Auditing/AuditTypeInfoTests.cs (100%) rename Tests/{EntityFramework.Toolkit.EF6.Tests => EntityFramework.Toolkit.Tests}/ContextTestBaseTests.cs (100%) rename Tests/{EntityFramework.Toolkit.EF6.Tests => EntityFramework.Toolkit.Tests}/DataSeedTests.IntegrationTests.cs (100%) rename Tests/{EntityFramework.Toolkit.EF6.Tests => EntityFramework.Toolkit.Tests}/DataSeedTests.UnitTests.cs (100%) rename Tests/{EntityFramework.Toolkit.EF6.Tests => EntityFramework.Toolkit.Tests}/DbContextBaseTests.cs (100%) rename Tests/{EntityFramework.Toolkit.EF6.Tests => EntityFramework.Toolkit.Tests}/DbContextExtensionsTests.cs (100%) rename Tests/{EntityFramework.Toolkit.EF6.Tests => EntityFramework.Toolkit.Tests}/EdmxToolsTests.cs (100%) rename Tests/{EntityFramework.Toolkit.EF6.Tests => EntityFramework.Toolkit.Tests}/EmployeeContextTestDbConnection.cs (100%) rename Tests/{EntityFramework.Toolkit.EF6.Tests => EntityFramework.Toolkit.Tests}/EntityFramework.Toolkit.Tests.csproj (87%) rename Tests/{EntityFramework.Toolkit.EF6.Tests => EntityFramework.Toolkit.Tests}/Extensions/AssertionExtensions.cs (100%) rename Tests/{EntityFramework.Toolkit.EF6.Tests => EntityFramework.Toolkit.Tests}/Extensions/ChangeSetExtensions.cs (100%) rename Tests/{EntityFramework.Toolkit.EF6.Tests => EntityFramework.Toolkit.Tests}/Extensions/DateTimeExtensionsTests.cs (100%) rename Tests/{EntityFramework.Toolkit.EF6.Tests => EntityFramework.Toolkit.Tests}/Extensions/DbConnectionExtensionsTests.cs (100%) rename Tests/{EntityFramework.Toolkit.EF6.Tests => EntityFramework.Toolkit.Tests}/Extensions/DbUpdateExceptionFormatterTests.cs (100%) rename Tests/{EntityFramework.Toolkit.EF6.Tests => EntityFramework.Toolkit.Tests}/Extensions/TypeExtensionsTests.cs (100%) rename Tests/{EntityFramework.Toolkit.EF6.Tests => EntityFramework.Toolkit.Tests}/IndexTests.cs (100%) rename Tests/{EntityFramework.Toolkit.EF6.Tests => EntityFramework.Toolkit.Tests}/Modularity/DataAccessModuleTests.cs (100%) rename Tests/{EntityFramework.Toolkit.EF6.Tests => EntityFramework.Toolkit.Tests}/Properties/AssemblyInfo.cs (100%) rename Tests/{EntityFramework.Toolkit.EF6.Tests => EntityFramework.Toolkit.Tests}/Properties/xunit.assembly.config.cs (100%) rename Tests/{EntityFramework.Toolkit.EF6.Tests => EntityFramework.Toolkit.Tests}/Repository/EmployeeReadOnlyRepositoryTests.cs (100%) rename Tests/{EntityFramework.Toolkit.EF6.Tests => EntityFramework.Toolkit.Tests}/Repository/GenericRepositoryTests.cs (100%) rename Tests/{EntityFramework.Toolkit.EF6.Tests => EntityFramework.Toolkit.Tests}/Repository/PersonRepositoryTests.cs (100%) rename Tests/{EntityFramework.Toolkit.EF6.Tests => EntityFramework.Toolkit.Tests}/Stubs/Testdata.cs (100%) rename Tests/{EntityFramework.Toolkit.EF6.Tests => EntityFramework.Toolkit.Tests}/Testing/ConnectionStringGeneratorTests.cs (100%) rename Tests/{EntityFramework.Toolkit.EF6.Tests => EntityFramework.Toolkit.Tests}/UnitOfWork.IntegrationTests.cs (100%) rename Tests/{EntityFramework.Toolkit.EF6.Tests => EntityFramework.Toolkit.Tests}/UnitOfWork.UnitTests.cs (100%) rename Tests/{EntityFramework.Toolkit.EF6.Tests => EntityFramework.Toolkit.Tests}/Utils/DbHelpersTests.cs (100%) diff --git a/EntityFramework.Toolkit.EF6.Contracts/Auditing/AuditEntity.cs b/EntityFramework.Toolkit.Core/Auditing/AuditEntity.cs similarity index 100% rename from EntityFramework.Toolkit.EF6.Contracts/Auditing/AuditEntity.cs rename to EntityFramework.Toolkit.Core/Auditing/AuditEntity.cs diff --git a/EntityFramework.Toolkit.EF6.Contracts/Auditing/AuditEntityState.cs b/EntityFramework.Toolkit.Core/Auditing/AuditEntityState.cs similarity index 100% rename from EntityFramework.Toolkit.EF6.Contracts/Auditing/AuditEntityState.cs rename to EntityFramework.Toolkit.Core/Auditing/AuditEntityState.cs diff --git a/EntityFramework.Toolkit.EF6.Contracts/Auditing/IAuditEntity.cs b/EntityFramework.Toolkit.Core/Auditing/IAuditEntity.cs similarity index 100% rename from EntityFramework.Toolkit.EF6.Contracts/Auditing/IAuditEntity.cs rename to EntityFramework.Toolkit.Core/Auditing/IAuditEntity.cs diff --git a/EntityFramework.Toolkit.EF6.Contracts/Auditing/ICreatedDate.cs b/EntityFramework.Toolkit.Core/Auditing/ICreatedDate.cs similarity index 100% rename from EntityFramework.Toolkit.EF6.Contracts/Auditing/ICreatedDate.cs rename to EntityFramework.Toolkit.Core/Auditing/ICreatedDate.cs diff --git a/EntityFramework.Toolkit.EF6.Contracts/Auditing/IUpdatedDate.cs b/EntityFramework.Toolkit.Core/Auditing/IUpdatedDate.cs similarity index 100% rename from EntityFramework.Toolkit.EF6.Contracts/Auditing/IUpdatedDate.cs rename to EntityFramework.Toolkit.Core/Auditing/IUpdatedDate.cs diff --git a/EntityFramework.Toolkit.EF6.Contracts/Change.cs b/EntityFramework.Toolkit.Core/Change.cs similarity index 100% rename from EntityFramework.Toolkit.EF6.Contracts/Change.cs rename to EntityFramework.Toolkit.Core/Change.cs diff --git a/EntityFramework.Toolkit.EF6.Contracts/ChangeSet.cs b/EntityFramework.Toolkit.Core/ChangeSet.cs similarity index 100% rename from EntityFramework.Toolkit.EF6.Contracts/ChangeSet.cs rename to EntityFramework.Toolkit.Core/ChangeSet.cs diff --git a/EntityFramework.Toolkit.EF6.Contracts/ChangeState.cs b/EntityFramework.Toolkit.Core/ChangeState.cs similarity index 100% rename from EntityFramework.Toolkit.EF6.Contracts/ChangeState.cs rename to EntityFramework.Toolkit.Core/ChangeState.cs diff --git a/EntityFramework.Toolkit.EF6.Contracts/EntityFramework.Toolkit.Core.csproj b/EntityFramework.Toolkit.Core/EntityFramework.Toolkit.Core.csproj similarity index 100% rename from EntityFramework.Toolkit.EF6.Contracts/EntityFramework.Toolkit.Core.csproj rename to EntityFramework.Toolkit.Core/EntityFramework.Toolkit.Core.csproj diff --git a/EntityFramework.Toolkit.EF6.Contracts/Extensions/DateTimeExtensions.cs b/EntityFramework.Toolkit.Core/Extensions/DateTimeExtensions.cs similarity index 100% rename from EntityFramework.Toolkit.EF6.Contracts/Extensions/DateTimeExtensions.cs rename to EntityFramework.Toolkit.Core/Extensions/DateTimeExtensions.cs diff --git a/EntityFramework.Toolkit.EF6.Contracts/Extensions/GenericRepositoryExtensions.cs b/EntityFramework.Toolkit.Core/Extensions/GenericRepositoryExtensions.cs similarity index 100% rename from EntityFramework.Toolkit.EF6.Contracts/Extensions/GenericRepositoryExtensions.cs rename to EntityFramework.Toolkit.Core/Extensions/GenericRepositoryExtensions.cs diff --git a/EntityFramework.Toolkit.EF6.Contracts/Extensions/ReadOnlyRepositoryExtensions.cs b/EntityFramework.Toolkit.Core/Extensions/ReadOnlyRepositoryExtensions.cs similarity index 100% rename from EntityFramework.Toolkit.EF6.Contracts/Extensions/ReadOnlyRepositoryExtensions.cs rename to EntityFramework.Toolkit.Core/Extensions/ReadOnlyRepositoryExtensions.cs diff --git a/EntityFramework.Toolkit.EF6.Contracts/IAuditContext.cs b/EntityFramework.Toolkit.Core/IAuditContext.cs similarity index 100% rename from EntityFramework.Toolkit.EF6.Contracts/IAuditContext.cs rename to EntityFramework.Toolkit.Core/IAuditContext.cs diff --git a/EntityFramework.Toolkit.EF6.Contracts/IChange.cs b/EntityFramework.Toolkit.Core/IChange.cs similarity index 100% rename from EntityFramework.Toolkit.EF6.Contracts/IChange.cs rename to EntityFramework.Toolkit.Core/IChange.cs diff --git a/EntityFramework.Toolkit.EF6.Contracts/IContext.cs b/EntityFramework.Toolkit.Core/IContext.cs similarity index 100% rename from EntityFramework.Toolkit.EF6.Contracts/IContext.cs rename to EntityFramework.Toolkit.Core/IContext.cs diff --git a/EntityFramework.Toolkit.EF6.Contracts/IDataSeed.cs b/EntityFramework.Toolkit.Core/IDataSeed.cs similarity index 100% rename from EntityFramework.Toolkit.EF6.Contracts/IDataSeed.cs rename to EntityFramework.Toolkit.Core/IDataSeed.cs diff --git a/EntityFramework.Toolkit.EF6.Contracts/IDbConnection.cs b/EntityFramework.Toolkit.Core/IDbConnection.cs similarity index 100% rename from EntityFramework.Toolkit.EF6.Contracts/IDbConnection.cs rename to EntityFramework.Toolkit.Core/IDbConnection.cs diff --git a/EntityFramework.Toolkit.EF6.Contracts/IGenericRepository.cs b/EntityFramework.Toolkit.Core/IGenericRepository.cs similarity index 100% rename from EntityFramework.Toolkit.EF6.Contracts/IGenericRepository.cs rename to EntityFramework.Toolkit.Core/IGenericRepository.cs diff --git a/EntityFramework.Toolkit.EF6.Contracts/IQueryableIncluding.cs b/EntityFramework.Toolkit.Core/IQueryableIncluding.cs similarity index 100% rename from EntityFramework.Toolkit.EF6.Contracts/IQueryableIncluding.cs rename to EntityFramework.Toolkit.Core/IQueryableIncluding.cs diff --git a/EntityFramework.Toolkit.EF6.Contracts/IReadOnlyRepository.cs b/EntityFramework.Toolkit.Core/IReadOnlyRepository.cs similarity index 100% rename from EntityFramework.Toolkit.EF6.Contracts/IReadOnlyRepository.cs rename to EntityFramework.Toolkit.Core/IReadOnlyRepository.cs diff --git a/EntityFramework.Toolkit.EF6.Contracts/IRepository.cs b/EntityFramework.Toolkit.Core/IRepository.cs similarity index 100% rename from EntityFramework.Toolkit.EF6.Contracts/IRepository.cs rename to EntityFramework.Toolkit.Core/IRepository.cs diff --git a/EntityFramework.Toolkit.EF6.Contracts/IUnitOfWork.cs b/EntityFramework.Toolkit.Core/IUnitOfWork.cs similarity index 100% rename from EntityFramework.Toolkit.EF6.Contracts/IUnitOfWork.cs rename to EntityFramework.Toolkit.Core/IUnitOfWork.cs diff --git a/EntityFramework.Toolkit.EF6.Contracts/IWritableRepository.cs b/EntityFramework.Toolkit.Core/IWritableRepository.cs similarity index 100% rename from EntityFramework.Toolkit.EF6.Contracts/IWritableRepository.cs rename to EntityFramework.Toolkit.Core/IWritableRepository.cs diff --git a/EntityFramework.Toolkit.EF6.Contracts/PropertyChangeInfo.cs b/EntityFramework.Toolkit.Core/PropertyChangeInfo.cs similarity index 100% rename from EntityFramework.Toolkit.EF6.Contracts/PropertyChangeInfo.cs rename to EntityFramework.Toolkit.Core/PropertyChangeInfo.cs diff --git a/EntityFramework.Toolkit.EF6.sln b/EntityFramework.Toolkit.sln similarity index 91% rename from EntityFramework.Toolkit.EF6.sln rename to EntityFramework.Toolkit.sln index 06d48eb..7b79dd4 100644 --- a/EntityFramework.Toolkit.EF6.sln +++ b/EntityFramework.Toolkit.sln @@ -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.Tests", "Tests\EntityFramework.Toolkit.EF6.Tests\EntityFramework.Toolkit.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", "EntityFramework.Toolkit.EF6\EntityFramework.Toolkit.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.Core", "EntityFramework.Toolkit.EF6.Contracts\EntityFramework.Toolkit.Core.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 diff --git a/EntityFramework.Toolkit.EF6.sln.DotSettings b/EntityFramework.Toolkit.sln.DotSettings similarity index 100% rename from EntityFramework.Toolkit.EF6.sln.DotSettings rename to EntityFramework.Toolkit.sln.DotSettings diff --git a/EntityFramework.Toolkit.EF6/AssemblyInfo.cs b/EntityFramework.Toolkit/AssemblyInfo.cs similarity index 100% rename from EntityFramework.Toolkit.EF6/AssemblyInfo.cs rename to EntityFramework.Toolkit/AssemblyInfo.cs diff --git a/EntityFramework.Toolkit.EF6/Auditing/AuditDbContextBase.cs b/EntityFramework.Toolkit/Auditing/AuditDbContextBase.cs similarity index 100% rename from EntityFramework.Toolkit.EF6/Auditing/AuditDbContextBase.cs rename to EntityFramework.Toolkit/Auditing/AuditDbContextBase.cs diff --git a/EntityFramework.Toolkit.EF6/Auditing/AuditDbContextConfiguration.cs b/EntityFramework.Toolkit/Auditing/AuditDbContextConfiguration.cs similarity index 100% rename from EntityFramework.Toolkit.EF6/Auditing/AuditDbContextConfiguration.cs rename to EntityFramework.Toolkit/Auditing/AuditDbContextConfiguration.cs diff --git a/EntityFramework.Toolkit.EF6/Auditing/AuditDbContextConfigurationManager.cs b/EntityFramework.Toolkit/Auditing/AuditDbContextConfigurationManager.cs similarity index 100% rename from EntityFramework.Toolkit.EF6/Auditing/AuditDbContextConfigurationManager.cs rename to EntityFramework.Toolkit/Auditing/AuditDbContextConfigurationManager.cs diff --git a/EntityFramework.Toolkit.EF6/Auditing/AuditEntityTypeConfiguration.cs b/EntityFramework.Toolkit/Auditing/AuditEntityTypeConfiguration.cs similarity index 100% rename from EntityFramework.Toolkit.EF6/Auditing/AuditEntityTypeConfiguration.cs rename to EntityFramework.Toolkit/Auditing/AuditEntityTypeConfiguration.cs diff --git a/EntityFramework.Toolkit.EF6/Auditing/AuditTypeInfo.cs b/EntityFramework.Toolkit/Auditing/AuditTypeInfo.cs similarity index 100% rename from EntityFramework.Toolkit.EF6/Auditing/AuditTypeInfo.cs rename to EntityFramework.Toolkit/Auditing/AuditTypeInfo.cs diff --git a/EntityFramework.Toolkit.EF6/Auditing/ConfigFile/AuditConfigurationSection.cs b/EntityFramework.Toolkit/Auditing/ConfigFile/AuditConfigurationSection.cs similarity index 100% rename from EntityFramework.Toolkit.EF6/Auditing/ConfigFile/AuditConfigurationSection.cs rename to EntityFramework.Toolkit/Auditing/ConfigFile/AuditConfigurationSection.cs diff --git a/EntityFramework.Toolkit.EF6/Auditing/ConfigFile/EntityElement.cs b/EntityFramework.Toolkit/Auditing/ConfigFile/EntityElement.cs similarity index 100% rename from EntityFramework.Toolkit.EF6/Auditing/ConfigFile/EntityElement.cs rename to EntityFramework.Toolkit/Auditing/ConfigFile/EntityElement.cs diff --git a/EntityFramework.Toolkit.EF6/Auditing/ConfigFile/EntityElementCollection.cs b/EntityFramework.Toolkit/Auditing/ConfigFile/EntityElementCollection.cs similarity index 100% rename from EntityFramework.Toolkit.EF6/Auditing/ConfigFile/EntityElementCollection.cs rename to EntityFramework.Toolkit/Auditing/ConfigFile/EntityElementCollection.cs diff --git a/EntityFramework.Toolkit.EF6/Auditing/Extensions/AuditEntityStateExtensions.cs b/EntityFramework.Toolkit/Auditing/Extensions/AuditEntityStateExtensions.cs similarity index 100% rename from EntityFramework.Toolkit.EF6/Auditing/Extensions/AuditEntityStateExtensions.cs rename to EntityFramework.Toolkit/Auditing/Extensions/AuditEntityStateExtensions.cs diff --git a/EntityFramework.Toolkit.EF6/Concurrency/ClientWinsConcurrencyResolveStrategy.cs b/EntityFramework.Toolkit/Concurrency/ClientWinsConcurrencyResolveStrategy.cs similarity index 100% rename from EntityFramework.Toolkit.EF6/Concurrency/ClientWinsConcurrencyResolveStrategy.cs rename to EntityFramework.Toolkit/Concurrency/ClientWinsConcurrencyResolveStrategy.cs diff --git a/EntityFramework.Toolkit.EF6/Concurrency/DatabaseWinsConcurrencyResolveStrategy.cs b/EntityFramework.Toolkit/Concurrency/DatabaseWinsConcurrencyResolveStrategy.cs similarity index 100% rename from EntityFramework.Toolkit.EF6/Concurrency/DatabaseWinsConcurrencyResolveStrategy.cs rename to EntityFramework.Toolkit/Concurrency/DatabaseWinsConcurrencyResolveStrategy.cs diff --git a/EntityFramework.Toolkit.EF6/Concurrency/IConcurrencyResolveStrategy.cs b/EntityFramework.Toolkit/Concurrency/IConcurrencyResolveStrategy.cs similarity index 100% rename from EntityFramework.Toolkit.EF6/Concurrency/IConcurrencyResolveStrategy.cs rename to EntityFramework.Toolkit/Concurrency/IConcurrencyResolveStrategy.cs diff --git a/EntityFramework.Toolkit.EF6/Concurrency/RethrowConcurrencyResolveStrategy.cs b/EntityFramework.Toolkit/Concurrency/RethrowConcurrencyResolveStrategy.cs similarity index 100% rename from EntityFramework.Toolkit.EF6/Concurrency/RethrowConcurrencyResolveStrategy.cs rename to EntityFramework.Toolkit/Concurrency/RethrowConcurrencyResolveStrategy.cs diff --git a/EntityFramework.Toolkit.EF6/ConstructorInfoAndParameters.cs b/EntityFramework.Toolkit/ConstructorInfoAndParameters.cs similarity index 100% rename from EntityFramework.Toolkit.EF6/ConstructorInfoAndParameters.cs rename to EntityFramework.Toolkit/ConstructorInfoAndParameters.cs diff --git a/EntityFramework.Toolkit.EF6/DataSeedBase.cs b/EntityFramework.Toolkit/DataSeedBase.cs similarity index 100% rename from EntityFramework.Toolkit.EF6/DataSeedBase.cs rename to EntityFramework.Toolkit/DataSeedBase.cs diff --git a/EntityFramework.Toolkit.EF6/DbConnection.cs b/EntityFramework.Toolkit/DbConnection.cs similarity index 100% rename from EntityFramework.Toolkit.EF6/DbConnection.cs rename to EntityFramework.Toolkit/DbConnection.cs diff --git a/EntityFramework.Toolkit.EF6/DbContextBase.cs b/EntityFramework.Toolkit/DbContextBase.cs similarity index 100% rename from EntityFramework.Toolkit.EF6/DbContextBase.cs rename to EntityFramework.Toolkit/DbContextBase.cs diff --git a/EntityFramework.Toolkit.EF6/EdmxTools.cs b/EntityFramework.Toolkit/EdmxTools.cs similarity index 100% rename from EntityFramework.Toolkit.EF6/EdmxTools.cs rename to EntityFramework.Toolkit/EdmxTools.cs diff --git a/EntityFramework.Toolkit.EF6/EntityFramework.Toolkit.csproj b/EntityFramework.Toolkit/EntityFramework.Toolkit.csproj similarity index 97% rename from EntityFramework.Toolkit.EF6/EntityFramework.Toolkit.csproj rename to EntityFramework.Toolkit/EntityFramework.Toolkit.csproj index dc1e0e6..63c2151 100644 --- a/EntityFramework.Toolkit.EF6/EntityFramework.Toolkit.csproj +++ b/EntityFramework.Toolkit/EntityFramework.Toolkit.csproj @@ -1,4 +1,4 @@ - + EntityFramework.Toolkit is a library which provides implementations for EntityFramework best practices, patterns, utilities and extensions. @@ -98,7 +98,7 @@ - + diff --git a/EntityFramework.Toolkit.EF6/Exceptions/UnitOfWorkException.cs b/EntityFramework.Toolkit/Exceptions/UnitOfWorkException.cs similarity index 100% rename from EntityFramework.Toolkit.EF6/Exceptions/UnitOfWorkException.cs rename to EntityFramework.Toolkit/Exceptions/UnitOfWorkException.cs diff --git a/EntityFramework.Toolkit.EF6/Exceptions/UpdateConcurrencyException.cs b/EntityFramework.Toolkit/Exceptions/UpdateConcurrencyException.cs similarity index 100% rename from EntityFramework.Toolkit.EF6/Exceptions/UpdateConcurrencyException.cs rename to EntityFramework.Toolkit/Exceptions/UpdateConcurrencyException.cs diff --git a/EntityFramework.Toolkit.EF6/Extensions/AssemblyExtensions.cs b/EntityFramework.Toolkit/Extensions/AssemblyExtensions.cs similarity index 100% rename from EntityFramework.Toolkit.EF6/Extensions/AssemblyExtensions.cs rename to EntityFramework.Toolkit/Extensions/AssemblyExtensions.cs diff --git a/EntityFramework.Toolkit.EF6/Extensions/DatabaseExtensions.cs b/EntityFramework.Toolkit/Extensions/DatabaseExtensions.cs similarity index 100% rename from EntityFramework.Toolkit.EF6/Extensions/DatabaseExtensions.cs rename to EntityFramework.Toolkit/Extensions/DatabaseExtensions.cs diff --git a/EntityFramework.Toolkit.EF6/Extensions/DbConnectionExtensions.cs b/EntityFramework.Toolkit/Extensions/DbConnectionExtensions.cs similarity index 100% rename from EntityFramework.Toolkit.EF6/Extensions/DbConnectionExtensions.cs rename to EntityFramework.Toolkit/Extensions/DbConnectionExtensions.cs diff --git a/EntityFramework.Toolkit.EF6/Extensions/DbContextExtensions.cs b/EntityFramework.Toolkit/Extensions/DbContextExtensions.cs similarity index 100% rename from EntityFramework.Toolkit.EF6/Extensions/DbContextExtensions.cs rename to EntityFramework.Toolkit/Extensions/DbContextExtensions.cs diff --git a/EntityFramework.Toolkit.EF6/Extensions/DbEntityEntryExtensions.cs b/EntityFramework.Toolkit/Extensions/DbEntityEntryExtensions.cs similarity index 100% rename from EntityFramework.Toolkit.EF6/Extensions/DbEntityEntryExtensions.cs rename to EntityFramework.Toolkit/Extensions/DbEntityEntryExtensions.cs diff --git a/EntityFramework.Toolkit.EF6/Extensions/DbEntityValidationExceptionFormatter.cs b/EntityFramework.Toolkit/Extensions/DbEntityValidationExceptionFormatter.cs similarity index 100% rename from EntityFramework.Toolkit.EF6/Extensions/DbEntityValidationExceptionFormatter.cs rename to EntityFramework.Toolkit/Extensions/DbEntityValidationExceptionFormatter.cs diff --git a/EntityFramework.Toolkit.EF6/Extensions/DbUpdateExceptionFormatter.cs b/EntityFramework.Toolkit/Extensions/DbUpdateExceptionFormatter.cs similarity index 100% rename from EntityFramework.Toolkit.EF6/Extensions/DbUpdateExceptionFormatter.cs rename to EntityFramework.Toolkit/Extensions/DbUpdateExceptionFormatter.cs diff --git a/EntityFramework.Toolkit.EF6/Extensions/ExpressionExtensions.cs b/EntityFramework.Toolkit/Extensions/ExpressionExtensions.cs similarity index 100% rename from EntityFramework.Toolkit.EF6/Extensions/ExpressionExtensions.cs rename to EntityFramework.Toolkit/Extensions/ExpressionExtensions.cs diff --git a/EntityFramework.Toolkit.EF6/Extensions/MappingExtensions.cs b/EntityFramework.Toolkit/Extensions/MappingExtensions.cs similarity index 100% rename from EntityFramework.Toolkit.EF6/Extensions/MappingExtensions.cs rename to EntityFramework.Toolkit/Extensions/MappingExtensions.cs diff --git a/EntityFramework.Toolkit.EF6/Extensions/QueryableExtensions.cs b/EntityFramework.Toolkit/Extensions/QueryableExtensions.cs similarity index 100% rename from EntityFramework.Toolkit.EF6/Extensions/QueryableExtensions.cs rename to EntityFramework.Toolkit/Extensions/QueryableExtensions.cs diff --git a/EntityFramework.Toolkit.EF6/Extensions/ReflectionApi.cs b/EntityFramework.Toolkit/Extensions/ReflectionApi.cs similarity index 100% rename from EntityFramework.Toolkit.EF6/Extensions/ReflectionApi.cs rename to EntityFramework.Toolkit/Extensions/ReflectionApi.cs diff --git a/EntityFramework.Toolkit.EF6/Extensions/TableRowCounts.cs b/EntityFramework.Toolkit/Extensions/TableRowCounts.cs similarity index 100% rename from EntityFramework.Toolkit.EF6/Extensions/TableRowCounts.cs rename to EntityFramework.Toolkit/Extensions/TableRowCounts.cs diff --git a/EntityFramework.Toolkit.EF6/Extensions/TypeExtensions.cs b/EntityFramework.Toolkit/Extensions/TypeExtensions.cs similarity index 100% rename from EntityFramework.Toolkit.EF6/Extensions/TypeExtensions.cs rename to EntityFramework.Toolkit/Extensions/TypeExtensions.cs diff --git a/EntityFramework.Toolkit.EF6/GenericRepository.cs b/EntityFramework.Toolkit/GenericRepository.cs similarity index 100% rename from EntityFramework.Toolkit.EF6/GenericRepository.cs rename to EntityFramework.Toolkit/GenericRepository.cs diff --git a/EntityFramework.Toolkit.EF6/IDbContext.cs b/EntityFramework.Toolkit/IDbContext.cs similarity index 100% rename from EntityFramework.Toolkit.EF6/IDbContext.cs rename to EntityFramework.Toolkit/IDbContext.cs diff --git a/EntityFramework.Toolkit.EF6/IndexConstants.cs b/EntityFramework.Toolkit/IndexConstants.cs similarity index 100% rename from EntityFramework.Toolkit.EF6/IndexConstants.cs rename to EntityFramework.Toolkit/IndexConstants.cs diff --git a/EntityFramework.Toolkit.EF6/PrimaryKey.cs b/EntityFramework.Toolkit/PrimaryKey.cs similarity index 100% rename from EntityFramework.Toolkit.EF6/PrimaryKey.cs rename to EntityFramework.Toolkit/PrimaryKey.cs diff --git a/EntityFramework.Toolkit.EF6/QueryableIncluding.cs b/EntityFramework.Toolkit/QueryableIncluding.cs similarity index 100% rename from EntityFramework.Toolkit.EF6/QueryableIncluding.cs rename to EntityFramework.Toolkit/QueryableIncluding.cs diff --git a/EntityFramework.Toolkit.EF6/Testing/ConnectionStringGenerator.cs b/EntityFramework.Toolkit/Testing/ConnectionStringGenerator.cs similarity index 100% rename from EntityFramework.Toolkit.EF6/Testing/ConnectionStringGenerator.cs rename to EntityFramework.Toolkit/Testing/ConnectionStringGenerator.cs diff --git a/EntityFramework.Toolkit.EF6/Testing/ContextTestBase.cs b/EntityFramework.Toolkit/Testing/ContextTestBase.cs similarity index 100% rename from EntityFramework.Toolkit.EF6/Testing/ContextTestBase.cs rename to EntityFramework.Toolkit/Testing/ContextTestBase.cs diff --git a/EntityFramework.Toolkit.EF6/Testing/RandomizedDbConnection.cs b/EntityFramework.Toolkit/Testing/RandomizedDbConnection.cs similarity index 100% rename from EntityFramework.Toolkit.EF6/Testing/RandomizedDbConnection.cs rename to EntityFramework.Toolkit/Testing/RandomizedDbConnection.cs diff --git a/EntityFramework.Toolkit.EF6/UnitOfWork.cs b/EntityFramework.Toolkit/UnitOfWork.cs similarity index 100% rename from EntityFramework.Toolkit.EF6/UnitOfWork.cs rename to EntityFramework.Toolkit/UnitOfWork.cs diff --git a/EntityFramework.Toolkit.EF6/Utils/DbHelpers.cs b/EntityFramework.Toolkit/Utils/DbHelpers.cs similarity index 100% rename from EntityFramework.Toolkit.EF6/Utils/DbHelpers.cs rename to EntityFramework.Toolkit/Utils/DbHelpers.cs diff --git a/EntityFramework.Toolkit.EF6/Utils/ReflectionHelper.cs b/EntityFramework.Toolkit/Utils/ReflectionHelper.cs similarity index 100% rename from EntityFramework.Toolkit.EF6/Utils/ReflectionHelper.cs rename to EntityFramework.Toolkit/Utils/ReflectionHelper.cs diff --git a/Samples/ToolkitSample.DataAccess.Contracts/ToolkitSample.DataAccess.Contracts.csproj b/Samples/ToolkitSample.DataAccess.Contracts/ToolkitSample.DataAccess.Contracts.csproj index 63f6d80..f2ba1f7 100644 --- a/Samples/ToolkitSample.DataAccess.Contracts/ToolkitSample.DataAccess.Contracts.csproj +++ b/Samples/ToolkitSample.DataAccess.Contracts/ToolkitSample.DataAccess.Contracts.csproj @@ -48,7 +48,7 @@ - + {88f192be-a2c5-4533-8376-b7838004947c} EntityFramework.Toolkit.Core diff --git a/Samples/ToolkitSample.DataAccess/ToolkitSample.DataAccess.csproj b/Samples/ToolkitSample.DataAccess/ToolkitSample.DataAccess.csproj index 6fc0713..56b5f88 100644 --- a/Samples/ToolkitSample.DataAccess/ToolkitSample.DataAccess.csproj +++ b/Samples/ToolkitSample.DataAccess/ToolkitSample.DataAccess.csproj @@ -106,11 +106,11 @@ - + {88f192be-a2c5-4533-8376-b7838004947c} EntityFramework.Toolkit.Core - + {bb2cfd38-0f40-4c10-ad5e-2c79f50f95f2} EntityFramework.Toolkit diff --git a/Samples/ToolkitSample.Model/ToolkitSample.Model.csproj b/Samples/ToolkitSample.Model/ToolkitSample.Model.csproj index 5f68021..4c28968 100644 --- a/Samples/ToolkitSample.Model/ToolkitSample.Model.csproj +++ b/Samples/ToolkitSample.Model/ToolkitSample.Model.csproj @@ -58,7 +58,7 @@ - + {88f192be-a2c5-4533-8376-b7838004947c} EntityFramework.Toolkit.Core diff --git a/Tests/EntityFramework.Toolkit.EF6.Tests/App.config b/Tests/EntityFramework.Toolkit.Tests/App.config similarity index 100% rename from Tests/EntityFramework.Toolkit.EF6.Tests/App.config rename to Tests/EntityFramework.Toolkit.Tests/App.config diff --git a/Tests/EntityFramework.Toolkit.EF6.Tests/Auditing/AuditDbContextBaseTests.cs b/Tests/EntityFramework.Toolkit.Tests/Auditing/AuditDbContextBaseTests.cs similarity index 100% rename from Tests/EntityFramework.Toolkit.EF6.Tests/Auditing/AuditDbContextBaseTests.cs rename to Tests/EntityFramework.Toolkit.Tests/Auditing/AuditDbContextBaseTests.cs diff --git a/Tests/EntityFramework.Toolkit.EF6.Tests/Auditing/AuditTypeInfoTests.cs b/Tests/EntityFramework.Toolkit.Tests/Auditing/AuditTypeInfoTests.cs similarity index 100% rename from Tests/EntityFramework.Toolkit.EF6.Tests/Auditing/AuditTypeInfoTests.cs rename to Tests/EntityFramework.Toolkit.Tests/Auditing/AuditTypeInfoTests.cs diff --git a/Tests/EntityFramework.Toolkit.EF6.Tests/ContextTestBaseTests.cs b/Tests/EntityFramework.Toolkit.Tests/ContextTestBaseTests.cs similarity index 100% rename from Tests/EntityFramework.Toolkit.EF6.Tests/ContextTestBaseTests.cs rename to Tests/EntityFramework.Toolkit.Tests/ContextTestBaseTests.cs diff --git a/Tests/EntityFramework.Toolkit.EF6.Tests/DataSeedTests.IntegrationTests.cs b/Tests/EntityFramework.Toolkit.Tests/DataSeedTests.IntegrationTests.cs similarity index 100% rename from Tests/EntityFramework.Toolkit.EF6.Tests/DataSeedTests.IntegrationTests.cs rename to Tests/EntityFramework.Toolkit.Tests/DataSeedTests.IntegrationTests.cs diff --git a/Tests/EntityFramework.Toolkit.EF6.Tests/DataSeedTests.UnitTests.cs b/Tests/EntityFramework.Toolkit.Tests/DataSeedTests.UnitTests.cs similarity index 100% rename from Tests/EntityFramework.Toolkit.EF6.Tests/DataSeedTests.UnitTests.cs rename to Tests/EntityFramework.Toolkit.Tests/DataSeedTests.UnitTests.cs diff --git a/Tests/EntityFramework.Toolkit.EF6.Tests/DbContextBaseTests.cs b/Tests/EntityFramework.Toolkit.Tests/DbContextBaseTests.cs similarity index 100% rename from Tests/EntityFramework.Toolkit.EF6.Tests/DbContextBaseTests.cs rename to Tests/EntityFramework.Toolkit.Tests/DbContextBaseTests.cs diff --git a/Tests/EntityFramework.Toolkit.EF6.Tests/DbContextExtensionsTests.cs b/Tests/EntityFramework.Toolkit.Tests/DbContextExtensionsTests.cs similarity index 100% rename from Tests/EntityFramework.Toolkit.EF6.Tests/DbContextExtensionsTests.cs rename to Tests/EntityFramework.Toolkit.Tests/DbContextExtensionsTests.cs diff --git a/Tests/EntityFramework.Toolkit.EF6.Tests/EdmxToolsTests.cs b/Tests/EntityFramework.Toolkit.Tests/EdmxToolsTests.cs similarity index 100% rename from Tests/EntityFramework.Toolkit.EF6.Tests/EdmxToolsTests.cs rename to Tests/EntityFramework.Toolkit.Tests/EdmxToolsTests.cs diff --git a/Tests/EntityFramework.Toolkit.EF6.Tests/EmployeeContextTestDbConnection.cs b/Tests/EntityFramework.Toolkit.Tests/EmployeeContextTestDbConnection.cs similarity index 100% rename from Tests/EntityFramework.Toolkit.EF6.Tests/EmployeeContextTestDbConnection.cs rename to Tests/EntityFramework.Toolkit.Tests/EmployeeContextTestDbConnection.cs diff --git a/Tests/EntityFramework.Toolkit.EF6.Tests/EntityFramework.Toolkit.Tests.csproj b/Tests/EntityFramework.Toolkit.Tests/EntityFramework.Toolkit.Tests.csproj similarity index 87% rename from Tests/EntityFramework.Toolkit.EF6.Tests/EntityFramework.Toolkit.Tests.csproj rename to Tests/EntityFramework.Toolkit.Tests/EntityFramework.Toolkit.Tests.csproj index 4fc9823..b2d4436 100644 --- a/Tests/EntityFramework.Toolkit.EF6.Tests/EntityFramework.Toolkit.Tests.csproj +++ b/Tests/EntityFramework.Toolkit.Tests/EntityFramework.Toolkit.Tests.csproj @@ -27,8 +27,8 @@ - - + + diff --git a/Tests/EntityFramework.Toolkit.EF6.Tests/Extensions/AssertionExtensions.cs b/Tests/EntityFramework.Toolkit.Tests/Extensions/AssertionExtensions.cs similarity index 100% rename from Tests/EntityFramework.Toolkit.EF6.Tests/Extensions/AssertionExtensions.cs rename to Tests/EntityFramework.Toolkit.Tests/Extensions/AssertionExtensions.cs diff --git a/Tests/EntityFramework.Toolkit.EF6.Tests/Extensions/ChangeSetExtensions.cs b/Tests/EntityFramework.Toolkit.Tests/Extensions/ChangeSetExtensions.cs similarity index 100% rename from Tests/EntityFramework.Toolkit.EF6.Tests/Extensions/ChangeSetExtensions.cs rename to Tests/EntityFramework.Toolkit.Tests/Extensions/ChangeSetExtensions.cs diff --git a/Tests/EntityFramework.Toolkit.EF6.Tests/Extensions/DateTimeExtensionsTests.cs b/Tests/EntityFramework.Toolkit.Tests/Extensions/DateTimeExtensionsTests.cs similarity index 100% rename from Tests/EntityFramework.Toolkit.EF6.Tests/Extensions/DateTimeExtensionsTests.cs rename to Tests/EntityFramework.Toolkit.Tests/Extensions/DateTimeExtensionsTests.cs diff --git a/Tests/EntityFramework.Toolkit.EF6.Tests/Extensions/DbConnectionExtensionsTests.cs b/Tests/EntityFramework.Toolkit.Tests/Extensions/DbConnectionExtensionsTests.cs similarity index 100% rename from Tests/EntityFramework.Toolkit.EF6.Tests/Extensions/DbConnectionExtensionsTests.cs rename to Tests/EntityFramework.Toolkit.Tests/Extensions/DbConnectionExtensionsTests.cs diff --git a/Tests/EntityFramework.Toolkit.EF6.Tests/Extensions/DbUpdateExceptionFormatterTests.cs b/Tests/EntityFramework.Toolkit.Tests/Extensions/DbUpdateExceptionFormatterTests.cs similarity index 100% rename from Tests/EntityFramework.Toolkit.EF6.Tests/Extensions/DbUpdateExceptionFormatterTests.cs rename to Tests/EntityFramework.Toolkit.Tests/Extensions/DbUpdateExceptionFormatterTests.cs diff --git a/Tests/EntityFramework.Toolkit.EF6.Tests/Extensions/TypeExtensionsTests.cs b/Tests/EntityFramework.Toolkit.Tests/Extensions/TypeExtensionsTests.cs similarity index 100% rename from Tests/EntityFramework.Toolkit.EF6.Tests/Extensions/TypeExtensionsTests.cs rename to Tests/EntityFramework.Toolkit.Tests/Extensions/TypeExtensionsTests.cs diff --git a/Tests/EntityFramework.Toolkit.EF6.Tests/IndexTests.cs b/Tests/EntityFramework.Toolkit.Tests/IndexTests.cs similarity index 100% rename from Tests/EntityFramework.Toolkit.EF6.Tests/IndexTests.cs rename to Tests/EntityFramework.Toolkit.Tests/IndexTests.cs diff --git a/Tests/EntityFramework.Toolkit.EF6.Tests/Modularity/DataAccessModuleTests.cs b/Tests/EntityFramework.Toolkit.Tests/Modularity/DataAccessModuleTests.cs similarity index 100% rename from Tests/EntityFramework.Toolkit.EF6.Tests/Modularity/DataAccessModuleTests.cs rename to Tests/EntityFramework.Toolkit.Tests/Modularity/DataAccessModuleTests.cs diff --git a/Tests/EntityFramework.Toolkit.EF6.Tests/Properties/AssemblyInfo.cs b/Tests/EntityFramework.Toolkit.Tests/Properties/AssemblyInfo.cs similarity index 100% rename from Tests/EntityFramework.Toolkit.EF6.Tests/Properties/AssemblyInfo.cs rename to Tests/EntityFramework.Toolkit.Tests/Properties/AssemblyInfo.cs diff --git a/Tests/EntityFramework.Toolkit.EF6.Tests/Properties/xunit.assembly.config.cs b/Tests/EntityFramework.Toolkit.Tests/Properties/xunit.assembly.config.cs similarity index 100% rename from Tests/EntityFramework.Toolkit.EF6.Tests/Properties/xunit.assembly.config.cs rename to Tests/EntityFramework.Toolkit.Tests/Properties/xunit.assembly.config.cs diff --git a/Tests/EntityFramework.Toolkit.EF6.Tests/Repository/EmployeeReadOnlyRepositoryTests.cs b/Tests/EntityFramework.Toolkit.Tests/Repository/EmployeeReadOnlyRepositoryTests.cs similarity index 100% rename from Tests/EntityFramework.Toolkit.EF6.Tests/Repository/EmployeeReadOnlyRepositoryTests.cs rename to Tests/EntityFramework.Toolkit.Tests/Repository/EmployeeReadOnlyRepositoryTests.cs diff --git a/Tests/EntityFramework.Toolkit.EF6.Tests/Repository/GenericRepositoryTests.cs b/Tests/EntityFramework.Toolkit.Tests/Repository/GenericRepositoryTests.cs similarity index 100% rename from Tests/EntityFramework.Toolkit.EF6.Tests/Repository/GenericRepositoryTests.cs rename to Tests/EntityFramework.Toolkit.Tests/Repository/GenericRepositoryTests.cs diff --git a/Tests/EntityFramework.Toolkit.EF6.Tests/Repository/PersonRepositoryTests.cs b/Tests/EntityFramework.Toolkit.Tests/Repository/PersonRepositoryTests.cs similarity index 100% rename from Tests/EntityFramework.Toolkit.EF6.Tests/Repository/PersonRepositoryTests.cs rename to Tests/EntityFramework.Toolkit.Tests/Repository/PersonRepositoryTests.cs diff --git a/Tests/EntityFramework.Toolkit.EF6.Tests/Stubs/Testdata.cs b/Tests/EntityFramework.Toolkit.Tests/Stubs/Testdata.cs similarity index 100% rename from Tests/EntityFramework.Toolkit.EF6.Tests/Stubs/Testdata.cs rename to Tests/EntityFramework.Toolkit.Tests/Stubs/Testdata.cs diff --git a/Tests/EntityFramework.Toolkit.EF6.Tests/Testing/ConnectionStringGeneratorTests.cs b/Tests/EntityFramework.Toolkit.Tests/Testing/ConnectionStringGeneratorTests.cs similarity index 100% rename from Tests/EntityFramework.Toolkit.EF6.Tests/Testing/ConnectionStringGeneratorTests.cs rename to Tests/EntityFramework.Toolkit.Tests/Testing/ConnectionStringGeneratorTests.cs diff --git a/Tests/EntityFramework.Toolkit.EF6.Tests/UnitOfWork.IntegrationTests.cs b/Tests/EntityFramework.Toolkit.Tests/UnitOfWork.IntegrationTests.cs similarity index 100% rename from Tests/EntityFramework.Toolkit.EF6.Tests/UnitOfWork.IntegrationTests.cs rename to Tests/EntityFramework.Toolkit.Tests/UnitOfWork.IntegrationTests.cs diff --git a/Tests/EntityFramework.Toolkit.EF6.Tests/UnitOfWork.UnitTests.cs b/Tests/EntityFramework.Toolkit.Tests/UnitOfWork.UnitTests.cs similarity index 100% rename from Tests/EntityFramework.Toolkit.EF6.Tests/UnitOfWork.UnitTests.cs rename to Tests/EntityFramework.Toolkit.Tests/UnitOfWork.UnitTests.cs diff --git a/Tests/EntityFramework.Toolkit.EF6.Tests/Utils/DbHelpersTests.cs b/Tests/EntityFramework.Toolkit.Tests/Utils/DbHelpersTests.cs similarity index 100% rename from Tests/EntityFramework.Toolkit.EF6.Tests/Utils/DbHelpersTests.cs rename to Tests/EntityFramework.Toolkit.Tests/Utils/DbHelpersTests.cs From 59747fdcc57238c3d9a6da7a699be58cfb8da18c Mon Sep 17 00:00:00 2001 From: Thomas Galliker Date: Sat, 10 Nov 2018 10:27:58 +0100 Subject: [PATCH 4/6] Fix unit tests --- EntityFramework.Toolkit/DbContextBase.cs | 10 +++++----- Samples/ToolkitSample.DataAccess/EmployeeContext.edmx | 2 +- .../EmployeeContextDatabaseInitializer.cs | 3 +-- .../Repository/EmployeeRepository.cs | 2 +- Tests/EntityFramework.Toolkit.Tests/EdmxToolsTests.cs | 2 +- .../Modularity/DataAccessModuleTests.cs | 2 +- .../Repository/GenericRepositoryTests.cs | 2 +- 7 files changed, 11 insertions(+), 12 deletions(-) diff --git a/EntityFramework.Toolkit/DbContextBase.cs b/EntityFramework.Toolkit/DbContextBase.cs index b0b422d..9ba87c2 100644 --- a/EntityFramework.Toolkit/DbContextBase.cs +++ b/EntityFramework.Toolkit/DbContextBase.cs @@ -47,7 +47,7 @@ protected DbContextBase(string nameOrConnectionString, IDatabaseInitializer databaseInitializer) @@ -68,7 +68,7 @@ protected DbContextBase(IDbConnection dbConnection, IDatabaseInitializer log = null) @@ -84,19 +84,19 @@ private void EnsureLog(Action log = null) /// public string Name { get; private set; } - private static void TryInitializeDatabase(DbContext dbContext, IDatabaseInitializer databaseInitializer, Action log) + private void TryInitializeDatabase(IDatabaseInitializer databaseInitializer) { try { lock (InitializerLock) { Database.SetInitializer(databaseInitializer); - dbContext.Database.Initialize(force: false); + this.Database.Initialize(force: false); } } catch (Exception ex) { - log(ex.ToString()); + this.Database.Log(ex.ToString()); } } diff --git a/Samples/ToolkitSample.DataAccess/EmployeeContext.edmx b/Samples/ToolkitSample.DataAccess/EmployeeContext.edmx index 19f8851..493f90d 100644 --- a/Samples/ToolkitSample.DataAccess/EmployeeContext.edmx +++ b/Samples/ToolkitSample.DataAccess/EmployeeContext.edmx @@ -74,7 +74,7 @@ - + diff --git a/Samples/ToolkitSample.DataAccess/EmployeeContextDatabaseInitializer.cs b/Samples/ToolkitSample.DataAccess/EmployeeContextDatabaseInitializer.cs index 89adbdd..b563a00 100644 --- a/Samples/ToolkitSample.DataAccess/EmployeeContextDatabaseInitializer.cs +++ b/Samples/ToolkitSample.DataAccess/EmployeeContextDatabaseInitializer.cs @@ -12,8 +12,7 @@ public EmployeeContextDatabaseInitializer() } public EmployeeContextDatabaseInitializer(EmployeeContextMigrationConfiguration migrationConfiguration) - : base(useSuppliedContext: true, - configuration: migrationConfiguration) + : base(useSuppliedContext: true, configuration: migrationConfiguration) { } } diff --git a/Samples/ToolkitSample.DataAccess/Repository/EmployeeRepository.cs b/Samples/ToolkitSample.DataAccess/Repository/EmployeeRepository.cs index 7017e7b..84e64fa 100644 --- a/Samples/ToolkitSample.DataAccess/Repository/EmployeeRepository.cs +++ b/Samples/ToolkitSample.DataAccess/Repository/EmployeeRepository.cs @@ -6,7 +6,7 @@ namespace ToolkitSample.DataAccess.Repository { /// - /// The EmployeeRepository should only be visibile withing the DAL layer. + /// The EmployeeRepository should only be visible withing the DAL layer. /// Consumers have to consume the IEmployeeRepository interface. /// public class EmployeeRepository : GenericRepository, IEmployeeRepository diff --git a/Tests/EntityFramework.Toolkit.Tests/EdmxToolsTests.cs b/Tests/EntityFramework.Toolkit.Tests/EdmxToolsTests.cs index 8bb9437..6528ca4 100644 --- a/Tests/EntityFramework.Toolkit.Tests/EdmxToolsTests.cs +++ b/Tests/EntityFramework.Toolkit.Tests/EdmxToolsTests.cs @@ -9,7 +9,7 @@ namespace EntityFramework.Toolkit.Tests { public class EdmxToolsTests : ContextTestBase { - private readonly string basePath = @"..\..\..\Samples\ToolkitSample.DataAccess\" + typeof(EmployeeContext).Name; + private readonly string basePath = @"..\..\..\..\..\Samples\ToolkitSample.DataAccess\" + typeof(EmployeeContext).Name; private readonly ITestOutputHelper testOutputHelper; public EdmxToolsTests(ITestOutputHelper testOutputHelper) diff --git a/Tests/EntityFramework.Toolkit.Tests/Modularity/DataAccessModuleTests.cs b/Tests/EntityFramework.Toolkit.Tests/Modularity/DataAccessModuleTests.cs index 3dde70f..84b9c8d 100644 --- a/Tests/EntityFramework.Toolkit.Tests/Modularity/DataAccessModuleTests.cs +++ b/Tests/EntityFramework.Toolkit.Tests/Modularity/DataAccessModuleTests.cs @@ -29,7 +29,7 @@ public void ShouldBuildAndResolveDependencies() private static IContainer GetContainer() { - var container = new Autofac.ContainerBuilder(); + var container = new ContainerBuilder(); container.RegisterAssemblyModules(Assembly.Load("ToolkitSample.DataAccess")); return container.Build(); } diff --git a/Tests/EntityFramework.Toolkit.Tests/Repository/GenericRepositoryTests.cs b/Tests/EntityFramework.Toolkit.Tests/Repository/GenericRepositoryTests.cs index a93051b..9a67df3 100644 --- a/Tests/EntityFramework.Toolkit.Tests/Repository/GenericRepositoryTests.cs +++ b/Tests/EntityFramework.Toolkit.Tests/Repository/GenericRepositoryTests.cs @@ -557,7 +557,7 @@ public void ShouldUpdateExistingEmployees() allEmployees.ElementAt(1).Birthdate.Should().Be(new DateTime(1990, 01, 01, 01, 23, 20)); allEmployees.ElementAt(2).Birthdate.Should().Be(new DateTime(2000, 12, 31, 01, 23, 20)); - stopwatch.ElapsedMilliseconds.Should().BeLessThan(2500); + stopwatch.ElapsedMilliseconds.Should().BeLessThan(3000); } } From 750d4bb771b9307f1deb9ffaecf990ab2da334f0 Mon Sep 17 00:00:00 2001 From: Thomas Galliker Date: Mon, 8 Apr 2019 07:58:19 +0200 Subject: [PATCH 5/6] Reformat --- .../Auditing/AuditEntityTypeConfiguration.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/EntityFramework.Toolkit/Auditing/AuditEntityTypeConfiguration.cs b/EntityFramework.Toolkit/Auditing/AuditEntityTypeConfiguration.cs index e2f87c5..702401a 100644 --- a/EntityFramework.Toolkit/Auditing/AuditEntityTypeConfiguration.cs +++ b/EntityFramework.Toolkit/Auditing/AuditEntityTypeConfiguration.cs @@ -4,8 +4,7 @@ namespace EntityFramework.Toolkit.Auditing { public abstract class AuditEntityTypeConfiguration : - EntityTypeConfiguration where TAuditEntity : class, - IAuditEntity + EntityTypeConfiguration where TAuditEntity : class, IAuditEntity { protected AuditEntityTypeConfiguration() { From 7e1f57881d942073a5ec7a90ce19f5d1c0488054 Mon Sep 17 00:00:00 2001 From: Thomas Galliker Date: Mon, 8 Apr 2019 07:58:30 +0200 Subject: [PATCH 6/6] Migrate dotsettings --- EntityFramework.Toolkit.sln.DotSettings | 1 + 1 file changed, 1 insertion(+) diff --git a/EntityFramework.Toolkit.sln.DotSettings b/EntityFramework.Toolkit.sln.DotSettings index fdaec63..47b4474 100644 --- a/EntityFramework.Toolkit.sln.DotSettings +++ b/EntityFramework.Toolkit.sln.DotSettings @@ -98,6 +98,7 @@ True True True + True True True True