Skip to content

Commit c21e8e1

Browse files
csrakowskicsrakowski
authored
Merge pull request #61 from csrakowski/Updated_TargetFrameworks
Updated target frameworks
2 parents e6adaec + 02407d3 commit c21e8e1

File tree

7 files changed

+49
-51
lines changed

7 files changed

+49
-51
lines changed

‎.github/workflows/dotnet.yml‎

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

1717
- name: Checkout
1818
uses: actions/checkout@v4
1919

20-
- name: Setup .Net 3.1
21-
uses: actions/setup-dotnet@v3
20+
- name: Setup .Net 6.0
21+
uses: actions/setup-dotnet@v4
2222
with:
23-
dotnet-version: '3.1.x' # SDK Version to use.
23+
dotnet-version: '6.0.x' # SDK Version to use.
2424

25-
- name: Setup .Net 5.0
26-
uses: actions/setup-dotnet@v3
25+
- name: Setup .Net 8.0
26+
uses: actions/setup-dotnet@v4
2727
with:
28-
dotnet-version: '5.0.x' # SDK Version to use.
28+
dotnet-version: '8.0.x' # SDK Version to use.
2929

30-
- name: Setup .Net 6.0
31-
uses: actions/setup-dotnet@v3
30+
- name: Setup .Net 9.0
31+
uses: actions/setup-dotnet@v4
3232
with:
33-
dotnet-version: '6.0.x' # SDK Version to use.
33+
dotnet-version: '9.0.x' # SDK Version to use.
3434

3535
- name: Dotnet info
3636
run: |
@@ -51,15 +51,15 @@ jobs:
5151
dotnet test --no-restore --configuration Release --verbosity normal --framework=${{ matrix.framework }} --logger trx --results-directory "TestResults-${{ matrix.os }}-${{ matrix.framework }}"
5252
5353
- name: Upload dotnet test results
54-
uses: actions/upload-artifact@v3
54+
uses: actions/upload-artifact@v4
5555
with:
5656
name: dotnet-results-${{ matrix.os }}-${{ matrix.framework }}
5757
path: TestResults-${{ matrix.os }}-${{ matrix.framework }}
5858
# Use always() to always run this step to publish test results when there are test failures
5959
if: ${{ always() }}
6060

6161
#- name: Publish nupkg
62-
# uses: actions/upload-artifact@v2
62+
# uses: actions/upload-artifact@v4
6363
# with:
6464
# name: CSRakowski.AsyncStreamsPreparations-nupkg
6565
# path: |

‎CSRakowski.AsyncStreamsPreparations.Tests/CSRakowski.AsyncStreamsPreparations.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;net50;net60;netcoreapp3.1</TargetFrameworks>
4+
<TargetFrameworks>net48;net472;net90;net80;net60</TargetFrameworks>
55

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

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
1515
<PackageReference Include="xunit" Version="2.8.1" />
16-
<PackageReference Include="coverlet.collector" Version="6.0.2">
16+
<PackageReference Include="coverlet.collector" Version="6.0.4">
1717
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1818
<PrivateAssets>all</PrivateAssets>
1919
</PackageReference>
20-
</ItemGroup>
21-
22-
<ItemGroup Condition="'$(TargetFramework)' == 'net472' or '$(TargetFramework)' == 'net48'">
23-
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="5.0.0" />
24-
</ItemGroup>
25-
26-
<ItemGroup Condition="'$(TargetFramework)' == 'net452' or '$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net50'">
27-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
20+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
2821
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2922
<PrivateAssets>all</PrivateAssets>
3023
</PackageReference>
3124
</ItemGroup>
3225

33-
<ItemGroup Condition="'$(TargetFramework)' == 'net472' or '$(TargetFramework)' == 'net48' or '$(TargetFramework)' == 'net60'">
34-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
35-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
36-
<PrivateAssets>all</PrivateAssets>
37-
</PackageReference>
26+
<ItemGroup Condition="'$(TargetFramework)' == 'net472' or '$(TargetFramework)' == 'net48'">
27+
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
3828
</ItemGroup>
3929

4030
<ItemGroup>

‎CSRakowski.AsyncStreamsPreparations.sln‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
99
ProjectSection(SolutionItems) = preProject
1010
.gitignore = .gitignore
1111
Directory.Build.props = Directory.Build.props
12+
global.json = global.json
1213
LICENSE = LICENSE
1314
README.md = README.md
1415
EndProjectSection

