Merge pull request #40 from HicServices/develop

Develop
SMI · Aug 17, 2020 · 5ed87c9 · 5ed87c9
2 parents 8e8f5b3 + 7e2e1a0
commit 5ed87c9
Show file tree

Hide file tree

Showing 16 changed files with 340 additions and 53 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,7 +7,17 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
-- 
+## [2.3.1] - 2020-08-17
+
+- Add support for DX (Digital Radiography) modality
+- Obsolete method CorrectFoDicomVersion removed, previously deprecated
+
+### Dependencies
+
+- Bump fo-dicom from 4.0.5 to 4.0.6
+- Bump HIC.FAnsiSql from 0.11.1 to 1.0.5
+- Bump MongoDB.Driver from 2.10.4 to 2.11.0
+- Bump NLog from 4.7.2 to 4.7.3
 
 ## [2.3.0] - 2020-05-21
 

diff --git a/DicomTypeTranslation.Tests/BsonTranslationTests.cs b/DicomTypeTranslation.Tests/BsonTranslationTests.cs
@@ -367,6 +367,12 @@ public void OneTimeSetUp()
             TestLogger.Setup();
         }
 
+        [OneTimeTearDown]
+        public void OneTimeTearDown()
+        {
+            TestLogger.ShutDown();
+        }
+
         #endregion
 
         #region Test Helpers

diff --git a/DicomTypeTranslation.Tests/DicomTypeTranslation.Tests.csproj b/DicomTypeTranslation.Tests/DicomTypeTranslation.Tests.csproj
@@ -60,10 +60,15 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="fo-dicom.Json" Version="4.0.5" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <Content Include="..\Templates\DX.it" Link="Templates\DX.it">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="fo-dicom.Json" Version="4.0.6" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1"><IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0"><IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 <PrivateAssets>all</PrivateAssets>
 </PackageReference>
     <PackageReference Include="NunitXml.TestLogger" Version="2.1.62" />

diff --git a/DicomTypeTranslation.Tests/DicomTypeTranslatorTests.cs b/DicomTypeTranslation.Tests/DicomTypeTranslatorTests.cs
@@ -25,6 +25,12 @@ public void OneTimeSetUp()
             TestLogger.Setup();
         }
 
+        [OneTimeTearDown]
+        public void OneTimeTearDown()
+        {
+            TestLogger.ShutDown();
+        }
+
         #endregion
 
         #region Tests

diff --git a/DicomTypeTranslation.Tests/ExampleUsages.cs b/DicomTypeTranslation.Tests/ExampleUsages.cs
@@ -1,17 +1,10 @@
 using Dicom;
-using DicomTypeTranslation.TableCreation;
-using FAnsi.Discovery;
 using FAnsi.Discovery.TypeTranslation;
-using FAnsi.Implementation;
 using FAnsi.Implementations.MicrosoftSQL;
-using FAnsi.Implementations.MySql;
 using FAnsi.Implementations.Oracle;
-using MySql.Data.MySqlClient;
 using NUnit.Framework;
 using System;
 using System.Collections.Generic;
-using System.Data;
-using System.IO;
 using TypeGuesser;
 
 namespace DicomTypeTranslation.Tests

diff --git a/DicomTypeTranslation.Tests/Helpers/TestLogger.cs b/DicomTypeTranslation.Tests/Helpers/TestLogger.cs
@@ -1,4 +1,5 @@
 
+using System;
 using NLog;
 using NLog.Config;
 using NLog.Targets;
@@ -7,21 +8,30 @@ namespace DicomTypeTranslation.Tests.Helpers
 {
     public static class TestLogger
     {
+        private static LoggingConfiguration _logConfig;
+        private static ConsoleTarget _consoleTarget;
+
         public static void Setup()
         {
-            var logConfig = new LoggingConfiguration();
+            _logConfig = new LoggingConfiguration();
 
-            var consoleTarget = new ConsoleTarget("TestConsole")
+            _consoleTarget = new ConsoleTarget("TestConsole")
             {
                 Layout = "${level} | ${message} | ${exception:format=toString,Data:maxInnerExceptionLevel=5}"
             };
 
-            logConfig.AddTarget(consoleTarget);
-            logConfig.AddRuleForAllLevels(consoleTarget);
+            _logConfig.AddTarget(_consoleTarget);
+            _logConfig.AddRuleForAllLevels(_consoleTarget);
 
             LogManager.GlobalThreshold = LogLevel.Trace;
-            LogManager.Configuration = logConfig;
+            LogManager.Configuration = _logConfig;
             LogManager.GetCurrentClassLogger().Info("TestLogger setup, previous configuration replaced");
         }
+
+        public static void ShutDown()
+        {
+            LogManager.Configuration = _logConfig = null;
+            _consoleTarget.Dispose();
+        }
     }
 }
