diff --git a/.vs/DigitalData.Core/DesignTimeBuild/.dtbcache.v2 b/.vs/DigitalData.Core/DesignTimeBuild/.dtbcache.v2 index 40eb7db..79de8ae 100644 Binary files a/.vs/DigitalData.Core/DesignTimeBuild/.dtbcache.v2 and b/.vs/DigitalData.Core/DesignTimeBuild/.dtbcache.v2 differ diff --git a/.vs/DigitalData.Core/FileContentIndex/0f286987-05b2-41fa-834d-d6c648c95ab2.vsidx b/.vs/DigitalData.Core/FileContentIndex/0f286987-05b2-41fa-834d-d6c648c95ab2.vsidx deleted file mode 100644 index e357eaa..0000000 Binary files a/.vs/DigitalData.Core/FileContentIndex/0f286987-05b2-41fa-834d-d6c648c95ab2.vsidx and /dev/null differ diff --git a/.vs/DigitalData.Core/FileContentIndex/78e2797a-4b7e-4580-89be-f9d0ed1994a3.vsidx b/.vs/DigitalData.Core/FileContentIndex/78e2797a-4b7e-4580-89be-f9d0ed1994a3.vsidx new file mode 100644 index 0000000..35749d0 Binary files /dev/null and b/.vs/DigitalData.Core/FileContentIndex/78e2797a-4b7e-4580-89be-f9d0ed1994a3.vsidx differ diff --git a/.vs/DigitalData.Core/FileContentIndex/80bdf5f4-32f0-46e1-8a72-e0dbc0b8aa09.vsidx b/.vs/DigitalData.Core/FileContentIndex/80bdf5f4-32f0-46e1-8a72-e0dbc0b8aa09.vsidx new file mode 100644 index 0000000..09dc5f7 Binary files /dev/null and b/.vs/DigitalData.Core/FileContentIndex/80bdf5f4-32f0-46e1-8a72-e0dbc0b8aa09.vsidx differ diff --git a/.vs/DigitalData.Core/FileContentIndex/aed5a339-2f38-440f-9a63-4f5bb6cf5b50.vsidx b/.vs/DigitalData.Core/FileContentIndex/aed5a339-2f38-440f-9a63-4f5bb6cf5b50.vsidx deleted file mode 100644 index d9d1d3f..0000000 Binary files a/.vs/DigitalData.Core/FileContentIndex/aed5a339-2f38-440f-9a63-4f5bb6cf5b50.vsidx and /dev/null differ diff --git a/.vs/DigitalData.Core/FileContentIndex/f3f6059c-08d8-487e-9ed2-7a5c45750852.vsidx b/.vs/DigitalData.Core/FileContentIndex/f3f6059c-08d8-487e-9ed2-7a5c45750852.vsidx deleted file mode 100644 index 2818f43..0000000 Binary files a/.vs/DigitalData.Core/FileContentIndex/f3f6059c-08d8-487e-9ed2-7a5c45750852.vsidx and /dev/null differ diff --git a/.vs/DigitalData.Core/v17/.suo b/.vs/DigitalData.Core/v17/.suo index c0fd038..1020f1d 100644 Binary files a/.vs/DigitalData.Core/v17/.suo and b/.vs/DigitalData.Core/v17/.suo differ diff --git a/DigitalData.Core.API/bin/Debug/net7.0/DigitalData.Core.API.deps.json b/DigitalData.Core.API/bin/Debug/net7.0/DigitalData.Core.API.deps.json index 7a3f306..bc3aa43 100644 --- a/DigitalData.Core.API/bin/Debug/net7.0/DigitalData.Core.API.deps.json +++ b/DigitalData.Core.API/bin/Debug/net7.0/DigitalData.Core.API.deps.json @@ -29,6 +29,22 @@ "Microsoft.Extensions.Primitives": "7.0.0" } }, + "Microsoft.Extensions.Configuration.Abstractions/7.0.0": { + "dependencies": { + "Microsoft.Extensions.Primitives": "7.0.0" + } + }, + "Microsoft.Extensions.Configuration.Binder/7.0.4": { + "dependencies": { + "Microsoft.Extensions.Configuration.Abstractions": "7.0.0" + }, + "runtime": { + "lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll": { + "assemblyVersion": "7.0.0.0", + "fileVersion": "7.0.423.11508" + } + } + }, "Microsoft.Extensions.DependencyInjection/7.0.0": { "dependencies": { "Microsoft.Extensions.DependencyInjection.Abstractions": "7.0.0" @@ -217,6 +233,7 @@ "DigitalData.Core.Contracts/1.0.0": { "dependencies": { "Microsoft.Extensions.Caching.Memory": "7.0.0", + "Microsoft.Extensions.Configuration.Binder": "7.0.4", "System.DirectoryServices": "7.0.1", "System.DirectoryServices.AccountManagement": "7.0.1" }, @@ -246,6 +263,20 @@ "path": "microsoft.extensions.caching.memory/7.0.0", "hashPath": "microsoft.extensions.caching.memory.7.0.0.nupkg.sha512" }, + "Microsoft.Extensions.Configuration.Abstractions/7.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-f34u2eaqIjNO9YLHBz8rozVZ+TcFiFs0F3r7nUJd7FRkVSxk8u4OpoK226mi49MwexHOR2ibP9MFvRUaLilcQQ==", + "path": "microsoft.extensions.configuration.abstractions/7.0.0", + "hashPath": "microsoft.extensions.configuration.abstractions.7.0.0.nupkg.sha512" + }, + "Microsoft.Extensions.Configuration.Binder/7.0.4": { + "type": "package", + "serviceable": true, + "sha512": "sha512-8+XPvJnHZsYgHOQlcMuQe7QNF5KdVKHH1F/wW3nd8/u81Gk/XFAYMDP0Lpz18h7/AM95M662vvqMorcYxCBB4w==", + "path": "microsoft.extensions.configuration.binder/7.0.4", + "hashPath": "microsoft.extensions.configuration.binder.7.0.4.nupkg.sha512" + }, "Microsoft.Extensions.DependencyInjection/7.0.0": { "type": "package", "serviceable": true, diff --git a/DigitalData.Core.API/bin/Debug/net7.0/DigitalData.Core.API.dll b/DigitalData.Core.API/bin/Debug/net7.0/DigitalData.Core.API.dll index 429e539..afdfcd2 100644 Binary files a/DigitalData.Core.API/bin/Debug/net7.0/DigitalData.Core.API.dll and b/DigitalData.Core.API/bin/Debug/net7.0/DigitalData.Core.API.dll differ diff --git a/DigitalData.Core.API/bin/Debug/net7.0/DigitalData.Core.API.pdb b/DigitalData.Core.API/bin/Debug/net7.0/DigitalData.Core.API.pdb index dc18d32..bf88f21 100644 Binary files a/DigitalData.Core.API/bin/Debug/net7.0/DigitalData.Core.API.pdb and b/DigitalData.Core.API/bin/Debug/net7.0/DigitalData.Core.API.pdb differ diff --git a/DigitalData.Core.API/bin/Debug/net7.0/DigitalData.Core.Contracts.dll b/DigitalData.Core.API/bin/Debug/net7.0/DigitalData.Core.Contracts.dll index c33f4c9..69c77f7 100644 Binary files a/DigitalData.Core.API/bin/Debug/net7.0/DigitalData.Core.Contracts.dll and b/DigitalData.Core.API/bin/Debug/net7.0/DigitalData.Core.Contracts.dll differ diff --git a/DigitalData.Core.API/bin/Debug/net7.0/DigitalData.Core.Contracts.pdb b/DigitalData.Core.API/bin/Debug/net7.0/DigitalData.Core.Contracts.pdb index 67c5524..150a0c5 100644 Binary files a/DigitalData.Core.API/bin/Debug/net7.0/DigitalData.Core.Contracts.pdb and b/DigitalData.Core.API/bin/Debug/net7.0/DigitalData.Core.Contracts.pdb differ diff --git a/DigitalData.Core.API/obj/Debug/net7.0/DigitalData.Core.API.assets.cache b/DigitalData.Core.API/obj/Debug/net7.0/DigitalData.Core.API.assets.cache index 63c3681..fc03d0c 100644 Binary files a/DigitalData.Core.API/obj/Debug/net7.0/DigitalData.Core.API.assets.cache and b/DigitalData.Core.API/obj/Debug/net7.0/DigitalData.Core.API.assets.cache differ diff --git a/DigitalData.Core.API/obj/Debug/net7.0/DigitalData.Core.API.csproj.AssemblyReference.cache b/DigitalData.Core.API/obj/Debug/net7.0/DigitalData.Core.API.csproj.AssemblyReference.cache index 16bc2ac..8fa507f 100644 Binary files a/DigitalData.Core.API/obj/Debug/net7.0/DigitalData.Core.API.csproj.AssemblyReference.cache and b/DigitalData.Core.API/obj/Debug/net7.0/DigitalData.Core.API.csproj.AssemblyReference.cache differ diff --git a/DigitalData.Core.API/obj/Debug/net7.0/DigitalData.Core.API.dll b/DigitalData.Core.API/obj/Debug/net7.0/DigitalData.Core.API.dll index 429e539..afdfcd2 100644 Binary files a/DigitalData.Core.API/obj/Debug/net7.0/DigitalData.Core.API.dll and b/DigitalData.Core.API/obj/Debug/net7.0/DigitalData.Core.API.dll differ diff --git a/DigitalData.Core.API/obj/Debug/net7.0/DigitalData.Core.API.pdb b/DigitalData.Core.API/obj/Debug/net7.0/DigitalData.Core.API.pdb index dc18d32..bf88f21 100644 Binary files a/DigitalData.Core.API/obj/Debug/net7.0/DigitalData.Core.API.pdb and b/DigitalData.Core.API/obj/Debug/net7.0/DigitalData.Core.API.pdb differ diff --git a/DigitalData.Core.API/obj/DigitalData.Core.API.csproj.nuget.dgspec.json b/DigitalData.Core.API/obj/DigitalData.Core.API.csproj.nuget.dgspec.json index ff54b1b..dea7d46 100644 --- a/DigitalData.Core.API/obj/DigitalData.Core.API.csproj.nuget.dgspec.json +++ b/DigitalData.Core.API/obj/DigitalData.Core.API.csproj.nuget.dgspec.json @@ -134,6 +134,10 @@ "target": "Package", "version": "[7.0.0, )" }, + "Microsoft.Extensions.Configuration.Binder": { + "target": "Package", + "version": "[7.0.4, )" + }, "System.DirectoryServices": { "target": "Package", "version": "[7.0.1, )" diff --git a/DigitalData.Core.API/obj/project.assets.json b/DigitalData.Core.API/obj/project.assets.json index 5befe3c..49d0008 100644 --- a/DigitalData.Core.API/obj/project.assets.json +++ b/DigitalData.Core.API/obj/project.assets.json @@ -44,6 +44,44 @@ "buildTransitive/net6.0/_._": {} } }, + "Microsoft.Extensions.Configuration.Abstractions/7.0.0": { + "type": "package", + "dependencies": { + "Microsoft.Extensions.Primitives": "7.0.0" + }, + "compile": { + "lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll": { + "related": ".xml" + } + }, + "build": { + "buildTransitive/net6.0/_._": {} + } + }, + "Microsoft.Extensions.Configuration.Binder/7.0.4": { + "type": "package", + "dependencies": { + "Microsoft.Extensions.Configuration.Abstractions": "7.0.0" + }, + "compile": { + "lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll": { + "related": ".xml" + } + }, + "build": { + "buildTransitive/net6.0/_._": {} + } + }, "Microsoft.Extensions.DependencyInjection/7.0.0": { "type": "package", "dependencies": { @@ -397,6 +435,7 @@ "framework": ".NETCoreApp,Version=v7.0", "dependencies": { "Microsoft.Extensions.Caching.Memory": "7.0.0", + "Microsoft.Extensions.Configuration.Binder": "7.0.4", "System.DirectoryServices": "7.0.1", "System.DirectoryServices.AccountManagement": "7.0.1" }, @@ -464,6 +503,60 @@ "useSharedDesignerContext.txt" ] }, + "Microsoft.Extensions.Configuration.Abstractions/7.0.0": { + "sha512": "f34u2eaqIjNO9YLHBz8rozVZ+TcFiFs0F3r7nUJd7FRkVSxk8u4OpoK226mi49MwexHOR2ibP9MFvRUaLilcQQ==", + "type": "package", + "path": "microsoft.extensions.configuration.abstractions/7.0.0", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "Icon.png", + "LICENSE.TXT", + "THIRD-PARTY-NOTICES.TXT", + "buildTransitive/net461/Microsoft.Extensions.Configuration.Abstractions.targets", + "buildTransitive/net462/_._", + "buildTransitive/net6.0/_._", + "buildTransitive/netcoreapp2.0/Microsoft.Extensions.Configuration.Abstractions.targets", + "lib/net462/Microsoft.Extensions.Configuration.Abstractions.dll", + "lib/net462/Microsoft.Extensions.Configuration.Abstractions.xml", + "lib/net6.0/Microsoft.Extensions.Configuration.Abstractions.dll", + "lib/net6.0/Microsoft.Extensions.Configuration.Abstractions.xml", + "lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll", + "lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.xml", + "lib/netstandard2.0/Microsoft.Extensions.Configuration.Abstractions.dll", + "lib/netstandard2.0/Microsoft.Extensions.Configuration.Abstractions.xml", + "microsoft.extensions.configuration.abstractions.7.0.0.nupkg.sha512", + "microsoft.extensions.configuration.abstractions.nuspec", + "useSharedDesignerContext.txt" + ] + }, + "Microsoft.Extensions.Configuration.Binder/7.0.4": { + "sha512": "8+XPvJnHZsYgHOQlcMuQe7QNF5KdVKHH1F/wW3nd8/u81Gk/XFAYMDP0Lpz18h7/AM95M662vvqMorcYxCBB4w==", + "type": "package", + "path": "microsoft.extensions.configuration.binder/7.0.4", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "Icon.png", + "LICENSE.TXT", + "THIRD-PARTY-NOTICES.TXT", + "buildTransitive/net461/Microsoft.Extensions.Configuration.Binder.targets", + "buildTransitive/net462/_._", + "buildTransitive/net6.0/_._", + "buildTransitive/netcoreapp2.0/Microsoft.Extensions.Configuration.Binder.targets", + "lib/net462/Microsoft.Extensions.Configuration.Binder.dll", + "lib/net462/Microsoft.Extensions.Configuration.Binder.xml", + "lib/net6.0/Microsoft.Extensions.Configuration.Binder.dll", + "lib/net6.0/Microsoft.Extensions.Configuration.Binder.xml", + "lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll", + "lib/net7.0/Microsoft.Extensions.Configuration.Binder.xml", + "lib/netstandard2.0/Microsoft.Extensions.Configuration.Binder.dll", + "lib/netstandard2.0/Microsoft.Extensions.Configuration.Binder.xml", + "microsoft.extensions.configuration.binder.7.0.4.nupkg.sha512", + "microsoft.extensions.configuration.binder.nuspec", + "useSharedDesignerContext.txt" + ] + }, "Microsoft.Extensions.DependencyInjection/7.0.0": { "sha512": "elNeOmkeX3eDVG6pYVeV82p29hr+UKDaBhrZyWvWLw/EVZSYEkZlQdkp0V39k/Xehs2Qa0mvoCvkVj3eQxNQ1Q==", "type": "package", diff --git a/DigitalData.Core.API/obj/project.nuget.cache b/DigitalData.Core.API/obj/project.nuget.cache index 4115cc5..0145549 100644 --- a/DigitalData.Core.API/obj/project.nuget.cache +++ b/DigitalData.Core.API/obj/project.nuget.cache @@ -1,11 +1,13 @@ { "version": 2, - "dgSpecHash": "GxFIQcHCjmkqiTHQzDiq3471GM1GDyJWtZ6ZstG6HnafATt7SNvAhuRBtyPn+0Tp0CHpVqQEbVf76gC7cIcRZA==", + "dgSpecHash": "ziLIEWsKtXzM+1p9xIcd95VClmuwIIVugVL7dkBzQoH6v10ibYNoFJNQ+dzv0oYSkn8+FpgbdtPIV/MKZ+mztw==", "success": true, "projectFilePath": "E:\\TekH\\Visual Studio\\WebCoreModules\\DigitalData.Core.API\\DigitalData.Core.API.csproj", "expectedPackageFiles": [ "C:\\Users\\tekh\\.nuget\\packages\\microsoft.extensions.caching.abstractions\\7.0.0\\microsoft.extensions.caching.abstractions.7.0.0.nupkg.sha512", "C:\\Users\\tekh\\.nuget\\packages\\microsoft.extensions.caching.memory\\7.0.0\\microsoft.extensions.caching.memory.7.0.0.nupkg.sha512", + "C:\\Users\\tekh\\.nuget\\packages\\microsoft.extensions.configuration.abstractions\\7.0.0\\microsoft.extensions.configuration.abstractions.7.0.0.nupkg.sha512", + "C:\\Users\\tekh\\.nuget\\packages\\microsoft.extensions.configuration.binder\\7.0.4\\microsoft.extensions.configuration.binder.7.0.4.nupkg.sha512", "C:\\Users\\tekh\\.nuget\\packages\\microsoft.extensions.dependencyinjection\\7.0.0\\microsoft.extensions.dependencyinjection.7.0.0.nupkg.sha512", "C:\\Users\\tekh\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\7.0.0\\microsoft.extensions.dependencyinjection.abstractions.7.0.0.nupkg.sha512", "C:\\Users\\tekh\\.nuget\\packages\\microsoft.extensions.logging\\7.0.0\\microsoft.extensions.logging.7.0.0.nupkg.sha512", diff --git a/DigitalData.Core.Application/DIExtensions.cs b/DigitalData.Core.Application/DIExtensions.cs index deba055..bcfa56b 100644 --- a/DigitalData.Core.Application/DIExtensions.cs +++ b/DigitalData.Core.Application/DIExtensions.cs @@ -55,12 +55,6 @@ namespace DigitalData.Core.Application return services; } - public static IServiceCollection AddDirectoryService(this IServiceCollection service) - { - service.AddScoped(); - return service; - } - public static IServiceCollection AddDirectorySearchService(this IServiceCollection service) { service.AddMemoryCache(); diff --git a/DigitalData.Core.Application/DirectorySearchService.cs b/DigitalData.Core.Application/DirectorySearchService.cs index ba39595..f3262b1 100644 --- a/DigitalData.Core.Application/DirectorySearchService.cs +++ b/DigitalData.Core.Application/DirectorySearchService.cs @@ -1,10 +1,10 @@ using DigitalData.Core.Contracts.Application; -using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; -using System.Configuration; using System.Diagnostics.CodeAnalysis; using System.DirectoryServices; using Microsoft.Extensions.Caching.Memory; +using Microsoft.Extensions.Configuration; +using System.DirectoryServices.AccountManagement; namespace DigitalData.Core.Application { @@ -12,15 +12,39 @@ namespace DigitalData.Core.Application public class DirectorySearchService : ServiceBase, IDirectorySearchService { private readonly IMemoryCache _memoryCache; - public readonly string SearchRootPath; + public string ServerName { get; } + public string Root { get; } + public string SearchRootPath { get; } + private readonly DateTimeOffset _userCacheExpiration; + public Dictionary CustomSearchFilters { get; } - public DirectorySearchService(IConfiguration configuration, ILogger logger, IMemoryCache memoryCache) + public DirectorySearchService(IConfiguration configuration, ILogger logger, IMemoryCache memoryCache) { - SearchRootPath = configuration["DirectorySearch:SearchRootPath"] ?? throw new ConfigurationErrorsException("SearchRootPath configuration is missing."); _memoryCache = memoryCache; + + ServerName = configuration["DirectorySearch:ServerName"] ?? throw new InvalidOperationException("The server name for directory search is not configured. Please specify the 'DirectorySearch:ServerName' in the configuration."); + + Root = configuration["DirectorySearch:Root"] ?? throw new InvalidOperationException("The root for directory search is not configured. Please specify the 'DirectorySearch:Root' in the configuration."); + + SearchRootPath = $"LDAP://{ServerName}/{Root}"; + + var customSearchFiltersSection = configuration.GetSection("DirectorySearch:CustomSearchFilters"); + CustomSearchFilters = customSearchFiltersSection.Get>() ?? new(); + + var dayCounts = configuration.GetValue("DirectorySearch:UserCacheExpirationDays"); + if (dayCounts == default) + _userCacheExpiration = default; + else + _userCacheExpiration = DateTimeOffset.Now.Date.AddDays(dayCounts); } - public IServiceResult> FindAll(DirectoryEntry searchRoot, string filter, SearchScope searchScope = SearchScope.Subtree, int sizeLimit = 5000) + public bool ValidateCredentials(string dirEntryUsername, string dirEntryPassword) + { + using var context = new PrincipalContext(ContextType.Domain, ServerName, Root); + return context.ValidateCredentials(dirEntryUsername, dirEntryPassword); + } + + public IServiceResult> FindAll(DirectoryEntry searchRoot, string filter, SearchScope searchScope = SearchScope.Subtree, int sizeLimit = 5000, params string[] properties) { List list = new(); @@ -32,6 +56,14 @@ namespace DigitalData.Core.Application SearchRoot = searchRoot }; + if (properties.Length > 0) + { + searcher.PropertiesToLoad.Clear(); + foreach (var property in properties) + if(property is not null) + searcher.PropertiesToLoad.Add(property); + } + foreach (SearchResult result in searcher.FindAll()) { ResultPropertyCollection rpc = result.Properties; @@ -41,7 +73,7 @@ namespace DigitalData.Core.Application return Successful>(list); } - public IServiceResult> FindAllByUserCache(string username, string filter, SearchScope searchScope = SearchScope.Subtree, int sizeLimit = 5000) + public IServiceResult> FindAllByUserCache(string username, string filter, SearchScope searchScope = SearchScope.Subtree, int sizeLimit = 5000, params string[] properties) { List list = new(); @@ -50,7 +82,21 @@ namespace DigitalData.Core.Application if (searchRoot is null) return Failed>(MessageKey.DirSearcherDisconnected.ToString()); - return FindAll(searchRoot, filter, searchScope, sizeLimit); + return FindAll(searchRoot, filter, searchScope, sizeLimit, properties); + } + + public void SetSearchRootCache(string dirEntryUsername, string dirEntryPassword) + { + if (_userCacheExpiration == default) + _memoryCache.Set(key: dirEntryUsername, new DirectoryEntry(path: SearchRootPath, username: dirEntryUsername, password: dirEntryPassword)); + else + _memoryCache.Set(key: dirEntryUsername, new DirectoryEntry(path: SearchRootPath, username: dirEntryUsername, password: dirEntryPassword), absoluteExpiration: _userCacheExpiration); + } + + public DirectoryEntry? GetSearchRootCache(string dirEntryUsername) + { + _memoryCache.TryGetValue(dirEntryUsername, out DirectoryEntry? root); + return root; } } } \ No newline at end of file diff --git a/DigitalData.Core.Application/DirectoryService.cs b/DigitalData.Core.Application/DirectoryService.cs deleted file mode 100644 index 86e1363..0000000 --- a/DigitalData.Core.Application/DirectoryService.cs +++ /dev/null @@ -1,115 +0,0 @@ -using AutoMapper; -using DigitalData.Core.Contracts.Application; -using System.DirectoryServices; -using System.Diagnostics.CodeAnalysis; -using System.DirectoryServices.AccountManagement; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.Logging; -using System.Configuration; - -namespace DigitalData.Core.Application -{ - [SuppressMessage("Interoperability", "CA1416:Validate platform compatibility", Justification = "")] - public class DirectoryService : ServiceBase, IDirectoryService - { - protected IMapper _mapper; - protected readonly DirectorySearcher _groupSearcher; - IConfiguration _configuration; - - public readonly string SearchRootPath; - - public DirectoryService(IMapper mapper, IConfiguration configuration, ILogger logger) { - _mapper = mapper; - _configuration = configuration; - - var searchRoot = configuration["DirectorySearch:SearchRootPath"]; - - logger.LogInformation($"Search Root is {searchRoot}."); - - SearchRootPath = _configuration["DirectorySearch:SearchRootPath"] ?? throw new ConfigurationErrorsException("SearchRootPath configuration is missing."); - - _groupSearcher = new DirectorySearcher() - { - Filter = "(&(objectClass=group) (samAccountName=*))", - SearchScope = SearchScope.Subtree, - SizeLimit = 5000, - SearchRoot = new DirectoryEntry(searchRoot) - }; - } - - public IServiceResult> ReadAllGroupAsCollection() - { - List list = new(); - - foreach (SearchResult result in _groupSearcher.FindAll()) - { - ResultPropertyCollection rpc = result.Properties; - list.Add(rpc); - } - - return Successful>(list); - } - - public IServiceResult> ReadAllGroupAsCollection(string serverAddress, string username, string password) - { - var searcher = new DirectorySearcher() - { - Filter = "(&(objectClass=user)(sAMAccountName=*))", - SearchScope = SearchScope.Subtree, - SizeLimit = 5000, - SearchRoot = new DirectoryEntry($"LDAP://{serverAddress}/DC=dd-gan,DC=local,DC=digitaldata,DC=works", username, password) - }; - - List list = new(); - - foreach (SearchResult result in searcher.FindAll()) - { - ResultPropertyCollection rpc = result.Properties; - list.Add(rpc); - } - - return Successful>(list); - } - - public IServiceResult>> ReadGroupByPropertyName(string propertyName = "samaccountname") - { - List> list = new(); - - foreach (SearchResult result in _groupSearcher.FindAll()) - { - var value = result.Properties[propertyName]; - if (value is not null) - list.Add(new Dictionary() - { - [propertyName] = value - }); - } - - return Successful>>(list); - } - - public IServiceResult> ReadUserByGroup(string groupIdentityValue, IdentityType groupIdentityType = IdentityType.Name, bool recursive = true) - { - List upDTOs = new(); - - using PrincipalContext context = new(ContextType.Domain); - using GroupPrincipal? groupPrincipal = GroupPrincipal.FindByIdentity(context, groupIdentityType, groupIdentityValue); - - if (groupPrincipal is null) - return Failed>(); - - using PrincipalSearchResult principalSearchResult = groupPrincipal.GetMembers(recursive); - - foreach (Principal principal in principalSearchResult) - { - if (principal is UserPrincipal userPrincipal) - { - var upDto = _mapper.MapOrThrow(userPrincipal); - upDTOs.Add(upDto); - } - } - - return Successful>(upDTOs); - } - } -} \ No newline at end of file diff --git a/DigitalData.Core.Application/bin/Debug/net7.0/DigitalData.Core.Application.deps.json b/DigitalData.Core.Application/bin/Debug/net7.0/DigitalData.Core.Application.deps.json index e19b53c..3653939 100644 --- a/DigitalData.Core.Application/bin/Debug/net7.0/DigitalData.Core.Application.deps.json +++ b/DigitalData.Core.Application/bin/Debug/net7.0/DigitalData.Core.Application.deps.json @@ -79,6 +79,17 @@ } } }, + "Microsoft.Extensions.Configuration.Binder/7.0.4": { + "dependencies": { + "Microsoft.Extensions.Configuration.Abstractions": "7.0.0" + }, + "runtime": { + "lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll": { + "assemblyVersion": "7.0.0.0", + "fileVersion": "7.0.423.11508" + } + } + }, "Microsoft.Extensions.DependencyInjection/7.0.0": { "dependencies": { "Microsoft.Extensions.DependencyInjection.Abstractions": "7.0.0" @@ -327,6 +338,7 @@ "DigitalData.Core.Contracts/1.0.0": { "dependencies": { "Microsoft.Extensions.Caching.Memory": "7.0.0", + "Microsoft.Extensions.Configuration.Binder": "7.0.4", "System.DirectoryServices": "7.0.1", "System.DirectoryServices.AccountManagement": "7.0.1" }, @@ -377,6 +389,13 @@ "path": "microsoft.extensions.configuration.abstractions/7.0.0", "hashPath": "microsoft.extensions.configuration.abstractions.7.0.0.nupkg.sha512" }, + "Microsoft.Extensions.Configuration.Binder/7.0.4": { + "type": "package", + "serviceable": true, + "sha512": "sha512-8+XPvJnHZsYgHOQlcMuQe7QNF5KdVKHH1F/wW3nd8/u81Gk/XFAYMDP0Lpz18h7/AM95M662vvqMorcYxCBB4w==", + "path": "microsoft.extensions.configuration.binder/7.0.4", + "hashPath": "microsoft.extensions.configuration.binder.7.0.4.nupkg.sha512" + }, "Microsoft.Extensions.DependencyInjection/7.0.0": { "type": "package", "serviceable": true, diff --git a/DigitalData.Core.Application/bin/Debug/net7.0/DigitalData.Core.Application.dll b/DigitalData.Core.Application/bin/Debug/net7.0/DigitalData.Core.Application.dll index 0918b47..d8a7384 100644 Binary files a/DigitalData.Core.Application/bin/Debug/net7.0/DigitalData.Core.Application.dll and b/DigitalData.Core.Application/bin/Debug/net7.0/DigitalData.Core.Application.dll differ diff --git a/DigitalData.Core.Application/bin/Debug/net7.0/DigitalData.Core.Application.pdb b/DigitalData.Core.Application/bin/Debug/net7.0/DigitalData.Core.Application.pdb index 562423d..f214cab 100644 Binary files a/DigitalData.Core.Application/bin/Debug/net7.0/DigitalData.Core.Application.pdb and b/DigitalData.Core.Application/bin/Debug/net7.0/DigitalData.Core.Application.pdb differ diff --git a/DigitalData.Core.Application/bin/Debug/net7.0/DigitalData.Core.Contracts.dll b/DigitalData.Core.Application/bin/Debug/net7.0/DigitalData.Core.Contracts.dll index c33f4c9..69c77f7 100644 Binary files a/DigitalData.Core.Application/bin/Debug/net7.0/DigitalData.Core.Contracts.dll and b/DigitalData.Core.Application/bin/Debug/net7.0/DigitalData.Core.Contracts.dll differ diff --git a/DigitalData.Core.Application/bin/Debug/net7.0/DigitalData.Core.Contracts.pdb b/DigitalData.Core.Application/bin/Debug/net7.0/DigitalData.Core.Contracts.pdb index 67c5524..150a0c5 100644 Binary files a/DigitalData.Core.Application/bin/Debug/net7.0/DigitalData.Core.Contracts.pdb and b/DigitalData.Core.Application/bin/Debug/net7.0/DigitalData.Core.Contracts.pdb differ diff --git a/DigitalData.Core.Application/obj/Debug/net7.0/DigitalData.Core.Application.assets.cache b/DigitalData.Core.Application/obj/Debug/net7.0/DigitalData.Core.Application.assets.cache index 77d2e1f..9c283f0 100644 Binary files a/DigitalData.Core.Application/obj/Debug/net7.0/DigitalData.Core.Application.assets.cache and b/DigitalData.Core.Application/obj/Debug/net7.0/DigitalData.Core.Application.assets.cache differ diff --git a/DigitalData.Core.Application/obj/Debug/net7.0/DigitalData.Core.Application.csproj.AssemblyReference.cache b/DigitalData.Core.Application/obj/Debug/net7.0/DigitalData.Core.Application.csproj.AssemblyReference.cache index 9fdb449..e3fb157 100644 Binary files a/DigitalData.Core.Application/obj/Debug/net7.0/DigitalData.Core.Application.csproj.AssemblyReference.cache and b/DigitalData.Core.Application/obj/Debug/net7.0/DigitalData.Core.Application.csproj.AssemblyReference.cache differ diff --git a/DigitalData.Core.Application/obj/Debug/net7.0/DigitalData.Core.Application.csproj.CoreCompileInputs.cache b/DigitalData.Core.Application/obj/Debug/net7.0/DigitalData.Core.Application.csproj.CoreCompileInputs.cache index c8e2016..79fa4a5 100644 --- a/DigitalData.Core.Application/obj/Debug/net7.0/DigitalData.Core.Application.csproj.CoreCompileInputs.cache +++ b/DigitalData.Core.Application/obj/Debug/net7.0/DigitalData.Core.Application.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -d6b492d4d707f47dd6268572d14db639b2b8036b +27b4d1c0e521dbdcdae7e49ff5b85233b84a7ece diff --git a/DigitalData.Core.Application/obj/Debug/net7.0/DigitalData.Core.Application.dll b/DigitalData.Core.Application/obj/Debug/net7.0/DigitalData.Core.Application.dll index 0918b47..d8a7384 100644 Binary files a/DigitalData.Core.Application/obj/Debug/net7.0/DigitalData.Core.Application.dll and b/DigitalData.Core.Application/obj/Debug/net7.0/DigitalData.Core.Application.dll differ diff --git a/DigitalData.Core.Application/obj/Debug/net7.0/DigitalData.Core.Application.pdb b/DigitalData.Core.Application/obj/Debug/net7.0/DigitalData.Core.Application.pdb index 562423d..f214cab 100644 Binary files a/DigitalData.Core.Application/obj/Debug/net7.0/DigitalData.Core.Application.pdb and b/DigitalData.Core.Application/obj/Debug/net7.0/DigitalData.Core.Application.pdb differ diff --git a/DigitalData.Core.Application/obj/Debug/net7.0/ref/DigitalData.Core.Application.dll b/DigitalData.Core.Application/obj/Debug/net7.0/ref/DigitalData.Core.Application.dll index 12f3754..4408cca 100644 Binary files a/DigitalData.Core.Application/obj/Debug/net7.0/ref/DigitalData.Core.Application.dll and b/DigitalData.Core.Application/obj/Debug/net7.0/ref/DigitalData.Core.Application.dll differ diff --git a/DigitalData.Core.Application/obj/Debug/net7.0/refint/DigitalData.Core.Application.dll b/DigitalData.Core.Application/obj/Debug/net7.0/refint/DigitalData.Core.Application.dll index 12f3754..4408cca 100644 Binary files a/DigitalData.Core.Application/obj/Debug/net7.0/refint/DigitalData.Core.Application.dll and b/DigitalData.Core.Application/obj/Debug/net7.0/refint/DigitalData.Core.Application.dll differ diff --git a/DigitalData.Core.Application/obj/DigitalData.Core.Application.csproj.nuget.dgspec.json b/DigitalData.Core.Application/obj/DigitalData.Core.Application.csproj.nuget.dgspec.json index 8f02a74..7424b71 100644 --- a/DigitalData.Core.Application/obj/DigitalData.Core.Application.csproj.nuget.dgspec.json +++ b/DigitalData.Core.Application/obj/DigitalData.Core.Application.csproj.nuget.dgspec.json @@ -147,6 +147,10 @@ "target": "Package", "version": "[7.0.0, )" }, + "Microsoft.Extensions.Configuration.Binder": { + "target": "Package", + "version": "[7.0.4, )" + }, "System.DirectoryServices": { "target": "Package", "version": "[7.0.1, )" diff --git a/DigitalData.Core.Application/obj/project.assets.json b/DigitalData.Core.Application/obj/project.assets.json index abbc1bc..b6cfce9 100644 --- a/DigitalData.Core.Application/obj/project.assets.json +++ b/DigitalData.Core.Application/obj/project.assets.json @@ -99,6 +99,25 @@ "buildTransitive/net6.0/_._": {} } }, + "Microsoft.Extensions.Configuration.Binder/7.0.4": { + "type": "package", + "dependencies": { + "Microsoft.Extensions.Configuration.Abstractions": "7.0.0" + }, + "compile": { + "lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll": { + "related": ".xml" + } + }, + "build": { + "buildTransitive/net6.0/_._": {} + } + }, "Microsoft.Extensions.DependencyInjection/7.0.0": { "type": "package", "dependencies": { @@ -452,6 +471,7 @@ "framework": ".NETCoreApp,Version=v7.0", "dependencies": { "Microsoft.Extensions.Caching.Memory": "7.0.0", + "Microsoft.Extensions.Configuration.Binder": "7.0.4", "System.DirectoryServices": "7.0.1", "System.DirectoryServices.AccountManagement": "7.0.1" }, @@ -588,6 +608,33 @@ "useSharedDesignerContext.txt" ] }, + "Microsoft.Extensions.Configuration.Binder/7.0.4": { + "sha512": "8+XPvJnHZsYgHOQlcMuQe7QNF5KdVKHH1F/wW3nd8/u81Gk/XFAYMDP0Lpz18h7/AM95M662vvqMorcYxCBB4w==", + "type": "package", + "path": "microsoft.extensions.configuration.binder/7.0.4", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "Icon.png", + "LICENSE.TXT", + "THIRD-PARTY-NOTICES.TXT", + "buildTransitive/net461/Microsoft.Extensions.Configuration.Binder.targets", + "buildTransitive/net462/_._", + "buildTransitive/net6.0/_._", + "buildTransitive/netcoreapp2.0/Microsoft.Extensions.Configuration.Binder.targets", + "lib/net462/Microsoft.Extensions.Configuration.Binder.dll", + "lib/net462/Microsoft.Extensions.Configuration.Binder.xml", + "lib/net6.0/Microsoft.Extensions.Configuration.Binder.dll", + "lib/net6.0/Microsoft.Extensions.Configuration.Binder.xml", + "lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll", + "lib/net7.0/Microsoft.Extensions.Configuration.Binder.xml", + "lib/netstandard2.0/Microsoft.Extensions.Configuration.Binder.dll", + "lib/netstandard2.0/Microsoft.Extensions.Configuration.Binder.xml", + "microsoft.extensions.configuration.binder.7.0.4.nupkg.sha512", + "microsoft.extensions.configuration.binder.nuspec", + "useSharedDesignerContext.txt" + ] + }, "Microsoft.Extensions.DependencyInjection/7.0.0": { "sha512": "elNeOmkeX3eDVG6pYVeV82p29hr+UKDaBhrZyWvWLw/EVZSYEkZlQdkp0V39k/Xehs2Qa0mvoCvkVj3eQxNQ1Q==", "type": "package", diff --git a/DigitalData.Core.Application/obj/project.nuget.cache b/DigitalData.Core.Application/obj/project.nuget.cache index a281765..008c573 100644 --- a/DigitalData.Core.Application/obj/project.nuget.cache +++ b/DigitalData.Core.Application/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "QbFi3Bjc6Jq5Z4fakBzuNU7pNttdG/DCmVVyuo9l0kz0AbeYFlsb08iiLxlvwMAW4Yiq7Puor/g1fVXD9WndbQ==", + "dgSpecHash": "n93+MKQABba3OlvV9vsNTsnfi5nHWhj3CavVgX3I9I1+zCwApoWk5yls2KENGsGobTCWb/ng+KmBQYYwtkP9AA==", "success": true, "projectFilePath": "E:\\TekH\\Visual Studio\\WebCoreModules\\DigitalData.Core.Application\\DigitalData.Core.Application.csproj", "expectedPackageFiles": [ @@ -9,6 +9,7 @@ "C:\\Users\\tekh\\.nuget\\packages\\microsoft.extensions.caching.memory\\7.0.0\\microsoft.extensions.caching.memory.7.0.0.nupkg.sha512", "C:\\Users\\tekh\\.nuget\\packages\\microsoft.extensions.configuration\\7.0.0\\microsoft.extensions.configuration.7.0.0.nupkg.sha512", "C:\\Users\\tekh\\.nuget\\packages\\microsoft.extensions.configuration.abstractions\\7.0.0\\microsoft.extensions.configuration.abstractions.7.0.0.nupkg.sha512", + "C:\\Users\\tekh\\.nuget\\packages\\microsoft.extensions.configuration.binder\\7.0.4\\microsoft.extensions.configuration.binder.7.0.4.nupkg.sha512", "C:\\Users\\tekh\\.nuget\\packages\\microsoft.extensions.dependencyinjection\\7.0.0\\microsoft.extensions.dependencyinjection.7.0.0.nupkg.sha512", "C:\\Users\\tekh\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\7.0.0\\microsoft.extensions.dependencyinjection.abstractions.7.0.0.nupkg.sha512", "C:\\Users\\tekh\\.nuget\\packages\\microsoft.extensions.logging\\7.0.0\\microsoft.extensions.logging.7.0.0.nupkg.sha512", diff --git a/DigitalData.Core.Contracts/Application/IDirectorySearchService.cs b/DigitalData.Core.Contracts/Application/IDirectorySearchService.cs index 35c026b..226827f 100644 --- a/DigitalData.Core.Contracts/Application/IDirectorySearchService.cs +++ b/DigitalData.Core.Contracts/Application/IDirectorySearchService.cs @@ -4,8 +4,22 @@ namespace DigitalData.Core.Contracts.Application { public interface IDirectorySearchService : IServiceBase { - IServiceResult> FindAll(DirectoryEntry searchRoot, string filter, SearchScope searchScope = SearchScope.Subtree, int sizeLimit = 5000); + public string ServerName { get; } - IServiceResult> FindAllByUserCache(string username, string filter, SearchScope searchScope = SearchScope.Subtree, int sizeLimit = 5000); + public string Root { get; } + + string SearchRootPath { get; } + + Dictionary CustomSearchFilters { get; } + + bool ValidateCredentials(string dirEntryUsername, string dirEntryPassword); + + IServiceResult> FindAll(DirectoryEntry searchRoot, string filter, SearchScope searchScope = SearchScope.Subtree, int sizeLimit = 5000, params string[] properties); + + IServiceResult> FindAllByUserCache(string username, string filter, SearchScope searchScope = SearchScope.Subtree, int sizeLimit = 5000, params string[] properties); + + void SetSearchRootCache(string username, string password); + + DirectoryEntry? GetSearchRootCache(string username); } -} +} \ No newline at end of file diff --git a/DigitalData.Core.Contracts/Application/IDirectoryService.cs b/DigitalData.Core.Contracts/Application/IDirectoryService.cs deleted file mode 100644 index 61e3b6b..0000000 --- a/DigitalData.Core.Contracts/Application/IDirectoryService.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System.DirectoryServices; - -using System.DirectoryServices.AccountManagement; - -namespace DigitalData.Core.Contracts.Application -{ - public interface IDirectoryService : IServiceBase - { - IServiceResult> ReadAllGroupAsCollection(); - - IServiceResult> ReadAllGroupAsCollection(string serverAddress, string username, string password); - - IServiceResult>> ReadGroupByPropertyName(string propName); - - IServiceResult> ReadUserByGroup(string groupIdentityValue, IdentityType groupIdentityType = IdentityType.Name, bool recursive = true); - } -} \ No newline at end of file diff --git a/DigitalData.Core.Contracts/DigitalData.Core.Contracts.csproj b/DigitalData.Core.Contracts/DigitalData.Core.Contracts.csproj index 4710c65..621ac27 100644 --- a/DigitalData.Core.Contracts/DigitalData.Core.Contracts.csproj +++ b/DigitalData.Core.Contracts/DigitalData.Core.Contracts.csproj @@ -8,6 +8,7 @@ + diff --git a/DigitalData.Core.Contracts/bin/Debug/net7.0/DigitalData.Core.Contracts.deps.json b/DigitalData.Core.Contracts/bin/Debug/net7.0/DigitalData.Core.Contracts.deps.json index cd906db..4d822c2 100644 --- a/DigitalData.Core.Contracts/bin/Debug/net7.0/DigitalData.Core.Contracts.deps.json +++ b/DigitalData.Core.Contracts/bin/Debug/net7.0/DigitalData.Core.Contracts.deps.json @@ -9,6 +9,7 @@ "DigitalData.Core.Contracts/1.0.0": { "dependencies": { "Microsoft.Extensions.Caching.Memory": "7.0.0", + "Microsoft.Extensions.Configuration.Binder": "7.0.4", "System.DirectoryServices": "7.0.1", "System.DirectoryServices.AccountManagement": "7.0.1" }, @@ -42,6 +43,28 @@ } } }, + "Microsoft.Extensions.Configuration.Abstractions/7.0.0": { + "dependencies": { + "Microsoft.Extensions.Primitives": "7.0.0" + }, + "runtime": { + "lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll": { + "assemblyVersion": "7.0.0.0", + "fileVersion": "7.0.22.51805" + } + } + }, + "Microsoft.Extensions.Configuration.Binder/7.0.4": { + "dependencies": { + "Microsoft.Extensions.Configuration.Abstractions": "7.0.0" + }, + "runtime": { + "lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll": { + "assemblyVersion": "7.0.0.0", + "fileVersion": "7.0.423.11508" + } + } + }, "Microsoft.Extensions.DependencyInjection.Abstractions/7.0.0": { "runtime": { "lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll": { @@ -284,6 +307,20 @@ "path": "microsoft.extensions.caching.memory/7.0.0", "hashPath": "microsoft.extensions.caching.memory.7.0.0.nupkg.sha512" }, + "Microsoft.Extensions.Configuration.Abstractions/7.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-f34u2eaqIjNO9YLHBz8rozVZ+TcFiFs0F3r7nUJd7FRkVSxk8u4OpoK226mi49MwexHOR2ibP9MFvRUaLilcQQ==", + "path": "microsoft.extensions.configuration.abstractions/7.0.0", + "hashPath": "microsoft.extensions.configuration.abstractions.7.0.0.nupkg.sha512" + }, + "Microsoft.Extensions.Configuration.Binder/7.0.4": { + "type": "package", + "serviceable": true, + "sha512": "sha512-8+XPvJnHZsYgHOQlcMuQe7QNF5KdVKHH1F/wW3nd8/u81Gk/XFAYMDP0Lpz18h7/AM95M662vvqMorcYxCBB4w==", + "path": "microsoft.extensions.configuration.binder/7.0.4", + "hashPath": "microsoft.extensions.configuration.binder.7.0.4.nupkg.sha512" + }, "Microsoft.Extensions.DependencyInjection.Abstractions/7.0.0": { "type": "package", "serviceable": true, diff --git a/DigitalData.Core.Contracts/bin/Debug/net7.0/DigitalData.Core.Contracts.dll b/DigitalData.Core.Contracts/bin/Debug/net7.0/DigitalData.Core.Contracts.dll index c33f4c9..69c77f7 100644 Binary files a/DigitalData.Core.Contracts/bin/Debug/net7.0/DigitalData.Core.Contracts.dll and b/DigitalData.Core.Contracts/bin/Debug/net7.0/DigitalData.Core.Contracts.dll differ diff --git a/DigitalData.Core.Contracts/bin/Debug/net7.0/DigitalData.Core.Contracts.pdb b/DigitalData.Core.Contracts/bin/Debug/net7.0/DigitalData.Core.Contracts.pdb index 67c5524..150a0c5 100644 Binary files a/DigitalData.Core.Contracts/bin/Debug/net7.0/DigitalData.Core.Contracts.pdb and b/DigitalData.Core.Contracts/bin/Debug/net7.0/DigitalData.Core.Contracts.pdb differ diff --git a/DigitalData.Core.Contracts/obj/Debug/net7.0/DigitalData.Core.Contracts.assets.cache b/DigitalData.Core.Contracts/obj/Debug/net7.0/DigitalData.Core.Contracts.assets.cache index cbb57df..5ab696b 100644 Binary files a/DigitalData.Core.Contracts/obj/Debug/net7.0/DigitalData.Core.Contracts.assets.cache and b/DigitalData.Core.Contracts/obj/Debug/net7.0/DigitalData.Core.Contracts.assets.cache differ diff --git a/DigitalData.Core.Contracts/obj/Debug/net7.0/DigitalData.Core.Contracts.csproj.AssemblyReference.cache b/DigitalData.Core.Contracts/obj/Debug/net7.0/DigitalData.Core.Contracts.csproj.AssemblyReference.cache index f54d2f0..1592475 100644 Binary files a/DigitalData.Core.Contracts/obj/Debug/net7.0/DigitalData.Core.Contracts.csproj.AssemblyReference.cache and b/DigitalData.Core.Contracts/obj/Debug/net7.0/DigitalData.Core.Contracts.csproj.AssemblyReference.cache differ diff --git a/DigitalData.Core.Contracts/obj/Debug/net7.0/DigitalData.Core.Contracts.csproj.CoreCompileInputs.cache b/DigitalData.Core.Contracts/obj/Debug/net7.0/DigitalData.Core.Contracts.csproj.CoreCompileInputs.cache index 1d8d859..d509fad 100644 --- a/DigitalData.Core.Contracts/obj/Debug/net7.0/DigitalData.Core.Contracts.csproj.CoreCompileInputs.cache +++ b/DigitalData.Core.Contracts/obj/Debug/net7.0/DigitalData.Core.Contracts.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -88cb4040e5dbd677ad534313590b1f1054b1298e +f4387e0fddd1173993a6db1f0ae947a265e040d2 diff --git a/DigitalData.Core.Contracts/obj/Debug/net7.0/DigitalData.Core.Contracts.dll b/DigitalData.Core.Contracts/obj/Debug/net7.0/DigitalData.Core.Contracts.dll index c33f4c9..69c77f7 100644 Binary files a/DigitalData.Core.Contracts/obj/Debug/net7.0/DigitalData.Core.Contracts.dll and b/DigitalData.Core.Contracts/obj/Debug/net7.0/DigitalData.Core.Contracts.dll differ diff --git a/DigitalData.Core.Contracts/obj/Debug/net7.0/DigitalData.Core.Contracts.pdb b/DigitalData.Core.Contracts/obj/Debug/net7.0/DigitalData.Core.Contracts.pdb index 67c5524..150a0c5 100644 Binary files a/DigitalData.Core.Contracts/obj/Debug/net7.0/DigitalData.Core.Contracts.pdb and b/DigitalData.Core.Contracts/obj/Debug/net7.0/DigitalData.Core.Contracts.pdb differ diff --git a/DigitalData.Core.Contracts/obj/Debug/net7.0/ref/DigitalData.Core.Contracts.dll b/DigitalData.Core.Contracts/obj/Debug/net7.0/ref/DigitalData.Core.Contracts.dll index 3341ac1..8791c17 100644 Binary files a/DigitalData.Core.Contracts/obj/Debug/net7.0/ref/DigitalData.Core.Contracts.dll and b/DigitalData.Core.Contracts/obj/Debug/net7.0/ref/DigitalData.Core.Contracts.dll differ diff --git a/DigitalData.Core.Contracts/obj/Debug/net7.0/refint/DigitalData.Core.Contracts.dll b/DigitalData.Core.Contracts/obj/Debug/net7.0/refint/DigitalData.Core.Contracts.dll index 3341ac1..8791c17 100644 Binary files a/DigitalData.Core.Contracts/obj/Debug/net7.0/refint/DigitalData.Core.Contracts.dll and b/DigitalData.Core.Contracts/obj/Debug/net7.0/refint/DigitalData.Core.Contracts.dll differ diff --git a/DigitalData.Core.Contracts/obj/DigitalData.Core.Contracts.csproj.nuget.dgspec.json b/DigitalData.Core.Contracts/obj/DigitalData.Core.Contracts.csproj.nuget.dgspec.json index d1dbdd1..7581232 100644 --- a/DigitalData.Core.Contracts/obj/DigitalData.Core.Contracts.csproj.nuget.dgspec.json +++ b/DigitalData.Core.Contracts/obj/DigitalData.Core.Contracts.csproj.nuget.dgspec.json @@ -55,6 +55,10 @@ "target": "Package", "version": "[7.0.0, )" }, + "Microsoft.Extensions.Configuration.Binder": { + "target": "Package", + "version": "[7.0.4, )" + }, "System.DirectoryServices": { "target": "Package", "version": "[7.0.1, )" diff --git a/DigitalData.Core.Contracts/obj/project.assets.json b/DigitalData.Core.Contracts/obj/project.assets.json index 5091c4c..02ae0e9 100644 --- a/DigitalData.Core.Contracts/obj/project.assets.json +++ b/DigitalData.Core.Contracts/obj/project.assets.json @@ -44,6 +44,44 @@ "buildTransitive/net6.0/_._": {} } }, + "Microsoft.Extensions.Configuration.Abstractions/7.0.0": { + "type": "package", + "dependencies": { + "Microsoft.Extensions.Primitives": "7.0.0" + }, + "compile": { + "lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll": { + "related": ".xml" + } + }, + "build": { + "buildTransitive/net6.0/_._": {} + } + }, + "Microsoft.Extensions.Configuration.Binder/7.0.4": { + "type": "package", + "dependencies": { + "Microsoft.Extensions.Configuration.Abstractions": "7.0.0" + }, + "compile": { + "lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll": { + "related": ".xml" + } + }, + "build": { + "buildTransitive/net6.0/_._": {} + } + }, "Microsoft.Extensions.DependencyInjection.Abstractions/7.0.0": { "type": "package", "compile": { @@ -408,6 +446,60 @@ "useSharedDesignerContext.txt" ] }, + "Microsoft.Extensions.Configuration.Abstractions/7.0.0": { + "sha512": "f34u2eaqIjNO9YLHBz8rozVZ+TcFiFs0F3r7nUJd7FRkVSxk8u4OpoK226mi49MwexHOR2ibP9MFvRUaLilcQQ==", + "type": "package", + "path": "microsoft.extensions.configuration.abstractions/7.0.0", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "Icon.png", + "LICENSE.TXT", + "THIRD-PARTY-NOTICES.TXT", + "buildTransitive/net461/Microsoft.Extensions.Configuration.Abstractions.targets", + "buildTransitive/net462/_._", + "buildTransitive/net6.0/_._", + "buildTransitive/netcoreapp2.0/Microsoft.Extensions.Configuration.Abstractions.targets", + "lib/net462/Microsoft.Extensions.Configuration.Abstractions.dll", + "lib/net462/Microsoft.Extensions.Configuration.Abstractions.xml", + "lib/net6.0/Microsoft.Extensions.Configuration.Abstractions.dll", + "lib/net6.0/Microsoft.Extensions.Configuration.Abstractions.xml", + "lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll", + "lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.xml", + "lib/netstandard2.0/Microsoft.Extensions.Configuration.Abstractions.dll", + "lib/netstandard2.0/Microsoft.Extensions.Configuration.Abstractions.xml", + "microsoft.extensions.configuration.abstractions.7.0.0.nupkg.sha512", + "microsoft.extensions.configuration.abstractions.nuspec", + "useSharedDesignerContext.txt" + ] + }, + "Microsoft.Extensions.Configuration.Binder/7.0.4": { + "sha512": "8+XPvJnHZsYgHOQlcMuQe7QNF5KdVKHH1F/wW3nd8/u81Gk/XFAYMDP0Lpz18h7/AM95M662vvqMorcYxCBB4w==", + "type": "package", + "path": "microsoft.extensions.configuration.binder/7.0.4", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "Icon.png", + "LICENSE.TXT", + "THIRD-PARTY-NOTICES.TXT", + "buildTransitive/net461/Microsoft.Extensions.Configuration.Binder.targets", + "buildTransitive/net462/_._", + "buildTransitive/net6.0/_._", + "buildTransitive/netcoreapp2.0/Microsoft.Extensions.Configuration.Binder.targets", + "lib/net462/Microsoft.Extensions.Configuration.Binder.dll", + "lib/net462/Microsoft.Extensions.Configuration.Binder.xml", + "lib/net6.0/Microsoft.Extensions.Configuration.Binder.dll", + "lib/net6.0/Microsoft.Extensions.Configuration.Binder.xml", + "lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll", + "lib/net7.0/Microsoft.Extensions.Configuration.Binder.xml", + "lib/netstandard2.0/Microsoft.Extensions.Configuration.Binder.dll", + "lib/netstandard2.0/Microsoft.Extensions.Configuration.Binder.xml", + "microsoft.extensions.configuration.binder.7.0.4.nupkg.sha512", + "microsoft.extensions.configuration.binder.nuspec", + "useSharedDesignerContext.txt" + ] + }, "Microsoft.Extensions.DependencyInjection.Abstractions/7.0.0": { "sha512": "h3j/QfmFN4S0w4C2A6X7arXij/M/OVw3uQHSOFxnND4DyAzO1F9eMX7Eti7lU/OkSthEE0WzRsfT/Dmx86jzCw==", "type": "package", @@ -874,6 +966,7 @@ "projectFileDependencyGroups": { "net7.0": [ "Microsoft.Extensions.Caching.Memory >= 7.0.0", + "Microsoft.Extensions.Configuration.Binder >= 7.0.4", "System.DirectoryServices >= 7.0.1", "System.DirectoryServices.AccountManagement >= 7.0.1" ] @@ -935,6 +1028,10 @@ "target": "Package", "version": "[7.0.0, )" }, + "Microsoft.Extensions.Configuration.Binder": { + "target": "Package", + "version": "[7.0.4, )" + }, "System.DirectoryServices": { "target": "Package", "version": "[7.0.1, )" diff --git a/DigitalData.Core.Contracts/obj/project.nuget.cache b/DigitalData.Core.Contracts/obj/project.nuget.cache index ca4c317..3753790 100644 --- a/DigitalData.Core.Contracts/obj/project.nuget.cache +++ b/DigitalData.Core.Contracts/obj/project.nuget.cache @@ -1,11 +1,13 @@ { "version": 2, - "dgSpecHash": "y0XesY12OIMQ6WgP5zto/kK6nOUBaNEsWBTfSX8HCGXA1+93y6Y0Qxsd3MEmsDK/jOU1QAUsO82rlpsZgYItqQ==", + "dgSpecHash": "Bo0GMV4+098EZ6xKCtpEGyIM8bwdVpp3GyRxUsWNYFp7byC9SMrAxFv275vfPARua9vB1UoRbkM+iJ2MO8Tk0Q==", "success": true, "projectFilePath": "E:\\TekH\\Visual Studio\\WebCoreModules\\DigitalData.Core.Contracts\\DigitalData.Core.Contracts.csproj", "expectedPackageFiles": [ "C:\\Users\\tekh\\.nuget\\packages\\microsoft.extensions.caching.abstractions\\7.0.0\\microsoft.extensions.caching.abstractions.7.0.0.nupkg.sha512", "C:\\Users\\tekh\\.nuget\\packages\\microsoft.extensions.caching.memory\\7.0.0\\microsoft.extensions.caching.memory.7.0.0.nupkg.sha512", + "C:\\Users\\tekh\\.nuget\\packages\\microsoft.extensions.configuration.abstractions\\7.0.0\\microsoft.extensions.configuration.abstractions.7.0.0.nupkg.sha512", + "C:\\Users\\tekh\\.nuget\\packages\\microsoft.extensions.configuration.binder\\7.0.4\\microsoft.extensions.configuration.binder.7.0.4.nupkg.sha512", "C:\\Users\\tekh\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\7.0.0\\microsoft.extensions.dependencyinjection.abstractions.7.0.0.nupkg.sha512", "C:\\Users\\tekh\\.nuget\\packages\\microsoft.extensions.logging.abstractions\\7.0.0\\microsoft.extensions.logging.abstractions.7.0.0.nupkg.sha512", "C:\\Users\\tekh\\.nuget\\packages\\microsoft.extensions.options\\7.0.0\\microsoft.extensions.options.7.0.0.nupkg.sha512", diff --git a/DigitalData.Core.CultureServices/bin/Debug/net7.0/DigitalData.Core.Contracts.dll b/DigitalData.Core.CultureServices/bin/Debug/net7.0/DigitalData.Core.Contracts.dll index c33f4c9..69c77f7 100644 Binary files a/DigitalData.Core.CultureServices/bin/Debug/net7.0/DigitalData.Core.Contracts.dll and b/DigitalData.Core.CultureServices/bin/Debug/net7.0/DigitalData.Core.Contracts.dll differ diff --git a/DigitalData.Core.CultureServices/bin/Debug/net7.0/DigitalData.Core.Contracts.pdb b/DigitalData.Core.CultureServices/bin/Debug/net7.0/DigitalData.Core.Contracts.pdb index 67c5524..150a0c5 100644 Binary files a/DigitalData.Core.CultureServices/bin/Debug/net7.0/DigitalData.Core.Contracts.pdb and b/DigitalData.Core.CultureServices/bin/Debug/net7.0/DigitalData.Core.Contracts.pdb differ diff --git a/DigitalData.Core.CultureServices/bin/Debug/net7.0/DigitalData.Core.CultureServices.deps.json b/DigitalData.Core.CultureServices/bin/Debug/net7.0/DigitalData.Core.CultureServices.deps.json index e6134b3..eb2849d 100644 --- a/DigitalData.Core.CultureServices/bin/Debug/net7.0/DigitalData.Core.CultureServices.deps.json +++ b/DigitalData.Core.CultureServices/bin/Debug/net7.0/DigitalData.Core.CultureServices.deps.json @@ -41,6 +41,28 @@ } } }, + "Microsoft.Extensions.Configuration.Abstractions/7.0.0": { + "dependencies": { + "Microsoft.Extensions.Primitives": "7.0.0" + }, + "runtime": { + "lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll": { + "assemblyVersion": "7.0.0.0", + "fileVersion": "7.0.22.51805" + } + } + }, + "Microsoft.Extensions.Configuration.Binder/7.0.4": { + "dependencies": { + "Microsoft.Extensions.Configuration.Abstractions": "7.0.0" + }, + "runtime": { + "lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll": { + "assemblyVersion": "7.0.0.0", + "fileVersion": "7.0.423.11508" + } + } + }, "Microsoft.Extensions.DependencyInjection.Abstractions/7.0.0": { "runtime": { "lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll": { @@ -286,6 +308,7 @@ "DigitalData.Core.Contracts/1.0.0": { "dependencies": { "Microsoft.Extensions.Caching.Memory": "7.0.0", + "Microsoft.Extensions.Configuration.Binder": "7.0.4", "System.DirectoryServices": "7.0.1", "System.DirectoryServices.AccountManagement": "7.0.1" }, @@ -315,6 +338,20 @@ "path": "microsoft.extensions.caching.memory/7.0.0", "hashPath": "microsoft.extensions.caching.memory.7.0.0.nupkg.sha512" }, + "Microsoft.Extensions.Configuration.Abstractions/7.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-f34u2eaqIjNO9YLHBz8rozVZ+TcFiFs0F3r7nUJd7FRkVSxk8u4OpoK226mi49MwexHOR2ibP9MFvRUaLilcQQ==", + "path": "microsoft.extensions.configuration.abstractions/7.0.0", + "hashPath": "microsoft.extensions.configuration.abstractions.7.0.0.nupkg.sha512" + }, + "Microsoft.Extensions.Configuration.Binder/7.0.4": { + "type": "package", + "serviceable": true, + "sha512": "sha512-8+XPvJnHZsYgHOQlcMuQe7QNF5KdVKHH1F/wW3nd8/u81Gk/XFAYMDP0Lpz18h7/AM95M662vvqMorcYxCBB4w==", + "path": "microsoft.extensions.configuration.binder/7.0.4", + "hashPath": "microsoft.extensions.configuration.binder.7.0.4.nupkg.sha512" + }, "Microsoft.Extensions.DependencyInjection.Abstractions/7.0.0": { "type": "package", "serviceable": true, diff --git a/DigitalData.Core.CultureServices/bin/Debug/net7.0/DigitalData.Core.CultureServices.dll b/DigitalData.Core.CultureServices/bin/Debug/net7.0/DigitalData.Core.CultureServices.dll index b6f367d..61d4fe7 100644 Binary files a/DigitalData.Core.CultureServices/bin/Debug/net7.0/DigitalData.Core.CultureServices.dll and b/DigitalData.Core.CultureServices/bin/Debug/net7.0/DigitalData.Core.CultureServices.dll differ diff --git a/DigitalData.Core.CultureServices/bin/Debug/net7.0/DigitalData.Core.CultureServices.pdb b/DigitalData.Core.CultureServices/bin/Debug/net7.0/DigitalData.Core.CultureServices.pdb index 51e1d78..ce20ba0 100644 Binary files a/DigitalData.Core.CultureServices/bin/Debug/net7.0/DigitalData.Core.CultureServices.pdb and b/DigitalData.Core.CultureServices/bin/Debug/net7.0/DigitalData.Core.CultureServices.pdb differ diff --git a/DigitalData.Core.CultureServices/obj/Debug/net7.0/DigitalData.Core.CultureServices.assets.cache b/DigitalData.Core.CultureServices/obj/Debug/net7.0/DigitalData.Core.CultureServices.assets.cache index f39e458..25c1efa 100644 Binary files a/DigitalData.Core.CultureServices/obj/Debug/net7.0/DigitalData.Core.CultureServices.assets.cache and b/DigitalData.Core.CultureServices/obj/Debug/net7.0/DigitalData.Core.CultureServices.assets.cache differ diff --git a/DigitalData.Core.CultureServices/obj/Debug/net7.0/DigitalData.Core.CultureServices.csproj.AssemblyReference.cache b/DigitalData.Core.CultureServices/obj/Debug/net7.0/DigitalData.Core.CultureServices.csproj.AssemblyReference.cache index c2a3639..07df2c2 100644 Binary files a/DigitalData.Core.CultureServices/obj/Debug/net7.0/DigitalData.Core.CultureServices.csproj.AssemblyReference.cache and b/DigitalData.Core.CultureServices/obj/Debug/net7.0/DigitalData.Core.CultureServices.csproj.AssemblyReference.cache differ diff --git a/DigitalData.Core.CultureServices/obj/Debug/net7.0/DigitalData.Core.CultureServices.csproj.CoreCompileInputs.cache b/DigitalData.Core.CultureServices/obj/Debug/net7.0/DigitalData.Core.CultureServices.csproj.CoreCompileInputs.cache index c6cae86..e7776e8 100644 --- a/DigitalData.Core.CultureServices/obj/Debug/net7.0/DigitalData.Core.CultureServices.csproj.CoreCompileInputs.cache +++ b/DigitalData.Core.CultureServices/obj/Debug/net7.0/DigitalData.Core.CultureServices.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -507e6d14925dcab1aab513eb91f7f6a4dd734ffb +f8996802f3751e1293f50e00a54ca9ae30cf49f4 diff --git a/DigitalData.Core.CultureServices/obj/Debug/net7.0/DigitalData.Core.CultureServices.dll b/DigitalData.Core.CultureServices/obj/Debug/net7.0/DigitalData.Core.CultureServices.dll index b6f367d..61d4fe7 100644 Binary files a/DigitalData.Core.CultureServices/obj/Debug/net7.0/DigitalData.Core.CultureServices.dll and b/DigitalData.Core.CultureServices/obj/Debug/net7.0/DigitalData.Core.CultureServices.dll differ diff --git a/DigitalData.Core.CultureServices/obj/Debug/net7.0/DigitalData.Core.CultureServices.pdb b/DigitalData.Core.CultureServices/obj/Debug/net7.0/DigitalData.Core.CultureServices.pdb index 51e1d78..ce20ba0 100644 Binary files a/DigitalData.Core.CultureServices/obj/Debug/net7.0/DigitalData.Core.CultureServices.pdb and b/DigitalData.Core.CultureServices/obj/Debug/net7.0/DigitalData.Core.CultureServices.pdb differ diff --git a/DigitalData.Core.CultureServices/obj/DigitalData.Core.CultureServices.csproj.nuget.dgspec.json b/DigitalData.Core.CultureServices/obj/DigitalData.Core.CultureServices.csproj.nuget.dgspec.json index 0af8348..071ad71 100644 --- a/DigitalData.Core.CultureServices/obj/DigitalData.Core.CultureServices.csproj.nuget.dgspec.json +++ b/DigitalData.Core.CultureServices/obj/DigitalData.Core.CultureServices.csproj.nuget.dgspec.json @@ -55,6 +55,10 @@ "target": "Package", "version": "[7.0.0, )" }, + "Microsoft.Extensions.Configuration.Binder": { + "target": "Package", + "version": "[7.0.4, )" + }, "System.DirectoryServices": { "target": "Package", "version": "[7.0.1, )" diff --git a/DigitalData.Core.CultureServices/obj/project.assets.json b/DigitalData.Core.CultureServices/obj/project.assets.json index 87b5ed6..0706521 100644 --- a/DigitalData.Core.CultureServices/obj/project.assets.json +++ b/DigitalData.Core.CultureServices/obj/project.assets.json @@ -44,6 +44,44 @@ "buildTransitive/net6.0/_._": {} } }, + "Microsoft.Extensions.Configuration.Abstractions/7.0.0": { + "type": "package", + "dependencies": { + "Microsoft.Extensions.Primitives": "7.0.0" + }, + "compile": { + "lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll": { + "related": ".xml" + } + }, + "build": { + "buildTransitive/net6.0/_._": {} + } + }, + "Microsoft.Extensions.Configuration.Binder/7.0.4": { + "type": "package", + "dependencies": { + "Microsoft.Extensions.Configuration.Abstractions": "7.0.0" + }, + "compile": { + "lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll": { + "related": ".xml" + } + }, + "build": { + "buildTransitive/net6.0/_._": {} + } + }, "Microsoft.Extensions.DependencyInjection.Abstractions/7.0.0": { "type": "package", "compile": { @@ -388,6 +426,7 @@ "framework": ".NETCoreApp,Version=v7.0", "dependencies": { "Microsoft.Extensions.Caching.Memory": "7.0.0", + "Microsoft.Extensions.Configuration.Binder": "7.0.4", "System.DirectoryServices": "7.0.1", "System.DirectoryServices.AccountManagement": "7.0.1" }, @@ -455,6 +494,60 @@ "useSharedDesignerContext.txt" ] }, + "Microsoft.Extensions.Configuration.Abstractions/7.0.0": { + "sha512": "f34u2eaqIjNO9YLHBz8rozVZ+TcFiFs0F3r7nUJd7FRkVSxk8u4OpoK226mi49MwexHOR2ibP9MFvRUaLilcQQ==", + "type": "package", + "path": "microsoft.extensions.configuration.abstractions/7.0.0", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "Icon.png", + "LICENSE.TXT", + "THIRD-PARTY-NOTICES.TXT", + "buildTransitive/net461/Microsoft.Extensions.Configuration.Abstractions.targets", + "buildTransitive/net462/_._", + "buildTransitive/net6.0/_._", + "buildTransitive/netcoreapp2.0/Microsoft.Extensions.Configuration.Abstractions.targets", + "lib/net462/Microsoft.Extensions.Configuration.Abstractions.dll", + "lib/net462/Microsoft.Extensions.Configuration.Abstractions.xml", + "lib/net6.0/Microsoft.Extensions.Configuration.Abstractions.dll", + "lib/net6.0/Microsoft.Extensions.Configuration.Abstractions.xml", + "lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll", + "lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.xml", + "lib/netstandard2.0/Microsoft.Extensions.Configuration.Abstractions.dll", + "lib/netstandard2.0/Microsoft.Extensions.Configuration.Abstractions.xml", + "microsoft.extensions.configuration.abstractions.7.0.0.nupkg.sha512", + "microsoft.extensions.configuration.abstractions.nuspec", + "useSharedDesignerContext.txt" + ] + }, + "Microsoft.Extensions.Configuration.Binder/7.0.4": { + "sha512": "8+XPvJnHZsYgHOQlcMuQe7QNF5KdVKHH1F/wW3nd8/u81Gk/XFAYMDP0Lpz18h7/AM95M662vvqMorcYxCBB4w==", + "type": "package", + "path": "microsoft.extensions.configuration.binder/7.0.4", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "Icon.png", + "LICENSE.TXT", + "THIRD-PARTY-NOTICES.TXT", + "buildTransitive/net461/Microsoft.Extensions.Configuration.Binder.targets", + "buildTransitive/net462/_._", + "buildTransitive/net6.0/_._", + "buildTransitive/netcoreapp2.0/Microsoft.Extensions.Configuration.Binder.targets", + "lib/net462/Microsoft.Extensions.Configuration.Binder.dll", + "lib/net462/Microsoft.Extensions.Configuration.Binder.xml", + "lib/net6.0/Microsoft.Extensions.Configuration.Binder.dll", + "lib/net6.0/Microsoft.Extensions.Configuration.Binder.xml", + "lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll", + "lib/net7.0/Microsoft.Extensions.Configuration.Binder.xml", + "lib/netstandard2.0/Microsoft.Extensions.Configuration.Binder.dll", + "lib/netstandard2.0/Microsoft.Extensions.Configuration.Binder.xml", + "microsoft.extensions.configuration.binder.7.0.4.nupkg.sha512", + "microsoft.extensions.configuration.binder.nuspec", + "useSharedDesignerContext.txt" + ] + }, "Microsoft.Extensions.DependencyInjection.Abstractions/7.0.0": { "sha512": "h3j/QfmFN4S0w4C2A6X7arXij/M/OVw3uQHSOFxnND4DyAzO1F9eMX7Eti7lU/OkSthEE0WzRsfT/Dmx86jzCw==", "type": "package", diff --git a/DigitalData.Core.CultureServices/obj/project.nuget.cache b/DigitalData.Core.CultureServices/obj/project.nuget.cache index e4ee4ba..da253c6 100644 --- a/DigitalData.Core.CultureServices/obj/project.nuget.cache +++ b/DigitalData.Core.CultureServices/obj/project.nuget.cache @@ -1,11 +1,13 @@ { "version": 2, - "dgSpecHash": "JQ7Dzvu7qxYCByorsmbD7yTigZWondYJ8pphjnS9isF5Q12FJUZoRHqB1h6zqQpQ7CyJ3ZNZyVkl5miDOJzwSQ==", + "dgSpecHash": "a8AKMkoUr/m82ydRrnH1BzZD7YyQjZhfTMxf28TSQu3I8mviY9tlURZNTHpNANWoZ9lFZiOpYo0iPY5eggjAFg==", "success": true, "projectFilePath": "E:\\TekH\\Visual Studio\\WebCoreModules\\DigitalData.Core.CultureServices\\DigitalData.Core.CultureServices.csproj", "expectedPackageFiles": [ "C:\\Users\\tekh\\.nuget\\packages\\microsoft.extensions.caching.abstractions\\7.0.0\\microsoft.extensions.caching.abstractions.7.0.0.nupkg.sha512", "C:\\Users\\tekh\\.nuget\\packages\\microsoft.extensions.caching.memory\\7.0.0\\microsoft.extensions.caching.memory.7.0.0.nupkg.sha512", + "C:\\Users\\tekh\\.nuget\\packages\\microsoft.extensions.configuration.abstractions\\7.0.0\\microsoft.extensions.configuration.abstractions.7.0.0.nupkg.sha512", + "C:\\Users\\tekh\\.nuget\\packages\\microsoft.extensions.configuration.binder\\7.0.4\\microsoft.extensions.configuration.binder.7.0.4.nupkg.sha512", "C:\\Users\\tekh\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\7.0.0\\microsoft.extensions.dependencyinjection.abstractions.7.0.0.nupkg.sha512", "C:\\Users\\tekh\\.nuget\\packages\\microsoft.extensions.localization\\7.0.16\\microsoft.extensions.localization.7.0.16.nupkg.sha512", "C:\\Users\\tekh\\.nuget\\packages\\microsoft.extensions.localization.abstractions\\7.0.16\\microsoft.extensions.localization.abstractions.7.0.16.nupkg.sha512", diff --git a/DigitalData.Core.Infrastructure/bin/Debug/net7.0/DigitalData.Core.Contracts.dll b/DigitalData.Core.Infrastructure/bin/Debug/net7.0/DigitalData.Core.Contracts.dll index c33f4c9..69c77f7 100644 Binary files a/DigitalData.Core.Infrastructure/bin/Debug/net7.0/DigitalData.Core.Contracts.dll and b/DigitalData.Core.Infrastructure/bin/Debug/net7.0/DigitalData.Core.Contracts.dll differ diff --git a/DigitalData.Core.Infrastructure/bin/Debug/net7.0/DigitalData.Core.Contracts.pdb b/DigitalData.Core.Infrastructure/bin/Debug/net7.0/DigitalData.Core.Contracts.pdb index 67c5524..150a0c5 100644 Binary files a/DigitalData.Core.Infrastructure/bin/Debug/net7.0/DigitalData.Core.Contracts.pdb and b/DigitalData.Core.Infrastructure/bin/Debug/net7.0/DigitalData.Core.Contracts.pdb differ diff --git a/DigitalData.Core.Infrastructure/bin/Debug/net7.0/DigitalData.Core.Infrastructure.deps.json b/DigitalData.Core.Infrastructure/bin/Debug/net7.0/DigitalData.Core.Infrastructure.deps.json index 16feb5f..c50fac8 100644 --- a/DigitalData.Core.Infrastructure/bin/Debug/net7.0/DigitalData.Core.Infrastructure.deps.json +++ b/DigitalData.Core.Infrastructure/bin/Debug/net7.0/DigitalData.Core.Infrastructure.deps.json @@ -65,6 +65,28 @@ } } }, + "Microsoft.Extensions.Configuration.Abstractions/7.0.0": { + "dependencies": { + "Microsoft.Extensions.Primitives": "7.0.0" + }, + "runtime": { + "lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll": { + "assemblyVersion": "7.0.0.0", + "fileVersion": "7.0.22.51805" + } + } + }, + "Microsoft.Extensions.Configuration.Binder/7.0.4": { + "dependencies": { + "Microsoft.Extensions.Configuration.Abstractions": "7.0.0" + }, + "runtime": { + "lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll": { + "assemblyVersion": "7.0.0.0", + "fileVersion": "7.0.423.11508" + } + } + }, "Microsoft.Extensions.DependencyInjection/7.0.0": { "dependencies": { "Microsoft.Extensions.DependencyInjection.Abstractions": "7.0.0" @@ -313,6 +335,7 @@ "DigitalData.Core.Contracts/1.0.0": { "dependencies": { "Microsoft.Extensions.Caching.Memory": "7.0.0", + "Microsoft.Extensions.Configuration.Binder": "7.0.4", "System.DirectoryServices": "7.0.1", "System.DirectoryServices.AccountManagement": "7.0.1" }, @@ -363,6 +386,20 @@ "path": "microsoft.extensions.caching.memory/7.0.0", "hashPath": "microsoft.extensions.caching.memory.7.0.0.nupkg.sha512" }, + "Microsoft.Extensions.Configuration.Abstractions/7.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-f34u2eaqIjNO9YLHBz8rozVZ+TcFiFs0F3r7nUJd7FRkVSxk8u4OpoK226mi49MwexHOR2ibP9MFvRUaLilcQQ==", + "path": "microsoft.extensions.configuration.abstractions/7.0.0", + "hashPath": "microsoft.extensions.configuration.abstractions.7.0.0.nupkg.sha512" + }, + "Microsoft.Extensions.Configuration.Binder/7.0.4": { + "type": "package", + "serviceable": true, + "sha512": "sha512-8+XPvJnHZsYgHOQlcMuQe7QNF5KdVKHH1F/wW3nd8/u81Gk/XFAYMDP0Lpz18h7/AM95M662vvqMorcYxCBB4w==", + "path": "microsoft.extensions.configuration.binder/7.0.4", + "hashPath": "microsoft.extensions.configuration.binder.7.0.4.nupkg.sha512" + }, "Microsoft.Extensions.DependencyInjection/7.0.0": { "type": "package", "serviceable": true, diff --git a/DigitalData.Core.Infrastructure/bin/Debug/net7.0/DigitalData.Core.Infrastructure.dll b/DigitalData.Core.Infrastructure/bin/Debug/net7.0/DigitalData.Core.Infrastructure.dll index bcef5b3..5f7fd36 100644 Binary files a/DigitalData.Core.Infrastructure/bin/Debug/net7.0/DigitalData.Core.Infrastructure.dll and b/DigitalData.Core.Infrastructure/bin/Debug/net7.0/DigitalData.Core.Infrastructure.dll differ diff --git a/DigitalData.Core.Infrastructure/bin/Debug/net7.0/DigitalData.Core.Infrastructure.pdb b/DigitalData.Core.Infrastructure/bin/Debug/net7.0/DigitalData.Core.Infrastructure.pdb index aec9770..55fd2b1 100644 Binary files a/DigitalData.Core.Infrastructure/bin/Debug/net7.0/DigitalData.Core.Infrastructure.pdb and b/DigitalData.Core.Infrastructure/bin/Debug/net7.0/DigitalData.Core.Infrastructure.pdb differ diff --git a/DigitalData.Core.Infrastructure/obj/Debug/net7.0/DigitalData.Core.Infrastructure.assets.cache b/DigitalData.Core.Infrastructure/obj/Debug/net7.0/DigitalData.Core.Infrastructure.assets.cache index 95d230c..0695b85 100644 Binary files a/DigitalData.Core.Infrastructure/obj/Debug/net7.0/DigitalData.Core.Infrastructure.assets.cache and b/DigitalData.Core.Infrastructure/obj/Debug/net7.0/DigitalData.Core.Infrastructure.assets.cache differ diff --git a/DigitalData.Core.Infrastructure/obj/Debug/net7.0/DigitalData.Core.Infrastructure.csproj.AssemblyReference.cache b/DigitalData.Core.Infrastructure/obj/Debug/net7.0/DigitalData.Core.Infrastructure.csproj.AssemblyReference.cache index b2c6a81..0189761 100644 Binary files a/DigitalData.Core.Infrastructure/obj/Debug/net7.0/DigitalData.Core.Infrastructure.csproj.AssemblyReference.cache and b/DigitalData.Core.Infrastructure/obj/Debug/net7.0/DigitalData.Core.Infrastructure.csproj.AssemblyReference.cache differ diff --git a/DigitalData.Core.Infrastructure/obj/Debug/net7.0/DigitalData.Core.Infrastructure.csproj.CoreCompileInputs.cache b/DigitalData.Core.Infrastructure/obj/Debug/net7.0/DigitalData.Core.Infrastructure.csproj.CoreCompileInputs.cache index 19d725e..1de5f8c 100644 --- a/DigitalData.Core.Infrastructure/obj/Debug/net7.0/DigitalData.Core.Infrastructure.csproj.CoreCompileInputs.cache +++ b/DigitalData.Core.Infrastructure/obj/Debug/net7.0/DigitalData.Core.Infrastructure.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -f1edde7cb138085467ea6ef11e51dc4c31822f4e +19cfb64ff12718c2f8b2102b5e5dbe4a6a7ed0af diff --git a/DigitalData.Core.Infrastructure/obj/Debug/net7.0/DigitalData.Core.Infrastructure.dll b/DigitalData.Core.Infrastructure/obj/Debug/net7.0/DigitalData.Core.Infrastructure.dll index bcef5b3..5f7fd36 100644 Binary files a/DigitalData.Core.Infrastructure/obj/Debug/net7.0/DigitalData.Core.Infrastructure.dll and b/DigitalData.Core.Infrastructure/obj/Debug/net7.0/DigitalData.Core.Infrastructure.dll differ diff --git a/DigitalData.Core.Infrastructure/obj/Debug/net7.0/DigitalData.Core.Infrastructure.pdb b/DigitalData.Core.Infrastructure/obj/Debug/net7.0/DigitalData.Core.Infrastructure.pdb index aec9770..55fd2b1 100644 Binary files a/DigitalData.Core.Infrastructure/obj/Debug/net7.0/DigitalData.Core.Infrastructure.pdb and b/DigitalData.Core.Infrastructure/obj/Debug/net7.0/DigitalData.Core.Infrastructure.pdb differ diff --git a/DigitalData.Core.Infrastructure/obj/DigitalData.Core.Infrastructure.csproj.nuget.dgspec.json b/DigitalData.Core.Infrastructure/obj/DigitalData.Core.Infrastructure.csproj.nuget.dgspec.json index c389bdc..213c42f 100644 --- a/DigitalData.Core.Infrastructure/obj/DigitalData.Core.Infrastructure.csproj.nuget.dgspec.json +++ b/DigitalData.Core.Infrastructure/obj/DigitalData.Core.Infrastructure.csproj.nuget.dgspec.json @@ -55,6 +55,10 @@ "target": "Package", "version": "[7.0.0, )" }, + "Microsoft.Extensions.Configuration.Binder": { + "target": "Package", + "version": "[7.0.4, )" + }, "System.DirectoryServices": { "target": "Package", "version": "[7.0.1, )" diff --git a/DigitalData.Core.Infrastructure/obj/project.assets.json b/DigitalData.Core.Infrastructure/obj/project.assets.json index cdf938b..6a33ad6 100644 --- a/DigitalData.Core.Infrastructure/obj/project.assets.json +++ b/DigitalData.Core.Infrastructure/obj/project.assets.json @@ -89,6 +89,44 @@ "buildTransitive/net6.0/_._": {} } }, + "Microsoft.Extensions.Configuration.Abstractions/7.0.0": { + "type": "package", + "dependencies": { + "Microsoft.Extensions.Primitives": "7.0.0" + }, + "compile": { + "lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll": { + "related": ".xml" + } + }, + "build": { + "buildTransitive/net6.0/_._": {} + } + }, + "Microsoft.Extensions.Configuration.Binder/7.0.4": { + "type": "package", + "dependencies": { + "Microsoft.Extensions.Configuration.Abstractions": "7.0.0" + }, + "compile": { + "lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll": { + "related": ".xml" + } + }, + "build": { + "buildTransitive/net6.0/_._": {} + } + }, "Microsoft.Extensions.DependencyInjection/7.0.0": { "type": "package", "dependencies": { @@ -442,6 +480,7 @@ "framework": ".NETCoreApp,Version=v7.0", "dependencies": { "Microsoft.Extensions.Caching.Memory": "7.0.0", + "Microsoft.Extensions.Configuration.Binder": "7.0.4", "System.DirectoryServices": "7.0.1", "System.DirectoryServices.AccountManagement": "7.0.1" }, @@ -552,6 +591,60 @@ "useSharedDesignerContext.txt" ] }, + "Microsoft.Extensions.Configuration.Abstractions/7.0.0": { + "sha512": "f34u2eaqIjNO9YLHBz8rozVZ+TcFiFs0F3r7nUJd7FRkVSxk8u4OpoK226mi49MwexHOR2ibP9MFvRUaLilcQQ==", + "type": "package", + "path": "microsoft.extensions.configuration.abstractions/7.0.0", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "Icon.png", + "LICENSE.TXT", + "THIRD-PARTY-NOTICES.TXT", + "buildTransitive/net461/Microsoft.Extensions.Configuration.Abstractions.targets", + "buildTransitive/net462/_._", + "buildTransitive/net6.0/_._", + "buildTransitive/netcoreapp2.0/Microsoft.Extensions.Configuration.Abstractions.targets", + "lib/net462/Microsoft.Extensions.Configuration.Abstractions.dll", + "lib/net462/Microsoft.Extensions.Configuration.Abstractions.xml", + "lib/net6.0/Microsoft.Extensions.Configuration.Abstractions.dll", + "lib/net6.0/Microsoft.Extensions.Configuration.Abstractions.xml", + "lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll", + "lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.xml", + "lib/netstandard2.0/Microsoft.Extensions.Configuration.Abstractions.dll", + "lib/netstandard2.0/Microsoft.Extensions.Configuration.Abstractions.xml", + "microsoft.extensions.configuration.abstractions.7.0.0.nupkg.sha512", + "microsoft.extensions.configuration.abstractions.nuspec", + "useSharedDesignerContext.txt" + ] + }, + "Microsoft.Extensions.Configuration.Binder/7.0.4": { + "sha512": "8+XPvJnHZsYgHOQlcMuQe7QNF5KdVKHH1F/wW3nd8/u81Gk/XFAYMDP0Lpz18h7/AM95M662vvqMorcYxCBB4w==", + "type": "package", + "path": "microsoft.extensions.configuration.binder/7.0.4", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "Icon.png", + "LICENSE.TXT", + "THIRD-PARTY-NOTICES.TXT", + "buildTransitive/net461/Microsoft.Extensions.Configuration.Binder.targets", + "buildTransitive/net462/_._", + "buildTransitive/net6.0/_._", + "buildTransitive/netcoreapp2.0/Microsoft.Extensions.Configuration.Binder.targets", + "lib/net462/Microsoft.Extensions.Configuration.Binder.dll", + "lib/net462/Microsoft.Extensions.Configuration.Binder.xml", + "lib/net6.0/Microsoft.Extensions.Configuration.Binder.dll", + "lib/net6.0/Microsoft.Extensions.Configuration.Binder.xml", + "lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll", + "lib/net7.0/Microsoft.Extensions.Configuration.Binder.xml", + "lib/netstandard2.0/Microsoft.Extensions.Configuration.Binder.dll", + "lib/netstandard2.0/Microsoft.Extensions.Configuration.Binder.xml", + "microsoft.extensions.configuration.binder.7.0.4.nupkg.sha512", + "microsoft.extensions.configuration.binder.nuspec", + "useSharedDesignerContext.txt" + ] + }, "Microsoft.Extensions.DependencyInjection/7.0.0": { "sha512": "elNeOmkeX3eDVG6pYVeV82p29hr+UKDaBhrZyWvWLw/EVZSYEkZlQdkp0V39k/Xehs2Qa0mvoCvkVj3eQxNQ1Q==", "type": "package", diff --git a/DigitalData.Core.Infrastructure/obj/project.nuget.cache b/DigitalData.Core.Infrastructure/obj/project.nuget.cache index e6f6825..182c125 100644 --- a/DigitalData.Core.Infrastructure/obj/project.nuget.cache +++ b/DigitalData.Core.Infrastructure/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "CeCKKzTjrJRkbJIw3Hrot0TmT7MDp02rLY2CHBsWKGW/lc3sykhUFb23p4rT1bGy+0tF5CKYxoC09wGroHHAEg==", + "dgSpecHash": "22zo+6pKCiYoACA2XaIimHdjjp7cVZmc9VmpBIPbFNGVSap82iqUzwBYE0FnEcHTylh9gt/E1IWsOa48puxfFw==", "success": true, "projectFilePath": "E:\\TekH\\Visual Studio\\WebCoreModules\\DigitalData.Core.Infrastructure\\DigitalData.Core.Infrastructure.csproj", "expectedPackageFiles": [ @@ -9,6 +9,8 @@ "C:\\Users\\tekh\\.nuget\\packages\\microsoft.entityframeworkcore.analyzers\\7.0.16\\microsoft.entityframeworkcore.analyzers.7.0.16.nupkg.sha512", "C:\\Users\\tekh\\.nuget\\packages\\microsoft.extensions.caching.abstractions\\7.0.0\\microsoft.extensions.caching.abstractions.7.0.0.nupkg.sha512", "C:\\Users\\tekh\\.nuget\\packages\\microsoft.extensions.caching.memory\\7.0.0\\microsoft.extensions.caching.memory.7.0.0.nupkg.sha512", + "C:\\Users\\tekh\\.nuget\\packages\\microsoft.extensions.configuration.abstractions\\7.0.0\\microsoft.extensions.configuration.abstractions.7.0.0.nupkg.sha512", + "C:\\Users\\tekh\\.nuget\\packages\\microsoft.extensions.configuration.binder\\7.0.4\\microsoft.extensions.configuration.binder.7.0.4.nupkg.sha512", "C:\\Users\\tekh\\.nuget\\packages\\microsoft.extensions.dependencyinjection\\7.0.0\\microsoft.extensions.dependencyinjection.7.0.0.nupkg.sha512", "C:\\Users\\tekh\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\7.0.0\\microsoft.extensions.dependencyinjection.abstractions.7.0.0.nupkg.sha512", "C:\\Users\\tekh\\.nuget\\packages\\microsoft.extensions.logging\\7.0.0\\microsoft.extensions.logging.7.0.0.nupkg.sha512",