WIP: Add support for releasing debugsymbols

2026-01-01 09:48:47 +03:00 · 2024-12-13 16:05:26 +01:00
19 changed files with 134 additions and 1113 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,6 @@ config.sh
 *.jks
 *.pfx
 *.pkcs12
-/*.json

 # Generated by build scripts
 angle/
@@ -17,7 +16,6 @@ angle.7z
 out/
 releases/
 sha512sums/
-steam/
 tmp/
 web/

--- a/build-android/build.sh
+++ b/build-android/build.sh
@@ -4,22 +4,16 @@ set -e

 # Config

-# Debug symbols are enabled for the Android builds so we can generate a separate debug symbols file.
-# Gradle will strip them out of the final artifacts.
-export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no redirect_build_objects=no"
-export OPTIONS="production=yes debug_symbols=yes"
+export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no"
+export OPTIONS="production=yes"
 export OPTIONS_MONO="module_mono_enabled=yes"
-export OPTIONS_DOTNET="module_dotnet_enabled=yes"
 export TERM=xterm

-prepare_source() {
-  cd /root
-  rm -rf godot
-  mkdir godot
-  cd godot
-  tar xf /root/godot.tar.gz --strip-components=1
-  cp -rf /root/swappy/* thirdparty/swappy-frame-pacing/
-}
+rm -rf godot
+mkdir godot
+cd godot
+tar xf /root/godot.tar.gz --strip-components=1
+cp -rf /root/swappy/* thirdparty/swappy-frame-pacing/

 # Environment variables and keystore needed for signing store editor build,
 # as well as signing and publishing to MavenCentral.
@@ -36,61 +30,49 @@ fi
 if [ "${CLASSICAL}" == "1" ]; then
  echo "Starting classical build for Android..."

-  prepare_source
-
  $SCONS platform=android arch=arm32 $OPTIONS target=editor store_release=${store_release}
  $SCONS platform=android arch=arm64 $OPTIONS target=editor store_release=${store_release}
  $SCONS platform=android arch=x86_32 $OPTIONS target=editor store_release=${store_release}
-  $SCONS platform=android arch=x86_64 $OPTIONS target=editor store_release=${store_release} separate_debug_symbols=yes # Generate native debug symbols.
+  $SCONS platform=android arch=x86_64 $OPTIONS target=editor store_release=${store_release}

  pushd platform/android/java
  # Generate the regular Android editor.
  ./gradlew generateGodotEditor
  # Generate the Android editor for HorizonOS devices.
  ./gradlew generateGodotHorizonOSEditor
-  # Generate the Android editor for PicoOS devices.
-  ./gradlew generateGodotPicoOSEditor
  popd

  mkdir -p /root/out/tools
-
+  # Copy the generated Android editor binaries (apk & aab).
  if [ "$store_release" == "yes" ]; then
-    # Copy the native debug symbols, a single one cover all editor builds.
-    cp bin/android-editor-release-native-symbols.zip /root/out/tools/android_editor_native_debug_symbols.zip
-
-    # Copy the generated Android editor binaries (apk & aab).
    cp bin/android_editor_builds/android_editor-android-release.apk /root/out/tools/android_editor.apk
    cp bin/android_editor_builds/android_editor-android-release.aab /root/out/tools/android_editor.aab
-
-    # For the HorizonOS and PicoOS builds, we only copy the apk.
+    # For the HorizonOS build, we only copy the apk.
    cp bin/android_editor_builds/android_editor-horizonos-release.apk /root/out/tools/android_editor_horizonos.apk
-    cp bin/android_editor_builds/android_editor-picoos-release.apk /root/out/tools/android_editor_picoos.apk
  else
-    # Copy the native debug symbols, a single one cover all editor builds.
-    cp bin/android-editor-debug-native-symbols.zip /root/out/tools/android_editor_native_debug_symbols.zip
-
-    # Copy the generated Android editor binaries (apk & aab).
    cp bin/android_editor_builds/android_editor-android-debug.apk /root/out/tools/android_editor.apk
    cp bin/android_editor_builds/android_editor-android-debug.aab /root/out/tools/android_editor.aab
-
-    # For the HorizonOS and PicoOS build, we only copy the apk.
+    # For the HorizonOS build, we only copy the apk.
    cp bin/android_editor_builds/android_editor-horizonos-debug.apk /root/out/tools/android_editor_horizonos.apk
-    cp bin/android_editor_builds/android_editor-picoos-debug.apk /root/out/tools/android_editor_picoos.apk
  fi

-  # Template builds
-
-  prepare_source
-
-  $SCONS platform=android arch=arm32 $OPTIONS target=template_release
-  $SCONS platform=android arch=arm64 $OPTIONS target=template_release
-  $SCONS platform=android arch=x86_32 $OPTIONS target=template_release
-  $SCONS platform=android arch=x86_64 $OPTIONS target=template_release separate_debug_symbols=yes # Generate native debug symbols only for the release templates.
+  # Restart from a clean tarball, as we'll copy all the contents
+  # outside the container for the MavenCentral upload.
+  rm -rf /root/godot/*
+  tar xf /root/godot.tar.gz --strip-components=1
+  cp -rf /root/swappy/* thirdparty/swappy-frame-pacing/

  $SCONS platform=android arch=arm32 $OPTIONS target=template_debug
+  $SCONS platform=android arch=arm32 $OPTIONS target=template_release
+
  $SCONS platform=android arch=arm64 $OPTIONS target=template_debug
+  $SCONS platform=android arch=arm64 $OPTIONS target=template_release
+
  $SCONS platform=android arch=x86_32 $OPTIONS target=template_debug
+  $SCONS platform=android arch=x86_32 $OPTIONS target=template_release
+
  $SCONS platform=android arch=x86_64 $OPTIONS target=template_debug
+  $SCONS platform=android arch=x86_64 $OPTIONS target=template_release

  pushd platform/android/java
  ./gradlew generateGodotTemplates
@@ -109,7 +91,6 @@ if [ "${CLASSICAL}" == "1" ]; then
  cp bin/android_debug.apk /root/out/templates/
  cp bin/android_release.apk /root/out/templates/
  cp bin/godot-lib.template_release.aar /root/out/templates/
-  cp bin/android-template-release-native-symbols.zip /root/out/templates/android_release_template_native_debug_symbols.zip
 fi

 # Mono
@@ -117,8 +98,6 @@ fi
 if [ "${MONO}" == "1" ]; then
  echo "Starting Mono build for Android..."

-  prepare_source
-
  cp -r /root/mono-glue/GodotSharp/GodotSharp/Generated modules/mono/glue/GodotSharp/GodotSharp/

  $SCONS platform=android arch=arm32 $OPTIONS $OPTIONS_MONO target=template_debug
@@ -144,34 +123,4 @@ if [ "${MONO}" == "1" ]; then
  cp bin/godot-lib.template_release.aar /root/out/templates-mono/
 fi

-# .NET
-
-if [ "${DOTNET}" == "1" ]; then
-  echo "Starting .NET build for Android..."
-
-  prepare_source
-
-  $SCONS platform=android arch=arm32 $OPTIONS $OPTIONS_DOTNET target=template_debug
-  $SCONS platform=android arch=arm32 $OPTIONS $OPTIONS_DOTNET target=template_release
-
-  $SCONS platform=android arch=arm64 $OPTIONS $OPTIONS_DOTNET target=template_debug
-  $SCONS platform=android arch=arm64 $OPTIONS $OPTIONS_DOTNET target=template_release
-
-  $SCONS platform=android arch=x86_32 $OPTIONS $OPTIONS_DOTNET target=template_debug
-  $SCONS platform=android arch=x86_32 $OPTIONS $OPTIONS_DOTNET target=template_release
-
-  $SCONS platform=android arch=x86_64 $OPTIONS $OPTIONS_DOTNET target=template_debug
-  $SCONS platform=android arch=x86_64 $OPTIONS $OPTIONS_DOTNET target=template_release
-
-  pushd platform/android/java
-  ./gradlew generateGodotMonoTemplates
-  popd
-
-  mkdir -p /root/out/templates-dotnet
-  cp bin/android_source.zip /root/out/templates-dotnet/
-  cp bin/android_monoDebug.apk /root/out/templates-dotnet/android_debug.apk
-  cp bin/android_monoRelease.apk /root/out/templates-dotnet/android_release.apk
-  cp bin/godot-lib.template_release.aar /root/out/templates-dotnet/
-fi
-
 echo "Android build successful"
--- a/build-android/playstore_upload_script.py
+++ b/build-android/playstore_upload_script.py
@@ -1,109 +0,0 @@
-import sys, socket
-from google.oauth2 import service_account
-from googleapiclient.discovery import build
-
-PACKAGE_NAME = "org.godotengine.editor.v4"
-
-def main(aab_path, nds_path, key_path, version_name):
-    version_base = version_name.split("-")[0]
-    version_parts = version_base.split(".")
-    major = version_parts[0]
-    minor = version_parts[1]
-    patch = int(version_parts[2]) if len(version_parts) > 2 else 0
-    channel = version_name.split("-")[1]
-
-    release_note = f"Godot Engine {version_name} has arrived!\nNote: This is a pre-release piece of software so be sure to make backups."
-    track = "alpha"
-
-    if "stable" in channel:
-        if patch == 0:
-            release_url = f"https://godotengine.org/releases/{major}.{minor}/"
-        else:
-            release_url = f"https://godotengine.org/article/maintenance-release-godot-{major}-{minor}-{patch}/"
-        release_note = f"Godot Engine {version_name} has arrived!\nRelease page: {release_url}"
-        track = "beta"
-    elif "rc" in channel:
-        channel_url = channel.replace("rc", "rc-")
-        if patch == 0:
-            release_url = f"https://godotengine.org/article/release-candidate-godot-{major}-{minor}-{channel_url}/"
-        else:
-            release_url = f"https://godotengine.org/article/release-candidate-godot-{major}-{minor}-{patch}-{channel_url}/"
-        release_note += f"\nRelease page: {release_url}"
-    else:
-        # No need to handle patch versions here: maintenance releases go straight to RC and stable.
-        # There are no 4.5.1-dev or 4.5.1-beta builds.
-        if "beta" in channel:
-            channel_url = channel.replace("beta", "beta-")
-        else:
-            channel_url = channel.replace("dev", "dev-")
-        release_url = f"https://godotengine.org/article/dev-snapshot-godot-{major}-{minor}-{channel_url}/"
-        release_note += f"\nRelease page: {release_url}"
-
-    scopes = ["https://www.googleapis.com/auth/androidpublisher"]
-    credentials = service_account.Credentials.from_service_account_file(key_path, scopes=scopes)
-
-    initial_timeout = socket.getdefaulttimeout()
-    socket.setdefaulttimeout(900)
-    service = build("androidpublisher", "v3", credentials=credentials)
-
-    print("Creating a new edit")
-    edit = service.edits().insert(body={}, packageName=PACKAGE_NAME).execute()
-    edit_id = edit["id"]
-
-    print(f"Uploading {aab_path}")
-    bundle_response = service.edits().bundles().upload(
-        editId=edit_id,
-        packageName=PACKAGE_NAME,
-        media_body=aab_path,
-        media_mime_type="application/octet-stream"
-    ).execute()
-
-    version_code = bundle_response["versionCode"]
-    print(f"Uploaded AAB with versionCode: {version_code}")
-
-    print(f"Uploading native debug symbols {nds_path}")
-    service.edits().deobfuscationfiles().upload(
-        editId=edit_id,
-        packageName=PACKAGE_NAME,
-        apkVersionCode=version_code,
-        deobfuscationFileType="nativeCode",
-        media_body=nds_path,
-        media_mime_type="application/octet-stream"
-    ).execute()
-
-    release_name = f"v{version_name} ({version_code})"
-    print(f"Assigning {release_name} to {track} track")
-
-    service.edits().tracks().update(
-        editId=edit_id,
-        packageName=PACKAGE_NAME,
-        track=track,
-        body={
-            "releases": [{
-                "name": release_name,
-                "versionCodes": [str(version_code)],
-                "status": "completed",
-                "releaseNotes": [{
-                    "language": "en-US",
-                    "text": release_note
-                }]
-            }]
-        }
-    ).execute()
-
-    service.edits().commit(editId=edit_id, packageName=PACKAGE_NAME).execute()
-    print("Release uploaded and published successfully!")
-    socket.setdefaulttimeout(initial_timeout)
-
-if __name__ == "__main__":
-    if len(sys.argv) != 5:
-        print("Usage: python3 upload_playstore.py <aab-path> <native-debug-symbols-path> <json-key-path> <version-name>")
-        print("version-name format: <major>.<minor>[.<patch>]-<channel> (e.g. 4.4.1-stable, 4.5-stable, 4.6-dev1)")
-        sys.exit(1)
-
-    aab_path = sys.argv[1]
-    nds_path = sys.argv[2]
-    key_path = sys.argv[3]
-    version_name = sys.argv[4]
-
-    main(aab_path, nds_path, key_path, version_name)
--- a/build-android/upload-horizon.sh
+++ b/build-android/upload-horizon.sh
@@ -1,55 +0,0 @@
-#!/bin/bash
-
-if [ "$#" -ne 2 ]; then
-  echo "Usage: $0 <version-name> <latest-stable>"
-  exit 1
-fi
-
-VERSION_NAME="$1"
-LATEST_STABLE="$2"
-
-BASEDIR="$(pwd)"
-
-source ${BASEDIR}/config.sh
-
-TMPDIR=$(mktemp -d)
-cleanup() {
-  rm -rf "$TMPDIR"
-}
-trap cleanup EXIT
-
-OVR_PLATFORM_UTIL_DOWNLOAD_URL="https://www.oculus.com/download_app/?id=5159709737372459"
-OVR_PLATFORM_UTIL="$TMPDIR/ovr-platform-util"
-
-APK_FILE="${BASEDIR}/out/android/tools/android_editor_horizonos.apk"
-NDS_FILE="${BASEDIR}/out/android/tools/android_editor_native_debug_symbols.zip"
-NDS_OUTPUT_DIR="$TMPDIR/nds"
-
-STATUS=$(echo "$VERSION_NAME" | sed -e 's/^.*-\([a-z][a-z]*\)[0-9]*$/\1/')
-if [ "$STATUS" = "stable" -a "$LATEST_STABLE" = "1" ]; then
-  HORIZON_STORE_CHANNEL="LIVE"
-elif [ "$STATUS" = "dev" ]; then
-  HORIZON_STORE_CHANNEL="ALPHA"
-elif [ "$STATUS" = "beta" ]; then
-  HORIZON_STORE_CHANNEL="BETA"
-elif [ "$STATUS" = "rc" ]; then
-  HORIZON_STORE_CHANNEL="RC"
-else
-  echo "Unable to determine Horizon store channel from version status: $STATUS" >/dev/stderr
-  exit 1
-fi
-
-mkdir -p "$NDS_OUTPUT_DIR"
-(cd "$NDS_OUTPUT_DIR" && unzip "$NDS_FILE")
-
-echo "Downloading ovr-platform-util..."
-if ! curl -fL -o "$OVR_PLATFORM_UTIL" "$OVR_PLATFORM_UTIL_DOWNLOAD_URL"; then
-  exit 1
-fi
-
-chmod +x "$OVR_PLATFORM_UTIL"
-
-echo "Uploading $VERSION_NAME to Horizon store on channel $HORIZON_STORE_CHANNEL..."
-if ! $OVR_PLATFORM_UTIL upload-quest-build --app-id "$GODOT_ANDROID_HORIZON_APP_ID" --app-secret "$GODOT_ANDROID_HORIZON_APP_SECRET" --apk "$APK_FILE" --channel "$HORIZON_STORE_CHANNEL" --debug-symbols-dir "$NDS_OUTPUT_DIR/arm64-v8a/" --debug-symbols-pattern '*.so'; then
-  exit 1
-fi
--- a/build-android/upload-mavencentral.sh
+++ b/build-android/upload-mavencentral.sh
@@ -15,4 +15,4 @@ ${PODMAN} run -it --rm \
    "source /root/keystore/config.sh && \
    cp -r /root/godot/.gradle /root && \
    cd /root/godot/platform/android/java && \
-    ./gradlew publishAllPublicationToSonatypeRepository --max-workers 1 closeAndReleaseSonatypeStagingRepository"
+    ./gradlew publishTemplateReleasePublicationToSonatypeRepository --max-workers 1 closeAndReleaseSonatypeStagingRepository"
--- a/build-android/upload-playstore.sh
+++ b/build-android/upload-playstore.sh
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-if [ "$#" -ne 1 ]; then
-  echo "Usage: $0 <version-name>"
-  exit 1
-fi
-
-VERSION_NAME="$1"
-
-BASEDIR="$(pwd)"
-
-source ${BASEDIR}/config.sh
-
-VENV_DIR="${BASEDIR}/venv"
-PYTHON_SCRIPT="${BASEDIR}/build-android/playstore_upload_script.py"
-AAB_FILE="${BASEDIR}/out/android/tools/android_editor.aab"
-NDS_FILE="${BASEDIR}/out/android/tools/android_editor_native_debug_symbols.zip"
-JSON_KEY_FILE="${BASEDIR}/${GODOT_ANDROID_UPLOAD_JSON_KEY}"
-
-echo "Creating virtual environment"
-rm -rf "$VENV_DIR"
-python3 -m venv "$VENV_DIR"
-source "$VENV_DIR/bin/activate"
-
-echo "Installing google-api-python-client"
-pip install --upgrade google-api-python-client
-
-echo "Uploading editor to Google Play Store..."
-python3 "$PYTHON_SCRIPT" "$AAB_FILE" "$NDS_FILE" "$JSON_KEY_FILE" "$VERSION_NAME"
--- a/build-dotnet/build.sh
+++ b/build-dotnet/build.sh
@@ -1,71 +0,0 @@
-#!/bin/bash
-
-set -e
-
-if [ "${DOTNET}" != "1" ]; then
-  exit 0
-fi
-
-dnf install -y clang python-unversioned-command
-
-git clone https://github.com/raulsntos/godot-dotnet
-cd godot-dotnet
-git checkout upgrade-assistant-plus-source-code-plugin-wip
-
-echo "Building and generating .NET extension..."
-
-# TODO: Get rid of this when we fix all these trimming warnings in godot-dotnet.
-cat << EOF >> .editorconfig
-# Disable trimming warnings because it spams the output too much.
-dotnet_diagnostics.IL2111.severity = none
-EOF
-
-prerelease_label="${GODOT_VERSION#*-}"
-version_prefix="${GODOT_VERSION%-*}"
-
-if [[ "${prerelease_label}" == "${GODOT_VERSION}" ]]; then
-  prerelease_label=""
-fi
-
-# TODO: Ensure we don't accidentally make stable releases. We can remove this when we're ready for a stable release.
-if [[ -z "$prerelease_label" ]]; then
-  echo "YOU ARE NOT SUPPOSED TO MAKE A STABLE RELEASE WITH THIS"
-  exit -1
-fi
-
-version_component_count=$(grep -o "\." <<< "$version_prefix" | wc -l)
-
-if [ "$version_component_count" -eq 0 ]; then
-  version_prefix="${version_prefix}.0.0"
-elif [ "$version_component_count" -eq 1 ]; then
-  version_prefix="${version_prefix}.0"
-fi
-
-if [[ -n "$prerelease_label" ]]; then
-  if [[ "$prerelease_label" =~ ^dev ]]; then
-    prerelease_label="${prerelease_label/dev/alpha}"
-  fi
-
-  prerelease_label=$(echo "$prerelease_label" | sed -E 's/([^0-9])([0-9])/\1.\2/g')
-fi
-
-echo "Building Godot .NET version ${version_prefix} (prerelease: '${prerelease_label}')"
-
-dotnet --info
-
-build_id="$(date +%Y%m%d).1"
-final_version_kind="release"
-if [[ -n "$prerelease_label" ]]; then
-  final_version_kind="prerelease"
-fi
-
-./build.sh --productBuild --ci --warnAsError false \
-    /p:GenerateGodotBindings=true \
-    /p:VersionPrefix=${version_prefix} \
-    /p:OfficialBuildId=${build_id} \
-    /p:FinalVersionKind=${final_version_kind} \
-    /p:PreReleaseVersionLabel=${prerelease_label}
-
-cp -r artifacts/packages/Release/Shipping/* /root/out/
-
-echo ".NET bindings generated successfully"
--- a/build-ios/build.sh
+++ b/build-ios/build.sh
@@ -4,19 +4,15 @@ set -e

 # Config

-export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no redirect_build_objects=no"
+export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no"
 # Keep LTO disabled for iOS - it works but it makes linking apps on deploy very slow,
 # which is seen as a regression in the current workflow.
-export OPTIONS="production=yes use_lto=no SWIFT_FRONTEND=/root/.local/share/swiftly/toolchains/6.2.1/usr/bin/swift-frontend"
+export OPTIONS="production=yes use_lto=no"
 export OPTIONS_MONO="module_mono_enabled=yes"
-export OPTIONS_DOTNET="module_dotnet_enabled=yes"
 export TERM=xterm

-export IOS_SDK="26.1"
-export IOS_DEVICE="IOS_SDK_PATH=/root/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS${IOS_SDK}.sdk"
-export IOS_SIMULATOR="IOS_SDK_PATH=/root/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator${IOS_SDK}.sdk simulator=yes"
-export APPLE_TARGET_ARM64="APPLE_TOOLCHAIN_PATH=/root/ioscross/arm64 apple_target_triple=arm-apple-darwin11-"
-export APPLE_TARGET_X86_64="APPLE_TOOLCHAIN_PATH=/root/ioscross/x86_64 apple_target_triple=x86_64-apple-darwin11-"
+export IOS_SDK="17.5"
+export IOS_LIPO="/root/ioscross/arm64/bin/arm-apple-darwin11-lipo"

 rm -rf godot
 mkdir godot
@@ -29,22 +25,30 @@ if [ "${CLASSICAL}" == "1" ]; then
  echo "Starting classical build for iOS..."

  # arm64 device
-  $SCONS platform=ios $OPTIONS arch=arm64 target=template_debug $IOS_DEVICE $APPLE_TARGET_ARM64
-  $SCONS platform=ios $OPTIONS arch=arm64 target=template_release $IOS_DEVICE $APPLE_TARGET_ARM64
+  $SCONS platform=ios $OPTIONS arch=arm64 ios_simulator=no target=template_debug \
+    IOS_SDK_PATH="/root/ioscross/arm64/SDK/iPhoneOS${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/arm64/" ios_triple="arm-apple-darwin11-"
+  $SCONS platform=ios $OPTIONS arch=arm64 ios_simulator=no target=template_release \
+    IOS_SDK_PATH="/root/ioscross/arm64/SDK/iPhoneOS${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/arm64/" ios_triple="arm-apple-darwin11-"

  # arm64 simulator
  # Disabled for now as it doesn't work with cctools-port and current LLVM.
  # See https://github.com/godotengine/build-containers/pull/85.
-  #$SCONS platform=ios $OPTIONS arch=arm64 target=template_debug $IOS_SIMULATOR $APPLE_TARGET_ARM64
-  #$SCONS platform=ios $OPTIONS arch=arm64 target=template_release $IOS_SIMULATOR $APPLE_TARGET_ARM64
+  #$SCONS platform=ios $OPTIONS arch=arm64 ios_simulator=yes target=template_debug \
+  #  IOS_SDK_PATH="/root/ioscross/arm64_sim/SDK/iPhoneSimulator${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/arm64_sim/" ios_triple="arm-apple-darwin11-"
+  #$SCONS platform=ios $OPTIONS arch=arm64 ios_simulator=yes target=template_release \
+  #  IOS_SDK_PATH="/root/ioscross/arm64_sim/SDK/iPhoneSimulator${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/arm64_sim/" ios_triple="arm-apple-darwin11-"

  # x86_64 simulator
-  $SCONS platform=ios $OPTIONS arch=x86_64 target=template_debug $IOS_SIMULATOR $APPLE_TARGET_X86_64
-  $SCONS platform=ios $OPTIONS arch=x86_64 target=template_release $IOS_SIMULATOR $APPLE_TARGET_X86_64
+  $SCONS platform=ios $OPTIONS arch=x86_64 ios_simulator=yes target=template_debug \
+    IOS_SDK_PATH="/root/ioscross/x86_64_sim/SDK/iPhoneSimulator${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/x86_64_sim/" ios_triple="x86_64-apple-darwin11-"
+  $SCONS platform=ios $OPTIONS arch=x86_64 ios_simulator=yes target=template_release \
+    IOS_SDK_PATH="/root/ioscross/x86_64_sim/SDK/iPhoneSimulator${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/x86_64_sim/" ios_triple="x86_64-apple-darwin11-"

  mkdir -p /root/out/templates
  cp bin/libgodot.ios.template_release.arm64.a /root/out/templates/libgodot.ios.a
  cp bin/libgodot.ios.template_debug.arm64.a /root/out/templates/libgodot.ios.debug.a
+  #$IOS_LIPO -create bin/libgodot.ios.template_release.arm64.simulator.a bin/libgodot.ios.template_release.x86_64.simulator.a -output /root/out/templates/libgodot.ios.simulator.a
+  #$IOS_LIPO -create bin/libgodot.ios.template_debug.arm64.simulator.a bin/libgodot.ios.template_debug.x86_64.simulator.a -output /root/out/templates/libgodot.ios.debug.simulator.a
  cp bin/libgodot.ios.template_release.x86_64.simulator.a /root/out/templates/libgodot.ios.simulator.a
  cp bin/libgodot.ios.template_debug.x86_64.simulator.a /root/out/templates/libgodot.ios.debug.simulator.a
 fi
@@ -57,50 +61,33 @@ if [ "${MONO}" == "1" ]; then
  cp -r /root/mono-glue/GodotSharp/GodotSharp/Generated modules/mono/glue/GodotSharp/GodotSharp/

  # arm64 device
-  $SCONS platform=ios $OPTIONS $OPTIONS_MONO arch=arm64 target=template_debug $IOS_DEVICE $APPLE_TARGET_ARM64
-  $SCONS platform=ios $OPTIONS $OPTIONS_MONO arch=arm64 target=template_release $IOS_DEVICE $APPLE_TARGET_ARM64
+  $SCONS platform=ios $OPTIONS $OPTIONS_MONO arch=arm64 ios_simulator=no target=template_debug \
+    IOS_SDK_PATH="/root/ioscross/arm64/SDK/iPhoneOS${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/arm64/" ios_triple="arm-apple-darwin11-"
+  $SCONS platform=ios $OPTIONS $OPTIONS_MONO arch=arm64 ios_simulator=no target=template_release \
+    IOS_SDK_PATH="/root/ioscross/arm64/SDK/iPhoneOS${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/arm64/" ios_triple="arm-apple-darwin11-"

  # arm64 simulator
  # Disabled for now as it doesn't work with cctools-port and current LLVM.
  # See https://github.com/godotengine/build-containers/pull/85.
-  #$SCONS platform=ios $OPTIONS $OPTIONS_MONO arch=arm64 target=template_debug $IOS_SIMULATOR $APPLE_TARGET_ARM64
-  #$SCONS platform=ios $OPTIONS $OPTIONS_MONO arch=arm64 target=template_release $IOS_SIMULATOR $APPLE_TARGET_ARM64
+  #$SCONS platform=ios $OPTIONS $OPTIONS_MONO arch=arm64 ios_simulator=yes target=template_debug \
+  #  IOS_SDK_PATH="/root/ioscross/arm64_sim/SDK/iPhoneSimulator${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/arm64_sim/" ios_triple="arm-apple-darwin11-"
+  #$SCONS platform=ios $OPTIONS $OPTIONS_MONO arch=arm64 ios_simulator=yes target=template_release \
+  #  IOS_SDK_PATH="/root/ioscross/arm64_sim/SDK/iPhoneSimulator${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/arm64_sim/" ios_triple="arm-apple-darwin11-"

  # x86_64 simulator
-  $SCONS platform=ios $OPTIONS $OPTIONS_MONO arch=x86_64 target=template_debug $IOS_SIMULATOR $APPLE_TARGET_X86_64
-  $SCONS platform=ios $OPTIONS $OPTIONS_MONO arch=x86_64 target=template_release $IOS_SIMULATOR $APPLE_TARGET_X86_64
+  $SCONS platform=ios $OPTIONS $OPTIONS_MONO arch=x86_64 ios_simulator=yes target=template_debug \
+    IOS_SDK_PATH="/root/ioscross/x86_64_sim/SDK/iPhoneSimulator${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/x86_64_sim/" ios_triple="x86_64-apple-darwin11-"
+  $SCONS platform=ios $OPTIONS $OPTIONS_MONO arch=x86_64 ios_simulator=yes target=template_release \
+    IOS_SDK_PATH="/root/ioscross/x86_64_sim/SDK/iPhoneSimulator${IOS_SDK}.sdk" IOS_TOOLCHAIN_PATH="/root/ioscross/x86_64_sim/" ios_triple="x86_64-apple-darwin11-"

  mkdir -p /root/out/templates-mono
+
  cp bin/libgodot.ios.template_release.arm64.a /root/out/templates-mono/libgodot.ios.a
  cp bin/libgodot.ios.template_debug.arm64.a /root/out/templates-mono/libgodot.ios.debug.a
+  #$IOS_LIPO -create bin/libgodot.ios.template_release.arm64.simulator.a bin/libgodot.ios.template_release.x86_64.simulator.a -output /root/out/templates-mono/libgodot.ios.simulator.a
+  #$IOS_LIPO -create bin/libgodot.ios.template_debug.arm64.simulator.a bin/libgodot.ios.template_debug.x86_64.simulator.a -output /root/out/templates-mono/libgodot.ios.debug.simulator.a
  cp bin/libgodot.ios.template_release.x86_64.simulator.a /root/out/templates-mono/libgodot.ios.simulator.a
  cp bin/libgodot.ios.template_debug.x86_64.simulator.a /root/out/templates-mono/libgodot.ios.debug.simulator.a
 fi

-# .NET
-
-if [ "${DOTNET}" == "1" ]; then
-  echo "Starting .NET build for iOS..."
-
-  # arm64 device
-  $SCONS platform=ios $OPTIONS $OPTIONS_DOTNET arch=arm64 target=template_debug $IOS_DEVICE $APPLE_TARGET_ARM64
-  $SCONS platform=ios $OPTIONS $OPTIONS_DOTNET arch=arm64 target=template_release $IOS_DEVICE $APPLE_TARGET_ARM64
-
-  # arm64 simulator
-  # Disabled for now as it doesn't work with cctools-port and current LLVM.
-  # See https://github.com/godotengine/build-containers/pull/85.
-  #$SCONS platform=ios $OPTIONS $OPTIONS_DOTNET arch=arm64 target=template_debug $IOS_SIMULATOR $APPLE_TARGET_ARM64
-  #$SCONS platform=ios $OPTIONS $OPTIONS_DOTNET arch=arm64 target=template_release $IOS_SIMULATOR $APPLE_TARGET_ARM64
-
-  # x86_64 simulator
-  $SCONS platform=ios $OPTIONS $OPTIONS_DOTNET arch=x86_64 target=template_debug $IOS_SIMULATOR $APPLE_TARGET_X86_64
-  $SCONS platform=ios $OPTIONS $OPTIONS_DOTNET arch=x86_64 target=template_release $IOS_SIMULATOR $APPLE_TARGET_X86_64
-
-  mkdir -p /root/out/templates-dotnet
-  cp bin/libgodot.ios.template_release.arm64.a /root/out/templates-dotnet/libgodot.ios.a
-  cp bin/libgodot.ios.template_debug.arm64.a /root/out/templates-dotnet/libgodot.ios.debug.a
-  cp bin/libgodot.ios.template_release.x86_64.simulator.a /root/out/templates-dotnet/libgodot.ios.simulator.a
-  cp bin/libgodot.ios.template_debug.x86_64.simulator.a /root/out/templates-dotnet/libgodot.ios.debug.simulator.a
-fi
-
 echo "iOS build successful"
--- a/build-linux/build.sh
+++ b/build-linux/build.sh
@@ -4,10 +4,9 @@ set -e

 # Config

-export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no redirect_build_objects=no"
-export OPTIONS="production=yes accesskit_sdk_path=/root/accesskit/accesskit-c"
+export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no"
+export OPTIONS="production=yes debug_symbols=yes separate_debug_symbols=yes debug_paths_relative=yes"
 export OPTIONS_MONO="module_mono_enabled=yes"
-export OPTIONS_DOTNET="module_dotnet_enabled=yes"
 export TERM=xterm

 rm -rf godot
@@ -15,6 +14,8 @@ mkdir godot
 cd godot
 tar xf /root/godot.tar.gz --strip-components=1

+dnf install -y binutils
+
 # Classical

 if [ "${CLASSICAL}" == "1" ]; then
@@ -138,62 +139,4 @@ if [ "${MONO}" == "1" ]; then
  rm -rf bin
 fi

-# .NET
-
-if [ "${DOTNET}" == "1" ]; then
-  echo "Starting .NET build for Linux..."
-
-  export PATH="${GODOT_SDK_LINUX_X86_64}/bin:${BASE_PATH}"
-
-  $SCONS platform=linuxbsd arch=x86_64 $OPTIONS $OPTIONS_DOTNET target=editor
-  mkdir -p /root/out/x86_64/tools-dotnet
-  cp -rvp bin/* /root/out/x86_64/tools-dotnet
-  rm -rf bin
-
-  $SCONS platform=linuxbsd arch=x86_64 $OPTIONS $OPTIONS_DOTNET target=template_debug
-  $SCONS platform=linuxbsd arch=x86_64 $OPTIONS $OPTIONS_DOTNET target=template_release
-  mkdir -p /root/out/x86_64/templates-dotnet
-  cp -rvp bin/* /root/out/x86_64/templates-dotnet
-  rm -rf bin
-
-  export PATH="${GODOT_SDK_LINUX_X86_32}/bin:${BASE_PATH}"
-
-  $SCONS platform=linuxbsd arch=x86_32 $OPTIONS $OPTIONS_DOTNET target=editor
-  mkdir -p /root/out/x86_32/tools-dotnet
-  cp -rvp bin/* /root/out/x86_32/tools-dotnet
-  rm -rf bin
-
-  $SCONS platform=linuxbsd arch=x86_32 $OPTIONS $OPTIONS_DOTNET target=template_debug
-  $SCONS platform=linuxbsd arch=x86_32 $OPTIONS $OPTIONS_DOTNET target=template_release
-  mkdir -p /root/out/x86_32/templates-dotnet
-  cp -rvp bin/* /root/out/x86_32/templates-dotnet
-  rm -rf bin
-
-  export PATH="${GODOT_SDK_LINUX_ARM64}/bin:${BASE_PATH}"
-
-  $SCONS platform=linuxbsd arch=arm64 $OPTIONS $OPTIONS_DOTNET target=editor
-  mkdir -p /root/out/arm64/tools-dotnet
-  cp -rvp bin/* /root/out/arm64/tools-dotnet
-  rm -rf bin
-
-  $SCONS platform=linuxbsd arch=arm64 $OPTIONS $OPTIONS_DOTNET target=template_debug
-  $SCONS platform=linuxbsd arch=arm64 $OPTIONS $OPTIONS_DOTNET target=template_release
-  mkdir -p /root/out/arm64/templates-dotnet
-  cp -rvp bin/* /root/out/arm64/templates-dotnet
-  rm -rf bin
-
-  export PATH="${GODOT_SDK_LINUX_ARM32}/bin:${BASE_PATH}"
-
-  $SCONS platform=linuxbsd arch=arm32 $OPTIONS $OPTIONS_DOTNET target=editor
-  mkdir -p /root/out/arm32/tools-dotnet
-  cp -rvp bin/* /root/out/arm32/tools-dotnet
-  rm -rf bin
-
-  $SCONS platform=linuxbsd arch=arm32 $OPTIONS $OPTIONS_DOTNET target=template_debug
-  $SCONS platform=linuxbsd arch=arm32 $OPTIONS $OPTIONS_DOTNET target=template_release
-  mkdir -p /root/out/arm32/templates-dotnet
-  cp -rvp bin/* /root/out/arm32/templates-dotnet
-  rm -rf bin
-fi
-
 echo "Linux build successful"
--- a/build-macos/build.sh
+++ b/build-macos/build.sh
@@ -4,10 +4,9 @@ set -e

 # Config

-export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no redirect_build_objects=no"
-export OPTIONS="osxcross_sdk=darwin25.1 production=yes use_volk=no vulkan_sdk_path=/root/moltenvk angle_libs=/root/angle accesskit_sdk_path=/root/accesskit/accesskit-c SWIFT_FRONTEND=/root/.local/share/swiftly/toolchains/6.2.1/usr/bin/swift-frontend"
+export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no"
+export OPTIONS="osxcross_sdk=darwin23.6 production=yes debug_symbols=yes separate_debug_symbols=yes debug_paths_relative=yes use_volk=no vulkan_sdk_path=/root/moltenvk angle_libs=/root/angle"
 export OPTIONS_MONO="module_mono_enabled=yes"
-export OPTIONS_DOTNET="module_dotnet_enabled=yes"
 export TERM=xterm

 rm -rf godot
@@ -69,29 +68,4 @@ if [ "${MONO}" == "1" ]; then
  rm -rf bin
 fi

-# .NET
-
-if [ "${DOTNET}" == "1" ]; then
-  echo "Starting .NET build for macOS..."
-
-  $SCONS platform=macos $OPTIONS $OPTIONS_DOTNET arch=x86_64 target=editor
-  $SCONS platform=macos $OPTIONS $OPTIONS_DOTNET arch=arm64 target=editor
-  lipo -create bin/godot.macos.editor.x86_64.dotnet bin/godot.macos.editor.arm64.dotnet -output bin/godot.macos.editor.universal.dotnet
-
-  mkdir -p /root/out/tools-dotnet
-  cp -rvp bin/* /root/out/tools-dotnet
-  rm -rf bin
-
-  $SCONS platform=macos $OPTIONS $OPTIONS_DOTNET arch=x86_64 target=template_debug
-  $SCONS platform=macos $OPTIONS $OPTIONS_DOTNET arch=arm64 target=template_debug
-  lipo -create bin/godot.macos.template_debug.x86_64.dotnet bin/godot.macos.template_debug.arm64.dotnet -output bin/godot.macos.template_debug.universal.dotnet
-  $SCONS platform=macos $OPTIONS $OPTIONS_DOTNET arch=x86_64 target=template_release
-  $SCONS platform=macos $OPTIONS $OPTIONS_DOTNET arch=arm64 target=template_release
-  lipo -create bin/godot.macos.template_release.x86_64.dotnet bin/godot.macos.template_release.arm64.dotnet -output bin/godot.macos.template_release.universal.dotnet
-
-  mkdir -p /root/out/templates-dotnet
-  cp -rvp bin/* /root/out/templates-dotnet
-  rm -rf bin
-fi
-
 echo "macOS build successful"
--- a/build-release.sh
+++ b/build-release.sh
@@ -3,26 +3,23 @@
 set -e
 export basedir=$(pwd)

-# Log output to a file automatically.
-exec > >(tee -a "out/logs/build-release") 2>&1
-
 # Config

 # For signing keystore and password.
 source ./config.sh

 can_sign_windows=0
-if [ ! -z "${WINDOWS_SIGN_NAME}" ] && [ ! -z "${WINDOWS_SIGN_URL}" ] && [[ $(type -P "osslsigncode") ]]; then
+if [ ! -z "${SIGN_KEYSTORE}" ] && [ ! -z "${SIGN_PASSWORD}" ] && [[ $(type -P "osslsigncode") ]]; then
  can_sign_windows=1
 else
-  echo "Disabling Windows binary signing as config.sh does not define the required data (WINDOWS_SIGN_NAME, WINDOWS_SIGN_URL), or osslsigncode can't be found in PATH."
+  echo "Disabling Windows binary signing as config.sh does not define the required data (SIGN_KEYSTORE, SIGN_PASSWORD), or osslsigncode can't be found in PATH."
 fi

 sign_windows() {
  if [ $can_sign_windows == 0 ]; then
    return
  fi
-  P11_KIT_SERVER_ADDRESS=unix:path=/run/p11-kit/p11kit.sock osslsigncode sign -pkcs11module /usr/lib64/pkcs11/p11-kit-client.so -pkcs11cert 'pkcs11:model=SimplySign%20C' -key 'pkcs11:model=SimplySign%20C' -t http://time.certum.pl/ -n "${WINDOWS_SIGN_NAME}" -i "${WINDOWS_SIGN_URL}" -in $1 -out $1-signed
+  osslsigncode sign -pkcs12 ${SIGN_KEYSTORE} -pass "${SIGN_PASSWORD}" -n "${SIGN_NAME}" -i "${SIGN_URL}" -t http://timestamp.comodoca.com -in $1 -out $1-signed
  mv $1-signed $1
 }

@@ -33,10 +30,13 @@ sign_macos() {
  _macos_tmpdir=$(ssh "${OSX_HOST}" "mktemp -d")
  _reldir="$1"
  _binname="$2"
-  _appname="$3"
+  _is_mono="$3"

-  if [[ "${_appname}" == "Godot_mono.app" ]]; then
+  if [[ "${_is_mono}" == "1" ]]; then
+    _appname="Godot_mono.app"
    _sharpdir="${_appname}/Contents/Resources/GodotSharp"
+  else
+    _appname="Godot.app"
  fi

  scp "${_reldir}/${_binname}.zip" "${OSX_HOST}:${_macos_tmpdir}"
@@ -73,6 +73,7 @@ sign_macos_template() {
  fi
  _macos_tmpdir=$(ssh "${OSX_HOST}" "mktemp -d")
  _reldir="$1"
+  _is_mono="$2"

  scp "${_reldir}/macos.zip" "${OSX_HOST}:${_macos_tmpdir}"
  ssh "${OSX_HOST}" "
@@ -93,7 +94,6 @@ do_cleanup=1
 make_tarball=1
 build_classical=1
 build_mono=1
-build_dotnet=0

 while getopts "h?v:t:b:n-:" opt; do
  case "$opt" in
@@ -102,7 +102,7 @@ while getopts "h?v:t:b:n-:" opt; do
    echo
    echo "  -v godot version (e.g: 3.2-stable) [mandatory]"
    echo "  -t templates version (e.g. 3.2.stable) [mandatory]"
-    echo "  -b build target: all|classical|mono|dotnet|none (default: all)"
+    echo "  -b build target: all|classical|mono|none (default: all)"
    echo "  --no-cleanup disable deleting pre-existing output folders (default: false)"
    echo "  --no-tarball disable generating source tarball (default: false)"
    echo
@@ -116,21 +116,12 @@ while getopts "h?v:t:b:n-:" opt; do
    ;;
  b)
    if [ "$OPTARG" == "classical" ]; then
-      build_classical=1
      build_mono=0
-      build_dotnet=0
    elif [ "$OPTARG" == "mono" ]; then
      build_classical=0
-      build_mono=1
-      build_dotnet=0
-    elif [ "$OPTARG" == "dotnet" ]; then
-      build_classical=0
-      build_mono=0
-      build_dotnet=1
    elif [ "$OPTARG" == "none" ]; then
      build_classical=0
      build_mono=0
-      build_dotnet=0
    fi
    ;;
  -)
@@ -160,15 +151,12 @@ elif [[ "{$templates_version}" == *"-"* ]]; then
  exit 1
 fi

+export webdir="${basedir}/web/${templates_version}"
 export reldir="${basedir}/releases/${godot_version}"
 export reldir_mono="${reldir}/mono"
-export reldir_dotnet="${reldir}/dotnet"
 export tmpdir="${basedir}/tmp"
 export templatesdir="${tmpdir}/templates"
 export templatesdir_mono="${tmpdir}/mono/templates"
-export templatesdir_dotnet="${tmpdir}/dotnet/templates"
-export webdir="${basedir}/web/${templates_version}"
-export steamdir="${basedir}/steam"

 export godot_basename="Godot_v${godot_version}"

@@ -176,25 +164,15 @@ export godot_basename="Godot_v${godot_version}"

 if [ "${do_cleanup}" == "1" ]; then

+  rm -rf ${webdir}
  rm -rf ${reldir}
  rm -rf ${tmpdir}
-  rm -rf ${webdir}
-  rm -rf ${steamdir}

+  mkdir -p ${webdir}
  mkdir -p ${reldir}
-  if [ "${build_mono}" ]; then
-    mkdir -p ${reldir_mono}
-  fi
-  if [ "${build_dotnet}" ]; then
-    mkdir -p ${reldir_dotnet}
-  fi
+  mkdir -p ${reldir_mono}
  mkdir -p ${templatesdir}
  mkdir -p ${templatesdir_mono}
-  mkdir -p ${templatesdir_dotnet}
-  mkdir -p ${webdir}
-  if [ -d out/windows/steam ]; then
-    mkdir -p ${steamdir}
-  fi

 fi

@@ -236,13 +214,6 @@ if [ "${build_classical}" == "1" ]; then
  zip -q -9 "${reldir}/${binname}.zip" ${binname}
  rm ${binname}

-  # ICU data
-  if [ -f ${basedir}/git/thirdparty/icu4c/icudt_godot.dat ]; then
-    cp ${basedir}/git/thirdparty/icu4c/icudt_godot.dat ${templatesdir}/icudt_godot.dat
-  else
-    echo "icudt_godot.dat" not found.
-  fi
-
  # Templates
  cp out/linux/x86_64/templates/godot.linuxbsd.template_release.x86_64 ${templatesdir}/linux_release.x86_64
  cp out/linux/x86_64/templates/godot.linuxbsd.template_debug.x86_64 ${templatesdir}/linux_debug.x86_64
@@ -308,7 +279,7 @@ if [ "${build_classical}" == "1" ]; then
  chmod +x Godot.app/Contents/MacOS/Godot
  zip -q -9 -r "${reldir}/${binname}.zip" Godot.app
  rm -rf Godot.app
-  sign_macos ${reldir} ${binname} Godot.app
+  sign_macos ${reldir} ${binname} 0

  # Templates
  rm -rf macos_template.app
@@ -320,21 +291,7 @@ if [ "${build_classical}" == "1" ]; then
  chmod +x macos_template.app/Contents/MacOS/godot_macos*
  zip -q -9 -r "${templatesdir}/macos.zip" macos_template.app
  rm -rf macos_template.app
-  sign_macos_template ${templatesdir}
-
-  ## Steam (Classical) ##
-
-  if [ -d out/windows/steam ]; then
-    cp out/windows/steam/godot.windows.editor.x86_64.exe ${steamdir}/godot.windows.opt.tools.64.exe
-    cp out/windows/steam/godot.windows.editor.x86_32.exe ${steamdir}/godot.windows.opt.tools.32.exe
-    sign_windows ${steamdir}/godot.windows.opt.tools.64.exe
-    sign_windows ${steamdir}/godot.windows.opt.tools.32.exe
-    unzip ${reldir}/${godot_basename}_linux.x86_64.zip -d ${steamdir}/
-    unzip ${reldir}/${godot_basename}_linux.x86_32.zip -d ${steamdir}/
-    mv ${steamdir}/{${godot_basename}_linux.x86_64,godot.x11.opt.tools.64}
-    mv ${steamdir}/{${godot_basename}_linux.x86_32,godot.x11.opt.tools.32}
-    unzip ${reldir}/${godot_basename}_macos.universal -d ${steamdir}/
-  fi
+  sign_macos_template ${templatesdir} 0

  ## Web (Classical) ##

@@ -367,8 +324,6 @@ if [ "${build_classical}" == "1" ]; then
  cp out/android/tools/android_editor.apk ${reldir}/${binname}
  binname="${godot_basename}_android_editor_horizonos.apk"
  cp out/android/tools/android_editor_horizonos.apk ${reldir}/${binname}
-  binname="${godot_basename}_android_editor_picoos.apk"
-  cp out/android/tools/android_editor_picoos.apk ${reldir}/${binname}
  binname="${godot_basename}_android_editor.aab"
  cp out/android/tools/android_editor.aab ${reldir}/${binname}

@@ -376,14 +331,10 @@ if [ "${build_classical}" == "1" ]; then
  cp out/android/templates/*.apk ${templatesdir}/
  cp out/android/templates/android_source.zip ${templatesdir}/

-  # Native debug symbols
-  cp out/android/templates/android_release_template_native_debug_symbols.zip ${reldir}/Godot_native_debug_symbols.${templates_version}.template_release.android.zip
-  cp out/android/tools/android_editor_native_debug_symbols.zip ${reldir}/Godot_native_debug_symbols.${templates_version}.editor.android.zip
-
  ## iOS (Classical) ##

  rm -rf ios_xcode
-  cp -r git/misc/dist/apple_embedded_xcode ios_xcode
+  cp -r git/misc/dist/ios_xcode ios_xcode
  cp out/ios/templates/libgodot.ios.simulator.a ios_xcode/libgodot.ios.release.xcframework/ios-arm64_x86_64-simulator/libgodot.a
  cp out/ios/templates/libgodot.ios.debug.simulator.a ios_xcode/libgodot.ios.debug.xcframework/ios-arm64_x86_64-simulator/libgodot.a
  cp out/ios/templates/libgodot.ios.a ios_xcode/libgodot.ios.release.xcframework/ios-arm64/libgodot.a
@@ -395,17 +346,6 @@ if [ "${build_classical}" == "1" ]; then
  cd ..
  rm -rf ios_xcode

-  ## visionOS (Classical) ##
-
-  #rm -rf visionos_xcode
-  #cp -r git/misc/dist/apple_embedded_xcode visionos_xcode
-  #cp out/visionos/templates/libgodot.visionos.a visionos_xcode/libgodot.visionos.release.xcframework/xros-arm64/libgodot.a
-  #cp out/visionos/templates/libgodot.visionos.debug.a visionos_xcode/libgodot.visionos.debug.xcframework/xros-arm64/libgodot.a
-  #cd visionos_xcode
-  #zip -q -9 -r "${templatesdir}/visionos.zip" *
-  #cd ..
-  #rm -rf visionos_xcode
-
  ## Templates TPZ (Classical) ##

  echo "${templates_version}" > ${templatesdir}/version.txt
@@ -458,13 +398,6 @@ if [ "${build_mono}" == "1" ]; then
  zip -r -q -9 "${reldir_mono}/${binbasename}_arm32.zip" ${binbasename}_arm32
  rm -rf ${binbasename}_arm32

-  # ICU data
-  if [ -f ${basedir}/git/thirdparty/icu4c/icudt_godot.dat ]; then
-    cp ${basedir}/git/thirdparty/icu4c/icudt_godot.dat ${templatesdir_mono}/icudt_godot.dat
-  else
-    echo "icudt_godot.dat" not found.
-  fi
-
  # Templates
  cp out/linux/x86_64/templates-mono/godot.linuxbsd.template_debug.x86_64.mono ${templatesdir_mono}/linux_debug.x86_64
  cp out/linux/x86_64/templates-mono/godot.linuxbsd.template_release.x86_64.mono ${templatesdir_mono}/linux_release.x86_64
@@ -537,7 +470,7 @@ if [ "${build_mono}" == "1" ]; then
  chmod +x Godot_mono.app/Contents/MacOS/Godot
  zip -q -9 -r "${reldir_mono}/${binname}.zip" Godot_mono.app
  rm -rf Godot_mono.app
-  sign_macos ${reldir_mono} ${binname} Godot_mono.app
+  sign_macos ${reldir_mono} ${binname} 1

  # Templates
  rm -rf macos_template.app
@@ -548,7 +481,7 @@ if [ "${build_mono}" == "1" ]; then
  chmod +x macos_template.app/Contents/MacOS/godot_macos*
  zip -q -9 -r "${templatesdir_mono}/macos.zip" macos_template.app
  rm -rf macos_template.app
-  sign_macos_template ${templatesdir_mono}
+  sign_macos_template ${templatesdir_mono} 1

  ## Android (Mono) ##

@@ -562,7 +495,7 @@ if [ "${build_mono}" == "1" ]; then
  ## iOS (Mono) ##

  rm -rf ios_xcode
-  cp -r git/misc/dist/apple_embedded_xcode ios_xcode
+  cp -r git/misc/dist/ios_xcode ios_xcode
  cp out/ios/templates-mono/libgodot.ios.simulator.a ios_xcode/libgodot.ios.release.xcframework/ios-arm64_x86_64-simulator/libgodot.a
  cp out/ios/templates-mono/libgodot.ios.debug.simulator.a ios_xcode/libgodot.ios.debug.xcframework/ios-arm64_x86_64-simulator/libgodot.a
  cp out/ios/templates-mono/libgodot.ios.a ios_xcode/libgodot.ios.release.xcframework/ios-arm64/libgodot.a
@@ -574,17 +507,6 @@ if [ "${build_mono}" == "1" ]; then
  cd ..
  rm -rf ios_xcode

-  ## visionOS (Mono) ##
-
-  #rm -rf visionos_xcode
-  #cp -r git/misc/dist/apple_embedded_xcode visionos_xcode
-  #cp out/visionos/templates-mono/libgodot.visionos.a visionos_xcode/libgodot.visionos.release.xcframework/xros-arm64/libgodot.a
-  #cp out/visionos/templates-mono/libgodot.visionos.debug.a visionos_xcode/libgodot.visionos.debug.xcframework/xros-arm64/libgodot.a
-  #cd visionos_xcode
-  #zip -q -9 -r "${templatesdir_mono}/visionos.zip" *
-  #cd ..
-  #rm -rf visionos_xcode
-
  # No .NET support for those platforms yet.

  if false; then
@@ -614,153 +536,4 @@ if [ "${build_mono}" == "1" ]; then

 fi

-# .NET
-
-if [ "${build_dotnet}" == "1" ]; then
-
-  ## Linux (.NET) ##
-
-  for arch in x86_64 x86_32 arm64 arm32; do
-    # Editor
-    binname="${godot_basename}_dotnet_linux.${arch}"
-    cp out/linux/${arch}/tools-dotnet/godot.linuxbsd.editor.${arch}.dotnet ${binname}
-    zip -r -q -9 "${reldir_dotnet}/${binname}.zip" ${binname}
-    rm ${binname}
-
-    # Templates
-    cp out/linux/${arch}/templates-dotnet/godot.linuxbsd.template_debug.${arch}.dotnet ${templatesdir_dotnet}/linux_debug.${arch}
-    cp out/linux/${arch}/templates-dotnet/godot.linuxbsd.template_release.${arch}.dotnet ${templatesdir_dotnet}/linux_release.${arch}
-  done
-
-  # ICU data
-  if [ -f ${basedir}/git/thirdparty/icu4c/icudt_godot.dat ]; then
-    cp ${basedir}/git/thirdparty/icu4c/icudt_godot.dat ${templatesdir_dotnet}/icudt_godot.dat
-  else
-    echo "icudt_godot.dat" not found.
-  fi
-
-  ## Windows (.NET) ##
-
-  declare -A win_arch_map=(
-    ["x86_64"]="win64"
-    ["x86_32"]="win32"
-    ["arm64"]="arm64"
-  )
-
-  for arch in x86_64 x86_32 arm64; do
-    # Editor
-    winarch=${win_arch_map[${arch}]}
-    binname="${godot_basename}_dotnet_${winarch}.exe"
-    wrpname="${godot_basename}_dotnet_${winarch}_console.exe"
-    [[ "${arch}" == "arm64" ]] && is_llvm=".llvm"
-    cp out/windows/${arch}/tools-dotnet/godot.windows.editor.${arch}${is_llvm}.dotnet.exe ${binname}
-    sign_windows ${binname}
-    cp out/windows/${arch}/tools-dotnet/godot.windows.editor.${arch}${is_llvm}.dotnet.console.exe ${wrpname}
-    sign_windows ${wrpname}
-    zip -r -q -9 "${reldir_dotnet}/${binname}.zip" ${binname} ${wrpname}
-    rm ${binname} ${wrpname}
-
-    # Templates
-    cp out/windows/${arch}/templates-dotnet/godot.windows.template_debug.${arch}${is_llvm}.dotnet.exe ${templatesdir_dotnet}/windows_debug_${arch}.exe
-    cp out/windows/${arch}/templates-dotnet/godot.windows.template_release.${arch}${is_llvm}.dotnet.exe ${templatesdir_dotnet}/windows_release_${arch}.exe
-    cp out/windows/${arch}/templates-dotnet/godot.windows.template_debug.${arch}${is_llvm}.dotnet.console.exe ${templatesdir_dotnet}/windows_debug_${arch}_console.exe
-    cp out/windows/${arch}/templates-dotnet/godot.windows.template_release.${arch}${is_llvm}.dotnet.console.exe ${templatesdir_dotnet}/windows_release_${arch}_console.exe
-  done
-
-  ## macOS (.NET) ##
-
-  # Editor
-  binname="${godot_basename}_dotnet_macos.universal"
-  rm -rf Godot_dotnet.app
-  cp -r git/misc/dist/macos_tools.app Godot_dotnet.app
-  mkdir -p Godot_dotnet.app/Contents/MacOS
-  cp out/macos/tools-dotnet/godot.macos.editor.universal.dotnet Godot_dotnet.app/Contents/MacOS/Godot
-  chmod +x Godot_dotnet.app/Contents/MacOS/Godot
-  zip -q -9 -r "${reldir_dotnet}/${binname}.zip" Godot_dotnet.app
-  rm -rf Godot_dotnet.app
-  sign_macos ${reldir_dotnet} ${binname} Godot_dotnet.app
-
-  # Templates
-  rm -rf macos_template.app
-  cp -r git/misc/dist/macos_template.app .
-  mkdir -p macos_template.app/Contents/MacOS
-  cp out/macos/templates-dotnet/godot.macos.template_debug.universal.dotnet macos_template.app/Contents/MacOS/godot_macos_debug.universal
-  cp out/macos/templates-dotnet/godot.macos.template_release.universal.dotnet macos_template.app/Contents/MacOS/godot_macos_release.universal
-  chmod +x macos_template.app/Contents/MacOS/godot_macos*
-  zip -q -9 -r "${templatesdir_dotnet}/macos.zip" macos_template.app
-  rm -rf macos_template.app
-  sign_macos_template ${templatesdir_dotnet}
-
-  ## Android (.NET) ##
-
-  # Lib for direct download
-  cp out/android/templates-dotnet/godot-lib.template_release.aar ${reldir_dotnet}/godot-lib.${templates_version}.dotnet.template_release.aar
-
-  # Templates
-  cp out/android/templates-dotnet/*.apk ${templatesdir_dotnet}/
-  cp out/android/templates-dotnet/android_source.zip ${templatesdir_dotnet}/
-
-  ## iOS (.NET) ##
-
-  rm -rf ios_xcode
-  cp -r git/misc/dist/apple_embedded_xcode ios_xcode
-  cp out/ios/templates-dotnet/libgodot.ios.simulator.a ios_xcode/libgodot.ios.release.xcframework/ios-arm64_x86_64-simulator/libgodot.a
-  cp out/ios/templates-dotnet/libgodot.ios.debug.simulator.a ios_xcode/libgodot.ios.debug.xcframework/ios-arm64_x86_64-simulator/libgodot.a
-  cp out/ios/templates-dotnet/libgodot.ios.a ios_xcode/libgodot.ios.release.xcframework/ios-arm64/libgodot.a
-  cp out/ios/templates-dotnet/libgodot.ios.debug.a ios_xcode/libgodot.ios.debug.xcframework/ios-arm64/libgodot.a
-  cp -r deps/moltenvk/MoltenVK/MoltenVK.xcframework ios_xcode/
-  rm -rf ios_xcode/MoltenVK.xcframework/{macos,tvos}*
-  cd ios_xcode
-  zip -q -9 -r "${templatesdir_dotnet}/ios.zip" *
-  cd ..
-  rm -rf ios_xcode
-
-  ## visionOS (.NET) ##
-
-  #rm -rf visionos_xcode
-  #cp -r git/misc/dist/apple_embedded_xcode visionos_xcode
-  #cp out/visionos/templates-dotnet/libgodot.visionos.a visionos_xcode/libgodot.visionos.release.xcframework/xros-arm64/libgodot.a
-  #cp out/visionos/templates-dotnet/libgodot.visionos.debug.a visionos_xcode/libgodot.visionos.debug.xcframework/xros-arm64/libgodot.a
-  #cd visionos_xcode
-  #zip -q -9 -r "${templatesdir_dotnet}/visionos.zip" *
-  #cd ..
-  #rm -rf visionos_xcode
-
-  # No .NET support for those platforms yet.
-
-  if false; then
-
-  ## Web (.NET) ##
-
-  # Templates
-  cp out/web/templates-dotnet/godot.web.template_debug.wasm32.dotnet.zip ${templatesdir_dotnet}/web_debug.zip
-  cp out/web/templates-dotnet/godot.web.template_release.wasm32.dotnet.zip ${templatesdir_dotnet}/web_release.zip
-
-  fi
-
-  ## Templates TPZ (.NET) ##
-
-  echo "${templates_version}.dotnet" > ${templatesdir_dotnet}/version.txt
-  pushd ${templatesdir_dotnet}/..
-  zip -q -9 -r -D "${reldir_dotnet}/${godot_basename}_dotnet_export_templates.tpz" templates/*
-  popd
-
-  ## .NET bindings ##
-
-  dotnetname="godot-dotnet-${templates_version}"
-  mkdir ${dotnetname}
-  cp out/dotnet/* ${dotnetname}/
-  zip -q -9 -r "${reldir_dotnet}/${dotnetname}.zip" ${dotnetname}
-  rm -rf ${dotnetname}
-
-  ## SHA-512 sums (.NET) ##
-
-  pushd ${reldir_dotnet}
-  sha512sum [Gg]* >> SHA512-SUMS.txt
-  mkdir -p ${basedir}/sha512sums/${godot_version}/dotnet
-  cp SHA512-SUMS.txt ${basedir}/sha512sums/${godot_version}/dotnet/
-  popd
-
-fi
-
 echo "All editor binaries and templates prepared successfully for release"
--- a/build-visionos/build.sh
+++ b/build-visionos/build.sh
@@ -1,82 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Config
-
-export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no redirect_build_objects=no"
-# Keep LTO disabled for visionOS - it works but it makes linking apps on deploy very slow,
-# which is seen as a regression in the current workflow.
-# Disable Vulkan and MoltenVK for visionOS - visionOS doesn't support MoltenVK.
-export OPTIONS="production=yes use_lto=no vulkan=no SWIFT_FRONTEND=/root/.local/share/swiftly/toolchains/6.2.0/usr/bin/swift-frontend"
-export OPTIONS_MONO="module_mono_enabled=yes"
-export OPTIONS_DOTNET="module_dotnet_enabled=yes"
-export TERM=xterm
-
-export VISIONOS_SDK="26.0"
-export VISIONOS_DEVICE="VISIONOS_SDK_PATH=/root/Xcode.app/Contents/Developer/Platforms/XROS.platform/Developer/SDKs/XROS${VISIONOS_SDK}.sdk"
-export VISIONOS_SIMULATOR="VISIONOS_SDK_PATH=/root/Xcode.app/Contents/Developer/Platforms/XRSimulator.platform/Developer/SDKs/XRSimulator${VISIONOS_SDK}.sdk"
-export APPLE_TARGET_ARM64="APPLE_TOOLCHAIN_PATH=/root/ioscross/arm64 apple_target_triple=arm-apple-darwin11-"
-
-rm -rf godot
-mkdir godot
-cd godot
-tar xf /root/godot.tar.gz --strip-components=1
-
-# Classical
-
-if [ "${CLASSICAL}" == "1" ]; then
-  echo "Starting classical build for visionOS..."
-
-  # arm64 device
-  $SCONS platform=visionos $OPTIONS arch=arm64 target=template_debug $VISIONOS_DEVICE $APPLE_TARGET_ARM64
-  $SCONS platform=visionos $OPTIONS arch=arm64 target=template_release $VISIONOS_DEVICE $APPLE_TARGET_ARM64
-
-  # arm64 simulator (disabled for now, see build-ios)
-  #$SCONS platform=visionos $OPTIONS arch=arm64 target=template_debug $VISIONOS_SIMULATOR $APPLE_TARGET_ARM64
-  #$SCONS platform=visionos $OPTIONS arch=arm64 target=template_release $VISIONOS_SIMULATOR $APPLE_TARGET_ARM64
-
-  mkdir -p /root/out/templates
-  cp bin/libgodot.visionos.template_release.arm64.a /root/out/templates/libgodot.visionos.a
-  cp bin/libgodot.visionos.template_debug.arm64.a /root/out/templates/libgodot.visionos.debug.a
-fi
-
-# Mono
-
-if [ "${MONO}" == "1" ]; then
-  echo "Starting Mono build for visionOS..."
-
-  cp -r /root/mono-glue/GodotSharp/GodotSharp/Generated modules/mono/glue/GodotSharp/GodotSharp/
-
-  # arm64 device
-  $SCONS platform=visionos $OPTIONS $OPTIONS_MONO arch=arm64 target=template_debug $VISIONOS_DEVICE $APPLE_TARGET_ARM64
-  $SCONS platform=visionos $OPTIONS $OPTIONS_MONO arch=arm64 target=template_release $VISIONOS_DEVICE $APPLE_TARGET_ARM64
-
-  # arm64 simulator (disabled for now, see build-ios)
-  #$SCONS platform=visionos $OPTIONS $OPTIONS_MONO arch=arm64 target=template_debug $VISIONOS_SIMULATOR $APPLE_TARGET_ARM64
-  #$SCONS platform=visionos $OPTIONS $OPTIONS_MONO arch=arm64 target=template_release $VISIONOS_SIMULATOR $APPLE_TARGET_ARM64
-
-  mkdir -p /root/out/templates-mono
-  cp bin/libgodot.visionos.template_release.arm64.a /root/out/templates-mono/libgodot.visionos.a
-  cp bin/libgodot.visionos.template_debug.arm64.a /root/out/templates-mono/libgodot.visionos.debug.a
-fi
-
-# .NET
-
-if [ "${DOTNET}" == "1" ]; then
-  echo "Starting .NET build for visionOS..."
-
-  # arm64 device
-  $SCONS platform=visionos $OPTIONS $OPTIONS_DOTNET arch=arm64 target=template_debug $VISIONOS_DEVICE $APPLE_TARGET_ARM64
-  $SCONS platform=visionos $OPTIONS $OPTIONS_DOTNET arch=arm64 target=template_release $VISIONOS_DEVICE $APPLE_TARGET_ARM64
-
-  # arm64 simulator (disabled for now, see build-ios)
-  #$SCONS platform=visionos $OPTIONS $OPTIONS_DOTNET arch=arm64 target=template_debug $VISIONOS_SIMULATOR $APPLE_TARGET_ARM64
-  #$SCONS platform=visionos $OPTIONS $OPTIONS_DOTNET arch=arm64 target=template_release $VISIONOS_SIMULATOR $APPLE_TARGET_ARM64
-
-  mkdir -p /root/out/templates-dotnet
-  cp bin/libgodot.visionos.template_release.arm64.a /root/out/templates-dotnet/libgodot.visionos.a
-  cp bin/libgodot.visionos.template_debug.arm64.a /root/out/templates-dotnet/libgodot.visionos.debug.a
-fi
-
-echo "visionOS build successful"
--- a/build-web/build.sh
+++ b/build-web/build.sh
@@ -20,10 +20,9 @@ declare -a JOBS_NOTHREADS=(
  "target=template_release dlink_enabled=yes threads=no"
 )

-export SCONS="scons -j$(expr ${NUM_CORES} / ${NUM_JOBS}) verbose=yes warnings=no progress=no redirect_build_objects=no"
+export SCONS="scons -j$(expr ${NUM_CORES} / ${NUM_JOBS}) verbose=yes warnings=no progress=no"
 export OPTIONS="production=yes"
 export OPTIONS_MONO="module_mono_enabled=yes -j${NUM_CORES}"
-export OPTIONS_MONO="module_dotnet_enabled=yes -j${NUM_CORES}"
 export TERM=xterm

 source /root/emsdk/emsdk_env.sh
@@ -95,26 +94,4 @@ if false; then
  rm -f bin/*.zip
 fi

-
-
-
-# .NET
-
-
-
-
-
-# No Web support with .NET yet.
-#if [ "${DOTNET}" == "1" ]; then
-if false; then
-  echo "Starting .NET build for Web..."
-
-  $SCONS platform=web ${OPTIONS} ${OPTIONS_DOTNET} target=template_debug
-  $SCONS platform=web ${OPTIONS} ${OPTIONS_DOTNET} target=template_release
-
-  mkdir -p /root/out/templates-dotnet
-  cp -rvp bin/*.zip /root/out/templates-dotnet
-  rm -f bin/*.zip
-fi
-
 echo "Web build successful"
--- a/build-windows/build.sh
+++ b/build-windows/build.sh
@@ -4,10 +4,9 @@ set -e

 # Config

-export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no redirect_build_objects=no"
-export OPTIONS="production=yes use_mingw=yes angle_libs=/root/angle mesa_libs=/root/mesa d3d12=yes accesskit_sdk_path=/root/accesskit/accesskit-c"
+export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no"
+export OPTIONS="production=yes debug_symbols=yes separate_debug_symbols=yes debug_paths_relative=yes use_mingw=yes angle_libs=/root/angle mesa_libs=/root/mesa d3d12=yes"
 export OPTIONS_MONO="module_mono_enabled=yes"
-export OPTIONS_DOTNET="module_dotnet_enabled=yes"
 export OPTIONS_LLVM="use_llvm=yes mingw_prefix=/root/llvm-mingw"
 export TERM=xterm

@@ -111,43 +110,4 @@ if [ "${MONO}" == "1" ]; then
  rm -rf bin
 fi

-# .NET
-
-if [ "${DOTNET}" == "1" ]; then
-  echo "Starting .NET build for Windows..."
-
-  $SCONS platform=windows arch=x86_64 $OPTIONS $OPTIONS_DOTNET target=editor
-  mkdir -p /root/out/x86_64/tools-dotnet
-  cp -rvp bin/* /root/out/x86_64/tools-dotnet
-  rm -rf bin
-
-  $SCONS platform=windows arch=x86_64 $OPTIONS $OPTIONS_DOTNET target=template_debug
-  $SCONS platform=windows arch=x86_64 $OPTIONS $OPTIONS_DOTNET target=template_release
-  mkdir -p /root/out/x86_64/templates-dotnet
-  cp -rvp bin/* /root/out/x86_64/templates-dotnet
-  rm -rf bin
-
-  $SCONS platform=windows arch=x86_32 $OPTIONS $OPTIONS_DOTNET target=editor
-  mkdir -p /root/out/x86_32/tools-dotnet
-  cp -rvp bin/* /root/out/x86_32/tools-dotnet
-  rm -rf bin
-
-  $SCONS platform=windows arch=x86_32 $OPTIONS $OPTIONS_DOTNET target=template_debug
-  $SCONS platform=windows arch=x86_32 $OPTIONS $OPTIONS_DOTNET target=template_release
-  mkdir -p /root/out/x86_32/templates-dotnet
-  cp -rvp bin/* /root/out/x86_32/templates-dotnet
-  rm -rf bin
-
-  $SCONS platform=windows arch=arm64 $OPTIONS $OPTIONS_DOTNET $OPTIONS_LLVM target=editor
-  mkdir -p /root/out/arm64/tools-dotnet
-  cp -rvp bin/* /root/out/arm64/tools-dotnet
-  rm -rf bin
-
-  $SCONS platform=windows arch=arm64 $OPTIONS $OPTIONS_DOTNET $OPTIONS_LLVM target=template_debug
-  $SCONS platform=windows arch=arm64 $OPTIONS $OPTIONS_DOTNET $OPTIONS_LLVM target=template_release
-  mkdir -p /root/out/arm64/templates-dotnet
-  cp -rvp bin/* /root/out/arm64/templates-dotnet
-  rm -rf bin
-fi
-
 echo "Windows build successful"
--- a/build.sh
+++ b/build.sh
@@ -4,14 +4,6 @@ set -e

 OPTIND=1

-export basedir="$(pwd)"
-mkdir -p ${basedir}/out
-mkdir -p ${basedir}/out/logs
-mkdir -p ${basedir}/mono-glue
-
-# Log output to a file automatically.
-exec > >(tee -a "out/logs/build") 2>&1
-
 # Config

 # For default registry and number of cores.
@@ -36,7 +28,6 @@ godot_version=""
 git_treeish="master"
 build_classical=1
 build_mono=1
-build_dotnet=0
 build_steam=0
 force_download=0
 skip_download=1
@@ -52,7 +43,7 @@ while getopts "h?r:u:p:v:g:b:fsc" opt; do
    echo "  -p password"
    echo "  -v godot version (e.g. 3.1-alpha5) [mandatory]"
    echo "  -g git treeish (e.g. master)"
-    echo "  -b all|classical|mono|dotnet (default: all)"
+    echo "  -b all|classical|mono (default: all)"
    echo "  -f force redownload of all images"
    echo "  -s skip downloading"
    echo "  -c skip checkout"
@@ -76,17 +67,9 @@ while getopts "h?r:u:p:v:g:b:fsc" opt; do
    ;;
  b)
    if [ "$OPTARG" == "classical" ]; then
-      build_classical=1
      build_mono=0
-      build_dotnet=0
    elif [ "$OPTARG" == "mono" ]; then
      build_classical=0
-      build_mono=1
-      build_dotnet=0
-    elif [ "$OPTARG" == "dotnet" ]; then
-      build_classical=0
-      build_mono=0
-      build_dotnet=1
    fi
    ;;
  f)
@@ -142,7 +125,7 @@ if [ $skip_download == 0 ]; then
  if [ ! -z "${logged_in}" ]; then
    echo "Fetching private images"

-    for image in macosx android appleembedded; do
+    for image in macosx android ios; do
      if [ ${force_download} == 1 ] || ! ${podman} image exists godot-private/$image; then
        if ! ${podman} pull ${registry}/godot-private/${image}; then
          echo "ERROR: image $image does not exist and can't be downloaded"
@@ -165,26 +148,15 @@ if [ ! -d "deps/moltenvk" ]; then
  popd
 fi

-# accesskit-c for Windows, macOS and Linux
-if [ ! -d "deps/accesskit" ]; then
-  echo "Missing accesskit, downloading it."
-  mkdir -p deps/accesskit
-  pushd deps/accesskit
-  curl -L -o accesskit.zip https://github.com/godotengine/godot-accesskit-c-static/releases/download/0.18.0/accesskit-c-0.18.0.zip
-  unzip -o accesskit.zip && rm -f accesskit.zip
-  mv accesskit-c-* accesskit-c
-  popd
-fi
-
 # Windows and macOS need ANGLE
 if [ ! -d "deps/angle" ]; then
  echo "Missing ANGLE libraries, downloading them."
  mkdir -p deps/angle
  pushd deps/angle
-  base_url=https://github.com/godotengine/godot-angle-static/releases/download/chromium%2F7578/godot-angle-static
+  base_url=https://github.com/godotengine/godot-angle-static/releases/download/chromium%2F6601.2/godot-angle-static
  curl -L -o windows_arm64.zip $base_url-arm64-llvm-release.zip
-  curl -L -o windows_x86_64.zip $base_url-x86_64-gcc-13-release.zip
-  curl -L -o windows_x86_32.zip $base_url-x86_32-gcc-13-release.zip
+  curl -L -o windows_x86_64.zip $base_url-x86_64-gcc-release.zip
+  curl -L -o windows_x86_32.zip $base_url-x86_32-gcc-release.zip
  curl -L -o macos_arm64.zip $base_url-arm64-macos-release.zip
  curl -L -o macos_x86_64.zip $base_url-x86_64-macos-release.zip
  unzip -o windows_arm64.zip && rm -f windows_arm64.zip
@@ -199,10 +171,9 @@ if [ ! -d "deps/mesa" ]; then
  echo "Missing Mesa/NIR libraries, downloading them."
  mkdir -p deps/mesa
  pushd deps/mesa
-  base_url=https://github.com/godotengine/godot-nir-static/releases/download/25.3.1-1/godot-nir-static
-  curl -L -o mesa_arm64.zip $base_url-arm64-llvm-release.zip
-  curl -L -o mesa_x86_64.zip $base_url-x86_64-gcc-release.zip
-  curl -L -o mesa_x86_32.zip $base_url-x86_32-gcc-release.zip
+  curl -L -o mesa_arm64.zip https://github.com/godotengine/godot-nir-static/releases/download/23.1.9-1/godot-nir-static-arm64-llvm-release.zip
+  curl -L -o mesa_x86_64.zip https://github.com/godotengine/godot-nir-static/releases/download/23.1.9-1/godot-nir-static-x86_64-gcc-release.zip
+  curl -L -o mesa_x86_32.zip https://github.com/godotengine/godot-nir-static/releases/download/23.1.9-1/godot-nir-static-x86_32-gcc-release.zip
  unzip -o mesa_arm64.zip && rm -f mesa_arm64.zip
  unzip -o mesa_x86_64.zip && rm -f mesa_x86_64.zip
  unzip -o mesa_x86_32.zip && rm -f mesa_x86_32.zip
@@ -213,7 +184,7 @@ if [ ! -d "deps/swappy" ]; then
  echo "Missing Swappy libraries, downloading them."
  mkdir -p deps/swappy
  pushd deps/swappy
-  curl -L -O https://github.com/godotengine/godot-swappy/releases/download/from-source-2025-01-31/godot-swappy.7z
+  curl -L -O https://github.com/darksylinc/godot-swappy/releases/download/v2023.3.0.0/godot-swappy.7z
  7z x godot-swappy.7z && rm godot-swappy.7z
  popd
 fi
@@ -257,35 +228,34 @@ EOF
  popd
 fi

-export podman_run="${podman} run -it --rm --env BUILD_NAME=${BUILD_NAME} --env GODOT_VERSION_STATUS=${GODOT_VERSION_STATUS} --env NUM_CORES=${NUM_CORES} --env CLASSICAL=${build_classical} --env MONO=${build_mono} --env DOTNET=${build_dotnet} -v ${basedir}/godot-${godot_version}.tar.gz:/root/godot.tar.gz -v ${basedir}/mono-glue:/root/mono-glue -w /root/"
+export basedir="$(pwd)"
+mkdir -p ${basedir}/out
+mkdir -p ${basedir}/out/logs
+mkdir -p ${basedir}/mono-glue
+
+export podman_run="${podman} run -it --rm --env BUILD_NAME=${BUILD_NAME} --env GODOT_VERSION_STATUS=${GODOT_VERSION_STATUS} --env NUM_CORES=${NUM_CORES} --env CLASSICAL=${build_classical} --env MONO=${build_mono} -v ${basedir}/godot-${godot_version}.tar.gz:/root/godot.tar.gz -v ${basedir}/mono-glue:/root/mono-glue -w /root/"
 export img_version=$IMAGE_VERSION

 mkdir -p ${basedir}/mono-glue
 ${podman_run} -v ${basedir}/build-mono-glue:/root/build localhost/godot-linux:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/mono-glue

-mkdir -p ${basedir}/out/dotnet
-${podman_run} -v ${basedir}/build-dotnet:/root/build -v ${basedir}/out/dotnet:/root/out --env GODOT_VERSION=${godot_version} localhost/godot-linux:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/dotnet
-
 mkdir -p ${basedir}/out/windows
-${podman_run} -v ${basedir}/build-windows:/root/build -v ${basedir}/out/windows:/root/out -v ${basedir}/deps/angle:/root/angle -v ${basedir}/deps/mesa:/root/mesa -v ${basedir}/deps/accesskit:/root/accesskit --env STEAM=${build_steam} localhost/godot-windows:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/windows
+${podman_run} -v ${basedir}/build-windows:/root/build -v ${basedir}/out/windows:/root/out -v ${basedir}/deps/angle:/root/angle -v ${basedir}/deps/mesa:/root/mesa --env STEAM=${build_steam} localhost/godot-windows:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/windows

 mkdir -p ${basedir}/out/linux
-${podman_run} -v ${basedir}/build-linux:/root/build -v ${basedir}/out/linux:/root/out -v ${basedir}/deps/accesskit:/root/accesskit localhost/godot-linux:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/linux
+${podman_run} -v ${basedir}/build-linux:/root/build -v ${basedir}/out/linux:/root/out localhost/godot-linux:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/linux

 mkdir -p ${basedir}/out/web
 ${podman_run} -v ${basedir}/build-web:/root/build -v ${basedir}/out/web:/root/out localhost/godot-web:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/web

 mkdir -p ${basedir}/out/macos
-${podman_run} -v ${basedir}/build-macos:/root/build -v ${basedir}/out/macos:/root/out -v ${basedir}/deps/accesskit:/root/accesskit -v ${basedir}/deps/moltenvk:/root/moltenvk -v ${basedir}/deps/angle:/root/angle localhost/godot-osx:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/macos
+${podman_run} -v ${basedir}/build-macos:/root/build -v ${basedir}/out/macos:/root/out -v ${basedir}/deps/moltenvk:/root/moltenvk -v ${basedir}/deps/angle:/root/angle localhost/godot-osx:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/macos

 mkdir -p ${basedir}/out/android
 ${podman_run} -v ${basedir}/build-android:/root/build -v ${basedir}/out/android:/root/out -v ${basedir}/deps/swappy:/root/swappy -v ${basedir}/deps/keystore:/root/keystore localhost/godot-android:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/android

 mkdir -p ${basedir}/out/ios
-${podman_run} -v ${basedir}/build-ios:/root/build -v ${basedir}/out/ios:/root/out localhost/godot-appleembedded:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/ios
-
-#mkdir -p ${basedir}/out/visionos
-#${podman_run} -v ${basedir}/build-visionos:/root/build -v ${basedir}/out/visionos:/root/out localhost/godot-appleembedded:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/visionos
+${podman_run} -v ${basedir}/build-ios:/root/build -v ${basedir}/out/ios:/root/out localhost/godot-ios:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/ios

 uid=$(id -un)
 gid=$(id -gn)
@@ -294,5 +264,3 @@ if [ ! -z "$SUDO_UID" ]; then
  gid="${SUDO_GID}"
 fi
 chown -R -f $uid:$gid ${basedir}/git ${basedir}/out ${basedir}/mono-glue ${basedir}/godot*.tar.gz
-
-echo "All builds completed. Check `out/logs/` to validate that they all succeeded (e.g. `tail -n 1 out/logs/*`)."
--- a/clean-release.sh
+++ b/clean-release.sh
@@ -1,3 +1,3 @@
 #!/bin/bash

-rm -rf releases steam tmp web
+rm -rf releases tmp web
--- a/clean.sh
+++ b/clean.sh
@@ -1,4 +1,4 @@
 #!/bin/bash

-rm -rf godot*.tar.gz mono-glue out releases steam tmp web
+rm -rf godot*.tar.gz mono-glue out releases tmp web
 git status
--- a/config.sh.in
+++ b/config.sh.in
@@ -12,25 +12,10 @@
 # relevant tool in your PATH or an absolute path to run it from.
 export PODMAN='podman'

-# GitHub token for @GodotBuilder for releases on godotengine/godot-builds,
-# can use a long expiry date.
-# For stable releases to godotengine/godot, generate a personal token with
-# write access to godotengine/godot for use in publish-release.sh.
-export GH_TOKEN=''
-
 # Path to a Git clone of https://github.com/godotengine/godot-builds.
 # Only used for uploading official releases.
 export GODOT_BUILDS_PATH=''

-# Path to the directory with the Steam upload setup.
-export UPLOAD_STEAM_PATH=''
-
-# Path to the directory with the EGS upload setup.
-export UPLOAD_EGS_PATH=''
-
-# Path to the 'butler' binary for upload of stable releases to itch.io.
-export UPLOAD_ITCH_BUTLER=''
-
 # SSH hostname to upload Web editor builds to.
 # Only used for uploading official releases.
 export WEB_EDITOR_HOSTNAME=''
@@ -52,13 +37,19 @@ export BUILD_NAME='custom_build'
 # Default number of parallel cores for each build.
 export NUM_CORES=16

-# Set up your own Windows signing details below.
+# Set up your own signing keystore and relevant details below.
 # If you do not fill all SIGN_* fields, signing will be skipped.

+# Path to pkcs12 archive.
+export SIGN_KEYSTORE=''
+
+# Password for the private key.
+export SIGN_PASSWORD=''
+
 # Name and URL of the signed application.
 # Use your own when making a thirdparty build.
-export WINDOWS_SIGN_NAME=''
-export WINDOWS_SIGN_URL=''
+export SIGN_NAME=''
+export SIGN_URL=''

 # Hostname or IP address of an OSX host (Needed for signing)
 # eg 'user@10.1.0.10'
@@ -98,9 +89,3 @@ export GODOT_ANDROID_SIGN_KEYSTORE=''
 export GODOT_ANDROID_KEYSTORE_ALIAS=''
 # Password for the key used for signing the release build
 export GODOT_ANDROID_SIGN_PASSWORD=''
-# Google Cloud Service Account JSON key with access to Play Console upload permissions
-# (View app information + Release apps to production and/or testing.)
-export GODOT_ANDROID_UPLOAD_JSON_KEY=''
-# Horizon Store app ID and secret.
-export GODOT_ANDROID_HORIZON_APP_ID=''
-export GODOT_ANDROID_HORIZON_APP_SECRET=''
--- a/publish-release.sh
+++ b/publish-release.sh
@@ -2,28 +2,21 @@

 set -e

-# Log output to a file automatically.
-exec > >(tee -a "out/logs/publish-release") 2>&1
-
 # Config

-# For upload tools and signing/release keys.
+# For signing keys, and path to godot-builds repo.
 source ./config.sh

 godot_version=""
-latest_stable=0
-skip_stable=0
-draft_arg=""
+web_editor_latest=0

-while getopts "h?v:lsd" opt; do
+while getopts "h?v:l" opt; do
  case "$opt" in
  h|\?)
    echo "Usage: $0 [OPTIONS...]"
    echo
    echo "  -v godot version (e.g: 3.2-stable) [mandatory]"
-    echo "  -l latest stable release (web editor, itch.io, EGS)"
-    echo "  -s don't run stable specific steps"
-    echo "  -d publish as draft release on GitHub"
+    echo "  -l mark web editor as latest"
    echo
    exit 1
    ;;
@@ -31,13 +24,7 @@ while getopts "h?v:lsd" opt; do
    godot_version=$OPTARG
    ;;
  l)
-    latest_stable=1
-    ;;
-  s)
-    skip_stable=1
-    ;;
-  d)
-    draft_arg="-d"
+    web_editor_latest=1
    ;;
  esac
 done
@@ -47,9 +34,6 @@ if [ -z "${godot_version}" ]; then
  exit 1
 fi

-basedir=$(pwd)
-reldir=${basedir}/releases/${godot_version}
-
 # Confirm

 IFS=- read version status <<< "${godot_version}"
@@ -62,109 +46,26 @@ case "$choice" in
 esac
 template_version=${version}.${status}

-# Config checks for stable releases.
-
-if [ "${status}" == "stable" -a "${skip_stable}" == "0" ]; then
-  echo "Publishing a stable release. Checking that configuration is valid to perform stable release specific steps."
-
-  read -p "Enter personal access token (GH_TOKEN) for godotengine/godot: " personal_gh_token
-  if [[ "${personal_gh_token}" != "github_pat_"* ]]; then
-    echo "Provided personal access token should start with 'github_pat', aborting."
-    exit 1
-  fi
-
-  if ! gh api repos/godotengine/godot/git/refs/tags | grep -q ${godot_version}; then
-    echo "The tag '${godot_version}' does not exist in godotengine/godot, aborting."
-    echo "Push commits and create it manually before running this script."
-    exit 1
-  fi
-
-  if [ ! -d "${UPLOAD_STEAM_PATH}" ]; then
-    echo "Invalid config.sh: UPLOAD_STEAM_PATH is not a directory, aborting."
-    exit 1
-  fi
-
-  if [ "${latest_stable}" == "1" ]; then
-    if [ ! -d "${UPLOAD_EGS_PATH}" ]; then
-      echo "Invalid config.sh: UPLOAD_EGS_PATH is not a directory, aborting."
-      exit 1
-    fi
-    if [ ! -x "${UPLOAD_ITCH_BUTLER}" ]; then
-      echo "Invalid config.sh: UPLOAD_ITCH_BUTLER does not point to an executable, aborting."
-      exit 1
-    fi
-  fi
-fi
-
 # Upload to GitHub godot-builds

-echo "Uploading release to to godotengine/godot-builds repository."
-
 if [ -z "${GODOT_BUILDS_PATH}" ]; then
  echo "Missing path to godotengine/godot-builds clone in config.sh, necessary to upload releases. Aborting."
  exit 1
 fi

-${GODOT_BUILDS_PATH}/tools/upload-github.sh -v ${version} -f ${status} ${draft_arg}
+${GODOT_BUILDS_PATH}/tools/upload-github.sh -v ${version} -f ${status}

-# Stable release only
+# Web editor

-if [ "${status}" == "stable" -a "${skip_stable}" == "0" ]; then
-  namever=Godot_v${godot_version}
-
-  echo "Uploading stable release to main GitHub repository."
-
-  export GH_TOKEN=${personal_gh_token}
-  pushd git
-  # Get release details from existing godot-builds release.
-  release_info=$(gh release view ${godot_version} --repo godotengine/godot-builds --json name,body)
-  release_title=$(echo "$release_info" | jq -r '.name')
-  release_desc=$(echo "$release_info" | jq -r '.body')
-
-  gh release create ${godot_version} --repo godotengine/godot --title "$release_title" --notes "$release_desc" ${draft_arg}
-  gh release upload ${godot_version} ${reldir}/[Gg]* ${reldir}/mono/[Gg]*
-  # Concatenate SHA sums.
-  cp ${reldir}/SHA512-SUMS.txt .
-  cat ${reldir}/mono/SHA512-SUMS.txt >> SHA512-SUMS.txt
-  gh release upload ${godot_version} SHA512-SUMS.txt
-  rm SHA512-SUMS.txt
-  popd
-
-  echo "Uploading stable release to Steam."
-
-  pushd ${UPLOAD_STEAM_PATH}
-  rm -rf content/bin/[Gg]*
-  rm -rf content/editor_data/export_templates/*
-  cp -f ${basedir}/git/*.{md,txt,png,svg} content/
-  # Steam specific binaries prepared by build-release.sh
-  cp -r ${basedir}/steam/[Gg]* content/bin/
-  unzip ${reldir}/${namever}_export_templates.tpz -d content/editor_data/export_templates/
-  mv content/editor_data/export_templates/{templates,${template_version}}
-  steam_build/build.sh
-  popd
-
-  if [ "${latest_stable}" == "1" ]; then
-    echo "Uploading stable release to EGS (latest only)."
-
-    pushd ${UPLOAD_EGS_PATH}
-    rm -rf buildroot-*/*
-    unzip ${reldir}/${namever}_win64.exe.zip -d buildroot-win64/
-    unzip ${reldir}/${namever}_win32.exe.zip -d buildroot-win32/
-    unzip ${reldir}/${namever}_macos.universal.zip -d buildroot-macos/
-    ./upload.sh -v ${godot_version}
-    popd
-
-    echo "Uploading stable release to itch.io (latest only)."
-
-    ${UPLOAD_ITCH_BUTLER} push ${reldir}/${namever}_linux.x86_64.zip godotengine/godot:linux-64-stable --userversion ${godot_version}
-    ${UPLOAD_ITCH_BUTLER} push ${reldir}/${namever}_linux.x86_32.zip godotengine/godot:linux-32-stable --userversion ${godot_version}
-    ${UPLOAD_ITCH_BUTLER} push ${reldir}/${namever}_win64.exe.zip godotengine/godot:windows-64-stable --userversion ${godot_version}
-    ${UPLOAD_ITCH_BUTLER} push ${reldir}/${namever}_win32.exe.zip godotengine/godot:windows-32-stable --userversion ${godot_version}
-    ${UPLOAD_ITCH_BUTLER} push ${reldir}/${namever}_macos.universal.zip godotengine/godot:osx-64-stable --userversion ${godot_version}
-  fi
-
-  echo "All stable release upload steps done."
+scp -P 22 -r web/${template_version} ${WEB_EDITOR_HOSTNAME}:/home/akien/web_editor/
+sleep 2
+command="sudo mv /home/akien/web_editor/${template_version} /var/www/editor.godotengine.org/public/releases/"
+command="${command}; cd /var/www/editor.godotengine.org; sudo chown -R www-data:www-data public/releases/${template_version}"
+command="${command}; sudo ./create-symlinks.sh -v ${template_version}"
+if [ $web_editor_latest == 1 ]; then
+  command="${command} -l"
 fi
