From af51a388f27d889c09e4642d52b6bbcafedecb68 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Jul 2022 17:04:07 +0000 Subject: [PATCH 1/4] Bump HIC.BadMedicine.Dicom from 0.0.13 to 0.0.14 Bumps [HIC.BadMedicine.Dicom](https://github.com/HicServices/BadMedicine.Dicom) from 0.0.13 to 0.0.14. - [Release notes](https://github.com/HicServices/BadMedicine.Dicom/releases) - [Changelog](https://github.com/HicServices/BadMedicine.Dicom/blob/develop/CHANGELOG.md) - [Commits](https://github.com/HicServices/BadMedicine.Dicom/compare/v0.0.13...v0.0.14) --- updated-dependencies: - dependency-name: HIC.BadMedicine.Dicom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- TemplateBuilder/TemplateBuilder.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TemplateBuilder/TemplateBuilder.csproj b/TemplateBuilder/TemplateBuilder.csproj index 53e6cb7..dc71e84 100644 --- a/TemplateBuilder/TemplateBuilder.csproj +++ b/TemplateBuilder/TemplateBuilder.csproj @@ -58,7 +58,7 @@ - + From 6d70c8dd9adb7bb868e65032e7f918ddba0cc7c6 Mon Sep 17 00:00:00 2001 From: James A Sutherland Date: Mon, 11 Jul 2022 12:53:04 -0500 Subject: [PATCH 2/4] Bump CsvHelper from 27.2.1 to 28.0.0 --- Repopulator/Repopulator.csproj | 2 +- TemplateBuilder/TemplateBuilder.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Repopulator/Repopulator.csproj b/Repopulator/Repopulator.csproj index d159521..af3b9f3 100644 --- a/Repopulator/Repopulator.csproj +++ b/Repopulator/Repopulator.csproj @@ -14,7 +14,7 @@ - + diff --git a/TemplateBuilder/TemplateBuilder.csproj b/TemplateBuilder/TemplateBuilder.csproj index dc71e84..7bd53cc 100644 --- a/TemplateBuilder/TemplateBuilder.csproj +++ b/TemplateBuilder/TemplateBuilder.csproj @@ -53,7 +53,7 @@ SettingsSingleFileGenerator Settings.Designer.cs - + From 959c1ce2449656bf8f46973ed460efbd26491b8b Mon Sep 17 00:00:00 2001 From: James A Sutherland Date: Mon, 11 Jul 2022 13:16:44 -0500 Subject: [PATCH 3/4] Update for new CsvHelper API --- Repopulator/CsvToDicomTagMapping.cs | 7 ++++--- Repopulator/Matchers/TagMatcher.cs | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Repopulator/CsvToDicomTagMapping.cs b/Repopulator/CsvToDicomTagMapping.cs index b6b6a19..1006292 100644 --- 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 index bcdc2ab..dbde1ec 100644 --- 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]; From 512687b461ff6392f67f8886bff9660267a93b5b Mon Sep 17 00:00:00 2001 From: James A Sutherland Date: Mon, 11 Jul 2022 13:22:37 -0500 Subject: [PATCH 4/4] Fix typo --- Repopulator/Matchers/TagMatcher.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Repopulator/Matchers/TagMatcher.cs b/Repopulator/Matchers/TagMatcher.cs index dbde1ec..46d1ffa 100644 --- a/Repopulator/Matchers/TagMatcher.cs +++ b/Repopulator/Matchers/TagMatcher.cs @@ -35,7 +35,7 @@ public TagMatcher(CsvToDicomTagMapping map, DicomRepopulatorOptions options):bas 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())