Finalize build to .net 9

k3ldar · k3ldar · commit 04bd0d875725 · 2024-12-19T15:07:33.000+01:00
diff --git a/DAL/PluginManager.DAL.TextFiles/Providers/ApplicationSettingsProvider.cs b/DAL/PluginManager.DAL.TextFiles/Providers/ApplicationSettingsProvider.cs
@@ -37,11 +37,6 @@ internal class SettingsProvider : IApplicationSettingsProvider
 	{
 		private readonly ISimpleDBOperations<SettingsDataRow> _settingsData;
 
-		public sealed class SettingValue
-		{
-			public string Value { get; set; }
-		}
-
 		public SettingsProvider(ISimpleDBOperations<SettingsDataRow> settingsData)
 		{
 			_settingsData = settingsData ?? throw new ArgumentNullException(nameof(settingsData));
diff --git a/Demo/NetCorePluginDemoWebsite/Controllers/HomeController.cs b/Demo/NetCorePluginDemoWebsite/Controllers/HomeController.cs
@@ -27,7 +27,6 @@
 
 
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Localization;
 
 using Shared.Classes;
 
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -5,7 +5,7 @@
   <PropertyGroup>
     <RunAnalyzers>true</RunAnalyzers>
     <RunAnalyzersDuringBuild>true</RunAnalyzersDuringBuild>
-    <NoWarn>1701;1702;8032;8981;S125;S6967;S6964;S6670;S6934;S3267;S3431;IDE0290;S3904</NoWarn>
+    <NoWarn>1701;1702;8032;8981;S125;S6967;S6964;S6670;S6934;S3267;S3431;IDE0290;IDE0130;IDE1100;S3904;S3358;S3400</NoWarn>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <SignAssembly>false</SignAssembly>
     <AssemblyOriginatorKeyFile>Shared.Key.pfx</AssemblyOriginatorKeyFile>
@@ -25,7 +25,7 @@
     <PackageTags>Plugin Manager</PackageTags>
     <PackageProjectUrl>http://pluginmanager.website/</PackageProjectUrl>
     <PackageLicenseExpression>GPL-3.0-or-later</PackageLicenseExpression>
-    <PackageReleaseNotes>Supports net 6.0 and net8.0</PackageReleaseNotes>
+    <PackageReleaseNotes>Supports net 6.0, net8.0 and net9.0</PackageReleaseNotes>
     <PackageTags>asp net core plugin manager system admin internal statistics</PackageTags>
   </PropertyGroup>
 
@@ -67,7 +67,21 @@
     <DebugType>embedded</DebugType>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
-	
+		
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)'=='Debug|net9.0'">
+    <DefineConstants>CODE_ANALYSIS;DEBUG;TRACE;NET_CORE;ISO_WEEK;ATTR_OS;NET_6_ABOVE;NET_8_ABOVE;NET_9_ABOVE;NET_9_0;NET_9_X</DefineConstants>
+    <CheckForOverflowUnderflow>$(CheckForOverflowUnderflow)</CheckForOverflowUnderflow>
+    <DebugType>$(DebugType)</DebugType>
+    <DebugSymbols>$(DebugSymbols)</DebugSymbols>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)'=='Release|net9.0'">
+    <DefineConstants>CODE_ANALYSIS;NET_CORE;ISO_WEEK;ATTR_OS;NET_6_ABOVE;NET_8_ABOVE;NET_9_ABOVE;NET_9_0;NET_9_X</DefineConstants>
+    <CheckForOverflowUnderflow>$(CheckForOverflowUnderflow)</CheckForOverflowUnderflow>
+    <DebugType>$(DebugType)</DebugType>
+    <DebugSymbols>$(DebugSymbols)</DebugSymbols>
+  </PropertyGroup>
+
   <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)'=='Debug|net8.0'">
     <DefineConstants>CODE_ANALYSIS;DEBUG;TRACE;NET_CORE;ISO_WEEK;ATTR_OS;NET_5_ABOVE;NET_6_ABOVE;NET_7_ABOVE;NET_8_ABOVE;NET_8_0;NET_8_X</DefineConstants>
     <CheckForOverflowUnderflow>$(CheckForOverflowUnderflow)</CheckForOverflowUnderflow>
