Skip to content

Commit

Permalink
Fix #2062: LGTM "could not build merge commit" (#2067)
Browse files Browse the repository at this point in the history
* Fix LGTM by adding new Multitool library project to CodeQL solution.

* Add explicit reference to newtonsoft JSON package.

Co-authored-by: Larry Golding <lgolding@comcast.net>
Co-authored-by: Michael Fanning <mikefan@microsoft.com>
  • Loading branch information
3 people committed Sep 29, 2020
1 parent 2e3a11e commit eb9d7f2
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 0 deletions.
1 change: 1 addition & 0 deletions src/Sarif.Multitool.Library/Sarif.Multitool.Library.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
<PackageReference Include="Microsoft.Json.Pointer" Version="1.1.2" />
</ItemGroup>

Expand Down
14 changes: 14 additions & 0 deletions src/Sarif.Sdk.CodeQL.sln
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sarif.WorkItems", "Sarif.Wo
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkItems", "WorkItems\WorkItems.csproj", "{175F37F3-E94B-4B4F-AA46-F0BF272CBD74}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sarif.Multitool.Library", "Sarif.Multitool.Library\Sarif.Multitool.Library.csproj", "{4A60ED16-36B4-435E-88A4-36B39CC6DFD7}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -99,6 +101,18 @@ Global
{175F37F3-E94B-4B4F-AA46-F0BF272CBD74}.Release|x64.Build.0 = Release|Any CPU
{175F37F3-E94B-4B4F-AA46-F0BF272CBD74}.Release|x86.ActiveCfg = Release|Any CPU
{175F37F3-E94B-4B4F-AA46-F0BF272CBD74}.Release|x86.Build.0 = Release|Any CPU
{4A60ED16-36B4-435E-88A4-36B39CC6DFD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4A60ED16-36B4-435E-88A4-36B39CC6DFD7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4A60ED16-36B4-435E-88A4-36B39CC6DFD7}.Debug|x64.ActiveCfg = Debug|Any CPU
{4A60ED16-36B4-435E-88A4-36B39CC6DFD7}.Debug|x64.Build.0 = Debug|Any CPU
{4A60ED16-36B4-435E-88A4-36B39CC6DFD7}.Debug|x86.ActiveCfg = Debug|Any CPU
{4A60ED16-36B4-435E-88A4-36B39CC6DFD7}.Debug|x86.Build.0 = Debug|Any CPU
{4A60ED16-36B4-435E-88A4-36B39CC6DFD7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4A60ED16-36B4-435E-88A4-36B39CC6DFD7}.Release|Any CPU.Build.0 = Release|Any CPU
{4A60ED16-36B4-435E-88A4-36B39CC6DFD7}.Release|x64.ActiveCfg = Release|Any CPU
{4A60ED16-36B4-435E-88A4-36B39CC6DFD7}.Release|x64.Build.0 = Release|Any CPU
{4A60ED16-36B4-435E-88A4-36B39CC6DFD7}.Release|x86.ActiveCfg = Release|Any CPU
{4A60ED16-36B4-435E-88A4-36B39CC6DFD7}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down

0 comments on commit eb9d7f2

Please sign in to comment.