Skip to content

Commit 5cebb91

Browse files
JohnnyCrazyJohnnyCrazy
committed
Updated to .net 6.0 and remove .net-standard2.0 support
1 parent adbf7eb commit 5cebb91

18 files changed

Lines changed: 21 additions & 43 deletions

File tree

‎.github/workflows/cicd.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ jobs:
1515
dotnet-version: "3.1.x"
1616
- uses: actions/setup-dotnet@v1
1717
with:
18-
dotnet-version: "2.2.x"
18+
dotnet-version: "5.0.x"
1919
- uses: actions/setup-dotnet@v1
2020
with:
21-
dotnet-version: "5.0.x"
21+
dotnet-version: "6.0.x"
2222
- name: Set RELEASE_VERSION
2323
run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
2424
- name: Restore Packages
@@ -47,21 +47,21 @@ jobs:
4747
- name: Upload to GH Release
4848
if: startsWith( github.ref, 'refs/tags/')
4949
run: |
50-
zip -j SpotifyAPI.Web-netstandard2.0.zip SpotifyAPI.Web/bin/Release/netstandard2.0/*
5150
zip -j SpotifyAPI.Web-netstandard2.1.zip SpotifyAPI.Web/bin/Release/netstandard2.1/*
5251
zip -j SpotifyAPI.Web-net5.0.zip SpotifyAPI.Web/bin/Release/net5.0/*
52+
zip -j SpotifyAPI.Web-net6.0.zip SpotifyAPI.Web/bin/Release/net6.0/*
5353
54-
zip -j SpotifyAPI.Web.Auth-netstandard2.0.zip SpotifyAPI.Web.Auth/bin/Release/netstandard2.0/*
5554
zip -j SpotifyAPI.Web.Auth-netstandard2.1.zip SpotifyAPI.Web.Auth/bin/Release/netstandard2.1/*
5655
zip -j SpotifyAPI.Web.Auth-net5.0.zip SpotifyAPI.Web.Auth/bin/Release/net5.0/*
56+
zip -j SpotifyAPI.Web.Auth-net6.0.zip SpotifyAPI.Web.Auth/bin/Release/net6.0/*
5757
5858
hub release edit \
59-
-a "SpotifyAPI.Web-netstandard2.0.zip" \
6059
-a "SpotifyAPI.Web-netstandard2.1.zip" \
6160
-a "SpotifyAPI.Web-net5.0.zip" \
62-
-a "SpotifyAPI.Web.Auth-netstandard2.0.zip" \
61+
-a "SpotifyAPI.Web-net6.0.zip" \
6362
-a "SpotifyAPI.Web.Auth-netstandard2.1.zip" \
6463
-a "SpotifyAPI.Web.Auth-net5.0.zip" \
64+
-a "SpotifyAPI.Web.Auth-net6.0.zip" \
6565
-m "" "$RELEASE_VERSION"
6666
env:
6767
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎SpotifyAPI.Web.Auth/SpotifyAPI.Web.Auth.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net5.0;netstandard2.1;netstandard2.0</TargetFrameworks>
3+
<TargetFrameworks>net6.0;net5.0;netstandard2.1</TargetFrameworks>
44
<LangVersion>9.0</LangVersion>
55
<Nullable>enable</Nullable>
66
<PackageId>SpotifyAPI.Web.Auth</PackageId>

‎SpotifyAPI.Web.Examples/Example.ASP/Example.ASP.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk.Web">
33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
<UserSecretsId>da29eac4-4c22-4a7f-b393-379e83b60998</UserSecretsId>
66
</PropertyGroup>
77
<ItemGroup>
8-
<PackageReference Include="AspNet.Security.OAuth.Spotify" Version="5.0.18" />
8+
<PackageReference Include="AspNet.Security.OAuth.Spotify" Version="6.0.0" />
99
</ItemGroup>
1010
<ItemGroup>
1111
<ProjectReference Include="..\..\SpotifyAPI.Web\SpotifyAPI.Web.csproj" />

‎SpotifyAPI.Web.Examples/Example.ASPBlazor/Example.ASPBlazor.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>

‎SpotifyAPI.Web.Examples/Example.BlazorWASM/Example.BlazorWASM.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.10" />
8+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.0" />
99
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.0" PrivateAssets="all" />
10-
<PackageReference Include="System.Net.Http.Json" Version="5.0.0" />
10+
<PackageReference Include="System.Net.Http.Json" Version="6.0.0" />
1111
</ItemGroup>
1212

1313
<ItemGroup>

‎SpotifyAPI.Web.Examples/Example.CLI.CustomHTML/Example.CLI.CustomHTML.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</ItemGroup>
77

88
<PropertyGroup>
9-
<TargetFramework>net5.0</TargetFramework>
9+
<TargetFramework>net6.0</TargetFramework>
1010
<OutputType>Exe</OutputType>
1111
</PropertyGroup>
1212

‎SpotifyAPI.Web.Examples/Example.CLI.PersistentConfig/Example.CLI.PersistentConfig.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net5.0</TargetFramework>
5+
<TargetFramework>net6.0</TargetFramework>
66
<LangVersion>8.0</LangVersion>
77
<Nullable>enable</Nullable>
88
</PropertyGroup>

‎SpotifyAPI.Web.Examples/Example.TokenSwap/Client/Client.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</ItemGroup>
77

88
<PropertyGroup>
9-
<TargetFramework>net5.0</TargetFramework>
9+
<TargetFramework>net6.0</TargetFramework>
1010
<OutputType>Exe</OutputType>
1111
</PropertyGroup>
1212

‎SpotifyAPI.Web.Tests/SpotifyAPI.Web.Tests.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>net5.0;netcoreapp3.1;netcoreapp2.2</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
55
<LangVersion>9.0</LangVersion>
66
<IsPackable>false</IsPackable>
77
</PropertyGroup>

‎SpotifyAPI.Web/Clients/Interfaces/IPaginator.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ Task<IList<T>> PaginateAll<T, TNext>(
3939
IAPIConnector connector
4040
);
4141

42-
#if !NETSTANDARD2_0
4342
/// <summary>
4443
/// Fetches all pages and returns one by one using IAsyncEnumerable
4544
/// </summary>
@@ -69,6 +68,5 @@ IAsyncEnumerable<T> Paginate<T, TNext>(
6968
IAPIConnector connector,
7069
CancellationToken cancel = default
7170
);
72-
#endif
7371
}
7472
}

0 commit comments

Comments
 (0)