diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e9295b9..c3fe5be 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -52,7 +52,7 @@ jobs: tools: licensefinder - name: Enable NuGet cache - uses: actions/cache@v3.2.3 + uses: actions/cache@v3.3.1 with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }} @@ -105,7 +105,7 @@ jobs: dotnet-version: "6.0.x" - name: Enable NuGet cache - uses: actions/cache@v3.2.3 + uses: actions/cache@v3.3.1 with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }} @@ -198,7 +198,7 @@ jobs: dotnet-version: "6.0.x" - name: Enable NuGet cache - uses: actions/cache@v3.2.3 + uses: actions/cache@v3.3.1 with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }} @@ -214,7 +214,7 @@ jobs: - name: Determine Version id: gitversion - uses: gittools/actions/gitversion/execute@v0.9.15 + uses: gittools/actions/gitversion/execute@v0.10.2 with: useConfigFile: true updateAssemblyInfo: true @@ -336,12 +336,12 @@ jobs: msg: ${{ github.repository }} - name: Install GitReleaseManager - uses: gittools/actions/gitreleasemanager/setup@v0.9.15 + uses: gittools/actions/gitreleasemanager/setup@v0.10.2 with: versionSpec: "0.13.x" - name: Create release with GitReleaseManager - uses: gittools/actions/gitreleasemanager/create@v0.9.15 + uses: gittools/actions/gitreleasemanager/create@v0.10.2 with: token: ${{ secrets.GITHUB_TOKEN }} owner: ${{ steps.repo.outputs._0 }} @@ -353,7 +353,7 @@ jobs: - name: Publish release with GitReleaseManager if: ${{ contains(github.ref, 'refs/heads/main') }} - uses: gittools/actions/gitreleasemanager/publish@v0.9.15 + uses: gittools/actions/gitreleasemanager/publish@v0.10.2 with: token: ${{ secrets.GITHUB_TOKEN }} owner: ${{ steps.repo.outputs._0 }} @@ -362,7 +362,7 @@ jobs: - name: Close release with GitReleaseManager if: ${{ contains(github.ref, 'refs/heads/main') }} - uses: gittools/actions/gitreleasemanager/close@v0.9.15 + uses: gittools/actions/gitreleasemanager/close@v0.10.2 with: token: ${{ secrets.GITHUB_TOKEN }} owner: ${{ steps.repo.outputs._0 }} diff --git a/.github/workflows/package-cleanup.yml b/.github/workflows/package-cleanup.yml index 51f645c..49f3dcd 100644 --- a/.github/workflows/package-cleanup.yml +++ b/.github/workflows/package-cleanup.yml @@ -18,6 +18,7 @@ jobs: name: Monai.Deploy.Messaging with: package-name: 'Monai.Deploy.Messaging' + package-type: nuget min-versions-to-keep: 10 delete-only-pre-release-versions: "true" @@ -25,6 +26,7 @@ jobs: name: Monai.Deploy.Messaging.RabbitMQ with: package-name: 'Monai.Deploy.Messaging.RabbitMQ' + package-type: nuget min-versions-to-keep: 10 delete-only-pre-release-versions: "true" diff --git a/GitVersion.yml b/GitVersion.yml index a4e2731..77eb439 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -56,4 +56,4 @@ branches: ignore: sha: [] merge-message-formats: {} -next-version: 0.1.16 +next-version: 0.1.19 diff --git a/doc/dependency_decisions.yml b/doc/dependency_decisions.yml old mode 100644 new mode 100755 index 2c153c5..136e401 --- a/doc/dependency_decisions.yml +++ b/doc/dependency_decisions.yml @@ -4,15 +4,22 @@ - :who: mocsharp :why: MIT (https://github.com/ardalis/GuardClauses.Analyzers/raw/master/LICENSE) :versions: - - 4.0.1 + - 4.1.1 :when: 2022-08-16 21:39:30.077666354 Z - - :approve - Castle.Core - - :who: mocsharp + - :who: woodheadio :why: Apache-2.0 (https://github.com/castleproject/Core/raw/master/LICENSE) :versions: - 5.1.1 - :when: 2022-08-16 21:39:36.541100978 Z + :when: 2023-08-16 16:49:26.950721112 Z +- - :approve + - coverlet.collector + - :who: mocsharp + :why: MIT (https://github.com/coverlet-coverage/coverlet/raw/master/LICENSE) + :versions: + - 6.0.0 + :when: 2022-08-16 21:40:21.855388365 Z - - :approve - JetBrains.Annotations - :who: mocsharp @@ -21,33 +28,19 @@ - 2021.3.0 :when: 2022-08-16 21:39:36.950721112 Z - - :approve - - Microsoft.CodeCoverage - - :who: mocsharp - :why: MIT (https://github.com/microsoft/vstest/raw/v17.3.0/LICENSE) - :versions: - - 17.4.1 - :when: 2022-08-16 21:39:37.382080790 Z -- - :approve - - Microsoft.Extensions.Diagnostics.HealthChecks - - :who: mocsharp - :why: MIT (https://github.com/dotnet/aspnetcore/raw/main/LICENSE.txt) - :versions: - - 6.0.12 - :when: 2022-08-29 18:11:22.090772006 Z -- - :approve - - Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - - :who: mocsharp + - Microsoft.AspNetCore.TestHost + - :who: woodheadio :why: MIT (https://github.com/dotnet/aspnetcore/raw/main/LICENSE.txt) :versions: - - 6.0.12 - :when: 2022-08-29 18:11:22.090772006 Z + - 6.0.21 + :when: 2023-08-16 16:49:26.950721112 Z - - :approve - - Microsoft.Extensions.Configuration - - :who: mocsharp - :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) + - Microsoft.CodeCoverage + - :who: woodheadio + :why: MIT (https://github.com/microsoft/vstest/raw/v17.4.1/LICENSE) :versions: - - 6.0.1 - :when: 2022-08-16 21:39:37.807421572 Z + - 17.7.0 + :when: 2023-08-16 16:49:26.950721112 Z - - :approve - Microsoft.Extensions.Configuration.Abstractions - :who: mocsharp @@ -56,244 +49,257 @@ - 6.0.0 :when: 2022-08-16 21:39:38.225591162 Z - - :approve - - Microsoft.Extensions.Configuration.Binder + - Microsoft.Extensions.DependencyInjection.Abstractions - :who: mocsharp :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - 6.0.0 - :when: 2022-08-16 21:39:38.638186969 Z + :when: 2022-08-16 21:39:41.552489638 Z - - :approve - - Microsoft.Extensions.Configuration.CommandLine - - :who: mocsharp - :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) + - Microsoft.Extensions.Diagnostics.HealthChecks + - :who: woodheadio + :why: MIT (https://github.com/dotnet/aspnetcore/raw/main/LICENSE.txt) :versions: - - 6.0.0 - :when: 2022-08-16 21:39:39.074744664 Z + - 6.0.21 + :when: 2023-08-16 16:49:26.950721112 Z - - :approve - - Microsoft.Extensions.Configuration.EnvironmentVariables - - :who: mocsharp - :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) + - Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions + - :who: woodheadio + :why: MIT (https://github.com/dotnet/aspnetcore/raw/main/LICENSE.txt) :versions: - - 6.0.1 - :when: 2022-08-16 21:39:39.488320548 Z + - 6.0.21 + :when: 2023-08-16 16:49:26.950721112 Z - - :approve - - Microsoft.Extensions.Configuration.FileExtensions + - Microsoft.Extensions.FileProviders.Abstractions - :who: mocsharp :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - 6.0.0 - :when: 2022-08-16 21:39:39.916078157 Z + :when: 2022-08-16 21:39:41.978000106 Z - - :approve - - Microsoft.Extensions.Configuration.Json + - Microsoft.Extensions.Hosting.Abstractions - :who: mocsharp :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - 6.0.0 - :when: 2022-08-16 21:39:40.329097801 Z + :when: 2022-08-16 21:39:43.643788345 Z - - :approve - - Microsoft.Extensions.Configuration.UserSecrets + - Microsoft.Extensions.Logging.Abstractions - :who: mocsharp :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 6.0.1 - :when: 2022-08-16 21:39:40.726979602 Z + - 6.0.4 + :when: 2022-08-16 21:39:44.471693654 Z - - :approve - - Microsoft.Extensions.DependencyInjection + - Microsoft.Extensions.Options - :who: mocsharp :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - 6.0.0 - - 6.0.1 - :when: 2022-08-16 21:39:41.139600217 Z + :when: 2022-08-16 21:39:46.980521333 Z - - :approve - - Microsoft.Extensions.DependencyInjection.Abstractions + - Microsoft.Extensions.Primitives - :who: mocsharp :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - 6.0.0 - :when: 2022-08-16 21:39:41.552489638 Z + :when: 2022-08-16 21:39:47.818886422 Z - - :approve - - Microsoft.Extensions.FileProviders.Abstractions - - :who: mocsharp - :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) + - Microsoft.NET.Test.Sdk + - :who: woodheadio + :why: MIT (https://github.com/microsoft/vstest/raw/v17.4.1/LICENSE) :versions: - - 6.0.0 - :when: 2022-08-16 21:39:41.978000106 Z + - 17.7.0 + :when: 2023-08-16 16:49:26.950721112 Z - - :approve - - Microsoft.Extensions.FileProviders.Physical + - Microsoft.NETCore.Platforms - :who: mocsharp - :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) + :why: MICROSOFT .NET LIBRARY License ( http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 6.0.0 - :when: 2022-08-16 21:39:42.385571977 Z + - 1.1.0 + :when: 2022-08-16 21:39:48.664174115 Z - - :approve - - Microsoft.Extensions.FileSystemGlobbing + - Microsoft.NETCore.Targets - :who: mocsharp - :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) + :why: MICROSOFT .NET LIBRARY License ( http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 6.0.0 - :when: 2022-08-16 21:39:42.825522546 Z + - 1.1.0 + :when: 2022-08-16 21:39:49.129536997 Z - - :approve - - Microsoft.Extensions.Hosting - - :who: mocsharp - :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) + - Microsoft.TestPlatform.ObjectModel + - :who: woodheadio + :why: MIT (https://github.com/microsoft/vstest/raw/v17.4.1/LICENSE) :versions: - - 6.0.1 - :when: 2022-08-16 21:39:43.233126948 Z + - 17.7.0 + :when: 2023-08-16 16:49:26.950721112 Z - - :approve - - Microsoft.Extensions.Hosting.Abstractions + - Microsoft.TestPlatform.TestHost + - :who: woodheadio + :why: MIT (https://github.com/microsoft/vstest/raw/v17.4.1/LICENSE) + :versions: + - 17.7.0 + :when: 2023-08-16 16:49:26.950721112 Z +- - :approve + - Microsoft.Win32.Primitives - :who: mocsharp - :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) + :why: MICROSOFT .NET LIBRARY License ( http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 6.0.0 - :when: 2022-08-16 21:39:43.643788345 Z + - 4.3.0 + :when: 2022-08-16 21:39:50.378367742 Z - - :approve - - Microsoft.Extensions.Logging + - Moq + - :who: woodheadio + :why: BSD 3-Clause License ( https://raw.githubusercontent.com/moq/moq4/main/License.txt) + :versions: + - 4.20.69 + :when: 2023-08-16 16:49:26.950721112 Z +- - :approve + - NETStandard.Library - :who: mocsharp - :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) + :why: MICROSOFT .NET LIBRARY License ( http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 6.0.0 - :when: 2022-08-16 21:39:44.057386274 Z + - 1.6.1 + :when: 2022-08-16 21:39:51.206461165 Z - - :approve - - Microsoft.Extensions.Logging.Abstractions + - Newtonsoft.Json - :who: mocsharp - :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) + :why: MIT (https://github.com/JamesNK/Newtonsoft.Json/raw/master/LICENSE.md) :versions: - - 6.0.3 - :when: 2022-08-16 21:39:44.471693654 Z + - 13.0.3 + :when: 2022-08-16 21:39:51.628833960 Z - - :approve - - Microsoft.Extensions.Logging.Configuration + - NuGet.Frameworks - :who: mocsharp - :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) + :why: Apache-2.0 (https://github.com/NuGet/NuGet.Client/raw/dev/LICENSE.txt) :versions: - - 6.0.0 - :when: 2022-08-16 21:39:44.890437214 Z + - 6.5.0 + :when: 2022-08-16 21:39:52.061412838 Z - - :approve - - Microsoft.Extensions.Logging.Console + - Polly - :who: mocsharp - :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) + :why: MIT ( https://licenses.nuget.org/MIT) :versions: - - 6.0.0 - :when: 2022-08-16 21:39:45.303196611 Z + - 7.2.4 + :when: 2022-11-09 18:57:32.294717110 Z - - :approve - - Microsoft.Extensions.Logging.Debug + - RabbitMQ.Client - :who: mocsharp - :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) + :why: Apache-2.0 (https://github.com/rabbitmq/rabbitmq-dotnet-client/raw/main/LICENSE-APACHE2) :versions: - - 6.0.0 - :when: 2022-08-16 21:39:45.713202306 Z + - 6.5.0 + :when: 2022-08-16 21:39:52.474284611 Z - - :approve - - Microsoft.Extensions.Logging.EventLog + - runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl - :who: mocsharp - :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) + :why: MICROSOFT .NET LIBRARY License ( http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 6.0.0 - :when: 2022-08-16 21:39:46.150650220 Z + - 4.3.0 + :when: 2022-08-16 21:40:22.289423980 Z - - :approve - - Microsoft.Extensions.Logging.EventSource + - runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl - :who: mocsharp - :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) + :why: MICROSOFT .NET LIBRARY License ( http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 6.0.0 - :when: 2022-08-16 21:39:46.567863357 Z + - 4.3.0 + :when: 2022-08-16 21:40:22.712579013 Z - - :approve - - Microsoft.Extensions.Options + - runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl - :who: mocsharp - :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) + :why: MICROSOFT .NET LIBRARY License ( http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 6.0.0 - :when: 2022-08-16 21:39:46.980521333 Z + - 4.3.0 + :when: 2022-08-16 21:40:23.140549879 Z - - :approve - - Microsoft.Extensions.Options.ConfigurationExtensions + - runtime.native.System - :who: mocsharp - :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) + :why: MICROSOFT .NET LIBRARY License ( http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 6.0.0 - :when: 2022-08-16 21:39:47.395045210 Z + - 4.3.0 + :when: 2022-08-16 21:40:23.578082745 Z - - :approve - - Microsoft.Extensions.Primitives + - runtime.native.System.IO.Compression - :who: mocsharp - :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) + :why: MICROSOFT .NET LIBRARY License ( http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 6.0.0 - :when: 2022-08-16 21:39:47.818886422 Z + - 4.3.0 + :when: 2022-08-16 21:40:23.998148184 Z - - :approve - - Microsoft.NET.Test.Sdk + - runtime.native.System.Net.Http - :who: mocsharp - :why: MIT (https://github.com/microsoft/vstest/raw/v17.4.1/LICENSE) + :why: MICROSOFT .NET LIBRARY License ( http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 17.4.1 - :when: 2022-08-16 21:39:48.253593534 Z + - 4.3.0 + :when: 2022-08-16 21:40:24.434111736 Z - - :approve - - Microsoft.NETCore.Platforms + - runtime.native.System.Security.Cryptography.Apple - :who: mocsharp :why: MICROSOFT .NET LIBRARY License ( http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 1.1.0 - :when: 2022-08-16 21:39:48.664174115 Z + - 4.3.0 + :when: 2022-08-16 21:40:24.868505894 Z - - :approve - - Microsoft.NETCore.Targets + - runtime.native.System.Security.Cryptography.OpenSsl - :who: mocsharp :why: MICROSOFT .NET LIBRARY License ( http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 1.1.0 - :when: 2022-08-16 21:39:49.129536997 Z + - 4.3.0 + :when: 2022-08-16 21:40:25.303742409 Z - - :approve - - Microsoft.TestPlatform.ObjectModel + - runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl - :who: mocsharp - :why: MIT (https://github.com/microsoft/vstest/raw/v17.4.1/LICENSE) + :why: MICROSOFT .NET LIBRARY License ( http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 17.4.1 - :when: 2022-08-16 21:39:49.547958989 Z + - 4.3.0 + :when: 2022-08-16 21:40:25.719795625 Z - - :approve - - Microsoft.TestPlatform.TestHost + - runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl - :who: mocsharp - :why: MIT (https://github.com/microsoft/vstest/raw/v17.4.1/LICENSE) + :why: MICROSOFT .NET LIBRARY License ( http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 17.4.1 - :when: 2022-08-16 21:39:49.963749572 Z + - 4.3.0 + :when: 2022-08-16 21:40:26.152928791 Z - - :approve - - Microsoft.Win32.Primitives + - 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:39:50.378367742 Z + :when: 2022-08-16 21:40:26.579463736 Z - - :approve - - Moq + - runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl - :who: mocsharp - :why: BSD 3-Clause License ( https://raw.githubusercontent.com/moq/moq4/main/License.txt) + :why: MICROSOFT .NET LIBRARY License ( http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 4.18.4 - :when: 2022-08-16 21:39:50.787673214 Z + - 4.3.0 + :when: 2022-08-16 21:40:27.001874526 Z - - :approve - - NETStandard.Library + - runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl - :who: mocsharp :why: MICROSOFT .NET LIBRARY License ( http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 1.6.1 - :when: 2022-08-16 21:39:51.206461165 Z + - 4.3.0 + :when: 2022-08-16 21:40:27.431289100 Z - - :approve - - Newtonsoft.Json + - runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl - :who: mocsharp - :why: MIT (https://github.com/JamesNK/Newtonsoft.Json/raw/master/LICENSE.md) + :why: MICROSOFT .NET LIBRARY License ( http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 13.0.2 - :when: 2022-08-16 21:39:51.628833960 Z + - 4.3.0 + :when: 2022-08-16 21:40:27.853144921 Z - - :approve - - NuGet.Frameworks + - runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl - :who: mocsharp - :why: Apache-2.0 (https://github.com/NuGet/NuGet.Client/raw/dev/LICENSE.txt) + :why: MICROSOFT .NET LIBRARY License ( http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 5.11.0 - :when: 2022-08-16 21:39:52.061412838 Z + - 4.3.0 + :when: 2022-08-16 21:40:28.265837209 Z - - :approve - - RabbitMQ.Client + - runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl - :who: mocsharp - :why: Apache-2.0 (https://github.com/rabbitmq/rabbitmq-dotnet-client/raw/main/LICENSE-APACHE2) + :why: MICROSOFT .NET LIBRARY License ( http://go.microsoft.com/fwlink/?LinkId=329770) :versions: - - 6.4.0 - :when: 2022-08-16 21:39:52.474284611 Z + - 4.3.0 + :when: 2022-08-16 21:40:28.686857664 Z - - :approve - System.AppContext - :who: mocsharp @@ -329,13 +335,6 @@ :versions: - 4.3.0 :when: 2022-08-16 21:39:54.601928428 Z -- - :approve - - System.ComponentModel.Annotations - - :who: mocsharp - :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) - :versions: - - 5.0.0 - :when: 2022-08-16 21:39:55.027202757 Z - - :approve - System.Console - :who: mocsharp @@ -355,7 +354,7 @@ - :who: mocsharp :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) :versions: - - 6.0.0 + - 4.3.0 :when: 2022-08-16 21:39:56.310443725 Z - - :approve - System.Diagnostics.EventLog @@ -441,13 +440,6 @@ :versions: - 4.3.0 :when: 2022-08-16 21:40:01.433803340 Z -- - :approve - - System.IO.FileSystem.AccessControl - - :who: mocsharp - :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) - :versions: - - 4.7.0 - :when: 2022-08-16 21:40:01.858159679 Z - - :approve - System.IO.FileSystem.Primitives - :who: mocsharp @@ -455,6 +447,13 @@ :versions: - 4.3.0 :when: 2022-08-16 21:40:02.283728395 Z +- - :approve + - System.IO.Pipelines + - :who: mocsharp + :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) + :versions: + - 6.0.3 + :when: 2022-08-16 23:06:53.356642197 Z - - :approve - System.Linq - :who: mocsharp @@ -474,7 +473,7 @@ - :who: mocsharp :why: MIT (https://github.com/dotnet/corefx/raw/master/LICENSE.TXT) :versions: - - 4.5.4 + - 4.5.5 :when: 2022-08-16 21:40:03.543731192 Z - - :approve - System.Net.Http @@ -497,13 +496,6 @@ :versions: - 4.3.0 :when: 2022-08-16 21:40:04.847919579 Z -- - :approve - - System.Numerics.Vectors - - :who: mocsharp - :why: MIT (https://github.com/dotnet/corefx/raw/master/LICENSE.TXT) - :versions: - - 4.4.0 - :when: 2022-08-16 21:40:05.268501287 Z - - :approve - System.ObjectModel - :who: mocsharp @@ -623,13 +615,6 @@ :versions: - 4.3.0 :when: 2022-08-16 21:40:12.501295087 Z -- - :approve - - System.Security.AccessControl - - :who: mocsharp - :why: MIT ( https://licenses.nuget.org/MIT) - :versions: - - 4.7.0 - :when: 2022-08-16 21:40:12.923743269 Z - - :approve - System.Security.Cryptography.Algorithms - :who: mocsharp @@ -679,13 +664,6 @@ :versions: - 4.3.0 :when: 2022-08-16 21:40:15.916209622 Z -- - :approve - - System.Security.Principal.Windows - - :who: mocsharp - :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) - :versions: - - 4.7.0 - :when: 2022-08-16 21:40:16.343033869 Z - - :approve - System.Text.Encoding - :who: mocsharp @@ -700,20 +678,6 @@ :versions: - 4.3.0 :when: 2022-08-16 21:40:17.179174197 Z -- - :approve - - System.Text.Encodings.Web - - :who: mocsharp - :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) - :versions: - - 6.0.0 - :when: 2022-08-16 21:40:17.600309407 Z -- - :approve - - System.Text.Json - - :who: mocsharp - :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) - :versions: - - 6.0.0 - :when: 2022-08-16 21:40:18.013199511 Z - - :approve - System.Text.RegularExpressions - :who: mocsharp @@ -733,7 +697,7 @@ - :who: mocsharp :why: MIT ( https://github.com/dotnet/corefx/blob/master/LICENSE.TXT) :versions: - - 4.7.1 + - 7.0.0 :when: 2022-08-16 21:40:19.306691187 Z - - :approve - System.Threading.Tasks @@ -770,131 +734,12 @@ :versions: - 4.3.0 :when: 2022-08-16 21:40:21.430356356 Z -- - :approve - - coverlet.collector - - :who: mocsharp - :why: MIT (https://github.com/coverlet-coverage/coverlet/raw/master/LICENSE) - :versions: - - 3.2.0 - :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) - :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 - - :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.431289100 Z -- - :approve - - runtime.ubuntu.14.04-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.853144921 Z -- - :approve - - runtime.ubuntu.16.04-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:28.265837209 Z -- - :approve - - runtime.ubuntu.16.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:28.686857664 Z - - :approve - xunit - :who: mocsharp :why: Apache-2.0 ( https://raw.githubusercontent.com/xunit/xunit/master/license.txt) :versions: - - 2.4.2 + - 2.5.0 :when: 2022-08-16 21:40:29.166018542 Z - - :approve - xunit.abstractions @@ -908,89 +753,40 @@ - :who: mocsharp :why: Apache-2.0 ( https://raw.githubusercontent.com/xunit/xunit.analyzers/master/LICENSE) :versions: - - 1.0.0 + - 1.2.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.4.2 + - 2.5.0 :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.4.2 + - 2.5.0 :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.4.2 + - 2.5.0 :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.4.2 + - 2.5.0 :when: 2022-08-16 21:40:31.845685693 Z - - :approve - xunit.runner.visualstudio - :who: mocsharp :why: MIT ( https://licenses.nuget.org/MIT) :versions: - - 2.4.5 + - 2.5.0 :when: 2022-08-16 21:40:32.294717110 Z -- - :approve - - Polly - - :who: mocsharp - :why: MIT ( https://licenses.nuget.org/MIT) - :versions: - - 7.2.3 - :when: 2022-11-09 18:57:32.294717110 Z -- - :approve - - Microsoft.AspNetCore.Hosting.Abstractions - - :who: mocsharp - :why: Apache-2.0 ( https://raw.githubusercontent.com/aspnet/AspNetCore/2.0.0/LICENSE.txt) - :versions: - - 2.2.0 - :when: 2022-08-16 23:05:39.515329423 Z -- - :approve - - Microsoft.AspNetCore.Hosting.Server.Abstractions - - :who: mocsharp - :why: Apache-2.0 ( https://raw.githubusercontent.com/aspnet/AspNetCore/2.0.0/LICENSE.txt) - :versions: - - 2.2.0 - :when: 2022-08-16 23:05:39.956722759 Z -- - :approve - - Microsoft.AspNetCore.Http.Abstractions - - :who: mocsharp - :why: Apache-2.0 ( https://raw.githubusercontent.com/aspnet/AspNetCore/2.0.0/LICENSE.txt) - :versions: - - 2.2.0 - :when: 2022-08-16 23:05:40.826627099 Z -- - :approve - - Microsoft.AspNetCore.Http.Features - - :who: mocsharp - :why: Apache-2.0 ( https://raw.githubusercontent.com/aspnet/AspNetCore/2.0.0/LICENSE.txt) - :versions: - - 2.2.0 - :when: 2022-08-16 23:05:41.699752560 Z -- - :approve - - Microsoft.AspNetCore.TestHost - - :who: mocsharp - :why: MIT (https://github.com/dotnet/aspnetcore/raw/main/LICENSE.txt) - :versions: - - 6.0.12 - :when: 2022-10-14 23:36:49.751931025 Z -- - :approve - - System.IO.Pipelines - - :who: mocsharp - :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) - :versions: - - 6.0.3 - :when: 2022-08-16 23:06:53.356642197 Z diff --git a/src/Messaging/API/IMessageBrokerSubscriberService.cs b/src/Messaging/API/IMessageBrokerSubscriberService.cs old mode 100644 new mode 100755 index d2667fb..e43de1e --- a/src/Messaging/API/IMessageBrokerSubscriberService.cs +++ b/src/Messaging/API/IMessageBrokerSubscriberService.cs @@ -31,28 +31,6 @@ public interface IMessageBrokerSubscriberService : IDisposable /// string Name { get; } - /// - /// Subscribe to a message topic & queue and executes messageReceivedCallback for every message that is received. - /// Either provide a topic, a queue or both. - /// A queue is generated if the name of the queue is not provided. - /// - /// Topic/routing key to bind to - /// Name of the queue to consume - /// Action to be performed when message is received - /// Number of unacknowledged messages to receive at once. Defaults to 0. - void Subscribe(string topic, string queue, Action messageReceivedCallback, ushort prefetchCount = 0); - - /// - /// Subscribe to a message topic & queue and executes messageReceivedCallback for every message that is received. - /// Either provide a topic, a queue or both. - /// A queue is generated if the name of the queue is not provided. - /// - /// Topics/routing keys to bind to - /// Name of the queue to consume - /// Action to be performed when message is received - /// Number of unacknowledged messages to receive at once. Defaults to 0. - void Subscribe(string[] topics, string queue, Action messageReceivedCallback, ushort prefetchCount = 0); - /// /// Subscribe to a message topic & queue and executes messageReceivedCallback asynchronously for every message that is received. /// Either provide a topic, a queue or both. diff --git a/src/Messaging/Common/ExportRequestType.cs b/src/Messaging/Common/ExportRequestType.cs new file mode 100755 index 0000000..7309685 --- /dev/null +++ b/src/Messaging/Common/ExportRequestType.cs @@ -0,0 +1,23 @@ +/* + * Copyright 2023 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +namespace Monai.Deploy.Messaging.Common +{ + public enum ExportRequestType + { + None = 0, + ExternalProcessing + } +} diff --git a/src/Messaging/Common/ServiceException.cs b/src/Messaging/Common/ServiceException.cs new file mode 100644 index 0000000..6bdaf30 --- /dev/null +++ b/src/Messaging/Common/ServiceException.cs @@ -0,0 +1,39 @@ +/* + * Copyright 2023 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +using System.Runtime.Serialization; + +namespace Monai.Deploy.Messaging.Common +{ + public class ServiceException : Exception + { + public ServiceException() + { + } + + public ServiceException(string? message) : base(message) + { + } + + public ServiceException(string? message, Exception? innerException) : base(message, innerException) + { + } + + protected ServiceException(SerializationInfo info, StreamingContext context) : base(info, context) + { + } + } +} diff --git a/src/Messaging/Events/EmailRequestEvent.cs b/src/Messaging/Events/EmailRequestEvent.cs new file mode 100644 index 0000000..195eb37 --- /dev/null +++ b/src/Messaging/Events/EmailRequestEvent.cs @@ -0,0 +1,61 @@ +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +using System.ComponentModel.DataAnnotations; +using Newtonsoft.Json; + +namespace Monai.Deploy.Messaging.Events +{ + public class EmailRequestEvent : EventBase + { + [JsonProperty(PropertyName = "id")] + [Required] + public Guid Id { get; set; } + + [JsonProperty(PropertyName = "workflow_instance_id")] + [Required] + public string WorkflowInstanceId { get; set; } + + [JsonProperty(PropertyName = "workflow_name")] + [Required] + public string WorkflowName { get; set; } + + [JsonProperty(PropertyName = "task_id")] + [Required] + public string TaskId { get; set; } + + [JsonProperty(PropertyName = "roles")] + public string Roles { get; set; } + + [JsonProperty(PropertyName = "emails")] + public string Emails { get; set; } + + [Required] + [JsonProperty(PropertyName = "metadata")] + public Dictionary Metadata { get; set; } + + public EmailRequestEvent() + { + Id = Guid.NewGuid(); + WorkflowInstanceId = string.Empty; + TaskId = string.Empty; + WorkflowName = string.Empty; + Metadata = new Dictionary(); + Roles = string.Empty; + Emails = string.Empty; + } + } +} diff --git a/src/Messaging/Events/ExportCompleteEvent.cs b/src/Messaging/Events/ExportCompleteEvent.cs old mode 100644 new mode 100755 index fe0d2e7..432b8b5 --- a/src/Messaging/Events/ExportCompleteEvent.cs +++ b/src/Messaging/Events/ExportCompleteEvent.cs @@ -16,6 +16,7 @@ using System.ComponentModel.DataAnnotations; using Ardalis.GuardClauses; +using Monai.Deploy.Messaging.Common; using Newtonsoft.Json; using Newtonsoft.Json.Converters; @@ -57,6 +58,15 @@ public class ExportCompleteEvent : EventBase [JsonProperty(PropertyName = "file_statuses")] public Dictionary FileStatuses { get; set; } + /// + /// Gets or set the ExportRequest type. + /// For standard exports this will be ExportRequestType.None + /// but for exports to external apps this will be ExportRequestType.ExternalProcessing + /// + [JsonProperty(PropertyName = "export_request")] + [Required] + public ExportRequestType ExportRequest { get; set; } = default!; + [JsonConstructor] public ExportCompleteEvent() { @@ -66,9 +76,9 @@ public ExportCompleteEvent() public ExportCompleteEvent(ExportRequestEvent exportRequest, ExportStatus exportStatus, Dictionary fileStatuses) { - Guard.Against.Null(exportRequest); - Guard.Against.Null(exportStatus); - Guard.Against.Null(fileStatuses); + Guard.Against.Null(exportRequest, nameof(exportRequest)); + Guard.Against.Null(exportStatus, nameof(exportStatus)); + Guard.Against.Null(fileStatuses, nameof(fileStatuses)); WorkflowInstanceId = exportRequest.WorkflowInstanceId; ExportTaskId = exportRequest.ExportTaskId; diff --git a/src/Messaging/Events/ExportRequestEvent.cs b/src/Messaging/Events/ExportRequestEvent.cs old mode 100644 new mode 100755 index 71388f3..2d6c89e --- a/src/Messaging/Events/ExportRequestEvent.cs +++ b/src/Messaging/Events/ExportRequestEvent.cs @@ -15,6 +15,7 @@ */ using System.ComponentModel.DataAnnotations; +using Monai.Deploy.Messaging.Common; using Newtonsoft.Json; namespace Monai.Deploy.Messaging.Events @@ -75,9 +76,18 @@ public class ExportRequestEvent : EventBase /// public List ErrorMessages { get; private set; } + /// + /// A list of data output plug-in type names to be executed by the export services. + /// Each string must be a fully-qualified type name. + /// E.g. MyCompnay.MyProject.MyNamepsace.MyPlugin, MyCompnay.MyProject.MyNamepsace where + /// MyCompnay.MyProject.MyNamepsace is the name of the assembly (DLL). + /// + public List PluginAssemblies { get; private set; } + public ExportRequestEvent() { ErrorMessages = new List(); + PluginAssemblies = new List(); } public void AddErrorMessages(IList errorMessages) diff --git a/src/Messaging/Events/WorkflowRequestEvent.cs b/src/Messaging/Events/WorkflowRequestEvent.cs old mode 100644 new mode 100755 index b437233..1f0be31 --- a/src/Messaging/Events/WorkflowRequestEvent.cs +++ b/src/Messaging/Events/WorkflowRequestEvent.cs @@ -81,6 +81,22 @@ public class WorkflowRequestEvent : EventBase [Required] public DateTime Timestamp { get; set; } + /// + /// Sets the workflow instance ID for the Workflow Manager. + /// This is only applicable to resume events (after external app executions) + /// In standard workflows this will not be set + /// + [JsonProperty(PropertyName = "workflow_instance_id")] + public string? WorkflowInstanceId { get; set; } = default; + + /// + /// Sets the task ID for the Workflow Manager. + /// This is only applicable to resume events (after external app executions) + /// In standard workflows this will not be set + /// + [JsonProperty(PropertyName = "task_id")] + public string? TaskId { get; set; } = default; + /// /// Gets or sets a list of files and metadata files in this request. /// diff --git a/src/Messaging/Monai.Deploy.Messaging.csproj b/src/Messaging/Monai.Deploy.Messaging.csproj index 106f6b3..4c5df90 100644 --- a/src/Messaging/Monai.Deploy.Messaging.csproj +++ b/src/Messaging/Monai.Deploy.Messaging.csproj @@ -1,4 +1,4 @@ -