diff --git a/GitVersion.yml b/GitVersion.yml index 593a2aa..d8c8c0b 100644 --- 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 index 5eed088..538c369 100755 --- 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 index 8fa479a..41c5859 100755 --- 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 ErrorMessages { get; private set; } - [JsonProperty(PropertyName = "file_id")] - [JsonPropertyName("file_id")] + /// + /// Gets or set the payloadId for external apps sending data back + /// + [JsonProperty(PropertyName = "payload_id")] + [JsonPropertyName("payload_id")] public string? PayloadId { get; set; } /// diff --git a/src/Messaging/Events/WorkflowRequestEvent.cs b/src/Messaging/Events/WorkflowRequestEvent.cs index 13040b7..59e7e63 100755 --- 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 /// Unknown, - + /// /// Data received via DIMSE services /// diff --git a/src/Messaging/Monai.Deploy.Messaging.csproj b/src/Messaging/Monai.Deploy.Messaging.csproj index 6a04872..8e89a1d 100644 --- a/src/Messaging/Monai.Deploy.Messaging.csproj +++ b/src/Messaging/Monai.Deploy.Messaging.csproj @@ -1,4 +1,4 @@ -