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).
1 task
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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