Target .net 8. Remove jetbrains.annotations dependency

dombrovsky · Mar 12, 2024 · 44d482e · 44d482e
1 parent b58f150
commit 44d482e
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 9 deletions.
diff --git a/....DependencyInjection.Tests/TaskFlow.Extensions.Microsoft.DependencyInjection.Tests.csproj b/....DependencyInjection.Tests/TaskFlow.Extensions.Microsoft.DependencyInjection.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>

diff --git a/...ns.Microsoft.DependencyInjection/TaskFlow.Extensions.Microsoft.DependencyInjection.csproj b/...ns.Microsoft.DependencyInjection/TaskFlow.Extensions.Microsoft.DependencyInjection.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<LangVersion>10</LangVersion>
-		<TargetFrameworks>netstandard2.0;net6.0;net7.0</TargetFrameworks>
+		<TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
 		<Nullable>enable</Nullable>
 		<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
 		<Deterministic>true</Deterministic>
@@ -10,7 +10,7 @@
 
 	<PropertyGroup>
 		<PackageId>TaskFlow.Microsoft.Extensions.DependencyInjection</PackageId>
-		<Version>1.0.0-rc2</Version>
+		<Version>1.0.0-rc3</Version>
 		<Authors>Volodymyr Dombrovskyi</Authors>
 		<Copyright>Copyright (c) 2023 Volodymyr Dombrovskyi</Copyright>
 		<PackageTags>TODO</PackageTags>
@@ -51,8 +51,8 @@
 	</ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="2022.3.1" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
+    <PackageReference Include="JetBrains.Annotations" Version="2022.3.1" PrivateAssets="All" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
 	</ItemGroup>
 

diff --git a/TaskFlow.Tests/TaskFlow.Tests.csproj b/TaskFlow.Tests/TaskFlow.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 

diff --git a/TaskFlow/TaskFlow.csproj b/TaskFlow/TaskFlow.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<LangVersion>10</LangVersion>
-		<TargetFrameworks>netstandard2.0;net6.0;net7.0</TargetFrameworks>
+		<TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
 		<Nullable>enable</Nullable>
 		<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
 		<Deterministic>true</Deterministic>
@@ -10,7 +10,7 @@
 
 	<PropertyGroup>
 		<PackageId>TaskFlow</PackageId>
-		<Version>1.0.0-rc2</Version>
+		<Version>1.0.0-rc3</Version>
 		<Authors>Volodymyr Dombrovskyi</Authors>
 		<Copyright>Copyright (c) 2023 Volodymyr Dombrovskyi</Copyright>
 		<PackageTags>TODO</PackageTags>
@@ -29,7 +29,7 @@
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
-  		<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
 	</PropertyGroup>
 
 	<PropertyGroup>
@@ -60,7 +60,7 @@
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       </PackageReference>
-      <PackageReference Include="JetBrains.Annotations" Version="2022.3.1" />
+      <PackageReference Include="JetBrains.Annotations" Version="2022.3.1" PrivateAssets="All" />
       <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
 	</ItemGroup>
 

diff --git a/TaskFlow/TaskFlowBase.cs b/TaskFlow/TaskFlowBase.cs
@@ -85,7 +85,11 @@ protected virtual async ValueTask DisposeAsyncCore()
 
             await initializationTask.ConfigureAwait(false);
 
+#if NET8_0_OR_GREATER
+            await _disposeCancellationTokenSource.CancelAsync().ConfigureAwait(false);
+#else
             _disposeCancellationTokenSource.Cancel();
+#endif
 
             try
             {
@@ -126,10 +130,14 @@ protected void Starting()
 
         protected void CheckDisposed()
         {
+#if NET7_0_OR_GREATER
+            ObjectDisposedException.ThrowIf(_state is TaskFlowState.Disposing or TaskFlowState.Disposed, nameof(TaskFlow));
+#else
             if (_state is TaskFlowState.Disposing or TaskFlowState.Disposed)
             {
                 throw new ObjectDisposedException(nameof(TaskFlow));
             }
+#endif
         }
 
         protected abstract Task GetInitializationTask();