unity-devkit 0.1.21.dev36667980974__tar.gz → 0.1.22__tar.gz

{unity_devkit-0.1.21.dev36667980974 → unity_devkit-0.1.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: unity-devkit
-Version: 0.1.21.dev36667980974
+Version: 0.1.22
 Summary: Unity build, license, and CI tooling
 Requires-Python: >=3.13
 Requires-Dist: bashrun>=0.1.0

{unity_devkit-0.1.21.dev36667980974 → unity_devkit-0.1.22}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "unity-devkit"
-version = "0.1.21.dev36667980974"
+version = "0.1.22"
 description = "Unity build, license, and CI tooling"
 requires-python = ">=3.13"
 dependencies = [

{unity_devkit-0.1.21.dev36667980974 → unity_devkit-0.1.22}/src/unity_devkit/player_build.py

@@ -1,4 +1,5 @@
 import json
+import os
 import re
 import shutil
 import sys
@@ -28,6 +29,14 @@ UNITYCI_IMAGE_REVISION = "3"
 LICENSE_IMAGE_MODULE = "linux-il2cpp"
 PLAYERBUILD_ENTRY = "Outernet.PlayerBuild.Entry"
 
+# Pinned to the v2026.07.21 tag of dotnet/install-scripts (raw at the commit SHA, which
+# is immutable, unlike the moving https://dot.net/v1/dotnet-install.sh redirect).
+DOTNET_INSTALL_SCRIPT_COMMIT = "da3ce11ba63f3dbb0fb835d41bda2665d5c48e84"
+DOTNET_INSTALL_SCRIPT_URL = (
+    f"https://raw.githubusercontent.com/dotnet/install-scripts/{DOTNET_INSTALL_SCRIPT_COMMIT}/src/dotnet-install.sh"
+)
+DOTNET_SDK_VERSION = "8.0.421"
+
 # Unity exits 0 while reporting fatal package-manager errors only in the editor log. Every
 # Unity invocation goes through run_unity_batchmode, which scans the captured log for these
 # signatures and fails regardless of the exit code. Extend the tuple as new silent failures
@@ -151,8 +160,18 @@ def prepare_unity_project(project_path: Path) -> None:
     # their manifest); elsewhere it would demand the dotnet SDK + tool manifest and
     # litter Assets/ with NuGet.config/packages.config/Packages.meta scaffolding.
     if (project_path / "Assets" / "packages.config").exists():
-        bash("dotnet tool restore")
-        bash(f"dotnet nugetforunity restore {project_path}")
+        # The unityci editor containers ship no dotnet CLI; provision the pinned SDK on
+        # demand into ~/.dotnet (persisting across runs on self-hosted runners).
+        env: dict[str, str] = {}
+        if not shutil.which("dotnet"):
+            install_dir = Path.home() / ".dotnet"
+            if not (install_dir / "dotnet").exists():
+                script_path = Path(tempfile.gettempdir()) / "dotnet-install.sh"
+                bash(f"curl -fsSL {DOTNET_INSTALL_SCRIPT_URL} -o {script_path}")
+                bash(f"bash {script_path} --version {DOTNET_SDK_VERSION} --install-dir {install_dir}")
+            env = {"PATH": f"{install_dir}{os.pathsep}{os.environ['PATH']}", "DOTNET_CLI_TELEMETRY_OPTOUT": "1"}
+        bash("dotnet tool restore", env=env)
+        bash(f"dotnet nugetforunity restore {project_path}", env=env)
 
 
 def parse_environment_fields(entries: Sequence[str]) -> dict[str, str]:

unity_devkit-0.1.22/tests/test_prepare.py

@@ -0,0 +1,78 @@
+import os
+import shutil
+import tempfile
+from functools import partial
+from pathlib import Path
+
+import pytest
+
+from unity_devkit import player_build
+
+Call = tuple[tuple[str, ...], dict[str, str]]
+
+
+def test_prepare_skips_nuget_restore_without_packages_config(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
+    calls: list[Call] = []
+    monkeypatch.setattr(player_build, "bash", partial(record_call, calls))
+    (tmp_path / "Assets").mkdir()
+
+    player_build.prepare_unity_project(tmp_path)
+
+    assert calls == []
+
+
+def test_prepare_runs_nuget_restore_for_nuget_consumer(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
+    calls: list[Call] = []
+    monkeypatch.setattr(player_build, "bash", partial(record_call, calls))
+    monkeypatch.setattr(shutil, "which", present_tool)
+    (tmp_path / "Assets").mkdir()
+    (tmp_path / "Assets" / "packages.config").write_text('<?xml version="1.0"?>\n')
+
+    player_build.prepare_unity_project(tmp_path)
+
+    assert calls == [
+        (("dotnet tool restore",), {}),
+        ((f"dotnet nugetforunity restore {tmp_path}",), {}),
+    ]
+
+
+def test_prepare_provisions_dotnet_sdk_when_missing(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
+    calls: list[Call] = []
+    monkeypatch.setattr(player_build, "bash", partial(record_call, calls))
+    monkeypatch.setattr(shutil, "which", absent_tool)
+    monkeypatch.setattr(Path, "home", lambda: tmp_path)
+    (tmp_path / "Assets").mkdir()
+    (tmp_path / "Assets" / "packages.config").write_text('<?xml version="1.0"?>\n')
+
+    player_build.prepare_unity_project(tmp_path)
+
+    script_path = Path(tempfile.gettempdir()) / "dotnet-install.sh"
+    install_dir = tmp_path / ".dotnet"
+    assert calls[0] == ((f"curl -fsSL {player_build.DOTNET_INSTALL_SCRIPT_URL} -o {script_path}",), {})
+    expected_install = f"bash {script_path} --version {player_build.DOTNET_SDK_VERSION} --install-dir {install_dir}"
+    assert calls[1] == ((expected_install,), {})
+    expected_env = {"PATH": f"{install_dir}{os.pathsep}{os.environ['PATH']}", "DOTNET_CLI_TELEMETRY_OPTOUT": "1"}
+    assert calls[2] == (("dotnet tool restore",), expected_env)
+    assert calls[3] == ((f"dotnet nugetforunity restore {tmp_path}",), expected_env)
+
+
+def test_prepare_clears_stale_unity_lockfile(tmp_path: Path) -> None:
+    lockfile = tmp_path / "Temp" / "UnityLockfile"
+    lockfile.parent.mkdir()
+    lockfile.write_text("")
+
+    player_build.prepare_unity_project(tmp_path)
+
+    assert not lockfile.exists()
+
+
+def record_call(calls: list[Call], command: str, env: dict[str, str] | None = None) -> None:
+    calls.append(((command,), env or {}))
+
+
+def absent_tool(_name: str) -> str | None:
+    return None
+
+
+def present_tool(name: str) -> str:
+    return f"/usr/bin/{name}"

unity_devkit-0.1.21.dev36667980974/tests/test_prepare.py

@@ -1,36 +0,0 @@
-from pathlib import Path
-
-import pytest
-
-from unity_devkit import player_build
-
-
-def test_prepare_skips_nuget_restore_without_packages_config(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
-    calls: list[str] = []
-    monkeypatch.setattr(player_build, "bash", calls.append)
-    (tmp_path / "Assets").mkdir()
-
-    player_build.prepare_unity_project(tmp_path)
-
-    assert calls == []
-
-
-def test_prepare_runs_nuget_restore_for_nuget_consumer(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
-    calls: list[str] = []
-    monkeypatch.setattr(player_build, "bash", calls.append)
-    (tmp_path / "Assets").mkdir()
-    (tmp_path / "Assets" / "packages.config").write_text('<?xml version="1.0"?>\n')
-
-    player_build.prepare_unity_project(tmp_path)
-
-    assert calls == ["dotnet tool restore", f"dotnet nugetforunity restore {tmp_path}"]
-
-
-def test_prepare_clears_stale_unity_lockfile(tmp_path: Path) -> None:
-    lockfile = tmp_path / "Temp" / "UnityLockfile"
-    lockfile.parent.mkdir()
-    lockfile.write_text("")
-
-    player_build.prepare_unity_project(tmp_path)
-
-    assert not lockfile.exists()