diff --git a/DicomTypeTranslation.Tests/JsonDicomConverterTests.cs b/DicomTypeTranslation.Tests/JsonDicomConverterTests.cs
@@ -56,6 +56,12 @@ public void SetUp()
             TestLogger.Setup();
         }
 
+        [OneTimeTearDown]
+        public void OneTimeTearDown()
+        {
+            TestLogger.ShutDown();
+        }
+
         #endregion
 
         #region Test Helpers

diff --git a/DicomTypeTranslation.Tests/TemplateTests.cs b/DicomTypeTranslation.Tests/TemplateTests.cs
@@ -48,6 +48,9 @@ public void Template_ExampleYaml()
         [TestCase("OTHER",FAnsi.DatabaseType.MicrosoftSQLServer)]
         [TestCase("OTHER",FAnsi.DatabaseType.MySql)]
         [TestCase("OTHER",FAnsi.DatabaseType.Oracle)]
+        [TestCase("DX",FAnsi.DatabaseType.MicrosoftSQLServer)]
+        [TestCase("DX",FAnsi.DatabaseType.MySql)]
+        [TestCase("DX",FAnsi.DatabaseType.Oracle)]
         public void TestTemplate(string template, FAnsi.DatabaseType dbType)
         {
             string templateFile = Path.Combine(TestContext.CurrentContext.TestDirectory,"Templates",template + ".it");

diff --git a/DicomTypeTranslation.sln b/DicomTypeTranslation.sln
@@ -28,6 +28,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Templates", "Templates", "{6A04501E-26BE-41E1-9C3E-8A1C1DC90F6D}"
 	ProjectSection(SolutionItems) = preProject
 		Templates\CT.it = Templates\CT.it
+		Templates\DX.it = Templates\DX.it
 		Templates\MR.it = Templates\MR.it
 		Templates\NM.it = Templates\NM.it
 		Templates\OTHER.it = Templates\OTHER.it

diff --git a/DicomTypeTranslation/DicomTypeTranslation.csproj b/DicomTypeTranslation/DicomTypeTranslation.csproj
@@ -29,11 +29,11 @@
     <None Include="Elevation\TagElevation.cd" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="fo-dicom.NetCore" Version="4.0.5" />
-    <PackageReference Include="HIC.FAnsiSql" Version="0.11.1" />
-    <PackageReference Include="MongoDB.Driver" Version="2.10.4" />
+    <PackageReference Include="fo-dicom.NetCore" Version="4.0.6" />
+    <PackageReference Include="HIC.FAnsiSql" Version="1.0.5" />
+    <PackageReference Include="MongoDB.Driver" Version="2.11.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="NLog" Version="4.7.2" />
-    <PackageReference Include="YamlDotNet" Version="8.1.1" />
+    <PackageReference Include="NLog" Version="4.7.3" />
+    <PackageReference Include="YamlDotNet" Version="8.1.2" />
   </ItemGroup>
 </Project>
diff --git a/DicomTypeTranslation/HIC.DicomTypeTranslation.nuspec b/DicomTypeTranslation/HIC.DicomTypeTranslation.nuspec
@@ -13,12 +13,12 @@
     <copyright>Copyright 2019</copyright>
     <tags>Dicom,ETL,SQL</tags>
     <dependencies>
-      <dependency id="fo-dicom.NetCore" version="4.0.5" />
-      <dependency id="HIC.FAnsiSql" version="0.11.1" />
-      <dependency id="MongoDB.Driver" version="2.10.4" />
+      <dependency id="fo-dicom.NetCore" version="4.0.6" />
+      <dependency id="HIC.FAnsiSql" version="1.0.5" />
+      <dependency id="MongoDB.Driver" version="2.11.0" />
       <dependency id="Newtonsoft.Json" version="12.0.3" />
-      <dependency id="NLog" version="4.7.2" />
-      <dependency id="YamlDotNet" version="8.1.1" />
+      <dependency id="NLog" version="4.7.3" />
+      <dependency id="YamlDotNet" version="8.1.2" />
     </dependencies>
   </metadata>
   <files>

diff --git a/DicomTypeTranslation/Helpers/DicomDatasetHelpers.cs b/DicomTypeTranslation/Helpers/DicomDatasetHelpers.cs
@@ -14,25 +14,6 @@ namespace DicomTypeTranslation.Helpers
     /// </summary>
     public static class DicomDatasetHelpers
     {
-        /// <summary>
-        /// Checks  the correct fo-dicom library is present for the platform at runtime
-        /// </summary>
-        /// <returns></returns>
-        [Obsolete("This is likely no longer needed since we explicitly build (and fo-dicom provides) packages for both Windows & Linux")]
-        [UsedImplicitly]
-        public static bool CorrectFoDicomVersion()
-        {
-            try
-            {
-                Encoding _ = Dicom.IO.IOManager.BaseEncoding;
-                return true;
-            }
-            catch (NullReferenceException)
-            {
-                return false;
-            }
-        }
-
         /// <summary>
         /// Returns true if the elements in <paramref name="a"/> are the same set of tags and values as <paramref name="b"/>
         /// </summary>

diff --git a/PACKAGES.md b/PACKAGES.md
@@ -9,11 +9,11 @@
 
 | Package | Source Code | Version | License | Purpose | Additional Risk Assessment |
 | ------- | ------------| --------| ------- | ------- | -------------------------- |
-| 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.4](https://www.nuget.org/packages/MongoDB.Driver/2.10.4)| [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.5](https://www.nuget.org/packages/fo-dicom.NetCore/4.0.5)|[MS-PL](https://opensource.org/licenses/MS-PL) | Handles reading/writing dicom tags from dicom datasets | |
-| YamlDotNet | [GitHub](https://github.com/aaubry/YamlDotNet)  | [8.1.1](https://www.nuget.org/packages/YamlDotNet/8.1.1) | [MIT](https://opensource.org/licenses/MIT) |Loading configuration files|
-| [NLog](https://nlog-project.org/) | [GitHub](https://github.com/NLog/NLog) | [4.7.2](https://www.nuget.org/packages/NLog/4.7.2) | [BSD 3-Clause](https://github.com/NLog/NLog/blob/dev/LICENSE.txt) | Flexible user configurable logging | |
+| HIC.FAnsiSql |[GitHub](https://github.com/HicServices/FAnsiSql) | [1.0.5](https://www.nuget.org/packages/HIC.FansiSql/1.0.5) | [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.11.0](https://www.nuget.org/packages/MongoDB.Driver/2.11.0)| [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.6](https://www.nuget.org/packages/fo-dicom.NetCore/4.0.6)|[MS-PL](https://opensource.org/licenses/MS-PL) | Handles reading/writing dicom tags from dicom datasets | |
+| YamlDotNet | [GitHub](https://github.com/aaubry/YamlDotNet)  | [8.1.2](https://www.nuget.org/packages/YamlDotNet/8.1.2) | [MIT](https://opensource.org/licenses/MIT) |Loading configuration files|
+| [NLog](https://nlog-project.org/) | [GitHub](https://github.com/NLog/NLog) | [4.7.3](https://www.nuget.org/packages/NLog/4.7.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.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 |
diff --git a/SharedAssemblyInfo.cs b/SharedAssemblyInfo.cs
@@ -8,6 +8,6 @@
 [assembly: AssemblyCulture("")]
 
 // These should be overwritten by release builds
-[assembly: AssemblyVersion("2.3.0")]
-[assembly: AssemblyFileVersion("2.3.0")]
-[assembly: AssemblyInformationalVersion("2.3.0")]
+[assembly: AssemblyVersion("2.3.1")]
+[assembly: AssemblyFileVersion("2.3.1")]
+[assembly: AssemblyInformationalVersion("2.3.1")]