From 6e3917165084152fec98e9915e161e70cacd51db Mon Sep 17 00:00:00 2001
From: James A Sutherland <j@sutherland.pw>
Date: Mon, 6 Apr 2020 15:45:57 +0100
Subject: [PATCH 01/11] Dependency updates

---
 DicomTypeTranslation/DicomTypeTranslation.csproj | 10 +++++-----
 Packages.md                                      | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/DicomTypeTranslation/DicomTypeTranslation.csproj b/DicomTypeTranslation/DicomTypeTranslation.csproj
index 7e8b68e..7d5f90f 100644
--- a/DicomTypeTranslation/DicomTypeTranslation.csproj
+++ b/DicomTypeTranslation/DicomTypeTranslation.csproj
@@ -17,10 +17,10 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="fo-dicom.NetCore" Version="[4.0.4]" />
-    <PackageReference Include="HIC.FAnsiSql" Version="[0.10.12]" />
-    <PackageReference Include="MongoDB.Driver" Version="[2.8.1]" />
-    <PackageReference Include="Newtonsoft.Json" Version="[12.0.2]" />
-    <PackageReference Include="NLog" Version="[4.6.3]" />
-    <PackageReference Include="YamlDotNet" Version="[6.0.0]" />
+    <PackageReference Include="HIC.FAnsiSql" Version="0.11.1" />
+    <PackageReference Include="MongoDB.Driver" Version="2.10.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="NLog" Version="4.7.0" />
+    <PackageReference Include="YamlDotNet" Version="8.1.0" />
   </ItemGroup>
 </Project>
diff --git a/Packages.md b/Packages.md
index a982a16..639db8a 100644
--- a/Packages.md
+++ b/Packages.md
@@ -9,12 +9,12 @@
 
 | Package | Source Code | Version | License | Purpose | Additional Risk Assessment |
 | ------- | ------------| --------| ------- | ------- | -------------------------- |
