Skip to content

Commit 1a20268

Browse files
BernieWhiteBernieWhite
authored
Merge branch 'main' into copilot/fix-2609
2 parents 463c82f + 3ffa8f2 commit 1a20268

File tree

65 files changed

+2586
-2094
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+2586
-2094
lines changed

‎.devcontainer/devcontainer.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@
3333
},
3434
"ghcr.io/devcontainers/features/python:1": {
3535
"version": "latest"
36+
},
37+
"ghcr.io/devcontainers/features/node:1": {
38+
"version": "lts"
3639
}
3740
},
3841
"onCreateCommand": "sudo ./dotnet-install.sh --install-dir /usr/lib/dotnet && sudo dotnet workload update && dotnet tool install --global PowerShell --version 7.4.10 && sudo chown -R vscode:vscode /usr/bin/pwsh && sudo apt-get update -y && sudo apt-get upgrade -y && dotnet restore && pip install -r requirements-docs.txt && ln /usr/bin/pwsh /home/vscode/.dotnet/tools/pwsh --force",

‎.github/dependabot.yml‎

Lines changed: 38 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,53 +22,80 @@ updates:
2222
- Microsoft.PowerShell.SDK
2323
ignore:
2424
- dependency-name: gitversion.tool
25+
26+
# Don't auto-update to new major versions, we need to migrate code first.
27+
# https://github.com/microsoft/PSRule/issues/3158
28+
- dependency-name: Microsoft.CodeAnalysis.Common
29+
update-types:
30+
- version-update:semver-major
31+
32+
# Upgrade to newer major versions are not compatible with .NET Standard 2.0.
33+
- dependency-name: Microsoft.Extensions.DependencyInjection
34+
update-types:
35+
- version-update:semver-major
36+
2537
# Maintain dependencies for GitHub Actions
2638
- package-ecosystem: github-actions
2739
directory: '/'
2840
schedule:
2941
interval: daily
3042
labels:
3143
- dependencies
44+
groups:
45+
github:
46+
patterns:
47+
- actions/*
48+
- github/*
49+
3250
# Maintain dependencies for Python
3351
- package-ecosystem: pip
3452
directory: '/'
3553
schedule:
3654
interval: daily
3755
labels:
3856
- dependencies
57+
groups:
58+
docs:
59+
patterns:
60+
- mkdocs*
61+
- mdx-truly-sane-lists
62+
- mike
63+
- semver
64+
3965
# Maintain dependencies for npm.
4066
- package-ecosystem: npm
4167
directory: '/'
4268
schedule:
4369
interval: daily
4470
labels:
45-
- 'dependencies'
71+
- dependencies
4672
groups:
4773
# Group linting dependencies
48-
dev-linting:
74+
dev-common:
4975
patterns:
5076
- esbuild
5177
- eslint
78+
- mocha
5279
- '@typescript-eslint/*'
53-
dev-types:
54-
patterns:
5580
- '@types/*'
5681
exclude-patterns:
5782
- '@types/vscode'
83+
ignore:
84+
# Don't auto-update major versions of Node.js types.
85+
# This will be manually updated when needed.
86+
- dependency-name: '@types/node'
87+
update-types:
88+
- version-update:semver-major
89+
5890
# Maintain dependencies for Dev Containers
5991
- package-ecosystem: devcontainers
6092
directory: '/'
6193
schedule:
6294
interval: weekly
6395
labels:
6496
- dependencies
65-
# Maintain dependencies for Docker
66-
- package-ecosystem: docker
67-
directory: '/'
68-
schedule:
69-
interval: weekly
70-
labels:
71-
- dependencies
97+
98+
# Maintain dependencies for .NET SDK
7299
- package-ecosystem: dotnet-sdk
73100
directory: /
74101
schedule:

‎.github/workflows/build.yaml‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ jobs:
3535

3636
steps:
3737
- name: Checkout
38-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
38+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
3939
with:
4040
fetch-depth: 0
4141

4242
- name: Setup .NET
43-
uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
43+
uses: actions/setup-dotnet@2016bd2012dba4e32de620c46fe006a3ac9f0602 # v5.0.1
4444
with:
4545
global-json-file: global.json
4646

@@ -63,26 +63,26 @@ jobs:
6363
- name: Lint .NET
6464
shell: pwsh
6565
timeout-minutes: 5
66-
run: dotnet format --verify-no-changes
66+
run: dotnet format --verify-no-changes --severity error
6767

6868
- name: Upload module
69-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
69+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
7070
with:
7171
name: Module
7272
path: ./out/modules/PSRule/*
7373
retention-days: 3
7474
if-no-files-found: error
7575

7676
- name: Upload packages
77-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
77+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
7878
with:
7979
name: Packages
8080
path: ./out/nuget/PSRule/*
8181
retention-days: 3
8282
if-no-files-found: error
8383

8484
- name: Upload PSRule Results
85-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
85+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
8686
if: always()
8787
with:
8888
name: Results-PSRule
@@ -124,10 +124,10 @@ jobs:
124124

125125
steps:
126126
- name: Checkout
127-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
127+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
128128

129129
- name: Setup .NET
130-
uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
130+
uses: actions/setup-dotnet@2016bd2012dba4e32de620c46fe006a3ac9f0602 # v5.0.1
131131
with:
132132
global-json-file: global.json
133133

@@ -144,7 +144,7 @@ jobs:
144144
run: ./scripts/pipeline-deps.ps1
145145

146146
- name: Download module
147-
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
147+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
148148
with:
149149
name: Module
150150
path: ./out/modules/PSRule
@@ -168,17 +168,17 @@ jobs:
168168
contents: read
169169
steps:
170170
- name: Checkout
171-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
171+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
172172
with:
173173
fetch-depth: 0
174174

175175
- name: Setup node.js
176-
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
176+
uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
177177
with:
178-
node-version: 20
178+
node-version: 24
179179

180180
- name: Setup .NET
181-
uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
181+
uses: actions/setup-dotnet@2016bd2012dba4e32de620c46fe006a3ac9f0602 # v5.0.1
182182
with:
183183
global-json-file: global.json
184184

@@ -197,7 +197,7 @@ jobs:
197197
npm run package -- 0.0.1
198198
199199
- name: Upload extension
200-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
200+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
201201
with:
202202
name: Extension
203203
path: out/package/vscode-ps-rule-*.vsix
@@ -221,15 +221,15 @@ jobs:
221221

222222
steps:
223223
- name: Checkout
224-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
224+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
225225

226226
- name: Setup node.js
227-
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
227+
uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
228228
with:
229-
node-version: 20
229+
node-version: 24
230230

231231
- name: Setup .NET
232-
uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
232+
uses: actions/setup-dotnet@2016bd2012dba4e32de620c46fe006a3ac9f0602 # v5.0.1
233233
with:
234234
global-json-file: global.json
235235

@@ -259,12 +259,12 @@ jobs:
259259

260260
steps:
261261
- name: Checkout
262-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
262+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
263263
with:
264264
fetch-depth: 0
265265

266266
- name: Setup Python
267-
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
267+
uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
268268
with:
269269
python-version: '3.11'
270270
architecture: 'x64'
@@ -289,15 +289,15 @@ jobs:
289289

290290
steps:
291291
- name: Checkout
292-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
292+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
293293

294294
- name: Setup .NET
295-
uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
295+
uses: actions/setup-dotnet@2016bd2012dba4e32de620c46fe006a3ac9f0602 # v5.0.1
296296
with:
297297
global-json-file: global.json
298298

299299
- name: Download packages
300-
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
300+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
301301
with:
302302
name: Packages
303303
path: ./out/nuget/PSRule
@@ -315,7 +315,7 @@ jobs:
315315
option: ps-rule-ci.yaml
316316

317317
- name: Upload results
318-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
318+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
319319
if: always()
320320
with:
321321
name: test-action-sarif
@@ -334,7 +334,7 @@ jobs:
334334
security-events: write
335335
steps:
336336
- name: Checkout
337-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
337+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
338338

339339
- name: Run PSRule analysis
340340
uses: microsoft/ps-rule@46451b8f5258c41beb5ae69ed7190ccbba84112c # v2.9.0
@@ -346,13 +346,13 @@ jobs:
346346
option: ps-rule-ci.yaml
347347

348348
- name: Upload results to security tab
349-
uses: github/codeql-action/upload-sarif@f1f6e5f6af878fb37288ce1c627459e94dbf7d01 # v3.29.5
349+
uses: github/codeql-action/upload-sarif@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v3.29.5
350350
if: always()
351351
with:
352352
sarif_file: reports/ps-rule-results.sarif
353353

354354
- name: Upload results
355-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
355+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
356356
if: always()
357357
with:
358358
name: PSRule-Sarif
@@ -369,21 +369,21 @@ jobs:
369369
security-events: write
370370
steps:
371371
- name: Checkout
372-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
372+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
373373

374374
- name: Run DevSkim scanner
375375
uses: microsoft/DevSkim-Action@4b5047945a44163b94642a1cecc0d93a3f428cc6 # v1.0.16
376376
with:
377377
directory-to-scan: .
378378

379379
- name: Upload results to security tab
380-
uses: github/codeql-action/upload-sarif@f1f6e5f6af878fb37288ce1c627459e94dbf7d01 # v3.29.5
380+
uses: github/codeql-action/upload-sarif@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v3.29.5
381381
if: always()
382382
with:
383383
sarif_file: devskim-results.sarif
384384

385385
- name: Upload results
386-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
386+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
387387
if: always()
388388
with:
389389
name: DevSkim-Sarif
@@ -400,22 +400,22 @@ jobs:
400400
security-events: write
401401
steps:
402402
- name: Checkout
403-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
403+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
404404

405405
- name: Initialize CodeQL
406-
uses: github/codeql-action/init@f1f6e5f6af878fb37288ce1c627459e94dbf7d01 # v3.29.5
406+
uses: github/codeql-action/init@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v3.29.5
407407
with:
408408
languages: 'csharp'
409409

410410
- name: Autobuild
411-
uses: github/codeql-action/autobuild@f1f6e5f6af878fb37288ce1c627459e94dbf7d01 # v3.29.5
411+
uses: github/codeql-action/autobuild@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v3.29.5
412412

413413
- name: Perform CodeQL Analysis
414-
uses: github/codeql-action/analyze@f1f6e5f6af878fb37288ce1c627459e94dbf7d01 # v3.29.5
414+
uses: github/codeql-action/analyze@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v3.29.5
415415
id: codeql-analyze
416416

417417
- name: Upload results
418-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
418+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
419419
if: always()
420420
with:
421421
name: CodeQL-Sarif

‎.github/workflows/copilot-setup-steps.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,19 @@ jobs:
2424

2525
steps:
2626
- name: Checkout
27-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
27+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
2828
with:
2929
fetch-depth: 0
3030

3131
- name: Setup .NET
32-
uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
32+
uses: actions/setup-dotnet@2016bd2012dba4e32de620c46fe006a3ac9f0602 # v5.0.1
3333
with:
3434
global-json-file: global.json
3535

3636
- name: Setup node.js
37-
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
37+
uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
3838
with:
39-
node-version: 20
39+
node-version: 22
4040

4141
- name: Install dependencies
4242
shell: pwsh

‎.github/workflows/dependencies.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
pull-requests: write
2727
steps:
2828
- name: Checkout
29-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
29+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
3030
with:
3131
fetch-depth: 0
3232

0 commit comments

Comments
 (0)