diff --git a/NetCorePluginManager/Classes/SystemAdmin/LoadedModulesMenu.cs b/NetCorePluginManager/Classes/SystemAdmin/LoadedModulesMenu.cs
@@ -86,13 +86,9 @@ public override string Data()
 				string file = String.Empty;
 				try
 				{
-#if NET_5_ABOVE
 					string path = assembly.Location;
-#else
-                    string path = String.IsNullOrEmpty(assembly.Location) ? assembly.CodeBase : assembly.Location;
-#endif
 
-#if NET_7_ABOVE
+#if NET_6_ABOVE
 					if (String.IsNullOrEmpty(path))
 						continue;
 #endif
diff --git a/PluginManager/src/GlobalSuppressions.cs b/PluginManager/src/GlobalSuppressions.cs
@@ -6,3 +6,4 @@
 using System.Diagnostics.CodeAnalysis;
 
 [assembly: SuppressMessage("Minor Bug", "S2674:The length returned from a stream read should be checked", Justification = "Reads entire length in one go", Scope = "member", Target = "~M:PluginManager.BasePluginManager.ExtractResources(System.Reflection.Assembly@,PluginManager.PluginSetting@)")]
+[assembly: SuppressMessage("Reliability", "CA2022:Avoid inexact read with 'Stream.Read'", Justification = "Good as is", Scope = "member", Target = "~M:PluginManager.BasePluginManager.ExtractResources(System.Reflection.Assembly@,PluginManager.PluginSetting@)")]
diff --git a/Plugins/ApiAuthorization.Plugin/GlobalSuppressions.cs b/Plugins/ApiAuthorization.Plugin/GlobalSuppressions.cs
@@ -6,3 +6,4 @@
 using System.Diagnostics.CodeAnalysis;
 
 [assembly: SuppressMessage("Minor Bug", "S2674:The length returned from a stream read should be checked", Justification = "Reads entire length of stream", Scope = "member", Target = "~M:ApiAuthorization.Plugin.Classes.HmacApiAuthorizationService.ValidateApiRequest(Microsoft.AspNetCore.Http.HttpRequest,System.String,System.Int32@)~System.Boolean")]
+[assembly: SuppressMessage("Reliability", "CA2022:Avoid inexact read with 'Stream.Read'", Justification = "Will only work with amount of data it gets back", Scope = "member", Target = "~M:ApiAuthorization.Plugin.Classes.HmacApiAuthorizationService.ValidateApiRequest(Microsoft.AspNetCore.Http.HttpRequest,System.String,System.Int32@)~System.Boolean")]
diff --git a/Plugins/Documentation.Plugin/Startup.cs b/Plugins/Documentation.Plugin/Startup.cs
@@ -23,6 +23,7 @@
  *  19/05/2019  Simon Carter        Initially Created
  *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 
@@ -45,30 +46,22 @@ public static void ConfigureServices(IServiceCollection services)
 			services.AddMemoryCache();
 
 			services.AddMvc(
-#if NET_CORE_3_X || NET_5_ABOVE
 				option => option.EnableEndpointRouting = false
-#endif
 				)
 				.AddSessionStateTempDataProvider();
 		}
 
 		// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
 		[System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "CA1801:ReviewUnusedParameters", MessageId = "Reviewed and ok in this context")]
-		public static void Configure(
-#if !NET_CORE_3_X && !NET_5_ABOVE
-            IApplicationBuilder app, IHostingEnvironment env
-#endif
-			)
+		public static void Configure(IApplicationBuilder app)
 		{
 
-#if !NET_CORE_3_X && !NET_5_ABOVE
             app.UseMvc(routes =>
             {
                 routes.MapRoute(
                     name: "default",
                     template: "{controller=Login}/{action=Index}/{id?}");
             });
-#endif
 		}
 	}
 }
diff --git a/Plugins/DynamicContent.Plugin/Startup.cs b/Plugins/DynamicContent.Plugin/Startup.cs
@@ -61,9 +61,7 @@ public static void ConfigureServices(IServiceCollection services)
 			PluginManagerService.ConfigureServices(services);
 
 			services.AddMvc(
-#if NET_CORE_3_X || NET_5_ABOVE
 				option => option.EnableEndpointRouting = false
-#endif
 				)
 				.AddSessionStateTempDataProvider()
 				.ConfigurePluginManager();
