diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 9fa9d2c1..91855a95 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -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: diff --git a/.github/workflows/publish-docs.yml b/.github/workflows/publish-docs.yml index 6b27f82d..301baf0a 100644 --- a/.github/workflows/publish-docs.yml +++ b/.github/workflows/publish-docs.yml @@ -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 diff --git a/AttackSurfaceAnalyzer.sln b/AttackSurfaceAnalyzer.sln index 52952301..d906e816 100644 --- a/AttackSurfaceAnalyzer.sln +++ b/AttackSurfaceAnalyzer.sln @@ -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 diff --git a/Benchmarks/Benchmarks.csproj b/Benchmarks/Benchmarks.csproj index 19e4764e..aaa5aa1c 100644 --- a/Benchmarks/Benchmarks.csproj +++ b/Benchmarks/Benchmarks.csproj @@ -9,7 +9,7 @@ - + diff --git a/Cli/Cli.csproj b/Cli/Cli.csproj index f9fb6072..d5794e3f 100644 --- a/Cli/Cli.csproj +++ b/Cli/Cli.csproj @@ -24,7 +24,7 @@ icon-128.png true snupkg - net6.0;net7.0 + net6.0;net7.0;net8.0 @@ -37,11 +37,11 @@ - - - - - + + + + + diff --git a/Lib/Lib.csproj b/Lib/Lib.csproj index 6fa22ba8..af3d44d2 100644 --- a/Lib/Lib.csproj +++ b/Lib/Lib.csproj @@ -21,7 +21,7 @@ snupkg true 2.1-alpha - net6.0;net7.0 + net6.0;net7.0;net8.0 @@ -35,26 +35,26 @@ - - - - - - + + + + + + - + - - + + - + - + - + diff --git a/Pipelines/asa-pr.yml b/Pipelines/asa-pr.yml index 0cb488e8..fc2602c7 100644 --- a/Pipelines/asa-pr.yml +++ b/Pipelines/asa-pr.yml @@ -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 @@ -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' diff --git a/Pipelines/asa-release.yml b/Pipelines/asa-release.yml index 5809c6ac..dab0a894 100644 --- a/Pipelines/asa-release.yml +++ b/Pipelines/asa-release.yml @@ -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 @@ -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' diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj index 7eb99ed5..dcb67dc9 100644 --- a/Tests/Tests.csproj +++ b/Tests/Tests.csproj @@ -4,7 +4,7 @@ false AsaTests 0.0.0-placeholder - net6.0;net7.0 + net6.0;net7.0;net8.0 @@ -13,7 +13,7 @@ - +