From 65758bd0521b1118a2f7fd40c48a3bfd84f894dd Mon Sep 17 00:00:00 2001 From: rekhoff Date: Thu, 28 May 2026 12:07:48 -0700 Subject: [PATCH 1/2] `bump-versions` adds regen case conversion and includes Godot, regression tests --- tools/upgrade-version/src/main.rs | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tools/upgrade-version/src/main.rs b/tools/upgrade-version/src/main.rs index a7a6bc41d31..aadb11f0255 100644 --- a/tools/upgrade-version/src/main.rs +++ b/tools/upgrade-version/src/main.rs @@ -238,6 +238,16 @@ fn main() -> anyhow::Result<()> { .run() .expect("pnpm generate failed!"); + // Regenerate case conversion test bindings to update embedded CLI version + println!("$> cargo run -p gen-bindings -- --out-dir crates/bindings-typescript/case-conversion-test-client/src/module_bindings --module-path modules/sdk-test-case-conversion"); + cmd!("cargo", "run", "-p", "gen-bindings", "--", "--out-dir", "crates/bindings-typescript/case-conversion-test-client/src/module_bindings", "--module-path", "modules/sdk-test-case-conversion") + .run() + .expect("gen-bindings for case-conversion-test-client failed!"); + println!("$> pnpm --dir crates/bindings-typescript/case-conversion-test-client exec prettier --write src/module_bindings"); + cmd!(pnpm_cmd(), "--dir", "crates/bindings-typescript/case-conversion-test-client", "exec", "prettier", "--write", "src/module_bindings") + .run() + .expect("prettier for case-conversion-test-client failed!"); + if matches.get_flag("accept-snapshots") { // Generate and auto-accept snapshots println!("$> INSTA_UPDATE=always cargo test -p spacetimedb-codegen --test codegen"); @@ -332,6 +342,14 @@ fn main() -> anyhow::Result<()> { rewrite_xml_tag_value(client_sdk, "AssemblyVersion", &numeric_version)?; // Update SpacetimeDB.BSATN.Runtime dependency to major.minor.* rewrite_csproj_package_ref_version(client_sdk, "SpacetimeDB.BSATN.Runtime", &wildcard_patch)?; + + // Also update the Godot client SDK csproj + let godot_client_sdk = "sdks/csharp/SpacetimeDB.ClientSDK.Godot.csproj"; + rewrite_xml_tag_value(godot_client_sdk, "Version", &full_version)?; + // doesn't support prerelease or metadata version suffixes like does. + rewrite_xml_tag_value(godot_client_sdk, "AssemblyVersion", &numeric_version)?; + // Update SpacetimeDB.BSATN.Runtime dependency to major.minor.* + rewrite_csproj_package_ref_version(godot_client_sdk, "SpacetimeDB.BSATN.Runtime", &wildcard_patch)?; // Also bump the C# SDK package.json version (preserve formatting) rewrite_json_version_inplace("sdks/csharp/package.json", &full_version)?; @@ -341,6 +359,8 @@ fn main() -> anyhow::Result<()> { "demo/Blackholio/server-csharp/StdbModule.csproj", "templates/chat-console-cs/spacetimedb/StdbModule.csproj", "sdks/csharp/examples~/regression-tests/server/StdbModule.csproj", + "sdks/csharp/examples~/regression-tests/republishing/server-initial/StdbModule.csproj", + "sdks/csharp/examples~/regression-tests/republishing/server-republish/StdbModule.csproj", ]; for path in stdb_modules { rewrite_csproj_package_ref_version(path, "SpacetimeDB.Runtime", &wildcard_patch)?; From 170f04dfd48c9f0135a597094cf7bec1903c2482 Mon Sep 17 00:00:00 2001 From: rekhoff Date: Thu, 28 May 2026 12:37:00 -0700 Subject: [PATCH 2/2] Update lint --- tools/upgrade-version/src/main.rs | 32 ++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/tools/upgrade-version/src/main.rs b/tools/upgrade-version/src/main.rs index aadb11f0255..81743d5c423 100644 --- a/tools/upgrade-version/src/main.rs +++ b/tools/upgrade-version/src/main.rs @@ -240,13 +240,31 @@ fn main() -> anyhow::Result<()> { // Regenerate case conversion test bindings to update embedded CLI version println!("$> cargo run -p gen-bindings -- --out-dir crates/bindings-typescript/case-conversion-test-client/src/module_bindings --module-path modules/sdk-test-case-conversion"); - cmd!("cargo", "run", "-p", "gen-bindings", "--", "--out-dir", "crates/bindings-typescript/case-conversion-test-client/src/module_bindings", "--module-path", "modules/sdk-test-case-conversion") - .run() - .expect("gen-bindings for case-conversion-test-client failed!"); + cmd!( + "cargo", + "run", + "-p", + "gen-bindings", + "--", + "--out-dir", + "crates/bindings-typescript/case-conversion-test-client/src/module_bindings", + "--module-path", + "modules/sdk-test-case-conversion" + ) + .run() + .expect("gen-bindings for case-conversion-test-client failed!"); println!("$> pnpm --dir crates/bindings-typescript/case-conversion-test-client exec prettier --write src/module_bindings"); - cmd!(pnpm_cmd(), "--dir", "crates/bindings-typescript/case-conversion-test-client", "exec", "prettier", "--write", "src/module_bindings") - .run() - .expect("prettier for case-conversion-test-client failed!"); + cmd!( + "pnpm", + "--dir", + "crates/bindings-typescript/case-conversion-test-client", + "exec", + "prettier", + "--write", + "src/module_bindings" + ) + .run() + .expect("prettier for case-conversion-test-client failed!"); if matches.get_flag("accept-snapshots") { // Generate and auto-accept snapshots @@ -342,7 +360,7 @@ fn main() -> anyhow::Result<()> { rewrite_xml_tag_value(client_sdk, "AssemblyVersion", &numeric_version)?; // Update SpacetimeDB.BSATN.Runtime dependency to major.minor.* rewrite_csproj_package_ref_version(client_sdk, "SpacetimeDB.BSATN.Runtime", &wildcard_patch)?; - + // Also update the Godot client SDK csproj let godot_client_sdk = "sdks/csharp/SpacetimeDB.ClientSDK.Godot.csproj"; rewrite_xml_tag_value(godot_client_sdk, "Version", &full_version)?;