Skip to content

Commit

Permalink
Update .NET SDK to 9.0.100-preview.6.24328.19 (#691)
Browse files Browse the repository at this point in the history
* Update .NET SDK

Update .NET SDK to version 9.0.100-preview.6.24328.19.

---
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.5.24306.11 to 9.0.0-preview.6.24328.4

Bumps Microsoft.AspNetCore.Mvc.Testing from 9.0.0-preview.5.24306.11 to 9.0.0-preview.6.24328.4.

---
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

- Set `NuGetAuditMode=direct`.
- Move CA1848 suppression to ruleset file.
- Suppress IDE0130.

---------

Signed-off-by: costellobot <[email protected]>
Co-authored-by: martincostello <[email protected]>
  • Loading branch information
costellobot and martincostello authored Jul 10, 2024
1 parent c4203d4 commit 090ee2a
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<LangVersion>preview</LangVersion>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<NeutralLanguage>en-US</NeutralLanguage>
<NoWarn>$(NoWarn);CA1848</NoWarn>
<NuGetAuditMode>direct</NuGetAuditMode>
<Nullable>enable</Nullable>
<PackageIcon></PackageIcon>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
Expand Down
2 changes: 1 addition & 1 deletion Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -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.5.24306.11" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0-preview.6.24328.4" />
<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" />
Expand Down
1 change: 1 addition & 0 deletions Logging.XUnit.ruleset
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<Rules AnalyzerId="Microsoft.Analyzers.ManagedCodeAnalysis" RuleNamespace="Microsoft.Rules.Managed">
<Rule Id="CA1303" Action="None" />
<Rule Id="CA1515" Action="None" />
<Rule Id="CA1848" Action="None" />
</Rules>
<Rules AnalyzerId="StyleCop.Analyzers" RuleNamespace="StyleCop.Analyzers">
<Rule Id="AD0001" Action="None" />
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "9.0.100-preview.5.24307.3",
"version": "9.0.100-preview.6.24328.19",
"allowPrerelease": false,
"rollForward": "latestMajor"
}
Expand Down
1 change: 1 addition & 0 deletions src/Logging.XUnit/IMessageSinkExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using System.ComponentModel;
using Microsoft.Extensions.Logging;

#pragma warning disable IDE0130
namespace Xunit.Abstractions;

/// <summary>
Expand Down
1 change: 1 addition & 0 deletions src/Logging.XUnit/ITestOutputHelperExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using System.ComponentModel;
using Microsoft.Extensions.Logging;

#pragma warning disable IDE0130
namespace Xunit.Abstractions;

/// <summary>
Expand Down
5 changes: 3 additions & 2 deletions src/Logging.XUnit/StringSyntaxAttribute.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@

#if NETSTANDARD

namespace System.Diagnostics.CodeAnalysis;

#pragma warning disable IDE0130
#pragma warning disable SA1600

namespace System.Diagnostics.CodeAnalysis;

[AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Field | AttributeTargets.Property, AllowMultiple = false, Inherited = false)]
[ExcludeFromCodeCoverage]
internal sealed class StringSyntaxAttribute(string syntax, params object?[] arguments) : Attribute
Expand Down

0 comments on commit 090ee2a

Please sign in to comment.