Merge branch 'main' into users/shaopeng-gh/reportdialect

microsoft · Sep 2, 2021 · d3f357b · d3f357b
2 parents e8156db + 386006b
commit d3f357b
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 0 deletions.
diff --git a/refs/runtime/msvcp140.dll b/refs/runtime/msvcp140.dll
diff --git a/refs/runtime/msvcp140_1.dll b/refs/runtime/msvcp140_1.dll
diff --git a/refs/runtime/msvcp140_2.dll b/refs/runtime/msvcp140_2.dll
diff --git a/refs/runtime/vcruntime140.dll b/refs/runtime/vcruntime140.dll
diff --git a/refs/runtime/vcruntime140_1.dll b/refs/runtime/vcruntime140_1.dll
diff --git a/src/BinSkim.Driver/BinSkim.Driver.csproj b/src/BinSkim.Driver/BinSkim.Driver.csproj
@@ -71,12 +71,17 @@
     <!-- Note: Official Release builds on Windows should specify a RID. Build using the BuildAndTest.cmd script. -->
     <MsDiaLibs Include="..\..\refs\x64\*" Condition="'$(RuntimeIdentifier)'=='win-x64'" />
     <MsDiaLibs Include="..\..\refs\msdia140.dll.manifest" />
+
+    <!-- Required DLLs for Microsoft Visual C++ runtime. -->
+    <MsRuntime Include="..\..\refs\runtime\*" />
   </ItemGroup>
 
   <Target Name="CopyMsDiaLibs" AfterTargets="build">
     <Copy SourceFiles="@(MsDiaLibs)" DestinationFolder="$(OutputPath)\" />
+    <Copy SourceFiles="@(MsRuntime)" DestinationFolder="$(OutputPath)\" />    
   </Target>
   <Target Name="PublishMsDiaLibs" AfterTargets="publish">
     <Copy SourceFiles="@(MsDiaLibs)" DestinationFolder="$(PublishDir)\" />
+    <Copy SourceFiles="@(MsRuntime)" DestinationFolder="$(PublishDir)\" />
   </Target>
 </Project>
diff --git a/src/ReleaseHistory.md b/src/ReleaseHistory.md
@@ -6,6 +6,7 @@
 * BUGFIX: Fix exception `System.AccessViolationException` caused by trying to read data out of boundary. [#470](https://github.com/microsoft/binskim/pull/470)
 * BUGFIX: Fix exception handling when PDB cannot be loaded by `IDiaDataSource`. [#461](https://github.com/microsoft/binskim/pull/461)
 * BREAKING: PDB exceptions will be reported once per target. [#465](https://github.com/microsoft/binskim/pull/465)
+* BUGFIX: Include C++ runtime in the package to prevent `DllNotFoundException` when loading `msdia140.dll`. [#474](https://github.com/microsoft/binskim/pull/474)
 
 ## **v1.9.0-prerelease1** [NuGet Package](https://www.nuget.org/packages/Microsoft.CodeAnalysis.BinSkim/1.9.0-prerelease1)