diff --git a/sample/MongoIdentitySample.Mvc/MongoIdentitySample.Mvc.csproj b/sample/MongoIdentitySample.Mvc/MongoIdentitySample.Mvc.csproj index 8aa2573..223f284 100644 --- a/sample/MongoIdentitySample.Mvc/MongoIdentitySample.Mvc.csproj +++ b/sample/MongoIdentitySample.Mvc/MongoIdentitySample.Mvc.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/AspNetCore.Identity.MongoDbCore.csproj b/src/AspNetCore.Identity.MongoDbCore.csproj index eeda372..26adbcf 100644 --- a/src/AspNetCore.Identity.MongoDbCore.csproj +++ b/src/AspNetCore.Identity.MongoDbCore.csproj @@ -16,8 +16,8 @@ - - + + diff --git a/src/AspNetCore.Identity.MongoDbCore.nuspec b/src/AspNetCore.Identity.MongoDbCore.nuspec index 3490dd3..e14720e 100644 --- a/src/AspNetCore.Identity.MongoDbCore.nuspec +++ b/src/AspNetCore.Identity.MongoDbCore.nuspec @@ -2,7 +2,7 @@ AspNetCore.Identity.MongoDbCore - 1.0.8 + 1.0.9 AspNetCore.Identity.MongoDbCore Alexandre Spieser Alexandre Spieser @@ -10,14 +10,14 @@ https://github.com/alexandre-spieser/AspNetCore.Identity.MongoDbCore false A MongoDb UserStore and RoleStore adapter for Microsoft.AspNetCore.Identity 2.0. - Added support for documents with an Id of type ObjectId. + Release notes are at https://github.com/alexandre-spieser/AspNetCore.Identity.MongoDbCore/releases Copyright 2018 (c) Alexandre Spieser. All rights reserved. aspnetcore mongo mongodb identity membership - - + + diff --git a/src/MongoRoleStore.cs b/src/MongoRoleStore.cs index bfed4dc..9fac314 100644 --- a/src/MongoRoleStore.cs +++ b/src/MongoRoleStore.cs @@ -131,7 +131,7 @@ namespace AspNetCore.Identity.MongoDbCore /// /// A navigation property for the roles the store contains. /// - public virtual IMongoCollection RolesCollection => Context.GetCollection(); + public virtual IMongoCollection RolesCollection => Context.GetCollection(); /// /// Gets or sets the for any error that occurred with the current operation. diff --git a/src/MongoUserOnlyStore.cs b/src/MongoUserOnlyStore.cs index f99adb0..1e88671 100644 --- a/src/MongoUserOnlyStore.cs +++ b/src/MongoUserOnlyStore.cs @@ -118,7 +118,7 @@ namespace AspNetCore.Identity.MongoDbCore } } - private IMongoCollection UsersCollection { get { return Context.GetCollection(); } } + private IMongoCollection UsersCollection { get { return Context.GetCollection(); } } /// /// Gets or sets a flag indicating if changes should be persisted after CreateAsync, UpdateAsync and DeleteAsync are called. diff --git a/src/MongoUserStore.cs b/src/MongoUserStore.cs index be00f92..9cfbeb4 100644 --- a/src/MongoUserStore.cs +++ b/src/MongoUserStore.cs @@ -153,8 +153,8 @@ namespace AspNetCore.Identity.MongoDbCore } } - private IMongoCollection UsersCollection { get { return Context.GetCollection(); } } - private IMongoCollection RolesCollection { get { return Context.GetCollection(); } } + private IMongoCollection UsersCollection { get { return Context.GetCollection(); } } + private IMongoCollection RolesCollection { get { return Context.GetCollection(); } } /// /// Gets or sets a flag indicating if changes should be persisted after CreateAsync, UpdateAsync and DeleteAsync are called. @@ -207,7 +207,7 @@ namespace AspNetCore.Identity.MongoDbCore } var oldStamp = user.ConcurrencyStamp; user.ConcurrencyStamp = Guid.NewGuid().ToString(); - var collection = MongoRepository.Context.GetCollection(); + var collection = MongoRepository.Context.GetCollection(); var updateRes = await collection.ReplaceOneAsync(x => x.Id.Equals(user.Id) && x.ConcurrencyStamp.Equals(oldStamp), user); diff --git a/src/lib/netcoreapp2.0/AspNetCore.Identity.MongoDbCore.deps.json b/src/lib/netcoreapp2.0/AspNetCore.Identity.MongoDbCore.deps.json index a5e6a14..264a2b5 100644 --- a/src/lib/netcoreapp2.0/AspNetCore.Identity.MongoDbCore.deps.json +++ b/src/lib/netcoreapp2.0/AspNetCore.Identity.MongoDbCore.deps.json @@ -1,7 +1,7 @@ { "runtimeTarget": { "name": ".NETCoreApp,Version=v2.0", - "signature": "38b2f87cafd1a2fa8c7bd3268841c3cd7abe472b" + "signature": "10fe378b60634bc380193c8a09a1d3f29a3e2954" }, "compilationOptions": {}, "targets": { @@ -10,8 +10,8 @@ "dependencies": { "Microsoft.AspNetCore.Identity": "2.0.1", "Microsoft.Extensions.Identity.Stores": "2.0.1", - "MongoDB.Driver": "2.5.0", - "MongoDbGenericRepository": "1.3.6" + "MongoDB.Driver": "2.7.0", + "MongoDbGenericRepository": "1.3.8" }, "runtime": { "AspNetCore.Identity.MongoDbCore.dll": {} @@ -323,7 +323,7 @@ } } }, - "MongoDB.Bson/2.5.0": { + "MongoDB.Bson/2.7.0": { "dependencies": { "System.Collections.NonGeneric": "4.0.1", "System.Diagnostics.Process": "4.1.0", @@ -334,10 +334,10 @@ "lib/netstandard1.5/MongoDB.Bson.dll": {} } }, - "MongoDB.Driver/2.5.0": { + "MongoDB.Driver/2.7.0": { "dependencies": { - "MongoDB.Bson": "2.5.0", - "MongoDB.Driver.Core": "2.5.0", + "MongoDB.Bson": "2.7.0", + "MongoDB.Driver.Core": "2.7.0", "System.ComponentModel.TypeConverter": "4.1.0", "System.Linq.Queryable": "4.0.1" }, @@ -345,10 +345,10 @@ "lib/netstandard1.5/MongoDB.Driver.dll": {} } }, - "MongoDB.Driver.Core/2.5.0": { + "MongoDB.Driver.Core/2.7.0": { "dependencies": { "DnsClient": "1.0.7", - "MongoDB.Bson": "2.5.0", + "MongoDB.Bson": "2.7.0", "System.Collections.Specialized": "4.0.1", "System.Diagnostics.TraceSource": "4.0.0", "System.Net.NameResolution": "4.3.0", @@ -359,9 +359,9 @@ "lib/netstandard1.5/MongoDB.Driver.Core.dll": {} } }, - "MongoDbGenericRepository/1.3.6": { + "MongoDbGenericRepository/1.3.8": { "dependencies": { - "MongoDB.Driver": "2.5.0" + "MongoDB.Driver": "2.7.0" }, "runtime": { "lib/netstandard2.0/MongoDbGenericRepository.dll": {} @@ -1441,33 +1441,33 @@ "path": "microsoft.win32.registry/4.4.0", "hashPath": "microsoft.win32.registry.4.4.0.nupkg.sha512" }, - "MongoDB.Bson/2.5.0": { + "MongoDB.Bson/2.7.0": { "type": "package", "serviceable": true, - "sha512": "sha512-b7zQAUdSdfJ4kmGzAA+hv89N2Q6jm1td9WfTimgp8xWAsN4qbtIjA/JkAY1HA0Z8xfXQE3EmdUcDEwT8bkXfXg==", - "path": "mongodb.bson/2.5.0", - "hashPath": "mongodb.bson.2.5.0.nupkg.sha512" + "sha512": "sha512-vzpTDHYX/X6gF9qtDuKRJiLkqpj5OZuT1bIzJCiBiU8CwJ37becYmaXuy/QSuWnYN6j6ZdVTWILKbWt2MXL8DA==", + "path": "mongodb.bson/2.7.0", + "hashPath": "mongodb.bson.2.7.0.nupkg.sha512" }, - "MongoDB.Driver/2.5.0": { + "MongoDB.Driver/2.7.0": { "type": "package", "serviceable": true, - "sha512": "sha512-VbHVV8Xdl3PcPU3XxdOUE/yc4BnPokg7k1XHU/3fEM/UdfCy0Ie0eXVE+U2HJXVcM3TQuuyVn+B1La2YY7X8dA==", - "path": "mongodb.driver/2.5.0", - "hashPath": "mongodb.driver.2.5.0.nupkg.sha512" + "sha512": "sha512-5wP5BBwm5YO6h2Vhw6zQmOwSW9WP2d6kgRM6E7uIbwIJz4+j2trS2Wo7/+IYow5WVN8Jd6O27bIB/4gKNepO1Q==", + "path": "mongodb.driver/2.7.0", + "hashPath": "mongodb.driver.2.7.0.nupkg.sha512" }, - "MongoDB.Driver.Core/2.5.0": { + "MongoDB.Driver.Core/2.7.0": { "type": "package", "serviceable": true, - "sha512": "sha512-/JYwBTEoWZDHiSePk0AF775c0YkSGSsHTA2+hWt9/UOCkYV/QOFujAWDdpFzBMCDpmQewbLRR1knYj76YOxffA==", - "path": "mongodb.driver.core/2.5.0", - "hashPath": "mongodb.driver.core.2.5.0.nupkg.sha512" + "sha512": "sha512-SepB4KT+zXA3iFaIFwXVKmk6BZIp0EGE/iWqNbDZ1mca9e8EhtqYPwOOzFmEbdKAzmVvF1y86kNI4agWP6I5sg==", + "path": "mongodb.driver.core/2.7.0", + "hashPath": "mongodb.driver.core.2.7.0.nupkg.sha512" }, - "MongoDbGenericRepository/1.3.6": { + "MongoDbGenericRepository/1.3.8": { "type": "package", "serviceable": true, - "sha512": "sha512-bm4Q5RDLqt6rRZJTDiWvQpHOJ3ACxfELqg0kiZO8dyb7xMEqPQC7urpuLKMpDUmnE/pMBuXe6Pmy9TyTksDbdg==", - "path": "mongodbgenericrepository/1.3.6", - "hashPath": "mongodbgenericrepository.1.3.6.nupkg.sha512" + "sha512": "sha512-7zEYdsDulxAfEpWJrdUc4R0Te8XQ5dbOMPeFpZyO2syjPDcD13Z/zSzb9h3dOh0xedHCNPRj9dh62yXXWpHpvA==", + "path": "mongodbgenericrepository/1.3.8", + "hashPath": "mongodbgenericrepository.1.3.8.nupkg.sha512" }, "runtime.native.System/4.3.0": { "type": "package", diff --git a/src/lib/netcoreapp2.0/AspNetCore.Identity.MongoDbCore.dll b/src/lib/netcoreapp2.0/AspNetCore.Identity.MongoDbCore.dll index c395fd0..5cdf632 100644 Binary files a/src/lib/netcoreapp2.0/AspNetCore.Identity.MongoDbCore.dll and b/src/lib/netcoreapp2.0/AspNetCore.Identity.MongoDbCore.dll differ diff --git a/src/lib/netstandard2.0/AspNetCore.Identity.MongoDbCore.deps.json b/src/lib/netstandard2.0/AspNetCore.Identity.MongoDbCore.deps.json index e59009d..9db27da 100644 --- a/src/lib/netstandard2.0/AspNetCore.Identity.MongoDbCore.deps.json +++ b/src/lib/netstandard2.0/AspNetCore.Identity.MongoDbCore.deps.json @@ -1,7 +1,7 @@ { "runtimeTarget": { "name": ".NETStandard,Version=v2.0/", - "signature": "777efc9083cc946975cf0e3ebd09810483543683" + "signature": "b91ec0d2463596661d279c90d3c35b28b4a2907b" }, "compilationOptions": {}, "targets": { @@ -11,9 +11,9 @@ "dependencies": { "Microsoft.AspNetCore.Identity": "2.0.1", "Microsoft.Extensions.Identity.Stores": "2.0.1", - "MongoDB.Driver": "2.5.0", - "MongoDbGenericRepository": "1.3.6", - "NETStandard.Library": "2.0.1" + "MongoDB.Driver": "2.7.0", + "MongoDbGenericRepository": "1.3.8", + "NETStandard.Library": "2.0.3" }, "runtime": { "AspNetCore.Identity.MongoDbCore.dll": {} @@ -22,7 +22,7 @@ "DnsClient/1.0.7": { "dependencies": { "Microsoft.Win32.Primitives": "4.3.0", - "NETStandard.Library": "2.0.1", + "NETStandard.Library": "2.0.3", "System.Buffers": "4.4.0", "System.Collections": "4.3.0", "System.Collections.Concurrent": "4.3.0", @@ -321,9 +321,9 @@ "lib/netstandard2.0/Microsoft.Win32.Registry.dll": {} } }, - "MongoDB.Bson/2.5.0": { + "MongoDB.Bson/2.7.0": { "dependencies": { - "NETStandard.Library": "2.0.1", + "NETStandard.Library": "2.0.3", "System.Collections.NonGeneric": "4.0.1", "System.Diagnostics.Process": "4.1.0", "System.Dynamic.Runtime": "4.0.11", @@ -333,11 +333,11 @@ "lib/netstandard1.5/MongoDB.Bson.dll": {} } }, - "MongoDB.Driver/2.5.0": { + "MongoDB.Driver/2.7.0": { "dependencies": { - "MongoDB.Bson": "2.5.0", - "MongoDB.Driver.Core": "2.5.0", - "NETStandard.Library": "2.0.1", + "MongoDB.Bson": "2.7.0", + "MongoDB.Driver.Core": "2.7.0", + "NETStandard.Library": "2.0.3", "System.ComponentModel.TypeConverter": "4.1.0", "System.Linq.Queryable": "4.0.1" }, @@ -345,11 +345,11 @@ "lib/netstandard1.5/MongoDB.Driver.dll": {} } }, - "MongoDB.Driver.Core/2.5.0": { + "MongoDB.Driver.Core/2.7.0": { "dependencies": { "DnsClient": "1.0.7", - "MongoDB.Bson": "2.5.0", - "NETStandard.Library": "2.0.1", + "MongoDB.Bson": "2.7.0", + "NETStandard.Library": "2.0.3", "System.Collections.Specialized": "4.0.1", "System.Diagnostics.TraceSource": "4.0.0", "System.Net.NameResolution": "4.3.0", @@ -360,15 +360,15 @@ "lib/netstandard1.5/MongoDB.Driver.Core.dll": {} } }, - "MongoDbGenericRepository/1.3.6": { + "MongoDbGenericRepository/1.3.8": { "dependencies": { - "MongoDB.Driver": "2.5.0" + "MongoDB.Driver": "2.7.0" }, "runtime": { "lib/netstandard2.0/MongoDbGenericRepository.dll": {} } }, - "NETStandard.Library/2.0.1": { + "NETStandard.Library/2.0.3": { "dependencies": { "Microsoft.NETCore.Platforms": "1.1.0" } @@ -1406,40 +1406,40 @@ "path": "microsoft.win32.registry/4.4.0", "hashPath": "microsoft.win32.registry.4.4.0.nupkg.sha512" }, - "MongoDB.Bson/2.5.0": { + "MongoDB.Bson/2.7.0": { "type": "package", "serviceable": true, - "sha512": "sha512-b7zQAUdSdfJ4kmGzAA+hv89N2Q6jm1td9WfTimgp8xWAsN4qbtIjA/JkAY1HA0Z8xfXQE3EmdUcDEwT8bkXfXg==", - "path": "mongodb.bson/2.5.0", - "hashPath": "mongodb.bson.2.5.0.nupkg.sha512" + "sha512": "sha512-vzpTDHYX/X6gF9qtDuKRJiLkqpj5OZuT1bIzJCiBiU8CwJ37becYmaXuy/QSuWnYN6j6ZdVTWILKbWt2MXL8DA==", + "path": "mongodb.bson/2.7.0", + "hashPath": "mongodb.bson.2.7.0.nupkg.sha512" }, - "MongoDB.Driver/2.5.0": { + "MongoDB.Driver/2.7.0": { "type": "package", "serviceable": true, - "sha512": "sha512-VbHVV8Xdl3PcPU3XxdOUE/yc4BnPokg7k1XHU/3fEM/UdfCy0Ie0eXVE+U2HJXVcM3TQuuyVn+B1La2YY7X8dA==", - "path": "mongodb.driver/2.5.0", - "hashPath": "mongodb.driver.2.5.0.nupkg.sha512" + "sha512": "sha512-5wP5BBwm5YO6h2Vhw6zQmOwSW9WP2d6kgRM6E7uIbwIJz4+j2trS2Wo7/+IYow5WVN8Jd6O27bIB/4gKNepO1Q==", + "path": "mongodb.driver/2.7.0", + "hashPath": "mongodb.driver.2.7.0.nupkg.sha512" }, - "MongoDB.Driver.Core/2.5.0": { + "MongoDB.Driver.Core/2.7.0": { "type": "package", "serviceable": true, - "sha512": "sha512-/JYwBTEoWZDHiSePk0AF775c0YkSGSsHTA2+hWt9/UOCkYV/QOFujAWDdpFzBMCDpmQewbLRR1knYj76YOxffA==", - "path": "mongodb.driver.core/2.5.0", - "hashPath": "mongodb.driver.core.2.5.0.nupkg.sha512" + "sha512": "sha512-SepB4KT+zXA3iFaIFwXVKmk6BZIp0EGE/iWqNbDZ1mca9e8EhtqYPwOOzFmEbdKAzmVvF1y86kNI4agWP6I5sg==", + "path": "mongodb.driver.core/2.7.0", + "hashPath": "mongodb.driver.core.2.7.0.nupkg.sha512" }, - "MongoDbGenericRepository/1.3.6": { + "MongoDbGenericRepository/1.3.8": { "type": "package", "serviceable": true, - "sha512": "sha512-bm4Q5RDLqt6rRZJTDiWvQpHOJ3ACxfELqg0kiZO8dyb7xMEqPQC7urpuLKMpDUmnE/pMBuXe6Pmy9TyTksDbdg==", - "path": "mongodbgenericrepository/1.3.6", - "hashPath": "mongodbgenericrepository.1.3.6.nupkg.sha512" + "sha512": "sha512-7zEYdsDulxAfEpWJrdUc4R0Te8XQ5dbOMPeFpZyO2syjPDcD13Z/zSzb9h3dOh0xedHCNPRj9dh62yXXWpHpvA==", + "path": "mongodbgenericrepository/1.3.8", + "hashPath": "mongodbgenericrepository.1.3.8.nupkg.sha512" }, - "NETStandard.Library/2.0.1": { + "NETStandard.Library/2.0.3": { "type": "package", "serviceable": true, - "sha512": "sha512-oA6nwv9MhEKYvLpjZ0ggSpb1g4CQViDVQjLUcDWg598jtvJbpfeP2reqwI1GLW2TbxC/Ml7xL6BBR1HmKPXlTg==", - "path": "netstandard.library/2.0.1", - "hashPath": "netstandard.library.2.0.1.nupkg.sha512" + "sha512": "sha512-st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==", + "path": "netstandard.library/2.0.3", + "hashPath": "netstandard.library.2.0.3.nupkg.sha512" }, "runtime.native.System/4.3.0": { "type": "package", diff --git a/src/lib/netstandard2.0/AspNetCore.Identity.MongoDbCore.dll b/src/lib/netstandard2.0/AspNetCore.Identity.MongoDbCore.dll index 0b534ee..24939be 100644 Binary files a/src/lib/netstandard2.0/AspNetCore.Identity.MongoDbCore.dll and b/src/lib/netstandard2.0/AspNetCore.Identity.MongoDbCore.dll differ diff --git a/test/AspNetCore.Identity.MongoDbCore.IntegrationTests/AspNetCore.Identity.MongoDbCore.IntegrationTests.csproj b/test/AspNetCore.Identity.MongoDbCore.IntegrationTests/AspNetCore.Identity.MongoDbCore.IntegrationTests.csproj index b8099f0..ee8273d 100644 --- a/test/AspNetCore.Identity.MongoDbCore.IntegrationTests/AspNetCore.Identity.MongoDbCore.IntegrationTests.csproj +++ b/test/AspNetCore.Identity.MongoDbCore.IntegrationTests/AspNetCore.Identity.MongoDbCore.IntegrationTests.csproj @@ -7,7 +7,7 @@ - + @@ -20,8 +20,8 @@ - - + + diff --git a/test/AspNetCore.Identity.MongoDbCore.IntegrationTests/AspNetCore.Identity.MongoDbCore.Test/MongoDbStoreTestBase.cs b/test/AspNetCore.Identity.MongoDbCore.IntegrationTests/AspNetCore.Identity.MongoDbCore.Test/MongoDbStoreTestBase.cs index 8316752..68a7918 100644 --- a/test/AspNetCore.Identity.MongoDbCore.IntegrationTests/AspNetCore.Identity.MongoDbCore.Test/MongoDbStoreTestBase.cs +++ b/test/AspNetCore.Identity.MongoDbCore.IntegrationTests/AspNetCore.Identity.MongoDbCore.Test/MongoDbStoreTestBase.cs @@ -162,7 +162,7 @@ namespace AspNetCore.Identity.MongoDbCore.Test private IQueryable GetQueryable() { - return Container.MongoRepository.Context.GetCollection().AsQueryable(); + return Container.MongoRepository.Context.GetCollection().AsQueryable(); } [Fact] diff --git a/test/AspNetCore.Identity.MongoDbCore.IntegrationTests/AspNetCore.Identity.MongoDbCore.Test/SqlStoreOnlyUsersTestBase.cs b/test/AspNetCore.Identity.MongoDbCore.IntegrationTests/AspNetCore.Identity.MongoDbCore.Test/SqlStoreOnlyUsersTestBase.cs index 52abf72..cffdb8e 100644 --- a/test/AspNetCore.Identity.MongoDbCore.IntegrationTests/AspNetCore.Identity.MongoDbCore.Test/SqlStoreOnlyUsersTestBase.cs +++ b/test/AspNetCore.Identity.MongoDbCore.IntegrationTests/AspNetCore.Identity.MongoDbCore.Test/SqlStoreOnlyUsersTestBase.cs @@ -87,7 +87,7 @@ namespace AspNetCore.Identity.MongoDbCore.Test private IQueryable GetQueryable() { - return Container.MongoRepository.Context.GetCollection().AsQueryable(); + return Container.MongoRepository.Context.GetCollection().AsQueryable(); } [Fact] diff --git a/test/AspNetCore.Identity.MongoDbCore.IntegrationTests/AspNetCore.Identity.MongoDbCore.Test/Utilities/MongoDatabaseFixture.cs b/test/AspNetCore.Identity.MongoDbCore.IntegrationTests/AspNetCore.Identity.MongoDbCore.Test/Utilities/MongoDatabaseFixture.cs index 9ce8b29..a2adf22 100644 --- a/test/AspNetCore.Identity.MongoDbCore.IntegrationTests/AspNetCore.Identity.MongoDbCore.Test/Utilities/MongoDatabaseFixture.cs +++ b/test/AspNetCore.Identity.MongoDbCore.IntegrationTests/AspNetCore.Identity.MongoDbCore.Test/Utilities/MongoDatabaseFixture.cs @@ -31,15 +31,15 @@ namespace AspNetCore.Identity.MongoDbCore.Test var userIds = UsersToDelete.ToList().Select(e => e.Id); if (userIds.Any()) { - Context.GetCollection().DeleteMany(e => userIds.Contains(e.Id)); + Context.GetCollection().DeleteMany(e => userIds.Contains(e.Id)); } } } public class MongoDatabaseFixture : MongoDatabaseFixture, IDisposable - where TUser : IDocument - where TRole : IDocument - where TKey : IEquatable + where TUser : IDocument + where TRole : IDocument + where TKey : IEquatable { public MongoDatabaseFixture() @@ -57,12 +57,12 @@ namespace AspNetCore.Identity.MongoDbCore.Test var userIds = UsersToDelete.ToList().Select(e => e.Id); if (userIds.Any()) { - Context.GetCollection().DeleteMany(e => userIds.Contains(e.Id)); + Context.GetCollection().DeleteMany(e => userIds.Contains(e.Id)); } var roleIds = RolesToDelete.ToList().Select(e => e.Id); if (roleIds.Any()) { - Context.GetCollection().DeleteMany(e => roleIds.Contains(e.Id)); + Context.GetCollection().DeleteMany(e => roleIds.Contains(e.Id)); } } }