Merge branch 'release/0.1.6'

HicServices · May 20, 2020 · 2fc6b00 · 2fc6b00
2 parents aef9f6c + be19bfc
commit 2fc6b00
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 20 deletions.
diff --git a/BadMedicine.Core/BadMedicine.Core.csproj b/BadMedicine.Core/BadMedicine.Core.csproj
@@ -34,8 +34,8 @@
     <EmbeddedResource Include="Datasets\Aggregates.zip" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="CsvHelper" Version="12.1.2" />
-    <PackageReference Include="MathNet.Numerics" Version="4.7.0" />
+    <PackageReference Include="CsvHelper" Version="15.0.5" />
+    <PackageReference Include="MathNet.Numerics" Version="4.9.1" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />

diff --git a/BadMedicine.Core/BadMedicine.nuspec b/BadMedicine.Core/BadMedicine.nuspec
@@ -15,8 +15,8 @@ BadMedicine differs from other random data generators e.g. Mockaroo, SQL Data Ge
     <copyright>Copyright 2019</copyright>
     <tags>Test Data,Random,Synthetic Data,EHR,Electronic Health Record</tags>
     <dependencies>
-      <dependency id="CsvHelper" version="12.1.2" exclude="Build,Analyzers" />
-      <dependency id="MathNet.Numerics" version="4.7.0" exclude="Build,Analyzers" />
+      <dependency id="CsvHelper" version="15.0.5" exclude="Build,Analyzers" />
+      <dependency id="MathNet.Numerics" version="4.9.1" exclude="Build,Analyzers" />
     </dependencies>
   </metadata>
   <files>

diff --git a/BadMedicine.Core/Datasets/DataGenerator.cs b/BadMedicine.Core/Datasets/DataGenerator.cs
@@ -8,6 +8,7 @@
 using System.Collections.Generic;
 using System.Data;
 using System.Diagnostics;
+using System.Globalization;
 using System.IO;
 using System.IO.Compression;
 using System.Linq;
