Skip to content

Commit

Permalink
Update SDK to 2024.1 (#105)
Browse files Browse the repository at this point in the history
* Update SdkVersion in Directory.Build.props

The SdkVersion in Directory.Build.props has been updated from version 2023.3.2 to 2024.1.0-eap01. This update is in line with the latest SDK changes and aims to maintain compatibility.

* Update SDK version and target framework

The SDK version has been updated from the Early Access Preview version to the stable version. The .NET target framework version in the _build.csproj file has been updated to 8.0. Also, the versions of the Nuke.Common, dotnet-sonarscanner, NuGet.CommandLine, and NUnit.ConsoleRunner packages have been updated. Lastly, the '.gitignore' file was updated to ignore GitHub Copilot chat sessions.

* Update SdkVersion to 2024.1.4

The SdkVersion in the `Directory.Build.props` file has been updated from 2024.1.0 to 2024.1.4. This version bump ensures the project uses the latest features and bug fixes from the SDK.

* Update MicrosoftLoggingPackage version and add TestNet60 attribute

The version of the MicrosoftLoggingPackage constant in the NugetPackages.cs file was updated from 1.0.0 to 6.0.0. Additionally, the TestNet60 attribute was added to the ContextualLoggerConstructorAnalyzerTests class in the ContextualLoggerConstructorAnalyzerTests.cs file.
  • Loading branch information
olsh authored Jul 8, 2024
1 parent c28b47b commit f5a6297
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<SdkVersion>2023.3.2</SdkVersion>
<SdkVersion>2024.1.4</SdkVersion>
</PropertyGroup>
<!-- https://jetbrains.slack.com/archives/CBZ36NH7C/p1628090127002200 -->
<PropertyGroup>
Expand Down
8 changes: 4 additions & 4 deletions build/_build.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace></RootNamespace>
<NoWarn>CS0649;CS0169</NoWarn>
<NukeRootDirectory>..</NukeRootDirectory>
Expand All @@ -15,9 +15,9 @@
</ItemGroup>

<ItemGroup>
<PackageDownload Include="dotnet-sonarscanner" Version="[5.9.1]" />
<PackageDownload Include="NuGet.CommandLine" Version="[6.3.1]" />
<PackageDownload Include="NUnit.ConsoleRunner" Version="[3.16.0]" />
<PackageDownload Include="dotnet-sonarscanner" Version="[6.2.0]" />
<PackageDownload Include="NuGet.CommandLine" Version="[6.9.1]" />
<PackageDownload Include="NUnit.ConsoleRunner" Version="[3.17.0]" />
<PackageDownload Include="dotnet-cleanup" Version="[0.6.1]" />
</ItemGroup>

Expand Down
2 changes: 2 additions & 0 deletions src/.idea/.idea.ReSharper.Structured.Logging/.idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
using NUnit.Framework;
using JetBrains.ReSharper.TestFramework;

using NUnit.Framework;

namespace ReSharper.Structured.Logging.Tests.Analyzer
{
[TestNet60]
public class ContextualLoggerConstructorAnalyzerTests : MessageTemplateAnalyzerTestBase
{
protected override string SubPath => "ContextualLoggerConstructor";
Expand Down
2 changes: 1 addition & 1 deletion test/src/Constants/NugetPackages.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ internal static class NugetPackages
{
public const string SerilogNugetPackage = "Serilog/2.7.1";

public const string MicrosoftLoggingPackage = "Microsoft.Extensions.Logging/1.0.0";
public const string MicrosoftLoggingPackage = "Microsoft.Extensions.Logging/6.0.0";

public const string NlogLoggingPackage = "NLog/4.5.11";

Expand Down

0 comments on commit f5a6297

Please sign in to comment.