From b082a6173d45bc0ddcfcc9a766377da13c7b8891 Mon Sep 17 00:00:00 2001 From: "Brett V. Forsgren" Date: Sat, 29 Jun 2024 11:10:09 -0600 Subject: [PATCH] update to dotnet 8 sdk --- .vscode/launch.json | 2 +- Directory.Build.props | 1 + global.json | 2 +- .../IxMilia.Lisp.DebugAdapter.Test.csproj | 2 +- src/IxMilia.Lisp.EditorServer/IxMilia.Lisp.EditorServer.csproj | 2 +- src/IxMilia.Lisp.Generator/IxMilia.Lisp.Generator.csproj | 2 +- .../IxMilia.Lisp.Interactive.Test.csproj | 2 +- .../IxMilia.Lisp.LanguageServer.Test.csproj | 2 +- src/IxMilia.Lisp.Repl/IxMilia.Lisp.Repl.csproj | 2 +- src/IxMilia.Lisp.Test/IxMilia.Lisp.Test.csproj | 2 +- src/IxMilia.Lisp.Wasm/IxMilia.Lisp.Wasm.csproj | 2 +- src/lisp-vscode/package.json | 2 +- src/lisp-vscode/src/extension.ts | 2 +- 13 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index ff0e708..b3d2870 100644 --- 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 index ea2315f..70cb85f 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,6 +1,7 @@ + net8.0 $([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)version.txt').Trim()) $(MSBuildThisFileDirectory)artifacts $(ArtifactsDir)\packages diff --git a/global.json b/global.json index 4037c77..989a69c 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "7.0.100", + "version": "8.0.100", "rollForward": "latestMinor" } } \ No newline at end of file diff --git a/src/IxMilia.Lisp.DebugAdapter.Test/IxMilia.Lisp.DebugAdapter.Test.csproj b/src/IxMilia.Lisp.DebugAdapter.Test/IxMilia.Lisp.DebugAdapter.Test.csproj index 0e5add6..33e7e21 100644 --- 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 @@ - net7.0 + $(CommonTargetFramework) false $(NoWarn);VSTHRD200 diff --git a/src/IxMilia.Lisp.EditorServer/IxMilia.Lisp.EditorServer.csproj b/src/IxMilia.Lisp.EditorServer/IxMilia.Lisp.EditorServer.csproj index 79a431f..cd06078 100644 --- a/src/IxMilia.Lisp.EditorServer/IxMilia.Lisp.EditorServer.csproj +++ b/src/IxMilia.Lisp.EditorServer/IxMilia.Lisp.EditorServer.csproj @@ -2,7 +2,7 @@ Exe - net7.0 + $(CommonTargetFramework) false $(NoWarn);VSTHRD002 diff --git a/src/IxMilia.Lisp.Generator/IxMilia.Lisp.Generator.csproj b/src/IxMilia.Lisp.Generator/IxMilia.Lisp.Generator.csproj index 8dd5260..710cbb2 100644 --- a/src/IxMilia.Lisp.Generator/IxMilia.Lisp.Generator.csproj +++ b/src/IxMilia.Lisp.Generator/IxMilia.Lisp.Generator.csproj @@ -2,7 +2,7 @@ Exe - net7.0 + $(CommonTargetFramework) false diff --git a/src/IxMilia.Lisp.Interactive.Test/IxMilia.Lisp.Interactive.Test.csproj b/src/IxMilia.Lisp.Interactive.Test/IxMilia.Lisp.Interactive.Test.csproj index c52587d..17c8206 100644 --- 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 @@ - net7.0 + $(CommonTargetFramework) false $(NoWarn);VSTHRD200 diff --git a/src/IxMilia.Lisp.LanguageServer.Test/IxMilia.Lisp.LanguageServer.Test.csproj b/src/IxMilia.Lisp.LanguageServer.Test/IxMilia.Lisp.LanguageServer.Test.csproj index 9494ccb..6d9c4ad 100644 --- 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 @@ - net7.0 + $(CommonTargetFramework) false $(NoWarn);VSTHRD200 diff --git a/src/IxMilia.Lisp.Repl/IxMilia.Lisp.Repl.csproj b/src/IxMilia.Lisp.Repl/IxMilia.Lisp.Repl.csproj index 3aa4fd4..59c7dbb 100644 --- a/src/IxMilia.Lisp.Repl/IxMilia.Lisp.Repl.csproj +++ b/src/IxMilia.Lisp.Repl/IxMilia.Lisp.Repl.csproj @@ -2,7 +2,7 @@ Exe - net7.0 + $(CommonTargetFramework) false diff --git a/src/IxMilia.Lisp.Test/IxMilia.Lisp.Test.csproj b/src/IxMilia.Lisp.Test/IxMilia.Lisp.Test.csproj index df37505..ddd19ab 100644 --- a/src/IxMilia.Lisp.Test/IxMilia.Lisp.Test.csproj +++ b/src/IxMilia.Lisp.Test/IxMilia.Lisp.Test.csproj @@ -1,7 +1,7 @@  - net7.0 + $(CommonTargetFramework) false $(NoWarn);VSTHRD200 diff --git a/src/IxMilia.Lisp.Wasm/IxMilia.Lisp.Wasm.csproj b/src/IxMilia.Lisp.Wasm/IxMilia.Lisp.Wasm.csproj index ee822bf..eef8cab 100644 --- a/src/IxMilia.Lisp.Wasm/IxMilia.Lisp.Wasm.csproj +++ b/src/IxMilia.Lisp.Wasm/IxMilia.Lisp.Wasm.csproj @@ -1,7 +1,7 @@ - net7.0 + $(CommonTargetFramework) enable enable $(MSBuildThisFileDirectory)..\lisp-monaco-editor\dist diff --git a/src/lisp-vscode/package.json b/src/lisp-vscode/package.json index 63d578f..5a354d8 100644 --- 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 index b3dcca2..fba1db4 100644 --- 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 = {