Skip to content

Commit

Permalink
Update dependencies + Build .NET 8 version (#706)
Browse files Browse the repository at this point in the history
* Update dependencies + Build .NET 8 version

* Dependencies
  • Loading branch information
gfs authored Nov 30, 2023
1 parent acb21da commit f3d089d
Show file tree
Hide file tree
Showing 9 changed files with 34 additions and 38 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: '7.x'
dotnet-version: '8.x'
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: '6.x'
dotnet-version: '8.x'
- name: Install chocolatey
run: Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))
- name: Install docfx
Expand Down
4 changes: 2 additions & 2 deletions AttackSurfaceAnalyzer.sln
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.28803.452
# Visual Studio Version 17
VisualStudioVersion = 17.8.34316.72
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0E30E3FA-AECD-4BF3-9EAA-9D6C16D5E991}"
ProjectSection(SolutionItems) = preProject
Expand Down
2 changes: 1 addition & 1 deletion Benchmarks/Benchmarks.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.13.9" />
<PackageReference Include="BenchmarkDotNet" Version="0.13.10" />
<PackageReference Include="System.Data.SQLite" Version="1.0.118" />
<PackageReference Include="murmurhash" Version="1.0.3" />
</ItemGroup>
Expand Down
12 changes: 6 additions & 6 deletions Cli/Cli.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<PackageIcon>icon-128.png</PackageIcon>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand All @@ -37,11 +37,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.7.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.7.0" />
<PackageReference Include="Microsoft.CST.OAT.Blazor.Components" Version="1.2.54" />
<PackageReference Include="Microsoft.CST.OAT.Scripting" Version="1.2.54" />
<PackageReference Include="Sarif.Sdk" Version="4.3.4" />
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.8.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
<PackageReference Include="Microsoft.CST.OAT.Blazor.Components" Version="1.2.56" />
<PackageReference Include="Microsoft.CST.OAT.Scripting" Version="1.2.56" />
<PackageReference Include="Sarif.Sdk" Version="4.3.7" />
<PackageReference Include="Tewr.Blazor.FileReader" Version="3.3.2.23201" />
</ItemGroup>
</Project>
26 changes: 13 additions & 13 deletions Lib/Lib.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<ReleaseVersion>2.1-alpha</ReleaseVersion>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
</PropertyGroup>

<Target Name="CopyLicenseNotice" AfterTargets="AfterBuild">
Expand All @@ -35,26 +35,26 @@

<ItemGroup>
<PackageReference Include="MedallionShell" Version="1.6.2" />
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.7.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.7.0" />
<PackageReference Include="Microsoft.CST.OAT" Version="1.2.54" />
<PackageReference Include="Microsoft.CST.RecursiveExtractor" Version="1.2.20" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
<PackageReference Include="Microsoft.Data.Sqlite" Version="7.0.12" />
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.8.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
<PackageReference Include="Microsoft.CST.OAT" Version="1.2.56" />
<PackageReference Include="Microsoft.CST.RecursiveExtractor" Version="1.2.21" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.Data.Sqlite" Version="8.0.0" />
<PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.5" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="8.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Serilog" Version="3.0.1" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
<PackageReference Include="Serilog" Version="3.1.1" />
<PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
<PackageReference Include="System.Diagnostics.Process" Version="4.3.0" />
<PackageReference Include="System.Management" Version="7.0.2" />
<PackageReference Include="System.Management" Version="8.0.0" />
<PackageReference Include="System.Net.NetworkInformation" Version="4.3.0" />
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="7.0.0" />
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="8.0.0" />
<PackageReference Include="System.Runtime" Version="4.3.1" />
<PackageReference Include="System.Security.AccessControl" Version="6.0.0" />
<PackageReference Include="System.Threading.AccessControl" Version="7.0.1" />
<PackageReference Include="System.Threading.AccessControl" Version="8.0.0" />
<PackageReference Include="System.Net.Security" Version="4.3.2" />
<PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
<PackageReference Include="WindowsFirewallHelper" Version="2.2.0.86" />
Expand Down
10 changes: 4 additions & 6 deletions Pipelines/asa-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,12 @@ resources:
- repository: templates
type: git
name: SecurityEngineering/OSS-Tools-Pipeline-Templates
ref: refs/tags/v1.0.7
ref: refs/tags/v1.1.0

variables:
BuildConfiguration: 'Release'
DotnetVersion: '7.0.x'
DotnetVersionLTS: '6.0.x'
DotnetTargetFramework: 'net7.0'
DotnetVersion: '8.0.x'
DotnetTargetFramework: 'net8.0'

stages:
- stage: Test
Expand All @@ -37,8 +36,7 @@ stages:
- template: dotnet-test-job.yml@templates
parameters:
jobName: 'dotnet_test_windows'
dotnetVersion: ${{ variables.DotnetVersion }}
dotnetVersionLTS: ${{ variables.DotnetVersionLTS }}
dotnetVersions: ['6.0.x','7.0.x','8.0.x']
vmImage: 'oss-tools-win2022_1es-managed'
projectPath: 'Tests/Tests.csproj'

Expand Down
10 changes: 4 additions & 6 deletions Pipelines/asa-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,12 @@ resources:
- repository: templates
type: git
name: SecurityEngineering/OSS-Tools-Pipeline-Templates
ref: refs/tags/v1.0.7
ref: refs/tags/v1.1.0

variables:
BuildConfiguration: 'Release'
DotnetVersion: '7.0.x'
DotnetVersionLTS: '6.0.x'
DotnetTargetFramework: 'net7.0'
DotnetVersion: '8.0.x'
DotnetTargetFramework: 'net8.0'

stages:
- stage: Test
Expand All @@ -35,8 +34,7 @@ stages:
- template: dotnet-test-job.yml@templates
parameters:
jobName: 'dotnet_test_windows'
dotnetVersion: ${{ variables.DotnetVersion }}
dotnetVersionLTS: ${{ variables.DotnetVersionLTS }}
dotnetVersions: ['6.0.x','7.0.x','8.0.x']
vmImage: 'oss-tools-win2022_1es-managed'
projectPath: 'Tests/Tests.csproj'

Expand Down
4 changes: 2 additions & 2 deletions Tests/Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<IsPackable>false</IsPackable>
<AssemblyName>AsaTests</AssemblyName>
<ReleaseVersion>0.0.0-placeholder</ReleaseVersion>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand All @@ -13,7 +13,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
<PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
</ItemGroup>
Expand Down

0 comments on commit f3d089d

Please sign in to comment.