Bump SkiaSharp from 2.88.6 to 2.88.7

.editorconfig

@@ -1076,3 +1076,6 @@ dotnet_diagnostic.IDE0046.severity = suggestion
 
 # IDE0045: Convert to conditional expression
 dotnet_diagnostic.IDE0045.severity = suggestion
+
+# Silence https://github.com/nunit/nunit.analyzers/tree/master/documentation/NUnit2046.md
+dotnet_diagnostic.NUnit2045.severity = suggestion

.github/workflows/dotnet.yml

@@ -16,7 +16,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Setup .NET
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
         dotnet-version: 8.0.x
     - name: Restore dependencies
@@ -26,7 +26,7 @@ jobs:
     - name: Test
       run: dotnet test --no-build --verbosity normal --configuration Release
     - name: Publish Unit Test Results
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       if: failure()
       with:
         name: TestResult
@@ -39,7 +39,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Setup .NET
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
         dotnet-version: 8.0.x
     - name: Restore dependencies
@@ -71,7 +71,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Setup .NET
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
         dotnet-version: 8.0.x
     - name: Restore dependencies

.github/workflows/stale.yml

@@ -18,7 +18,7 @@ jobs:
       pull-requests: write
 
     steps:
-    - uses: actions/stale@v8
+    - uses: actions/stale@v9
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         stale-issue-message: 'Stale issue message'

ClosedXML.Examples/ClosedXML.Examples.csproj

@@ -16,8 +16,8 @@
 	<ItemGroup>
 		<ProjectReference Include="..\ClosedXML\ClosedXML.csproj" />
 		<PackageReference Include="DocumentFormat.OpenXml" Version="2.20.0" />
-		<PackageReference Include="morelinq" Version="4.0.0" />
-		<PackageReference Include="SonarAnalyzer.CSharp" Version="9.12.0.78982">
+		<PackageReference Include="morelinq" Version="4.1.0" />
+		<PackageReference Include="SonarAnalyzer.CSharp" Version="9.15.0.81779">
 		  <PrivateAssets>all</PrivateAssets>
 		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>

ClosedXML.Sandbox/ClosedXML.Sandbox.csproj

@@ -7,7 +7,7 @@
 		<IsPackable>false</IsPackable>
 	</PropertyGroup>
 	<ItemGroup>
-	  <PackageReference Include="SonarAnalyzer.CSharp" Version="9.12.0.78982">
+	  <PackageReference Include="SonarAnalyzer.CSharp" Version="9.15.0.81779">
 	    <PrivateAssets>all</PrivateAssets>
 	    <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 	  </PackageReference>

ClosedXML.Tests/ClosedXML.Tests.csproj

@@ -22,14 +22,18 @@
 	<ItemGroup>
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
 		<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-		<PackageReference Include="NUnit" Version="3.14.0" />
+		<PackageReference Include="NUnit" Version="4.0.1" />
+		<PackageReference Include="NUnit.Analyzers" Version="3.10.0">
+		  <PrivateAssets>all</PrivateAssets>
+		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
 		<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-		<PackageReference Include="SonarAnalyzer.CSharp" Version="9.12.0.78982">
+		<PackageReference Include="SonarAnalyzer.CSharp" Version="9.15.0.81779">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
 		<PackageReference Include="System.Data.OleDb" Version="8.0.0" />
-		<PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
+		<PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
 	</ItemGroup>
 
 	<ItemGroup>

ClosedXML.Tests/Excel/AutoFilters/AutoFilterTests.cs

@@ -35,8 +35,8 @@ public void AutoFilterExpandsWithTable()
             table.DataRange.InsertRowsBelow(listOfArr.Count - table.DataRange.RowCount());
             table.DataRange.FirstCell().InsertData(listOfArr);
 
-            Assert.AreEqual("A1:A5", table.AutoFilter.Range.RangeAddress.ToStringRelative());
-            Assert.AreEqual(5, table.AutoFilter.VisibleRows.Count());
+            Assert.That(table.AutoFilter.Range.RangeAddress.ToStringRelative(), Is.EqualTo("A1:A5"));
+            Assert.That(table.AutoFilter.VisibleRows.Count(), Is.EqualTo(5));
         }
 
         [Test]
@@ -50,7 +50,7 @@ public void AutoFilterSortWhenNotInFirstRow()
                 .CellBelow().SetValue("Carlos")
                 .CellBelow().SetValue("Dominic");
             ws.RangeUsed().SetAutoFilter().Sort();
-            Assert.AreEqual("Carlos", ws.Cell(4, 3).GetString());
+            Assert.That(ws.Cell(4, 3).GetString(), Is.EqualTo("Carlos"));
         }
 
         [Test]
