Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

[release/7.0] Put back setting of field in DirectorySearcher.FindAll #79192

Merged
merged 2 commits into from
Jan 5, 2023
Merged

[release/7.0] Put back setting of field in DirectorySearcher.FindAll #79192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
406e759
Put back setting of field in DirectorySearcher.FindAll
stephentoub Dec 1, 2022
d11c7a9
OOB package changes.
carlossanlop Jan 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
CA1846: Prefer 'AsSpan' over 'Substring' when span-based overloads are available -->
<NoWarn>$(NoWarn);CA1845;CA1846;IDE0059;CA1822</NoWarn>
<IsPackable>true</IsPackable>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<ServicingVersion>1</ServicingVersion>
<AddNETFrameworkPlaceholderFileToPackage>true</AddNETFrameworkPlaceholderFileToPackage>
<AddNETFrameworkAssemblyReferenceToPackage>true</AddNETFrameworkAssemblyReferenceToPackage>
<PackageDescription>Provides easy access to Active Directory Domain Services.
Expand Down
6 changes: 5 additions & 1 deletion src/libraries/System.DirectoryServices/src/System/DirectoryServices/DirectorySearcher.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,6 +607,8 @@ public DirectoryVirtualListView? VirtualListView

private SearchResultCollection FindAll(bool findMoreThanOne)
{
searchResult = null;

DirectoryEntry clonedRoot = SearchRoot!.CloneBrowsable();

UnsafeNativeMethods.IAds adsObject = clonedRoot.AdsObject;
Expand Down Expand Up @@ -650,7 +652,9 @@ private SearchResultCollection FindAll(bool findMoreThanOne)
properties = Array.Empty<string>();
}

return new SearchResultCollection(clonedRoot, resultsHandle, properties, this);
SearchResultCollection result = new SearchResultCollection(clonedRoot, resultsHandle, properties, this);
searchResult = result;
return result;
}

private unsafe void SetSearchPreferences(UnsafeNativeMethods.IDirectorySearch adsSearch, bool findMoreThanOne)
Expand Down