From 0cf0bc8a94bf3be000081a7e42ec030471aa99b5 Mon Sep 17 00:00:00 2001 From: Shaopeng <81775155+shaopeng-gh@users.noreply.github.com> Date: Fri, 8 Dec 2023 12:25:37 -0800 Subject: [PATCH] Fix build error after update the SDK submodule in BinSkim (#915) * Fix update Submodule error * Update to Latest SDK * Update Release History * Fix casing for Dia2Lib * Format Release History Update `Sarif.Sdk` submodule --- NuGet.Config | 6 ++++++ ReleaseHistory.md | 7 ++++--- refs/{dia2lib.dll => Dia2Lib.dll} | Bin src/BinSkim.Driver/BinSkim.Driver.csproj | 4 ++-- src/BinSkim.Rules/BinSkim.Rules.csproj | 4 ++-- src/BinaryParsers/BinaryParsers.csproj | 16 +++++++++++++--- .../Test.UnitTests.BinaryParsers.csproj | 2 +- src/packages/.gitkeep | 0 src/sarif-sdk | 2 +- 9 files changed, 29 insertions(+), 12 deletions(-) create mode 100644 NuGet.Config rename refs/{dia2lib.dll => Dia2Lib.dll} (100%) create mode 100644 src/packages/.gitkeep diff --git a/NuGet.Config b/NuGet.Config new file mode 100644 index 000000000..ddd058c7b --- /dev/null +++ b/NuGet.Config @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/ReleaseHistory.md b/ReleaseHistory.md index e48c54946..6a659c1f1 100644 --- a/ReleaseHistory.md +++ b/ReleaseHistory.md @@ -16,6 +16,7 @@ - NEW => new feature ## UNRELEASED +* DEP: Update `Sarif.Sdk` submodule from [bc8cb57 to fd6e615](https://github.com/microsoft/sarif-sdk/compare/bc8cb57...fd6e615). Reference [SARIF SDK Release History](https://github.com/microsoft/sarif-sdk/blob/fd6e615/ReleaseHistory.md). ## **v4.2.1** * FPS: `BA2004.EnableSecureSourceCodeHashing` now will no longer generate false positives on precompiled headers, they are always without hash. [#965](https://github.com/microsoft/binskim/pull/965) @@ -39,7 +40,7 @@ * NEW: Support `SymbolPath`, `LocalSymbolDirectories`, `IgnorePdbLoadError` option when using config file, in addtion to passing as command line parameters. [#944](https://github.com/microsoft/binskim/pull/944) ## **v4.1.0** -* DEP: Update Sarif.Sdk submodule from [120fae3 to bc8cb57](https://github.com/microsoft/sarif-sdk/compare/120fae3...bc8cb57). Full [SARIF SDK Release History](https://github.com/microsoft/sarif-sdk/blob/bc8cb57/ReleaseHistory.md). +* DEP: Update `Sarif.Sdk` submodule from [120fae3 to bc8cb57](https://github.com/microsoft/sarif-sdk/compare/120fae3...bc8cb57). Reference [SARIF SDK Release History](https://github.com/microsoft/sarif-sdk/blob/bc8cb57/ReleaseHistory.md). * DEP: Upgrade ELFSharp from 2.16.1 to 2.17.1. [#872](https://github.com/microsoft/binskim/pull/872) * BRK: Remove `--verbose` command-line option (in favor of `--level` and `--kind`). [#853](https://github.com/microsoft/binskim/pull/853) * BRK: Remove `--hashes` command-line option (in favor of `--insert Hashes`). [#853](https://github.com/microsoft/binskim/pull/853) @@ -53,7 +54,7 @@ * NEW: `CompilerInformation` telemetry now emits the last modified date of the PDB associated with the analyzed binary. [#871](https://github.com/microsoft/binskim/pull/871) ## **v4.0.0** -* DEP: Update Sarif.Sdk submodule from [fc9a9df to 2d52c53](https://github.com/microsoft/sarif-sdk/compare/fc9a9df...2d52c53). Full [SARIF SDK Release History](https://github.com/microsoft/sarif-sdk/blob/2d52c53/ReleaseHistory.md). +* DEP: Update `Sarif.Sdk` submodule from [fc9a9df to 2d52c53](https://github.com/microsoft/sarif-sdk/compare/fc9a9df...2d52c53). Reference [SARIF SDK Release History](https://github.com/microsoft/sarif-sdk/blob/2d52c53/ReleaseHistory.md). * DEP: Upgrade `Elfsharp.2.16.0` to `Elfsharp.2.16.1`[#791](https://github.com/microsoft/binskim/pull/791) * DEP: Upgrade BinSkim to .net6.0 as .net core 3.1 reached end of support on 12/13/2022. * DEP: Upgrade `Newtonsoft.JSON` package to 13.0.2 to resolve security alert. @@ -78,7 +79,7 @@ ## **v1.9.5** [NuGet Package](https://www.nuget.org/packages/Microsoft.CodeAnalysis.BinSkim/1.9.5) * DEP: Upgrade ELFSharp from 2.14.0 to 2.15.0. [#631](https://github.com/microsoft/binskim/pull/631) * DEP: Upgrade System.Reflection.Metadata from 5.0.0 to 6.0.1 and System.Collections.Immutable from 5.0.0 to 6.0.0. [#605](https://github.com/microsoft/binskim/pull/605) -* DEP: Upgrade Sarif.Sdk by updating submodule from [4e9f606 to fc9a9df](https://github.com/microsoft/sarif-sdk/compare/4e9f606bb0e88428866e253352cdc70dc68f98cb...fc9a9dfb865096b5aaa9fa3651854670940f7459). [#638](https://github.com/microsoft/binskim/pull/638) +* DEP: Update `Sarif.Sdk` submodule from [4e9f606 to fc9a9df](https://github.com/microsoft/sarif-sdk/compare/4e9f606...fc9a9df). Reference [SARIF SDK Release History](https://github.com/microsoft/sarif-sdk/blob/fc9a9df/ReleaseHistory.md). * NEW: Enable BinSkim for MacOS. [#576](https://github.com/microsoft/binskim/pull/576) * FPR: Skip `BA2025.EnableShadowStack` rule for ARM Binaries which cannot use `/CETCOMPAT`. [#650](https://github.com/microsoft/binskim/pull/650) * BUG: Fix missing `commandLineId` from `CommandLineInformation` event. [#652](https://github.com/microsoft/binskim/pull/652) diff --git a/refs/dia2lib.dll b/refs/Dia2Lib.dll similarity index 100% rename from refs/dia2lib.dll rename to refs/Dia2Lib.dll diff --git a/src/BinSkim.Driver/BinSkim.Driver.csproj b/src/BinSkim.Driver/BinSkim.Driver.csproj index 5743500bc..80e725f07 100644 --- a/src/BinSkim.Driver/BinSkim.Driver.csproj +++ b/src/BinSkim.Driver/BinSkim.Driver.csproj @@ -35,8 +35,8 @@ - - ..\..\refs\dia2lib.dll + + ..\..\refs\Dia2Lib.dll False diff --git a/src/BinSkim.Rules/BinSkim.Rules.csproj b/src/BinSkim.Rules/BinSkim.Rules.csproj index 1b0bd8287..4bb6e4a8b 100644 --- a/src/BinSkim.Rules/BinSkim.Rules.csproj +++ b/src/BinSkim.Rules/BinSkim.Rules.csproj @@ -9,8 +9,8 @@ - - ..\..\refs\dia2lib.dll + + ..\..\refs\Dia2Lib.dll False diff --git a/src/BinaryParsers/BinaryParsers.csproj b/src/BinaryParsers/BinaryParsers.csproj index 1fac8fab5..9b49224a3 100644 --- a/src/BinaryParsers/BinaryParsers.csproj +++ b/src/BinaryParsers/BinaryParsers.csproj @@ -21,8 +21,8 @@ - - ..\..\refs\dia2lib.dll + + ..\..\refs\Dia2Lib.dll False @@ -43,4 +43,14 @@ - + + + echo Copying file from "$(MSBuildProjectDirectory)\..\..\refs\Dia2Lib.dll" to "$(MSBuildProjectDirectory)\..\..\src\packages\microsoft.diagnostics.tracing.traceevent\3.1.3\lib\netstandard2.0\" + copy "$(MSBuildProjectDirectory)\..\..\refs\Dia2Lib.dll" "$(MSBuildProjectDirectory)\..\..\src\packages\microsoft.diagnostics.tracing.traceevent\3.1.3\lib\netstandard2.0\" + + + echo Copying file from "$(MSBuildProjectDirectory)\..\..\refs\Dia2Lib.dll" to "$(MSBuildProjectDirectory)\..\..\src\packages\microsoft.diagnostics.tracing.traceevent\3.1.3\lib\netstandard2.0\" + cp -f "$(MSBuildProjectDirectory)\..\..\refs\Dia2Lib.dll" "$(MSBuildProjectDirectory)\..\..\src\packages\microsoft.diagnostics.tracing.traceevent\3.1.3\lib\netstandard2.0\" + + + \ No newline at end of file diff --git a/src/Test.UnitTests.BinaryParsers/Test.UnitTests.BinaryParsers.csproj b/src/Test.UnitTests.BinaryParsers/Test.UnitTests.BinaryParsers.csproj index 4fa310f56..7bf3be0c9 100644 --- a/src/Test.UnitTests.BinaryParsers/Test.UnitTests.BinaryParsers.csproj +++ b/src/Test.UnitTests.BinaryParsers/Test.UnitTests.BinaryParsers.csproj @@ -28,7 +28,7 @@ - ..\..\refs\dia2lib.dll + ..\..\refs\Dia2Lib.dll diff --git a/src/packages/.gitkeep b/src/packages/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/src/sarif-sdk b/src/sarif-sdk index bc8cb578c..fd6e61588 160000 --- a/src/sarif-sdk +++ b/src/sarif-sdk @@ -1 +1 @@ -Subproject commit bc8cb578c3d020f927f0db9118ecab46f4bb257b +Subproject commit fd6e6158856bffce610068549ae41082bd23dc16