Bump NUnit.Analyzers from 4.4.0 to 4.5.0 (#115)

HicServices · Jan 10, 2025 · a0df617 · a0df617
1 parent 894d7f7
commit a0df617
Show file tree

Hide file tree

Showing 15 changed files with 31 additions and 77 deletions.
diff --git 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
@@ -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/.../LoadModules.Extensions.AutomationPlugins/LoadModules.Extensions.AutomationPlugins.csproj b/.../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
@@ -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
@@ -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
@@ -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
diff --git a/LoadModules.Extensions.Tests/LoadModules.Extensions.Tests.csproj b/LoadModules.Extensions.Tests/LoadModules.Extensions.Tests.csproj
@@ -1,29 +1,18 @@
 <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>
     <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>
-    <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
@@ -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
@@ -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
@@ -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
diff --git a/...lugins/LoadModules.Extensions.ReleasePlugins/LoadModules.Extensions.ReleasePlugins.csproj b/...lugins/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/...ules.Extensions.StatsScriptsExecution/LoadModules.Extensions.StatsScriptsExecution.csproj b/...ules.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
@@ -0,0 +1,6 @@
+{
+  "sdk": {
+    "version": "9.0.101",
+    "rollForward": "minor"
+  }
+}