update net8

DCArea · Nov 23, 2023 · 292c02a · 292c02a
1 parent 2399d4e
commit 292c02a
Show file tree

Hide file tree

Showing 15 changed files with 54 additions and 47 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -10,7 +10,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: "7.0.401"
+          dotnet-version: "8.0.100"
       - name: Restore dependencies
         run: dotnet restore
       - name: Build
@@ -29,7 +29,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: "7.0.401"
+          dotnet-version: "8.0.100"
       - name: Restore dependencies
         run: dotnet restore
       - name: Restore tools

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -12,7 +12,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: "7.0.401"
+          dotnet-version: "8.0.100"
       - name: Restore dependencies
         run: dotnet restore
       - name: Restore tools

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -4,6 +4,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <VersionPrefix>0.1.0</VersionPrefix>
   </PropertyGroup>
 

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -1,25 +1,27 @@
 <Project>
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <MExVersion>[6.0.0,%29</MExVersion>
+    <OtelVersion>[1.5.1,%29</OtelVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="MediatR" Version="12.1.1" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="[6.0.0,)" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[6.0.0,)" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="[6.0.0,)" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="[6.0.0,)" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="[6.0.0,)" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="[6.0.0,)" />
-    <PackageVersion Include="Microsoft.Extensions.Options" Version="[6.0.0,)" />
-    <PackageVersion Include="OpenTelemetry" Version="1.5.1" />
-    <PackageVersion Include="OpenTelemetry.Exporter.InMemory" Version="1.5.1" />
-    <PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.5.1" />
-    <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.5.1" />
-    <PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="7.0.2" />
-    <PackageVersion Include="System.Threading.Channels" Version="7.0.0" />
-    <PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
-    <PackageVersion Include="System.Threading.ThreadPool" Version="4.3.0" />
-    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
+    <PackageVersion Include="MediatR" Version="[12.2.0,)" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="$(MExVersion)" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(MExVersion)" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="$(MExVersion)" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="$(MExVersion)" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="$(MExVersion)" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MExVersion)" />
+    <PackageVersion Include="Microsoft.Extensions.Options" Version="$(MExVersion)" />
+    <PackageVersion Include="OpenTelemetry" Version="$(OtelVersion)" />
+    <PackageVersion Include="OpenTelemetry.Exporter.InMemory" Version="$(OtelVersion)" />
+    <PackageVersion Include="OpenTelemetry.Exporter.Console" Version="$(OtelVersion)" />
+    <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="$(OtelVersion)" />
+    <PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="[7.0.2,)" />
+    <PackageVersion Include="System.Threading.Channels" Version="[7.0.0,)" />
+    <PackageVersion Include="System.Threading.Tasks.Extensions" Version="[4.5.4,)" />
+    <PackageVersion Include="System.Threading.ThreadPool" Version="[4.3.0,)" />
+    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
   </ItemGroup>
   <ItemGroup>
     <PackageVersion Include="FakeItEasy" Version="7.4.0" />

diff --git a/global.json b/global.json
diff --git a/src/DCA.Extensions.BackgroundTask.MediatR/DCA.Extensions.BackgroundTask.MediatR.csproj b/src/DCA.Extensions.BackgroundTask.MediatR/DCA.Extensions.BackgroundTask.MediatR.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
     <PackageReadmeFile>readme.md</PackageReadmeFile>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/DCA.Extensions.BackgroundTask/AssemblyInfo.cs b/src/DCA.Extensions.BackgroundTask/AssemblyInfo.cs
@@ -1,3 +1,4 @@
+#if !NET7_0_OR_GREATER
 namespace System.Runtime.CompilerServices
 {
 	public class RequiredMemberAttribute : Attribute { }
@@ -14,3 +15,4 @@ public sealed class SetsRequiredMembersAttribute : Attribute
 	{
 	}
 }
+#endif
diff --git a/src/DCA.Extensions.BackgroundTask/BackgroundTaskChannel.cs b/src/DCA.Extensions.BackgroundTask/BackgroundTaskChannel.cs
@@ -11,7 +11,7 @@ namespace DCA.Extensions.BackgroundTask;
 public sealed class BackgroundTaskChannel
 {
     private readonly Channel<IBackgroundTask> _channel;
-    private readonly List<BackgroundTaskChannelReader> _readers = new();
+    private readonly List<BackgroundTaskChannelReader> _readers = [];
     private readonly CancellationTokenSource _stopTokenSource = new();
     private readonly ILogger<BackgroundTaskChannel> _logger;
     private readonly BackgroundTaskChannelOptions _options;

diff --git a/src/DCA.Extensions.BackgroundTask/BackgroundTaskOptions.cs b/src/DCA.Extensions.BackgroundTask/BackgroundTaskOptions.cs
@@ -5,10 +5,10 @@ public class BackgroundTaskOptions
     /// <summary>
     /// Configure channels
     /// </summary>
-    public List<BackgroundTaskChannelOptions> Channels { get; set; } = new()
-    {
+    public List<BackgroundTaskChannelOptions> Channels { get; set; } =
+    [
         new (){ Key = Constants.DefaultChannelKey}
-    };
+    ];
 }
 
 

diff --git a/src/DCA.Extensions.BackgroundTask/CompatibilitySuppressions.xml b/src/DCA.Extensions.BackgroundTask/CompatibilitySuppressions.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
+<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:System.Diagnostics.CodeAnalysis.SetsRequiredMembersAttribute</Target>
+    <Left>lib/net6.0/DCA.Extensions.BackgroundTask.dll</Left>
+    <Right>lib/net7.0/DCA.Extensions.BackgroundTask.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:System.Runtime.CompilerServices.CompilerFeatureRequiredAttribute</Target>
+    <Left>lib/net6.0/DCA.Extensions.BackgroundTask.dll</Left>
+    <Right>lib/net7.0/DCA.Extensions.BackgroundTask.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:System.Runtime.CompilerServices.RequiredMemberAttribute</Target>
+    <Left>lib/net6.0/DCA.Extensions.BackgroundTask.dll</Left>
+    <Right>lib/net7.0/DCA.Extensions.BackgroundTask.dll</Right>
+  </Suppression>
+</Suppressions>
diff --git a/src/DCA.Extensions.BackgroundTask/DCA.Extensions.BackgroundTask.csproj b/src/DCA.Extensions.BackgroundTask/DCA.Extensions.BackgroundTask.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
     <PackageReadmeFile>readme.md</PackageReadmeFile>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -16,15 +16,15 @@
     <SourceLinkOriginUrl>https://github.com/DCArea/DotNetToolkit</SourceLinkOriginUrl>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(IsPackable)'=='true' and '$(SourceLinkCreate)'=='true'">
+  <PropertyGroup Condition="'$(IsPackable)'=='true'">
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <!-- <DebugType>embedded</DebugType> -->
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <EnablePackageValidation>true</EnablePackageValidation>
   </PropertyGroup>
-  <ItemGroup Condition="'$(IsPackable)'=='true' and '$(SourceLinkCreate)'=='true'">
+  <ItemGroup Condition="'$(IsPackable)'=='true'">
     <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All"/>
   </ItemGroup>
 

diff --git a/test/DCA.Extensions.BackgroundTask.MediatR.Test/DispatchTests.cs b/test/DCA.Extensions.BackgroundTask.MediatR.Test/DispatchTests.cs
@@ -33,7 +33,7 @@ public record MyTask(string Id) : IRequest
 {
     public class MyTaskHandler : IRequestHandler<MyTask>
     {
-        private static readonly ConcurrentBag<string> _processedTaskIds = new();
+        private static readonly ConcurrentBag<string> _processedTaskIds = [];
 
         public static ConcurrentBag<string> ProcessedTaskIds => _processedTaskIds;
 

diff --git a/test/Directory.Build.props b/test/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
     <IsTestProject>true</IsTestProject>
     <IsPackable>false</IsPackable>
   </PropertyGroup>