From 553cd2c940ee779304cb58721e1f2d727430a14b Mon Sep 17 00:00:00 2001 From: Neil South Date: Thu, 25 Jul 2024 10:34:33 +0100 Subject: [PATCH 1/5] small change Signed-off-by: Neil South --- .github/.gitversion.yml | 8 ++++---- src/Api/packages.lock.json | 6 +++--- src/CLI/packages.lock.json | 6 +++--- src/Client.Common/packages.lock.json | 6 +++--- src/Common/packages.lock.json | 6 +++--- src/Configuration/packages.lock.json | 6 +++--- src/DicomWebClient/CLI/packages.lock.json | 6 +++--- src/DicomWebClient/packages.lock.json | 6 +++--- 8 files changed, 25 insertions(+), 25 deletions(-) mode change 100644 => 100755 .github/.gitversion.yml mode change 100644 => 100755 src/Api/packages.lock.json mode change 100644 => 100755 src/CLI/packages.lock.json mode change 100644 => 100755 src/Client.Common/packages.lock.json mode change 100644 => 100755 src/Common/packages.lock.json mode change 100644 => 100755 src/Configuration/packages.lock.json mode change 100644 => 100755 src/DicomWebClient/CLI/packages.lock.json mode change 100644 => 100755 src/DicomWebClient/packages.lock.json diff --git a/.github/.gitversion.yml b/.github/.gitversion.yml old mode 100644 new mode 100755 index 6486d5775..56e2c3c07 --- a/.github/.gitversion.yml +++ b/.github/.gitversion.yml @@ -18,13 +18,13 @@ branches: main: tag: '' release: - tag: rc + tag: 'rc' develop: - tag: beta + tag: 'beta' feature: - tag: alpha.{BranchName} + tag: 'alpha.{BranchName}' pull-request: - tag: pr + tag: 'pr' ignore: sha: [] diff --git a/src/Api/packages.lock.json b/src/Api/packages.lock.json old mode 100644 new mode 100755 index ae1920d9a..ff01254b3 --- a/src/Api/packages.lock.json +++ b/src/Api/packages.lock.json @@ -41,9 +41,9 @@ }, "Microsoft.NET.ILLink.Tasks": { "type": "Direct", - "requested": "[8.0.6, )", - "resolved": "8.0.6", - "contentHash": "E+lDylsTeP4ZiDmnEkiJ5wobnGaIJzFhOgZppznJCb69UZgbh6G3cfv1pnLDLLBx6JAgl0kAlnINDeT3uCuczQ==" + "requested": "[8.0.7, )", + "resolved": "8.0.7", + "contentHash": "iI52ptEKby2ymQ6B7h4TWbFmm85T4VvLgc/HvS45Yr3lgi4IIFbQtjON3bQbX/Vc94jXNSLvrDOp5Kh7SJyFYQ==" }, "Monai.Deploy.Messaging": { "type": "Direct", diff --git a/src/CLI/packages.lock.json b/src/CLI/packages.lock.json old mode 100644 new mode 100755 index d530a862d..31a286b83 --- a/src/CLI/packages.lock.json +++ b/src/CLI/packages.lock.json @@ -35,9 +35,9 @@ }, "Microsoft.NET.ILLink.Tasks": { "type": "Direct", - "requested": "[8.0.6, )", - "resolved": "8.0.6", - "contentHash": "E+lDylsTeP4ZiDmnEkiJ5wobnGaIJzFhOgZppznJCb69UZgbh6G3cfv1pnLDLLBx6JAgl0kAlnINDeT3uCuczQ==" + "requested": "[8.0.7, )", + "resolved": "8.0.7", + "contentHash": "iI52ptEKby2ymQ6B7h4TWbFmm85T4VvLgc/HvS45Yr3lgi4IIFbQtjON3bQbX/Vc94jXNSLvrDOp5Kh7SJyFYQ==" }, "System.CommandLine.Hosting": { "type": "Direct", diff --git a/src/Client.Common/packages.lock.json b/src/Client.Common/packages.lock.json old mode 100644 new mode 100755 index e8e4fa01e..da9a2e2d7 --- a/src/Client.Common/packages.lock.json +++ b/src/Client.Common/packages.lock.json @@ -10,9 +10,9 @@ }, "Microsoft.NET.ILLink.Tasks": { "type": "Direct", - "requested": "[8.0.6, )", - "resolved": "8.0.6", - "contentHash": "E+lDylsTeP4ZiDmnEkiJ5wobnGaIJzFhOgZppznJCb69UZgbh6G3cfv1pnLDLLBx6JAgl0kAlnINDeT3uCuczQ==" + "requested": "[8.0.7, )", + "resolved": "8.0.7", + "contentHash": "iI52ptEKby2ymQ6B7h4TWbFmm85T4VvLgc/HvS45Yr3lgi4IIFbQtjON3bQbX/Vc94jXNSLvrDOp5Kh7SJyFYQ==" } } } diff --git a/src/Common/packages.lock.json b/src/Common/packages.lock.json old mode 100644 new mode 100755 index d43b35d29..4abc07400 --- a/src/Common/packages.lock.json +++ b/src/Common/packages.lock.json @@ -10,9 +10,9 @@ }, "Microsoft.NET.ILLink.Tasks": { "type": "Direct", - "requested": "[8.0.6, )", - "resolved": "8.0.6", - "contentHash": "E+lDylsTeP4ZiDmnEkiJ5wobnGaIJzFhOgZppznJCb69UZgbh6G3cfv1pnLDLLBx6JAgl0kAlnINDeT3uCuczQ==" + "requested": "[8.0.7, )", + "resolved": "8.0.7", + "contentHash": "iI52ptEKby2ymQ6B7h4TWbFmm85T4VvLgc/HvS45Yr3lgi4IIFbQtjON3bQbX/Vc94jXNSLvrDOp5Kh7SJyFYQ==" }, "System.IO.Abstractions": { "type": "Direct", diff --git a/src/Configuration/packages.lock.json b/src/Configuration/packages.lock.json old mode 100644 new mode 100755 index bdbcbfb47..9f4ff7802 --- a/src/Configuration/packages.lock.json +++ b/src/Configuration/packages.lock.json @@ -4,9 +4,9 @@ "net8.0": { "Microsoft.NET.ILLink.Tasks": { "type": "Direct", - "requested": "[8.0.6, )", - "resolved": "8.0.6", - "contentHash": "E+lDylsTeP4ZiDmnEkiJ5wobnGaIJzFhOgZppznJCb69UZgbh6G3cfv1pnLDLLBx6JAgl0kAlnINDeT3uCuczQ==" + "requested": "[8.0.7, )", + "resolved": "8.0.7", + "contentHash": "iI52ptEKby2ymQ6B7h4TWbFmm85T4VvLgc/HvS45Yr3lgi4IIFbQtjON3bQbX/Vc94jXNSLvrDOp5Kh7SJyFYQ==" }, "Ardalis.GuardClauses": { "type": "Transitive", diff --git a/src/DicomWebClient/CLI/packages.lock.json b/src/DicomWebClient/CLI/packages.lock.json old mode 100644 new mode 100755 index bba51e306..8f7ad6849 --- a/src/DicomWebClient/CLI/packages.lock.json +++ b/src/DicomWebClient/CLI/packages.lock.json @@ -14,9 +14,9 @@ }, "Microsoft.NET.ILLink.Tasks": { "type": "Direct", - "requested": "[8.0.6, )", - "resolved": "8.0.6", - "contentHash": "E+lDylsTeP4ZiDmnEkiJ5wobnGaIJzFhOgZppznJCb69UZgbh6G3cfv1pnLDLLBx6JAgl0kAlnINDeT3uCuczQ==" + "requested": "[8.0.7, )", + "resolved": "8.0.7", + "contentHash": "iI52ptEKby2ymQ6B7h4TWbFmm85T4VvLgc/HvS45Yr3lgi4IIFbQtjON3bQbX/Vc94jXNSLvrDOp5Kh7SJyFYQ==" }, "Ardalis.GuardClauses": { "type": "Transitive", diff --git a/src/DicomWebClient/packages.lock.json b/src/DicomWebClient/packages.lock.json old mode 100644 new mode 100755 index d0e54b405..b24bb65e3 --- a/src/DicomWebClient/packages.lock.json +++ b/src/DicomWebClient/packages.lock.json @@ -23,9 +23,9 @@ }, "Microsoft.NET.ILLink.Tasks": { "type": "Direct", - "requested": "[8.0.6, )", - "resolved": "8.0.6", - "contentHash": "E+lDylsTeP4ZiDmnEkiJ5wobnGaIJzFhOgZppznJCb69UZgbh6G3cfv1pnLDLLBx6JAgl0kAlnINDeT3uCuczQ==" + "requested": "[8.0.7, )", + "resolved": "8.0.7", + "contentHash": "iI52ptEKby2ymQ6B7h4TWbFmm85T4VvLgc/HvS45Yr3lgi4IIFbQtjON3bQbX/Vc94jXNSLvrDOp5Kh7SJyFYQ==" }, "Ardalis.GuardClauses": { "type": "Transitive", From dda6cb5843f0ded42a1341030ca1fec6b4b20656 Mon Sep 17 00:00:00 2001 From: Neil South Date: Thu, 25 Jul 2024 10:36:21 +0100 Subject: [PATCH 2/5] small change Signed-off-by: Neil South --- .github/.gitversion.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/.gitversion.yml b/.github/.gitversion.yml index 56e2c3c07..516d4d96c 100755 --- a/.github/.gitversion.yml +++ b/.github/.gitversion.yml @@ -18,15 +18,15 @@ branches: main: tag: '' release: - tag: 'rc' + tag: rc develop: - tag: 'beta' + tag: beta feature: - tag: 'alpha.{BranchName}' + tag: alpha.{BranchName} pull-request: - tag: 'pr' + tag: pr ignore: sha: [] merge-message-formats: {} -next-version: 0.3.17 +next-version: 0.3.18 From 94502f5160409ac3a4bf7e0f2bd5d9b9e45311c6 Mon Sep 17 00:00:00 2001 From: Neil South Date: Thu, 25 Jul 2024 10:46:39 +0100 Subject: [PATCH 3/5] small change Signed-off-by: Neil South --- .github/workflows/ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 47ed9b252..db9d8bd7f 100755 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -51,7 +51,9 @@ jobs: dotnet-version: "8.0.x" - name: Install GitVersion - run: dotnet tool install --global GitVersion.Tool + uses: gittools/actions/gitversion/setup@v2.0.1 + with: + versionSpec: '5.x' - name: Determine Version id: gitversion From ab2ea2a61227b7b22b65e97ad08a215e571c5c3d Mon Sep 17 00:00:00 2001 From: Neil South Date: Thu, 25 Jul 2024 11:00:54 +0100 Subject: [PATCH 4/5] fix gitVersion Signed-off-by: Neil South --- .github/.gitversion.yml | 10 +++++----- .github/workflows/ci.yml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/.gitversion.yml b/.github/.gitversion.yml index 516d4d96c..cd6218afc 100755 --- a/.github/.gitversion.yml +++ b/.github/.gitversion.yml @@ -16,15 +16,15 @@ assembly-versioning-scheme: MajorMinorPatchTag mode: ContinuousDelivery branches: main: - tag: '' + label: '' release: - tag: rc + label: rc develop: - tag: beta + label: beta feature: - tag: alpha.{BranchName} + label: alpha.{BranchName} pull-request: - tag: pr + label: pr ignore: sha: [] diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index db9d8bd7f..29a54d015 100755 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -53,7 +53,7 @@ jobs: - name: Install GitVersion uses: gittools/actions/gitversion/setup@v2.0.1 with: - versionSpec: '5.x' + versionSpec: '6.x' - name: Determine Version id: gitversion From a644dba9cb0c09f1912ee79e6ef42f4e3a4c8612 Mon Sep 17 00:00:00 2001 From: Neil South Date: Thu, 25 Jul 2024 11:13:11 +0100 Subject: [PATCH 5/5] fix gitVersion Signed-off-by: Neil South --- .github/.gitversion.yml | 2 ++ .github/workflows/ci.yml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/.gitversion.yml b/.github/.gitversion.yml index cd6218afc..1509bf188 100755 --- a/.github/.gitversion.yml +++ b/.github/.gitversion.yml @@ -21,10 +21,12 @@ branches: label: rc develop: label: beta + increment: Patch feature: label: alpha.{BranchName} pull-request: label: pr + increment: Patch ignore: sha: [] diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 29a54d015..aa8d90ada 100755 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -57,7 +57,7 @@ jobs: - name: Determine Version id: gitversion - uses: gittools/actions/gitversion/execute@v0.10.2 + uses: gittools/actions/gitversion/execute@v2.0.1 with: useConfigFile: true updateAssemblyInfo: true