From 690e2b9218dcec09d28687b17d39b29997f1e172 Mon Sep 17 00:00:00 2001 From: Ruairidh MacLeod Date: Mon, 10 Jul 2023 12:00:34 +0100 Subject: [PATCH 1/8] add ii.Tests csproj --- IsIdentifiable.sln | 6 ++++++ Tests/IsIdentifiableTests/DatabaseTests.cs | 2 +- ii.Tests/ii.Tests.csproj | 11 +++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 ii.Tests/ii.Tests.csproj diff --git a/IsIdentifiable.sln b/IsIdentifiable.sln index 5ea09602..4cabe2fc 100644 --- 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/Tests/IsIdentifiableTests/DatabaseTests.cs b/Tests/IsIdentifiableTests/DatabaseTests.cs index 36dfe262..df6d7d6e 100644 --- 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/ii.Tests/ii.Tests.csproj b/ii.Tests/ii.Tests.csproj new file mode 100644 index 00000000..0256d85a --- /dev/null +++ b/ii.Tests/ii.Tests.csproj @@ -0,0 +1,11 @@ + + + ii.Tests + net6.0 + false + Library + + + + + \ No newline at end of file From a8d41945d3a452d8ffbd7f2d461d51e9aa40a978 Mon Sep 17 00:00:00 2001 From: Ruairidh MacLeod Date: Mon, 17 Jul 2023 15:36:51 +0100 Subject: [PATCH 2/8] tidy csprojs and switch to central package versions --- Directory.Build.props | 13 ++++++ Directory.Packages.props | 35 ++++++++++++++++ IsIdentifiable/IsIdentifiable.csproj | 41 +++++++------------ .../IsIdentifiablePlugin.csproj | 6 ++- Tests/Directory.Build.props | 16 ++++++++ .../IsIdentifiable.Tests.csproj | 19 +++------ ii/ii.csproj | 14 +++---- nlp/uk.ac.dundee.hic.nerd/nerd.csproj | 7 +--- src/Directory.Build.props | 13 ++++++ 9 files changed, 108 insertions(+), 56 deletions(-) create mode 100644 Directory.Packages.props create mode 100644 Tests/Directory.Build.props create mode 100644 src/Directory.Build.props diff --git a/Directory.Build.props b/Directory.Build.props index 4ca8b3e5..d32a4966 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,7 +1,20 @@ + Universities of Dundee (HIC) and Edinburgh (EPCC) + true + full + false + True disable + false + false + 10.0 enable + GPL-3.0-or-later + https://github.com/SMI/IsIdentifiable + none + net6.0 + true diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 00000000..a14cb0bd --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,35 @@ + + + + false + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/IsIdentifiable/IsIdentifiable.csproj b/IsIdentifiable/IsIdentifiable.csproj index 79d1c379..1593992c 100644 --- a/IsIdentifiable/IsIdentifiable.csproj +++ b/IsIdentifiable/IsIdentifiable.csproj @@ -2,24 +2,13 @@ IsIdentifiable - Universities of Dundee and Edinburgh - GPL-3.0-or-later - https://github.com/SMI/IsIdentifiable Library Library for spotting identifiable data in flat files, dicom files and relational databases (Sql Server, MySql, Oracle). - Identifiable,Detection,Validation,NLP,OCR,Natural Language Processing,Optical Character Recognition - Copyright 2019 - net6.0 - false - True - 10.0 + Identifiable,Detection,Validation,NLP,OCR,Natural Language Processing,Optical Character Recognition - - - - + @@ -30,18 +19,18 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/IsIdentifiablePlugin/IsIdentifiablePlugin.csproj b/IsIdentifiablePlugin/IsIdentifiablePlugin.csproj index 5cb3d912..fd9f2940 100644 --- a/IsIdentifiablePlugin/IsIdentifiablePlugin.csproj +++ b/IsIdentifiablePlugin/IsIdentifiablePlugin.csproj @@ -1,9 +1,11 @@ - net6.0 + IsIdentifiablePlugin + true + true - + diff --git a/Tests/Directory.Build.props b/Tests/Directory.Build.props new file mode 100644 index 00000000..f6bf3b83 --- /dev/null +++ b/Tests/Directory.Build.props @@ -0,0 +1,16 @@ + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + \ No newline at end of file diff --git a/Tests/IsIdentifiableTests/IsIdentifiable.Tests.csproj b/Tests/IsIdentifiableTests/IsIdentifiable.Tests.csproj index 4927a227..f3b20ece 100644 --- a/Tests/IsIdentifiableTests/IsIdentifiable.Tests.csproj +++ b/Tests/IsIdentifiableTests/IsIdentifiable.Tests.csproj @@ -1,9 +1,6 @@ IsIdentifiable.Tests - net6.0 - false - Library @@ -18,17 +15,11 @@ - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - + + + + + diff --git a/ii/ii.csproj b/ii/ii.csproj index 818175d5..2f1967b0 100644 --- a/ii/ii.csproj +++ b/ii/ii.csproj @@ -1,20 +1,16 @@ + ii Exe - net6.0 - false true - embedded + true - - - - + PreserveNewest @@ -27,8 +23,8 @@ - - + + diff --git a/nlp/uk.ac.dundee.hic.nerd/nerd.csproj b/nlp/uk.ac.dundee.hic.nerd/nerd.csproj index 582917a2..6e8bb779 100644 --- a/nlp/uk.ac.dundee.hic.nerd/nerd.csproj +++ b/nlp/uk.ac.dundee.hic.nerd/nerd.csproj @@ -2,15 +2,12 @@ Exe - false - net6.0 - false + true true true - embedded - + diff --git a/src/Directory.Build.props b/src/Directory.Build.props new file mode 100644 index 00000000..97c2fc77 --- /dev/null +++ b/src/Directory.Build.props @@ -0,0 +1,13 @@ + + + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + \ No newline at end of file From 0e90833b810671c40c8047510911c7a8bb039ffb Mon Sep 17 00:00:00 2001 From: Ruairidh MacLeod Date: Wed, 19 Jul 2023 09:43:42 +0100 Subject: [PATCH 3/8] switch to embedded debug symbols --- Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Build.props b/Directory.Build.props index d32a4966..6c25faf7 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -3,7 +3,7 @@ Universities of Dundee (HIC) and Edinburgh (EPCC) true - full + embedded false True disable From 5299489915e505a53b8069e9f6e796ff3a73764d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 20 Jul 2023 10:45:03 +0000 Subject: [PATCH 4/8] Bump Terminal.Gui from 1.12.1 to 1.13.4 Bumps [Terminal.Gui](https://github.com/gui-cs/Terminal.Gui) from 1.12.1 to 1.13.4. - [Release notes](https://github.com/gui-cs/Terminal.Gui/releases) - [Commits](https://github.com/gui-cs/Terminal.Gui/compare/v1.12.1...v1.13.4) --- updated-dependencies: - dependency-name: Terminal.Gui dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index a14cb0bd..019b2a41 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -22,7 +22,7 @@ - + From f8acb27b021750b29b3f09343e2f25f9fb8d5c1c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 20 Jul 2023 10:47:53 +0000 Subject: [PATCH 5/8] Bump IKVM from 8.2.1 to 8.6.2 Bumps [IKVM](https://github.com/ikvmnet/ikvm) from 8.2.1 to 8.6.2. - [Release notes](https://github.com/ikvmnet/ikvm/releases) - [Commits](https://github.com/ikvmnet/ikvm/compare/8.2.1...8.6.2) --- updated-dependencies: - dependency-name: IKVM dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index a14cb0bd..511ec44d 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -13,7 +13,7 @@ - + From 1e2d483b3e253e92c245562aff956971a65be611 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Jul 2023 06:52:09 +0000 Subject: [PATCH 6/8] Bump org.junit.jupiter:junit-jupiter-api in /nlp/uk.ac.dundee.hic.nerd Bumps [org.junit.jupiter:junit-jupiter-api](https://github.com/junit-team/junit5) from 5.9.3 to 5.10.0. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.9.3...r5.10.0) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter-api dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- nlp/uk.ac.dundee.hic.nerd/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nlp/uk.ac.dundee.hic.nerd/pom.xml b/nlp/uk.ac.dundee.hic.nerd/pom.xml index 7ed08eb9..be7a4cb2 100644 --- a/nlp/uk.ac.dundee.hic.nerd/pom.xml +++ b/nlp/uk.ac.dundee.hic.nerd/pom.xml @@ -129,7 +129,7 @@ org.junit.jupiter junit-jupiter-api - 5.9.3 + 5.10.0 test From 1175da19878c7342fcb0624cb6165eb8df75816a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Jul 2023 06:52:04 +0000 Subject: [PATCH 7/8] Bump org.junit.jupiter:junit-jupiter-engine Bumps [org.junit.jupiter:junit-jupiter-engine](https://github.com/junit-team/junit5) from 5.9.3 to 5.10.0. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.9.3...r5.10.0) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter-engine dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- nlp/uk.ac.dundee.hic.nerd/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nlp/uk.ac.dundee.hic.nerd/pom.xml b/nlp/uk.ac.dundee.hic.nerd/pom.xml index be7a4cb2..ae0150e6 100644 --- a/nlp/uk.ac.dundee.hic.nerd/pom.xml +++ b/nlp/uk.ac.dundee.hic.nerd/pom.xml @@ -135,7 +135,7 @@ org.junit.jupiter junit-jupiter-engine - 5.9.3 + 5.10.0 test From 2b8b150c1771df37777f87c7a2f2fc26ae7908e3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 25 Jul 2023 06:12:28 +0000 Subject: [PATCH 8/8] Bump Magick.NET-Q16-AnyCPU from 13.1.3 to 13.2.0 Bumps [Magick.NET-Q16-AnyCPU](https://github.com/dlemstra/Magick.NET) from 13.1.3 to 13.2.0. - [Release notes](https://github.com/dlemstra/Magick.NET/releases) - [Commits](https://github.com/dlemstra/Magick.NET/compare/13.1.3...13.2.0) --- updated-dependencies: - dependency-name: Magick.NET-Q16-AnyCPU dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index adc34aaa..614a049b 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -15,7 +15,7 @@ - +