From bdf7e35e1450f5e3d983db12ed783c62491845cc Mon Sep 17 00:00:00 2001 From: Siegfried Pammer Date: Wed, 10 Jun 2026 00:41:17 +0200 Subject: [PATCH] Drop the stale net10.0-windows segment from publish-output paths ILSpy targets net10.0, not net10.0-windows; the VS add-in build paths, the installer output dir, the local-dev publish script, and the VS Code launch config still referenced the old net10.0-windows layout. Align them with the actual TFM, matching publish.ps1 and the build workflow. Assisted-by: Claude:claude-opus-4-8:Claude Code --- .vscode/launch.json | 2 +- ILSpy.AddIn.VS2022/ILSpy.AddIn.VS2022.csproj | 4 ++-- ILSpy.AddIn/ILSpy.AddIn.csproj | 2 +- ILSpy.Installer/setup.cs | 2 +- publishlocaldev.ps1 | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 8c9db3a5c..c717d85f5 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -9,7 +9,7 @@ "type": "coreclr", "request": "launch", "preLaunchTask": "build", - "program": "${workspaceFolder}/ILSpy/bin/Debug/net10.0-windows/ILSpy.exe", + "program": "${workspaceFolder}/ILSpy/bin/Debug/net10.0/ILSpy.exe", "args": ["--newinstance"], "cwd": "${workspaceFolder}", "console": "internalConsole", diff --git a/ILSpy.AddIn.VS2022/ILSpy.AddIn.VS2022.csproj b/ILSpy.AddIn.VS2022/ILSpy.AddIn.VS2022.csproj index 9d89f674e..f1297348e 100644 --- a/ILSpy.AddIn.VS2022/ILSpy.AddIn.VS2022.csproj +++ b/ILSpy.AddIn.VS2022/ILSpy.AddIn.VS2022.csproj @@ -77,8 +77,8 @@ - ..\ILSpy\bin\$(Configuration)\net10.0-windows\win-x64\publish\fwdependent\ - ..\ILSpy\bin\$(Configuration)\net10.0-windows\win-arm64\publish\fwdependent\ + ..\ILSpy\bin\$(Configuration)\net10.0\win-x64\publish\fwdependent\ + ..\ILSpy\bin\$(Configuration)\net10.0\win-arm64\publish\fwdependent\ diff --git a/ILSpy.AddIn/ILSpy.AddIn.csproj b/ILSpy.AddIn/ILSpy.AddIn.csproj index db5f3114e..9baad539e 100644 --- a/ILSpy.AddIn/ILSpy.AddIn.csproj +++ b/ILSpy.AddIn/ILSpy.AddIn.csproj @@ -83,7 +83,7 @@ - ..\ILSpy\bin\$(Configuration)\net10.0-windows\win-x64\publish\fwdependent\ + ..\ILSpy\bin\$(Configuration)\net10.0\win-x64\publish\fwdependent\ diff --git a/ILSpy.Installer/setup.cs b/ILSpy.Installer/setup.cs index d16e245f4..d40a88b28 100644 --- a/ILSpy.Installer/setup.cs +++ b/ILSpy.Installer/setup.cs @@ -25,7 +25,7 @@ namespace ILSpy.Installer #else var buildPlatform = "x64"; #endif - var buildOutputDir = $@"ILSpy\bin\{buildConfiguration}\net10.0-windows\win-{buildPlatform}\publish\fwdependent"; + var buildOutputDir = $@"ILSpy\bin\{buildConfiguration}\net10.0\win-{buildPlatform}\publish\fwdependent"; var project = new Project("ILSpy", new InstallDir(@"%LocalAppData%\Programs\ILSpy", diff --git a/publishlocaldev.ps1 b/publishlocaldev.ps1 index 01d1a5d94..47dc31c0b 100644 --- a/publishlocaldev.ps1 +++ b/publishlocaldev.ps1 @@ -1,11 +1,11 @@ # For local development of the VSIX package - build and publish (VS2022 also needs arm64) -$output_x64 = "./ILSpy/bin/Release/net10.0-windows/win-x64/publish/fwdependent" +$output_x64 = "./ILSpy/bin/Release/net10.0/win-x64/publish/fwdependent" dotnet publish ./ILSpy/ILSpy.csproj -c Release --no-restore --no-self-contained -r win-x64 -o $output_x64 dotnet publish ./ILSpy.ReadyToRun/ILSpy.ReadyToRun.csproj -c Release --no-restore --no-self-contained -r win-x64 -o $output_x64 -$output_arm64 = "./ILSpy/bin/Release/net10.0-windows/win-arm64/publish/fwdependent" +$output_arm64 = "./ILSpy/bin/Release/net10.0/win-arm64/publish/fwdependent" dotnet publish ./ILSpy/ILSpy.csproj -c Release --no-restore --no-self-contained -r win-arm64 -o $output_arm64 dotnet publish ./ILSpy.ReadyToRun/ILSpy.ReadyToRun.csproj -c Release --no-restore --no-self-contained -r win-arm64 -o $output_arm64 \ No newline at end of file