Merge v2 (2.0.0) into master

Brings the 2.0 ScriptedImporter line to master. v2 is the source of truth
for 2.0; master's remaining unique commits were either already replicated
on v2 (DEV_README packaging note, exception-safe PublishingTools) or moot
(re-serialising the old Packages/Ink folder, which 2.0 renamed).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

Author: tomkail

.github/workflows/Update-UPM-Branch.yml

@@ -22,5 +22,5 @@ jobs:
         uses: hecomi/create-upm-branch-action@main
         with:
           git-tag: ${{ steps.tag.outputs.name }}
-          pkg-root-dir-path: Packages/Ink
-          samples-dir: Packages/Ink/Demos
+          pkg-root-dir-path: Packages/com.inkle.ink-unity-integration
+          samples-dir: Packages/com.inkle.ink-unity-integration/Demos

Assets/DEV_README.md

@@ -6,7 +6,7 @@ Demos are packaged up as separate .unitypackage files.
 
 ## Which Unity version to package from
 Do the packaging from the **minimum supported Unity version** — the `unity` field in
-`Packages/Ink/package.json` (currently **2022.3 LTS**) — not a newer editor.
+`Packages/com.inkle.ink-unity-integration/package.json` (currently **2022.3 LTS**) — not a newer editor.
 
 - The **`.unitypackage`** (produced by "Prepare for publishing", then both attached to the GitHub
   release and uploaded to the Asset Store — it's the same file) ships serialized assets: the demo
@@ -22,7 +22,7 @@ Do the packaging from the **minimum supported Unity version** — the `unity` fi
 
 ## To update create a new release
 - Update CHANGELOG.md with a list of changes (these will then autopopulate)
-- Increase the version number in InkLibrary.cs
+- Increase the version number in InkEditorUtils.cs (unityIntegrationVersionCurrent)
 - Open the Ink Publishing Tools wizard with the 'Publishing/Show Helper Window' menu item
 - Click 'Prepare for publishing'. This will run a bunch of automated tasks and produce a .UnityPackage which we'll need later. **Do this from the minimum supported Unity version — see "Which Unity version to package from" above.**
 - You can click the 'Show Package' button to reveal the packages in Finder

Assets/Editor/InkCompilerEditor.cs

@@ -0,0 +1,42 @@
+using System.IO;
+using UnityEditor;
+using UnityEngine;
+using Ink.UnityIntegration;
+
+// Package-author dev tool: simulates a 1.x -> 2.0 upgrade so the Ink Update window and its migrate
+// prompt can be tested. Lives under Assets (never shipped in the package); not for end users.
+public static class PretendUpgrade {
+	const string legacyJsonPath = "Assets/Ink Dev Tools/LegacyStory.json";
+	// Must match InkUnityIntegrationStartupWindow.editorPrefsKeyForVersionSeen.
+	const string startupVersionSeenKey = "Ink Unity Integration Startup Window Version Confirmed";
+
+	[MenuItem("Ink Test/Simulate Upgrade (show update window)")]
+	static void SimulateUpgrade () {
+		// 1. Recreate a leftover 1.x compiled .json so the migrate prompt has something to find.
+		Directory.CreateDirectory("Assets/Ink Dev Tools");
+		File.WriteAllText(legacyJsonPath,
+			"{\"inkVersion\":21,\"root\":[[\"^Pretend upgrade story.\",\"\\n\",[\"done\",null],null],\"done\",null],\"listDefs\":{}}");
+		AssetDatabase.Refresh();
+
+		// 2. Refresh the migration cache so HasLegacyJson() reports true.
+		InkMigrationTool.RecheckLegacyJson();
+
+		// 3. Mark the update window as never-seen, so this launch is treated as an upgrade.
+		EditorPrefs.SetInt(startupVersionSeenKey, -1);
+
+		// 4. The window won't show if it's suppressed in settings.
+		if (InkSettings.instance.suppressStartupWindow)
+			Debug.LogWarning("Ink: 'Suppress Startup Window' is ON (Project Settings > Ink) — turn it off or the window won't auto-show on reload.");
+
+		// Show it now — this is what the automatic on-load path does after an upgrade.
+		InkUnityIntegrationStartupWindow.ShowWindow();
+		Debug.Log("Ink: simulated upgrade. The Ink Update window should show the changelog + a migrate prompt.");
+	}
+
+	[MenuItem("Ink Test/Reset Upgrade Simulation")]
+	static void ResetSimulation () {
+		AssetDatabase.DeleteAsset(legacyJsonPath);
+		InkMigrationTool.RecheckLegacyJson();
+		Debug.Log("Ink: removed the simulated legacy .json.");
+	}
+}