Normalize Geometry release package versions

scripts/build-geometry-candidate.ps1

@@ -1,5 +1,7 @@
 param(
-  [string] $Version = "0.1.0-geometry-migration.2",
+  [string] $GeometryVersion = "0.1.0",
+  [string] $SupportVersion = "1.0.3",
+  [string] $CultMathVersion = "0.1.0",
   [string] $OutputDirectory = "artifacts\candidate-feed",
   [string] $CultMathCandidateFeed = "..\CultMath\.tools\local-feed"
 )
@@ -9,6 +11,10 @@ $project = Join-Path $root "src\GameCult.Geometry\GameCult.Geometry.csproj"
 $output = Join-Path $root $OutputDirectory
 $feed = [IO.Path]::GetFullPath((Join-Path $root $CultMathCandidateFeed))
 New-Item -ItemType Directory -Force -Path $output | Out-Null
+$cultMathPackage = Join-Path $feed "CultMath.$CultMathVersion.nupkg"
+if (-not (Test-Path -LiteralPath $cultMathPackage)) {
+  throw "CultMath $CultMathVersion is missing from $feed. Pack the final CultMath artifact first."
+}
 $supportProjects = @(
   "src\GameCult.Logging\GameCult.Logging.csproj",
   "src\GameCult.Caching\GameCult.Caching.csproj",
@@ -19,13 +25,13 @@ $supportProjects = @(
 )
 foreach ($relativeProject in $supportProjects) {
   $supportProject = Join-Path $root $relativeProject
-  dotnet pack $supportProject -c Release -o $output --disable-build-servers -p:PackageVersion=$Version -p:UseSharedCompilation=false -m:1
+  dotnet pack $supportProject -c Release -o $output --disable-build-servers -p:PackageVersion=$SupportVersion -p:UseSharedCompilation=false -m:1
   if ($LASTEXITCODE -ne 0) { throw "Candidate support pack failed: $relativeProject" }
 }
-dotnet restore $project --disable-build-servers -p:CultMathCandidateFeed=$feed -p:UseSharedCompilation=false -m:1
+dotnet restore $project --disable-build-servers -p:CultMathCandidateFeed=$feed -p:CultMathVersion=$CultMathVersion -p:UseSharedCompilation=false -m:1
 if ($LASTEXITCODE -ne 0) { throw "Geometry candidate restore failed." }
-dotnet pack $project -c Release -o $output --no-restore --disable-build-servers -p:PackageVersion=$Version -p:CultMathCandidateFeed=$feed -p:UseSharedCompilation=false -m:1
+dotnet pack $project -c Release -o $output --no-restore --disable-build-servers -p:CultMathVersion=$CultMathVersion -p:CultMathCandidateFeed=$feed -p:UseSharedCompilation=false -m:1
 if ($LASTEXITCODE -ne 0) { throw "Geometry candidate pack failed." }
-$package = Join-Path $output "GameCult.Geometry.$Version.nupkg"
+$package = Join-Path $output "GameCult.Geometry.$GeometryVersion.nupkg"
 if (-not (Test-Path -LiteralPath $package)) { throw "Geometry candidate package was not produced." }
 Write-Host $package

scripts/build-geometry-unity-package.ps1

@@ -1,7 +1,8 @@
 param(
   [string] $Configuration = "Release",
   [string] $OutputDirectory = "artifacts\unity\org.gamecult.geometry",
-  [string] $CultMathCandidateFeed = "..\CultMath\.tools\local-feed"
+  [string] $CultMathCandidateFeed = "..\CultMath\.tools\local-feed",
+  [string] $CultMathVersion = "0.1.0"
 )
 
 $ErrorActionPreference = "Stop"
@@ -23,8 +24,8 @@ $candidateFeed = if ([System.IO.Path]::IsPathRooted($CultMathCandidateFeed)) {
 $pluginRoot = Join-Path $outputRoot "Runtime\Plugins"
 $templatePluginRoot = Join-Path $templateRoot "Runtime\Plugins"
 
-if (-not (Test-Path -LiteralPath (Join-Path $candidateFeed "CultMath.0.1.0-geometry-migration.2.nupkg"))) {
-  throw "CultMath migration candidate is missing from $candidateFeed. Pack CultMath before staging Geometry."
+if (-not (Test-Path -LiteralPath (Join-Path $candidateFeed "CultMath.$CultMathVersion.nupkg"))) {
+  throw "CultMath $CultMathVersion is missing from $candidateFeed. Pack CultMath before staging Geometry."
 }
 
 if (Test-Path -LiteralPath $publishRoot) {
@@ -34,7 +35,7 @@ if (Test-Path -LiteralPath $outputRoot) {
   Remove-Item -LiteralPath $outputRoot -Recurse -Force
 }
 
-dotnet restore $projectPath --disable-build-servers -p:CultMathCandidateFeed=$candidateFeed -p:UseSharedCompilation=false -m:1
+dotnet restore $projectPath --disable-build-servers -p:CultMathCandidateFeed=$candidateFeed -p:CultMathVersion=$CultMathVersion -p:UseSharedCompilation=false -m:1
 if ($LASTEXITCODE -ne 0) {
   throw "GameCult.Geometry restore failed with exit code $LASTEXITCODE"
 }
@@ -57,6 +58,9 @@ $requiredTemplateFiles = @(
   "Runtime\Plugins\GameCult.Geometry.dll.meta",
   "Runtime\Plugins\GameCult.Geometry.pdb",
   "Runtime\Plugins\GameCult.Geometry.pdb.meta",
+  "Runtime\Unity\GameCult.Geometry.Unity.asmdef",
+  "Runtime\Unity\PlanetaryPatchMeshAdapter.cs",
+  "Runtime\Unity\PlanetaryPageUpload.cs",
   "Shaders\AdvancedErosionFilter.hlsl",
   "Shaders\GameCult.Geometry.hlsl",
   "Shaders\Planetary.hlsl",

src/GameCult.Geometry/GameCult.Geometry.csproj

@@ -2,19 +2,22 @@
   <PropertyGroup>
     <Description>Spatial values, planetary geometry, queries, and typed geometry state built on CultMath primitives</Description>
     <PackageId>GameCult.Geometry</PackageId>
+    <Version>0.1.0</Version>
+    <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
     <PackageTags>game;geometry;planetary;csg;lod;cultcache;cultmesh</PackageTags>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <PackageLicenseExpression></PackageLicenseExpression>
     <PackageLicenseFile>LICENSES.md</PackageLicenseFile>
     <NoWarn>$(NoWarn);1591</NoWarn>
-    <CultMathVersion>0.1.0-geometry-migration.2</CultMathVersion>
+    <CultMathVersion>0.1.0</CultMathVersion>
+    <CultLibSupportVersion>1.0.3</CultLibSupportVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\GameCult.Caching\GameCult.Caching.csproj" />
-    <ProjectReference Include="..\GameCult.Caching.MessagePack\GameCult.Caching.MessagePack.csproj" />
-    <ProjectReference Include="..\GameCult.Mesh\GameCult.Mesh.csproj" />
-    <ProjectReference Include="..\GameCult.Networking\GameCult.Networking.csproj" />
+    <ProjectReference Include="..\GameCult.Caching\GameCult.Caching.csproj" AdditionalProperties="Version=$(CultLibSupportVersion);PackageVersion=$(CultLibSupportVersion)" />
+    <ProjectReference Include="..\GameCult.Caching.MessagePack\GameCult.Caching.MessagePack.csproj" AdditionalProperties="Version=$(CultLibSupportVersion);PackageVersion=$(CultLibSupportVersion)" />
+    <ProjectReference Include="..\GameCult.Mesh\GameCult.Mesh.csproj" AdditionalProperties="Version=$(CultLibSupportVersion);PackageVersion=$(CultLibSupportVersion)" />
+    <ProjectReference Include="..\GameCult.Networking\GameCult.Networking.csproj" AdditionalProperties="Version=$(CultLibSupportVersion);PackageVersion=$(CultLibSupportVersion)" />
     <PackageReference Include="CultMath" Version="$(CultMathVersion)" />
     <PackageReference Include="MessagePack" Version="3.1.7" />
     <PackageReference Include="System.Text.Json" Version="9.0.10" />

unity/org.gamecult.geometry/Runtime/Unity.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3436e51255844bf896e76ecfce1a8a5c
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData:
+  assetBundleName:
+  assetBundleVariant: