Skip to content

Commit 3ea1a4f

Browse files
csrakowskicsrakowski
authored
Merge pull request #101 from csrakowski/Updated_TargetFrameworks
Updated target frameworks
2 parents 8676cc4 + 679ee77 commit 3ea1a4f

9 files changed

Lines changed: 42 additions & 47 deletions

File tree

‎.github/workflows/dotnetcore.yml‎

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,32 +11,27 @@ jobs:
1111
fail-fast: false
1212
matrix:
1313
os: [windows-latest, ubuntu-latest]
14-
framework: ['netcoreapp3.1', 'net50', 'net60', 'net80']
14+
framework: ['net60', 'net80', 'net90']
1515
steps:
1616

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

20-
- name: Setup .Net 3.1
21-
uses: actions/setup-dotnet@v3
22-
with:
23-
dotnet-version: '3.1.x' # SDK Version to use.
24-
25-
- name: Setup .Net 5.0
26-
uses: actions/setup-dotnet@v3
27-
with:
28-
dotnet-version: '5.0.x' # SDK Version to use.
29-
3020
- name: Setup .Net 6.0
31-
uses: actions/setup-dotnet@v3
21+
uses: actions/setup-dotnet@v4
3222
with:
3323
dotnet-version: '6.0.x' # SDK Version to use.
3424

3525
- name: Setup .Net 8.0
36-
uses: actions/setup-dotnet@v3
26+
uses: actions/setup-dotnet@v4
3727
with:
3828
dotnet-version: '8.0.x' # SDK Version to use.
3929

30+
- name: Setup .Net 9.0
31+
uses: actions/setup-dotnet@v4
32+
with:
33+
dotnet-version: '9.0.x' # SDK Version to use.
34+
4035
- name: Dotnet info
4136
run: |
4237
dotnet --version
@@ -63,15 +58,15 @@ jobs:
6358
if: matrix.framework == 'net80'
6459

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

7368
- name: Upload BenchmarkDotNet results
74-
uses: actions/upload-artifact@v3
69+
uses: actions/upload-artifact@v4
7570
with:
7671
name: BenchmarkDotNet-${{ matrix.os }}-${{ matrix.framework }}
7772
path: BenchmarkDotNet.Artifacts
@@ -85,7 +80,7 @@ jobs:
8580
strategy:
8681
fail-fast: false
8782
matrix:
88-
framework: ['net45', 'net472', 'net48']
83+
framework: ['net472', 'net48']
8984
steps:
9085

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

9792
- name: Setup .Net 8.0
98-
uses: actions/setup-dotnet@v3
93+
uses: actions/setup-dotnet@v4
9994
with:
10095
dotnet-version: '8.0.x' # SDK Version to use.
10196

@@ -119,7 +114,7 @@ jobs:
119114
dotnet test --no-restore --configuration Release --verbosity normal --framework=${{ matrix.framework }} --logger trx --results-directory "TestResults-${{ matrix.os }}-${{ matrix.framework }}"
120115
121116
- name: Upload dotnet test results
122-
uses: actions/upload-artifact@v3
117+
uses: actions/upload-artifact@v4
123118
with:
124119
name: dotnet-results-windows-latest-${{ matrix.framework }}
125120
path: TestResults-windows-latest-${{ matrix.framework }}

‎CSRakowski.ParallelAsync.sln‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionIt
1111
ProjectSection(SolutionItems) = preProject
1212
.gitignore = .gitignore
1313
Directory.Build.props = Directory.Build.props
14+
global.json = global.json
1415
LICENSE = LICENSE
1516
README.md = README.md
1617
EndProjectSection

‎Directory.Build.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project>
22
<PropertyGroup>
33
<Authors>Christiaan Rakowski</Authors>
4-
<Copyright>Christiaan Rakowski - 2017-2023</Copyright>
5-
<Version>1.7.2</Version>
4+
<Copyright>Christiaan Rakowski - 2017-2025</Copyright>
5+
<Version>1.8.0</Version>
66
<LangVersion>latest</LangVersion>
77
</PropertyGroup>
88

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2017-2023 Christiaan Rakowski
3+
Copyright (c) 2017-2025 Christiaan Rakowski
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎README.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,9 @@ await foreach (var result in resultStream)
5757

5858
# Release notes
5959

60+
### 1.8.0
61+
* Updated TargetFrameworks to remove old unsupported ones.
62+
6063
### 1.7.2
6164
* First attempt at enabling SourceLink.
6265

‎global.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"sdk": {
3+
//"version": "9.0.300",
4+
"rollForward": "latestFeature"
5+
}
6+
}

