Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
31 changes: 13 additions & 18 deletions .github/workflows/dotnetcore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,32 +11,27 @@ jobs:
fail-fast: false
matrix:
os: [windows-latest, ubuntu-latest]
framework: ['netcoreapp3.1', 'net50', 'net60', 'net80']
framework: ['net60', 'net80', 'net90']
steps:

- name: Check out code onto host
uses: actions/checkout@v4

- name: Setup .Net 3.1
uses: actions/setup-dotnet@v3
with:
dotnet-version: '3.1.x' # SDK Version to use.

- name: Setup .Net 5.0
uses: actions/setup-dotnet@v3
with:
dotnet-version: '5.0.x' # SDK Version to use.

- name: Setup .Net 6.0
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: '6.0.x' # SDK Version to use.

- name: Setup .Net 8.0
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.x' # SDK Version to use.

- name: Setup .Net 9.0
uses: actions/setup-dotnet@v4
with:
dotnet-version: '9.0.x' # SDK Version to use.

- name: Dotnet info
run: |
dotnet --version
Expand All @@ -63,15 +58,15 @@ jobs:
if: matrix.framework == 'net80'

- name: Upload dotnet test results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: dotnet-results-${{ matrix.os }}-${{ matrix.framework }}
path: TestResults-${{ matrix.os }}-${{ matrix.framework }}
# Use always() to always run this step to publish test results when there are test failures
if: ${{ always() }}

- name: Upload BenchmarkDotNet results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: BenchmarkDotNet-${{ matrix.os }}-${{ matrix.framework }}
path: BenchmarkDotNet.Artifacts
Expand All @@ -85,7 +80,7 @@ jobs:
strategy:
fail-fast: false
matrix:
framework: ['net45', 'net472', 'net48']
framework: ['net472', 'net48']
steps:

- name: Check out code onto host
Expand All @@ -95,7 +90,7 @@ jobs:
uses: microsoft/setup-msbuild@v1.3.1

- name: Setup .Net 8.0
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.x' # SDK Version to use.

Expand All @@ -119,7 +114,7 @@ jobs:
dotnet test --no-restore --configuration Release --verbosity normal --framework=${{ matrix.framework }} --logger trx --results-directory "TestResults-${{ matrix.os }}-${{ matrix.framework }}"

- name: Upload dotnet test results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: dotnet-results-windows-latest-${{ matrix.framework }}
path: TestResults-windows-latest-${{ matrix.framework }}
Expand Down
1 change: 1 addition & 0 deletions CSRakowski.ParallelAsync.sln
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionIt
ProjectSection(SolutionItems) = preProject
.gitignore = .gitignore
Directory.Build.props = Directory.Build.props
global.json = global.json
LICENSE = LICENSE
README.md = README.md
EndProjectSection
Expand Down
4 changes: 2 additions & 2 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project>
<PropertyGroup>
<Authors>Christiaan Rakowski</Authors>
<Copyright>Christiaan Rakowski - 2017-2023</Copyright>
<Version>1.7.2</Version>
<Copyright>Christiaan Rakowski - 2017-2025</Copyright>
<Version>1.8.0</Version>
<LangVersion>latest</LangVersion>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2017-2023 Christiaan Rakowski
Copyright (c) 2017-2025 Christiaan Rakowski

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@ await foreach (var result in resultStream)

# Release notes

### 1.8.0
* Updated TargetFrameworks to remove old unsupported ones.

### 1.7.2
* First attempt at enabling SourceLink.

Expand Down
6 changes: 6 additions & 0 deletions global.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"sdk": {
//"version": "9.0.300",
"rollForward": "latestFeature"
}
}
12 changes: 6 additions & 6 deletions src/CSRakowski.Parallel/CSRakowski.Parallel.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net472;net452;net60;net50;netstandard2.1;netstandard2.0;netstandard1.1</TargetFrameworks>
<TargetFrameworks>net472;net80;net60;netstandard2.1;netstandard2.0;netstandard1.1</TargetFrameworks>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Company />
<PackageId>CSRakowski.ParallelAsync</PackageId>
Expand All @@ -15,7 +15,7 @@
<PackageTags>Parallel, Async, Batching</PackageTags>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>CSRakowski.Parallel.snk</AssemblyOriginatorKeyFile>
<PackageReleaseNotes>* First attempt at enabling SourceLink.
<PackageReleaseNotes>* Updated TargetFrameworks to remove old unsupported ones.
</PackageReleaseNotes>
<RootNamespace>CSRakowski.Parallel</RootNamespace>
<AssemblyName>CSRakowski.Parallel</AssemblyName>
Expand All @@ -26,11 +26,11 @@
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net472'">
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="5.0.0" />
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net452' or '$(TargetFramework)' == 'netstandard1.1'">
<PackageReference Include="CSRakowski.AsyncStreamsPreparations" Version="1.5.2" />

<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.1'">
<PackageReference Include="CSRakowski.AsyncStreamsPreparations" Version="1.6.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net48;net472;net80;net60;net50;netcoreapp3.1;</TargetFrameworks>
<TargetFrameworks>net48;net472;net90;net80;net60;</TargetFrameworks>
<OutputType>Exe</OutputType>
<IsPackable>false</IsPackable>

Expand All @@ -10,12 +10,12 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.13.12" />
<PackageReference Include="CSRakowski.AsyncStreamsPreparations" Version="1.5.2" />
<PackageReference Include="BenchmarkDotNet" Version="0.15.0" />
<PackageReference Include="CSRakowski.AsyncStreamsPreparations" Version="1.6.0" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' ">
<PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.13.12" />
<PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.15.0" />
</ItemGroup>

<ItemGroup>
Expand Down
22 changes: 6 additions & 16 deletions tests/CSRakowski.Parallel.Tests/CSRakowski.Parallel.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net48;net472;net452;net80;net60;net50;netcoreapp3.1;</TargetFrameworks>
<TargetFrameworks>net48;net472;net90;net80;net60</TargetFrameworks>

<IsPackable>false</IsPackable>
<IsTestProject>true</IsTestProject>
Expand All @@ -11,27 +11,17 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageReference Include="xunit" Version="2.8.1" />
<PackageReference Include="coverlet.collector" Version="6.0.2">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.8">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="CSRakowski.AsyncStreamsPreparations" Version="1.5.2" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net452' or '$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net50'">
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net472' or '$(TargetFramework)' == 'net48' or '$(TargetFramework)' == 'net60' or '$(TargetFramework)' == 'net80'">
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
<PackageReference Include="coverlet.collector" Version="6.0.4">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="CSRakowski.AsyncStreamsPreparations" Version="1.6.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading