Merge pull request #111 from HicServices/develop

Release v2.1.0 to main

.github/workflows/dotnet-desktop.yml

@@ -66,10 +66,20 @@ jobs:
     - name: Restore NuGet
       run: nuget restore
 
-    # Execute all unit tests in the solution
-    - name: Execute unit tests
-      run: dotnet test
-
+    # Execute all unit tests in the solution via coverlet for coverage info
+    - name : coverlet
+      uses: b3b00/coverlet-action@1.1.0
+      with:
+        testProject: 'Tests/Tests.csproj'
+        output: 'lcov.info'
+        outputFormat: 'lcov'
+        excludes: '[test]test.*'
+    - name: Upload coverage report
+      uses: coverallsapp/github-action@v1.1.1
+      with:
+        github-token: ${{secrets.GITHUB_TOKEN }} 
+        path-to-lcov: Tests/lcov.info
+
     # Restore the application to populate the obj folder with RuntimeIdentifiers
     - name: Restore the application
       run: dotnet build -c Release --verbosity quiet

CHANGELOG.md

@@ -6,12 +6,29 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-### Fixed
+## [2.1.0] - 2022-02-08
 
-- Fixed navigate to online templates not working after dotnet core update
+### Changes
+
+- Using .Net 5.0
+
+### Dependency updates
+
+- Bump CsvHelper from 26.1.0 to 27.2.1
+- Bump HIC.DicomTypeTranslation from 2.3.2 to 3.0.0
+- Bump DockPanelSuite from 3.1.0-beta7 to 3.1.0
+- Bump fo-dicom from 4.0.7 to 4.0.8
+- Bump fo-dicom.Drawing from 4.0.7 to 4.0.8
+- Bump HIC.DicomTypeTranslation from 2.3.2 to 3.0.0
+- Bump System.Drawing.Common from 5.0.2 to 6.0.0
+- Bump fernandreu.ScintillaNET from 4.0.4 to 4.2.0
 
-## [2.0.0] - 2020-03-26
+## [2.0.0] - 2021-03-27
 
+### Fixed
+
+- Fixed navigate to online templates not working after dotnet core update
+- 
 ### Added
 
 - Added logging to ProcessJob for outPath in DicomRepopulatorProcessor
@@ -59,7 +76,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 Initial version
 
 
-[Unreleased]: https://github.com/HicServices/DicomTemplateBuilder/compare/v2.0.0...develop
+[Unreleased]: https://github.com/HicServices/DicomTemplateBuilder/compare/v2.1.0...develop
+[2.1.0]: https://github.com/HicServices/DicomTemplateBuilder/compare/v2.0.0...v2.1.0
 [2.0.0]: https://github.com/HicServices/DicomTemplateBuilder/compare/v1.1.0...v2.0.0
 [1.1.0]: https://github.com/HicServices/DicomTemplateBuilder/compare/v1.0.2...v1.1.0
 [1.0.2]: https://github.com/HicServices/DicomTemplateBuilder/compare/v1.0.1...v1.0.2

README.md

@@ -1,7 +1,7 @@
 # DicomTemplateBuilder
 
