From be4f60c0d6db7126b0693b2e50afcfd1673bd92d Mon Sep 17 00:00:00 2001 From: Victor Chang Date: Mon, 24 Mar 2025 10:02:40 -0700 Subject: [PATCH 01/13] Update dependencies --- doc/dependency_decisions.yml | 193 ++++++------------ ...onai.Deploy.Security.Authentication.csproj | 10 +- ...eploy.Security.Authentication.Tests.csproj | 12 +- 3 files changed, 69 insertions(+), 146 deletions(-) diff --git a/doc/dependency_decisions.yml b/doc/dependency_decisions.yml index c16e3c6..3a1c924 100644 --- a/doc/dependency_decisions.yml +++ b/doc/dependency_decisions.yml @@ -4,28 +4,28 @@ - :who: mocsharp :why: MIT (https://github.com/ardalis/GuardClauses.Analyzers/raw/master/LICENSE) :versions: - - 4.2.0 + - 4.6.0 :when: 2022-08-16 23:10:21.184627612 Z - - :approve - Microsoft.AspNetCore.Authentication.JwtBearer - :who: mocsharp :why: MIT (https://github.com/dotnet/aspnetcore/raw/main/LICENSE.txt) :versions: - - 8.0.0 + - 8.0.14 :when: 2022-10-14 23:36:49.751931025 Z - - :approve - Microsoft.AspNetCore.TestHost - :who: mocsharp :why: MIT (https://github.com/dotnet/aspnetcore/raw/main/LICENSE.txt) :versions: - - 8.0.0 + - 8.0.14 :when: 2022-10-14 23:36:49.751931025 Z - - :approve - Microsoft.CodeCoverage - :who: mocsharp :why: MIT (https://github.com/microsoft/vstest/raw/main/LICENSE) :versions: - - 17.8.0 + - 17.13.0 :when: 2022-08-16 23:05:48.342748414 Z - - :approve - Microsoft.Extensions.Configuration @@ -46,7 +46,7 @@ - :who: mocsharp :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 8.0.0 + - 8.0.2 :when: 2022-08-16 23:05:56.869915708 Z - - :approve - Microsoft.Extensions.Configuration.CommandLine @@ -67,49 +67,49 @@ - :who: mocsharp :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 8.0.0 + - 8.0.1 :when: 2022-08-16 23:05:58.646414000 Z - - :approve - Microsoft.Extensions.Configuration.Json - :who: mocsharp :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 8.0.0 + - 8.0.1 :when: 2022-08-16 23:05:59.140939154 Z - - :approve - Microsoft.Extensions.Configuration.UserSecrets - :who: mocsharp :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 8.0.0 + - 8.0.1 :when: 2022-08-16 23:05:59.570260365 Z - - :approve - Microsoft.Extensions.DependencyInjection - :who: mocsharp :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 8.0.0 + - 8.0.1 :when: 2022-08-16 23:06:00.904189459 Z - - :approve - Microsoft.Extensions.DependencyInjection.Abstractions - :who: mocsharp :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 8.0.0 + - 8.0.2 :when: 2022-08-16 23:06:01.778427777 Z - - :approve - Microsoft.Extensions.Diagnostics - :who: mocsharp :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 8.0.0 + - 8.0.1 :when: 2022-08-16 23:06:00.904189459 Z - - :approve - Microsoft.Extensions.Diagnostics.Abstractions - :who: mocsharp :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 8.0.0 + - 8.0.1 :when: 2022-08-16 23:06:01.778427777 Z - - :approve - Microsoft.Extensions.FileProviders.Abstractions @@ -137,70 +137,70 @@ - :who: mocsharp :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 8.0.0 + - 8.0.1 :when: 2022-08-16 23:06:04.488545906 Z - - :approve - Microsoft.Extensions.Hosting.Abstractions - :who: mocsharp :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 8.0.0 + - 8.0.1 :when: 2022-08-16 23:06:04.935613050 Z - - :approve - Microsoft.Extensions.Logging - :who: mocsharp :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 8.0.0 + - 8.0.1 :when: 2022-08-16 23:06:05.840705669 Z - - :approve - Microsoft.Extensions.Logging.Abstractions - :who: mocsharp :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 8.0.0 + - 8.0.3 :when: 2022-08-16 23:06:06.728283354 Z - - :approve - Microsoft.Extensions.Logging.Configuration - :who: mocsharp :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 8.0.0 + - 8.0.1 :when: 2022-08-16 23:06:07.178037938 Z - - :approve - Microsoft.Extensions.Logging.Console - :who: mocsharp :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 8.0.0 + - 8.0.1 :when: 2022-08-16 23:06:07.618174405 Z - - :approve - Microsoft.Extensions.Logging.Debug - :who: mocsharp :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 8.0.0 + - 8.0.1 :when: 2022-08-16 23:06:08.061150392 Z - - :approve - Microsoft.Extensions.Logging.EventLog - :who: mocsharp :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 8.0.0 + - 8.0.1 :when: 2022-08-16 23:06:08.503025043 Z - - :approve - Microsoft.Extensions.Logging.EventSource - :who: mocsharp :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 8.0.0 + - 8.0.1 :when: 2022-08-16 23:06:08.971793852 Z - - :approve - Microsoft.Extensions.Options - :who: mocsharp :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 8.0.0 + - 8.0.2 :when: 2022-08-16 23:06:10.315793104 Z - - :approve - Microsoft.Extensions.Options.ConfigurationExtensions @@ -221,49 +221,49 @@ - :who: mocsharp :why: MIT (https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet/raw/dev/LICENSE.txt) :versions: - - 7.0.3 + - 7.1.2 :when: 2022-10-14 23:37:14.398733049 Z - - :approve - Microsoft.IdentityModel.JsonWebTokens - :who: mocsharp :why: MIT (https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet/raw/dev/LICENSE.txt) :versions: - - 7.0.3 + - 7.1.2 :when: 2022-10-14 23:37:14.398733049 Z - - :approve - Microsoft.IdentityModel.Logging - :who: mocsharp :why: MIT (https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet/raw/dev/LICENSE.txt) :versions: - - 7.0.3 + - 7.1.2 :when: 2022-10-14 23:37:15.196566449 Z - - :approve - Microsoft.IdentityModel.Protocols - :who: mocsharp :why: MIT (https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet/raw/dev/LICENSE.txt) :versions: - - 7.0.3 + - 7.1.2 :when: 2022-10-14 23:37:16.007362554 Z - - :approve - Microsoft.IdentityModel.Protocols.OpenIdConnect - :who: mocsharp :why: MIT (https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet/raw/dev/LICENSE.txt) :versions: - - 7.0.3 + - 7.1.2 :when: 2022-10-14 23:37:16.403183970 Z - - :approve - Microsoft.IdentityModel.Tokens - :who: mocsharp :why: MIT (https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet/raw/dev/LICENSE.txt) :versions: - - 7.0.3 + - 7.1.2 :when: 2022-10-14 23:37:16.793759607 Z - - :approve - Microsoft.NET.Test.Sdk - :who: mocsharp :why: MIT (https://raw.githubusercontent.com/microsoft/vstest/main/LICENSE) :versions: - - 17.8.0 + - 17.13.0 :when: 2022-09-01 23:06:13.008314524 Z - - :approve - Microsoft.NETCore.Platforms @@ -284,14 +284,14 @@ - :who: mocsharp :why: MIT (https://github.com/microsoft/vstest/raw/v17.4.0/LICENSE) :versions: - - 17.8.0 + - 17.13.0 :when: 2022-08-16 23:06:16.175705981 Z - - :approve - Microsoft.TestPlatform.TestHost - :who: mocsharp :why: MIT (https://github.com/microsoft/vstest/raw/v17.4.0/LICENSE) :versions: - - 17.8.0 + - 17.13.0 :when: 2022-08-16 23:06:17.671459450 Z - - :approve - Microsoft.Win32.Primitives @@ -375,7 +375,7 @@ - :who: mocsharp :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 8.0.0 + - 8.0.1 :when: 2022-08-16 23:06:45.597825555 Z - - :approve - System.Diagnostics.Tools @@ -466,7 +466,7 @@ - :who: mocsharp :why: MIT (https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet/raw/dev/LICENSE.txt) :versions: - - 7.0.3 + - 7.1.2 :when: 2022-10-14 23:37:56.206982078 Z - - :approve - System.Linq @@ -753,126 +753,49 @@ - :who: mocsharp :why: MIT (https://github.com/coverlet-coverage/coverlet/raw/master/LICENSE) :versions: - - 6.0.0 + - 6.0.4 :when: 2022-08-16 21:40:21.855388365 Z -- - :approve - - runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl - - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License ( http://go.microsoft.com/fwlink/?LinkId=329770) - :versions: - - 4.3.0 - :when: 2022-08-16 21:40:22.289423980 Z -- - :approve - - runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl - - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License ( http://go.microsoft.com/fwlink/?LinkId=329770) - :versions: - - 4.3.0 - :when: 2022-08-16 21:40:22.712579013 Z -- - :approve - - runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl - - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License ( http://go.microsoft.com/fwlink/?LinkId=329770) - :versions: - - 4.3.0 - :when: 2022-08-16 21:40:23.140549879 Z -- - :approve - - runtime.native.System - - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License ( http://go.microsoft.com/fwlink/?LinkId=329770) - :versions: - - 4.3.0 - :when: 2022-08-16 21:40:23.578082745 Z -- - :approve - - runtime.native.System.IO.Compression - - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License ( http://go.microsoft.com/fwlink/?LinkId=329770) - :versions: - - 4.3.0 - :when: 2022-08-16 21:40:23.998148184 Z - - :approve - runtime.native.System.Net.Http - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License ( http://go.microsoft.com/fwlink/?LinkId=329770) + :why: MICROSOFT .NET LIBRARY License (http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - 4.3.0 :when: 2022-08-16 21:40:24.434111736 Z - - :approve - - runtime.native.System.Security.Cryptography.Apple - - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License ( http://go.microsoft.com/fwlink/?LinkId=329770) - :versions: - - 4.3.0 - :when: 2022-08-16 21:40:24.868505894 Z -- - :approve - - runtime.native.System.Security.Cryptography.OpenSsl - - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License ( http://go.microsoft.com/fwlink/?LinkId=329770) - :versions: - - 4.3.0 - :when: 2022-08-16 21:40:25.303742409 Z -- - :approve - - runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl - - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License ( http://go.microsoft.com/fwlink/?LinkId=329770) - :versions: - - 4.3.0 - :when: 2022-08-16 21:40:25.719795625 Z -- - :approve - - runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl - - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License ( http://go.microsoft.com/fwlink/?LinkId=329770) - :versions: - - 4.3.0 - :when: 2022-08-16 21:40:26.152928791 Z -- - :approve - - runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple - - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License ( http://go.microsoft.com/fwlink/?LinkId=329770) - :versions: - - 4.3.0 - :when: 2022-08-16 21:40:26.579463736 Z -- - :approve - - runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl - - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License ( http://go.microsoft.com/fwlink/?LinkId=329770) - :versions: - - 4.3.0 - :when: 2022-08-16 21:40:27.001874526 Z -- - :approve - - runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl + - System.IdentityModel.Tokens.Jwt - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License ( http://go.microsoft.com/fwlink/?LinkId=329770) + :why: MIT (https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet/raw/dev/LICENSE.txt) :versions: - - 4.3.0 - :when: 2022-08-16 21:40:27.431289100 Z + - 7.1.2 + :when: 2022-10-14 23:37:56.206982078 Z - - :approve - - runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl + - System.IO.Pipelines - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License ( http://go.microsoft.com/fwlink/?LinkId=329770) + :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 4.3.0 - :when: 2022-08-16 21:40:27.853144921 Z + - 8.0.0 + :when: 2022-08-16 23:06:53.356642197 Z - - :approve - - runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl + - System.Reflection.Metadata - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License ( http://go.microsoft.com/fwlink/?LinkId=329770) + :why: MIT (https://github.com/dotnet/corefx/raw/master/LICENSE.TXT) :versions: - - 4.3.0 - :when: 2022-08-16 21:40:28.265837209 Z + - 1.6.0 + :when: 2022-08-16 23:07:03.120522282 Z - - :approve - - runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl + - coverlet.collector - :who: mocsharp - :why: MICROSOFT .NET LIBRARY License ( http://go.microsoft.com/fwlink/?LinkId=329770) + :why: MIT (https://github.com/coverlet-coverage/coverlet/raw/master/LICENSE) :versions: - - 4.3.0 - :when: 2022-08-16 21:40:28.686857664 Z + - 6.0.4 + :when: 2022-08-16 21:40:21.855388365 Z - - :approve - xunit - :who: mocsharp :why: Apache-2.0 ( https://raw.githubusercontent.com/xunit/xunit/master/license.txt) :versions: - - 2.6.3 + - 2.9.3 :when: 2022-08-16 21:40:29.166018542 Z - - :approve - xunit.abstractions @@ -886,40 +809,40 @@ - :who: mocsharp :why: Apache-2.0 ( https://raw.githubusercontent.com/xunit/xunit.analyzers/master/LICENSE) :versions: - - 1.7.0 + - 1.18.0 :when: 2022-08-16 21:40:30.047067134 Z - - :approve - xunit.assert - :who: mocsharp :why: Apache-2.0 ( https://raw.githubusercontent.com/xunit/xunit/master/license.txt) :versions: - - 2.6.3 + - 2.9.3 :when: 2022-08-16 21:40:30.526718458 Z - - :approve - xunit.core - :who: mocsharp :why: Apache-2.0 ( https://raw.githubusercontent.com/xunit/xunit/master/license.txt) :versions: - - 2.6.3 + - 2.9.3 :when: 2022-08-16 21:40:30.973515441 Z - - :approve - xunit.extensibility.core - :who: mocsharp :why: Apache-2.0 ( https://raw.githubusercontent.com/xunit/xunit/master/license.txt) :versions: - - 2.6.3 + - 2.9.3 :when: 2022-08-16 21:40:31.401607230 Z - - :approve - xunit.extensibility.execution - :who: mocsharp :why: Apache-2.0 ( https://raw.githubusercontent.com/xunit/xunit/master/license.txt) :versions: - - 2.6.3 + - 2.9.3 :when: 2022-08-16 21:40:31.845685693 Z - - :approve - xunit.runner.visualstudio - :who: mocsharp :why: MIT ( https://licenses.nuget.org/MIT) :versions: - - 2.5.5 + - 3.0.2 :when: 2022-08-16 21:40:32.294717110 Z diff --git a/src/Authentication/Monai.Deploy.Security.Authentication.csproj b/src/Authentication/Monai.Deploy.Security.Authentication.csproj index 76a776d..66f748f 100644 --- a/src/Authentication/Monai.Deploy.Security.Authentication.csproj +++ b/src/Authentication/Monai.Deploy.Security.Authentication.csproj @@ -67,12 +67,12 @@ - - + + - - - + + + \ No newline at end of file diff --git a/src/Authentication/Tests/Monai.Deploy.Security.Authentication.Tests.csproj b/src/Authentication/Tests/Monai.Deploy.Security.Authentication.Tests.csproj index 9f9346a..9673df7 100644 --- a/src/Authentication/Tests/Monai.Deploy.Security.Authentication.Tests.csproj +++ b/src/Authentication/Tests/Monai.Deploy.Security.Authentication.Tests.csproj @@ -21,18 +21,18 @@ false - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all - - + + From 3eba1d060248ff91410935ab4646c605df77aaad Mon Sep 17 00:00:00 2001 From: Victor Chang Date: Mon, 24 Mar 2025 10:06:51 -0700 Subject: [PATCH 02/13] Update GHA packages --- .github/workflows/ci.yml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f487ef0..f7a3eff 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -45,11 +45,11 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: actions/setup-dotnet@v3 + - uses: actions/setup-dotnet@v4 with: dotnet-version: "8.0.x" @@ -62,7 +62,7 @@ jobs: ${{ runner.os }}-nuget - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: languages: csharp @@ -75,7 +75,7 @@ jobs: working-directory: ./src - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 analyze: runs-on: ubuntu-latest @@ -86,10 +86,10 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: actions/setup-dotnet@v3 + - uses: actions/setup-dotnet@v4 with: dotnet-version: "8.0.x" @@ -130,12 +130,12 @@ jobs: runs-on: ubuntu-latest steps: - name: Set up JDK 11 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: '17' - - uses: actions/setup-dotnet@v3 + - uses: actions/setup-dotnet@v4 with: dotnet-version: "8.0.x" @@ -147,7 +147,7 @@ jobs: restore-keys: | ${{ runner.os }}-nuget - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 @@ -216,11 +216,11 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: actions/setup-dotnet@v3 + - uses: actions/setup-dotnet@v4 with: dotnet-version: "8.0.x" @@ -282,7 +282,7 @@ jobs: needs: [build, unit-test] if: ${{ ! ( github.event.inputs.nuget ) && ! ( contains(github.ref, 'refs/heads/main') ) }} steps: - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 id: download - name: List artifacts @@ -291,7 +291,7 @@ jobs: - name: Install grp run: dotnet tool install gpr -g - - uses: actions/setup-dotnet@v3 + - uses: actions/setup-dotnet@v4 env: NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}} with: @@ -307,7 +307,7 @@ jobs: needs: [build, unit-test] if: ${{ github.event.inputs.nuget }} steps: - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 id: download - name: List artifacts @@ -316,7 +316,7 @@ jobs: - name: Install grp run: dotnet tool install gpr -g - - uses: actions/setup-dotnet@v3 + - uses: actions/setup-dotnet@v4 env: NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}} with: @@ -335,11 +335,11 @@ jobs: MAJORMINORPATCH: ${{ needs.build.outputs.majorMinorPatch }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 id: download - name: List artifacts From 946581fdce3c8d5e4db831945114c3e094bdb8c7 Mon Sep 17 00:00:00 2001 From: Victor Chang Date: Mon, 24 Mar 2025 10:08:41 -0700 Subject: [PATCH 03/13] Update actions/cache --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f7a3eff..464b61b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -54,7 +54,7 @@ jobs: dotnet-version: "8.0.x" - name: Enable NuGet cache - uses: actions/cache@v3.3.2 + uses: actions/cache@v4.2.3 with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }} @@ -102,7 +102,7 @@ jobs: tools: licensefinder - name: Enable NuGet cache - uses: actions/cache@v3.3.2 + uses: actions/cache@v4.2.3 with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }} @@ -140,7 +140,7 @@ jobs: dotnet-version: "8.0.x" - name: Enable NuGet cache - uses: actions/cache@v3.3.2 + uses: actions/cache@v4.2.3 with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }} @@ -225,7 +225,7 @@ jobs: dotnet-version: "8.0.x" - name: Enable NuGet cache - uses: actions/cache@v3.3.2 + uses: actions/cache@v4.2.3 with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }} From 3419331e59650df550f4e3eab8ee7417119b2abc Mon Sep 17 00:00:00 2001 From: Victor Chang Date: Mon, 24 Mar 2025 10:17:49 -0700 Subject: [PATCH 04/13] Update gittools --- .github/workflows/ci.yml | 10 +++++----- GitVersion.yml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 464b61b..f4eed6a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -241,7 +241,7 @@ jobs: - name: Determine Version id: gitversion - uses: gittools/actions/gitversion/execute@v0.10.2 + uses: gittools/actions/gitversion/execute@v3.1.11 with: useConfigFile: true updateAssemblyInfo: true @@ -356,12 +356,12 @@ jobs: msg: ${{ github.repository }} - name: Install GitReleaseManager - uses: gittools/actions/gitreleasemanager/setup@v0.10.2 + uses: gittools/actions/gitreleasemanager/setup@v3.1.11 with: versionSpec: "0.13.x" - name: Create release with GitReleaseManager - uses: gittools/actions/gitreleasemanager/create@v0.10.2 + uses: gittools/actions/gitreleasemanager/create@v3.1.11 with: token: ${{ secrets.GITHUB_TOKEN }} owner: ${{ steps.repo.outputs._0 }} @@ -371,7 +371,7 @@ jobs: - name: Publish release with GitReleaseManager if: ${{ contains(github.ref, 'refs/heads/main') }} - uses: gittools/actions/gitreleasemanager/publish@v0.10.2 + uses: gittools/actions/gitreleasemanager/publish@v3.1.11 with: token: ${{ secrets.GITHUB_TOKEN }} owner: ${{ steps.repo.outputs._0 }} @@ -380,7 +380,7 @@ jobs: - name: Close release with GitReleaseManager if: ${{ contains(github.ref, 'refs/heads/main') }} - uses: gittools/actions/gitreleasemanager/close@v0.10.2 + uses: gittools/actions/gitreleasemanager/close@v3.1.11 with: token: ${{ secrets.GITHUB_TOKEN }} owner: ${{ steps.repo.outputs._0 }} diff --git a/GitVersion.yml b/GitVersion.yml index 653a125..220f37d 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -56,7 +56,7 @@ branches: mode: ContinuousDeployment increment: Inherit prevent-increment-of-merged-branch-version: false - tag-number-pattern: '[/-](?\d+)[-/]' + label-number-pattern: '[/-](?\d+)[-/]' track-merge-target: false source-branches: [ 'main', 'release', 'feature' ] tracks-release-branches: false From df793556fee2d28d7f4e2be094cf559529139513 Mon Sep 17 00:00:00 2001 From: Victor Chang Date: Mon, 24 Mar 2025 10:45:15 -0700 Subject: [PATCH 05/13] Update GitVersion.yml for v6 --- GitVersion.yml | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/GitVersion.yml b/GitVersion.yml index 220f37d..5da51bb 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -12,56 +12,49 @@ # See the License for the specific language governing permissions and # limitations under the License. +workflow: GitHubFlow/v1 assembly-versioning-scheme: MajorMinorPatchTag +assembly-file-versioning-scheme: MajorMinorPatchTag mode: ContinuousDeployment branches: main: - tag: '' + label: '' mode: ContinuousDelivery increment: Patch - prevent-increment-of-merged-branch-version: true - track-merge-target: false source-branches: [ 'release' ] tracks-release-branches: false is-release-branch: false - is-mainline: true pre-release-weight: 55000 release: - tag: rc + label: rc regex: ^releases?[/-] mode: ContinuousDeployment increment: None - prevent-increment-of-merged-branch-version: true track-merge-target: false source-branches: [ 'main', 'release' ] tracks-release-branches: false is-release-branch: true - is-mainline: false pre-release-weight: 30000 feature: - tag: alpha.{BranchName} + label: alpha.{BranchName} regex: ^features?[/-] mode: ContinuousDeployment increment: Inherit - prevent-increment-of-merged-branch-version: false track-merge-target: false source-branches: [ 'main', 'release', 'feature' ] tracks-release-branches: false is-release-branch: false - is-mainline: false pre-release-weight: 30000 pull-request: - tag: pr + label: pr regex: ^(pull|pull\-requests|pr)[/-] mode: ContinuousDeployment increment: Inherit - prevent-increment-of-merged-branch-version: false label-number-pattern: '[/-](?\d+)[-/]' track-merge-target: false source-branches: [ 'main', 'release', 'feature' ] tracks-release-branches: false is-release-branch: false - is-mainline: false pre-release-weight: 30000 ignore: From e4be2f7b33ee8d328c523340570a0c349db4408f Mon Sep 17 00:00:00 2001 From: Victor Chang Date: Mon, 24 Mar 2025 11:00:12 -0700 Subject: [PATCH 06/13] Switch to TrunkBased/preview1 https://github.com/GitTools/GitVersion/issues/4350 --- GitVersion.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GitVersion.yml b/GitVersion.yml index 5da51bb..14e0d3f 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -workflow: GitHubFlow/v1 +workflow: TrunkBased/preview1 assembly-versioning-scheme: MajorMinorPatchTag assembly-file-versioning-scheme: MajorMinorPatchTag mode: ContinuousDeployment From 720ad21f7048d19a16ac04e736db26b9e03b0c55 Mon Sep 17 00:00:00 2001 From: Victor Chang Date: Mon, 24 Mar 2025 11:04:35 -0700 Subject: [PATCH 07/13] Setup GitVersion --- .github/workflows/ci.yml | 6 ++++-- GitVersion.yml | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f4eed6a..26131c3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -236,8 +236,10 @@ jobs: run: dotnet restore working-directory: ./src - - name: Install GitVersion - run: dotnet tool install --global GitVersion.Tool + - name: Setup GitVersion + uses: gittools/actions/gitversion/setup@v3.1.1 + with: + versionSpec: '6.0.5' - name: Determine Version id: gitversion diff --git a/GitVersion.yml b/GitVersion.yml index 14e0d3f..5da51bb 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -workflow: TrunkBased/preview1 +workflow: GitHubFlow/v1 assembly-versioning-scheme: MajorMinorPatchTag assembly-file-versioning-scheme: MajorMinorPatchTag mode: ContinuousDeployment From b9f56c14ff7960f2558af4d8c5425099da1d70e9 Mon Sep 17 00:00:00 2001 From: Victor Chang Date: Mon, 24 Mar 2025 11:27:41 -0700 Subject: [PATCH 08/13] Change package version --- .github/workflows/ci.yml | 2 +- src/AssemblyInfo.cs | 6 +++--- .../Monai.Deploy.Security.Authentication.csproj | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 26131c3..a0e6a17 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -266,7 +266,7 @@ jobs: if: ${{ matrix.os == 'ubuntu-latest' }} run: | mkdir $PACKAGEDIR - dotnet pack --no-build -c ${{ env.BUILD_CONFIG }} -o $PACKAGEDIR -p:PackageVersion=${{ steps.gitversion.outputs.nuGetVersionV2 }} + dotnet pack --no-build -c ${{ env.BUILD_CONFIG }} -o $PACKAGEDIR -p:PackageVersion=${{ steps.gitversion.outputs.majorMinorPatch }}-${{steps.gitversion.outputs.Sha }} ls -lR $PACKAGEDIR working-directory: ./src diff --git a/src/AssemblyInfo.cs b/src/AssemblyInfo.cs index f8b8774..695c9a2 100644 --- a/src/AssemblyInfo.cs +++ b/src/AssemblyInfo.cs @@ -24,6 +24,6 @@ using System.Reflection; -[assembly: AssemblyFileVersion("0.1.0.0")] -[assembly: AssemblyVersion("0.1.0.0")] -[assembly: AssemblyInformationalVersion("0.1.0")] +[assembly: AssemblyFileVersion("0.0.0.0")] +[assembly: AssemblyVersion("0.0.0.0")] +[assembly: AssemblyInformationalVersion("0.0.0")] diff --git a/src/Authentication/Monai.Deploy.Security.Authentication.csproj b/src/Authentication/Monai.Deploy.Security.Authentication.csproj index 66f748f..92b0e65 100644 --- a/src/Authentication/Monai.Deploy.Security.Authentication.csproj +++ b/src/Authentication/Monai.Deploy.Security.Authentication.csproj @@ -24,6 +24,7 @@ ..\.sonarlint\project-monai_monai-deploy-securitycsharp.ruleset true $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb + true From 3f6eb4c29e5a5962dfbc013584feada648ecc077 Mon Sep 17 00:00:00 2001 From: Victor Chang Date: Mon, 24 Mar 2025 11:51:26 -0700 Subject: [PATCH 09/13] Update copyright year --- .github/workflows/ci.yml | 2 +- .licenserc.yaml | 1 + CODE_OF_CONDUCT.md | 2 +- CONTRIBUTING.md | 2 +- GitReleaseManager.yaml | 2 +- GitVersion.yml | 2 +- codecov.yml | 2 +- src/AssemblyInfo.cs | 2 +- src/Authentication/Configurations/AuthenticationOptions.cs | 2 +- src/Authentication/Configurations/BasicAuthOptions.cs | 2 +- src/Authentication/Configurations/ClaimMappings.cs | 2 +- src/Authentication/Configurations/OpenIdOptions.cs | 2 +- src/Authentication/Extensions/ArrayExtensions.cs | 2 +- src/Authentication/Extensions/AuthKeys.cs | 2 +- src/Authentication/Extensions/HttpContextExtension.cs | 2 +- src/Authentication/Extensions/IApplicationBuilderExtensions.cs | 2 +- src/Authentication/Extensions/MonaiAuthenticationExtensions.cs | 2 +- src/Authentication/Logging.cs | 2 +- src/Authentication/Middleware/BasicAuthorizationMiddleware.cs | 2 +- src/Authentication/Middleware/BypassAuthenticationHandler.cs | 2 +- .../Middleware/EndpointAuthorizationMiddleware.cs | 2 +- src/Authentication/Monai.Deploy.Security.Authentication.csproj | 2 +- src/Authentication/Tests/BasicAuthorizationMiddlewareTest.cs | 2 +- src/Authentication/Tests/EndpointAuthorizationMiddlewareTest.cs | 2 +- src/Authentication/Tests/MockJwtTokenHandler.cs | 2 +- .../Tests/Monai.Deploy.Security.Authentication.Tests.csproj | 2 +- src/Authentication/Tests/TestController.cs | 2 +- src/Authentication/Tests/Usings.cs | 2 +- third-party-licenses.md | 2 +- 29 files changed, 29 insertions(+), 28 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a0e6a17..0d64c51 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,4 +1,4 @@ -# Copyright 2022 MONAI Consortium +# Copyright 2022-2025 MONAI Consortium # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/.licenserc.yaml b/.licenserc.yaml index 9d15715..47ac3d8 100644 --- a/.licenserc.yaml +++ b/.licenserc.yaml @@ -2,6 +2,7 @@ header: license: spdx-id: Apache-2.0 copyright-owner: MONAI Consortium + copyright-year: 2022-2025 paths: - 'src' diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index b71ba6e..ee10b2e 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -1,5 +1,5 @@