+ssh -P 22 ${WEB_EDITOR_HOSTNAME} "${command}"

 # NuGet packages

@@ -181,22 +82,6 @@ else
  echo "Disabling NuGet package publishing as config.sh does not define the required data (NUGET_SOURCE, NUGET_API_KEY), or dotnet can't be found in PATH."
 fi

-# Godot Android Editor
-
-if [ -e "${GODOT_ANDROID_UPLOAD_JSON_KEY}" ]; then
-  echo "Publishing Android Editor to Play Store..."
-  sh build-android/upload-playstore.sh ${godot_version}
-else
-  echo "Disabling Android Editor publishing on the Play Store as no valid Play Store JSON key was found."
-fi
-
-if [ ! -z "${GODOT_ANDROID_HORIZON_APP_ID}" ] && [ ! -z "${GODOT_ANDROID_HORIZON_APP_SECRET}" ]; then
-  echo "Publishing Android Editor to Horizon Store..."
-  ./build-android/upload-horizon.sh ${godot_version} ${latest_stable}
-else
-  echo "Disabling Android Editor publishing on the Horizon Store as config.sh does not define the required data (GODOT_ANDROID_HORIZON_APP_ID, GODOT_ANDROID_HORIZON_SECRET)."
-fi
-
 # Godot Android library

 if [ -d "deps/keystore" ]; then
