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..46d1ffa 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]; 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 @@ <Content Include="..\TemplateBuilder\NLog.config" Link="NLog.config" /> </ItemGroup> <ItemGroup> - <PackageReference Include="CsvHelper" Version="27.2.1" /> + <PackageReference Include="CsvHelper" Version="28.0.0" /> <PackageReference Include="HIC.DicomTypeTranslation" Version="4.0.1" /> <PackageReference Include="System.Data.DataSetExtensions" Version="4.*" /> <PackageReference Include="Microsoft.CSharp" Version="4.*" /> diff --git a/TemplateBuilder/TemplateBuilder.csproj b/TemplateBuilder/TemplateBuilder.csproj index 53e6cb7..7bd53cc 100644 --- a/TemplateBuilder/TemplateBuilder.csproj +++ b/TemplateBuilder/TemplateBuilder.csproj @@ -53,12 +53,12 @@ <Generator>SettingsSingleFileGenerator</Generator> <LastGenOutput>Settings.Designer.cs</LastGenOutput> </None> - <PackageReference Include="CsvHelper" Version="27.2.1" /> + <PackageReference Include="CsvHelper" Version="28.0.0" /> <PackageReference Include="DockPanelSuite" Version="3.1.0" /> <PackageReference Include="DockPanelSuite.ThemeVS2015" Version="3.1.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.13" /> + <PackageReference Include="HIC.BadMedicine.Dicom" Version="0.0.14" /> <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" />