Merge pull request #152 from HicServices/develop

Release v2.2.1 to main
SMI · Nov 21, 2022 · 1b831ac · 1b831ac
2 parents cd60686 + b894e98
commit 1b831ac
Show file tree

Hide file tree

Showing 12 changed files with 55 additions and 147 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -15,5 +15,4 @@ updates:
       interval: "daily"
     target-branch: develop
     reviewers:
-    - tznind
     - jas88
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,9 +6,35 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.2.1] - 2022-11-21
+
+- Bump CsvHelper from 27.2.1 to 30.0.1
+- Bump CommandLineParser from 2.8.0 to 2.9.1
+- Bump fo-dicom from 5.0.2 to 5.0.3
+- Bump fo-dicom.Imaging.ImageSharp from 5.0.2 to 5.0.3
+- Bump HIC.DicomTypeTranslation from 4.0.0 to 4.0.1
+- Bump HIC.BadMedicine.Dicom from 0.0.11 to 0.0.15
+- Bump HIC.DicomTypeTranslation from 4.0.0 to 4.0.1
+- Bump System.Drawing.Common from 6.0.0 to 7.0.0
+- Bump System.Threading.AccessControl from 6.0.0 to 7.0.0
+- Bump coverallsapp/github-action from 1.1.1 to 1.1.3 
+- Bump b3b00/coverlet-action from 1.1.0 to 11.9 
+- Bump actions/checkout from 2 to 3 
+- Bump actions/setup-dotnet from 1 to 2 
+- Bump actions/cache from 2 to 3 
+- Bump actions/upload-artifact from 2 to 3 
+- Bump actions/setup-dotnet from 2 to 3 
+
 ## [2.2.0] - 2022-03-31
 
+### Changes
+
 - Using .Net 6.0
+- Bump HIC.DicomTypeTranslation from 3.0.0 to 4.0.0
+- Replace fo-dicom.Drawing 4.0.8 with fo-dicom.Imaging.ImageSharp 5.0.2
+- Bump HIC.BadMedicine.Dicom from 0.0.9 to 0.0.11
+- Bump HIC.DicomTypeTranslation from 3.0.0 to 4.0.0
+- Add System.Threading.AccessControl 6.0.0
 
 ## [2.1.0] - 2022-02-08
 
