Merge remote-tracking branch 'origin/main' into hotfix/ifpartpattern

SMI · Jul 25, 2023 · d8aefb1 · d8aefb1
2 parents c0cd79e + a59c11b
commit d8aefb1
Show file tree

Hide file tree

Showing 13 changed files with 128 additions and 59 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <PropertyGroup>
+    <Authors>Universities of Dundee (HIC) and Edinburgh (EPCC)</Authors>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>embedded</DebugType>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <GenerateDocumentationFile>True</GenerateDocumentationFile>
     <ImplicitUsings>disable</ImplicitUsings>
+    <IsPackable>false</IsPackable>
+    <IsPublishable>false</IsPublishable>
+    <LangVersion>10.0</LangVersion>
     <Nullable>enable</Nullable>
+    <PackageLicenseExpression>GPL-3.0-or-later</PackageLicenseExpression>
+    <PackageProjectUrl>https://github.com/SMI/IsIdentifiable</PackageProjectUrl>
+    <SatelliteResourceLanguages>none</SatelliteResourceLanguages>
+    <TargetFramework>net6.0</TargetFramework>
+    <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
   </PropertyGroup>
 </Project>
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <PropertyGroup>
+    <EnablePackageVersionOverride>false</EnablePackageVersionOverride>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageVersion Include="CommandLineParser" Version="2.9.1" />
+    <PackageVersion Include="coverlet.msbuild" Version="6.0.0"/>
+    <PackageVersion Include="CsvHelper" Version="30.0.1" />
+    <PackageVersion Include="Equ" Version="2.3.0" />
+    <PackageVersion Include="fo-dicom.Imaging.ImageSharp" Version="5.1.0" />
+    <PackageVersion Include="HIC.DicomTypeTranslation" Version="4.0.3" />
+    <PackageVersion Include="HIC.FAnsiSql" Version="3.1.0" />
+    <PackageVersion Include="HIC.RDMP.Plugin" Version="8.0.7" />
+    <PackageVersion Include="IKVM" Version="8.6.2"/>
+    <PackageVersion Include="Lib.Harmony" Version="2.2.2" />
+    <PackageVersion Include="Magick.NET-Q16-AnyCPU" Version="13.2.0" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="7.0.0" />
+    <PackageVersion Include="NLog" Version="5.2.2" />
+    <PackageVersion Include="SecurityCodeScan.VS2019" Version="5.6.7"/>
+    <PackageVersion Include="System.IO.Abstractions" Version="19.2.29" />
+    <PackageVersion Include="System.IO.FileSystem" Version="4.3.0" />
+    <PackageVersion Include="Terminal.Gui" Version="1.13.4" />
+    <PackageVersion Include="Tesseract" Version="4.1.1" />
+    <PackageVersion Include="YamlDotNet" Version="13.1.1" />    
+    <!-- Test Packages -->
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
+    <PackageVersion Include="Moq" Version="4.18.4" />    
+    <PackageVersion Include="NUnit" Version="3.13.3" />
+    <PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
+    <PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="19.2.29" />
+  </ItemGroup>
+</Project>
diff --git a/IsIdentifiable.sln b/IsIdentifiable.sln
@@ -21,6 +21,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IsIdentifiablePlugin", "IsIdentifiablePlugin\IsIdentifiablePlugin.csproj", "{3BDB8F80-C301-4CC1-8511-7CAC3D5C3BD7}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ii.Tests", "ii.Tests\ii.Tests.csproj", "{ED7896EE-AB66-4FD2-BC62-5D8FCCA29D1A}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -43,6 +45,10 @@ Global
 		{3BDB8F80-C301-4CC1-8511-7CAC3D5C3BD7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3BDB8F80-C301-4CC1-8511-7CAC3D5C3BD7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3BDB8F80-C301-4CC1-8511-7CAC3D5C3BD7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ED7896EE-AB66-4FD2-BC62-5D8FCCA29D1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ED7896EE-AB66-4FD2-BC62-5D8FCCA29D1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ED7896EE-AB66-4FD2-BC62-5D8FCCA29D1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ED7896EE-AB66-4FD2-BC62-5D8FCCA29D1A}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/IsIdentifiable/IsIdentifiable.csproj b/IsIdentifiable/IsIdentifiable.csproj
