Skip to content

Commit 73d4f0d

Browse files
CZEMacLeodCZEMacLeod
committed
Add net8.0 target and update packages
1 parent 8e67f8e commit 73d4f0d

8 files changed

Lines changed: 36 additions & 37 deletions

File tree

‎C3D.Extensions.Logging.sln‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{B41F4209
99
ProjectSection(SolutionItems) = preProject
1010
Directory.Build.props = Directory.Build.props
1111
Directory.Build.targets = Directory.Build.targets
12+
global.json = global.json
1213
build\Test.snk = build\Test.snk
1314
EndProjectSection
1415
EndProject

‎Directory.Build.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Microsoft.Build.CopyOnWrite" Version="1.0.302" PrivateAssets="All" />
9-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
8+
<PackageReference Include="Microsoft.Build.CopyOnWrite" Version="1.0.315" PrivateAssets="All" />
9+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
1010
</ItemGroup>
1111
</Project>

‎build/azure-pipelines.yml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,20 @@ steps:
113113
useGlobalJson: true
114114
installationPath: $(Agent.ToolsDirectory)/dotnet
115115

116+
- task: UseDotNet@2
117+
displayName: 'Use .NET Runtime 6.0.x'
118+
inputs:
119+
packageType: 'runtime'
120+
version: "6.0.x"
121+
installationPath: $(Agent.ToolsDirectory)/dotnet
122+
123+
- task: UseDotNet@2
124+
displayName: 'Use .NET Runtime 7.0.x'
125+
inputs:
126+
packageType: 'runtime'
127+
version: "7.0.x"
128+
installationPath: $(Agent.ToolsDirectory)/dotnet
129+
116130
# Install the code signing tool
117131
- task: DotNetCoreCLI@2
118132
inputs:

‎global.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
{
22
"sdk": {
3-
"version": "6.0.100",
3+
"version": "8.0.400",
44
"rollForward": "latestMajor",
55
"allowPrerelease": true
66
},
77
"msbuild-sdks": {
8-
"Microsoft.Build.NoTargets": "2.0.1"
98
}
109
}

‎src/C3D/Extensions/Logging/Xunit/C3D.Extensions.Logging.Xunit.csproj‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net462;netstandard2.0;netstandard2.1;net6.0;net7.0</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net462;netstandard2.0;netstandard2.1;net7.0;net8.0</TargetFrameworks>
55
<Nullable>enable</Nullable>
66
<LangVersion>10.0</LangVersion>
77
<ImplicitUsings>enable</ImplicitUsings>
@@ -20,16 +20,13 @@
2020
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
2121
</PackageReference>
2222
<PackageReference Include="xunit.abstractions" Version="2.0.3" />
23-
<PackageReference Include="xunit.extensibility.execution" Version="2.5.0" />
23+
<PackageReference Include="xunit.extensibility.execution" Version="2.9.0" />
2424
</ItemGroup>
2525
<ItemGroup>
26-
<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="6.0.0" />
27-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" />
28-
<PackageReference Include="System.Collections.Immutable" Version="6.0.0" />
29-
</ItemGroup>
30-
31-
<ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
32-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
26+
<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="8.0.0" />
27+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
28+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
29+
<PackageReference Include="System.Collections.Immutable" Version="8.0.0" />
3330
</ItemGroup>
3431

3532
<ItemGroup>

‎src/C3D/Extensions/Logging/Xunit/Loggers/XunitLoggerBase.cs‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -79,21 +79,9 @@ protected string BuildMessageText<TState>(LogLevel logLevel, TState state, Excep
7979
return message;
8080
}
8181

82-
#region "Scope"
83-
#if NET7_0_OR_GREATER
84-
public virtual IDisposable? BeginScope<TState>(TState state) where TState : notnull => null;
85-
#else
86-
private class NullScope : IDisposable
87-
{
88-
public void Dispose()
89-
{
90-
}
91-
}
92-
public virtual IDisposable BeginScope<TState>(TState state) => new NullScope();
93-
#endif
94-
#endregion
82+
public virtual IDisposable? BeginScope<TState>(TState state)
83+
where TState : notnull => Microsoft.Extensions.Logging.Abstractions.NullLogger.Instance.BeginScope(state);
9584

9685
public virtual bool IsEnabled(LogLevel logLevel) => logLevel >= options().MinLevel;
9786
public abstract void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception? exception, Func<TState, Exception?, string> formatter);
98-
9987
}

‎test/C3D/Extensions/Logging/Xunit/Test/C3D.Extensions.Logging.Xunit.Tests.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;net48;net7.0</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net48;net7.0;net8.0</TargetFrameworks>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<LangVersion>10.0</LangVersion>
@@ -18,16 +18,16 @@
1818
</ItemGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
22-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
21+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
22+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
23+
<PackageReference Include="System.Text.Json" Version="8.0.4" />
2324

24-
<PackageReference Include="System.Collections.Immutable" Version="6.0.0" />
25+
<PackageReference Include="System.Collections.Immutable" Version="8.0.0" />
2526

26-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="6.0.0" />
27+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
2728
</ItemGroup>
2829

2930
<ItemGroup>
3031
<ProjectReference Include="$(PUTDirectory)C3D.Extensions.Logging.Xunit.csproj" />
3132
</ItemGroup>
32-
3333
</Project>

‎test/Directory.Build.Targets‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
33

44
<ItemGroup Label="Testing" Condition="'$(IsTestProject)'=='true'">
5-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
6-
<PackageReference Include="xunit" Version="2.5.0" />
7-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
5+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
6+
<PackageReference Include="xunit" Version="2.9.0" />
7+
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
88
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
99
<PrivateAssets>all</PrivateAssets>
1010
</PackageReference>
11-
<PackageReference Include="coverlet.collector" Version="6.0.0">
11+
<PackageReference Include="coverlet.collector" Version="6.0.2">
1212
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1313
<PrivateAssets>all</PrivateAssets>
1414
</PackageReference>

0 commit comments

Comments
 (0)