diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9fc9e66..ad05a3f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,12 +38,12 @@ jobs: with: fetch-depth: 0 - - uses: actions/setup-dotnet@v3 + - uses: actions/setup-dotnet@v4 with: dotnet-version: "8.0.x" - name: Enable NuGet cache - uses: actions/cache@v4.0.2 + uses: actions/cache@v4.2.3 with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }} @@ -82,7 +82,7 @@ jobs: uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: actions/setup-dotnet@v3 + - uses: actions/setup-dotnet@v4 with: dotnet-version: "8.0.x" @@ -95,7 +95,7 @@ jobs: tools: licensefinder - name: Enable NuGet cache - uses: actions/cache@v4.0.2 + uses: actions/cache@v4.2.3 with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }} @@ -133,7 +133,7 @@ jobs: dotnet-version: "8.0.x" - name: Enable NuGet cache - uses: actions/cache@v4.0.2 + uses: actions/cache@v4.2.3 with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }} @@ -188,7 +188,7 @@ jobs: docker volume rm tests_minio_config working-directory: ./src/Plugins/MinIO/Tests - - uses: codecov/codecov-action@v4.4.1 + - uses: codecov/codecov-action@v3.1.4 with: token: ${{ secrets.CODECOV_TOKEN }} directory: "src/" @@ -221,12 +221,12 @@ jobs: with: fetch-depth: 0 - - uses: actions/setup-dotnet@v3 + - uses: actions/setup-dotnet@v4 with: dotnet-version: "8.0.x" - name: Enable NuGet cache - uses: actions/cache@v4.0.2 + uses: actions/cache@v4.2.3 with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }} @@ -237,12 +237,14 @@ 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 - uses: gittools/actions/gitversion/execute@v0.10.2 + uses: gittools/actions/gitversion/execute@v3.1.11 with: useConfigFile: true updateAssemblyInfo: true @@ -265,7 +267,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.EscapedBranchName }}.${{ steps.gitversion.outputs.CommitsSinceVersionSource }} ls -lR $PACKAGEDIR working-directory: ./src @@ -307,7 +309,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: @@ -332,7 +334,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: @@ -348,7 +350,7 @@ jobs: runs-on: ubuntu-latest needs: [build, unit-test] env: - MAJORMINORPATCH: ${{ needs.build.outputs.majorMinorPatch }} + MAJORMINORPATCH: ${{ needs.build.outputs.MajorMinorPatch }} steps: - uses: actions/checkout@v4 @@ -372,12 +374,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" + versionSpec: '0.18.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 }} @@ -390,16 +392,17 @@ 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 }} repository: ${{ steps.repo.outputs._1 }} tagName: ${{ env.MAJORMINORPATCH }} + milestone: ${{ env.MAJORMINORPATCH }} - 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/.licenserc.yaml b/.licenserc.yaml index de4456a..eab5f89 100644 --- a/.licenserc.yaml +++ b/.licenserc.yaml @@ -2,8 +2,7 @@ header: license: spdx-id: Apache-2.0 copyright-owner: MONAI Consortium - copyright-year: '2021-2024' - + copyright-year: '2021-2025' paths: - 'src' diff --git a/GitVersion.yml b/GitVersion.yml index 5d07ab0..79f597c 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -1,59 +1,48 @@ # SPDX-FileCopyrightText: © 2022 MONAI Consortium # SPDX-License-Identifier: Apache License 2.0 +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 - tag-number-pattern: '[/-](?\d+)[-/]' - track-merge-target: false + label-number-pattern: '[/-](?\d+)[-/]' source-branches: [ 'main', 'release', 'feature' ] tracks-release-branches: false is-release-branch: false - is-mainline: false pre-release-weight: 30000 ignore: sha: [] merge-message-formats: {} -next-version: 0.2.17 diff --git a/doc/dependency_decisions.yml b/doc/dependency_decisions.yml index e2b0ffa..ef55632 100644 --- a/doc/dependency_decisions.yml +++ b/doc/dependency_decisions.yml @@ -4,28 +4,28 @@ - :who: mocsharp :why: Apache-2.0 (https://github.com/aws/aws-sdk-net/raw/master/License.txt) :versions: - - 3.7.304.15 + - 3.7.402.25 :when: 2022-08-29 18:11:12.923214877 Z - - :approve - AWSSDK.S3 - :who: mocsharp :why: Apache-2.0 (https://github.com/aws/aws-sdk-net/raw/master/License.txt) :versions: - - 3.7.309.3 + - 3.7.415.24 :when: 2022-08-29 18:11:13.354973002 Z - - :approve - AWSSDK.SecurityToken - :who: mocsharp :why: Apache-2.0 (https://github.com/aws/aws-sdk-net/raw/master/License.txt) :versions: - - 3.7.300.105 + - 3.7.401.68 :when: 2022-08-16 18:11:13.781079769 Z - - :approve - Ardalis.GuardClauses - :who: mocsharp :why: MIT (https://github.com/ardalis/GuardClauses.Analyzers/raw/master/LICENSE) :versions: - - 4.5.0 + - 4.6.0 :when: 2022-08-16 18:11:14.642522140 Z - - :approve - Castle.Core @@ -51,16 +51,16 @@ - - :approve - FluentAssertions - :who: mocsharp - :why: Apache-2.0 (https://github.com/fluentassertions/fluentassertions/raw/develop/LICENSE) + :why: Apache-2.0 (https://raw.githubusercontent.com/fluentassertions/fluentassertions/refs/tags/6.12.2/LICENSE) :versions: - - 6.12.0 + - 6.12.2 :when: 2022-11-28 18:12:27.491158618 Z - - :approve - Microsoft.CodeCoverage - :who: mocsharp :why: MIT (https://github.com/microsoft/vstest/raw/v17.7.0/LICENSE) :versions: - - 17.10.0 + - 17.13.0 :when: 2022-08-16 18:11:17.245887971 Z - - :approve - Microsoft.Extensions.Configuration.Abstractions @@ -81,28 +81,28 @@ - :who: mocsharp :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 8.0.1 + - 8.0.2 :when: 2022-08-16 18:11:22.090772006 Z - - :approve - Microsoft.Extensions.Diagnostics.Abstractions - :who: mocsharp :why: MIT (https://github.com/dotnet/aspnetcore/raw/main/LICENSE.txt) :versions: - - 8.0.0 + - 8.0.1 :when: 2022-08-29 18:11:22.090772006 Z - - :approve - Microsoft.Extensions.Diagnostics.HealthChecks - :who: mocsharp :why: MIT (https://github.com/dotnet/aspnetcore/raw/main/LICENSE.txt) :versions: - - 8.0.6 + - 8.0.14 :when: 2022-08-29 18:11:22.090772006 Z - - :approve - Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - :who: mocsharp :why: MIT (https://github.com/dotnet/aspnetcore/raw/main/LICENSE.txt) :versions: - - 8.0.6 + - 8.0.14 :when: 2022-08-29 18:11:22.090772006 Z - - :approve - Microsoft.Extensions.FileProviders.Abstractions @@ -116,7 +116,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 18:11:24.291406794 Z - - :approve - Microsoft.Extensions.Logging @@ -131,7 +131,7 @@ - :who: mocsharp :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 8.0.1 + - 8.0.3 :when: 2022-08-29 18:11:25.167886026 Z - - :approve - Microsoft.Extensions.Options @@ -152,7 +152,7 @@ - :who: mocsharp :why: MIT (https://github.com/microsoft/vstest/raw/v17.7.0/LICENSE) :versions: - - 17.10.0 + - 17.13.0 :when: 2022-08-16 18:11:29.155295778 Z - - :approve - Microsoft.NETCore.Platforms @@ -173,14 +173,14 @@ - :who: mocsharp :why: MIT (https://github.com/microsoft/vstest/raw/v17.7.0/LICENSE) :versions: - - 17.10.0 + - 17.13.0 :when: 2022-08-16 18:11:32.293966383 Z - - :approve - Microsoft.TestPlatform.TestHost - :who: mocsharp :why: MIT (https://github.com/microsoft/vstest/raw/v17.7.0/LICENSE) :versions: - - 17.10.0 + - 17.13.0 :when: 2022-08-16 18:11:33.162650175 Z - - :approve - Microsoft.Win32.Primitives @@ -201,7 +201,7 @@ - :who: mocsharp :why: BSD 3-Clause License ( https://raw.githubusercontent.com/moq/moq4/main/License.txt) :versions: - - 4.20.70 + - 4.20.72 :when: 2022-08-16 18:11:34.872036382 Z - - :approve - NETStandard.Library @@ -335,14 +335,14 @@ - :who: samrooke :why: MIT (https://github.com/TestableIO/System.IO.Abstractions/raw/main/LICENSE) :versions: - - 21.0.2 + - 21.3.1 :when: 2022-12-14 12:28:00.728481602 Z - - :approve - System.IO.Abstractions.TestingHelpers - :who: samrooke :why: MIT (https://github.com/TestableIO/System.IO.Abstractions/raw/main/LICENSE) :versions: - - 21.0.2 + - 21.3.1 :when: 2022-12-14 12:28:00.728481602 Z - - :approve - runtime.native.System.IO.Compression @@ -664,28 +664,28 @@ - :who: samrooke :why: MIT (https://github.com/TestableIO/System.IO.Abstractions/raw/main/LICENSE) :versions: - - 21.0.2 + - 21.3.1 :when: 2022-12-14 12:28:00.728481602 Z - - :approve - TestableIO.System.IO.Abstractions.TestingHelpers - :who: samrooke :why: MIT (https://github.com/TestableIO/System.IO.Abstractions/raw/main/LICENSE) :versions: - - 21.0.2 + - 21.3.1 :when: 2022-12-14 12:28:00.728481602 Z - - :approve - TestableIO.System.IO.Abstractions.Wrappers - :who: samrooke :why: MIT (https://github.com/TestableIO/System.IO.Abstractions/raw/main/LICENSE) :versions: - - 21.0.2 + - 21.3.1 :when: 2022-12-14 12:28:00.728481602 Z - - :approve - coverlet.collector - :who: mocsharp :why: MIT (https://github.com/coverlet-coverage/coverlet/raw/master/LICENSE) :versions: - - 6.0.2 + - 6.0.4 :when: 2022-08-16 18:12:11.244463651 Z - - :approve - runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl @@ -797,7 +797,7 @@ - :who: mocsharp :why: Apache-2.0 ( https://raw.githubusercontent.com/xunit/xunit/master/license.txt) :versions: - - 2.8.1 + - 2.9.3 :when: 2022-08-16 21:40:29.166018542 Z - - :approve - xunit.abstractions @@ -811,40 +811,40 @@ - :who: mocsharp :why: Apache-2.0 ( https://raw.githubusercontent.com/xunit/xunit.analyzers/master/LICENSE) :versions: - - 1.14.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.8.1 + - 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.8.1 + - 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.8.1 + - 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.8.1 + - 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.8.1 + - 3.0.2 :when: 2022-08-16 21:40:32.294717110 Z \ No newline at end of file diff --git a/src/AssemblyInfo.cs b/src/AssemblyInfo.cs index 10faff2..0515397 100644 --- a/src/AssemblyInfo.cs +++ b/src/AssemblyInfo.cs @@ -1,5 +1,5 @@ /* - * Copyright 2021-2024 MONAI Consortium + * Copyright 2021-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/src/Plugins/AWSS3/AWS3StorageService.cs b/src/Plugins/AWSS3/AWS3StorageService.cs index ba90c2e..64e7e52 100644 --- a/src/Plugins/AWSS3/AWS3StorageService.cs +++ b/src/Plugins/AWSS3/AWS3StorageService.cs @@ -1,5 +1,5 @@ /* - * Copyright 2021-2024 MONAI Consortium + * Copyright 2021-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/src/Plugins/AWSS3/ConfigurationKeys.cs b/src/Plugins/AWSS3/ConfigurationKeys.cs index f64972a..86392fc 100644 --- a/src/Plugins/AWSS3/ConfigurationKeys.cs +++ b/src/Plugins/AWSS3/ConfigurationKeys.cs @@ -1,5 +1,5 @@ /* - * Copyright 2021-2024 MONAI Consortium + * Copyright 2021-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/src/Plugins/AWSS3/Monai.Deploy.Storage.AWSS3.csproj b/src/Plugins/AWSS3/Monai.Deploy.Storage.AWSS3.csproj index 3cbc1a7..9473e14 100644 --- a/src/Plugins/AWSS3/Monai.Deploy.Storage.AWSS3.csproj +++ b/src/Plugins/AWSS3/Monai.Deploy.Storage.AWSS3.csproj @@ -1,5 +1,5 @@