Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/dotnet-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion DrsPlugin/DrsPlugin.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<DebugType>embedded</DebugType>
<NeutralLanguage>en-GB</NeutralLanguage>
Expand Down
2 changes: 1 addition & 1 deletion GoDartsPluginUI/GoDartsPluginUI.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net9.0-windows</TargetFramework>
<TargetFramework>net10.0-windows</TargetFramework>
<AssemblyTitle>GoDartsPluginUI</AssemblyTitle>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<UseWindowsForms>true</UseWindowsForms>
Expand Down
2 changes: 1 addition & 1 deletion HIC.Demography/HIC.Demography.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<DebugType>embedded</DebugType>
Expand Down
5 changes: 4 additions & 1 deletion HICPlugin/HICPlugin.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<AssemblyTitle>HICPlugin</AssemblyTitle>
<Product>HICPlugin</Product>
<Copyright>Copyright © 2016</Copyright>
Expand Down Expand Up @@ -40,6 +40,9 @@
<ItemGroup>
<None Include="Resources\MTo1.png" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Resources.Extensions" Version="10.0.7" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\RDMP\Rdmp.Core\Rdmp.Core.csproj" />
<ProjectReference Include="..\HIC.Demography\HIC.Demography.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion HICPluginInteractive/HICPluginInteractive.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net9.0-windows</TargetFramework>
<TargetFramework>net10.0-windows</TargetFramework>
<AssemblyTitle>HICPluginInteractive</AssemblyTitle>
<Product>HICPluginInteractive</Product>
<Copyright>Copyright © 2018</Copyright>
Expand Down
2 changes: 1 addition & 1 deletion HICPluginTests/HICPluginTests.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net9.0-windows</TargetFramework>
<TargetFramework>net10.0-windows</TargetFramework>
<AssemblyTitle>HICPluginTests</AssemblyTitle>
<Product>HICPluginTests</Product>
<Copyright>Copyright © 2016</Copyright>
Expand Down
2 changes: 1 addition & 1 deletion JiraPlugin/JiraPlugin.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<AssemblyTitle>JIRATicketing</AssemblyTitle>
<Company>Hewlett-Packard Company</Company>
<Product>JIRATicketing</Product>
Expand Down
2 changes: 2 additions & 0 deletions Packages.md
Original file line number Diff line number Diff line change
Expand Up @@ -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) | |"

2 changes: 1 addition & 1 deletion Plugin/main/main.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<AssemblyTitle>Rdmp.Hic.Plugin</AssemblyTitle>
<Product>Rdmp.Hic.Plugin</Product>
<Copyright>Copyright © 2019</Copyright>
Expand Down
2 changes: 1 addition & 1 deletion Plugin/windows/windows.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<ProjectGuid>{07F9F874-1306-4FE6-A03F-A483592BBC7F}</ProjectGuid>
<TargetFramework>net9.0-windows</TargetFramework>
<TargetFramework>net10.0-windows</TargetFramework>
<AssemblyTitle>Rdmp.Hic.Plugin</AssemblyTitle>
<Product>Rdmp.Hic.Plugin</Product>
<Copyright>Copyright © 2019</Copyright>
Expand Down
2 changes: 1 addition & 1 deletion RDMP
Submodule RDMP updated 25 files
+2 −0 Application/ResearchDataManagementPlatform/ResearchDataManagementPlatform.csproj
+8 −1 CHANGELOG.md
+3 −0 Directory.Packages.props
+3 −0 Documentation/CodeTutorials/Packages.md
+1 −1 Rdmp.Core.Tests/DataLoad/Engine/Integration/DataTableUploadDestinationTests.cs
+3 −0 Rdmp.Core.Tests/Rdmp.Core.Tests.csproj
+31 −9 Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddCatalogueToCohortIdentificationSetContainer.cs
+1 −1 Rdmp.Core/DataExport/Data/Project.cs
+4 −0 Rdmp.Core/DataExport/DataExtraction/Pipeline/Destinations/ExecuteFullExtractionToDatabaseMSSql.cs
+13 −29 Rdmp.Core/DataExport/DataExtraction/Pipeline/Destinations/MSSqlMergeDestination.cs
+7 −1 Rdmp.Core/DataLoad/Engine/Pipeline/Destinations/DataTableUploadDestination.cs
+5 −5 Rdmp.Core/DataLoad/Triggers/Implementations/MicrosoftSQLTriggerImplementer.cs
+4 −4 Rdmp.Core/DataLoad/Triggers/Implementations/MySqlTriggerImplementer.cs
+3 −3 Rdmp.Core/DataLoad/Triggers/Implementations/OracleTriggerImplementer.cs
+4 −4 Rdmp.Core/DataLoad/Triggers/Implementations/PostgreSqlTriggerImplementer.cs
+4 −1 Rdmp.Core/DataLoad/Triggers/Implementations/TriggerImplementer.cs
+5 −5 Rdmp.Core/DataLoad/Triggers/Implementations/TriggerImplementerFactory.cs
+3 −0 Rdmp.Core/Rdmp.Core.csproj
+3 −0 Rdmp.UI.Tests/Rdmp.UI.Tests.csproj
+2 −0 Rdmp.UI/Rdmp.UI.csproj
+2 −0 Rdmp.UI/SubComponents/CohortIdentificationConfigurationUI.cs
+4 −4 SharedAssemblyInfo.cs
+3 −0 Tests.Common/Tests.Common.csproj
+3 −0 Tools/rdmp/rdmp.csproj
+2 −2 rdmp-client.xml
6 changes: 5 additions & 1 deletion SCIStorePlugin/Data/Discipline.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,9 @@ public enum Discipline
Microbiology,
Immunology,
Virology,
Pathology
Pathology,
MIC,
BHI,
Radiology,
ResultMixed
}
2 changes: 1 addition & 1 deletion SCIStorePlugin/SCIStorePlugin.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>

<AssemblyTitle>SCIStore</AssemblyTitle>
Expand Down
6 changes: 3 additions & 3 deletions SharedAssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Loading