@@ -57,7 +58,7 @@ public void GenerateTestDataFile(IPersonCollection cohort, FileInfo target, int
                 string task = "Populate " + target.Name;
                 stopwatch.Start();
 
-                using (var writer = new CsvWriter(sw))
+                using (var writer = new CsvWriter(sw,CultureInfo.CurrentCulture))
                 {
                     for (linesWritten = 0; linesWritten < numberOfRecords; linesWritten++)
                     {
@@ -294,7 +295,7 @@ public static DataTable EmbeddedCsvToDataTable(Type requestingType,string resour
             if (lookup == null)
                 throw new Exception("Could not find embedded resource file " + resourceFileName);
 
-            CsvReader r = new CsvReader(new StreamReader(lookup),new Configuration(){Delimiter =","});
+            CsvReader r = new CsvReader(new StreamReader(lookup),new CsvConfiguration(CultureInfo.CurrentCulture){Delimiter =","});
 
             var toReturn = dt?? new DataTable();
 

diff --git a/BadMedicine/BadMedicine.csproj b/BadMedicine/BadMedicine.csproj
@@ -23,7 +23,7 @@
     <Compile Include="..\SharedAssemblyInfo.cs" Link="SharedAssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="CommandLineParser" Version="2.5.0" />
+    <PackageReference Include="CommandLineParser" Version="2.8.0" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />

diff --git a/BadMedicineTests/BadMedicineTests.csproj b/BadMedicineTests/BadMedicineTests.csproj
@@ -10,10 +10,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
-    <PackageReference Include="NUnit" Version="3.11.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
-    <PackageReference Include="NunitXml.TestLogger" Version="2.1.36" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="NunitXml.TestLogger" Version="2.1.62" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ...
 
+## [0.1.6] - 2020-05-20
+
+### Changed
+
+- Updated CsvHelper to 15.0.5
+- Updated MathNet.Numerics to 4.9.1
+
 ## [0.1.5] - 2019-07-12
 
 ### Fixed
@@ -26,7 +33,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Patient birth dates now go from 1914 (Person.MinimumYearOfBirth) allowing for patients aged up to 100 years
 
-[Unreleased]: https://github.com/HicServices/BadMedicine/compare/v0.1.5...develop
+[Unreleased]: https://github.com/HicServices/BadMedicine/compare/v0.1.6...develop
+[0.1.6]: https://github.com/HicServices/BadMedicine/compare/v0.1.5...v0.1.6
 [0.1.5]: https://github.com/HicServices/BadMedicine/compare/v0.1.4...v0.1.5
 [0.1.4]: https://github.com/HicServices/BadMedicine/compare/v0.1.3...v0.1.4
 [0.1.3]: https://github.com/HicServices/BadMedicine/compare/0.0.1.2...v0.1.3
diff --git a/Packages.md b/Packages.md
@@ -9,10 +9,10 @@
 
 | Package | Source Code | Version | License | Purpose | Additional Risk Assessment |
 | ------- | ------------| --------| ------- | ------- | -------------------------- |
-| MathNet.Numerics | [GitHub](https://github.com/mathnet/mathnet-numerics)| [4.7.0](https://www.nuget.org/packages/MathNet.Numerics/4.7.0) |[MIT](https://opensource.org/licenses/MIT) | Generate statistical distributions (e.g. Gaussian) for random data | |
-| Command Line Parser | [GitHub](https://github.com/commandlineparser/commandline) | [2.5.0](https://www.nuget.org/packages/CommandLineParser/2.5.0) | [MIT](https://opensource.org/licenses/MIT) | Allows command line arguments for main client application and CLI executables |
-| CsvHelper | [GitHub](https://github.com/JoshClose/CsvHelper) | [12.1.2](https://www.nuget.org/packages/CsvHelper/12.1.2) | MS-PL / Apache 2.0 | Enables reading/writing CSV files |
-| [Nunit](https://nunit.org/) |[GitHub](https://github.com/nunit/nunit) | [3.11.0](https://www.nuget.org/packages/NUnit/3.11.0) | [MIT](https://opensource.org/licenses/MIT) | Unit testing |
-| NUnit3TestAdapter | [GitHub](https://github.com/nunit/nunit3-vs-adapter)| [3.13.0](https://www.nuget.org/packages/NUnit3TestAdapter/3.13.0) | [MIT](https://opensource.org/licenses/MIT) | Run unit tests from within Visual Studio |
+| MathNet.Numerics | [GitHub](https://github.com/mathnet/mathnet-numerics)| [4.9.1](https://www.nuget.org/packages/MathNet.Numerics/4.9.1) |[MIT](https://opensource.org/licenses/MIT) | Generate statistical distributions (e.g. Gaussian) for random data | |
+| Command Line Parser | [GitHub](https://github.com/commandlineparser/commandline) | [2.8.0](https://www.nuget.org/packages/CommandLineParser/2.8.0) | [MIT](https://opensource.org/licenses/MIT) | Allows command line arguments for main client application and CLI executables |
+| CsvHelper | [GitHub](https://github.com/JoshClose/CsvHelper) | [15.0.5](https://www.nuget.org/packages/CsvHelper/15.0.5) | MS-PL / Apache 2.0 | Enables reading/writing CSV files |
+| [Nunit](https://nunit.org/) |[GitHub](https://github.com/nunit/nunit) | [3.12.0](https://www.nuget.org/packages/NUnit/3.12.0) | [MIT](https://opensource.org/licenses/MIT) | Unit testing |
+| NUnit3TestAdapter | [GitHub](https://github.com/nunit/nunit3-vs-adapter)| [3.16.1](https://www.nuget.org/packages/NUnit3TestAdapter/3.16.1) | [MIT](https://opensource.org/licenses/MIT) | Run unit tests from within Visual Studio |
 
 
diff --git a/SharedAssemblyInfo.cs b/SharedAssemblyInfo.cs
@@ -9,6 +9,6 @@
 [assembly: AssemblyCulture("")]
 
 // These should be replaced with correct values by the release process
-[assembly: AssemblyVersion("0.1.5")]
-[assembly: AssemblyFileVersion("0.1.5")]
-[assembly: AssemblyInformationalVersion("0.1.5")]
+[assembly: AssemblyVersion("0.1.6")]
+[assembly: AssemblyFileVersion("0.1.6")]
+[assembly: AssemblyInformationalVersion("0.1.6")]