From 352fc1bfc0d00adbbe436eed941936656bff2e0c Mon Sep 17 00:00:00 2001 From: James Friel Date: Thu, 30 Apr 2026 08:37:21 +0100 Subject: [PATCH 1/5] bump --- DrsPlugin/DrsPlugin.csproj | 2 +- GoDartsPluginUI/GoDartsPluginUI.csproj | 2 +- HIC.Demography/HIC.Demography.csproj | 2 +- HICPlugin/HICPlugin.csproj | 5 ++++- HICPluginInteractive/HICPluginInteractive.csproj | 2 +- HICPluginTests/HICPluginTests.csproj | 2 +- .../Unit/LimitedRetryThenContinueStrategyTests.cs | 10 ++++++++++ JiraPlugin/JiraPlugin.csproj | 2 +- Plugin/main/main.csproj | 2 +- Plugin/windows/windows.csproj | 2 +- SCIStorePlugin/SCIStorePlugin.csproj | 2 +- 11 files changed, 23 insertions(+), 10 deletions(-) diff --git a/DrsPlugin/DrsPlugin.csproj b/DrsPlugin/DrsPlugin.csproj index e9f1aaf0..ab4d2a08 100644 --- a/DrsPlugin/DrsPlugin.csproj +++ b/DrsPlugin/DrsPlugin.csproj @@ -1,6 +1,6 @@  - net9.0 + net10.0 false embedded en-GB diff --git a/GoDartsPluginUI/GoDartsPluginUI.csproj b/GoDartsPluginUI/GoDartsPluginUI.csproj index 9fe8aa92..fe584823 100644 --- a/GoDartsPluginUI/GoDartsPluginUI.csproj +++ b/GoDartsPluginUI/GoDartsPluginUI.csproj @@ -1,6 +1,6 @@  - net9.0-windows + net10.0-windows GoDartsPluginUI false true diff --git a/HIC.Demography/HIC.Demography.csproj b/HIC.Demography/HIC.Demography.csproj index 432fa70d..7fc401c4 100644 --- a/HIC.Demography/HIC.Demography.csproj +++ b/HIC.Demography/HIC.Demography.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 enable enable embedded diff --git a/HICPlugin/HICPlugin.csproj b/HICPlugin/HICPlugin.csproj index 43dcc1ed..227f8d9c 100644 --- a/HICPlugin/HICPlugin.csproj +++ b/HICPlugin/HICPlugin.csproj @@ -1,6 +1,6 @@  - net9.0 + net10.0 HICPlugin HICPlugin Copyright © 2016 @@ -40,6 +40,9 @@ + + + diff --git a/HICPluginInteractive/HICPluginInteractive.csproj b/HICPluginInteractive/HICPluginInteractive.csproj index 8d9821a9..3093c879 100644 --- a/HICPluginInteractive/HICPluginInteractive.csproj +++ b/HICPluginInteractive/HICPluginInteractive.csproj @@ -1,6 +1,6 @@  - net9.0-windows + net10.0-windows HICPluginInteractive HICPluginInteractive Copyright © 2018 diff --git a/HICPluginTests/HICPluginTests.csproj b/HICPluginTests/HICPluginTests.csproj index 6e5297bc..a8ae3bae 100644 --- a/HICPluginTests/HICPluginTests.csproj +++ b/HICPluginTests/HICPluginTests.csproj @@ -1,6 +1,6 @@ - net9.0-windows + net10.0-windows HICPluginTests HICPluginTests Copyright © 2016 diff --git a/HICPluginTests/Unit/LimitedRetryThenContinueStrategyTests.cs b/HICPluginTests/Unit/LimitedRetryThenContinueStrategyTests.cs index d05bc164..7d38310f 100644 --- a/HICPluginTests/Unit/LimitedRetryThenContinueStrategyTests.cs +++ b/HICPluginTests/Unit/LimitedRetryThenContinueStrategyTests.cs @@ -26,4 +26,14 @@ public void Test() Assert.That(0, Is.EqualTo(strategy.RetryAfterCooldown(new TimeSpan(1, 0, 0, 0), ThrowImmediatelyDataLoadEventListener.Quiet, 1, new Exception()))); } + + + [Test] + public void SCIStoreTest() { + //var wsConfig = new WebServiceConfiguration(); + //var repo = new CombinedReportDataWsRepository(); + Assert.That(1, Is.EqualTo(1)); + + } + } \ No newline at end of file diff --git a/JiraPlugin/JiraPlugin.csproj b/JiraPlugin/JiraPlugin.csproj index eb9c662b..5da7e515 100644 --- a/JiraPlugin/JiraPlugin.csproj +++ b/JiraPlugin/JiraPlugin.csproj @@ -1,6 +1,6 @@  - net9.0 + net10.0 JIRATicketing Hewlett-Packard Company JIRATicketing diff --git a/Plugin/main/main.csproj b/Plugin/main/main.csproj index 666492e2..887caf66 100644 --- a/Plugin/main/main.csproj +++ b/Plugin/main/main.csproj @@ -1,6 +1,6 @@  - net9.0 + net10.0 Rdmp.Hic.Plugin Rdmp.Hic.Plugin Copyright © 2019 diff --git a/Plugin/windows/windows.csproj b/Plugin/windows/windows.csproj index 24a5a279..829672a2 100644 --- a/Plugin/windows/windows.csproj +++ b/Plugin/windows/windows.csproj @@ -1,7 +1,7 @@  {07F9F874-1306-4FE6-A03F-A483592BBC7F} - net9.0-windows + net10.0-windows Rdmp.Hic.Plugin Rdmp.Hic.Plugin Copyright © 2019 diff --git a/SCIStorePlugin/SCIStorePlugin.csproj b/SCIStorePlugin/SCIStorePlugin.csproj index 1b2d28ba..6ee00333 100644 --- a/SCIStorePlugin/SCIStorePlugin.csproj +++ b/SCIStorePlugin/SCIStorePlugin.csproj @@ -1,6 +1,6 @@ - net9.0 + net10.0 ..\ SCIStore From 3eb7ac4394d80a8b212bac68dd429a2db588f139 Mon Sep 17 00:00:00 2001 From: James Friel Date: Thu, 7 May 2026 07:59:40 +0100 Subject: [PATCH 2/5] add new disciplines --- .github/workflows/dotnet-core.yml | 2 +- RDMP | 2 +- SCIStorePlugin/Data/Discipline.cs | 6 +++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index 94e52ef2..acec2de2 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v4 with: repository: HicServices/RDMP - ref: v9.2.0-rc1 + ref: bump-crypto path: RDMP - uses: actions/setup-dotnet@v4 with: diff --git a/RDMP b/RDMP index d5ced0fd..d04d13f9 160000 --- a/RDMP +++ b/RDMP @@ -1 +1 @@ -Subproject commit d5ced0fd4dbfa5944490d021e88d8c789c437fcb +Subproject commit d04d13f93fbd2843a8d1065f8db96d5abe684bff diff --git a/SCIStorePlugin/Data/Discipline.cs b/SCIStorePlugin/Data/Discipline.cs index cc4cc78b..bd6c0011 100644 --- a/SCIStorePlugin/Data/Discipline.cs +++ b/SCIStorePlugin/Data/Discipline.cs @@ -8,5 +8,9 @@ public enum Discipline Microbiology, Immunology, Virology, - Pathology + Pathology, + MIC, + BHI, + Radiology, + ResultMixed } \ No newline at end of file From 835a9b097ffa6fa4273fef292b6654b001fb8bba Mon Sep 17 00:00:00 2001 From: James Friel Date: Thu, 7 May 2026 08:34:27 +0100 Subject: [PATCH 3/5] update packages --- Packages.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Packages.md b/Packages.md index 08643916..1bb24dfe 100644 --- a/Packages.md +++ b/Packages.md @@ -12,3 +12,5 @@ | RestSharp | [GitHub](https://github.com/restsharp/RestSharp) | [Apache 2.0](https://github.com/restsharp/RestSharp/blob/dev/LICENSE.txt) | REST API wrapper | | | System.ServiceModel.Http | [GitHub](https://github.com/dotnet/corefx) | [MIT](https://opensource.org/licenses/MIT) | Enables interaction with Web APIs (SciStore) | | | Microsoft.XmlSerializer.Generator | [Microsoft](https://learn.microsoft.com/en-us/dotnet/core/additional-tools/xml-serializer-generator) | [MIT](https://opensource.org/licenses/MIT) | XML handling improvements | +| System.Resources.Extensions | [GitHub]() | LICENCE GOES HERE | |" + From cb9d27ca3b80e24cdaecd9b2d58fe6a666ec1243 Mon Sep 17 00:00:00 2001 From: James Friel Date: Tue, 19 May 2026 09:30:09 +0100 Subject: [PATCH 4/5] bump rdmp version --- .github/workflows/dotnet-core.yml | 2 +- .../Unit/LimitedRetryThenContinueStrategyTests.cs | 10 ---------- Packages.md | 2 +- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index acec2de2..3c5a93d5 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v4 with: repository: HicServices/RDMP - ref: bump-crypto + ref: v9.2.3-rc1 path: RDMP - uses: actions/setup-dotnet@v4 with: diff --git a/HICPluginTests/Unit/LimitedRetryThenContinueStrategyTests.cs b/HICPluginTests/Unit/LimitedRetryThenContinueStrategyTests.cs index 7d38310f..d05bc164 100644 --- a/HICPluginTests/Unit/LimitedRetryThenContinueStrategyTests.cs +++ b/HICPluginTests/Unit/LimitedRetryThenContinueStrategyTests.cs @@ -26,14 +26,4 @@ public void Test() Assert.That(0, Is.EqualTo(strategy.RetryAfterCooldown(new TimeSpan(1, 0, 0, 0), ThrowImmediatelyDataLoadEventListener.Quiet, 1, new Exception()))); } - - - [Test] - public void SCIStoreTest() { - //var wsConfig = new WebServiceConfiguration(); - //var repo = new CombinedReportDataWsRepository(); - Assert.That(1, Is.EqualTo(1)); - - } - } \ No newline at end of file diff --git a/Packages.md b/Packages.md index 1bb24dfe..adb59920 100644 --- a/Packages.md +++ b/Packages.md @@ -12,5 +12,5 @@ | RestSharp | [GitHub](https://github.com/restsharp/RestSharp) | [Apache 2.0](https://github.com/restsharp/RestSharp/blob/dev/LICENSE.txt) | REST API wrapper | | | System.ServiceModel.Http | [GitHub](https://github.com/dotnet/corefx) | [MIT](https://opensource.org/licenses/MIT) | Enables interaction with Web APIs (SciStore) | | | Microsoft.XmlSerializer.Generator | [Microsoft](https://learn.microsoft.com/en-us/dotnet/core/additional-tools/xml-serializer-generator) | [MIT](https://opensource.org/licenses/MIT) | XML handling improvements | -| System.Resources.Extensions | [GitHub]() | LICENCE GOES HERE | |" +| System.Resources.Extensions | [GitHub](https://github.com/dotnet/dotnet) | [MIT](https://opensource.org/licenses/MIT) | |" From 760df34a99de63de21852fe90f4d7b0fd92a23f8 Mon Sep 17 00:00:00 2001 From: James Friel Date: Tue, 19 May 2026 09:40:31 +0100 Subject: [PATCH 5/5] bump version --- RDMP | 2 +- SharedAssemblyInfo.cs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/RDMP b/RDMP index d04d13f9..48e9c591 160000 --- a/RDMP +++ b/RDMP @@ -1 +1 @@ -Subproject commit d04d13f93fbd2843a8d1065f8db96d5abe684bff +Subproject commit 48e9c59138a1a953095285d603b3a560953fa7b5 diff --git a/SharedAssemblyInfo.cs b/SharedAssemblyInfo.cs index 5395179f..d0431c06 100644 --- a/SharedAssemblyInfo.cs +++ b/SharedAssemblyInfo.cs @@ -10,6 +10,6 @@ [assembly: AssemblyCulture("")] // These should be overwritten by release builds -[assembly: AssemblyVersion("6.1.16")] -[assembly: AssemblyFileVersion("6.1.16")] -[assembly: AssemblyInformationalVersion("6.1.16")] +[assembly: AssemblyVersion("6.1.17")] +[assembly: AssemblyFileVersion("6.1.17")] +[assembly: AssemblyInformationalVersion("6.1.17")]