@@ -2,24 +2,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyName>IsIdentifiable</AssemblyName>
-    <authors>Universities of Dundee and Edinburgh</authors>
-    <PackageLicenseExpression>GPL-3.0-or-later</PackageLicenseExpression>
-    <PackageProjectUrl>https://github.com/SMI/IsIdentifiable</PackageProjectUrl>
     <OutputType>Library</OutputType>
     <description>Library for spotting identifiable data in flat files, dicom files and relational databases (Sql Server, MySql, Oracle).</description>
-    <PackageTags>Identifiable,Detection,Validation,NLP,OCR,Natural Language Processing,Optical Character Recognition</PackageTags>
-    <copyright>Copyright 2019</copyright>
-    <TargetFramework>net6.0</TargetFramework>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <GenerateDocumentationFile>True</GenerateDocumentationFile>
-    <LangVersion>10.0</LangVersion>
+    <PackageTags>Identifiable,Detection,Validation,NLP,OCR,Natural Language Processing,Optical Character Recognition</PackageTags>    
   </PropertyGroup>
   <ItemGroup>
     <None Remove="Rules.template.yaml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\SharedAssemblyInfo.cs" Link="SharedAssemblyInfo.cs" />
-  </ItemGroup>
+  </ItemGroup>  
   <ItemGroup>
     <NativeLibs Include="$(MSBuildThisFileDirectory)runtimes\**\*.so" />
     <Content Include="@(NativeLibs)">
@@ -30,18 +19,18 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="CommandLineParser" Version="2.9.1" />
-    <PackageReference Include="CsvHelper" Version="30.0.1" />
-    <PackageReference Include="Equ" Version="2.3.0" />
-    <PackageReference Include="fo-dicom.Imaging.ImageSharp" Version="5.1.0" />
-    <PackageReference Include="HIC.DicomTypeTranslation" Version="4.0.3" />
-    <PackageReference Include="HIC.FAnsiSql" Version="3.1.0" />
-    <PackageReference Include="Lib.Harmony" Version="2.2.2" />
-    <PackageReference Include="Magick.NET-Q16-AnyCPU" Version="13.1.3" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
-    <PackageReference Include="NLog" Version="5.2.2" />
-    <PackageReference Include="System.IO.Abstractions" Version="19.2.29" />
-    <PackageReference Include="System.IO.FileSystem" Version="4.3.0" />
-    <PackageReference Include="Tesseract" Version="4.1.1" />
+    <PackageReference Include="CommandLineParser" />
+    <PackageReference Include="CsvHelper" />
+    <PackageReference Include="Equ" />
+    <PackageReference Include="fo-dicom.Imaging.ImageSharp" />
+    <PackageReference Include="HIC.DicomTypeTranslation" />
+    <PackageReference Include="HIC.FAnsiSql" />
+    <PackageReference Include="Lib.Harmony" />
+    <PackageReference Include="Magick.NET-Q16-AnyCPU" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" />
+    <PackageReference Include="NLog" />
+    <PackageReference Include="System.IO.Abstractions" />
+    <PackageReference Include="System.IO.FileSystem" />
+    <PackageReference Include="Tesseract" />
   </ItemGroup>
 </Project>
diff --git a/IsIdentifiablePlugin/IsIdentifiablePlugin.csproj b/IsIdentifiablePlugin/IsIdentifiablePlugin.csproj
@@ -1,9 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <AssemblyName>IsIdentifiablePlugin</AssemblyName>
+    <IsPublishable>true</IsPublishable>
+    <IsPackable>true</IsPackable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="HIC.RDMP.Plugin" Version="8.0.7" />
+    <PackageReference Include="HIC.RDMP.Plugin" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\IsIdentifiable\IsIdentifiable.csproj" />

diff --git a/Tests/Directory.Build.props b/Tests/Directory.Build.props
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<Project>
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))"/>
+  <ItemGroup>
+    <PackageReference Include="coverlet.msbuild">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.NET.Test.Sdk"/>
+    <PackageReference Include="NUnit"/>
+    <PackageReference Include="NUnit3TestAdapter">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+</Project>
diff --git a/Tests/IsIdentifiableTests/DatabaseTests.cs b/Tests/IsIdentifiableTests/DatabaseTests.cs
@@ -1,4 +1,4 @@
-using FAnsi;
+using FAnsi;
 using FAnsi.Discovery;
 using FAnsi.Discovery.Constraints;
 using FAnsi.Implementation;

