update to dotnet 8 sdk

ixmilia · Jun 29, 2024 · b082a61 · b082a61
1 parent c32b3b5
commit b082a61
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 12 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -10,7 +10,7 @@
             "request": "launch",
             "preLaunchTask": "build",
             // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/src/IxMilia.Lisp.DebugAdapter.Test/bin/Debug/net7.0/IxMilia.Lisp.DebugAdapter.Test.dll",
+            "program": "${workspaceFolder}/src/IxMilia.Lisp.DebugAdapter.Test/bin/Debug/net8.0/IxMilia.Lisp.DebugAdapter.Test.dll",
             "args": [],
             "cwd": "${workspaceFolder}/src/IxMilia.Lisp.DebugAdapter.Test",
             // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,6 +1,7 @@
 <Project>
 
   <PropertyGroup>
+    <CommonTargetFramework>net8.0</CommonTargetFramework>
     <VersionPrefix>$([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)version.txt').Trim())</VersionPrefix>
     <ArtifactsDir>$(MSBuildThisFileDirectory)artifacts</ArtifactsDir>
     <ArtifactsPackagesDir>$(ArtifactsDir)\packages</ArtifactsPackagesDir>

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "7.0.100",
+    "version": "8.0.100",
     "rollForward": "latestMinor"
   }
 }
diff --git a/src/IxMilia.Lisp.DebugAdapter.Test/IxMilia.Lisp.DebugAdapter.Test.csproj b/src/IxMilia.Lisp.DebugAdapter.Test/IxMilia.Lisp.DebugAdapter.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>$(CommonTargetFramework)</TargetFramework>
     <IsPackable>false</IsPackable>
     <NoWarn>$(NoWarn);VSTHRD200</NoWarn><!-- Use "Async" suffix in names of methods that return an awaitable type. -->
   </PropertyGroup>

diff --git a/src/IxMilia.Lisp.EditorServer/IxMilia.Lisp.EditorServer.csproj b/src/IxMilia.Lisp.EditorServer/IxMilia.Lisp.EditorServer.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>$(CommonTargetFramework)</TargetFramework>
     <IsPackable>false</IsPackable>
     <NoWarn>$(NoWarn);VSTHRD002</NoWarn>
   </PropertyGroup>

diff --git a/src/IxMilia.Lisp.Generator/IxMilia.Lisp.Generator.csproj b/src/IxMilia.Lisp.Generator/IxMilia.Lisp.Generator.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>$(CommonTargetFramework)</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

diff --git a/src/IxMilia.Lisp.Interactive.Test/IxMilia.Lisp.Interactive.Test.csproj b/src/IxMilia.Lisp.Interactive.Test/IxMilia.Lisp.Interactive.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>$(CommonTargetFramework)</TargetFramework>
     <IsPackable>false</IsPackable>
     <NoWarn>$(NoWarn);VSTHRD200</NoWarn><!-- Use "Async" suffix in names of methods that return an awaitable type. -->
   </PropertyGroup>

diff --git a/src/IxMilia.Lisp.LanguageServer.Test/IxMilia.Lisp.LanguageServer.Test.csproj b/src/IxMilia.Lisp.LanguageServer.Test/IxMilia.Lisp.LanguageServer.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>$(CommonTargetFramework)</TargetFramework>
     <IsPackable>false</IsPackable>
     <NoWarn>$(NoWarn);VSTHRD200</NoWarn><!-- Use "Async" suffix in names of methods that return an awaitable type. -->
   </PropertyGroup>

diff --git a/src/IxMilia.Lisp.Repl/IxMilia.Lisp.Repl.csproj b/src/IxMilia.Lisp.Repl/IxMilia.Lisp.Repl.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>$(CommonTargetFramework)</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

diff --git a/src/IxMilia.Lisp.Test/IxMilia.Lisp.Test.csproj b/src/IxMilia.Lisp.Test/IxMilia.Lisp.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>$(CommonTargetFramework)</TargetFramework>
     <IsPackable>false</IsPackable>
     <NoWarn>$(NoWarn);VSTHRD200</NoWarn><!-- Use "Async" suffix in names of methods that return an awaitable type. -->
   </PropertyGroup>

diff --git a/src/IxMilia.Lisp.Wasm/IxMilia.Lisp.Wasm.csproj b/src/IxMilia.Lisp.Wasm/IxMilia.Lisp.Wasm.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>$(CommonTargetFramework)</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <EditorDirectory>$(MSBuildThisFileDirectory)..\lisp-monaco-editor\dist</EditorDirectory>

diff --git a/src/lisp-vscode/package.json b/src/lisp-vscode/package.json
@@ -74,7 +74,7 @@
     "watch": "tsc -watch -p ./",
     "clean-server": "npx rimraf ./server",
     "publish-server": "dotnet publish ../IxMilia.Lisp.EditorServer/IxMilia.Lisp.EditorServer.csproj --configuration Release",
-    "copy-server": "npx copyfiles --up 8 --error --verbose \"../../artifacts/bin/IxMilia.Lisp.EditorServer/Release/net7.0/publish/*\" ./server/",
+    "copy-server": "npx copyfiles --up 8 --error --verbose \"../../artifacts/bin/IxMilia.Lisp.EditorServer/Release/net8.0/publish/*\" ./server/",
     "package": "npm run compile && npm run clean-server && npm run publish-server && npm run copy-server && npx vsce package"
   },
   "repository": {

diff --git a/src/lisp-vscode/src/extension.ts b/src/lisp-vscode/src/extension.ts
@@ -17,7 +17,7 @@ const languageName = 'lisp';
 const outputChannelName = 'IxMilia.Lisp Language Server';
 
 export async function activate(context: vscode.ExtensionContext) {
-    const targetFrameworkMoniker = 'net7.0';
+    const targetFrameworkMoniker = 'net8.0';
     const runtimeVersion = targetFrameworkMoniker.replace('net', '');
     if (context.extensionMode === vscode.ExtensionMode.Production) {
         const acquireContext = {