Conversation
…csproj fixes StratumServer#94, StratumServer#96 - bootstrap.sh: find|head|grep sigpipe under set -o pipefail skipped all patches. use find -print -quit. - sources/VintagestoryApi/VintagestoryAPI.csproj: overlay now owns csproj, remove stale patches/VintagestoryApi/VintagestoryAPI.csproj.patch. add missing Compile Removes (OptimumMeshPartPool, OptimumChunkVisibilityBfs, OptimumCompatibilityGuard, OptimumFrustumCullSimd, OptimumKometGuard) so Optimum types compile only in Optimum.Api.Contracts, not also in VintagestoryAPI.dll (cs0433).
|
getting ```
Variable reference is not valid. ':' was not followed by a valid variable name character. Consider using ${} |
|
Thanks for this. Every fix here already landed on Checking each part against current Fix 1 (issue #94, #90): Fix 2 (issue #96, SIGPIPE): the patch gate no longer dies on SIGPIPE. Fix 3 (issue #96, CS0433): the overlay already carries all five previously missing removes ( Your diagnosis on all three was correct and it matched what we found independently. Appreciate the detailed writeup on #96. |
fixes #94, #90, #96
fix 1 (issue #94 & #90): csproj owned by both sources/ overlay and old patches/ file
sources/VintagestoryApi/VintagestoryAPI.csprojoverlay now canonical owner of donor csproj.patches/VintagestoryApi/VintagestoryAPI.csproj.patch, its 2<Compile Remove>lines merged into overlay.fix 2 (issue #96, first part): patch gate die on sigpipe
set -o pipefail. gatefind "$patches_dir" -name '*.patch' -print | head -n 1 | grep -q ..headexits after first line,findgets SIGPIPE (141), pipeline fails, else branch runs. "No patches/ to apply." every run.find "$patches_dir" -name '*.patch' -print -quit >/dev/null 2>&1.-quitstops find after first match, no broken pipe. all 118 patches apply.fix 3 (issue #96, second part): cs0433 same type in two dll
OptimumCompatibilityGuard,OptimumFrustumCullSimd,OptimumKometGuard.OptimumMeshPartPoolandOptimumChunkVisibilityBfs(taken from deleted patch), compiled into bothVintagestoryAPI.dllandOptimum.Api.Contracts.dll, so mods referencing both get cs0433.<Compile Remove>entries to overlay. Optimum types compile only in contracts.verify
make refreshprints "Patches: 118 applied, 0 skipped, 0 failed"dotnet build VintageStory.slnx -c Releasesucceeds, 0 errorsdotnet testpasses 1042 tests