@@ -206,40 +91,8 @@ else
  echo "Disabling Android library publishing as deps/keystore doesn't exist."
 fi

-# Web editor
+# Stable release only

-echo "Uploading web editor... (with retry logic as it can be flaky)"
-
-MAX_RETRIES=5
-delay=5
-
-retry_command() {
-    local attempt=1
-    local cmd=$1
-    while [ ${attempt} -le ${MAX_RETRIES} ]; do
-        echo "Attempt ${attempt}: Running command..."
-        eval "${cmd}" && return 0  # Success
-
-        echo "Command failed. Retrying in ${delay} seconds..."
-        sleep ${delay}
-        ((attempt++))
-        delay=$((delay * 2))  # Exponential backoff
-    done
-
-    echo "❌ Command failed after ${MAX_RETRIES} attempts."
-    return 1
-}
-
-command="sudo mv /home/akien/web_editor/${template_version} /var/www/editor.godotengine.org/public/releases/"
-command="${command}; cd /var/www/editor.godotengine.org; sudo chown -R www-data:www-data public/releases/${template_version}"
-command="${command}; sudo ./create-symlinks.sh -v ${template_version}"
-if [ "${latest_stable}" == "1" ]; then
-  echo "Marking web editor build as 'latest'."
-  command="${command} -l"
+if [ "${status}" == "stable" ]; then
+  echo "NOTE: This script doesn't handle yet uploading stable releases to the main GitHub repository, Steam, EGS, and itch.io."
 fi
-
-retry_command "scp -P 22 -r web/${template_version} ${WEB_EDITOR_HOSTNAME}:/home/akien/web_editor/"
-sleep 2
-retry_command "ssh -p 22 ${WEB_EDITOR_HOSTNAME} '${command}'"
-
-echo "All publishing steps done. Check out/logs/publish-release to double check that all steps succeeded."