Skip to content

Commit 424d8e4

Browse files
matteobrunimatteobruni
committed
Merge pull request #11 from Ar3sDevelopment/dev
updated constraints
2 parents 413e8de + 7494d9f commit 424d8e4

9 files changed

Lines changed: 20 additions & 23 deletions

File tree

‎UnitOfWork.NET.EntityFramework.NUnit/UnitOfWork.NET.EntityFramework.NUnit.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@
6161
<HintPath>..\packages\System.Linq.Dynamic.1.0.6\lib\net40\System.Linq.Dynamic.dll</HintPath>
6262
<Private>True</Private>
6363
</Reference>
64-
<Reference Include="UnitOfWork.NET, Version=4.1.0.456, Culture=neutral, processorArchitecture=MSIL">
65-
<HintPath>..\packages\UnitOfWork.NET.4.1.0.456\lib\net45\UnitOfWork.NET.dll</HintPath>
64+
<Reference Include="UnitOfWork.NET, Version=4.1.0.461, Culture=neutral, processorArchitecture=MSIL">
65+
<HintPath>..\packages\UnitOfWork.NET.4.1.0.461\lib\net45\UnitOfWork.NET.dll</HintPath>
6666
<Private>True</Private>
6767
</Reference>
6868
</ItemGroup>

‎UnitOfWork.NET.EntityFramework.NUnit/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
<package id="EntityFramework" version="6.1.3" targetFramework="net45" />
88
<package id="NUnit" version="3.2.1" targetFramework="net45" />
99
<package id="System.Linq.Dynamic" version="1.0.6" targetFramework="net45" />
10-
<package id="UnitOfWork.NET" version="4.1.0.456" targetFramework="net45" />
10+
<package id="UnitOfWork.NET" version="4.1.0.461" targetFramework="net45" />
1111
</packages>

