From e9d6c4ea7399766de2b1048306ac21ad71b30ca4 Mon Sep 17 00:00:00 2001 From: Tony Knight Date: Fri, 28 Nov 2025 21:00:58 +0000 Subject: [PATCH 01/13] kick build --- tests/pkgchk-cli.tests.integration/TestUtils.fs | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/pkgchk-cli.tests.integration/TestUtils.fs b/tests/pkgchk-cli.tests.integration/TestUtils.fs index 4ee30314..e8f474c9 100644 --- a/tests/pkgchk-cli.tests.integration/TestUtils.fs +++ b/tests/pkgchk-cli.tests.integration/TestUtils.fs @@ -180,3 +180,4 @@ module TestUtils = >> executeProc >> logExecution output >> assertSuccessfulPkgChk + From ab5a04b1b15d27961868c2a5841bc2cce0302f22 Mon Sep 17 00:00:00 2001 From: Tony Knight Date: Fri, 28 Nov 2025 22:05:19 +0000 Subject: [PATCH 02/13] suppress NU1510 warning in restore --- src/pkgchk-cli/Sca.fs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pkgchk-cli/Sca.fs b/src/pkgchk-cli/Sca.fs index fc1e22e4..78a4b3bc 100644 --- a/src/pkgchk-cli/Sca.fs +++ b/src/pkgchk-cli/Sca.fs @@ -69,7 +69,7 @@ module ScaArgs = module Sca = let restoreArgs projectPath = - projectPath |> Io.toFullPath |> sprintf "restore %s" + projectPath |> Io.toFullPath |> sprintf "restore %s -nowarn:NU1510" let parseError (parseable: string) (ex: Exception) = match From ad07cdd65d19c58bbe239a17935807108b230462 Mon Sep 17 00:00:00 2001 From: Tony Knight Date: Fri, 28 Nov 2025 22:05:26 +0000 Subject: [PATCH 03/13] remove check on System.IO --- tests/pkgchk-cli.tests.integration/PackageDependencyTests.fs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/pkgchk-cli.tests.integration/PackageDependencyTests.fs b/tests/pkgchk-cli.tests.integration/PackageDependencyTests.fs index 8d00bffc..03d0602f 100644 --- a/tests/pkgchk-cli.tests.integration/PackageDependencyTests.fs +++ b/tests/pkgchk-cli.tests.integration/PackageDependencyTests.fs @@ -39,4 +39,4 @@ type PackageDependencyTests(output: ITestOutputHelper) = runPkgChkDependenciesArgs outDir true |> execSuccessPkgChk - |> assertPackagesFound [ httpPackage; regexPackage; sysIoPackage ] + |> assertPackagesFound [ httpPackage; regexPackage; ] From caba36686b7affe263c969b6ae1e94130c33e818 Mon Sep 17 00:00:00 2001 From: Tony Knight Date: Fri, 28 Nov 2025 22:33:18 +0000 Subject: [PATCH 04/13] switch test to failure --- tests/pkgchk-cli.tests.integration/DeprecatedPackageTests.fs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/pkgchk-cli.tests.integration/DeprecatedPackageTests.fs b/tests/pkgchk-cli.tests.integration/DeprecatedPackageTests.fs index 9d9c11f4..3513f897 100644 --- a/tests/pkgchk-cli.tests.integration/DeprecatedPackageTests.fs +++ b/tests/pkgchk-cli.tests.integration/DeprecatedPackageTests.fs @@ -105,4 +105,4 @@ type DeprecatedPackageTests(output: ITestOutputHelper) = addPackageDowngradeAadPackageArgs outDir |> execSuccess - [ "high"; "legacy" ] |> runPkgChkSeverityArgs outDir |> execSysErrorFailedPkgChk + [ "high"; "legacy" ] |> runPkgChkSeverityArgs outDir |> execFailedPkgChk From 37cae388fee380fe02d434a0298addf5c3e36783 Mon Sep 17 00:00:00 2001 From: Tony Knight Date: Fri, 28 Nov 2025 22:54:39 +0000 Subject: [PATCH 05/13] fix .net version --- .github/workflows/build.yml | 10 ++++++++++ .github/workflows/pr-checks.yml | 2 ++ .github/workflows/sca.yml | 2 ++ 3 files changed, 14 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5747a185..d9228565 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,6 +29,8 @@ jobs: - name: Setup .NET SDK uses: actions/setup-dotnet@v5 + with: + dotnet-version: '8.0.x' - name: Check SCA run: | @@ -49,6 +51,8 @@ jobs: - name: Setup .NET SDK uses: actions/setup-dotnet@v5 + with: + dotnet-version: '8.0.x' - name: Tool restore run: dotnet tool restore @@ -104,6 +108,8 @@ jobs: - name: Setup .NET SDK uses: actions/setup-dotnet@v5 + with: + dotnet-version: '8.0.x' - name: Tool restore run: dotnet tool restore @@ -133,6 +139,8 @@ jobs: - name: Setup .NET SDK uses: actions/setup-dotnet@v5 + with: + dotnet-version: '8.0.x' - name: Tool restore run: dotnet tool restore @@ -166,6 +174,8 @@ jobs: - name: Setup .NET SDK uses: actions/setup-dotnet@v5 + with: + dotnet-version: '8.0.x' - name: Download package uses: actions/download-artifact@v5 diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml index 217d8e2d..283c5617 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -21,6 +21,8 @@ jobs: - name: Setup .NET SDK uses: actions/setup-dotnet@v5 + with: + dotnet-version: '8.0.x' - name: Tool restore run: dotnet tool restore diff --git a/.github/workflows/sca.yml b/.github/workflows/sca.yml index 33eb8d6c..37993995 100644 --- a/.github/workflows/sca.yml +++ b/.github/workflows/sca.yml @@ -30,6 +30,8 @@ jobs: - name: Setup .NET SDK uses: actions/setup-dotnet@v5 + with: + dotnet-version: '8.0.x' - name: Check SCA run: | From c40577df3cf0448430caa84226cbd296fe000e9c Mon Sep 17 00:00:00 2001 From: Tony Knight Date: Fri, 28 Nov 2025 22:59:08 +0000 Subject: [PATCH 06/13] Revert "fix .net version" This reverts commit 37cae388fee380fe02d434a0298addf5c3e36783. --- .github/workflows/build.yml | 10 ---------- .github/workflows/pr-checks.yml | 2 -- .github/workflows/sca.yml | 2 -- 3 files changed, 14 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d9228565..5747a185 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,8 +29,6 @@ jobs: - name: Setup .NET SDK uses: actions/setup-dotnet@v5 - with: - dotnet-version: '8.0.x' - name: Check SCA run: | @@ -51,8 +49,6 @@ jobs: - name: Setup .NET SDK uses: actions/setup-dotnet@v5 - with: - dotnet-version: '8.0.x' - name: Tool restore run: dotnet tool restore @@ -108,8 +104,6 @@ jobs: - name: Setup .NET SDK uses: actions/setup-dotnet@v5 - with: - dotnet-version: '8.0.x' - name: Tool restore run: dotnet tool restore @@ -139,8 +133,6 @@ jobs: - name: Setup .NET SDK uses: actions/setup-dotnet@v5 - with: - dotnet-version: '8.0.x' - name: Tool restore run: dotnet tool restore @@ -174,8 +166,6 @@ jobs: - name: Setup .NET SDK uses: actions/setup-dotnet@v5 - with: - dotnet-version: '8.0.x' - name: Download package uses: actions/download-artifact@v5 diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml index 283c5617..217d8e2d 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -21,8 +21,6 @@ jobs: - name: Setup .NET SDK uses: actions/setup-dotnet@v5 - with: - dotnet-version: '8.0.x' - name: Tool restore run: dotnet tool restore diff --git a/.github/workflows/sca.yml b/.github/workflows/sca.yml index 37993995..33eb8d6c 100644 --- a/.github/workflows/sca.yml +++ b/.github/workflows/sca.yml @@ -30,8 +30,6 @@ jobs: - name: Setup .NET SDK uses: actions/setup-dotnet@v5 - with: - dotnet-version: '8.0.x' - name: Check SCA run: | From 6a64fc255e3b5c627895d16fc7a76088f969a6fd Mon Sep 17 00:00:00 2001 From: Tony Knight Date: Fri, 28 Nov 2025 23:07:17 +0000 Subject: [PATCH 07/13] Revert "switch test to failure" This reverts commit caba36686b7affe263c969b6ae1e94130c33e818. --- tests/pkgchk-cli.tests.integration/DeprecatedPackageTests.fs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/pkgchk-cli.tests.integration/DeprecatedPackageTests.fs b/tests/pkgchk-cli.tests.integration/DeprecatedPackageTests.fs index 3513f897..9d9c11f4 100644 --- a/tests/pkgchk-cli.tests.integration/DeprecatedPackageTests.fs +++ b/tests/pkgchk-cli.tests.integration/DeprecatedPackageTests.fs @@ -105,4 +105,4 @@ type DeprecatedPackageTests(output: ITestOutputHelper) = addPackageDowngradeAadPackageArgs outDir |> execSuccess - [ "high"; "legacy" ] |> runPkgChkSeverityArgs outDir |> execFailedPkgChk + [ "high"; "legacy" ] |> runPkgChkSeverityArgs outDir |> execSysErrorFailedPkgChk From e01937df025dc5f7e5e5c62d587b6bc8db84298a Mon Sep 17 00:00:00 2001 From: Tony Knight Date: Fri, 28 Nov 2025 23:07:30 +0000 Subject: [PATCH 08/13] set SDK version --- global.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 global.json diff --git a/global.json b/global.json new file mode 100644 index 00000000..95aec77a --- /dev/null +++ b/global.json @@ -0,0 +1,6 @@ +{ + "sdk": { + "version": "9.0.200", + "rollForward": "latestFeature" + } +} \ No newline at end of file From 8cc1b9bbfa4989b4632e4c438ec33bd0ce5b1af4 Mon Sep 17 00:00:00 2001 From: Tony Knight Date: Fri, 28 Nov 2025 23:19:51 +0000 Subject: [PATCH 09/13] use 9.0.308 --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 95aec77a..6c77f9e5 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "9.0.200", + "version": "9.0.308", "rollForward": "latestFeature" } } \ No newline at end of file From 830335c1fab74b907c790b9128ccc29fd667dd46 Mon Sep 17 00:00:00 2001 From: Tony Knight Date: Fri, 28 Nov 2025 23:25:21 +0000 Subject: [PATCH 10/13] upgrade actions/setup-dotnet --- .github/workflows/build.yml | 10 +++++----- .github/workflows/pr-checks.yml | 2 +- .github/workflows/sca.yml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5747a185..afe42207 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,7 +28,7 @@ jobs: - uses: actions/checkout@v5 - name: Setup .NET SDK - uses: actions/setup-dotnet@v5 + uses: actions/setup-dotnet@v6 - name: Check SCA run: | @@ -48,7 +48,7 @@ jobs: - uses: actions/checkout@v5 - name: Setup .NET SDK - uses: actions/setup-dotnet@v5 + uses: actions/setup-dotnet@v6 - name: Tool restore run: dotnet tool restore @@ -103,7 +103,7 @@ jobs: - uses: actions/checkout@v5 - name: Setup .NET SDK - uses: actions/setup-dotnet@v5 + uses: actions/setup-dotnet@v6 - name: Tool restore run: dotnet tool restore @@ -132,7 +132,7 @@ jobs: - uses: actions/checkout@v5 - name: Setup .NET SDK - uses: actions/setup-dotnet@v5 + uses: actions/setup-dotnet@v6 - name: Tool restore run: dotnet tool restore @@ -165,7 +165,7 @@ jobs: - uses: actions/checkout@v5 - name: Setup .NET SDK - uses: actions/setup-dotnet@v5 + uses: actions/setup-dotnet@v6 - name: Download package uses: actions/download-artifact@v5 diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml index 217d8e2d..0d970f14 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -20,7 +20,7 @@ jobs: - uses: actions/checkout@v5 - name: Setup .NET SDK - uses: actions/setup-dotnet@v5 + uses: actions/setup-dotnet@v6 - name: Tool restore run: dotnet tool restore diff --git a/.github/workflows/sca.yml b/.github/workflows/sca.yml index 33eb8d6c..fc937f8f 100644 --- a/.github/workflows/sca.yml +++ b/.github/workflows/sca.yml @@ -29,7 +29,7 @@ jobs: - uses: actions/checkout@v5 - name: Setup .NET SDK - uses: actions/setup-dotnet@v5 + uses: actions/setup-dotnet@v6 - name: Check SCA run: | From 4e9a242d11b9568decfe0de6a8f05e8d99bf21d3 Mon Sep 17 00:00:00 2001 From: Tony Knight Date: Fri, 28 Nov 2025 23:26:31 +0000 Subject: [PATCH 11/13] upgrade actions --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index afe42207..e2b063ee 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -86,7 +86,7 @@ jobs: run: dotnet reportgenerator -reports:./tests/**/coverage.info -targetdir:./reports/codecoverage -reporttypes:Html - name: Archive Code coverage - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v5 with: name: codecoverage path: ./reports/codecoverage/*.* @@ -149,7 +149,7 @@ jobs: run: dotnet pack -c Release -o ./package/ -p:PackageVersion=${{ env.build-version-number }} -p:Version=${{ env.build-version-number }} - name: Archive tool nupkg - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v5 with: name: ${{ env.nuget-package-name }} path: ./package/*.nupkg @@ -168,7 +168,7 @@ jobs: uses: actions/setup-dotnet@v6 - name: Download package - uses: actions/download-artifact@v5 + uses: actions/download-artifact@v6 with: name: ${{ env.nuget-package-name }} path: ${{ github.workspace }}/artifacts From d9fb8d1129a78a9440b71264346126176e7e34af Mon Sep 17 00:00:00 2001 From: Tony Knight Date: Fri, 28 Nov 2025 23:27:47 +0000 Subject: [PATCH 12/13] Revert "upgrade actions/setup-dotnet" This reverts commit 830335c1fab74b907c790b9128ccc29fd667dd46. --- .github/workflows/build.yml | 10 +++++----- .github/workflows/pr-checks.yml | 2 +- .github/workflows/sca.yml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e2b063ee..7b4f1c4e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,7 +28,7 @@ jobs: - uses: actions/checkout@v5 - name: Setup .NET SDK - uses: actions/setup-dotnet@v6 + uses: actions/setup-dotnet@v5 - name: Check SCA run: | @@ -48,7 +48,7 @@ jobs: - uses: actions/checkout@v5 - name: Setup .NET SDK - uses: actions/setup-dotnet@v6 + uses: actions/setup-dotnet@v5 - name: Tool restore run: dotnet tool restore @@ -103,7 +103,7 @@ jobs: - uses: actions/checkout@v5 - name: Setup .NET SDK - uses: actions/setup-dotnet@v6 + uses: actions/setup-dotnet@v5 - name: Tool restore run: dotnet tool restore @@ -132,7 +132,7 @@ jobs: - uses: actions/checkout@v5 - name: Setup .NET SDK - uses: actions/setup-dotnet@v6 + uses: actions/setup-dotnet@v5 - name: Tool restore run: dotnet tool restore @@ -165,7 +165,7 @@ jobs: - uses: actions/checkout@v5 - name: Setup .NET SDK - uses: actions/setup-dotnet@v6 + uses: actions/setup-dotnet@v5 - name: Download package uses: actions/download-artifact@v6 diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml index 0d970f14..217d8e2d 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -20,7 +20,7 @@ jobs: - uses: actions/checkout@v5 - name: Setup .NET SDK - uses: actions/setup-dotnet@v6 + uses: actions/setup-dotnet@v5 - name: Tool restore run: dotnet tool restore diff --git a/.github/workflows/sca.yml b/.github/workflows/sca.yml index fc937f8f..33eb8d6c 100644 --- a/.github/workflows/sca.yml +++ b/.github/workflows/sca.yml @@ -29,7 +29,7 @@ jobs: - uses: actions/checkout@v5 - name: Setup .NET SDK - uses: actions/setup-dotnet@v6 + uses: actions/setup-dotnet@v5 - name: Check SCA run: | From 8d42211cb5605ca876823ca9fe69a53c6f926935 Mon Sep 17 00:00:00 2001 From: Tony Knight Date: Fri, 28 Nov 2025 23:38:53 +0000 Subject: [PATCH 13/13] style --- tests/pkgchk-cli.tests.integration/PackageDependencyTests.fs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/pkgchk-cli.tests.integration/PackageDependencyTests.fs b/tests/pkgchk-cli.tests.integration/PackageDependencyTests.fs index 03d0602f..16295ad8 100644 --- a/tests/pkgchk-cli.tests.integration/PackageDependencyTests.fs +++ b/tests/pkgchk-cli.tests.integration/PackageDependencyTests.fs @@ -39,4 +39,4 @@ type PackageDependencyTests(output: ITestOutputHelper) = runPkgChkDependenciesArgs outDir true |> execSuccessPkgChk - |> assertPackagesFound [ httpPackage; regexPackage; ] + |> assertPackagesFound [ httpPackage; regexPackage ]