chore: upgrade to .NET 8.0

kthompson · May 31, 2024 · a888f7f · a888f7f
1 parent df82a6a
commit a888f7f
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 20 deletions.
diff --git a/src/Directory.Build.props → Directory.Build.props b/src/Directory.Build.props → Directory.Build.props
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
+        <LangVersion>latest</LangVersion>
         <Nullable>enable</Nullable>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-        <LangVersion>latest</LangVersion>
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="Nerdbank.GitVersioning" Condition="!Exists('packages.config')">

diff --git a/Panther.sln b/Panther.sln
@@ -6,9 +6,6 @@ MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{DE9991AB-E783-4C47-B224-BFE5493F2A9B}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{3A9F57E8-52F8-4A65-93B7-910383111244}"
-	ProjectSection(SolutionItems) = preProject
-		src\Directory.Build.props = src\Directory.Build.props
-	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Panther", "src\Panther\Panther.csproj", "{7122216E-DCED-4E69-87A6-7AD3388E6552}"
 EndProject
@@ -22,6 +19,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		pnc.sh = pnc.sh
 		global.json = global.json
 		CHANGELOG.md = CHANGELOG.md
+		Directory.Build.props = Directory.Build.props
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "_build", "build\_build.csproj", "{2C7EA852-0336-45D4-9AAA-D3A5D1F2F4AA}"

diff --git a/build/_build.csproj b/build/_build.csproj
@@ -2,14 +2,12 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
     <NoWarn>CS0649;CS0169</NoWarn>
     <NukeRootDirectory>..</NukeRootDirectory>
     <NukeScriptDirectory>..</NukeScriptDirectory>
     <Nullable>disable</Nullable>
     <NukeTelemetryVersion>1</NukeTelemetryVersion>
     <RootNamespace>Panther.Build</RootNamespace>
-    <LangVersion>default</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "6.0.201",
+    "version": "8.0.0",
     "rollForward": "latestMajor",
     "allowPrerelease": false
   }

diff --git a/tests/Panther.TestStdLib/Panther.TestStdLib.csproj b/tests/Panther.TestStdLib/Panther.TestStdLib.csproj
@@ -2,10 +2,6 @@
 
     <PropertyGroup>
         <RootNamespace>Panther</RootNamespace>
-        <TargetFramework>net6.0</TargetFramework>
-        <Nullable>enable</Nullable>
-        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-        <LangVersion>default</LangVersion>
         <IsPackable>false</IsPackable>
     </PropertyGroup>
 

diff --git a/tests/Panther.Tests/CodeAnalysis/EmitterTests.cs b/tests/Panther.Tests/CodeAnalysis/EmitterTests.cs
@@ -135,11 +135,11 @@ private static void AssertCommandOutput(string testDirectory, string assemblyLoc
             runtimeConfig,
             @"{
   ""runtimeOptions"": {
-    ""tfm"": ""net6.0"",
+    ""tfm"": ""net8.0"",
     ""rollForward"": ""LatestMinor"",
     ""framework"": {
       ""name"": ""Microsoft.NETCore.App"",
-      ""version"": ""6.0.0""
+      ""version"": ""8.0.0""
     }
   }
 }"

diff --git a/tests/Panther.Tests/Panther.Tests.csproj b/tests/Panther.Tests/Panther.Tests.csproj
@@ -2,11 +2,6 @@
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
-
-    <TargetFramework>net6.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">