Browse Source

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
pull/3755/head
Siegfried Pammer 4 weeks ago
parent
commit
bdf7e35e14
  1. 2
      .vscode/launch.json
  2. 4
      ILSpy.AddIn.VS2022/ILSpy.AddIn.VS2022.csproj
  3. 2
      ILSpy.AddIn/ILSpy.AddIn.csproj
  4. 2
      ILSpy.Installer/setup.cs
  5. 4
      publishlocaldev.ps1

2
.vscode/launch.json vendored

@ -9,7 +9,7 @@
"type": "coreclr", "type": "coreclr",
"request": "launch", "request": "launch",
"preLaunchTask": "build", "preLaunchTask": "build",
"program": "${workspaceFolder}/ILSpy/bin/Debug/net10.0-windows/ILSpy.exe", "program": "${workspaceFolder}/ILSpy/bin/Debug/net10.0/ILSpy.exe",
"args": ["--newinstance"], "args": ["--newinstance"],
"cwd": "${workspaceFolder}", "cwd": "${workspaceFolder}",
"console": "internalConsole", "console": "internalConsole",

4
ILSpy.AddIn.VS2022/ILSpy.AddIn.VS2022.csproj

@ -77,8 +77,8 @@
</ItemGroup> </ItemGroup>
<PropertyGroup> <PropertyGroup>
<ILSpyBuildPathX64>..\ILSpy\bin\$(Configuration)\net10.0-windows\win-x64\publish\fwdependent\</ILSpyBuildPathX64> <ILSpyBuildPathX64>..\ILSpy\bin\$(Configuration)\net10.0\win-x64\publish\fwdependent\</ILSpyBuildPathX64>
<ILSpyBuildPathArm64>..\ILSpy\bin\$(Configuration)\net10.0-windows\win-arm64\publish\fwdependent\</ILSpyBuildPathArm64> <ILSpyBuildPathArm64>..\ILSpy\bin\$(Configuration)\net10.0\win-arm64\publish\fwdependent\</ILSpyBuildPathArm64>
</PropertyGroup> </PropertyGroup>
<Target Name="IncludeILSpyDistributionInVSIXSubFolder" AfterTargets="ResolveProjectReferences"> <Target Name="IncludeILSpyDistributionInVSIXSubFolder" AfterTargets="ResolveProjectReferences">

2
ILSpy.AddIn/ILSpy.AddIn.csproj

@ -83,7 +83,7 @@
</ItemGroup> </ItemGroup>
<PropertyGroup> <PropertyGroup>
<ILSpyBuildPath>..\ILSpy\bin\$(Configuration)\net10.0-windows\win-x64\publish\fwdependent\</ILSpyBuildPath> <ILSpyBuildPath>..\ILSpy\bin\$(Configuration)\net10.0\win-x64\publish\fwdependent\</ILSpyBuildPath>
</PropertyGroup> </PropertyGroup>
<Target Name="IncludeILSpyDistributionInVSIXSubFolder" AfterTargets="ResolveProjectReferences"> <Target Name="IncludeILSpyDistributionInVSIXSubFolder" AfterTargets="ResolveProjectReferences">

2
ILSpy.Installer/setup.cs

@ -25,7 +25,7 @@ namespace ILSpy.Installer
#else #else
var buildPlatform = "x64"; var buildPlatform = "x64";
#endif #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", var project = new Project("ILSpy",
new InstallDir(@"%LocalAppData%\Programs\ILSpy", new InstallDir(@"%LocalAppData%\Programs\ILSpy",

4
publishlocaldev.ps1

@ -1,11 +1,11 @@
# For local development of the VSIX package - build and publish (VS2022 also needs arm64) # 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/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 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/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 dotnet publish ./ILSpy.ReadyToRun/ILSpy.ReadyToRun.csproj -c Release --no-restore --no-self-contained -r win-arm64 -o $output_arm64
Loading…
Cancel
Save