diff --git a/Changelog.md b/Changelog.md index 360101e6..50c868da 100644 --- a/Changelog.md +++ b/Changelog.md @@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [1.0.52] - 2024-12-09 +## Dependencies +Updates Dependencies + +## .Net Targets +CLI now targets .NET 8.0 and .NET 9.0, .NET 6.0/7.0 targeting removed. DevSkim Library component retains .Net Standard 2.1 support. + ## [1.0.51] - 2024-12-09 ## Fix Fix confidence filtering at rule level. diff --git a/DevSkim-DotNet/Microsoft.DevSkim.CLI/Microsoft.DevSkim.CLI.csproj b/DevSkim-DotNet/Microsoft.DevSkim.CLI/Microsoft.DevSkim.CLI.csproj index b6df9215..b2835ba5 100644 --- a/DevSkim-DotNet/Microsoft.DevSkim.CLI/Microsoft.DevSkim.CLI.csproj +++ b/DevSkim-DotNet/Microsoft.DevSkim.CLI/Microsoft.DevSkim.CLI.csproj @@ -2,7 +2,7 @@ Exe - net6.0;net7.0;net8.0 + net8.0;net9.0 devskim Microsoft.DevSkim.CLI.Program win-x64;linux-x64;osx-x64 @@ -36,10 +36,13 @@ - - + + - + + + 3.7.115 + diff --git a/DevSkim-DotNet/Microsoft.DevSkim.LanguageProtoInterop/Microsoft.DevSkim.LanguageProtoInterop.csproj b/DevSkim-DotNet/Microsoft.DevSkim.LanguageProtoInterop/Microsoft.DevSkim.LanguageProtoInterop.csproj index 796694e2..73627dcd 100644 --- a/DevSkim-DotNet/Microsoft.DevSkim.LanguageProtoInterop/Microsoft.DevSkim.LanguageProtoInterop.csproj +++ b/DevSkim-DotNet/Microsoft.DevSkim.LanguageProtoInterop/Microsoft.DevSkim.LanguageProtoInterop.csproj @@ -8,6 +8,9 @@ + + 3.7.115 + diff --git a/DevSkim-DotNet/Microsoft.DevSkim.LanguageServer/Microsoft.DevSkim.LanguageServer.csproj b/DevSkim-DotNet/Microsoft.DevSkim.LanguageServer/Microsoft.DevSkim.LanguageServer.csproj index 5497a02d..f14044e9 100644 --- a/DevSkim-DotNet/Microsoft.DevSkim.LanguageServer/Microsoft.DevSkim.LanguageServer.csproj +++ b/DevSkim-DotNet/Microsoft.DevSkim.LanguageServer/Microsoft.DevSkim.LanguageServer.csproj @@ -5,7 +5,7 @@ enable enable DevSkim.LanguageServer - net6.0;net7.0;net8.0 + net8.0 MIT Microsoft © Microsoft Corporation. All rights reserved. @@ -13,11 +13,14 @@ - + - - - + + + + + 3.7.115 + diff --git a/DevSkim-DotNet/Microsoft.DevSkim.Tests/Microsoft.DevSkim.Tests.csproj b/DevSkim-DotNet/Microsoft.DevSkim.Tests/Microsoft.DevSkim.Tests.csproj index 5c7410e0..7c30e41d 100644 --- a/DevSkim-DotNet/Microsoft.DevSkim.Tests/Microsoft.DevSkim.Tests.csproj +++ b/DevSkim-DotNet/Microsoft.DevSkim.Tests/Microsoft.DevSkim.Tests.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0;net8.0 + net8.0;net9.0 enable enable @@ -9,9 +9,9 @@ - - - + + + diff --git a/DevSkim-DotNet/Microsoft.DevSkim.VisualStudio.SourceGenerator/Microsoft.DevSkim.VisualStudio.SourceGenerator.csproj b/DevSkim-DotNet/Microsoft.DevSkim.VisualStudio.SourceGenerator/Microsoft.DevSkim.VisualStudio.SourceGenerator.csproj index 22482531..f50e7bb4 100644 --- a/DevSkim-DotNet/Microsoft.DevSkim.VisualStudio.SourceGenerator/Microsoft.DevSkim.VisualStudio.SourceGenerator.csproj +++ b/DevSkim-DotNet/Microsoft.DevSkim.VisualStudio.SourceGenerator/Microsoft.DevSkim.VisualStudio.SourceGenerator.csproj @@ -13,7 +13,7 @@ - + diff --git a/DevSkim-DotNet/Microsoft.DevSkim.VisualStudio/Microsoft.DevSkim.VisualStudio.csproj b/DevSkim-DotNet/Microsoft.DevSkim.VisualStudio/Microsoft.DevSkim.VisualStudio.csproj index 09ab8330..c854bc42 100644 --- a/DevSkim-DotNet/Microsoft.DevSkim.VisualStudio/Microsoft.DevSkim.VisualStudio.csproj +++ b/DevSkim-DotNet/Microsoft.DevSkim.VisualStudio/Microsoft.DevSkim.VisualStudio.csproj @@ -85,17 +85,17 @@ - + - 17.9.46 + 17.12.48 17.2.8 - + compile; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/DevSkim-DotNet/Microsoft.DevSkim/Microsoft.DevSkim.csproj b/DevSkim-DotNet/Microsoft.DevSkim/Microsoft.DevSkim.csproj index b19d4d07..abd383f6 100644 --- a/DevSkim-DotNet/Microsoft.DevSkim/Microsoft.DevSkim.csproj +++ b/DevSkim-DotNet/Microsoft.DevSkim/Microsoft.DevSkim.csproj @@ -1,7 +1,7 @@ - netstandard2.1;net6.0;net7.0;net8.0 + netstandard2.1;net8.0;net9.0 Microsoft.CST.DevSkim 0.0.0 Security Linter @@ -24,8 +24,11 @@ - + + + 3.7.115 + diff --git a/DevSkim-VSCode-Plugin/package-lock.json b/DevSkim-VSCode-Plugin/package-lock.json index d7121fb1..db6f681a 100644 --- a/DevSkim-VSCode-Plugin/package-lock.json +++ b/DevSkim-VSCode-Plugin/package-lock.json @@ -3801,10 +3801,11 @@ "dev": true }, "node_modules/undici": { - "version": "6.21.0", - "resolved": "https://registry.npmjs.org/undici/-/undici-6.21.0.tgz", - "integrity": "sha512-BUgJXc752Kou3oOIuU1i+yZZypyZRqNPW0vqoMPl8VaoalSfeR0D8/t4iAS3yirs79SSMTxTag+ZC86uswv+Cw==", + "version": "6.21.1", + "resolved": "https://registry.npmjs.org/undici/-/undici-6.21.1.tgz", + "integrity": "sha512-q/1rj5D0/zayJB2FraXdaWxbhWiNKDvu8naDT2dl1yTlvJp4BLtOcp2a5BvgGNQpYYJzau7tf1WgKv3b+7mqpQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=18.17" } diff --git a/Directory.Build.props b/Directory.Build.props index f1cda77e..13e3fe75 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -2,7 +2,7 @@ - 3.6.133 + 3.7.115 all diff --git a/Pipelines/cli/devskim-cli-pr.yml b/Pipelines/cli/devskim-cli-pr.yml index 3334911b..9b7b271c 100644 --- a/Pipelines/cli/devskim-cli-pr.yml +++ b/Pipelines/cli/devskim-cli-pr.yml @@ -13,7 +13,7 @@ resources: - repository: templates type: git name: SecurityEngineering/OSS-Tools-Pipeline-Templates - ref: refs/tags/v2.0.0 + ref: refs/tags/v2.0.1 - repository: 1esPipelines type: git name: 1ESPipelineTemplates/1ESPipelineTemplates @@ -21,7 +21,7 @@ resources: variables: BuildConfiguration: 'Release' - DotnetVersion: '8.0.x' + DotnetVersion: '9.0.x' extends: template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines @@ -36,7 +36,7 @@ extends: - template: dotnet-test-job.yml@templates parameters: jobName: 'dotnet_test_windows' - dotnetVersions: ['6.0.x','7.0.x','8.0.x'] + dotnetVersions: ['8.0.x','9.0.x'] projectPath: 'DevSkim-DotNet/Microsoft.DevSkim.Tests/Microsoft.DevSkim.Tests.csproj' poolName: MSSecurity-1ES-Build-Agents-Pool poolImage: MSSecurity-1ES-Windows-2022 @@ -44,7 +44,7 @@ extends: - template: dotnet-test-job.yml@templates parameters: jobName: 'dotnet_test_ubuntu' - dotnetVersions: ['6.0.x','7.0.x','8.0.x'] + dotnetVersions: ['8.0.x','9.0.x'] poolName: MSSecurity-1ES-Build-Agents-Pool poolImage: MSSecurity-1ES-Ubuntu-2204 poolOs: linux diff --git a/Pipelines/cli/devskim-cli-release.yml b/Pipelines/cli/devskim-cli-release.yml index 7f707868..28a79d57 100644 --- a/Pipelines/cli/devskim-cli-release.yml +++ b/Pipelines/cli/devskim-cli-release.yml @@ -7,7 +7,7 @@ resources: - repository: templates type: git name: Data/OSS-Tools-Pipeline-Templates - ref: refs/tags/v2.0.0 + ref: refs/tags/v2.0.1 - repository: 1esPipelines type: git name: 1ESPipelineTemplates/1ESPipelineTemplates @@ -15,7 +15,7 @@ resources: variables: BuildConfiguration: 'Release' - DotnetVersion: '8.0.x' + DotnetVersion: '9.0.x' extends: template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines @@ -35,7 +35,7 @@ extends: - template: dotnet-test-job.yml@templates parameters: jobName: 'dotnet_test_windows' - dotnetVersions: ['6.0.x','7.0.x','8.0.x'] + dotnetVersions: ['8.0.x','9.0.x'] projectPath: 'DevSkim-DotNet/Microsoft.DevSkim.Tests/Microsoft.DevSkim.Tests.csproj' poolName: MSSecurity-1ES-Build-Agents-Pool poolImage: MSSecurity-1ES-Windows-2022 @@ -43,7 +43,7 @@ extends: - template: dotnet-test-job.yml@templates parameters: jobName: 'dotnet_test_ubuntu' - dotnetVersions: ['6.0.x','7.0.x','8.0.x'] + dotnetVersions: ['8.0.x','9.0.x'] poolName: MSSecurity-1ES-Build-Agents-Pool poolImage: MSSecurity-1ES-Ubuntu-2204 poolOs: linux diff --git a/Pipelines/vs/devskim-visualstudio-pr.yml b/Pipelines/vs/devskim-visualstudio-pr.yml index 3e51e2d2..a1746d42 100644 --- a/Pipelines/vs/devskim-visualstudio-pr.yml +++ b/Pipelines/vs/devskim-visualstudio-pr.yml @@ -13,7 +13,7 @@ resources: - repository: templates type: git name: SecurityEngineering/OSS-Tools-Pipeline-Templates - ref: refs/tags/v2.0.0 + ref: refs/tags/v2.0.1 - repository: 1esPipelines type: git name: 1ESPipelineTemplates/1ESPipelineTemplates @@ -46,14 +46,11 @@ extends: extraArtifactLocation: 'extension' preBuild: - template: nbgv-set-version-steps.yml@templates - # Workaround: Using the .NET 8 SDK doesn't install the right version of MSBuild for .NET 8 - # Using the .NET 7 SDK doesn't include the .NET 8 SDK so it can't build the project - # Install both for now until the right version of MSBuild is included with .NET 8 - task: UseDotNet@2 - displayName: Install Dotnet 7 SDK + displayName: Install Dotnet 9 SDK inputs: packageType: 'sdk' - version: '7.0.x' + version: '9.0.x' onEnd: - task: PowerShell@2 displayName: Mkdir for Extension diff --git a/Pipelines/vs/devskim-visualstudio-release.yml b/Pipelines/vs/devskim-visualstudio-release.yml index 61bcb47d..abe0bdd4 100644 --- a/Pipelines/vs/devskim-visualstudio-release.yml +++ b/Pipelines/vs/devskim-visualstudio-release.yml @@ -7,7 +7,7 @@ resources: - repository: templates type: git name: Data/OSS-Tools-Pipeline-Templates - ref: refs/tags/v2.0.0 + ref: refs/tags/v2.0.1 - repository: 1esPipelines type: git name: 1ESPipelineTemplates/1ESPipelineTemplates @@ -45,14 +45,11 @@ extends: extraArtifactLocation: 'extension' preBuild: - template: nbgv-set-version-steps.yml@templates - # Workaround: Using the .NET 8 SDK doesn't install the right version of MSBuild for .NET 8 - # Using the .NET 7 SDK doesn't include the .NET 8 SDK so it can't build the project - # Install both for now until the right version of MSBuild is included with .NET 8 - task: UseDotNet@2 - displayName: Install Dotnet 7 SDK + displayName: Install Dotnet 9 SDK inputs: packageType: 'sdk' - version: '7.0.x' + version: '9.0.x' onEnd: - task: PowerShell@2 displayName: Mkdir for Extension diff --git a/Pipelines/vscode/devskim-vscode-pr.yml b/Pipelines/vscode/devskim-vscode-pr.yml index 2a406338..59e50d93 100644 --- a/Pipelines/vscode/devskim-vscode-pr.yml +++ b/Pipelines/vscode/devskim-vscode-pr.yml @@ -43,6 +43,11 @@ extends: inputs: packageType: 'sdk' version: '8.0.x' + - task: UseDotNet@2 + displayName: Install Dotnet SDK + inputs: + packageType: 'sdk' + version: '9.0.x' - task: Npm@1 displayName: Build VS Code Plugin inputs: diff --git a/Pipelines/vscode/devskim-vscode-release.yml b/Pipelines/vscode/devskim-vscode-release.yml index 2b3f38ea..ab6f789f 100644 --- a/Pipelines/vscode/devskim-vscode-release.yml +++ b/Pipelines/vscode/devskim-vscode-release.yml @@ -7,7 +7,7 @@ resources: - repository: templates type: git name: Data/OSS-Tools-Pipeline-Templates - ref: refs/tags/v2.0.0 + ref: refs/tags/v2.0.1 - repository: 1esPipelines type: git name: 1ESPipelineTemplates/1ESPipelineTemplates @@ -42,6 +42,11 @@ extends: inputs: packageType: 'sdk' version: '8.0.x' + - task: UseDotNet@2 + displayName: Install Dotnet SDK + inputs: + packageType: 'sdk' + version: '9.0.x' - task: Npm@1 displayName: Build VS Code Plugin inputs: