chore: Upgrade SA

linkdotnet · linkdotnet · commit a689c162a248 · 2025-01-16T09:03:54.000+01:00
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -6,7 +6,7 @@
 	<!-- Shared code analyzers used for all projects in the solution -->
 	<ItemGroup Condition="!$(MSBuildProjectName.EndsWith('samples'))">
 		<GlobalPackageReference Include="AsyncFixer" Version="1.6.0" PrivateAssets="All" IncludeAssets="Runtime;Build;Native;contentFiles;Analyzers"/>
-		<GlobalPackageReference Include="SonarAnalyzer.CSharp" Version="9.32.0.97167" PrivateAssets="All" IncludeAssets="Runtime;Build;Native;contentFiles;Analyzers"/>
+		<GlobalPackageReference Include="SonarAnalyzer.CSharp" Version="10.5.0.109200" PrivateAssets="All" IncludeAssets="Runtime;Build;Native;contentFiles;Analyzers"/>
 		<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
 		<PackageVersion Include="Meziantou.Polyfill" Version="1.0.42" />
 	</ItemGroup>
@@ -28,7 +28,7 @@
 
 	<ItemGroup Label="System.Text.Json Vulnerability">
 		<!-- Due to a CVE in System.Text.Json we explicitly reference the latest version of System.Text.Json -->
-		<PackageVersion Include="System.Text.Json" Version="9.0.0"/>
+		<PackageVersion Include="System.Text.Json" Version="9.0.1"/>
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
diff --git a/tests/bunit.core.tests/Rendering/RenderModeTests.razor b/tests/bunit.core.tests/Rendering/RenderModeTests.razor
@@ -168,7 +168,7 @@
                 </ComponentWithChildContent>
             </ComponentWithChildContent>);
 
