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

Jump to bottom

Allow net6.0 and net7.0 #10

Merged
merged 2 commits into from
Aug 24, 2023
Merged

Allow net6.0 and net7.0 #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aaed891
Allow net6.0 and net7.0
Aug 24, 2023
85838f7
Fix github workflow
Aug 24, 2023
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
15 changes: 10 additions & 5 deletions .github/workflows/dotnet.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
6 changes: 3 additions & 3 deletions src/core-asyncpipeline/AsyncPipeline/AsyncPipeline.T/AsyncPipeline.T.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down
6 changes: 3 additions & 3 deletions src/core-asyncpipeline/AsyncPipeline/AsyncPipeline.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -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>
Expand All @@ -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>