Skip to content

Commit 07fcccd

Browse files
mocsharpneildsouth
mocsharp
and
neildsouth
authored
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]>
1 parent 8a4fa15 commit 07fcccd

File tree

7 files changed

+21
-10
lines changed

7 files changed

+21
-10
lines changed

‎.github/workflows/ci.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,8 @@ jobs:
214214

215215
- name: Determine Version
216216
id: gitversion
217-
uses: gittools/actions/gitversion/[email protected]
217+
uses: gittools/actions/gitversion/[email protected]
218+
218219
with:
219220
useConfigFile: true
220221
updateAssemblyInfo: true
@@ -336,12 +337,12 @@ jobs:
336337
msg: ${{ github.repository }}
337338

338339
- name: Install GitReleaseManager
339-
uses: gittools/actions/gitreleasemanager/setup@v0.10.2
340+
uses: gittools/actions/gitreleasemanager/setup@v0.17.0
340341
with:
341342
versionSpec: "0.13.x"
342343

343344
- name: Create release with GitReleaseManager
344-
uses: gittools/actions/gitreleasemanager/create@v0.10.2
345+
uses: gittools/actions/gitreleasemanager/create@v0.17.0
345346
with:
346347
token: ${{ secrets.GITHUB_TOKEN }}
347348
owner: ${{ steps.repo.outputs._0 }}
@@ -353,7 +354,7 @@ jobs:
353354
354355
- name: Publish release with GitReleaseManager
355356
if: ${{ contains(github.ref, 'refs/heads/main') }}
356-
uses: gittools/actions/gitreleasemanager/publish@v0.10.2
357+
uses: gittools/actions/gitreleasemanager/publish@v0.17.0
357358
with:
358359
token: ${{ secrets.GITHUB_TOKEN }}
359360
owner: ${{ steps.repo.outputs._0 }}
@@ -362,7 +363,7 @@ jobs:
362363

363364
- name: Close release with GitReleaseManager
364365
if: ${{ contains(github.ref, 'refs/heads/main') }}
365-
uses: gittools/actions/gitreleasemanager/close@v0.10.2
366+
uses: gittools/actions/gitreleasemanager/close@v0.17.0
366367
with:
367368
token: ${{ secrets.GITHUB_TOKEN }}
368369
owner: ${{ steps.repo.outputs._0 }}

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -351,4 +351,5 @@ MigrationBackup/
351351
# Ionide (cross platform F# VS Code tools) working folder
352352
.ionide/
353353

354+
354355
*/.idea/*

‎GitVersion.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,9 @@ branches:
5656
ignore:
5757
sha: []
5858
merge-message-formats: {}
59-
next-version: 0.1.19
59+
next-version: 2.0.0
60+
61+
major-version-bump-message: '\+semver:\s?(breaking|major)'
62+
minor-version-bump-message: '\+semver:\s?(feature|minor)'
63+
patch-version-bump-message: '\+semver:\s?(fix|patch)'
64+
update-build-number: false

‎src/Messaging/Events/ExportRequestEvent.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,11 @@ public class ExportRequestEvent : EventBase
8787
[JsonPropertyName("error_messages")]
8888
public List<string> ErrorMessages { get; private set; }
8989

90-
[JsonProperty(PropertyName = "file_id")]
91-
[JsonPropertyName("file_id")]
90+
/// <summary>
91+
/// Gets or set the payloadId for external apps sending data back
92+
/// </summary>
93+
[JsonProperty(PropertyName = "payload_id")]
94+
[JsonPropertyName("payload_id")]
9295
public string? PayloadId { get; set; }
9396

9497
/// <summary>

‎src/Messaging/Events/WorkflowRequestEvent.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ public class DataOrigin
5858
[JsonPropertyName("artifactType")]
5959
public ArtifactType ArtifactType { get; set; } = ArtifactType.Unset;
6060

61+
6162
public override int GetHashCode()
6263
{
6364
return HashCode.Combine(Source, Destination, DataService);
@@ -78,7 +79,7 @@ public enum DataService
7879
/// Unknown data service
7980
/// </summary>
8081
Unknown,
81-
82+
8283
/// <summary>
8384
/// Data received via DIMSE services
8485
/// </summary>

‎src/Messaging/Tests/IServiceCollectionExtensionsTests.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,6 @@ internal class GoodSubscriberService : IMessageBrokerSubscriberService
207207

208208
// event used by users of this library
209209
public event ConnectionErrorHandler? OnConnectionError;
210-
211210
#pragma warning restore CS0067 // The event 'GoodSubscriberService.OnConnectionError' is never used
212211

213212
public void Acknowledge(MessageBase message) => throw new NotImplementedException();

‎src/Messaging/Tests/WorkflowRequestMessageTest.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ public void ConvertsJsonMessageToMessage()
4949
DataService = DataService.DicomWeb,
5050
Source = Guid.NewGuid().ToString(),
5151
Destination = Guid.NewGuid().ToString(),
52+
5253
});
5354
input.DataOrigins.Add(new DataOrigin
5455
{

0 commit comments

Comments
 (0)