Fix Pool and Image name declarations (#603)

* Fix Pool and Image name declarations * Update Changelog.md * Fix image name * Update README.md * Dependencies
microsoft · Feb 7, 2024 · d08607c · d08607c
1 parent bd77ec3
commit d08607c
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 24 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -4,6 +4,10 @@ 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.30] - 2024-1-31
+### Pipeline
+Additional pipeline fixes
+
 ## [1.0.29] - 2024-1-17
 ### Pipeline
 Fix GitHub binary release process

diff --git a/DevSkim-DotNet/Microsoft.DevSkim.CLI/Microsoft.DevSkim.CLI.csproj b/DevSkim-DotNet/Microsoft.DevSkim.CLI/Microsoft.DevSkim.CLI.csproj
@@ -37,7 +37,7 @@
     <ItemGroup>
       <PackageReference Include="CommandLineParser" Version="2.9.1" />
       <PackageReference Include="LibGit2Sharp" Version="0.29.0" />
-      <PackageReference Include="Microsoft.CST.ApplicationInspector.Logging" Version="1.9.17" />
+      <PackageReference Include="Microsoft.CST.ApplicationInspector.Logging" Version="1.9.18" />
       <PackageReference Include="Microsoft.Extensions.CommandLineUtils" Version="1.1.1" />
       <PackageReference Include="Sarif.Sdk" Version="4.4.0" />
     </ItemGroup>

diff --git a/DevSkim-DotNet/Microsoft.DevSkim.Tests/Microsoft.DevSkim.Tests.csproj b/DevSkim-DotNet/Microsoft.DevSkim.Tests/Microsoft.DevSkim.Tests.csproj
@@ -9,9 +9,9 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <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" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+        <PackageReference Include="MSTest.TestAdapter" Version="3.2.0" />
+        <PackageReference Include="MSTest.TestFramework" Version="3.2.0" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/DevSkim-DotNet/Microsoft.DevSkim/Microsoft.DevSkim.csproj b/DevSkim-DotNet/Microsoft.DevSkim/Microsoft.DevSkim.csproj
@@ -24,7 +24,7 @@
   </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.CST.ApplicationInspector.RulesEngine" Version="1.9.17" />
+      <PackageReference Include="Microsoft.CST.ApplicationInspector.RulesEngine" Version="1.9.18" />
       <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     </ItemGroup>
 

diff --git 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/v1.1.0
+      ref: refs/tags/v1.1.1
 
 variables:
   BuildConfiguration: 'Release'
@@ -26,7 +26,7 @@ stages:
     parameters:
       jobName: 'dotnet_test_windows'
       dotnetVersions: ['6.0.x','7.0.x','8.0.x']
-      vmImage: 'oss-tools-win2022_1es-managed'
+      vmImage: 'win2022-image-base'
       projectPath: 'DevSkim-DotNet/Microsoft.DevSkim.Tests/Microsoft.DevSkim.Tests.csproj'
   - template: dotnet-test-job.yml@templates
     parameters:

diff --git a/Pipelines/cli/devskim-cli-release.yml b/Pipelines/cli/devskim-cli-release.yml
@@ -17,7 +17,7 @@ resources:
     - repository: templates
       type: git
       name: SecurityEngineering/OSS-Tools-Pipeline-Templates
-      ref: refs/tags/v1.1.0
+      ref: refs/tags/v1.1.1
 
 variables:
   BuildConfiguration: 'Release'
@@ -31,7 +31,7 @@ stages:
     parameters:
       jobName: 'dotnet_test_windows'
       dotnetVersions: ['6.0.x','7.0.x','8.0.x']
-      vmImage: 'oss-tools-win2022_1es-managed'
+      vmImage: 'win2022-image-base'
       projectPath: 'DevSkim-DotNet/Microsoft.DevSkim.Tests/Microsoft.DevSkim.Tests.csproj'
   - template: dotnet-test-job.yml@templates
     parameters:
