Update .NET SDK to 9.0.100-preview.4.24267.66 (#648)

* Update .NET SDK Update .NET SDK to version 9.0.100-preview.4.24267.66. --- updated-dependencies: - dependency-name: Microsoft.NET.Sdk dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: costellobot <[email protected]> * Bump Microsoft.AspNetCore.Mvc.Testing from 9.0.0-preview.3.24172.13 to 9.0.0-preview.4.24267.6 Bumps Microsoft.AspNetCore.Mvc.Testing from 9.0.0-preview.3.24172.13 to 9.0.0-preview.4.24267.6. --- updated-dependencies: - dependency-name: Microsoft.AspNetCore.Mvc.Testing dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: costellobot <[email protected]> * Fix build Add compatibility suppression for netstandard2.0. * Fix ambiguous methods Remove span to use params span overloads. --------- Signed-off-by: costellobot <[email protected]> Co-authored-by: martincostello <[email protected]>
martincostello · Jun 1, 2024 · 4b0b252 · 4b0b252
1 parent a9fbfd7
commit 4b0b252
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 7 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -6,7 +6,7 @@
   <ItemGroup>
     <PackageVersion Include="coverlet.msbuild" Version="6.0.2" />
     <PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
-    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0-preview.3.24172.13" />
+    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0-preview.4.24267.6" />
     <PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageVersion Include="NSubstitute" Version="5.1.0" />

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "9.0.100-preview.3.24204.13",
+    "version": "9.0.100-preview.4.24267.66",
     "allowPrerelease": false,
     "rollForward": "latestMajor"
   }

diff --git a/src/Logging.XUnit/CompatibilitySuppressions.xml b/src/Logging.XUnit/CompatibilitySuppressions.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
+<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Suppression>
+    <DiagnosticId>CP0021</DiagnosticId>
+    <Target>M:MartinCostello.Logging.XUnit.XUnitLogger.BeginScope``1(``0)``0:notnull</Target>
+    <Left>lib/netstandard2.0/MartinCostello.Logging.XUnit.dll</Left>
+    <Right>lib/netstandard2.0/MartinCostello.Logging.XUnit.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
+</Suppressions>
diff --git a/tests/Logging.XUnit.Tests/XUnitLoggerTests.cs b/tests/Logging.XUnit.Tests/XUnitLoggerTests.cs
@@ -287,7 +287,8 @@ public static void XUnitLogger_Log_Logs_Message_If_Only_Exception()
 
         string expected = string.Join(
             Environment.NewLine,
-            ["[2018-08-19 16:12:16Z] info: MyName[2]", "System.InvalidOperationException: Invalid"]);
+            "[2018-08-19 16:12:16Z] info: MyName[2]",
+            "System.InvalidOperationException: Invalid");
 
         // Act
         logger.Log(LogLevel.Information, new EventId(2), "state", exception, FormatterNull);
@@ -317,7 +318,9 @@ public static void XUnitLogger_Log_Logs_Message_If_Message_And_Exception()
 
         string expected = string.Join(
             Environment.NewLine,
-            ["[2018-08-19 16:12:16Z] warn: MyName[3]", "      Message|False|True", "System.InvalidOperationException: Invalid"]);
+            "[2018-08-19 16:12:16Z] warn: MyName[3]",
+            "      Message|False|True",
+            "System.InvalidOperationException: Invalid");
 
         // Act
         logger.Log<string?>(LogLevel.Warning, new EventId(3), null, exception, Formatter);
@@ -345,7 +348,8 @@ public static void XUnitLogger_Log_Logs_Message_If_Message_And_No_Exception()
 
         string expected = string.Join(
             Environment.NewLine,
-            ["[2018-08-19 16:12:16Z] fail: MyName[4]", "      Message|False|False"]);
+            "[2018-08-19 16:12:16Z] fail: MyName[4]",
+            "      Message|False|False");
 
         // Act
         logger.Log<string?>(LogLevel.Error, new EventId(4), null, null, Formatter);
@@ -379,7 +383,8 @@ public static void XUnitLogger_Log_Logs_Messages(LogLevel logLevel, string short
 
         string expected = string.Join(
             Environment.NewLine,
-            [$"[2018-08-19 16:12:16Z] {shortLevel}: Your Name[85]", "      Message|True|False"]);
+            $"[2018-08-19 16:12:16Z] {shortLevel}: Your Name[85]",
+            "      Message|True|False");
 
         // Act
         logger.Log(logLevel, new EventId(85), "Martin", null, Formatter);
@@ -429,7 +434,8 @@ public static void XUnitLogger_Log_Logs_Message_If_Scopes_Included_But_There_Are
 
         string expected = string.Join(
             Environment.NewLine,
-            ["[2018-08-19 16:12:16Z] info: MyName[0]", "      Message|False|False"]);
+            "[2018-08-19 16:12:16Z] info: MyName[0]",
+            "      Message|False|False");
 
         // Act
         logger.Log<string?>(LogLevel.Information, 0, null, null, Formatter);