Fix regression bugs

Author: MichaelGrafnetter

Src/DSInternals.Common.Test/Cryptography/GPPrefPwdObfuscatorTester.cs

@@ -32,7 +32,7 @@ public void GPPrefPwdObfuscator_Decrypt_NullInput()
     [TestMethod]
     public void GPPrefPwdObfuscator_Decrypt_EmptyInput()
     {
-        Assert.ThrowsExactly<ArgumentNullException>(() => GPPrefPwdObfuscator.Decrypt(String.Empty));
+        Assert.ThrowsExactly<ArgumentException>(() => GPPrefPwdObfuscator.Decrypt(String.Empty));
     }
     [TestMethod]
     public void GPPrefPwdObfuscator_Encrypt_Test1()

Src/DSInternals.Common.Test/DNWithBinaryTester.cs

@@ -24,7 +24,7 @@ public void DNWithBinary_NullInput()
     [TestMethod]
     public void DNWithBinary_EmptyInput()
     {
-        Assert.ThrowsExactly<ArgumentNullException>(() => DNWithBinary.Parse(String.Empty));
+        Assert.ThrowsExactly<ArgumentException>(() => DNWithBinary.Parse(String.Empty));
     }
 
     [TestMethod]

Src/DSInternals.Common/Cryptography/Asn1/asn.xslt

@@ -53,7 +53,10 @@ public bool FindString(string query)
                 break;
             }
 
-            switch (String.Compare(line, 0, query, 0, query.Length, StringComparison.OrdinalIgnoreCase))
+            int compareResult = string.Compare(line, 0, query, 0, query.Length, StringComparison.OrdinalIgnoreCase);
+
+            // In .NET Core, OrdinalIgnoreCase comparison might return values other than -1, 0, or 1.
+            switch (Math.Sign(compareResult))
             {
                 case -1:
                     // Continue with the right half

Src/DSInternals.Common/Cryptography/SortedFileSearcher.cs

@@ -67,7 +67,7 @@
   </ItemGroup>
 
   <!-- Bundle the platform-specific DSInternals.Replication.Interop libraries and Visual C and C++ runtimes -->
-  <Target Name="CopyInteropLibraries" AfterTargets="Build">
+  <Target Name="CopyInteropLibraries" AfterTargets="PostBuildEvent">
     <PropertyGroup>
       <ReplicationInteropRootDir>$(ArtifactsPath)\bin\DSInternals.Replication.Interop\$(Configuration.ToLower())_$(TargetFramework)\</ReplicationInteropRootDir>
     </PropertyGroup>
@@ -99,7 +99,7 @@
   </Target>
 
   <!-- Remove platform-specific files from the AnyCPU root -->
-  <Target Name="RemoveRootInteropDll" AfterTargets="Build">
+  <Target Name="RemoveRootInteropDll" AfterTargets="PostBuildEvent">
     <!-- Remove DSInternals.Replication.Interop DLL and PDB from module root. Only keep it in the architecture-specific subdirectories. -->
     <Delete Files="$(OutDir)DSInternals.Replication.Interop.dll" />
     <Delete Files="$(OutDir)DSInternals.Replication.Interop.pdb" />

Src/DSInternals.PowerShell/DSInternals.PowerShell.csproj

@@ -15,9 +15,12 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <Midl Include="$(MSBuildThisFileDirectory)drsr.idl">
+      <!-- MIDL compilation randomly fails and causes build errors. -->
+      <!-- When this starts happening, the file can temporarily be excluded from compilation. -->
       <ExcludedFromBuild>false</ExcludedFromBuild>
     </Midl>
     <Midl Include="$(MSBuildThisFileDirectory)drsr_imports.idl">
+      <!-- This file should never be compiled by MIDL directly. It should only be imported into drsr.idl. -->
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </Midl>
   </ItemGroup>
@@ -60,4 +63,4 @@
   <ItemGroup>
     <ResourceCompile Include="$(MSBuildThisFileDirectory)version.rc" />
   </ItemGroup>
-</Project>
+</Project>

Src/DSInternals.Replication.Interop/DSInternals.Replication.Interop.Shared.vcxitems

@@ -113,20 +113,19 @@ public void LsaPolicy_LsaRetrievePrivateData_Existing()
     [TestMethod]
     public void LsaPolicy_LsaRetrievePrivateData_NonExisting()
     {
-        Assert.ThrowsExactly<FileNotFoundException>(() =>
+        try
         {
-            try
+            using (var policy = new LsaPolicy(LsaPolicyAccessMask.GetPrivateInformation))
             {
-                using (var policy = new LsaPolicy(LsaPolicyAccessMask.GetPrivateInformation))
-                {
+                Assert.ThrowsExactly<FileNotFoundException>(() => {
                     policy.RetrievePrivateData("bflmpsvz");
-                }
+                });
             }
-            catch (UnauthorizedAccessException e)
-            {
-                // This is expected.
-                throw new AssertInconclusiveException("LSA-related tests require admin rights.", e);
-            }
-        });
+        }
+        catch (UnauthorizedAccessException e)
+        {
+            // This is expected.
+            throw new AssertInconclusiveException("LSA-related tests require admin rights.", e);
+        }
     }
 }