diff --git a/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj b/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj
index 83a118e940de06..1590c8de8b423d 100644
--- a/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj
+++ b/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj
@@ -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.
diff --git a/src/libraries/System.DirectoryServices/src/System/DirectoryServices/DirectorySearcher.cs b/src/libraries/System.DirectoryServices/src/System/DirectoryServices/DirectorySearcher.cs
index 1ef524342a3357..37f2018d70bc67 100644
--- a/src/libraries/System.DirectoryServices/src/System/DirectoryServices/DirectorySearcher.cs
+++ b/src/libraries/System.DirectoryServices/src/System/DirectoryServices/DirectorySearcher.cs
@@ -607,6 +607,8 @@ public DirectoryVirtualListView? VirtualListView
 
         private SearchResultCollection FindAll(bool findMoreThanOne)
         {
+            searchResult = null;
+
             DirectoryEntry clonedRoot = SearchRoot!.CloneBrowsable();
 
             UnsafeNativeMethods.IAds adsObject = clonedRoot.AdsObject;
@@ -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)