Browse Source

Run SortResX with pwsh on non-Windows hosts

The SortResX target only set its command on Windows (powershell), so the
resx-sorting build step was a silent no-op on Linux/macOS even though
pwsh (PowerShell 7+) is available there -- mirror the PowerShell cmdlet
project's powershell/pwsh split. The included Resources.resx change is
that step catching up one entry (ExportProjectSolution) that had drifted
out of order while the target was disabled. The script is EOL-preserving,
so this stays LF with no cross-OS churn.

Assisted-by: Claude:claude-opus-4-8:Claude Code
pull/3755/head
Siegfried Pammer 4 weeks ago
parent
commit
d395e73a80
  1. 3
      ILSpy/ILSpy.csproj
  2. 6
      ILSpy/Properties/Resources.resx

3
ILSpy/ILSpy.csproj

@ -193,6 +193,9 @@ @@ -193,6 +193,9 @@
<PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
<SortResX>powershell -NoProfile -ExecutionPolicy Bypass -File BuildTools/sort-resx.ps1</SortResX>
</PropertyGroup>
<PropertyGroup Condition=" '$(OS)' != 'Windows_NT' ">
<SortResX>pwsh -NoProfile -ExecutionPolicy Bypass -File BuildTools/sort-resx.ps1</SortResX>
</PropertyGroup>
<Exec WorkingDirectory=".." Command="$(SortResX)" Timeout="60000" Condition="'$(SortResX)' != ''" />
<Touch Files="@(SortResXStamp)" AlwaysCreate="true" Condition="'$(SortResX)' != ''" />
</Target>

6
ILSpy/Properties/Resources.resx

@ -660,6 +660,9 @@ Are you sure you want to continue?</value> @@ -660,6 +660,9 @@ Are you sure you want to continue?</value>
<data name="ExpandUsingDeclarationsAfterDecompilation" xml:space="preserve">
<value>Expand using declarations after decompilation</value>
</data>
<data name="ExportProjectSolution" xml:space="preserve">
<value>Export Project/Solution...</value>
</data>
<data name="ExtractAllPackageEntries" xml:space="preserve">
<value>Extract all package entries</value>
</data>
@ -675,9 +678,6 @@ Are you sure you want to continue?</value> @@ -675,9 +678,6 @@ Are you sure you want to continue?</value>
<data name="Forward" xml:space="preserve">
<value>Forward</value>
</data>
<data name="ExportProjectSolution" xml:space="preserve">
<value>Export Project/Solution...</value>
</data>
<data name="GeneratePortable" xml:space="preserve">
<value>Generate portable PDB</value>
</data>

Loading…
Cancel
Save