diff --git a/Plugins/ErrorManager.Plugin/Controllers/ErrorController.cs b/Plugins/ErrorManager.Plugin/Controllers/ErrorController.cs
@@ -49,32 +49,19 @@ public class ErrorController : BaseController
 	{
 		#region Private Members
 
-#if NET_CORE_3_X || NET_5_ABOVE
 		private readonly IWebHostEnvironment _hostingEnvironment;
-#else
-        private readonly IHostingEnvironment _hostingEnvironment;
-#endif
 
 		private readonly ISettingsProvider _settingsProvider;
 
 		#endregion Private Members
 
 		#region Constructors
 
-#if NET_CORE_3_X || NET_5_ABOVE
 		public ErrorController(IWebHostEnvironment hostingEnvironment, ISettingsProvider settingsProvider)
 		{
 			_hostingEnvironment = hostingEnvironment ?? throw new ArgumentNullException(nameof(hostingEnvironment));
 			_settingsProvider = settingsProvider ?? throw new ArgumentNullException(nameof(settingsProvider));
 		}
-#else
-        public ErrorController(IHostingEnvironment hostingEnvironment, ISettingsProvider settingsProvider)
-        {
-            _hostingEnvironment = hostingEnvironment ?? throw new ArgumentNullException(nameof(hostingEnvironment));
-            _settingsProvider = settingsProvider ?? throw new ArgumentNullException(nameof(settingsProvider));
-        }
-#endif
-
 
 		#endregion Constructors
 
diff --git a/Plugins/ErrorManager.Plugin/Startup.cs b/Plugins/ErrorManager.Plugin/Startup.cs
@@ -45,31 +45,22 @@ public Startup(IConfiguration configuration)
 		public static void ConfigureServices(IServiceCollection services)
 		{
 			services.AddMvc(
-#if NET_CORE_3_X || NET_5_ABOVE
 				option => option.EnableEndpointRouting = false
-#endif
 				);
 		}
 
 		// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
 		[System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "CA1801:ReviewUnusedParameters", MessageId = "Reviewed and ok in this context")]
-		public static void Configure(IApplicationBuilder app,
-#if NET_CORE_3_X || NET_5_ABOVE
-			IWebHostEnvironment env)
-#else
-            IHostingEnvironment env)
-#endif
+		public static void Configure(IApplicationBuilder app)
 		{
 			app.UseErrorManager();
 
-#if !NET_CORE_3_X
 			app.UseMvc(routes =>
 			{
 				routes.MapRoute(
 					name: "default",
 					template: "{controller=Home}/{action=Index}/{id?}");
 			});
-#endif
 		}
 	}
 }
diff --git a/Plugins/HelpDesk.Plugin/Startup.cs b/Plugins/HelpDesk.Plugin/Startup.cs
@@ -37,28 +37,20 @@ public class Startup
 		public static void ConfigureServices(IServiceCollection services)
 		{
 			services.AddMvc(
-#if NET_CORE_3_X || NET_5_ABOVE
 				option => option.EnableEndpointRouting = false
-#endif
-				)
-#if NET_CORE_3_X
-                .SetCompatibilityVersion(CompatibilityVersion.Latest)
-#endif
-				;
+				);
 		}
 
 		// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
 		public static void Configure(IApplicationBuilder app)
 		{
 
-#if !NET_CORE_3_X
 			app.UseMvc(routes =>
 			{
 				routes.MapRoute(
 					name: "default",
 					template: "{controller=Helpdesk}/{action=Index}/{id?}");
 			});
-#endif
 		}
 	}
 }
diff --git a/Plugins/Login.Plugin/Startup.cs b/Plugins/Login.Plugin/Startup.cs
@@ -48,9 +48,7 @@ public Startup()
 		public void ConfigureServices(IServiceCollection services)
 		{
 			services.AddMvc(
-#if NET_CORE_3_X || NET_5_ABOVE
 				option => option.EnableEndpointRouting = false
-#endif
 				)
 				.AddSessionStateTempDataProvider();
 		}

Original file line number	Diff line number	Diff line change
`@@ -37,11 +37,6 @@ internal class SettingsProvider : IApplicationSettingsProvider`
`37`	`37`	`{`
`38`	`38`	`private readonly ISimpleDBOperations<SettingsDataRow> _settingsData;`
`39`	`39`
`40`		`- public sealed class SettingValue`
`41`		`- {`
`42`		`- public string Value { get; set; }`
`43`		`- }`
`44`		`-`
`45`	`40`	`public SettingsProvider(ISimpleDBOperations<SettingsDataRow> settingsData)`
`46`	`41`	`{`
`47`	`42`	`_settingsData = settingsData ?? throw new ArgumentNullException(nameof(settingsData));`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,6 @@`
`27`	`27`
`28`	`28`
`29`	`29`	`using Microsoft.AspNetCore.Mvc;`
`30`		`-using Microsoft.Extensions.Localization;`
`31`	`30`
`32`	`31`	`using Shared.Classes;`
`33`	`32`
Original file line number	Diff line number	Diff line change
`@@ -6,3 +6,4 @@`
`6`	`6`	`using System.Diagnostics.CodeAnalysis;`
`7`	`7`
`8`	`8`	`[assembly: SuppressMessage("Minor Bug", "S2674:The length returned from a stream read should be checked", Justification = "Reads entire length in one go", Scope = "member", Target = "~M:PluginManager.BasePluginManager.ExtractResources(System.Reflection.Assembly@,PluginManager.PluginSetting@)")]`
	`9`	`+[assembly: SuppressMessage("Reliability", "CA2022:Avoid inexact read with 'Stream.Read'", Justification = "Good as is", Scope = "member", Target = "~M:PluginManager.BasePluginManager.ExtractResources(System.Reflection.Assembly@,PluginManager.PluginSetting@)")]`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@`