‎CSRakowski.AsyncStreamsPreparations/CSRakowski.AsyncStreamsPreparations.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>net50;netstandard2.1;netstandard2.0;netstandard1.1</TargetFrameworks>
5-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
6-
<Description>Quick helper library containing interfaces and classes to help you prepare for the C# 8 Async Streams feature.</Description>
7-
<PackageProjectUrl>https://github.com/csrakowski/CSRakowski.AsyncStreamsPreparations</PackageProjectUrl>
8-
<PackageLicenseFile>LICENSE</PackageLicenseFile>
9-
<PackageReadmeFile>README.md</PackageReadmeFile>
10-
<RepositoryUrl>https://github.com/csrakowski/CSRakowski.AsyncStreamsPreparations</RepositoryUrl>
11-
<RepositoryType>Git</RepositoryType>
12-
<PackageTags>C# 8, AsyncStreams, IAsyncEnumerable, IAsyncDisposable</PackageTags>
13-
<SignAssembly>true</SignAssembly>
14-
<AssemblyOriginatorKeyFile>CSRakowski.AsyncStreamsPreparations.snk</AssemblyOriginatorKeyFile>
15-
<PackageReleaseNotes>* First attempt at enabling SourceLink.</PackageReleaseNotes>
4+
<TargetFrameworks>netstandard2.1;netstandard2.0;netstandard1.1</TargetFrameworks>
5+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
6+
<Description>Quick helper library containing interfaces and classes to help you prepare for the C# 8 Async Streams feature.</Description>
7+
<PackageProjectUrl>https://github.com/csrakowski/CSRakowski.AsyncStreamsPreparations</PackageProjectUrl>
8+
<PackageLicenseFile>LICENSE</PackageLicenseFile>
9+
<PackageReadmeFile>README.md</PackageReadmeFile>
10+
<RepositoryUrl>https://github.com/csrakowski/CSRakowski.AsyncStreamsPreparations</RepositoryUrl>
11+
<RepositoryType>Git</RepositoryType>
12+
<PackageTags>C# 8, AsyncStreams, IAsyncEnumerable, IAsyncDisposable</PackageTags>
13+
<SignAssembly>true</SignAssembly>
14+
<AssemblyOriginatorKeyFile>CSRakowski.AsyncStreamsPreparations.snk</AssemblyOriginatorKeyFile>
15+
<PackageReleaseNotes>* Updated TargetFrameworks to remove old unsupported ones.</PackageReleaseNotes>
1616
</PropertyGroup>
1717

1818
<PropertyGroup>
19-
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\CSRakowski.AsyncStreamsPreparations.xml</DocumentationFile>
19+
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\CSRakowski.AsyncStreamsPreparations.xml</DocumentationFile>
2020
</PropertyGroup>
2121

2222
<PropertyGroup Condition="'$(TargetFramework)' != 'netstandard1.1'">
23-
<DefineConstants>$(DefineConstants);HAS_ASYNCENUMERABLE</DefineConstants>
23+
<DefineConstants>$(DefineConstants);HAS_ASYNCENUMERABLE</DefineConstants>
2424
</PropertyGroup>
2525

26-
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard1.1'">
27-
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
26+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.1'">
27+
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
2828
</ItemGroup>
29-
29+
3030
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
31-
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="5.0.0" />
31+
<PackageReference Include="System.Threading.Tasks.Extensions" Version="[4.6,)" />
32+
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
3233
</ItemGroup>
3334

3435
<ItemGroup>
35-
<None Include="..\LICENSE" Pack="true" PackagePath="\"/>
36-
<None Include="..\README.md" Pack="true" PackagePath="\"/>
36+
<None Include="..\LICENSE" Pack="true" PackagePath="\"/>
37+
<None Include="..\README.md" Pack="true" PackagePath="\"/>
3738
</ItemGroup>
3839

3940
</Project>

‎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 - 2018-2023</Copyright>
5-
<Version>1.5.2</Version>
4+
<Copyright>Christiaan Rakowski - 2018-2025</Copyright>
5+
<Version>1.6.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) 2018-2023 Christiaan Rakowski
3+
Copyright (c) 2018-2024 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

‎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+
}

0 commit comments

Comments
 (0)