-| HIC.FAnsiSql |[GitHub](https://github.com/HicServices/FAnsiSql) | [0.10.12](https://www.nuget.org/packages/HIC.FansiSql/0.10.12) | [GPL 3.0](https://www.gnu.org/licenses/gpl-3.0.html) | Handles assigning translating database types and DBMS interactions|
-|[MongoDB.Driver](https://docs.mongodb.com/ecosystem/drivers/csharp/)| [GitHub](https://github.com/mongodb/mongo-csharp-driver) |[2.8.1](https://www.nuget.org/packages/MongoDB.Driver/2.8.1)| [Apache 2.0](http://www.apache.org/licenses/LICENSE-2.0) | Types for writting dicom tags into MongoDb databases|
+| HIC.FAnsiSql |[GitHub](https://github.com/HicServices/FAnsiSql) | [0.11.1](https://www.nuget.org/packages/HIC.FansiSql/0.11.1) | [GPL 3.0](https://www.gnu.org/licenses/gpl-3.0.html) | Handles assigning translating database types and DBMS interactions|
+|[MongoDB.Driver](https://docs.mongodb.com/ecosystem/drivers/csharp/)| [GitHub](https://github.com/mongodb/mongo-csharp-driver) |[2.10.2](https://www.nuget.org/packages/MongoDB.Driver/2.10.2)| [Apache 2.0](http://www.apache.org/licenses/LICENSE-2.0) | Types for writting dicom tags into MongoDb databases|
 | fo-dicom.NetCore | [GitHub](https://github.com/fo-dicom/fo-dicom) |[4.0.4](https://www.nuget.org/packages/fo-dicom.NetCore/4.0.4)|[MS-PL](https://opensource.org/licenses/MS-PL) | Handles reading/writing dicom tags from dicom datasets | |
 | fo-dicom.Json | [GitHub](https://github.com/fo-dicom/fo-dicom) |[4.0.4](https://www.nuget.org/packages/fo-dicom.Json/4.0.4)|[MS-PL](https://opensource.org/licenses/MS-PL) | Handles serializing dicom datasets | |
-| YamlDotNet | [GitHub](https://github.com/aaubry/YamlDotNet)  | [6.0.0](https://www.nuget.org/packages/YamlDotNet/6.0.0) | [MIT](https://opensource.org/licenses/MIT) |Loading configuration files|
-| [NLog](https://nlog-project.org/) | [GitHub](https://github.com/NLog/NLog) | [4.6.3](https://www.nuget.org/packages/NLog/4.6.3) | [BSD 3-Clause](https://github.com/NLog/NLog/blob/dev/LICENSE.txt) | Flexible user configurable logging | |
-| [Newtonsoft.Json](https://www.newtonsoft.com/json) | [GitHub](https://github.com/JamesNK/Newtonsoft.Json) | [12.0.2](https://www.nuget.org/packages/Newtonsoft.Json/12.0.2) | [MIT](https://opensource.org/licenses/MIT) | Serialization of objects for sharing/transmission |
+| YamlDotNet | [GitHub](https://github.com/aaubry/YamlDotNet)  | [8.1.0](https://www.nuget.org/packages/YamlDotNet/8.1.0) | [MIT](https://opensource.org/licenses/MIT) |Loading configuration files|
+| [NLog](https://nlog-project.org/) | [GitHub](https://github.com/NLog/NLog) | [4.7.0](https://www.nuget.org/packages/NLog/4.7.0) | [BSD 3-Clause](https://github.com/NLog/NLog/blob/dev/LICENSE.txt) | Flexible user configurable logging | |
+| [Newtonsoft.Json](https://www.newtonsoft.com/json) | [GitHub](https://github.com/JamesNK/Newtonsoft.Json) | [12.0.3](https://www.nuget.org/packages/Newtonsoft.Json/12.0.3) | [MIT](https://opensource.org/licenses/MIT) | Serialization of objects for sharing/transmission |
 | [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 |

From 3523d427f6589efe4aa517ba6d37af4eecd324e4 Mon Sep 17 00:00:00 2001
From: James A Sutherland <j@sutherland.pw>
Date: Mon, 6 Apr 2020 15:52:51 +0100
Subject: [PATCH 02/11] Fix ssl-mode to sslmode

---
 DicomTypeTranslation.Tests/TestDatabases.xml | 2 +-
 rakefile.rb                                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/DicomTypeTranslation.Tests/TestDatabases.xml b/DicomTypeTranslation.Tests/TestDatabases.xml
index 6cb6321..0071607 100644
--- a/DicomTypeTranslation.Tests/TestDatabases.xml
+++ b/DicomTypeTranslation.Tests/TestDatabases.xml
@@ -9,7 +9,7 @@
   </TestDatabase>
   <TestDatabase>
     <DatabaseType>MySql</DatabaseType>
-    <ConnectionString>server=127.0.0.1;Uid=root;Pwd=;Ssl-Mode=None</ConnectionString>
+    <ConnectionString>server=127.0.0.1;Uid=root;Pwd=;sslmode=None</ConnectionString>
   </TestDatabase>
   <!--         
   <TestDatabase>
diff --git a/rakefile.rb b/rakefile.rb
index bb53181..1449ccf 100644
--- a/rakefile.rb
+++ b/rakefile.rb
@@ -22,7 +22,7 @@
           </TestDatabase>
           <TestDatabase>
             <DatabaseType>MySql</DatabaseType>
-            <ConnectionString>Server=#{MYSQLDB};Uid=#{MYSQLUSR};Pwd=#{MYSQLPASS};Ssl-Mode=Required</ConnectionString>
+            <ConnectionString>Server=#{MYSQLDB};Uid=#{MYSQLUSR};Pwd=#{MYSQLPASS};sslmode=Required</ConnectionString>
           </TestDatabase>
           <!--<TestDatabase>
             <DatabaseType>Oracle</DatabaseType>

From 5907e9af2ffa9d4ab76725837fd7ee30cb8aed88 Mon Sep 17 00:00:00 2001
From: James A Sutherland <j@sutherland.pw>
Date: Mon, 6 Apr 2020 15:53:16 +0100
Subject: [PATCH 03/11] Update Docker, use 3.1 SDK (supported) not 2.2
 (abandonware)

---
 .travis.yml | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 82651ac..8c901e9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,5 @@
-language: csharp
+language: generic
 mono: none
-dotnet: 2.2.100
 
 addons:
   postgresql: "10"
@@ -8,13 +7,22 @@ addons:
     packages:
     - postgresql-10
     - postgresql-client-10
+    sources:
+    - sourceline: 'deb [arch=amd64] https://packages.microsoft.com/ubuntu/18.04/prod bionic main'
+      key_url: 'https://packages.microsoft.com/keys/microsoft.asc'
+    - sourceline: 'deb [arch=amd64,arm64,armhf] https://packages.microsoft.com/ubuntu/16.04/mssql-server-2017 xenial main'
 
 services:
   - postgresql
   - mysql
+  env:
+  - MSSQL_SA_PASSWORD="YourStrong!Passw0rd"
+  - ACCEPT_EULA=Y
+  - MSSQL_PID='developer'
 
 before_script:
-- sudo docker run --name=mssql-server-linux-latest -e 'ACCEPT_EULA=Y' -e 'MSSQL_SA_PASSWORD=YourStrong!Passw0rd' -p 1433:1433 -d microsoft/mssql-server-linux:2017-latest
+- sudo apt-get install -y --no-install-recommends mssql-tools mssql-server dotnet-runtime-2.2 dotnet-sdk-3.1
+- sudo /opt/mssql/bin/mssql-conf -n setup accept-eula
 
 script:
  - dotnet restore

From 432050d20dfcd33cf2033aaf9c7a821393e58d50 Mon Sep 17 00:00:00 2001
From: James A Sutherland <j@sutherland.pw>
Date: Mon, 6 Apr 2020 15:55:38 +0100
Subject: [PATCH 04/11] Update nuspec file with new version numbers for
 dependencies to match .csproj

---
 DicomTypeTranslation/HIC.DicomTypeTranslation.nuspec | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/DicomTypeTranslation/HIC.DicomTypeTranslation.nuspec b/DicomTypeTranslation/HIC.DicomTypeTranslation.nuspec
index f3c3c98..897c870 100644
--- a/DicomTypeTranslation/HIC.DicomTypeTranslation.nuspec
+++ b/DicomTypeTranslation/HIC.DicomTypeTranslation.nuspec
@@ -14,11 +14,11 @@
     <tags>Dicom,ETL,SQL</tags>
     <dependencies>
       <dependency id="fo-dicom.NetCore" version="4.0.4" />
-      <dependency id="HIC.FAnsiSql" version="0.10.12" />
-      <dependency id="MongoDB.Driver" version="2.8.1" />
-      <dependency id="Newtonsoft.Json" version="12.0.2" />
-	  <dependency id="NLog" version="4.6.3" />
-	  <dependency id="YamlDotNet" version="6.0.0" />
+      <dependency id="HIC.FAnsiSql" version="0.11.1" />
+      <dependency id="MongoDB.Driver" version="2.10.2" />
+      <dependency id="Newtonsoft.Json" version="12.0.3" />
+	  <dependency id="NLog" version="4.7.0" />
+	  <dependency id="YamlDotNet" version="8.1.0" />
     </dependencies>
   </metadata>
   <files>

From c715f2ff7e719af107e4388d084836a95798ddd2 Mon Sep 17 00:00:00 2001
From: James A Sutherland <j@sutherland.pw>
Date: Mon, 6 Apr 2020 15:57:33 +0100
Subject: [PATCH 05/11] Travis indentation fixup

---
 .travis.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8c901e9..fb36418 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,12 +13,12 @@ addons:
     - sourceline: 'deb [arch=amd64,arm64,armhf] https://packages.microsoft.com/ubuntu/16.04/mssql-server-2017 xenial main'
 
 services:
-  - postgresql
-  - mysql
-  env:
-  - MSSQL_SA_PASSWORD="YourStrong!Passw0rd"
-  - ACCEPT_EULA=Y
-  - MSSQL_PID='developer'
+- postgresql
+- mysql
+env:
+- MSSQL_SA_PASSWORD="YourStrong!Passw0rd"
+- ACCEPT_EULA=Y
+- MSSQL_PID='developer'
 
 before_script:
 - sudo apt-get install -y --no-install-recommends mssql-tools mssql-server dotnet-runtime-2.2 dotnet-sdk-3.1

From af27762e4d4b27c501c3954c31d65a329382ef8d Mon Sep 17 00:00:00 2001
From: James A Sutherland <j@sutherland.pw>
Date: Mon, 6 Apr 2020 16:00:07 +0100
Subject: [PATCH 06/11] Travis env-job fixup

---
 .travis.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fb36418..7ded0ba 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,7 @@
 language: generic
 mono: none
+dist: bionic
+os: linux
 
 addons:
   postgresql: "10"
@@ -16,9 +18,10 @@ services:
 - postgresql
 - mysql
 env:
-- MSSQL_SA_PASSWORD="YourStrong!Passw0rd"
-- ACCEPT_EULA=Y
-- MSSQL_PID='developer'
+  global:
+  - MSSQL_SA_PASSWORD="YourStrong!Passw0rd"
+  - ACCEPT_EULA=Y
+  - MSSQL_PID='developer'
 
 before_script:
 - sudo apt-get install -y --no-install-recommends mssql-tools mssql-server dotnet-runtime-2.2 dotnet-sdk-3.1

From bf8580a6cccefcf0741e59caca8494b29e4e031b Mon Sep 17 00:00:00 2001
From: James A Sutherland <j@sutherland.pw>
Date: Mon, 6 Apr 2020 16:13:11 +0100
Subject: [PATCH 07/11] Update test dependencies too

---
 .../DicomTypeTranslation.Tests.csproj                 | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/DicomTypeTranslation.Tests/DicomTypeTranslation.Tests.csproj b/DicomTypeTranslation.Tests/DicomTypeTranslation.Tests.csproj
index aea19b8..14f2584 100644
--- a/DicomTypeTranslation.Tests/DicomTypeTranslation.Tests.csproj
+++ b/DicomTypeTranslation.Tests/DicomTypeTranslation.Tests.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <ProjectGuid>{877FAE0D-9EA7-4CA9-ADBB-B47913428ADE}</ProjectGuid>
     <TargetFramework>netcoreapp2.2</TargetFramework>
     <AssemblyTitle>DicomTypeTranslation.Tests</AssemblyTitle>
     <Product>DicomTypeTranslation.Tests</Product>
@@ -57,10 +56,12 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="fo-dicom.Json" Version="[4.0.4]" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.0" />
-    <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.5.0" />
+    <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1"><IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+<PrivateAssets>all</PrivateAssets>
+</PackageReference>
+    <PackageReference Include="NunitXml.TestLogger" Version="2.1.41" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\DicomTypeTranslation\DicomTypeTranslation.csproj" />

From 2175b022ff1c74dc85851aeaecfdf69f58520ce3 Mon Sep 17 00:00:00 2001
From: James A Sutherland <j@sutherland.pw>
Date: Mon, 6 Apr 2020 16:22:31 +0100
Subject: [PATCH 08/11] Build test app as .net Core 3.1 (supported) not 2.2
 (EOL)

---
 DicomTypeTranslation.Tests/DicomTypeTranslation.Tests.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DicomTypeTranslation.Tests/DicomTypeTranslation.Tests.csproj b/DicomTypeTranslation.Tests/DicomTypeTranslation.Tests.csproj
index 14f2584..a40b44a 100644
--- a/DicomTypeTranslation.Tests/DicomTypeTranslation.Tests.csproj
+++ b/DicomTypeTranslation.Tests/DicomTypeTranslation.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <AssemblyTitle>DicomTypeTranslation.Tests</AssemblyTitle>
     <Product>DicomTypeTranslation.Tests</Product>
     <Copyright>Copyright ©  2018</Copyright>

From e9019e001c53334f0c85574be1821c2ac9bec0f6 Mon Sep 17 00:00:00 2001
From: James A Sutherland <j@sutherland.pw>
Date: Mon, 6 Apr 2020 16:26:50 +0100
Subject: [PATCH 09/11] Update YAML parser code to use .Consume rather than
 .Expect

---
 DicomTypeTranslation/TableCreation/SystemTypeTypeConverter.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DicomTypeTranslation/TableCreation/SystemTypeTypeConverter.cs b/DicomTypeTranslation/TableCreation/SystemTypeTypeConverter.cs
index 08948f4..2160ca2 100644
--- a/DicomTypeTranslation/TableCreation/SystemTypeTypeConverter.cs
+++ b/DicomTypeTranslation/TableCreation/SystemTypeTypeConverter.cs
@@ -14,7 +14,7 @@ public bool Accepts(Type type)
 
         public object ReadYaml(IParser parser, Type type)
         {
-            var scalar = parser.Expect<Scalar>();
+            var scalar = parser.Consume<Scalar>();
             return Type.GetType(scalar.Value);
         }
 

From cfa7b6f9032ed2ede221a89206713403212f07e3 Mon Sep 17 00:00:00 2001
From: James A Sutherland <j@sutherland.pw>
Date: Mon, 6 Apr 2020 16:42:50 +0100
Subject: [PATCH 10/11] Update CHANGELOG, add self to CONTRIBUTORS

---
 CHANGELOG.md    | 8 +++++++-
 CONTRIBUTORS.md | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index df51d78..59dd316 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
--
+- Update HIC.FAnsiSql to 0.11.1
+  - This updates the MySQL client to MySQLConnector
+  - Any connection string containing 'ssl-mode' must be updated to 'sslmode'
+- Update MongoDB.Driver to 2.10.2
+- Update Newtonsoft.Json to 12.0.3
+- Update NLog to 4.7.0
+- Update YamlDotNet to 8.1.0
 
 ## [2.2.0] - 2020-03-26
 
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 051fd99..c6bbff9 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -11,3 +11,4 @@
 
 - [Thomas Nind](https://github.com/tznind)
 - [Leandro Tramma](https://github.com/Tallmaris)
+- [James A Sutherland](https://github.com/jas88)

From 3da8f94c93a8299cbf2a44812d15667474883053 Mon Sep 17 00:00:00 2001
From: James A Sutherland <j@sutherland.pw>
Date: Mon, 6 Apr 2020 16:48:31 +0100
Subject: [PATCH 11/11] Add caching of Nuget directories in Travis

---
 .travis.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 7ded0ba..630a76d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,6 +22,10 @@ env:
   - MSSQL_SA_PASSWORD="YourStrong!Passw0rd"
   - ACCEPT_EULA=Y
   - MSSQL_PID='developer'
+cache:
+  directories:
+  - $HOME/.local/share/NuGet/
+  - $HOME/.nuget
 
 before_script:
 - sudo apt-get install -y --no-install-recommends mssql-tools mssql-server dotnet-runtime-2.2 dotnet-sdk-3.1