From a0df617a8a7d20a95231b97b254a9e191b70d77f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 10 Jan 2025 20:34:32 +0000
Subject: [PATCH] Bump NUnit.Analyzers from 4.4.0 to 4.5.0 (#115)

---
 .github/dependabot.yml                        |  4 ++
 .github/workflows/dotnet-core.yml             |  2 -
 ...odules.Extensions.AutomationPlugins.csproj | 11 +-----
 Directory.Build.props                         |  8 ++++
 .../DeAnonymise/DeAnonymiseAgainstCohortUI.cs |  5 +++
 .../LoadModules.Extensions.Interactive.csproj |  4 +-
 ...adModules - Backup.Extensions.Tests.csproj | 37 -------------------
 .../LoadModules.Extensions.Tests.csproj       | 15 +-------
 Plugin/main/main.csproj                       |  1 -
 Plugin/windows/windows.csproj                 |  3 +-
 .../LoadModules.Extensions.Python.csproj      |  5 +--
 RDMP                                          |  2 +-
 ...adModules.Extensions.ReleasePlugins.csproj |  4 +-
 ...es.Extensions.StatsScriptsExecution.csproj |  1 -
 global.json                                   |  6 +++
 15 files changed, 31 insertions(+), 77 deletions(-)
 create mode 100644 Directory.Build.props
 delete mode 100644 LoadModules.Extensions.Tests/LoadModules - Backup.Extensions.Tests.csproj
 create mode 100644 global.json

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index d188d32..3be36e4 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -12,3 +12,7 @@ updates:
   target-branch: main
   reviewers:
   - jas88
+- package-ecosystem: "dotnet-sdk"
+  directory: "/"
+  schedule:
+    interval: weekly
diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml
index 893ff37..21a80a3 100644
--- a/.github/workflows/dotnet-core.yml
+++ b/.github/workflows/dotnet-core.yml
@@ -19,8 +19,6 @@ jobs:
           ref: develop
           path: RDMP
       - uses: actions/setup-dotnet@v4
-        with:
-          dotnet-version: 7.0.x
       - name: Get version
         id: version
         shell: cmd
diff --git a/AutomationPlugins/LoadModules.Extensions.AutomationPlugins/LoadModules.Extensions.AutomationPlugins.csproj b/AutomationPlugins/LoadModules.Extensions.AutomationPlugins/LoadModules.Extensions.AutomationPlugins.csproj
index 37d1e8c..9c7325d 100644
--- a/AutomationPlugins/LoadModules.Extensions.AutomationPlugins/LoadModules.Extensions.AutomationPlugins.csproj
+++ b/AutomationPlugins/LoadModules.Extensions.AutomationPlugins/LoadModules.Extensions.AutomationPlugins.csproj
@@ -1,20 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>false</RestorePackages>
     <AssemblyTitle>LoadModules.Extensions.AutomationPlugins</AssemblyTitle>
     <Product>LoadModules.Extensions.AutomationPlugins</Product>
-    <Copyright>Copyright ©  2017</Copyright>
+    <Copyright>Copyright ©  2017-2024 Health Informatics Centre, University of Dundee</Copyright>
     <AssemblyVersion>1.1.0.0</AssemblyVersion>
     <FileVersion>1.1.0.0</FileVersion>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <PostBuildEvent />
-    <PostBuildEvent />
-    <PostBuildEvent />
-  </PropertyGroup>
-  <PropertyGroup>
-    <PostBuildEvent />
   </PropertyGroup>
   <ItemGroup>
     <Compile Remove="Data\Repository\AutomationDatabasePluginPatcher.cs" />
diff --git a/Directory.Build.props b/Directory.Build.props
new file mode 100644
index 0000000..c944ba5
--- /dev/null
+++ b/Directory.Build.props
@@ -0,0 +1,8 @@
+<Project>
+	<PropertyGroup>
+		<TargetFramework>net9.0</TargetFramework>
+		<LangVersion>latest</LangVersion>
+		<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+		<NoWarn>NU1902;NU1903;NU1904;1701;1702;CS1591;NU1701;CA1416</NoWarn>
+	</PropertyGroup>
+</Project>
diff --git a/Interactive/LoadModules.Extensions.Interactive/DeAnonymise/DeAnonymiseAgainstCohortUI.cs b/Interactive/LoadModules.Extensions.Interactive/DeAnonymise/DeAnonymiseAgainstCohortUI.cs
index e8fd76f..1ed044a 100644
--- a/Interactive/LoadModules.Extensions.Interactive/DeAnonymise/DeAnonymiseAgainstCohortUI.cs
+++ b/Interactive/LoadModules.Extensions.Interactive/DeAnonymise/DeAnonymiseAgainstCohortUI.cs
@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel;
 using System.Data;
 using System.Windows.Forms;
 using FAnsi.Implementations.MicrosoftSQL;
@@ -18,7 +19,11 @@ public partial class DeAnonymiseAgainstCohortUI : Form, IDeAnonymiseAgainstCohor
     private readonly DataTable _toProcess;
     private readonly IBasicActivateItems _activator;
     private readonly IDataExportRepository _dataExportRepository;
+    
+    [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
     public IExtractableCohort ChosenCohort { get; set; }
+
+    [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
     public string OverrideReleaseIdentifier { get; set; }
 
     public DeAnonymiseAgainstCohortUI(DataTable toProcess, IBasicActivateItems activator)
diff --git a/Interactive/LoadModules.Extensions.Interactive/LoadModules.Extensions.Interactive.csproj b/Interactive/LoadModules.Extensions.Interactive/LoadModules.Extensions.Interactive.csproj
index 3f0ae36..f108b1e 100644
--- a/Interactive/LoadModules.Extensions.Interactive/LoadModules.Extensions.Interactive.csproj
+++ b/Interactive/LoadModules.Extensions.Interactive/LoadModules.Extensions.Interactive.csproj
@@ -1,8 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0-windows</TargetFramework>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>false</RestorePackages>
+    <TargetFramework>$(TargetFramework)-windows</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
     <AssemblyTitle>LoadModules.Extensions.Interactive</AssemblyTitle>
     <Company>Hewlett-Packard Company</Company>
diff --git a/LoadModules.Extensions.Tests/LoadModules - Backup.Extensions.Tests.csproj b/LoadModules.Extensions.Tests/LoadModules - Backup.Extensions.Tests.csproj
deleted file mode 100644
index 1bdadce..0000000
--- a/LoadModules.Extensions.Tests/LoadModules - Backup.Extensions.Tests.csproj	
+++ /dev/null
@@ -1,37 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <ProjectGuid>{A6987FAF-E280-48C8-B50D-17FF34924E1D}</ProjectGuid>
-    <TargetFramework>net7.0-windows</TargetFramework>
-    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
-    <IsCodedUITest>False</IsCodedUITest>
-    <TestProjectType>UnitTest</TestProjectType>
-    <AssemblyTitle>LoadModules.Extensions.Tests</AssemblyTitle>
-    <Product>LoadModules.Extensions.Tests</Product>
-    <Copyright>Copyright ©  2019</Copyright>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
-  <ItemGroup>
-    <Compile Include="..\SharedAssemblyInfo.cs" Link="SharedAssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
-    <PackageReference Include="NunitXml.TestLogger" Version="3.0.131" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\AutomationPlugins\LoadModules.Extensions.AutomationPlugins\LoadModules.Extensions.AutomationPlugins.csproj" />
-    <ProjectReference Include="..\Interactive\LoadModules.Extensions.Interactive\LoadModules.Extensions.Interactive.csproj" />
-    <ProjectReference Include="..\Python\LoadModules.Extensions.Python\LoadModules.Extensions.Python.csproj" />
-    <ProjectReference Include="..\RDMP\Tests.Common\Tests.Common.csproj" />
-    <ProjectReference Include="..\ReleasePlugins\LoadModules.Extensions.ReleasePlugins\LoadModules.Extensions.ReleasePlugins.csproj" />
-    <ProjectReference Include="..\StatsScriptsExecution\LoadModules.Extensions.StatsScriptsExecution\LoadModules.Extensions.StatsScriptsExecution.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Update="TestDatabases.txt">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/LoadModules.Extensions.Tests/LoadModules.Extensions.Tests.csproj b/LoadModules.Extensions.Tests/LoadModules.Extensions.Tests.csproj
index fba66e9..5feb443 100644
--- a/LoadModules.Extensions.Tests/LoadModules.Extensions.Tests.csproj
+++ b/LoadModules.Extensions.Tests/LoadModules.Extensions.Tests.csproj
@@ -1,10 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <ProjectGuid>{A6987FAF-E280-48C8-B50D-17FF34924E1D}</ProjectGuid>
-    <TargetFramework>net8.0-windows</TargetFramework>
-    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
+    <TargetFramework>$(TargetFramework)-windows</TargetFramework>
     <IsCodedUITest>False</IsCodedUITest>
     <TestProjectType>UnitTest</TestProjectType>
     <AssemblyTitle>LoadModules.Extensions.Tests</AssemblyTitle>
@@ -12,18 +8,11 @@
     <Copyright>Copyright ©  2019</Copyright>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
-  <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
-  <ItemGroup>
-    <Content Remove="C:\Users\AzureUser_JS\.nuget\packages\hic.rdmp.plugin.test\8.1.0-rc1\contentFiles\any\net6.0\testhost.dll" />
-    <Content Remove="C:\Users\AzureUser_JS\.nuget\packages\hic.rdmp.plugin.test\8.1.0-rc1\contentFiles\any\net6.0\testhost.exe" />
-    <Content Remove="C:\Users\AzureUser_JS\.nuget\packages\microsoft.testplatform.testhost\17.5.0\build\netcoreapp3.1\x64\testhost.dll" />
-    <Content Remove="C:\Users\AzureUser_JS\.nuget\packages\microsoft.testplatform.testhost\17.5.0\build\netcoreapp3.1\x64\testhost.exe" />
-  </ItemGroup>
   <ItemGroup>
     <Compile Include="..\SharedAssemblyInfo.cs" Link="SharedAssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="NUnit.Analyzers" Version="4.4.0">
+    <PackageReference Include="NUnit.Analyzers" Version="4.5.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/Plugin/main/main.csproj b/Plugin/main/main.csproj
index 896162a..b45e5a5 100644
--- a/Plugin/main/main.csproj
+++ b/Plugin/main/main.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
     <AssemblyTitle>Rdmp.Extensions.Plugin</AssemblyTitle>
     <Product>Rdmp.Extensions.Plugin</Product>
     <Copyright>Copyright ©  2019</Copyright>
diff --git a/Plugin/windows/windows.csproj b/Plugin/windows/windows.csproj
index 3b19b4e..fe4965a 100644
--- a/Plugin/windows/windows.csproj
+++ b/Plugin/windows/windows.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <ProjectGuid>{07F9F874-1306-4FE6-A03F-A483592BBC7F}</ProjectGuid>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFramework>$(TargetFramework)-windows</TargetFramework>
     <AssemblyTitle>Rdmp.Extensions.Plugin</AssemblyTitle>
     <Product>Rdmp.Extensions.Plugin</Product>
     <Copyright>Copyright ©  2019</Copyright>
diff --git a/Python/LoadModules.Extensions.Python/LoadModules.Extensions.Python.csproj b/Python/LoadModules.Extensions.Python/LoadModules.Extensions.Python.csproj
index fd293a5..28f3670 100644
--- a/Python/LoadModules.Extensions.Python/LoadModules.Extensions.Python.csproj
+++ b/Python/LoadModules.Extensions.Python/LoadModules.Extensions.Python.csproj
@@ -1,11 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>    
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>false</RestorePackages>
     <AssemblyTitle>LoadModules.Extensions</AssemblyTitle>
     <Product>LoadModules.Extensions</Product>
-    <Copyright>Copyright ©  2016</Copyright>
+    <Copyright>Copyright ©  2016-2024 Health Informatics Centre, University of Dundee</Copyright>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
   <ItemGroup>
diff --git a/RDMP b/RDMP
index 38fdd8b..0dddd28 160000
--- a/RDMP
+++ b/RDMP
@@ -1 +1 @@
-Subproject commit 38fdd8bd4f690a3132f248c0bfec24b6d183df95
+Subproject commit 0dddd28592f5da79ce6d670d8ba06ff4d771ef5a
diff --git a/ReleasePlugins/LoadModules.Extensions.ReleasePlugins/LoadModules.Extensions.ReleasePlugins.csproj b/ReleasePlugins/LoadModules.Extensions.ReleasePlugins/LoadModules.Extensions.ReleasePlugins.csproj
index 8ab8c76..6af8448 100644
--- a/ReleasePlugins/LoadModules.Extensions.ReleasePlugins/LoadModules.Extensions.ReleasePlugins.csproj
+++ b/ReleasePlugins/LoadModules.Extensions.ReleasePlugins/LoadModules.Extensions.ReleasePlugins.csproj
@@ -1,10 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <AssemblyTitle>LoadModules.Extensions.ReleasePlugins</AssemblyTitle>
     <Product>LoadModules.Extensions.ReleasePlugins</Product>
-    <Copyright>Copyright ©  2017</Copyright> 
+    <Copyright>Copyright ©  2017-2024 Health Informatics Centre, University of Dundee</Copyright>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/StatsScriptsExecution/LoadModules.Extensions.StatsScriptsExecution/LoadModules.Extensions.StatsScriptsExecution.csproj b/StatsScriptsExecution/LoadModules.Extensions.StatsScriptsExecution/LoadModules.Extensions.StatsScriptsExecution.csproj
index 24c06be..fe7f696 100644
--- a/StatsScriptsExecution/LoadModules.Extensions.StatsScriptsExecution/LoadModules.Extensions.StatsScriptsExecution.csproj
+++ b/StatsScriptsExecution/LoadModules.Extensions.StatsScriptsExecution/LoadModules.Extensions.StatsScriptsExecution.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
     <AssemblyTitle>LoadModules.Extensions.StatsScriptsExecution</AssemblyTitle>
     <Product>LoadModules.Extensions.StatsScriptsExecution</Product>
     <Copyright>Copyright ©  2018</Copyright>
diff --git a/global.json b/global.json
new file mode 100644
index 0000000..45f790c
--- /dev/null
+++ b/global.json
@@ -0,0 +1,6 @@
+{
+  "sdk": {
+    "version": "9.0.101",
+    "rollForward": "minor"
+  }
+}