Task/net 8 bump (#61)

* bump to net8 * fix packages test
HicServices · Mar 12, 2024 · b01da7f · b01da7f
1 parent accea5c
commit b01da7f
Show file tree

Hide file tree

Showing 13 changed files with 15 additions and 14 deletions.
diff --git a/DrsPlugin/DrsPlugin.csproj b/DrsPlugin/DrsPlugin.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <DebugType>embedded</DebugType>
     <NeutralLanguage>en-GB</NeutralLanguage>

diff --git a/GoDartsPluginUI/GoDartsPluginUI.csproj b/GoDartsPluginUI/GoDartsPluginUI.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <AssemblyTitle>GoDartsPluginUI</AssemblyTitle>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <UseWindowsForms>true</UseWindowsForms>

diff --git a/HIC.Demography/HIC.Demography.csproj b/HIC.Demography/HIC.Demography.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <DebugType>embedded</DebugType>

diff --git a/HICPlugin/HICPlugin.csproj b/HICPlugin/HICPlugin.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AssemblyTitle>HICPlugin</AssemblyTitle>
     <Product>HICPlugin</Product>
     <Copyright>Copyright ©  2016</Copyright>

diff --git a/HICPluginInteractive/HICPluginInteractive.csproj b/HICPluginInteractive/HICPluginInteractive.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <AssemblyTitle>HICPluginInteractive</AssemblyTitle>
     <Product>HICPluginInteractive</Product>
     <Copyright>Copyright ©  2018</Copyright>

diff --git a/HICPluginTests/HICPluginTests.csproj b/HICPluginTests/HICPluginTests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <AssemblyTitle>HICPluginTests</AssemblyTitle>
     <Product>HICPluginTests</Product>
     <Copyright>Copyright ©  2016</Copyright>

diff --git a/HICPluginTests/PackageListIsCorrectTests.cs b/HICPluginTests/PackageListIsCorrectTests.cs
@@ -93,15 +93,16 @@ private static IEnumerable<string> GetCsprojFiles(DirectoryInfo root)
     {
         return root.EnumerateFiles("*.csproj", EnumerationOptions).Select(f => f.FullName).Where(f => !f.Contains("tests", StringComparison.InvariantCultureIgnoreCase));
     }
-
     /// <summary>
     /// Find the sole packages.md file wherever in the repo it lives. Error if multiple or none.
     /// </summary>
     /// <param name="root"></param>
     /// <returns></returns>
     private static string[] GetPackagesMarkdown(DirectoryInfo root)
     {
-        var path = root.EnumerateFiles("packages.md", EnumerationOptions).Select(f => f.FullName).ToArray();
+        var path = root.EnumerateFiles("packages.md", EnumerationOptions).Select(f => f.FullName)
+            .Where(f => !f.Contains("RDMP\\Documentation\\CodeTutorials\\Packages.md", StringComparison.InvariantCultureIgnoreCase))
+            .ToArray();
         Assert.That(path.Length==0, Is.False);
         return path;
     }

diff --git a/JiraPlugin/JiraPlugin.csproj b/JiraPlugin/JiraPlugin.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AssemblyTitle>JIRATicketing</AssemblyTitle>
     <Company>Hewlett-Packard Company</Company>
     <Product>JIRATicketing</Product>

diff --git a/Packages.md b/Packages.md
@@ -11,4 +11,4 @@
 | --------------------------------- | ------------------------------------------------------- | ------------------------------------------------------------------------- | --------------------------------------------- | -------------------------- |
 | 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)  |                            |
-| [NLog](https://nlog-project.org/) | [GitHub](https://github.com/NLog/NLog)                  | [BSD 3-Clause](https://github.com/NLog/NLog/blob/dev/LICENSE.txt)         | Flexible user configurable logging            |                            |
+| 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 |
diff --git a/Plugin/main/main.csproj b/Plugin/main/main.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AssemblyTitle>Rdmp.Hic.Plugin</AssemblyTitle>
     <Product>Rdmp.Hic.Plugin</Product>
     <Copyright>Copyright ©  2019</Copyright>

diff --git a/Plugin/windows/windows.csproj b/Plugin/windows/windows.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <ProjectGuid>{07F9F874-1306-4FE6-A03F-A483592BBC7F}</ProjectGuid>
-    <TargetFramework>net7.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <AssemblyTitle>Rdmp.Hic.Plugin</AssemblyTitle>
     <Product>Rdmp.Hic.Plugin</Product>
     <Copyright>Copyright ©  2019</Copyright>

diff --git a/RDMP b/RDMP
diff --git a/SCIStorePlugin/SCIStorePlugin.csproj b/SCIStorePlugin/SCIStorePlugin.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
 
     <AssemblyTitle>SCIStore</AssemblyTitle>
+2 −14		.github/dependabot.yml
+11 −11		.github/workflows/build.yml
+0 −26		.nuget/packages.config
+6 −6		Application/ResearchDataManagementPlatform/ResearchDataManagementPlatform.csproj
+1 −1		CHANGELOG.md
+7 −0		Directory.Build.props
+43 −0		Directory.Packages.props
+0 −2		Documentation/CodeTutorials/Packages.md
+2 −6		HIC.DataManagementPlatform.sln
+0 −3		Rdmp.Core.Tests/CommandExecution/CommandInvokerTests.cs
+1 −1		Rdmp.Core.Tests/Curation/Integration/QueryBuildingTests/AggregateBuilderTests/AggregateDataBasedTests.cs
+5 −3		Rdmp.Core.Tests/DataLoad/Engine/Integration/FlatFileAttacherTests.cs
+8 −8		Rdmp.Core.Tests/Rdmp.Core.Tests.csproj
+7 −4		Rdmp.Core.Tests/ReusableCodeTests/PackageListIsCorrectTests.cs
+1 −0		Rdmp.Core/CommandExecution/AtomicCommands/LogsNotConfirmedException.cs
+1 −2		Rdmp.Core/Curation/Data/Catalogue.cs
+1 −1		Rdmp.Core/Curation/Data/ConcreteFilter.cs
+1 −1		Rdmp.Core/Curation/Data/SelfCertifyingDataAccessPoint.cs
+1 −1		Rdmp.Core/Curation/Data/TableInfo.cs
+1 −1		Rdmp.Core/DataExport/Data/ExternalCohortTable.cs
+2 −3		Rdmp.Core/DataExport/DataExtraction/Pipeline/Sources/ExecuteCrossServerDatasetExtractionSource.cs
+6 −35		Rdmp.Core/DataLoad/Modules/Attachers/ExcelAttacher.cs
+42 −7		Rdmp.Core/DataLoad/Modules/DataFlowSources/ExcelDataFlowSource.cs
+6 −4		Rdmp.Core/DataViewing/ViewCohortExtractionUICollection.cs
+1 −1		Rdmp.Core/DataViewing/ViewSupportingSqlCollection.cs
+1 −1		Rdmp.Core/QueryBuilding/ExtractionQueryBuilder.cs
+382 −383		Rdmp.Core/Rdmp.Core.csproj
+1 −0		Rdmp.Core/Startup/CorruptRepositoryConnectionDetailsException.cs
+13 −9		Rdmp.UI.Tests/Rdmp.UI.Tests.csproj
+433 −429		Rdmp.UI/Rdmp.UI.csproj
+5 −5		Rdmp.UI/TestsAndSetup/StartupUI.cs
+1 −1		SharedAssemblyInfo.cs
+5 −5		Tests.Common/Tests.Common.csproj
+48 −50		Tools/rdmp/rdmp.csproj
+2 −1		directory.build.props
+2 −2		rdmp-client.xml