Skip to content

Commit

Permalink
Fix DEP and ASLR Rules (#656)
Browse files Browse the repository at this point in the history
* Remove stray debugging print.

* Removed unused dependency.

* Update Dependencies

Fix #655
  • Loading branch information
gfs authored Jun 22, 2022
1 parent 7c5be27 commit 297d2a9
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 27 deletions.
6 changes: 3 additions & 3 deletions Benchmarks/Benchmarks.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
<PackageReference Include="LiteDB" Version="5.0.11" />
<PackageReference Include="System.Data.SQLite" Version="1.0.115.5" />
<PackageReference Include="LiteDB" Version="5.0.12" />
<PackageReference Include="System.Data.SQLite" Version="1.0.116" />
<PackageReference Include="murmurhash" Version="1.0.3" />
</ItemGroup>

Expand All @@ -25,6 +25,6 @@
<None Include="BenchmarkDotNet.Artifacts\OldResults\AttackSurfaceAnalyzer.Benchmarks.LiteDbInsertTests-report-full.json" />
</ItemGroup>
<ItemGroup>
<PackageReference Update="Nerdbank.GitVersioning" Version="3.4.255" />
<PackageReference Update="Nerdbank.GitVersioning" Version="3.5.107" />
</ItemGroup>
</Project>
4 changes: 0 additions & 4 deletions Cli/AttackSurfaceAnalyzerClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1180,10 +1180,6 @@ public static List<BaseCompare> GetComparators()
{
if (c.Results[key] is IEnumerable<CompareResult> queue)
{
if (queue.Any(x => x is null))
{
Console.WriteLine("found em");
}
IEnumerable<AsaRule> platformRules = opts.AnalysesFile.Rules.Where(rule => rule.Platforms == null || rule.Platforms.Contains(platform));
if (opts.SingleThreadAnalysis)
{
Expand Down
12 changes: 6 additions & 6 deletions Cli/Cli.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.1.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.1.0" />
<PackageReference Include="Microsoft.CST.OAT.Blazor.Components" Version="1.2.6" />
<PackageReference Include="Microsoft.CST.OAT.Scripting" Version="1.2.6" />
<PackageReference Include="Sarif.Sdk" Version="2.4.12" />
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.2.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.2.0" />
<PackageReference Include="Microsoft.CST.OAT.Blazor.Components" Version="1.2.16" />
<PackageReference Include="Microsoft.CST.OAT.Scripting" Version="1.2.16" />
<PackageReference Include="Sarif.Sdk" Version="2.4.15" />
<PackageReference Include="Tewr.Blazor.FileReader" Version="3.3.1.21360" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="Nerdbank.GitVersioning" Version="3.4.255" />
<PackageReference Update="Nerdbank.GitVersioning" Version="3.5.107" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<PackageReference Include="Nerdbank.GitVersioning">
<Version>3.4.231</Version>
<Version>3.5.107</Version>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>
Expand Down
19 changes: 9 additions & 10 deletions Lib/Lib.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,17 @@

<ItemGroup>
<PackageReference Include="MedallionShell" Version="1.6.2" />
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.1.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.1.0" />
<PackageReference Include="Microsoft.CST.OAT" Version="1.2.6" />
<PackageReference Include="Microsoft.CST.RecursiveExtractor" Version="1.1.9" />
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.2.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.2.0" />
<PackageReference Include="Microsoft.CST.OAT" Version="1.2.16" />
<PackageReference Include="Microsoft.CST.RecursiveExtractor" Version="1.1.11" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
<PackageReference Include="Microsoft.Data.Sqlite" Version="6.0.2" />
<PackageReference Include="Microsoft.PowerShell.Commands.Diagnostics" Version="7.2.1" />
<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.2.1" />
<PackageReference Include="Microsoft.Data.Sqlite" Version="6.0.6" />
<PackageReference Include="Microsoft.PowerShell.Commands.Diagnostics" Version="7.2.5" />
<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.2.5" />
<PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0" />
<PackageReference Include="Serilog" Version="2.10.0" />
<PackageReference Include="Serilog" Version="2.11.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
<PackageReference Include="System.Diagnostics.Process" Version="4.3.0" />
Expand All @@ -58,13 +58,12 @@
<PackageReference Include="System.Threading.AccessControl" Version="6.0.0" />
<PackageReference Include="System.Net.Security" Version="4.3.2" />
<PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
<PackageReference Include="Serilog.Sinks.ApplicationInsights" Version="3.1.0" />
<PackageReference Include="Nerdbank.GitVersioning" Version="3.4.255">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="WindowsFirewallHelper" Version="2.2.0.86" />
<PackageReference Include="CommandLineParser" Version="2.8.0" />
<PackageReference Include="CommandLineParser" Version="2.9.1" />
<PackageReference Include="sqlite" Version="3.13.0" />
<PackageReference Include="Microsoft.TSS" Version="2.1.1" />
<PackageReference Include="PeNet" Version="2.9.7" />
Expand Down
6 changes: 3 additions & 3 deletions Tests/Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageReference Include="MSTest.TestAdapter" Version="2.2.8" />
<PackageReference Include="MSTest.TestFramework" Version="2.2.8" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
<PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
<PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
</ItemGroup>

<ItemGroup>
Expand Down

0 comments on commit 297d2a9

Please sign in to comment.