-		act.ShouldThrow<RenderModeMisMatchException>(); // todo: figure out good exception to use
+		act.ShouldThrow<RenderModeMisMatchException>();
     }
 }
 @code{
diff --git a/tests/bunit.core.tests/TestDoubles/PersistentComponentState/FakePersistentComponentStateTest.cs b/tests/bunit.core.tests/TestDoubles/PersistentComponentState/FakePersistentComponentStateTest.cs
@@ -67,7 +67,7 @@ public void Test013(string key)
 	{
 		var fakeState = this.AddFakePersistentComponentState();
 
-		fakeState.TryTake<string>(key, out var actual).ShouldBeFalse();
+		fakeState.TryTake<string>(key, out _).ShouldBeFalse();
 	}
 
 	[Fact(DisplayName = "TriggerOnPersisting triggers OnPersisting callbacks added to store")]
diff --git a/tests/bunit.testassets/BlazorE2E/AddRemoveChildComponents.razor b/tests/bunit.testassets/BlazorE2E/AddRemoveChildComponents.razor
@@ -10,7 +10,7 @@ Child components follow.
 
 @code {
     int numAdded = 0;
-    List<string> currentChildrenMessages = new List<string>();
+    private readonly List<string> currentChildrenMessages = new List<string>();
 
     void AddChild()
     {
diff --git a/tests/bunit.testassets/BlazorE2E/DataDashComponent.razor b/tests/bunit.testassets/BlazorE2E/DataDashComponent.razor
@@ -1,5 +1,5 @@
 <div id="cool_beans" data-tab="@TabId">@TabId</div>
 
 @code {
-    string TabId = "17";
+    private readonly string TabId = "17";
 }
diff --git a/tests/bunit.testassets/BlazorE2E/DuplicateAttributesComponent.razor b/tests/bunit.testassets/BlazorE2E/DuplicateAttributesComponent.razor
@@ -13,7 +13,7 @@
 </div>
 
 @functions {
-    Dictionary<string, object> elementValues = new Dictionary<string, object>
+	private readonly Dictionary<string, object> elementValues = new Dictionary<string, object>
     {
         { "bool",  true },
         { "string", "middle-value" },
diff --git a/tests/bunit.testassets/BlazorE2E/KeyPressEventComponent.razor b/tests/bunit.testassets/BlazorE2E/KeyPressEventComponent.razor
@@ -9,7 +9,7 @@ Type here: <input @onkeypress=OnKeyPressed />
 </ul>
 
 @code {
-    List<string> keysPressed = new List<string>();
+	private readonly List<string> keysPressed = new List<string>();
 
     void OnKeyPressed(KeyboardEventArgs eventArgs)
     {
diff --git a/tests/bunit.testassets/BlazorE2E/MarkupBlockComponent.razor b/tests/bunit.testassets/BlazorE2E/MarkupBlockComponent.razor
@@ -28,7 +28,7 @@
     #nullable disable
     bool changeOutput;
 
-    string myMarkup = "<p class='markup-string-value'>This is a <em>markup string</em>.</p>";
+    private readonly string myMarkup = "<p class='markup-string-value'>This is a <em>markup string</em>.</p>";
 
     void EmitMarkupBlock(RenderTreeBuilder builder)
     {
diff --git a/tests/bunit.testassets/BlazorE2E/MovingCheckboxesComponent.razor b/tests/bunit.testassets/BlazorE2E/MovingCheckboxesComponent.razor
@@ -41,15 +41,15 @@
 
 @code {
     #nullable disable
-    List<TodoItem> items = new List<TodoItem>
+    private readonly List<TodoItem> items = new List<TodoItem>
     {
         new TodoItem { Text = "Alpha" },
         new TodoItem { Text = "Beta" },
         new TodoItem { Text = "Gamma", IsDone = true },
         new TodoItem { Text = "Delta", IsDone = true },
     };
 
-    class TodoItem
+    private sealed class TodoItem
     {
         public bool IsDone { get; set; }
         public string Text { get; set; }
diff --git a/tests/bunit.testassets/BlazorE2E/OrderedList.razor b/tests/bunit.testassets/BlazorE2E/OrderedList.razor
@@ -6,7 +6,7 @@
     }
     @foreach (var item in Items)
     {
-        @Template(new Context { Index = index++, Item = item, });
+        @Template(new Context { Index = index++, Item = item, })
     }
 </ol>
 
diff --git a/tests/bunit.testassets/SampleComponents/AsyncRenderChangesProperty.razor b/tests/bunit.testassets/SampleComponents/AsyncRenderChangesProperty.razor
@@ -1,7 +1,7 @@
 <button id="tick" @onclick="Tick">Tick</button>
 <button id="tock" @onclick="Tock">Tock</button>
 @code {
-	private TaskCompletionSource<object?> _tcs = new TaskCompletionSource<object?>();
+	private readonly TaskCompletionSource<object?> _tcs = new TaskCompletionSource<object?>();
 	public int Counter;
 
 	private Task Tick()
diff --git a/tests/bunit.testassets/SampleComponents/InvokeAsyncInsideContinueWith.razor b/tests/bunit.testassets/SampleComponents/InvokeAsyncInsideContinueWith.razor
@@ -22,13 +22,13 @@
 		{
 			registeredTask = task;
 			delegatedTask = task == null ? null : DelegateTo(task);
-			RenderWhenDone();
+			_ = RenderWhenDone();
 		}
 
 		base.OnParametersSet();
 	}
 
-	private async void RenderWhenDone()
+	private async Task RenderWhenDone()
 	{
 		var task = delegatedTask;
 		if (task != null)
@@ -44,7 +44,7 @@
 
 	private static async Task<object?> DelegateTo(Task task)
 	{
-		await task;//.ConfigureAwait(false);
+		await task;
 		return null;
 	}
 }
diff --git a/tests/bunit.testassets/SampleComponents/RenderOnClick.razor b/tests/bunit.testassets/SampleComponents/RenderOnClick.razor
@@ -2,8 +2,11 @@
 
 @code {
     public int RenderCount { get; private set; }
-    
-    void IncreaseCount() { }
+
+    void IncreaseCount()
+    {
+	    // Left empty on purpose
+    }
 
     protected override void OnAfterRender(bool firstRender) => RenderCount++;
 }
diff --git a/tests/bunit.testassets/SampleComponents/SimpleUsingLocalizer.razor b/tests/bunit.testassets/SampleComponents/SimpleUsingLocalizer.razor
@@ -6,7 +6,7 @@
 @code {
 	protected override void OnInitialized()
 	{
-		var localizedString = StringLocalizer["StringName"];
+		_ = StringLocalizer["StringName"];
 	}
 
 }
diff --git a/tests/bunit.testassets/SampleComponents/SimpleWithTemplate.razor b/tests/bunit.testassets/SampleComponents/SimpleWithTemplate.razor
@@ -1,7 +1,7 @@
 @typeparam T
 @foreach (var d in Data)
 {
-	@Template?.Invoke(d);
+	@Template?.Invoke(d)
 }
 @code
 {
diff --git a/tests/bunit.testassets/SampleComponents/ToggleableDetails.razor b/tests/bunit.testassets/SampleComponents/ToggleableDetails.razor
@@ -3,7 +3,7 @@
 	{
 		<p>Read the details carefully!</p>
 	}
-	<details id="details-toggle" @ontoggle="OnToggle">
+	<details id="details-toggle" @ontoggle="@OnToggle">
 		<summary>Summary</summary>
 		<p>Detailed content</p>
 	</details>
diff --git a/tests/bunit.web.tests/Asserting/MarkupMatchesTests.razor b/tests/bunit.web.tests/Asserting/MarkupMatchesTests.razor
@@ -1,13 +1,9 @@
-@using Bunit.TestAssets
 @using Bunit.TestAssets.SampleComponents
 @inherits TestContext
 @code {
-    private readonly ITestOutputHelper outputHelper;
-
-    public MarkupMatchesTests(ITestOutputHelper outputHelper)
+    public MarkupMatchesTests()
     {
-        this.outputHelper = outputHelper;
-        TestContext.DefaultWaitTimeout = TimeSpan.FromSeconds(30);
+        DefaultWaitTimeout = TimeSpan.FromSeconds(30);
     }
 
     [Fact]

Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@`
`168`	`168`	`</ComponentWithChildContent>`
`169`	`169`	`</ComponentWithChildContent>);`
`170`	`170`
`171`		`- act.ShouldThrow<RenderModeMisMatchException>(); // todo: figure out good exception to use`
	`171`	`+ act.ShouldThrow<RenderModeMisMatchException>();`
`172`	`172`	`}`
`173`	`173`	`}`
`174`	`174`	`@code{`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public void Test013(string key)`
`67`	`67`	`{`
`68`	`68`	`var fakeState = this.AddFakePersistentComponentState();`
`69`	`69`
`70`		`- fakeState.TryTake<string>(key, out var actual).ShouldBeFalse();`
	`70`	`+ fakeState.TryTake<string>(key, out _).ShouldBeFalse();`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`[Fact(DisplayName = "TriggerOnPersisting triggers OnPersisting callbacks added to store")]`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ Child components follow.`
`10`	`10`
`11`	`11`	`@code {`
`12`	`12`	`int numAdded = 0;`
`13`		`- List<string> currentChildrenMessages = new List<string>();`
	`13`	`+ private readonly List<string> currentChildrenMessages = new List<string>();`
`14`	`14`
`15`	`15`	`void AddChild()`
`16`	`16`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`<div id="cool_beans" data-tab="@TabId">@TabId</div>`
`2`	`2`
`3`	`3`	`@code {`
`4`		`- string TabId = "17";`
	`4`	`+ private readonly string TabId = "17";`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`</div>`
`14`	`14`
`15`	`15`	`@functions {`
`16`		`- Dictionary<string, object> elementValues = new Dictionary<string, object>`
	`16`	`+ private readonly Dictionary<string, object> elementValues = new Dictionary<string, object>`
`17`	`17`	`{`
`18`	`18`	`{ "bool", true },`
`19`	`19`	`{ "string", "middle-value" },`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ Type here: <input @onkeypress=OnKeyPressed />`
`9`	`9`	`</ul>`
`10`	`10`
`11`	`11`	`@code {`
`12`		`- List<string> keysPressed = new List<string>();`
	`12`	`+ private readonly List<string> keysPressed = new List<string>();`
`13`	`13`
`14`	`14`	`void OnKeyPressed(KeyboardEventArgs eventArgs)`
`15`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`#nullable disable`
`29`	`29`	`bool changeOutput;`
`30`	`30`
`31`		`- string myMarkup = "<p class='markup-string-value'>This is a <em>markup string</em>.</p>";`
	`31`	`+ private readonly string myMarkup = "<p class='markup-string-value'>This is a <em>markup string</em>.</p>";`
`32`	`32`
`33`	`33`	`void EmitMarkupBlock(RenderTreeBuilder builder)`
`34`	`34`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`}`
`7`	`7`	`@foreach (var item in Items)`
`8`	`8`	`{`
`9`		`- @Template(new Context { Index = index++, Item = item, });`
	`9`	`+ @Template(new Context { Index = index++, Item = item, })`
`10`	`10`	`}`
`11`	`11`	`</ol>`
`12`	`12`
Original file line number	Diff line number	Diff line change
`@@ -22,13 +22,13 @@`
`22`	`22`	`{`
`23`	`23`	`registeredTask = task;`
`24`	`24`	`delegatedTask = task == null ? null : DelegateTo(task);`
`25`		`- RenderWhenDone();`
	`25`	`+ _ = RenderWhenDone();`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`base.OnParametersSet();`
`29`	`29`	`}`
`30`	`30`
`31`		`- private async void RenderWhenDone()`
	`31`	`+ private async Task RenderWhenDone()`
`32`	`32`	`{`
`33`	`33`	`var task = delegatedTask;`
`34`	`34`	`if (task != null)`
`@@ -44,7 +44,7 @@`
`44`	`44`
`45`	`45`	`private static async Task<object?> DelegateTo(Task task)`
`46`	`46`	`{`
`47`		`- await task;//.ConfigureAwait(false);`
	`47`	`+ await task;`
`48`	`48`	`return null;`
`49`	`49`	`}`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`@code {`
`7`	`7`	`protected override void OnInitialized()`
`8`	`8`	`{`
`9`		`- var localizedString = StringLocalizer["StringName"];`
	`9`	`+ _ = StringLocalizer["StringName"];`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`}`