Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update SDK to 2024.1 #105

Merged
merged 4 commits into from
Jul 8, 2024
Merged

Update SDK to 2024.1 #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8c0b273
Update SdkVersion in Directory.Build.props
olsh Jan 19, 2024
39e51cd
Update SDK version and target framework
olsh Apr 13, 2024
a3993e0
Update SdkVersion to 2024.1.4
olsh Jul 8, 2024
90e4a79
Update MicrosoftLoggingPackage version and add TestNet60 attribute
olsh Jul 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Directory.Build.props
View file
Open in desktop
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
10 changes: 5 additions & 5 deletions build/_build.csproj
View file
Open in desktop
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 @@ -11,13 +11,13 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Nuke.Common" Version="7.0.6" />
<PackageReference Include="Nuke.Common" Version="8.0.0" />
</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
View file
Open in desktop

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

5 changes: 4 additions & 1 deletion test/src/Analyzer/ContextualLoggerConstructorAnalyzerTests.cs
View file
Open in desktop
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
View file
Open in desktop
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