Skip to content

Commit 730bb1f

Browse files
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 <102549341+costellobot@users.noreply.github.com> * 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 <102549341+costellobot@users.noreply.github.com> * Fix build Add compatibility suppression for netstandard2.0. * Fix ambiguous methods Remove span to use params span overloads. --------- Signed-off-by: costellobot <102549341+costellobot@users.noreply.github.com> Co-authored-by: martincostello <martin@martincostello.com>
1 parent 81d3fae commit 730bb1f

File tree

4 files changed

+24
-7
lines changed

4 files changed

+24
-7
lines changed

Directory.Packages.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<ItemGroup>
77
<PackageVersion Include="coverlet.msbuild" Version="6.0.2" />
88
<PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
9-
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0-preview.3.24172.13" />
9+
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0-preview.4.24267.6" />
1010
<PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />
1111
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
1212
<PackageVersion Include="NSubstitute" Version="5.1.0" />

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "9.0.100-preview.3.24204.13",
3+
"version": "9.0.100-preview.4.24267.66",
44
"allowPrerelease": false,
55
"rollForward": "latestMajor"
66
}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
3+
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
4+
<Suppression>
5+
<DiagnosticId>CP0021</DiagnosticId>
6+
<Target>M:MartinCostello.Logging.XUnit.XUnitLogger.BeginScope``1(``0)``0:notnull</Target>
7+
<Left>lib/netstandard2.0/MartinCostello.Logging.XUnit.dll</Left>
8+
<Right>lib/netstandard2.0/MartinCostello.Logging.XUnit.dll</Right>
9+
<IsBaselineSuppression>true</IsBaselineSuppression>
10+
</Suppression>
11+
</Suppressions>

tests/Logging.XUnit.Tests/XUnitLoggerTests.cs

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,8 @@ public static void XUnitLogger_Log_Logs_Message_If_Only_Exception()
287287

288288
string expected = string.Join(
289289
Environment.NewLine,
290-
["[2018-08-19 16:12:16Z] info: MyName[2]", "System.InvalidOperationException: Invalid"]);
290+
"[2018-08-19 16:12:16Z] info: MyName[2]",
291+
"System.InvalidOperationException: Invalid");
291292

292293
// Act
293294
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()
317318

318319
string expected = string.Join(
319320
Environment.NewLine,
320-
["[2018-08-19 16:12:16Z] warn: MyName[3]", " Message|False|True", "System.InvalidOperationException: Invalid"]);
321+
"[2018-08-19 16:12:16Z] warn: MyName[3]",
322+
" Message|False|True",
323+
"System.InvalidOperationException: Invalid");
321324

322325
// Act
323326
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()
345348

346349
string expected = string.Join(
347350
Environment.NewLine,
348-
["[2018-08-19 16:12:16Z] fail: MyName[4]", " Message|False|False"]);
351+
"[2018-08-19 16:12:16Z] fail: MyName[4]",
352+
" Message|False|False");
349353

350354
// Act
351355
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
379383

380384
string expected = string.Join(
381385
Environment.NewLine,
382-
[$"[2018-08-19 16:12:16Z] {shortLevel}: Your Name[85]", " Message|True|False"]);
386+
$"[2018-08-19 16:12:16Z] {shortLevel}: Your Name[85]",
387+
" Message|True|False");
383388

384389
// Act
385390
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
429434

430435
string expected = string.Join(
431436
Environment.NewLine,
432-
["[2018-08-19 16:12:16Z] info: MyName[0]", " Message|False|False"]);
437+
"[2018-08-19 16:12:16Z] info: MyName[0]",
438+
" Message|False|False");
433439

434440
// Act
435441
logger.Log<string?>(LogLevel.Information, 0, null, null, Formatter);

0 commit comments

Comments
 (0)