‎UnitOfWork.NET.EntityFramework/Classes/EntityRepository.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
namespace UnitOfWork.NET.EntityFramework.Classes
1818
{
19-
public class EntityRepository<TEntity> : Repository<TEntity>, IEntityRepository<TEntity> where TEntity : class
19+
public class EntityRepository<TEntity> : Repository<TEntity>, IEntityRepository<TEntity> where TEntity : class, new()
2020
{
2121
public new IEntityUnitOfWork UnitOfWork => base.UnitOfWork as IEntityUnitOfWork;
2222

@@ -53,7 +53,7 @@ public virtual void OnSaveChanges(IDictionary<EntityState, IEnumerable<TEntity>>
5353
public async Task<TEntity> EntityAsync(Expression<Func<TEntity, bool>> expr) => await new TaskFactory().StartNew(() => Entity(expr));
5454
}
5555

56-
public class EntityRepository<TEntity, TDTO> : EntityRepository<TEntity>, IEntityRepository<TEntity, TDTO> where TEntity : class where TDTO : class
56+
public class EntityRepository<TEntity, TDTO> : EntityRepository<TEntity>, IEntityRepository<TEntity, TDTO> where TEntity : class, new() where TDTO : class, new()
5757
{
5858
public IMapper<TEntity, TDTO> DTOMapper { get; set; }
5959
public IMapper<TDTO, TEntity> EntityMapper { get; set; }

‎UnitOfWork.NET.EntityFramework/Classes/EntityUnitOfWork.cs‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -123,17 +123,14 @@ public bool TransactionSaveChanges(Action<IEntityUnitOfWork> body)
123123
}
124124
}
125125

126-
public DbEntityEntry Entry<TEntity>(TEntity entity) where TEntity : class => _dbContext.Entry(entity);
126+
public DbEntityEntry Entry<TEntity>(TEntity entity) where TEntity : class, new() => _dbContext.Entry(entity);
127127

128-
[Obsolete("Use Set instead")]
129-
public DbSet<TEntity> DbSet<TEntity>() where TEntity : class => _dbContext.Set<TEntity>();
128+
public DbSet<TEntity> Set<TEntity>() where TEntity : class, new() => _dbContext.Set<TEntity>();
130129

131-
public DbSet<TEntity> Set<TEntity>() where TEntity : class => _dbContext.Set<TEntity>();
130+
public new IEntityRepository<TEntity> Repository<TEntity>() where TEntity : class, new() => base.Repository<TEntity>() as IEntityRepository<TEntity>;
131+
public new IEntityRepository<TEntity, TDTO> Repository<TEntity, TDTO>() where TEntity : class, new() where TDTO : class, new() => base.Repository<TEntity, TDTO>() as IEntityRepository<TEntity, TDTO>;
132132

133-
public new IEntityRepository<TEntity> Repository<TEntity>() where TEntity : class => base.Repository<TEntity>() as IEntityRepository<TEntity>;
134-
public new IEntityRepository<TEntity, TDTO> Repository<TEntity, TDTO>() where TEntity : class where TDTO : class => base.Repository<TEntity, TDTO>() as IEntityRepository<TEntity, TDTO>;
135-
136-
private void CallOnSaveChanges<TEntity>(Dictionary<EntityState, IEnumerable<object>> entitiesObj) where TEntity : class
133+
private void CallOnSaveChanges<TEntity>(Dictionary<EntityState, IEnumerable<object>> entitiesObj) where TEntity : class, new()
137134
{
138135
var entities = entitiesObj.ToDictionary(t => t.Key, t => t.Value.Cast<TEntity>());
139136

‎UnitOfWork.NET.EntityFramework/Interfaces/IEntityRepository.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77

88
namespace UnitOfWork.NET.EntityFramework.Interfaces
99
{
10-
public interface IEntityRepository<TEntity> : IRepository<TEntity> where TEntity : class
10+
public interface IEntityRepository<TEntity> : IRepository<TEntity> where TEntity : class, new()
1111
{
12-
IEntityUnitOfWork UnitOfWork { get; }
12+
new IEntityUnitOfWork UnitOfWork { get; }
1313
DbSet<TEntity> Set { get; }
1414

1515
TEntity Entity(params object[] ids);
@@ -31,7 +31,7 @@ public interface IEntityRepository<TEntity> : IRepository<TEntity> where TEntity
3131
void OnSaveChanges(IDictionary<EntityState, IEnumerable<TEntity>> entities);
3232
}
3333

34-
public interface IEntityRepository<TEntity, TDTO> : IRepository<TEntity, TDTO>, IEntityRepository<TEntity> where TEntity : class where TDTO : class
34+
public interface IEntityRepository<TEntity, TDTO> : IRepository<TEntity, TDTO>, IEntityRepository<TEntity> where TEntity : class, new() where TDTO : class, new()
3535
{
3636
TDTO DTO(params object[] ids);
3737

‎UnitOfWork.NET.EntityFramework/Interfaces/IEntityUnitOfWork.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public interface IEntityUnitOfWork : IUnitOfWork
2727
///
2828
/// </summary>
2929
/// <param name="entity"></param>
30-
DbEntityEntry Entry<TEntity>(TEntity entity) where TEntity : class;
30+
DbEntityEntry Entry<TEntity>(TEntity entity) where TEntity : class, new();
3131

3232
/// <summary>
3333
///
@@ -44,11 +44,11 @@ public interface IEntityUnitOfWork : IUnitOfWork
4444
/// <summary>
4545
///
4646
/// </summary>
47-
IEntityRepository<TEntity> Repository<TEntity>() where TEntity : class;
47+
new IEntityRepository<TEntity> Repository<TEntity>() where TEntity : class, new();
4848

4949
/// <summary>
5050
///
5151
/// </summary>
52-
IEntityRepository<TEntity, TDTO> Repository<TEntity, TDTO>() where TEntity : class where TDTO : class;
52+
new IEntityRepository<TEntity, TDTO> Repository<TEntity, TDTO>() where TEntity : class, new() where TDTO : class, new();
5353
}
5454
}

‎UnitOfWork.NET.EntityFramework/UnitOfWork.NET.EntityFramework.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@
6767
<Reference Include="System.Data" />
6868
<Reference Include="System.Net.Http" />
6969
<Reference Include="System.Xml" />
70-
<Reference Include="UnitOfWork.NET, Version=4.1.0.456, Culture=neutral, processorArchitecture=MSIL">
71-
<HintPath>..\packages\UnitOfWork.NET.4.1.0.456\lib\net45\UnitOfWork.NET.dll</HintPath>
70+
<Reference Include="UnitOfWork.NET, Version=4.1.0.461, Culture=neutral, processorArchitecture=MSIL">
71+
<HintPath>..\packages\UnitOfWork.NET.4.1.0.461\lib\net45\UnitOfWork.NET.dll</HintPath>
7272
<Private>True</Private>
7373
</Reference>
7474
</ItemGroup>

‎UnitOfWork.NET.EntityFramework/UnitOfWork.NET.EntityFramework.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1616
<dependencies>
1717
<group targetFramework=".NETFramework4.5">
18-
<dependency id="UnitOfWork.NET" version="4.1.0.456" />
18+
<dependency id="UnitOfWork.NET" version="4.1.0.461" />
1919
<dependency id="EntityFramework" version="6.1.3" />
2020
</group>
2121
</dependencies>

‎UnitOfWork.NET.EntityFramework/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
<package id="ClassBuilder" version="4.0.0.71" targetFramework="net45" />
77
<package id="EntityFramework" version="6.1.3" targetFramework="net45" />
88
<package id="System.Linq.Dynamic" version="1.0.6" targetFramework="net45" />
9-
<package id="UnitOfWork.NET" version="4.1.0.456" targetFramework="net45" />
9+
<package id="UnitOfWork.NET" version="4.1.0.461" targetFramework="net45" />
1010
</packages>

0 commit comments

Comments
 (0)