Merge branch 'main' into release/2.0.1

Signed-off-by: Neil South <[email protected]>
Project-MONAI · Feb 8, 2024 · 4ea59bc · 4ea59bc
2 parents e9ff61e + 4a1ca65
commit 4ea59bc
Show file tree

Hide file tree

Showing 10 changed files with 69 additions and 43 deletions.
diff --git a/GitVersion.yml b/GitVersion.yml
@@ -57,6 +57,8 @@ ignore:
   sha: []
 merge-message-formats: {}
 next-version: 2.0.1
+
 major-version-bump-message: '\+semver:\s?(breaking|major)'
 minor-version-bump-message: '\+semver:\s?(feature|minor)'
 patch-version-bump-message: '\+semver:\s?(fix|patch)'
+update-build-number: false
diff --git a/doc/dependency_decisions.yml b/doc/dependency_decisions.yml
@@ -4,7 +4,7 @@
   - :who: mocsharp
     :why: MIT (https://github.com/ardalis/GuardClauses.Analyzers/raw/master/LICENSE)
     :versions:
-    - 4.2.0
+    - 4.3.0
     :when: 2022-08-16 21:39:30.077666354 Z
 - - :approve
   - Castle.Core
@@ -754,7 +754,7 @@
   - :who: mocsharp
     :why: Apache-2.0 ( https://raw.githubusercontent.com/xunit/xunit/master/license.txt)
     :versions:
-    - 2.6.3
+    - 2.6.4
     :when: 2022-08-16 21:40:29.166018542 Z
 - - :approve
   - xunit.abstractions
@@ -768,35 +768,35 @@
   - :who: mocsharp
     :why: Apache-2.0 ( https://raw.githubusercontent.com/xunit/xunit.analyzers/master/LICENSE)
     :versions:
-    - 1.7.0
+    - 1.8.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.6.4
     :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.6.4
     :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.6.4
     :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.6.4
     :when: 2022-08-16 21:40:31.845685693 Z
 - - :approve
   - xunit.runner.visualstudio

diff --git a/src/Messaging/Events/ExportRequestEvent.cs b/src/Messaging/Events/ExportRequestEvent.cs
@@ -87,8 +87,11 @@ public class ExportRequestEvent : EventBase
         [JsonPropertyName("error_messages")]
         public List<string> ErrorMessages { get; private set; }
 
-        [JsonProperty(PropertyName = "file_id")]
-        [JsonPropertyName("file_id")]
+        /// <summary>
+        /// Gets or set the payloadId for external apps sending data back
+        /// </summary>
+        [JsonProperty(PropertyName = "payload_id")]
+        [JsonPropertyName("payload_id")]
         public string? PayloadId { get; set; }
 
         /// <summary>

diff --git a/src/Messaging/Events/WorkflowRequestEvent.cs b/src/Messaging/Events/WorkflowRequestEvent.cs
@@ -58,6 +58,7 @@ public class DataOrigin
         [JsonPropertyName("artifactType")]
         public ArtifactType ArtifactType { get; set; } = ArtifactType.Unset;
 
+
         public override int GetHashCode()
         {
             return HashCode.Combine(Source, Destination, DataService);
@@ -78,7 +79,7 @@ public enum DataService
         /// Unknown data service
         /// </summary>
         Unknown,
-
+        
         /// <summary>
         /// Data received via DIMSE services
         /// </summary>

diff --git a/src/Messaging/Monai.Deploy.Messaging.csproj b/src/Messaging/Monai.Deploy.Messaging.csproj
@@ -1,4 +1,4 @@
-<!--
+<!--
   ~ Copyright 2021-2022 MONAI Consortium
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -65,7 +65,7 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Ardalis.GuardClauses" Version="4.2.0" />
+    <PackageReference Include="Ardalis.GuardClauses" Version="4.3.0" />
     <PackageReference Include="System.IO.Abstractions" Version="20.0.4" />
     <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />

diff --git a/src/Messaging/Tests/IServiceCollectionExtensionsTests.cs b/src/Messaging/Tests/IServiceCollectionExtensionsTests.cs
@@ -207,7 +207,6 @@ internal class GoodSubscriberService : IMessageBrokerSubscriberService
 
         // event used by users of this library
         public event ConnectionErrorHandler? OnConnectionError;
-
 #pragma warning restore CS0067 // The event 'GoodSubscriberService.OnConnectionError' is never used
 
         public void Acknowledge(MessageBase message) => throw new NotImplementedException();

diff --git a/src/Messaging/Tests/Monai.Deploy.Messaging.Tests.csproj b/src/Messaging/Tests/Monai.Deploy.Messaging.Tests.csproj
@@ -1,4 +1,4 @@
-<!--
+<!--
   ~ Copyright 2022 MONAI Consortium
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -28,7 +28,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageReference Include="Moq" Version="4.20.70" />
-    <PackageReference Include="xunit" Version="2.6.3" />
+    <PackageReference Include="xunit" Version="2.6.4" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>

diff --git a/src/Messaging/Tests/WorkflowRequestMessageTest.cs b/src/Messaging/Tests/WorkflowRequestMessageTest.cs
@@ -49,6 +49,7 @@ public void ConvertsJsonMessageToMessage()
                 DataService = DataService.DicomWeb,
                 Source = Guid.NewGuid().ToString(),
                 Destination = Guid.NewGuid().ToString(),
+
             });
             input.DataOrigins.Add(new DataOrigin
             {

diff --git a/src/Plugins/RabbitMQ/Tests/Monai.Deploy.Messaging.RabbitMQ.Tests.csproj b/src/Plugins/RabbitMQ/Tests/Monai.Deploy.Messaging.RabbitMQ.Tests.csproj
@@ -33,7 +33,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageReference Include="Moq" Version="4.20.70" />
     <PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="20.0.4" />
-    <PackageReference Include="xunit" Version="2.6.3" />
+    <PackageReference Include="xunit" Version="2.6.4" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>

diff --git a/third-party-licenses.md b/third-party-licenses.md
@@ -60,14 +60,13 @@ SOFTWARE.
 
 
 <details>
-<summary>Ardalis.GuardClauses 4.2.0</summary>
 
+<summary>Ardalis.GuardClauses 4.3.0</summary>
 ## Ardalis.GuardClauses
-
-- Version: 4.2.0
+- Version: 4.3.0
 - Authors: Steve Smith (@ardalis)
 - Project URL: https://github.com/ardalis/guardclauses
-- Source: [NuGet](https://www.nuget.org/packages/Ardalis.GuardClauses/4.2.0)
+- Source: [NuGet](https://www.nuget.org/packages/Ardalis.GuardClauses/4.3.0)
 - License: [MIT](https://github.com/ardalis/GuardClauses.Analyzers/raw/master/LICENSE)
 
 
@@ -5537,6 +5536,8 @@ SOFTWARE.
 
 ```
 .NET Library License Terms | .NET
+MICROSOFT SOFTWARE LICENSE
+TERMS
 
 
 
@@ -12648,7 +12649,6 @@ Insights
 
 Additional navigation options
 
-
 
 
 
@@ -12658,6 +12658,8 @@ Additional navigation options
 
 
 
+          Code
+
 
           Code
 
@@ -12670,6 +12672,8 @@ Additional navigation options
 
 
 
+          Pull requests
+
           Pull requests
 
 
@@ -12680,6 +12684,9 @@ Additional navigation options
 
 
 
+          Security
+
+
 
           Security
 
@@ -12723,8 +12730,8 @@ Footer
 
 
 
+        © 2024 GitHub, Inc.
 
-        © 2023 GitHub, Inc.
 
 
 
@@ -12752,9 +12759,17 @@ Contact
 
 
 
+      Manage cookies
+
+
+
 
 
 
+      Do not share my personal information
+
+
+
 
 
 
@@ -17243,13 +17258,14 @@ consequential or other damages.
 
 
 <details>
-<summary>xunit 2.6.3</summary>
+
+<summary>xunit 2.6.4</summary>
 
 ## xunit
 
-- Version: 2.6.3
+- Version: 2.6.4
 - Authors: jnewkirk,bradwilson
-- Source: [NuGet](https://www.nuget.org/packages/xunit/2.6.3)
+- Source: [NuGet](https://www.nuget.org/packages/xunit/2.6.4)
 - License: [Apache-2.0]( https://raw.githubusercontent.com/xunit/xunit/master/license.txt)
 
 
@@ -17375,13 +17391,14 @@ Both sets of code are covered by the following license:
 
 
 <details>
-<summary>xunit.analyzers 1.7.0</summary>
+
+<summary>xunit.analyzers 1.8.0</summary>
 
 ## xunit.analyzers
 
-- Version: 1.7.0
+- Version: 1.8.0
 - Authors: jnewkirk,bradwilson,marcind
-- Source: [NuGet](https://www.nuget.org/packages/xunit.analyzers/1.7.0)
+- Source: [NuGet](https://www.nuget.org/packages/xunit.analyzers/1.8.0)
 - License: [Apache-2.0]( https://raw.githubusercontent.com/xunit/xunit.analyzers/master/LICENSE)
 
 
@@ -17406,13 +17423,13 @@ limitations under the License.
 
 
 <details>
-<summary>xunit.assert 2.6.3</summary>
+<summary>xunit.assert 2.6.4</summary>
 
 ## xunit.assert
 
-- Version: 2.6.3
+- Version: 2.6.4
 - Authors: jnewkirk,bradwilson
-- Source: [NuGet](https://www.nuget.org/packages/xunit.assert/2.6.3)
+- Source: [NuGet](https://www.nuget.org/packages/xunit.assert/2.6.4)
 - License: [Apache-2.0]( https://raw.githubusercontent.com/xunit/xunit/master/license.txt)
 
 
@@ -17471,13 +17488,14 @@ Both sets of code are covered by the following license:
 
 
 <details>
-<summary>xunit.core 2.6.3</summary>
+
+<summary>xunit.core 2.6.4</summary>
 
 ## xunit.core
 
-- Version: 2.6.3
+- Version: 2.6.4
 - Authors: jnewkirk,bradwilson
-- Source: [NuGet](https://www.nuget.org/packages/xunit.core/2.6.3)
+- Source: [NuGet](https://www.nuget.org/packages/xunit.core/2.6.4)
 - License: [Apache-2.0]( https://raw.githubusercontent.com/xunit/xunit/master/license.txt)
 
 
@@ -17536,13 +17554,14 @@ Both sets of code are covered by the following license:
 
 
 <details>
-<summary>xunit.extensibility.core 2.6.3</summary>
+
+<summary>xunit.extensibility.core 2.6.4</summary>
 
 ## xunit.extensibility.core
 
-- Version: 2.6.3
+- Version: 2.6.4
 - Authors: jnewkirk,bradwilson
-- Source: [NuGet](https://www.nuget.org/packages/xunit.extensibility.core/2.6.3)
+- Source: [NuGet](https://www.nuget.org/packages/xunit.extensibility.core/2.6.4)
 - License: [Apache-2.0]( https://raw.githubusercontent.com/xunit/xunit/master/license.txt)
 
 
@@ -17601,13 +17620,13 @@ Both sets of code are covered by the following license:
 
 
 <details>
-<summary>xunit.extensibility.execution 2.6.3</summary>
+<summary>xunit.extensibility.execution 2.6.4</summary>
 
 ## xunit.extensibility.execution
 
-- Version: 2.6.3
+- Version: 2.6.4
 - Authors: jnewkirk,bradwilson
-- Source: [NuGet](https://www.nuget.org/packages/xunit.extensibility.execution/2.6.3)
+- Source: [NuGet](https://www.nuget.org/packages/xunit.extensibility.execution/2.6.4)
 - License: [Apache-2.0]( https://raw.githubusercontent.com/xunit/xunit/master/license.txt)
 
 
@@ -17666,13 +17685,14 @@ Both sets of code are covered by the following license:
 
 
 <details>
-<summary>xunit.runner.visualstudio 2.5.5</summary>
+
+<summary>xunit.runner.visualstudio 2.5.6</summary>
 
 ## xunit.runner.visualstudio
 
-- Version: 2.5.5
+- Version: 2.5.6
 - Authors: jnewkirk,bradwilson
-- Source: [NuGet](https://www.nuget.org/packages/xunit.runner.visualstudio/2.5.5)
+- Source: [NuGet](https://www.nuget.org/packages/xunit.runner.visualstudio/2.5.6)
 - License: [MIT]( https://licenses.nuget.org/MIT)