Address Resharper inspections

bart-vmware · bart-vmware · commit 2cd44b4809bc · 2025-07-23T12:04:34.000+02:00
diff --git a/Steeltoe.NetCoreToolTemplates.sln.DotSettings b/Steeltoe.NetCoreToolTemplates.sln.DotSettings
@@ -0,0 +1,6 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=appsettings/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=HashiCorp/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=PostgreSQL/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Steeltoe/@EntryIndexedValue">True</s:Boolean>
+</wpf:ResourceDictionary>
diff --git a/src/Content/NetCoreTool.Template.WebApi/CSharp/.template.config/ide.host.json b/src/Content/NetCoreTool.Template.WebApi/CSharp/.template.config/ide.host.json
@@ -295,7 +295,7 @@
         "text": "Use dynamic Serilog logger"
       },
       "description": {
-        "text": "Enables dynamically changing minimum levels at runtime using Serlog."
+        "text": "Enables dynamically changing minimum levels at runtime using Serilog."
       },
       "isVisible": true
     },
diff --git a/src/Content/NetCoreTool.Template.WebApi/CSharp/.template.config/template.json b/src/Content/NetCoreTool.Template.WebApi/CSharp/.template.config/template.json
@@ -635,7 +635,7 @@
     "LoggingDynamicSerilogOption": {
       "type": "parameter",
       "datatype": "bool",
-      "description": "Enable dynamically changing minimum levels at runtime using Serlog.",
+      "description": "Enable dynamically changing minimum levels at runtime using Serilog.",
       "defaultValue": "false"
     },
     "HasLoggingDynamicSerilogInSteeltoeV3": {
diff --git a/test/NetCoreTool.Template.WebApi.Test/CircuitBreakerHystrixOptionTest.cs b/test/NetCoreTool.Template.WebApi.Test/CircuitBreakerHystrixOptionTest.cs
@@ -25,7 +25,7 @@ protected override async Task AssertProjectGeneration(ProjectOptions options)
 
             if (options.SteeltoeVersion == SteeltoeVersion.Steeltoe32)
             {
-                Logger.WriteLine($"asserting HelloHystrixCommand");
+                Logger.WriteLine("asserting HelloHystrixCommand");
                 var sourceFile = GetSourceFileForLanguage("HelloHystrixCommand", options.Language);
                 var source = await Sandbox.GetFileTextAsync(sourceFile);
                 source.Should().ContainSnippet("class HelloHystrixCommand");
diff --git a/test/NetCoreTool.Template.WebApi.Test/LoggingDynamicSerilogOptionTest.cs b/test/NetCoreTool.Template.WebApi.Test/LoggingDynamicSerilogOptionTest.cs
@@ -5,7 +5,7 @@
 namespace Steeltoe.NetCoreTool.Template.WebApi.Test;
 
 public class LoggingDynamicSerilogOptionTest(ITestOutputHelper logger)
-    : ProjectOptionTest("logging-dynamic-serilog", "Enable dynamically changing minimum levels at runtime using Serlog.", logger)
+    : ProjectOptionTest("logging-dynamic-serilog", "Enable dynamically changing minimum levels at runtime using Serilog.", logger)
 {
     protected override void AssertPackageReferencesHook(ProjectOptions options, List<(string, string)> packages)
     {
diff --git a/test/NetCoreTool.Template.WebApi.Test/TemplateTest.cs b/test/NetCoreTool.Template.WebApi.Test/TemplateTest.cs
@@ -29,7 +29,7 @@ protected TemplateTest(string option, string description, ITestOutputHelper logg
         [Trait("Category", "Smoke")]
         public async Task Smoke_Test()
         {
-            Logger.WriteLine($"smoke testing help");
+            Logger.WriteLine("smoke testing help");
             using var helpBox = await TemplateSandbox("--help");
 
             if (Option != null)
@@ -42,7 +42,7 @@ public async Task Smoke_Test()
                 helpBox.CommandOutput.Should().Contain(Description);
             }
 
-            Logger.WriteLine($"smoke testing option");
+            Logger.WriteLine("smoke testing option");
             using var smokeBox = await TemplateSandbox($"{GetSmokeTestArgs()}");
         }
 
diff --git a/test/NetCoreTool.Template.WebApi.Test/Utilities/Command.cs b/test/NetCoreTool.Template.WebApi.Test/Utilities/Command.cs
@@ -76,7 +76,7 @@ public class Command
                 var output = $"{outputBuilder}${errorBuilder}";
                 // if (process.ExitCode != 0)
                 // {
-                    // throw new Exception($"'{command}' exited with exit code {process.ExitCode}:\n\n{output}");
+                //     throw new Exception($"'{command}' exited with exit code {process.ExitCode}:\n\n{output}");
                 // }
 
                 return (process.ExitCode, output);
diff --git a/test/NetCoreTool.Template.WebApi.Test/Utilities/Sandbox.cs b/test/NetCoreTool.Template.WebApi.Test/Utilities/Sandbox.cs
@@ -9,7 +9,7 @@ namespace Steeltoe.NetCoreTool.Template.WebApi.Test.Utilities
 {
     public class Sandbox : TempDirectory
     {
-        private static JsonSerializerOptions Options { get; } = new JsonSerializerOptions
+        private static JsonSerializerOptions Options { get; } = new()
         {
             PropertyNameCaseInsensitive = true,
             ReadCommentHandling = JsonCommentHandling.Skip,
@@ -21,10 +21,7 @@ public class Sandbox : TempDirectory
 
         public string CommandOutput { get; private set; }
 
-        public string Name
-        {
-            get => System.IO.Path.GetFileName(Path);
-        }
+        public string Name => System.IO.Path.GetFileName(Path);
 
         public Sandbox(ITestOutputHelper logger) : base(
             $"DotNetNewTemplatesSandboxes{System.IO.Path.DirectorySeparatorChar}P_{Guid.NewGuid():N}")
diff --git a/test/NetCoreTool.Template.WebApi.Test/Utilities/SteeltoeWebApiTemplateInstaller.cs b/test/NetCoreTool.Template.WebApi.Test/Utilities/SteeltoeWebApiTemplateInstaller.cs
@@ -13,29 +13,31 @@ public void Install()
             Installer.EnsureInstalled(logger);
         }
 
-        private class Installer
+        private static class Installer
         {
             static Installer()
             {
-                var p = Process.Start(
+                var process = Process.Start(
                     new ProcessStartInfo
                     {
                         FileName = "dotnet",
                         Arguments = $"new uninstall {Directory.GetCurrentDirectory()}/../../../../../src/Content",
                     }
                 );
-                Assert.NotNull(p);
-                p.WaitForExit();
-                p = Process.Start(
+                Assert.NotNull(process);
+
+                process.WaitForExit();
+                process = Process.Start(
                     new ProcessStartInfo
                     {
                         FileName = "dotnet",
                         Arguments = $"new install {Directory.GetCurrentDirectory()}/../../../../../src/Content",
                     }
                 );
-                p.Should().NotBeNull();
-                p.WaitForExit();
-                p.ExitCode.Should().Be(0);
+                Assert.NotNull(process);
+
+                process.WaitForExit();
+                process.ExitCode.Should().Be(0);
             }
 
             internal static void EnsureInstalled(ITestOutputHelper logger)

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ protected override async Task AssertProjectGeneration(ProjectOptions options)`
`25`	`25`
`26`	`26`	`if (options.SteeltoeVersion == SteeltoeVersion.Steeltoe32)`
`27`	`27`	`{`
`28`		`- Logger.WriteLine($"asserting HelloHystrixCommand");`
	`28`	`+ Logger.WriteLine("asserting HelloHystrixCommand");`
`29`	`29`	`var sourceFile = GetSourceFileForLanguage("HelloHystrixCommand", options.Language);`
`30`	`30`	`var source = await Sandbox.GetFileTextAsync(sourceFile);`
`31`	`31`	`source.Should().ContainSnippet("class HelloHystrixCommand");`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`namespace Steeltoe.NetCoreTool.Template.WebApi.Test;`
`6`	`6`
`7`	`7`	`public class LoggingDynamicSerilogOptionTest(ITestOutputHelper logger)`
`8`		`- : ProjectOptionTest("logging-dynamic-serilog", "Enable dynamically changing minimum levels at runtime using Serlog.", logger)`
	`8`	`+ : ProjectOptionTest("logging-dynamic-serilog", "Enable dynamically changing minimum levels at runtime using Serilog.", logger)`
`9`	`9`	`{`
`10`	`10`	`protected override void AssertPackageReferencesHook(ProjectOptions options, List<(string, string)> packages)`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ protected TemplateTest(string option, string description, ITestOutputHelper logg`
`29`	`29`	`[Trait("Category", "Smoke")]`
`30`	`30`	`public async Task Smoke_Test()`
`31`	`31`	`{`
`32`		`- Logger.WriteLine($"smoke testing help");`
	`32`	`+ Logger.WriteLine("smoke testing help");`
`33`	`33`	`using var helpBox = await TemplateSandbox("--help");`
`34`	`34`
`35`	`35`	`if (Option != null)`
`@@ -42,7 +42,7 @@ public async Task Smoke_Test()`
`42`	`42`	`helpBox.CommandOutput.Should().Contain(Description);`
`43`	`43`	`}`
`44`	`44`
`45`		`- Logger.WriteLine($"smoke testing option");`
	`45`	`+ Logger.WriteLine("smoke testing option");`
`46`	`46`	`using var smokeBox = await TemplateSandbox($"{GetSmokeTestArgs()}");`
`47`	`47`	`}`
`48`	`48`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ namespace Steeltoe.NetCoreTool.Template.WebApi.Test.Utilities`
`9`	`9`	`{`
`10`	`10`	`public class Sandbox : TempDirectory`
`11`	`11`	`{`
`12`		`- private static JsonSerializerOptions Options { get; } = new JsonSerializerOptions`
	`12`	`+ private static JsonSerializerOptions Options { get; } = new()`
`13`	`13`	`{`
`14`	`14`	`PropertyNameCaseInsensitive = true,`
`15`	`15`	`ReadCommentHandling = JsonCommentHandling.Skip,`
`@@ -21,10 +21,7 @@ public class Sandbox : TempDirectory`
`21`	`21`
`22`	`22`	`public string CommandOutput { get; private set; }`
`23`	`23`
`24`		`- public string Name`
`25`		`- {`
`26`		`- get => System.IO.Path.GetFileName(Path);`
`27`		`- }`
	`24`	`+ public string Name => System.IO.Path.GetFileName(Path);`
`28`	`25`
`29`	`26`	`public Sandbox(ITestOutputHelper logger) : base(`
`30`	`27`	`$"DotNetNewTemplatesSandboxes{System.IO.Path.DirectorySeparatorChar}P_{Guid.NewGuid():N}")`
Original file line number	Diff line number	Diff line change
`@@ -13,29 +13,31 @@ public void Install()`
`13`	`13`	`Installer.EnsureInstalled(logger);`
`14`	`14`	`}`
`15`	`15`
`16`		`- private class Installer`
	`16`	`+ private static class Installer`
`17`	`17`	`{`
`18`	`18`	`static Installer()`
`19`	`19`	`{`
`20`		`- var p = Process.Start(`
	`20`	`+ var process = Process.Start(`
`21`	`21`	`new ProcessStartInfo`
`22`	`22`	`{`
`23`	`23`	`FileName = "dotnet",`
`24`	`24`	`Arguments = $"new uninstall {Directory.GetCurrentDirectory()}/../../../../../src/Content",`
`25`	`25`	`}`
`26`	`26`	`);`
`27`		`- Assert.NotNull(p);`
`28`		`- p.WaitForExit();`
`29`		`- p = Process.Start(`
	`27`	`+ Assert.NotNull(process);`
	`28`	`+`
	`29`	`+ process.WaitForExit();`
	`30`	`+ process = Process.Start(`
`30`	`31`	`new ProcessStartInfo`
`31`	`32`	`{`
`32`	`33`	`FileName = "dotnet",`
`33`	`34`	`Arguments = $"new install {Directory.GetCurrentDirectory()}/../../../../../src/Content",`
`34`	`35`	`}`
`35`	`36`	`);`
`36`		`- p.Should().NotBeNull();`
`37`		`- p.WaitForExit();`
`38`		`- p.ExitCode.Should().Be(0);`
	`37`	`+ Assert.NotNull(process);`
	`38`	`+`
	`39`	`+ process.WaitForExit();`
	`40`	`+ process.ExitCode.Should().Be(0);`
`39`	`41`	`}`
`40`	`42`
`41`	`43`	`internal static void EnsureInstalled(ITestOutputHelper logger)`