@@ -117,7 +117,7 @@ public void CanCopyAutoFilterToNewSheetOnNewWorkbook()
 
             using (var wb2 = new XLWorkbook(ms2))
             {
-                Assert.IsTrue(wb2.Worksheets.First().AutoFilter.IsEnabled);
+                Assert.That(wb2.Worksheets.First().AutoFilter.IsEnabled, Is.True);
             }
         }
 
@@ -162,7 +162,7 @@ public void AutoFilterRangeRemainsValidOnInsertColumn(string rangeAddress)
             range.InsertColumnsBefore(1);
 
             //Assert
-            Assert.IsTrue(ws.AutoFilter.Range.RangeAddress.IsValid);
+            Assert.That(ws.AutoFilter.Range.RangeAddress.IsValid, Is.True);
         }
 
         [Test]
@@ -181,10 +181,10 @@ public void AutoFilterVisibleRows()
 
             autoFilter.Column(1).AddFilter("Carlos");
 
-            Assert.AreEqual("Carlos", ws.Cell(5, 3).GetString());
-            Assert.AreEqual(2, autoFilter.VisibleRows.Count());
-            Assert.AreEqual(3, autoFilter.VisibleRows.First().WorksheetRow().RowNumber());
-            Assert.AreEqual(5, autoFilter.VisibleRows.Last().WorksheetRow().RowNumber());
+            Assert.That(ws.Cell(5, 3).GetString(), Is.EqualTo("Carlos"));
+            Assert.That(autoFilter.VisibleRows.Count(), Is.EqualTo(2));
+            Assert.That(autoFilter.VisibleRows.First().WorksheetRow().RowNumber(), Is.EqualTo(3));
+            Assert.That(autoFilter.VisibleRows.Last().WorksheetRow().RowNumber(), Is.EqualTo(5));
         }
 
         [Test]
@@ -204,14 +204,14 @@ public void ReapplyAutoFilter()
 
             autoFilter.Column(1).AddFilter("Carlos");
 
-            Assert.AreEqual(3, autoFilter.HiddenRows.Count());
+            Assert.That(autoFilter.HiddenRows.Count(), Is.EqualTo(3));
 
             // Unhide the rows so that the table is out of sync with the filter
             autoFilter.HiddenRows.ForEach(r => r.WorksheetRow().Unhide());
-            Assert.False(autoFilter.HiddenRows.Any());
+            Assert.That(autoFilter.HiddenRows.Any(), Is.False);
 
             autoFilter.Reapply();
-            Assert.AreEqual(3, autoFilter.HiddenRows.Count());
+            Assert.That(autoFilter.HiddenRows.Count(), Is.EqualTo(3));
         }
 
         [Test]
@@ -233,11 +233,11 @@ public void CanLoadAutoFilterWithThousandsSeparator()
                 using (var wb = new XLWorkbook(stream))
                 {
                     var ws = wb.Worksheets.First();
-                    Assert.AreEqual(10000, (ws.AutoFilter as XLAutoFilter).Filters.First().Value.FirstOrDefault().Value);
-                    Assert.AreEqual(2, ws.AutoFilter.VisibleRows.Count());
+                    Assert.That((ws.AutoFilter as XLAutoFilter).Filters.First().Value.FirstOrDefault().Value, Is.EqualTo(10000));
+                    Assert.That(ws.AutoFilter.VisibleRows.Count(), Is.EqualTo(2));
 
                     ws.AutoFilter.Reapply();
-                    Assert.AreEqual(2, ws.AutoFilter.VisibleRows.Count());
+                    Assert.That(ws.AutoFilter.VisibleRows.Count(), Is.EqualTo(2));
                 }
 
                 Thread.CurrentThread.CurrentCulture = CultureInfo.CreateSpecificCulture("en-US");
@@ -246,13 +246,13 @@ public void CanLoadAutoFilterWithThousandsSeparator()
                 using (var wb = new XLWorkbook(stream))
                 {
                     var ws = wb.Worksheets.First();
-                    Assert.AreEqual("10 000.00", (ws.AutoFilter as XLAutoFilter).Filters.First().Value.FirstOrDefault().Value);
+                    Assert.That((ws.AutoFilter as XLAutoFilter).Filters.First().Value.FirstOrDefault().Value, Is.EqualTo("10 000.00"));
 
                     _ = ws.AutoFilter.VisibleRows.Select(r => r.FirstCell().Value).ToList();
-                    Assert.AreEqual(2, ws.AutoFilter.VisibleRows.Count());
+                    Assert.That(ws.AutoFilter.VisibleRows.Count(), Is.EqualTo(2));
 
                     ws.AutoFilter.Reapply();
-                    Assert.AreEqual(1, ws.AutoFilter.VisibleRows.Count());
+                    Assert.That(ws.AutoFilter.VisibleRows.Count(), Is.EqualTo(1));
                 }
             }
             finally

