Merge branch 'master' into feature/SonarIssuesAgain

Signed-off-by: Si Carter <[email protected]>
k3ldar · Jul 7, 2024 · fa55e59 · fa55e59
2 parents f71ec7c + de428db
commit fa55e59
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/DAL/PluginManager.DAL.TextFiles/GlobalSuppressions.cs b/DAL/PluginManager.DAL.TextFiles/GlobalSuppressions.cs
@@ -10,3 +10,4 @@
 [assembly: SuppressMessage("Major Bug", "S1244:Floating point numbers should not be tested for equality", Justification = "Fine as is", Scope = "member", Target = "~P:PluginManager.DAL.TextFiles.Tables.PageViewsDataRow.TotalTime")]
 [assembly: SuppressMessage("Major Code Smell", "S1854:Unused assignments should be removed", Justification = "Without it there will be no depth", Scope = "member", Target = "~M:PluginManager.DAL.TextFiles.Providers.HelpdeskProvider.InternalGetKnowledgebaseGroup(System.Int64,System.Int32)~Middleware.Helpdesk.KnowledgeBaseGroup")]
 [assembly: SuppressMessage("Performance", "CA1859:Use concrete types when possible for improved performance", Justification = "<Pending>", Scope = "member", Target = "~M:PluginManager.DAL.TextFiles.Providers.DynamicContentProvider.InternalGetCustomPage(PluginManager.DAL.TextFiles.Tables.ContentPageDataRow)~Middleware.IDynamicContentPage")]
+
diff --git a/Plugins/ImageManager.Plugin/GlobalSuppressions.cs b/Plugins/ImageManager.Plugin/GlobalSuppressions.cs
@@ -7,3 +7,4 @@
 
 [assembly: SuppressMessage("Critical Code Smell", "S2696:Instance members should not write to \"static\" fields", Justification = "Required for unique id in app lifetime", Scope = "member", Target = "~M:ImageManager.Plugin.Controllers.ImageManagerController.GetCacheId~System.String")]
 [assembly: SuppressMessage("Performance", "CA1859:Use concrete types when possible for improved performance", Justification = "The right model is returned here", Scope = "member", Target = "~M:ImageManager.Plugin.Controllers.ImageManagerController.CreateImagesViewModel(System.String,System.String,System.String)~ImageManager.Plugin.Models.ImagesViewModel")]
+
diff --git a/Tests/Directory.Build.props b/Tests/Directory.Build.props
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <BaseOutputPath>$(SolutionDir)\Output\UnitTests\</BaseOutputPath>
-	<NoWarn>$(NoWarn);S1481</NoWarn>
+  	<NoWarn>$(NoWarn);S1481</NoWarn>
   </PropertyGroup>
 
   <PropertyGroup>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,3 +10,4 @@
		[assembly: SuppressMessage("Major Bug", "S1244:Floating point numbers should not be tested for equality", Justification = "Fine as is", Scope = "member", Target = "~P:PluginManager.DAL.TextFiles.Tables.PageViewsDataRow.TotalTime")]
		[assembly: SuppressMessage("Major Code Smell", "S1854:Unused assignments should be removed", Justification = "Without it there will be no depth", Scope = "member", Target = "~M:PluginManager.DAL.TextFiles.Providers.HelpdeskProvider.InternalGetKnowledgebaseGroup(System.Int64,System.Int32)~Middleware.Helpdesk.KnowledgeBaseGroup")]
		[assembly: SuppressMessage("Performance", "CA1859:Use concrete types when possible for improved performance", Justification = "<Pending>", Scope = "member", Target = "~M:PluginManager.DAL.TextFiles.Providers.DynamicContentProvider.InternalGetCustomPage(PluginManager.DAL.TextFiles.Tables.ContentPageDataRow)~Middleware.IDynamicContentPage")]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,3 +7,4 @@

		[assembly: SuppressMessage("Critical Code Smell", "S2696:Instance members should not write to \"static\" fields", Justification = "Required for unique id in app lifetime", Scope = "member", Target = "~M:ImageManager.Plugin.Controllers.ImageManagerController.GetCacheId~System.String")]
		[assembly: SuppressMessage("Performance", "CA1859:Use concrete types when possible for improved performance", Justification = "The right model is returned here", Scope = "member", Target = "~M:ImageManager.Plugin.Controllers.ImageManagerController.CreateImagesViewModel(System.String,System.String,System.String)~ImageManager.Plugin.Models.ImagesViewModel")]