Remove net5.0 support

MingweiSamuel · Aug 27, 2023 · 52ed4d5 · 52ed4d5
1 parent 76e9b12
commit 52ed4d5
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 15 deletions.
diff --git a/src/Camille.Core/Camille.Core.csproj b/src/Camille.Core/Camille.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\common.csproj.xml" />
   <PropertyGroup>
-    <TargetFrameworks>netstandard1.1;net45;net461;netstandard2.1;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard1.1;net45;net461;netstandard2.1;netcoreapp3.1;net6.0</TargetFrameworks>
     <PackageId>Camille.Core</PackageId>
     <RootNamespace>Camille.Core</RootNamespace>
     <Description>Core utilities for Camille packages.</Description>

diff --git a/src/Camille.Enums/Camille.Enums.csproj b/src/Camille.Enums/Camille.Enums.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\common.csproj.xml" />
   <PropertyGroup>
-    <TargetFrameworks>netstandard1.1;net45;net461;netstandard2.1;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard1.1;net45;net461;netstandard2.1;netcoreapp3.1;net6.0</TargetFrameworks>
     <PackageId>Camille.Enums</PackageId>
     <RootNamespace>Camille.Enums</RootNamespace>
     <Description>Enums for League of Legends and other Riot Games games.</Description>
@@ -13,7 +13,7 @@
     <DownloadFile SourceUrl="https://www.mingweisamuel.com/riotapi-schema/enums/queues.json" DestinationFolder="$(GenDir)" DestinationFileName=".queues.json" Retries="3" ContinueOnError="true" />
     <DownloadFile SourceUrl="https://www.mingweisamuel.com/riotapi-schema/enums/maps.json" DestinationFolder="$(GenDir)" DestinationFileName=".maps.json" Retries="3" ContinueOnError="true" />
     <DownloadFile SourceUrl="https://www.mingweisamuel.com/riotapi-schema/enums/gameModes.json" DestinationFolder="$(GenDir)" DestinationFileName=".gameModes.json" Retries="3" ContinueOnError="true" />
-	<DownloadFile SourceUrl="https://www.mingweisamuel.com/riotapi-schema/enums/gameTypes.json" DestinationFolder="$(GenDir)" DestinationFileName=".gameTypes.json" Retries="3" ContinueOnError="true" />
+    <DownloadFile SourceUrl="https://www.mingweisamuel.com/riotapi-schema/enums/gameTypes.json" DestinationFolder="$(GenDir)" DestinationFileName=".gameTypes.json" Retries="3" ContinueOnError="true" />
     <DownloadFile SourceUrl="https://www.mingweisamuel.com/riotapi-schema/routesTable.json" DestinationFolder="$(GenDir)" DestinationFileName=".routesTable.json" Retries="3" ContinueOnError="true" />
   </Target>
 </Project>
diff --git a/src/Camille.LolGame/Camille.LolGame.csproj b/src/Camille.LolGame/Camille.LolGame.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\common.csproj.xml" />
   <PropertyGroup>
-    <TargetFrameworks>net461;netstandard2.1;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net461;netstandard2.1;netcoreapp3.1;net6.0</TargetFrameworks>
     <PackageId>Camille.LolGame</PackageId>
     <RootNamespace>Camille.LolGame</RootNamespace>
     <Description>League of Legends Live (In-Game) Client Data API library</Description>

diff --git a/src/Camille.RiotGames/Camille.RiotGames.csproj b/src/Camille.RiotGames/Camille.RiotGames.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\common.csproj.xml" />
   <PropertyGroup>
-    <TargetFrameworks>netstandard1.1;net45;net461;netstandard2.1;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard1.1;net45;net461;netstandard2.1;netcoreapp3.1;net6.0</TargetFrameworks>
     <PackageId>Camille.RiotGames</PackageId>
     <RootNamespace>Camille.RiotGames</RootNamespace>
     <Description>Riot Games API library. Fully rate limited, automatic retrying, thread-safe. Up-to-date nightlies.</Description>

diff --git a/src/common.csproj.xml b/src/common.csproj.xml
@@ -60,7 +60,7 @@
   </ItemGroup>
 
   <!-- Include RiotCertificateUtils for LCU or In-Game APIs. -->
-  <PropertyGroup Condition="'$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'netstandard2.1' Or '$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'net5.0' Or '$(TargetFramework)' == 'net6.0'">
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'netstandard2.1' Or '$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'net6.0'">
     <DefineConstants>$(DefineConstants);INCLUDE_RIOTCERTIFICATEUTILS</DefineConstants>
   </PropertyGroup>
 
@@ -69,16 +69,16 @@
     <DefineConstants>$(DefineConstants);USE_NEWTONSOFT</DefineConstants>
   </PropertyGroup>
   <!-- Camille using System.Text.Json. -->
-  <PropertyGroup Condition="'$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'netstandard2.1' Or '$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'net5.0' Or '$(TargetFramework)' == 'net6.0'">
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'netstandard2.1' Or '$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'net6.0'">
     <DefineConstants>$(DefineConstants);USE_SYSTEXTJSON</DefineConstants>
   </PropertyGroup>
   <!--
-    HttpRequestMessage.Options in net5.0.
+    HttpRequestMessage.Options in net6.0.
     https://docs.microsoft.com/en-us/dotnet/api/system.net.http.httprequestoptions?view=net-5.0
-    HttpContent.ReadAsStringAsync with CancellationToken in net5.0.
+    HttpContent.ReadAsStringAsync with CancellationToken in net6.0.
     https://docs.microsoft.com/en-us/dotnet/api/system.net.http.httpcontent.readasstringasync?view=net-5.0#System_Net_Http_HttpContent_ReadAsStringAsync_System_Threading_CancellationToken_
   -->
-  <PropertyGroup Condition="'$(TargetFramework)' == 'net5.0' Or '$(TargetFramework)' == 'net6.0'">
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net6.0'">
     <DefineConstants>$(DefineConstants);USE_HTTPREQUESTMESSAGE_OPTIONS;USE_HTTPCONTENT_READASSTRINGASYNC_CANCELLATIONTOKEN</DefineConstants>
   </PropertyGroup>
 
@@ -98,7 +98,7 @@
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
   </ItemGroup>
   <!-- System.Text.Json from NuGet, for tagets stricly below net6.0. -->
-  <ItemGroup Condition="'$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'netstandard2.1' Or '$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'net5.0'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'netstandard2.1' Or '$(TargetFramework)' == 'netcoreapp3.1'">
     <PackageReference Include="System.Text.Json" Version="6.0.0" />
   </ItemGroup>
   <!-- System.ComponentModel.DataAnnotations from NuGet. -->

diff --git a/tests/Camille.Core.Test/Camille.Core.Test.csproj b/tests/Camille.Core.Test/Camille.Core.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
     <LangVersion>8.0</LangVersion>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>

diff --git a/tests/Camille.Enums.Test/Camille.Enums.Test.csproj b/tests/Camille.Enums.Test/Camille.Enums.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
     <LangVersion>8.0</LangVersion>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>

diff --git a/tests/Camille.LolGame.Test/Camille.LolGame.Test.csproj b/tests/Camille.LolGame.Test/Camille.LolGame.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

diff --git a/tests/Camille.RiotGames.Test/Camille.RiotGames.Test.csproj b/tests/Camille.RiotGames.Test/Camille.RiotGames.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>