@@ -96,8 +96,8 @@ stages:
   - job: sign_hash_release
     displayName: Code Sign, Generate Hashes, Publish Public Releases
     pool:
-      name: 'OSS-Tools-1ESPool'
-      vmImage: 'oss-tools-win2022_1es-managed'
+      name: 'CSPA'
+      vmImage: 'win2022-image-base'
     steps:
     - task: UseDotNet@2
       inputs:

diff --git 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/v1.1.0
+      ref: refs/tags/v1.1.1
 
 stages:
 - stage: SDL

diff --git a/Pipelines/vs/devskim-visualstudio-release.yml b/Pipelines/vs/devskim-visualstudio-release.yml
@@ -17,7 +17,7 @@ resources:
     - repository: templates
       type: git
       name: SecurityEngineering/OSS-Tools-Pipeline-Templates
-      ref: refs/tags/v1.1.0
+      ref: refs/tags/v1.1.1
 
 stages:
 - stage: SDL
@@ -76,8 +76,8 @@ stages:
   - job: sign_hash_release
     displayName: Code Sign, Generate Hashes, Publish Public Release
     pool:
-      name: 'OSS-Tools-1ESPool'
-      vmImage: 'windows-latest'
+      name: 'CSPA'
+      vmImage: 'win2022-image-base'
     steps:
     - template: nbgv-set-version-steps.yml@templates
     - task: DownloadBuildArtifacts@0

diff --git a/Pipelines/vscode/devskim-vscode-pr.yml b/Pipelines/vscode/devskim-vscode-pr.yml
@@ -13,7 +13,7 @@ resources:
     - repository: templates
       type: git
       name: SecurityEngineering/OSS-Tools-Pipeline-Templates
-      ref: refs/tags/v1.1.0
+      ref: refs/tags/v1.1.1
 
 stages:
 - stage: SDL
@@ -28,8 +28,8 @@ stages:
   - job: build_vscode_plugin
     displayName: Build VS Code Plugin
     pool:
-      name: 'OSS-Tools-1ESPool'
-      vmImage: 'oss-tools-win2022_1es-managed'
+      name: 'CSPA'
+      vmImage: 'win2022-image-base'
     steps:
     - task: UseDotNet@2
       displayName: Install Dotnet SDK

diff --git a/Pipelines/vscode/devskim-vscode-release.yml b/Pipelines/vscode/devskim-vscode-release.yml
@@ -17,7 +17,7 @@ resources:
     - repository: templates
       type: git
       name: SecurityEngineering/OSS-Tools-Pipeline-Templates
-      ref: refs/tags/v1.1.0
+      ref: refs/tags/v1.1.1
 
 stages:
 - stage: SDL
@@ -33,8 +33,8 @@ stages:
   - job: build_vscode_plugin
     displayName: Build VS Code Plugin
     pool:
-      name: 'OSS-Tools-1ESPool'
-      vmImage: 'oss-tools-win2022_1es-managed'
+      name: 'CSPA'
+      vmImage: 'win2022-image-base'
     steps:
     - task: UseDotNet@2
       displayName: Install Dotnet SDK
@@ -133,8 +133,8 @@ stages:
   - job: sign_hash_release
     displayName: Code Sign, Generate Hashes, Publish Public Release
     pool:
-      name: 'OSS-Tools-1ESPool'
-      vmImage: 'oss-tools-win2022_1es-managed'
+      name: 'CSPA'
+      vmImage: 'win2022-image-base'
     steps:
     - template: nbgv-set-version-steps.yml@templates
     - task: DownloadBuildArtifacts@0

diff --git a/README.md b/README.md
@@ -107,7 +107,7 @@ Once the DevSkim plugin is installed and enabled, simply write some code, and fe
 ## Writing Rules
 
 Please see [Writing Rules](https://github.com/Microsoft/DevSkim/wiki/Writing-Rules) for
-instructions on how to author new rules.
+instructions on how to author rules.
 
 ## Contributing