ClosedXML.Tests/Excel/Caching/SampleRepositoryTests.cs

@@ -23,9 +23,9 @@ public void DifferentEntitiesWithSameKeyStoredOnce()
             var storedEntity2 = sampleRepository.Store(ref key, entity2);
 
             // Assert
-            Assert.AreSame(entity1, storedEntity1);
-            Assert.AreSame(entity1, storedEntity2);
-            Assert.AreNotSame(entity2, storedEntity2);
+            Assert.That(storedEntity1, Is.SameAs(entity1));
+            Assert.That(storedEntity2, Is.SameAs(entity1));
+            Assert.That(storedEntity2, Is.Not.SameAs(entity2));
         }
 
         [Test]
@@ -52,7 +52,7 @@ public void NonUsedReferencesAreGCed()
            if (count == 10)
                 Assert.Fail("storedEntityRef1 was not GCed");
 
-            Assert.IsFalse(sampleRepository.Any());
+            Assert.That(sampleRepository.Any(), Is.False);
 #else
             Assert.Ignore("Can't run in DEBUG");
 #endif
@@ -89,7 +89,7 @@ public void NonUsedReferencesAreGCed2()
             var storedEntries = sampleRepository.ToList();
 
             // Assert
-            Assert.AreEqual(0, storedEntries.Count);
+            Assert.That(storedEntries.Count, Is.Zero);
 #else
             Assert.Ignore("Can't run in DEBUG");
 #endif
@@ -122,8 +122,8 @@ public void ConcurrentAddingCausesNoDuplication()
             var storedEntries = sampleRepository.ToList();
 
             // Assert
-            Assert.AreEqual(countUnique, storedEntries.Count);
-            Assert.NotNull(entities); // To protect them from GC
+            Assert.That(storedEntries.Count, Is.EqualTo(countUnique));
+            Assert.That(entities, Is.Not.Null); // To protect them from GC
         }
 
         [Test]
@@ -143,10 +143,10 @@ public void ReplaceKeyInRepository()
             var storedEntity2 = sampleRepository.GetOrCreate(ref key2);
 
             // Assert
-            Assert.IsFalse(containsOld);
-            Assert.IsTrue(containsNew);
-            Assert.AreSame(entity, storedEntity1);
-            Assert.AreSame(entity, storedEntity2);
+            Assert.That(containsOld, Is.False);
+            Assert.That(containsNew, Is.True);
+            Assert.That(storedEntity1, Is.SameAs(entity));
+            Assert.That(storedEntity2, Is.SameAs(entity));
         }
 
         [Test]
@@ -162,7 +162,7 @@ public void ConcurrentReplaceKeyInRepository()
                 var val1 = sampleRepository.Replace(ref key, ref modifiedKey);
                 val1.Key = key + 2000;
                 var val2 = sampleRepository.GetOrCreate(ref modifiedKey);
-                Assert.AreSame(val1, val2);
+                Assert.That(val2, Is.SameAs(val1));
             });
         }
 
@@ -179,8 +179,8 @@ public void ReplaceNonExistingKeyInRepository()
             sampleRepository.Replace(ref key2, ref key3);
             var all = sampleRepository.ToList();
 
-            Assert.AreEqual(1, all.Count);
-            Assert.AreSame(entity, all.First());
+            Assert.That(all, Has.Count.EqualTo(1));
+            Assert.That(all.First(), Is.SameAs(entity));
         }
 
         private SampleRepository CreateSampleRepository()

ClosedXML.Tests/Excel/CalcEngine/CalcEngineCellEnumerationTests.cs

@@ -15,7 +15,7 @@ public void CanEnumerateCellsOverEmptySheet()
             var cell = sheet1.FirstCell();
             cell.FormulaA1 = "=SUMIFS(Sheet2!B:B, Sheet2!C:C, 1)";
 
-            Assert.AreEqual(0, cell.Value);
+            Assert.That(cell.Value, Is.EqualTo(0));
         }
     }
 }

ClosedXML.Tests/Excel/CalcEngine/CalcEngineExceptionTests.cs

@@ -51,7 +51,7 @@ public void NestedNameNotRecognizedException()
             ws.Cell("A1").SetFormulaA1("=XXX");
             ws.Cell("A2").SetFormulaA1(@"=IFERROR(A1, ""Success"")");
 
-            Assert.AreEqual("Success", ws.Cell("A2").Value);
+            Assert.That(ws.Cell("A2").Value, Is.EqualTo("Success"));
         }
     }
 }