@@ -80,7 +106,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 Initial version
 
 
-[Unreleased]: https://github.com/HicServices/DicomTemplateBuilder/compare/v2.2.0...develop
+[Unreleased]: https://github.com/HicServices/DicomTemplateBuilder/compare/v2.2.1...develop
+[2.2.1]: https://github.com/HicServices/DicomTemplateBuilder/compare/v2.2.0...v2.2.1
 [2.2.0]: https://github.com/HicServices/DicomTemplateBuilder/compare/v2.1.0...v2.2.0
 [2.1.0]: https://github.com/HicServices/DicomTemplateBuilder/compare/v2.0.0...v2.1.0
 [2.0.0]: https://github.com/HicServices/DicomTemplateBuilder/compare/v1.1.0...v2.0.0

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # DicomTemplateBuilder
 
 [![Total alerts](https://img.shields.io/lgtm/alerts/g/HicServices/DicomTemplateBuilder.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/HicServices/DicomTemplateBuilder/alerts/) 
-[![Coverage Status](https://coveralls.io/repos/github/HicServices/DicomTemplateBuilder/badge.svg?branch=feature/coverage)](https://coveralls.io/github/HicServices/DicomTemplateBuilder?branch=feature/coverage)
+[![Coverage Status](https://coveralls.io/repos/github/HicServices/DicomTemplateBuilder/badge.svg?branch=feature/coverage)](https://coveralls.io/github/HicServices/DicomTemplateBuilder)
 
 [Dicom Template Builder](https://github.com/HicServices/DicomTemplateBuilder/releases) is a small windows application to assist researchers in building simple relational database schemas for storing DICOM images.
 

diff --git a/Repopulator/CsvToDicomTagMapping.cs b/Repopulator/CsvToDicomTagMapping.cs
@@ -73,10 +73,11 @@ public bool BuildMap(DicomRepopulatorOptions options, out string log)
 
                 CsvFile = options.CsvFileInfo;
 
-                using (var reader = new CsvReader(CsvFile.OpenText(), new(System.Globalization.CultureInfo.CurrentCulture)
+                var conf = new CsvConfiguration(System.Globalization.CultureInfo.CurrentCulture)
                 {
-                    TrimOptions = TrimOptions.Trim
-                }))
+                    TrimOptions=TrimOptions.Trim
+                };
+                using (var reader = new CsvReader(CsvFile.OpenText(), conf))
                 {
                     reader.Read();
                     var couldReadHeader = reader.ReadHeader();

diff --git a/Repopulator/Matchers/TagMatcher.cs b/Repopulator/Matchers/TagMatcher.cs
@@ -33,10 +33,11 @@ public TagMatcher(CsvToDicomTagMapping map, DicomRepopulatorOptions options):bas
             if(_indexer == null)
                 throw new ArgumentException("No valid indexer could be found, there must be a column in the map for either SOP, Series or Study instance UIDs");
 
-            using var reader = new CsvReader(map.CsvFile.OpenText(), new(System.Globalization.CultureInfo.CurrentCulture)
+            var conf = new CsvConfiguration(System.Globalization.CultureInfo.CurrentCulture)
             {
-                TrimOptions = TrimOptions.Trim
-            });
+                TrimOptions=TrimOptions.Trim
+            };
+            using var reader = new CsvReader(map.CsvFile.OpenText(), conf);
             while (reader.Read())
             {
                 string key = reader[_indexer.Index];

diff --git a/Repopulator/Repopulator.csproj b/Repopulator/Repopulator.csproj
@@ -14,8 +14,8 @@
     <Content Include="..\TemplateBuilder\NLog.config" Link="NLog.config" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="CsvHelper" Version="27.2.1" />
-    <PackageReference Include="HIC.DicomTypeTranslation" Version="4.0.0" />
+    <PackageReference Include="CsvHelper" Version="30.0.1" />
+    <PackageReference Include="HIC.DicomTypeTranslation" Version="4.0.1" />
     <PackageReference Include="System.Data.DataSetExtensions" Version="4.*" />
     <PackageReference Include="Microsoft.CSharp" Version="4.*" />
     <PackageReference Include="System.Net.Http" Version="4.*" />

diff --git a/RepopulatorCli/RepopulatorCli.csproj b/RepopulatorCli/RepopulatorCli.csproj
@@ -18,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CommandLineParser" Version="2.8.0" />
+    <PackageReference Include="CommandLineParser" Version="2.9.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/SharedAssemblyInfo.cs b/SharedAssemblyInfo.cs
@@ -7,6 +7,6 @@
 [assembly: AssemblyCulture("")]
 
 // These should be replaced with correct values by the release process
-[assembly: AssemblyVersion("2.2.0")]
-[assembly: AssemblyFileVersion("2.2.0")]
-[assembly: AssemblyInformationalVersion("2.2.0")]
+[assembly: AssemblyVersion("2.2.1")]
+[assembly: AssemblyFileVersion("2.2.1")]
+[assembly: AssemblyInformationalVersion("2.2.1")]
diff --git a/TemplateBuilder/TemplateBuilder.csproj b/TemplateBuilder/TemplateBuilder.csproj
@@ -53,18 +53,18 @@
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
-    <PackageReference Include="CsvHelper" Version="27.2.1" />
+    <PackageReference Include="CsvHelper" Version="30.0.1" />
     <PackageReference Include="DockPanelSuite" Version="3.1.0" />
     <PackageReference Include="DockPanelSuite.ThemeVS2015" Version="3.1.0" />
-    <PackageReference Include="fo-dicom" Version="5.0.2" />
-    <PackageReference Include="fo-dicom.Imaging.ImageSharp" Version="5.0.2" />
-    <PackageReference Include="HIC.BadMedicine.Dicom" Version="0.0.11" />
-    <PackageReference Include="HIC.DicomTypeTranslation" Version="4.0.0" />
+    <PackageReference Include="fo-dicom" Version="5.0.3" />
+    <PackageReference Include="fo-dicom.Imaging.ImageSharp" Version="5.0.3" />
+    <PackageReference Include="HIC.BadMedicine.Dicom" Version="0.0.15" />
+    <PackageReference Include="HIC.DicomTypeTranslation" Version="4.0.1" />
     <PackageReference Include="ObjectListView.Official" Version="2.9.1" />
-    <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
+    <PackageReference Include="System.Drawing.Common" Version="7.0.0" />
     <PackageReference Include="System.Resources.Extensions" Version="4.6.0" />
     <PackageReference Include="fernandreu.ScintillaNET" Version="4.2.0" />
-    <PackageReference Include="System.Threading.AccessControl" Version="6.0.0" />
+    <PackageReference Include="System.Threading.AccessControl" Version="7.0.0" />
     <ProjectReference Include="..\Repopulator\Repopulator.csproj" />
 
     <Compile Update="Properties\Settings.Designer.cs">

diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
@@ -16,18 +16,18 @@
   </PropertyGroup>
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <ItemGroup>
-    <PackageReference Include="coverlet.msbuild" Version="3.1.2">
+    <PackageReference Include="coverlet.msbuild" Version="3.2.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="HIC.DicomTypeTranslation" Version="4.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
+    <PackageReference Include="HIC.DicomTypeTranslation" Version="4.0.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1">
+    <PackageReference Include="NUnit3TestAdapter" Version="4.3.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="NunitXml.TestLogger" Version="3.0.117" />
+    <PackageReference Include="NunitXml.TestLogger" Version="3.0.127" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Repopulator\Repopulator.csproj" />

diff --git a/rakeconfig.rb b/rakeconfig.rb
diff --git a/rakefile.rb b/rakefile.rb