Remove net7.0 support

brminnick · May 26, 2024 · 9ee763a · 9ee763a
1 parent 06b1901
commit 9ee763a
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 11 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -3,9 +3,9 @@
   <PropertyGroup>
     <Nullable>enable</Nullable>
     <NoWarn>NETSDK1023</NoWarn>
+    <IsTrimmable>false</IsTrimmable>
     <LangVersion>latest</LangVersion>
     <ImplicitUsings>enable</ImplicitUsings>
-    <WarningsAsErrors>nullable</WarningsAsErrors>
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
     <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
     <LatestSupportedNetVersion>net8.0</LatestSupportedNetVersion>
@@ -34,7 +34,9 @@
      CS1711: XML comment has a typeparam tag, but there is no type parameter by that name 
      CS1712: Type parameter has no matching typeparam tag in the XML comment
      CS1723: XML comment has cref attribute that refers to a type parameter
-     CS1734: XML comment has a paramref tag, but there is no parameter by that name -->
-    <WarningsAsErrors>nullable,CS0419,CS1570,CS1571,CS1572,CS1573,CS1574,CS1580,CS1581,CS1584,CS1587,CS1589,CS1590,CS1591,CS1592,CS1598,CS1658,CS1710,CS1711,CS1712,CS1723,CS1734</WarningsAsErrors>
+     CS1734: XML comment has a paramref tag, but there is no parameter by that name 
+     xUnit1012: Null should not be used for type parameter
+     xUnit2021: Assert.ThrowsAsync is async. The resulting task should be awaited -->
+    <WarningsAsErrors>nullable,CS0419,CS1570,CS1571,CS1572,CS1573,CS1574,CS1580,CS1581,CS1584,CS1587,CS1589,CS1590,CS1591,CS1592,CS1598,CS1658,CS1710,CS1711,CS1712,CS1723,CS1734,xUnit1012,xUnit2021</WarningsAsErrors>
   </PropertyGroup>
 </Project>
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.100",
+    "version": "8.0.300",
     "rollForward": "latestFeature"
   }
 }
diff --git a/src/GitHubApiStatus.Extensions.UnitTests/GitHubApiStatus.Extensions.UnitTests.csproj b/src/GitHubApiStatus.Extensions.UnitTests/GitHubApiStatus.Extensions.UnitTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net461;netcoreapp2.1;netcoreapp3.1;net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net461;netcoreapp2.1;netcoreapp3.1;net6.0;net8.0</TargetFrameworks>
     <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>

diff --git a/src/GitHubApiStatus.Extensions/GitHubApiStatus.Extensions.csproj b/src/GitHubApiStatus.Extensions/GitHubApiStatus.Extensions.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>netstandard2.0;netstandard2.1;netcoreapp3.0;net6.0;net7.0;net8.0</TargetFrameworks>
+		<TargetFrameworks>netstandard2.0;netstandard2.1;netcoreapp3.0;net6.0;net8.0</TargetFrameworks>
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>GitHubApiStatus.Extensions.snk</AssemblyOriginatorKeyFile>
 		<AssemblyName>GitHubApiStatus.Extensions</AssemblyName>

diff --git a/src/GitHubApiStatus.UnitTests/GitHubApiStatus.UnitTests.csproj b/src/GitHubApiStatus.UnitTests/GitHubApiStatus.UnitTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net46;netcoreapp2.1;netcoreapp3.1;net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net46;netcoreapp2.1;netcoreapp3.1;net6.0;net8.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

diff --git a/src/GitHubApiStatus.UnitTests/Tests/ProductHeaderValueTests.cs b/src/GitHubApiStatus.UnitTests/Tests/ProductHeaderValueTests.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Net.Http.Headers;
-using System.Threading.Tasks;
+using System.Net.Http.Headers;
 using GitStatus.Shared;
 using NUnit.Framework;
 
@@ -33,7 +31,11 @@ public void NullNameTest()
 
 		//Assert
 #pragma warning disable CS8625 // Cannot convert null literal to non-nullable reference type.
+#if NET8_0_OR_GREATER
 		Assert.Throws<ArgumentNullException>(() => gitHubApiStatusService.AddProductHeaderValue(new ProductHeaderValue(null)));
+#else
+		Assert.Throws<ArgumentException>(() => gitHubApiStatusService.AddProductHeaderValue(new ProductHeaderValue(null)));
+#endif
 #pragma warning restore CS8625 // Cannot convert null literal to non-nullable reference type.
 		Assert.IsFalse(gitHubApiStatusService.IsProductHeaderValueValid);
 	}

diff --git a/src/GitHubApiStatus/GitHubApiStatus.csproj b/src/GitHubApiStatus/GitHubApiStatus.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp3.0;net6.0;net7.0;net8.0</TargetFrameworks>
+		<TargetFrameworks>netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp3.0;net6.0;net8.0</TargetFrameworks>
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>GitHubApiStatus.snk</AssemblyOriginatorKeyFile>
 		<AssemblyName>GitHubApiStatus</AssemblyName>