Merge pull request #10 from pfpack/feature/async-pipeline-options

Allow net6.0 and net7.0
pfpack · Aug 24, 2023 · 62e523d · 62e523d
2 parents 313e039 + 85838f7
commit 62e523d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -17,12 +17,13 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Setup .NET
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 6.0.x
-        include-prerelease: false
+        dotnet-version: |
+            6.0.x
+            7.0.x
 
     # Create Local NuGet Source
 
@@ -47,4 +48,8 @@ jobs:
 
     - name: Push Packages
       if: ${{ github.event_name == 'release' }}
-      run: dotnet nuget push "../../../nuget/*.nupkg" -s https://api.nuget.org/v3/index.json -k ${{ secrets.NuGetSourcePassword }} --skip-duplicate
+      run: >
+        dotnet nuget push "../../../nuget/*.nupkg"
+        -s https://api.nuget.org/v3/index.json
+        -k ${{ secrets.NuGetSourcePassword }}
+        --skip-duplicate
diff --git a/src/core-asyncpipeline/AsyncPipeline/AsyncPipeline.T/AsyncPipeline.T.cs b/src/core-asyncpipeline/AsyncPipeline/AsyncPipeline.T/AsyncPipeline.T.cs
@@ -31,15 +31,15 @@ private AsyncPipeline(int _)
     {
         isStopped = true;
         valueTask = default;
-        cancellationToken = default;
         options = null;
+        cancellationToken = default;
     }
 
     public AsyncPipelineOptions Options
         =>
-        options ?? InnerEmptyOptions.Value;
+        options ?? InnerDefaultOptions.Value;
 
-    private static class InnerEmptyOptions
+    private static class InnerDefaultOptions
     {
         internal static readonly AsyncPipelineOptions Value = new();
     }

diff --git a/src/core-asyncpipeline/AsyncPipeline/AsyncPipeline.csproj b/src/core-asyncpipeline/AsyncPipeline/AsyncPipeline.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
     <ImplicitUsings>disable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <InvariantGlobalization>true</InvariantGlobalization>
@@ -13,7 +13,7 @@
     <RepositoryUrl>https://github.com/pfpack/early-core-asyncpipeline</RepositoryUrl>
     <Company>pfpack</Company>
     <Authors>Andrei Sergeev, Pavel Moskovoy</Authors>
-    <Copyright>Copyright © 2020-2022 Andrei Sergeev, Pavel Moskovoy</Copyright>
+    <Copyright>Copyright © 2020-2023 Andrei Sergeev, Pavel Moskovoy</Copyright>
     <Description>EarlyFuncPack Core.AsyncPipeline is a core library for .NET consisting of asynchronous pipeline.</Description>
     <RootNamespace>System</RootNamespace>
     <AssemblyName>EarlyFuncPack.Core.AsyncPipeline</AssemblyName>
@@ -32,7 +32,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="PrimeFuncPack.Core.Result" Version="2.0.1" />
+    <PackageReference Include="PrimeFuncPack.Core.Result" Version="2.0.2" />
   </ItemGroup>
 
 </Project>