-[![Build Status](https://travis-ci.org/HicServices/DicomTemplateBuilder.svg?branch=master)](https://travis-ci.org/HicServices/DicomTemplateBuilder)  [![Total alerts](https://img.shields.io/lgtm/alerts/g/HicServices/DicomTemplateBuilder.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/HicServices/DicomTemplateBuilder/alerts/) 
-[![codecov](https://codecov.io/gh/HicServices/DicomTemplateBuilder/branch/develop/graph/badge.svg)](https://codecov.io/gh/HicServices/DicomTemplateBuilder/)
+[![Total alerts](https://img.shields.io/lgtm/alerts/g/HicServices/DicomTemplateBuilder.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/HicServices/DicomTemplateBuilder/alerts/) 
+[![Coverage Status](https://coveralls.io/repos/github/HicServices/DicomTemplateBuilder/badge.svg?branch=feature/coverage)](https://coveralls.io/github/HicServices/DicomTemplateBuilder?branch=feature/coverage)
 
 [Dicom Template Builder](https://github.com/HicServices/DicomTemplateBuilder/releases) is a small windows application to assist researchers in building simple relational database schemas for storing DICOM images.
 

Repopulator/Repopulator.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <ProjectGuid>3b0e5ac1-5439-470c-832d-7de566b22cd8</ProjectGuid>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <AssemblyTitle>Repopulator</AssemblyTitle>
     <Product>Repopulator</Product>
     <Copyright>Copyright ©  2019</Copyright>
@@ -14,8 +14,8 @@
     <Content Include="..\TemplateBuilder\NLog.config" Link="NLog.config" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="CsvHelper" Version="26.1.0" />
-    <PackageReference Include="HIC.DicomTypeTranslation" Version="2.3.2" />
+    <PackageReference Include="CsvHelper" Version="27.2.1" />
+    <PackageReference Include="HIC.DicomTypeTranslation" Version="3.0.0" />
     <PackageReference Include="System.Data.DataSetExtensions" Version="4.*" />
     <PackageReference Include="Microsoft.CSharp" Version="4.*" />
     <PackageReference Include="System.Net.Http" Version="4.*" />

SharedAssemblyInfo.cs

@@ -7,6 +7,6 @@
 [assembly: AssemblyCulture("")]
 
 // These should be replaced with correct values by the release process
-[assembly: AssemblyVersion("2.0.0")]
-[assembly: AssemblyFileVersion("2.0.0")]
-[assembly: AssemblyInformationalVersion("2.0.0")]
+[assembly: AssemblyVersion("2.1.0")]
+[assembly: AssemblyFileVersion("2.1.0")]
+[assembly: AssemblyInformationalVersion("2.1.0")]

TemplateBuilder/TemplateBuilder.csproj

@@ -53,17 +53,17 @@
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
-    <PackageReference Include="CsvHelper" Version="26.1.0" />
-    <PackageReference Include="DockPanelSuite" Version="3.1.0-beta7" />
-    <PackageReference Include="DockPanelSuite.ThemeVS2015" Version="3.1.0-beta7" />
-    <PackageReference Include="fo-dicom" Version="4.0.7" />
-    <PackageReference Include="fo-dicom.Drawing" Version="4.0.7" />
+    <PackageReference Include="CsvHelper" Version="27.2.1" />
+    <PackageReference Include="DockPanelSuite" Version="3.1.0" />
+    <PackageReference Include="DockPanelSuite.ThemeVS2015" Version="3.1.0" />
+    <PackageReference Include="fo-dicom" Version="5.0.2" />
+    <PackageReference Include="fo-dicom.Drawing" Version="4.0.8" />
     <PackageReference Include="HIC.BadMedicine.Dicom" Version="0.0.9" />
-    <PackageReference Include="HIC.DicomTypeTranslation" Version="2.3.2" />
+    <PackageReference Include="HIC.DicomTypeTranslation" Version="3.0.0" />
     <PackageReference Include="ObjectListView.Official" Version="2.9.1" />
-    <PackageReference Include="System.Drawing.Common" Version="5.0.2" />
+    <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
     <PackageReference Include="System.Resources.Extensions" Version="4.6.0" />
-    <PackageReference Include="fernandreu.ScintillaNET" Version="4.0.4" />
+    <PackageReference Include="fernandreu.ScintillaNET" Version="4.2.0" />
     <ProjectReference Include="..\Repopulator\Repopulator.csproj" />
 
     <Compile Update="Properties\Settings.Designer.cs">

Tests/Tests.csproj

@@ -16,15 +16,18 @@
   </PropertyGroup>
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <ItemGroup>
-    <PackageReference Include="HIC.DicomTypeTranslation" Version="2.3.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
-    <PackageReference Include="NUnit" Version="3.13.1" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0">
+    <PackageReference Include="coverlet.msbuild" Version="3.1.2">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="HIC.DicomTypeTranslation" Version="3.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+    <PackageReference Include="NUnit" Version="3.13.2" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="NunitXml.TestLogger" Version="3.0.97" />
-    <PackageReference Include="OpenCover" Version="4.7.922" />
+    <PackageReference Include="NunitXml.TestLogger" Version="3.0.117" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Repopulator\Repopulator.csproj" />