diff --git a/scripts/build-geometry-unity-package.ps1 b/scripts/build-geometry-unity-package.ps1 index 1bd9af53..31002f5e 100644 --- a/scripts/build-geometry-unity-package.ps1 +++ b/scripts/build-geometry-unity-package.ps1 @@ -85,17 +85,13 @@ if ($missingAssetMetas.Count -ne 0 -or $missingDirectoryMetas.Count -ne 0) { throw "Tracked Geometry Unity package has assets without stable .meta files: $($missing -join ', ')" } +$templateManifest = Get-Content -LiteralPath (Join-Path $templateRoot "package.json") -Raw | ConvertFrom-Json +$expectedFileVersion = "$($templateManifest.version).0" $trackedAssembly = Join-Path $templatePluginRoot "GameCult.Geometry.dll" -if ((Get-FileHash -Algorithm SHA256 -LiteralPath $trackedAssembly).Hash -ne - (Get-FileHash -Algorithm SHA256 -LiteralPath $geometryAssembly).Hash) { - throw "Tracked GameCult.Geometry.dll does not match the current Release publish output. Sync the tracked Git-UPM package before tagging." -} -if (Test-Path -LiteralPath $geometrySymbols) { - $trackedSymbols = Join-Path $templatePluginRoot "GameCult.Geometry.pdb" - if ((Get-FileHash -Algorithm SHA256 -LiteralPath $trackedSymbols).Hash -ne - (Get-FileHash -Algorithm SHA256 -LiteralPath $geometrySymbols).Hash) { - throw "Tracked GameCult.Geometry.pdb does not match the current Release publish output. Sync the tracked Git-UPM package before tagging." - } +$trackedFileVersion = [Diagnostics.FileVersionInfo]::GetVersionInfo($trackedAssembly).FileVersion +$publishedFileVersion = [Diagnostics.FileVersionInfo]::GetVersionInfo($geometryAssembly).FileVersion +if ($trackedFileVersion -ne $expectedFileVersion -or $publishedFileVersion -ne $expectedFileVersion) { + throw "Geometry Unity assemblies must match package version $expectedFileVersion; tracked=$trackedFileVersion published=$publishedFileVersion" } New-Item -ItemType Directory -Force -Path $outputRoot | Out-Null diff --git a/src/GameCult.Geometry/GameCult.Geometry.csproj b/src/GameCult.Geometry/GameCult.Geometry.csproj index c8c9800a..705fa2f4 100644 --- a/src/GameCult.Geometry/GameCult.Geometry.csproj +++ b/src/GameCult.Geometry/GameCult.Geometry.csproj @@ -4,8 +4,6 @@ GameCult.Geometry 0.1.0 false - false - false game;geometry;planetary;csg;lod;cultcache;cultmesh README.md diff --git a/unity/org.gamecult.geometry/Runtime/Plugins/GameCult.Geometry.dll b/unity/org.gamecult.geometry/Runtime/Plugins/GameCult.Geometry.dll index 6e6138a9..82c42828 100644 Binary files a/unity/org.gamecult.geometry/Runtime/Plugins/GameCult.Geometry.dll and b/unity/org.gamecult.geometry/Runtime/Plugins/GameCult.Geometry.dll differ diff --git a/unity/org.gamecult.geometry/Runtime/Plugins/GameCult.Geometry.pdb b/unity/org.gamecult.geometry/Runtime/Plugins/GameCult.Geometry.pdb index 8617282e..33bf653a 100644 Binary files a/unity/org.gamecult.geometry/Runtime/Plugins/GameCult.Geometry.pdb and b/unity/org.gamecult.geometry/Runtime/Plugins/GameCult.Geometry.pdb differ