diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index 94e52ef..3c5a93d 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: v9.2.3-rc1 path: RDMP - uses: actions/setup-dotnet@v4 with: diff --git a/DrsPlugin/DrsPlugin.csproj b/DrsPlugin/DrsPlugin.csproj index e9f1aaf..ab4d2a0 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 9fe8aa9..fe58482 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 432fa70..7fc401c 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 43dcc1e..227f8d9 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 8d9821a..3093c87 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 6e5297b..a8ae3ba 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/JiraPlugin/JiraPlugin.csproj b/JiraPlugin/JiraPlugin.csproj index eb9c662..5da7e51 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/Packages.md b/Packages.md index 0864391..adb5992 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](https://github.com/dotnet/dotnet) | [MIT](https://opensource.org/licenses/MIT) | |" + diff --git a/Plugin/main/main.csproj b/Plugin/main/main.csproj index 666492e..887caf6 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 24a5a27..829672a 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/RDMP b/RDMP index d5ced0f..48e9c59 160000 --- a/RDMP +++ b/RDMP @@ -1 +1 @@ -Subproject commit d5ced0fd4dbfa5944490d021e88d8c789c437fcb +Subproject commit 48e9c59138a1a953095285d603b3a560953fa7b5 diff --git a/SCIStorePlugin/Data/Discipline.cs b/SCIStorePlugin/Data/Discipline.cs index cc4cc78..bd6c001 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 diff --git a/SCIStorePlugin/SCIStorePlugin.csproj b/SCIStorePlugin/SCIStorePlugin.csproj index 1b2d28b..6ee0033 100644 --- a/SCIStorePlugin/SCIStorePlugin.csproj +++ b/SCIStorePlugin/SCIStorePlugin.csproj @@ -1,6 +1,6 @@ - net9.0 + net10.0 ..\ SCIStore diff --git a/SharedAssemblyInfo.cs b/SharedAssemblyInfo.cs index 5395179..d0431c0 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")]