Merge pull request #113 from HicServices/develop

v0.0.14
SMI · Jul 11, 2022 · d299f26 · d299f26
2 parents 37b1c26 + 5d1836c
commit d299f26
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 21 deletions.
diff --git 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') }}
@@ -20,23 +20,20 @@ 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
+          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
-          dotnet ./BadDicom.dll ./ 50000 10 CT
-          cd -
+          dotnet run --project BadDicom/BadDicom.csproj -- ./ 50000 10 CT
       - name: Package
         run: |
           mkdir -p dist
           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
@@ -45,7 +42,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 }}

diff --git a/BadDicom/BadDicom.csproj b/BadDicom/BadDicom.csproj
@@ -42,7 +42,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="CommandLineParser" Version="2.9.1" />
-    <PackageReference Include="HIC.DicomTypeTranslation" Version="4.0.0" />
+    <PackageReference Include="HIC.DicomTypeTranslation" Version="4.0.1" />
     <PackageReference Include="YamlDotNet" Version="11.2.1" />
   </ItemGroup>
   <ItemGroup>

diff --git a/BadMedicine.Dicom/BadMedicine.Dicom.csproj b/BadMedicine.Dicom/BadMedicine.Dicom.csproj
@@ -40,8 +40,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="HIC.BadMedicine" Version="1.0.1" />
-    <PackageReference Include="SixLabors.ImageSharp" Version="2.1.2" />
+    <PackageReference Include="HIC.BadMedicine" Version="1.1.0" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="2.1.3" />
     <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta14" />
   </ItemGroup>
 

diff --git 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/Packages.md b/Packages.md
@@ -9,14 +9,14 @@
 
 | 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.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|
-| 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 |

diff --git 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")]