‎src/CSRakowski.Parallel/CSRakowski.Parallel.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net472;net452;net60;net50;netstandard2.1;netstandard2.0;netstandard1.1</TargetFrameworks>
4+
<TargetFrameworks>net472;net80;net60;netstandard2.1;netstandard2.0;netstandard1.1</TargetFrameworks>
55
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
66
<Company />
77
<PackageId>CSRakowski.ParallelAsync</PackageId>
@@ -15,7 +15,7 @@
1515
<PackageTags>Parallel, Async, Batching</PackageTags>
1616
<SignAssembly>true</SignAssembly>
1717
<AssemblyOriginatorKeyFile>CSRakowski.Parallel.snk</AssemblyOriginatorKeyFile>
18-
<PackageReleaseNotes>* First attempt at enabling SourceLink.
18+
<PackageReleaseNotes>* Updated TargetFrameworks to remove old unsupported ones.
1919
</PackageReleaseNotes>
2020
<RootNamespace>CSRakowski.Parallel</RootNamespace>
2121
<AssemblyName>CSRakowski.Parallel</AssemblyName>
@@ -26,11 +26,11 @@
2626
</PropertyGroup>
2727

2828
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net472'">
29-
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="5.0.0" />
29+
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
3030
</ItemGroup>
31-
32-
<ItemGroup Condition="'$(TargetFramework)' == 'net452' or '$(TargetFramework)' == 'netstandard1.1'">
33-
<PackageReference Include="CSRakowski.AsyncStreamsPreparations" Version="1.5.2" />
31+
32+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.1'">
33+
<PackageReference Include="CSRakowski.AsyncStreamsPreparations" Version="1.6.0" />
3434
</ItemGroup>
3535

3636
<ItemGroup>

‎tests/CSRakowski.Parallel.Benchmarks/CSRakowski.Parallel.Benchmarks.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net48;net472;net80;net60;net50;netcoreapp3.1;</TargetFrameworks>
4+
<TargetFrameworks>net48;net472;net90;net80;net60;</TargetFrameworks>
55
<OutputType>Exe</OutputType>
66
<IsPackable>false</IsPackable>
77

@@ -10,12 +10,12 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="BenchmarkDotNet" Version="0.13.12" />
14-
<PackageReference Include="CSRakowski.AsyncStreamsPreparations" Version="1.5.2" />
13+
<PackageReference Include="BenchmarkDotNet" Version="0.15.0" />
14+
<PackageReference Include="CSRakowski.AsyncStreamsPreparations" Version="1.6.0" />
1515
</ItemGroup>
1616

1717
<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' ">
18-
<PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.13.12" />
18+
<PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.15.0" />
1919
</ItemGroup>
2020

2121
<ItemGroup>

‎tests/CSRakowski.Parallel.Tests/CSRakowski.Parallel.Tests.csproj‎

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net48;net472;net452;net80;net60;net50;netcoreapp3.1;</TargetFrameworks>
4+
<TargetFrameworks>net48;net472;net90;net80;net60</TargetFrameworks>
55

66
<IsPackable>false</IsPackable>
77
<IsTestProject>true</IsTestProject>
@@ -11,27 +11,17 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
15-
<PackageReference Include="xunit" Version="2.8.1" />
16-
<PackageReference Include="coverlet.collector" Version="6.0.2">
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
15+
<PackageReference Include="xunit" Version="2.9.3" />
16+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.8">
1717
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1818
<PrivateAssets>all</PrivateAssets>
1919
</PackageReference>
20-
<PackageReference Include="CSRakowski.AsyncStreamsPreparations" Version="1.5.2" />
21-
</ItemGroup>
22-
23-
<ItemGroup Condition="'$(TargetFramework)' == 'net452' or '$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net50'">
24-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
25-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
26-
<PrivateAssets>all</PrivateAssets>
27-
</PackageReference>
28-
</ItemGroup>
29-
30-
<ItemGroup Condition="'$(TargetFramework)' == 'net472' or '$(TargetFramework)' == 'net48' or '$(TargetFramework)' == 'net60' or '$(TargetFramework)' == 'net80'">
31-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
20+
<PackageReference Include="coverlet.collector" Version="6.0.4">
3221
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3322
<PrivateAssets>all</PrivateAssets>
3423
</PackageReference>
24+
<PackageReference Include="CSRakowski.AsyncStreamsPreparations" Version="1.6.0" />
3525
</ItemGroup>
3626

3727
<ItemGroup>

0 commit comments

Comments
 (0)