diff --git a/Tests/IsIdentifiableTests/IsIdentifiable.Tests.csproj b/Tests/IsIdentifiableTests/IsIdentifiable.Tests.csproj
@@ -1,9 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyTitle>IsIdentifiable.Tests</AssemblyTitle>
-	  <TargetFramework>net6.0</TargetFramework>
-	  <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-	  <OutputType>Library</OutputType>
   </PropertyGroup>
   <ItemGroup>
     <None Remove="Mongo.yaml" />
@@ -18,17 +15,11 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-	  <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
-	  <PackageReference Include="Moq" Version="4.18.4" />
-	  <PackageReference Include="NUnit" Version="3.13.3" />
-	  <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-	  <PackageReference Include="MSTest.TestAdapter" Version="3.0.4" />
-	  <PackageReference Include="MSTest.TestFramework" Version="3.0.4" />
-	  <PackageReference Include="coverlet.msbuild" Version="6.0.0">
-        <PrivateAssets>all</PrivateAssets>
-        <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-	  </PackageReference>
-	  <PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="19.2.29" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="Moq" />
+    <PackageReference Include="NUnit" />
+    <PackageReference Include="NUnit3TestAdapter" />
+    <PackageReference Include="System.IO.Abstractions.TestingHelpers" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\ii\ii.csproj" />

diff --git a/ii.Tests/ii.Tests.csproj b/ii.Tests/ii.Tests.csproj
@@ -0,0 +1,11 @@
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+        <AssemblyTitle>ii.Tests</AssemblyTitle>
+        <TargetFramework>net6.0</TargetFramework>
+        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+        <OutputType>Library</OutputType>
+    </PropertyGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\ii\ii.csproj" />
+    </ItemGroup>
+</Project>
diff --git a/ii/ii.csproj b/ii/ii.csproj
@@ -1,20 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <AssemblyName>ii</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <PublishSingleFile>true</PublishSingleFile>
-    <DebugType>embedded</DebugType>
+    <IsPublishable>true</IsPublishable>
   </PropertyGroup>
   <ItemGroup>
     <None Remove="ExampleReport.csv" />
     <None Remove="Targets.template.yaml" />
     <None Remove="theme.yaml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\SharedAssemblyInfo.cs" Link="SharedAssemblyInfo.cs" />
-  </ItemGroup>
+  </ItemGroup>  
   <ItemGroup>
     <Content Include="ExampleReport.csv">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -27,8 +23,8 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="7.0.0" />
-    <PackageReference Include="Terminal.Gui" Version="1.12.1" />
+    <PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" />
+    <PackageReference Include="Terminal.Gui" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\IsIdentifiable\IsIdentifiable.csproj" />

diff --git a/nlp/uk.ac.dundee.hic.nerd/nerd.csproj b/nlp/uk.ac.dundee.hic.nerd/nerd.csproj
@@ -2,15 +2,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <IsPackable>false</IsPackable>
-    <TargetFramework>net6.0</TargetFramework>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <IsPublishable>true</IsPublishable>
     <PublishSingleFile>true</PublishSingleFile>
     <PublishSelfContained>true</PublishSelfContained>
-    <DebugType>embedded</DebugType>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="IKVM" Version="8.2.1"/>
+    <PackageReference Include="IKVM" />
   </ItemGroup>
   <ItemGroup>
     <IkvmReference Include="target/nerd-0.0.1-SNAPSHOT.jar">

diff --git a/nlp/uk.ac.dundee.hic.nerd/pom.xml b/nlp/uk.ac.dundee.hic.nerd/pom.xml
@@ -129,13 +129,13 @@
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-api</artifactId>
-			<version>5.9.3</version>
+			<version>5.10.0</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-engine</artifactId>
-			<version>5.9.3</version>
+			<version>5.10.0</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))"/>
+  <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)\..\SharedAssemblyInfo.cs" Link="Properties\SharedAssemblyInfo.cs"/>
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="SecurityCodeScan.VS2019">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+</Project>