Sync Main (#316)

* Release/0.1.24 (#209) +semver: patch * adding new fields to messages for external app executions Signed-off-by: Neil South <[email protected]> * added forgot licence header Signed-off-by: Neil South <[email protected]> * added export request to export cmplete message event Signed-off-by: Neil South <[email protected]> * Update ExportRequestEvent and update dependencies (#210) * Update dependencies * Remove ExportRequestType enum and replace with a list of plug-in assembly names * Update dependencies decisions * Include taskId in WorkflowRequestEvent to support multiple external app executions Signed-off-by: Victor Chang <[email protected]> --------- Signed-off-by: Neil South <[email protected]> Signed-off-by: Victor Chang <[email protected]> Co-authored-by: Victor Chang <[email protected]> * Release/0.1.25 (#214) +semver: patch * Update dependency decisions Signed-off-by: Victor Chang <[email protected]> * Release/0.1.24 (#209) (#213) +semver: patch * adding new fields to messages for external app executions * added forgot licence header * added export request to export cmplete message event * Update ExportRequestEvent and update dependencies (#210) * Update dependencies * Remove ExportRequestType enum and replace with a list of plug-in assembly names * Update dependencies decisions * Include taskId in WorkflowRequestEvent to support multiple external app executions --------- Signed-off-by: Neil South <[email protected]> Signed-off-by: Victor Chang <[email protected]> * Fix merge issues Signed-off-by: Victor Chang <[email protected]> --------- Signed-off-by: Victor Chang <[email protected]> Signed-off-by: Neil South <[email protected]> * Release 0.2.0 (#216) +semver: minor * adding new fields to messages for external app executions * added forgot licence header * added export request to export cmplete message event * Update ExportRequestEvent and update dependencies (#210) * Update dependencies * Remove ExportRequestType enum and replace with a list of plug-in assembly names * Update dependencies decisions * Include taskId in WorkflowRequestEvent to support multiple external app executions * gh-127 (#215) New data trigger and data origins to support multiple data sources/modalities Signed-off-by: Victor Chang <[email protected]> Signed-off-by: Neil South <[email protected]> * Release/0.2.1 (#218) +semver: patch * Add ACR enum in DataService (#217) Signed-off-by: Victor Chang <[email protected]> * Update GitVersion.yml Signed-off-by: Victor Chang <[email protected]> * Update GitVersion.yml Signed-off-by: Victor Chang <[email protected]> * Update GitVersion.yml +semver: patch Signed-off-by: Victor Chang <[email protected]> * Release/0.2.1 (#219) +semver: patch * Release/0.2.2 (#221) +semver: patch * Release/1.0.0 (#222) +semver: major * Update GitVersion.yml Signed-off-by: Victor Chang <[email protected]> * Update GitVersion.yml Signed-off-by: Victor Chang <[email protected]> * Attempt to fix GitVersion versioning by removing next-version Signed-off-by: Victor Chang <[email protected]> * Release/1.0.1 (#224) +semver: patch prefix scope variables with `@` Signed-off-by: Victor Chang <[email protected]> * Update IServiceCollectionExtensionsTests.cs Signed-off-by: Neil South <[email protected]> * adding comment Signed-off-by: Neil South <[email protected]> * unify naming Signed-off-by: Neil South <[email protected]> * Release 2.0.0 (#273) +semver: major * Update project to .NET 8 (#270) Signed-off-by: Victor Chang <[email protected]> * Update GitVersion.yml Set next version to 2.0.0 Signed-off-by: Victor Chang <[email protected]> * Update GitVersion.yml Signed-off-by: Victor Chang <[email protected]> * Update GitVersion.yml Signed-off-by: Victor Chang <[email protected]> * Update .gitignore test Signed-off-by: Neil South <[email protected]> * +semver: minor Signed-off-by: Neil South <[email protected]> * +semver: patch +semver: patch Signed-off-by: Neil South <[email protected]> * Update .gitignore to do new release Signed-off-by: Neil South <[email protected]> * Update .gitignore Signed-off-by: Neil South <[email protected]> * +semver: patch version 2.0.1 Signed-off-by: Neil South <[email protected]> * change upload action Signed-off-by: Neil South <[email protected]> * tweek to download action Signed-off-by: Neil South <[email protected]> * change next version Signed-off-by: Neil South <[email protected]> * Update dependencies, license and copyrights (#313) (#314) Signed-off-by: Victor Chang <[email protected]> Signed-off-by: Victor Chang <[email protected]> * Update ci.yml Signed-off-by: Victor Chang <[email protected]> * Update gittool to 0.17.0 Signed-off-by: Victor Chang <[email protected]> * Fix gitversion version number Signed-off-by: Victor Chang <[email protected]> * Update ci.yml gitversion v1.1.1 Signed-off-by: Victor Chang <[email protected]> --------- Signed-off-by: Neil South <[email protected]> Signed-off-by: Victor Chang <[email protected]> Signed-off-by: Victor Chang <[email protected]> Signed-off-by: Neil South <[email protected]> Co-authored-by: Neil South <[email protected]> Co-authored-by: Neil South <[email protected]>
Project-MONAI · Jun 12, 2024 · 07fcccd · 07fcccd
1 parent 8a4fa15
commit 07fcccd
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -214,7 +214,8 @@ jobs:
 
       - name: Determine Version
         id: gitversion
-        uses: gittools/actions/gitversion/[email protected]
+        uses: gittools/actions/gitversion/[email protected]
+
         with:
           useConfigFile: true
           updateAssemblyInfo: true
@@ -336,12 +337,12 @@ jobs:
           msg: ${{ github.repository }}
 
       - name: Install GitReleaseManager
-        uses: gittools/actions/gitreleasemanager/setup@v0.10.2
+        uses: gittools/actions/gitreleasemanager/setup@v0.17.0
         with:
           versionSpec: "0.13.x"
 
       - name: Create release with GitReleaseManager
-        uses: gittools/actions/gitreleasemanager/create@v0.10.2
+        uses: gittools/actions/gitreleasemanager/create@v0.17.0
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           owner: ${{ steps.repo.outputs._0 }}
@@ -353,7 +354,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@v0.17.0
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           owner: ${{ steps.repo.outputs._0 }}
@@ -362,7 +363,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@v0.17.0
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           owner: ${{ steps.repo.outputs._0 }}

diff --git a/.gitignore b/.gitignore
@@ -351,4 +351,5 @@ MigrationBackup/
 # Ionide (cross platform F# VS Code tools) working folder
 .ionide/
 
+
 */.idea/*
diff --git a/GitVersion.yml b/GitVersion.yml
@@ -56,4 +56,9 @@ branches:
 ignore:
   sha: []
 merge-message-formats: {}
-next-version: 0.1.19
+next-version: 2.0.0
+
+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/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/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/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
             {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -351,4 +351,5 @@ MigrationBackup/
		# Ionide (cross platform F# VS Code tools) working folder
		.ionide/


		/.idea/