`23`	`23`	`* 19/05/2019 Simon Carter Initially Created`
`24`	`24`	`*`
`25`	`25`	`* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */`
	`26`	`+using Microsoft.AspNetCore.Builder;`
`26`	`27`	`using Microsoft.Extensions.Configuration;`
`27`	`28`	`using Microsoft.Extensions.DependencyInjection;`
`28`	`29`
`@@ -45,30 +46,22 @@ public static void ConfigureServices(IServiceCollection services)`
`45`	`46`	`services.AddMemoryCache();`
`46`	`47`
`47`	`48`	`services.AddMvc(`
`48`		`-#if NET_CORE_3_X \|\| NET_5_ABOVE`
`49`	`49`	`option => option.EnableEndpointRouting = false`
`50`		`-#endif`
`51`	`50`	`)`
`52`	`51`	`.AddSessionStateTempDataProvider();`
`53`	`52`	`}`
`54`	`53`
`55`	`54`	`// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.`
`56`	`55`	`[System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "CA1801:ReviewUnusedParameters", MessageId = "Reviewed and ok in this context")]`
`57`		`- public static void Configure(`
`58`		`-#if !NET_CORE_3_X && !NET_5_ABOVE`
`59`		`- IApplicationBuilder app, IHostingEnvironment env`
`60`		`-#endif`
`61`		`- )`
	`56`	`+ public static void Configure(IApplicationBuilder app)`
`62`	`57`	`{`
`63`	`58`
`64`		`-#if !NET_CORE_3_X && !NET_5_ABOVE`
`65`	`59`	`app.UseMvc(routes =>`
`66`	`60`	`{`
`67`	`61`	`routes.MapRoute(`
`68`	`62`	`name: "default",`
`69`	`63`	`template: "{controller=Login}/{action=Index}/{id?}");`
`70`	`64`	`});`
`71`		`-#endif`
`72`	`65`	`}`
`73`	`66`	`}`
`74`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,9 +61,7 @@ public static void ConfigureServices(IServiceCollection services)`
`61`	`61`	`PluginManagerService.ConfigureServices(services);`
`62`	`62`
`63`	`63`	`services.AddMvc(`
`64`		`-#if NET_CORE_3_X \|\| NET_5_ABOVE`
`65`	`64`	`option => option.EnableEndpointRouting = false`
`66`		`-#endif`
`67`	`65`	`)`
`68`	`66`	`.AddSessionStateTempDataProvider()`
`69`	`67`	`.ConfigurePluginManager();`
Original file line number	Diff line number	Diff line change
`@@ -45,31 +45,22 @@ public Startup(IConfiguration configuration)`
`45`	`45`	`public static void ConfigureServices(IServiceCollection services)`
`46`	`46`	`{`
`47`	`47`	`services.AddMvc(`
`48`		`-#if NET_CORE_3_X \|\| NET_5_ABOVE`
`49`	`48`	`option => option.EnableEndpointRouting = false`
`50`		`-#endif`
`51`	`49`	`);`
`52`	`50`	`}`
`53`	`51`
`54`	`52`	`// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.`
`55`	`53`	`[System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "CA1801:ReviewUnusedParameters", MessageId = "Reviewed and ok in this context")]`
`56`		`- public static void Configure(IApplicationBuilder app,`
`57`		`-#if NET_CORE_3_X \|\| NET_5_ABOVE`
`58`		`- IWebHostEnvironment env)`
`59`		`-#else`
`60`		`- IHostingEnvironment env)`
`61`		`-#endif`
	`54`	`+ public static void Configure(IApplicationBuilder app)`
`62`	`55`	`{`
`63`	`56`	`app.UseErrorManager();`
`64`	`57`
`65`		`-#if !NET_CORE_3_X`
`66`	`58`	`app.UseMvc(routes =>`
`67`	`59`	`{`
`68`	`60`	`routes.MapRoute(`
`69`	`61`	`name: "default",`
`70`	`62`	`template: "{controller=Home}/{action=Index}/{id?}");`
`71`	`63`	`});`
`72`		`-#endif`
`73`	`64`	`}`
`74`	`65`	`}`
`75`	`66`	`}`