From 8b2a3e1a923f24d265a66b2f04026590ccea6e90 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Jun 2022 14:02:43 +0000 Subject: [PATCH 01/11] Bump HIC.DicomTypeTranslation from 4.0.0 to 4.0.1 Bumps [HIC.DicomTypeTranslation](https://github.com/HicServices/DicomTypeTranslation) from 4.0.0 to 4.0.1. - [Release notes](https://github.com/HicServices/DicomTypeTranslation/releases) - [Changelog](https://github.com/HicServices/DicomTypeTranslation/blob/main/CHANGELOG.md) - [Commits](https://github.com/HicServices/DicomTypeTranslation/compare/4.0.0...4.0.1) --- updated-dependencies: - dependency-name: HIC.DicomTypeTranslation dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- BadDicom/BadDicom.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BadDicom/BadDicom.csproj b/BadDicom/BadDicom.csproj index a042bf0..515f937 100644 --- a/BadDicom/BadDicom.csproj +++ b/BadDicom/BadDicom.csproj @@ -42,7 +42,7 @@ - + From d110b0ecb806a31c28cdae9a930c9b9fb5c7fb93 Mon Sep 17 00:00:00 2001 From: James A Sutherland Date: Mon, 6 Jun 2022 22:22:57 +0100 Subject: [PATCH 02/11] Bump HIC.DicomTypeTranslation from 4.0.0 to 4.0.1 --- Packages.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Packages.md b/Packages.md index 6567638..c76056e 100644 --- a/Packages.md +++ b/Packages.md @@ -16,7 +16,7 @@ | SixLabors.ImageSharp.Drawing | [GitHub](https://github.com/SixLabors/ImageSharp.Drawing) | [1.0.0-beta14](https://www.nuget.org/packages/SixLabors.ImageSharp.Drawing/1.0.0-beta14) | [Apache 2.0](https://github.com/SixLabors/ImageSharp/blob/main/LICENSE) | Font handling for ImageSharp | | | Microsoft.SourceLink.GitHub | [GitHub](https://github.com/dotnet/sourcelink) | [1.1.1](https://www.nuget.org/packages/Microsoft.SourceLink.GitHub/1.1.1) | [Apache License 2.0](https://github.com/dotnet/sourcelink/blob/master/License.txt) | Enables source debugging of project nuget package| | | Microsoft.NETCore.App | [GitHub](https://github.com/dotnet/runtime) | [2.2.8](https://www.nuget.org/packages/Microsoft.NETCore.App/2.2.8) |[MIT](https://opensource.org/licenses/MIT) | | .Net Core API| -| HIC.DicomTypeTranslation | [GitHub](https://github.com/HicServices/DicomTypeTranslation) | [4.0.0](https://www.nuget.org/packages/HIC.DicomTypeTranslation/4.0.0) | [GPL 3.0](https://github.com/HicServices/DicomTypeTranslation/blob/master/LICENSE) | | | +| HIC.DicomTypeTranslation | [GitHub](https://github.com/HicServices/DicomTypeTranslation) | [4.0.1](https://www.nuget.org/packages/HIC.DicomTypeTranslation/4.0.1) | [GPL 3.0](https://github.com/HicServices/DicomTypeTranslation/blob/master/LICENSE) | | | | YamlDotNet | [GitHub](https://github.com/aaubry/YamlDotNet) | [11.2.1](https://www.nuget.org/packages/YamlDotNet/11.2.1) | [MIT](https://opensource.org/licenses/MIT) |Loading configuration files| | CommandLineParser | [GitHub](https://github.com/commandlineparser/commandline) | [2.9.1](https://www.nuget.org/packages/CommandLineParser/2.9.1) | [MIT](https://opensource.org/licenses/MIT) | Allows command line arguments for main client application and CLI executables | | [Nunit](https://nunit.org/) |[GitHub](https://github.com/nunit/nunit) | [3.13.3](https://www.nuget.org/packages/NUnit/3.13.3) | [MIT](https://opensource.org/licenses/MIT) | Unit testing | From d6b81438d8d214f68b529658339840bb2f8e6547 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Jun 2022 14:31:19 +0000 Subject: [PATCH 03/11] Bump svenstaro/upload-release-action from 2.2.1 to 2.3.0 Bumps [svenstaro/upload-release-action](https://github.com/svenstaro/upload-release-action) from 2.2.1 to 2.3.0. - [Release notes](https://github.com/svenstaro/upload-release-action/releases) - [Changelog](https://github.com/svenstaro/upload-release-action/blob/master/CHANGELOG.md) - [Commits](https://github.com/svenstaro/upload-release-action/compare/2.2.1...2.3.0) --- updated-dependencies: - dependency-name: svenstaro/upload-release-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/testpack.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testpack.yml b/.github/workflows/testpack.yml index 555a54e..f1168ab 100644 --- a/.github/workflows/testpack.yml +++ b/.github/workflows/testpack.yml @@ -45,7 +45,7 @@ jobs: run: | dotnet nuget push ./BadMedicine.Dicom/bin/Release/HIC.BadMedicine.Dicom.*.nupkg -k ${{ secrets.NUGET_KEY }} --skip-duplicate -s https://api.nuget.org/v3/index.json - name: Upload release binaries - uses: svenstaro/upload-release-action@2.2.1 + uses: svenstaro/upload-release-action@2.3.0 if: contains(github.ref, 'refs/tags/v') with: repo_token: ${{ secrets.GITHUB_TOKEN }} From 5c106ffb64fd115dd033efb06d0850fc0f416c8e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Jun 2022 14:31:21 +0000 Subject: [PATCH 04/11] Bump actions/cache from 3.0.3 to 3.0.4 Bumps [actions/cache](https://github.com/actions/cache) from 3.0.3 to 3.0.4. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/v3.0.3...v3.0.4) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/testpack.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testpack.yml b/.github/workflows/testpack.yml index 555a54e..f490d7f 100644 --- a/.github/workflows/testpack.yml +++ b/.github/workflows/testpack.yml @@ -10,7 +10,7 @@ jobs: - uses: actions/setup-dotnet@v2 with: dotnet-version: '6.0.x' - - uses: actions/cache@v3.0.3 + - uses: actions/cache@v3.0.4 with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }} From 17064b5170ece3f0d91e58c77b8059153d7ebcb4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Jun 2022 14:04:24 +0000 Subject: [PATCH 05/11] Bump SixLabors.ImageSharp from 2.1.2 to 2.1.3 Bumps [SixLabors.ImageSharp](https://github.com/SixLabors/ImageSharp) from 2.1.2 to 2.1.3. - [Release notes](https://github.com/SixLabors/ImageSharp/releases) - [Commits](https://github.com/SixLabors/ImageSharp/compare/v2.1.2...v2.1.3) --- updated-dependencies: - dependency-name: SixLabors.ImageSharp dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- BadMedicine.Dicom/BadMedicine.Dicom.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BadMedicine.Dicom/BadMedicine.Dicom.csproj b/BadMedicine.Dicom/BadMedicine.Dicom.csproj index a5576c4..5a4e2a8 100644 --- a/BadMedicine.Dicom/BadMedicine.Dicom.csproj +++ b/BadMedicine.Dicom/BadMedicine.Dicom.csproj @@ -41,7 +41,7 @@ - + From c4335651493a4018c17fdd0439edae297778906d Mon Sep 17 00:00:00 2001 From: James A Sutherland Date: Mon, 20 Jun 2022 10:22:38 -0500 Subject: [PATCH 06/11] Bump SixLabors.ImageSharp from 2.1.2 to 2.1.3 --- Packages.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Packages.md b/Packages.md index c76056e..c77a2cc 100644 --- a/Packages.md +++ b/Packages.md @@ -12,7 +12,7 @@ | HIC.BadMedicine | [GitHub](https://github.com/HicServices/BadMedicine) | [1.0.1](https://www.nuget.org/packages/HIC.BadMedicine/1.0.1) | [GPL 3.0](https://www.gnu.org/licenses/gpl-3.0.html) | Handles generating baseline random data (patient date of birth, CHI numberts etc)| | | fo-dicom | [GitHub](https://github.com/fo-dicom/fo-dicom) |[5.0.3](https://www.nuget.org/packages/fo-dicom/5.0.3)|[MS-PL](https://opensource.org/licenses/MS-PL) | Handles reading/writing dicom tags from dicom datasets | | | fo-dicom.Imaging.ImageSharp | [GitHub](https://github.com/fo-dicom/fo-dicom) |[5.0.3](https://www.nuget.org/packages/fo-dicom/5.0.3)|[MS-PL](https://opensource.org/licenses/MS-PL) | Handles imaging aspects with fo-dicom | | -| SixLabors.ImageSharp | [GitHub](https://github.com/SixLabors/ImageSharp) | [2.1.2](https://www.nuget.org/packages/SixLabors.ImageSharp/2.1.2) | [Apache 2.0](https://github.com/SixLabors/ImageSharp/blob/main/LICENSE) | Platform-independent replacement for legacy Windows-only System.Drawing.Common | | +| SixLabors.ImageSharp | [GitHub](https://github.com/SixLabors/ImageSharp) | [2.1.3](https://www.nuget.org/packages/SixLabors.ImageSharp/2.1.3) | [Apache 2.0](https://github.com/SixLabors/ImageSharp/blob/main/LICENSE) | Platform-independent replacement for legacy Windows-only System.Drawing.Common | | | SixLabors.ImageSharp.Drawing | [GitHub](https://github.com/SixLabors/ImageSharp.Drawing) | [1.0.0-beta14](https://www.nuget.org/packages/SixLabors.ImageSharp.Drawing/1.0.0-beta14) | [Apache 2.0](https://github.com/SixLabors/ImageSharp/blob/main/LICENSE) | Font handling for ImageSharp | | | Microsoft.SourceLink.GitHub | [GitHub](https://github.com/dotnet/sourcelink) | [1.1.1](https://www.nuget.org/packages/Microsoft.SourceLink.GitHub/1.1.1) | [Apache License 2.0](https://github.com/dotnet/sourcelink/blob/master/License.txt) | Enables source debugging of project nuget package| | | Microsoft.NETCore.App | [GitHub](https://github.com/dotnet/runtime) | [2.2.8](https://www.nuget.org/packages/Microsoft.NETCore.App/2.2.8) |[MIT](https://opensource.org/licenses/MIT) | | .Net Core API| From da7e70ecb4cbd8a4d373f2d26bf89dd098e74d3c Mon Sep 17 00:00:00 2001 From: James A Sutherland Date: Mon, 20 Jun 2022 10:28:34 -0500 Subject: [PATCH 07/11] Adjust test invocation --- .github/workflows/testpack.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/testpack.yml b/.github/workflows/testpack.yml index 83a11f6..ca4bea3 100644 --- a/.github/workflows/testpack.yml +++ b/.github/workflows/testpack.yml @@ -20,16 +20,13 @@ jobs: run: sudo systemctl start mysql.service - name: Test run: | - dotnet test "./BadMedicine.Dicom.Tests/BadMedicine.Dicom.Tests.csproj" -nologo - dotnet build -c Debug - cd ./BadDicom/bin/Debug/net6.0 + dotnet test "./BadMedicine.Dicom.Tests/BadMedicine.Dicom.Tests.csproj" -nologo -c Release curl https://raw.githubusercontent.com/HicServices/DicomTypeTranslation/master/Templates/CT.it > ./CT.it - mv BadDicom.template.yaml BadDicom.yaml - dotnet ./BadDicom.dll ./ 50000 10 CT + mv BadDicom/BadDicom.template.yaml BadDicom.yaml + dotnet run --project BadDicom/BadDicom.csproj -- ./ 50000 10 CT sed -i "s/Batches: 1/Batches: 5/g" ./BadDicom.yaml sed -i "s/DropTables: false/DropTables: true/g" ./BadDicom.yaml - dotnet ./BadDicom.dll ./ 50000 10 CT - cd - + dotnet run --project BadDicom/BadDicom.csproj -- ./ 50000 10 CT - name: Package run: | mkdir -p dist From 8bd78d7783f0c3788333c23e8275cdf1f7ef9611 Mon Sep 17 00:00:00 2001 From: James A Sutherland Date: Mon, 20 Jun 2022 10:32:32 -0500 Subject: [PATCH 08/11] Copy template instead of moving --- .github/workflows/testpack.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testpack.yml b/.github/workflows/testpack.yml index ca4bea3..ef4f09c 100644 --- a/.github/workflows/testpack.yml +++ b/.github/workflows/testpack.yml @@ -22,7 +22,7 @@ jobs: run: | dotnet test "./BadMedicine.Dicom.Tests/BadMedicine.Dicom.Tests.csproj" -nologo -c Release curl https://raw.githubusercontent.com/HicServices/DicomTypeTranslation/master/Templates/CT.it > ./CT.it - mv BadDicom/BadDicom.template.yaml BadDicom.yaml + cp BadDicom/BadDicom.template.yaml BadDicom.yaml dotnet run --project BadDicom/BadDicom.csproj -- ./ 50000 10 CT sed -i "s/Batches: 1/Batches: 5/g" ./BadDicom.yaml sed -i "s/DropTables: false/DropTables: true/g" ./BadDicom.yaml From 4da5c9216e09d277a711f4aba935696935253c06 Mon Sep 17 00:00:00 2001 From: James A Sutherland Date: Mon, 11 Jul 2022 09:43:43 -0500 Subject: [PATCH 09/11] Bump HIC.BadMedicine from 1.0.1 to 1.1.0 --- BadMedicine.Dicom/BadMedicine.Dicom.csproj | 2 +- Packages.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/BadMedicine.Dicom/BadMedicine.Dicom.csproj b/BadMedicine.Dicom/BadMedicine.Dicom.csproj index 5a4e2a8..6fc8671 100644 --- a/BadMedicine.Dicom/BadMedicine.Dicom.csproj +++ b/BadMedicine.Dicom/BadMedicine.Dicom.csproj @@ -40,7 +40,7 @@ - + diff --git a/Packages.md b/Packages.md index c77a2cc..8e6c91d 100644 --- a/Packages.md +++ b/Packages.md @@ -9,7 +9,7 @@ | Package | Source Code | Version | License | Purpose | Additional Risk Assessment | | ------- | ------------| --------| ------- | ------- | -------------------------- | -| HIC.BadMedicine | [GitHub](https://github.com/HicServices/BadMedicine) | [1.0.1](https://www.nuget.org/packages/HIC.BadMedicine/1.0.1) | [GPL 3.0](https://www.gnu.org/licenses/gpl-3.0.html) | Handles generating baseline random data (patient date of birth, CHI numberts etc)| | +| HIC.BadMedicine | [GitHub](https://github.com/HicServices/BadMedicine) | [1.1.0](https://www.nuget.org/packages/HIC.BadMedicine/1.1.0) | [GPL 3.0](https://www.gnu.org/licenses/gpl-3.0.html) | Handles generating baseline random data (patient date of birth, CHI numberts etc)| | | fo-dicom | [GitHub](https://github.com/fo-dicom/fo-dicom) |[5.0.3](https://www.nuget.org/packages/fo-dicom/5.0.3)|[MS-PL](https://opensource.org/licenses/MS-PL) | Handles reading/writing dicom tags from dicom datasets | | | fo-dicom.Imaging.ImageSharp | [GitHub](https://github.com/fo-dicom/fo-dicom) |[5.0.3](https://www.nuget.org/packages/fo-dicom/5.0.3)|[MS-PL](https://opensource.org/licenses/MS-PL) | Handles imaging aspects with fo-dicom | | | SixLabors.ImageSharp | [GitHub](https://github.com/SixLabors/ImageSharp) | [2.1.3](https://www.nuget.org/packages/SixLabors.ImageSharp/2.1.3) | [Apache 2.0](https://github.com/SixLabors/ImageSharp/blob/main/LICENSE) | Platform-independent replacement for legacy Windows-only System.Drawing.Common | | From 14d07fd222b345f71e299045d9da1b343a3cdd24 Mon Sep 17 00:00:00 2001 From: James A Sutherland Date: Mon, 11 Jul 2022 09:44:53 -0500 Subject: [PATCH 10/11] Tidy up published CLI tool --- .github/workflows/testpack.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testpack.yml b/.github/workflows/testpack.yml index ef4f09c..833fe1f 100644 --- a/.github/workflows/testpack.yml +++ b/.github/workflows/testpack.yml @@ -33,7 +33,7 @@ jobs: dotnet pack ./BadMedicine.Dicom/BadMedicine.Dicom.csproj -c Release -p:IncludeSymbols=true -p:Version=$(grep AssemblyInformationalVersion SharedAssemblyInfo.cs | cut -d'"' -f2) -nologo for platform in linux win do - dotnet publish -c Release -r $platform-x64 -o $platform-x64 --self-contained true -nologo -v q + dotnet publish BadDicom/BadDicom.csproj -c Release -r $platform-x64 -o $platform-x64 --self-contained true -nologo -v q -p:PublishSingleFile=true -p:DebugType=embedded -p:GenerateDocumentationFile=false done zip -9r dist/baddicom-win-x64-v$(grep AssemblyInformationalVersion SharedAssemblyInfo.cs | cut -d'"' -f2).zip ./win-x64 tar czf dist/baddicom-linux-x64-v$(grep AssemblyInformationalVersion SharedAssemblyInfo.cs | cut -d'"' -f2).tar.gz ./linux-x64 From 5d1836ca1c29bf977c37f96aa9cb50d2c9e0c165 Mon Sep 17 00:00:00 2001 From: James A Sutherland Date: Mon, 11 Jul 2022 09:49:36 -0500 Subject: [PATCH 11/11] Update for 0.0.14 release --- CHANGELOG.md | 11 ++++++++++- SharedAssemblyInfo.cs | 8 ++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b848e26..b7b2de6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ... +## [0.0.14] - 2022-07-11 + +### Dependencies + +- Bump HIC.DicomTypeTranslation from 4.0.0 to 4.0.1 +- Bump HIC.BadMedicine from 1.0.1 to 1.1.0 +- Bump SixLabors.ImageSharp from 2.1.2 to 2.1.3 + ## [0.0.13] - 2022-06-02 - Fixed SpiralPitchFactor illegal value of 0.0 [#107](https://github.com/HicServices/BadMedicine.Dicom/issues/107) @@ -128,7 +136,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Support for PatientAge, Modality, Address, UIDs, StudyDate/Time - Support for pixel data / NoPixels flag -[Unreleased]: https://github.com/HicServices/BadMedicine.Dicom/compare/v0.0.13...develop +[Unreleased]: https://github.com/HicServices/BadMedicine.Dicom/compare/v0.0.14...develop +[0.0.14]: https://github.com/HicServices/BadMedicine.Dicom/compare/v0.0.13...v0.0.14 [0.0.13]: https://github.com/HicServices/BadMedicine.Dicom/compare/v0.0.12...v0.0.13 [0.0.12]: https://github.com/HicServices/BadMedicine.Dicom/compare/v0.0.11...v0.0.12 [0.0.11]: https://github.com/HicServices/BadMedicine.Dicom/compare/v0.0.10...v0.0.11 diff --git a/SharedAssemblyInfo.cs b/SharedAssemblyInfo.cs index 4eefeee..62d1c99 100644 --- a/SharedAssemblyInfo.cs +++ b/SharedAssemblyInfo.cs @@ -2,11 +2,11 @@ [assembly: AssemblyCompany("Health Informatics Centre, University of Dundee")] [assembly: AssemblyProduct("Bad Dicom")] -[assembly: AssemblyCopyright("Copyright (c) 2018 - 2021")] +[assembly: AssemblyCopyright("Copyright (c) 2018 - 2022")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] // These should be replaced with correct values by the release process -[assembly: AssemblyVersion("0.0.13")] -[assembly: AssemblyFileVersion("0.0.13")] -[assembly: AssemblyInformationalVersion("0.0.13")] +[assembly: AssemblyVersion("0.0.14")] +[assembly: AssemblyFileVersion("0.0.14")] +[assembly: AssemblyInformationalVersion("0.0.14")]