[#131] Support ContentLayout v3 (Unity 6.7) with v2 backward compatibility (#147)

The Unity 6.7 ContentLayout.json schema (v3) renames ID to StableId (no
.cfid extension), replaces ContentHash with ArtifactIndex, references
loadables by index instead of ObjectIdHash, and drops the loadable
AssetPath/OutputLFID fields (no more remapping into clusters).

UnityDataTools.Models.ContentLayout now tracks v3; the v2 schema is
preserved as a reference definition in UnityDataTools.Models.V2. Analyze
accepts both versions: v2 files are upgraded in memory to the v3 model
(ContentLayoutV2Upgrader), so a single write path and a single database
schema serve both. The content_layout tables move to the v3 shape
(loadable_index key, stable_id, artifact_index, is_root_asset holding
the 1-based root position); the v2-only source data (asset_path,
source_lfid) lands in extra columns that exist only in databases
imported from a v2 layout. PRAGMA user_version bumped to 8.

The previous v2 layout of the LeadingEdge build is archived at
TestCommon/Data/ContentLayoutVersions/v2 as a permanent fixture, the
LeadingEdge ContentDirectory reference data is regenerated with a 6.7
editor (v3 layout), and UnityFileSystemApi.dll is updated to a local
6.7 build (debug config, Windows only - the mac/linux libraries still
need a 6.7 build).

Author: SkowronskiAndrew

Analyzer/Properties/Resources.Designer.cs

@@ -247,6 +247,12 @@
   <data name="ContentLayoutLoadableObjects" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\ContentLayoutLoadableObjects.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
+  <data name="ContentLayoutLoadableObjectsV2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ContentLayoutLoadableObjectsV2.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  </data>
+  <data name="ContentLayoutLoadableObjectsView" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ContentLayoutLoadableObjectsView.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  </data>
   <data name="ContentLayoutLoadableScenes" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\ContentLayoutLoadableScenes.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>

Analyzer/Properties/Resources.resx

@@ -2,5 +2,5 @@ CREATE TABLE IF NOT EXISTS content_layout_loadable_dependencies
 (
     -- The loadable objects each content file references.
     serialized_file_index INTEGER,   -- references content_layout_serialized_files.file_index
-    object_id_hash TEXT              -- references content_layout_loadable_objects.object_id_hash
+    loadable_index INTEGER           -- references content_layout_loadable_objects.loadable_index
 );

Analyzer/Resources/ContentLayoutLoadableDependencies.sql

@@ -2,13 +2,11 @@ CREATE TABLE IF NOT EXISTS content_layout_loadable_objects
 (
     -- The objects that can be loaded on demand, identified independently of the content file that
     -- holds them, plus where each came from in the source project.
-    object_id_hash TEXT,             -- hash of GUID, LFID and identifier_type
+    loadable_index INTEGER,          -- the json array index; how the other content_layout tables name a loadable
     guid TEXT,                       -- AssetDatabase GUID of the source asset
-    asset_path TEXT,
-    lfid INTEGER,                    -- local file id of the object in the source asset
+    lfid INTEGER,                    -- local file id of the object in its output content file
     identifier_type INTEGER,
     serialized_file_index INTEGER,   -- content_layout_serialized_files.file_index; NULL if dropped from the build
-    output_lfid INTEGER,             -- local file id of the object in its output content file
-    is_root_asset INTEGER,
-    PRIMARY KEY (object_id_hash)
+    is_root_asset INTEGER,           -- 1-based position in the layout's RootAssets; 0 when not a root asset
+    PRIMARY KEY (loadable_index)
 );

Analyzer/Resources/ContentLayoutLoadableObjects.sql

@@ -0,0 +1,16 @@
+CREATE TABLE IF NOT EXISTS content_layout_loadable_objects
+(
+    -- The objects that can be loaded on demand, identified independently of the content file that
+    -- holds them, plus where each came from in the source project. This is the variant created when
+    -- a version 2 layout (Unity 6.6) is imported; it adds source columns that newer layout versions
+    -- no longer record.
+    loadable_index INTEGER,          -- the json array index; how the other content_layout tables name a loadable
+    guid TEXT,                       -- AssetDatabase GUID of the source asset
+    lfid INTEGER,                    -- local file id of the object in its output content file
+    identifier_type INTEGER,
+    serialized_file_index INTEGER,   -- content_layout_serialized_files.file_index; NULL if dropped from the build
+    is_root_asset INTEGER,           -- 1-based position in the layout's RootAssets; 0 when not a root asset
+    asset_path TEXT,                 -- v2 layouts only: path of the source asset
+    source_lfid INTEGER,             -- v2 layouts only: local file id of the object in the source asset
+    PRIMARY KEY (loadable_index)
+);

Analyzer/Resources/ContentLayoutLoadableObjectsV2.sql

@@ -0,0 +1,11 @@
+CREATE VIEW IF NOT EXISTS content_layout_loadable_objects_view AS
+-- Loadables resolved to their analyzed object. The object columns are NULL in a layout-only
+-- database. Selects the loadable table's columns as-is, so the v2-only columns (asset_path,
+-- source_lfid) appear when the imported layout was version 2.
+SELECT l.*,
+       f.filename,
+       o.id AS object, t.name AS type, o.name, o.size
+FROM content_layout_loadable_objects l
+LEFT JOIN content_layout_serialized_files_view f ON f.file_index = l.serialized_file_index
+LEFT JOIN objects o ON o.serialized_file = f.serialized_file AND o.object_id = l.lfid
+LEFT JOIN types t ON t.id = o.type;

Analyzer/Resources/ContentLayoutLoadableObjectsView.sql

@@ -3,9 +3,9 @@ CREATE TABLE IF NOT EXISTS content_layout_serialized_files
     -- The content files (.cf) the ContentDirectory build produced, one row per entry in the
     -- layout's SerializedFiles array.
     file_index INTEGER,         -- the json array index; how the other content_layout tables name a file
-    cfid TEXT,                  -- symbolic .cfid reference string (for built-ins: the built-in path)
+    stable_id TEXT,             -- identity hash used to reference this file (for built-ins: the built-in path)
     is_builtin INTEGER,
-    content_hash TEXT,          -- NULL for built-ins; the filename is content_hash || '.cf'
+    artifact_index INTEGER,     -- content_layout_binary_artifacts.artifact_index; NULL for built-ins
     serialized_file INTEGER,    -- serialized_files.id; NULL for built-ins and for a layout-only analyze
     PRIMARY KEY (file_index)
 );

Analyzer/Resources/ContentLayoutSerializedFiles.sql

@@ -1,39 +1,31 @@
 CREATE VIEW IF NOT EXISTS content_layout_serialized_files_view AS
--- One row per layout content file with its derived filename, artifact size and core-table link.
--- Built-in entries have no file on disk, so their path (cfid) is shown as the filename.
-SELECT f.file_index, f.cfid, f.is_builtin,
-       CASE WHEN f.is_builtin = 1 THEN f.cfid ELSE f.content_hash || '.cf' END AS filename,
+-- One row per layout content file with its content hash, derived filename, artifact size and
+-- core-table link. Built-in entries have no file on disk, so their path (stable_id) is shown as
+-- the filename.
+SELECT f.file_index, f.stable_id, f.is_builtin, f.artifact_index,
+       CASE WHEN f.is_builtin = 1 THEN f.stable_id ELSE ba.content_hash || '.cf' END AS filename,
+       ba.content_hash,
        ba.size,
        f.serialized_file,
        sf.archive
 FROM content_layout_serialized_files f
-LEFT JOIN content_layout_binary_artifacts ba ON ba.content_hash = f.content_hash AND ba.category = 'contentfile'
+LEFT JOIN content_layout_binary_artifacts ba ON ba.artifact_index = f.artifact_index
 LEFT JOIN serialized_files sf ON sf.id = f.serialized_file;
 
 CREATE VIEW IF NOT EXISTS content_layout_source_assets_view AS
 -- Source asset to the content file(s) it was built into.
-SELECT s.asset_path, f.file_index, f.content_hash || '.cf' AS filename, f.serialized_file
+SELECT s.asset_path, f.file_index, f.filename, f.serialized_file
 FROM content_layout_source_assets s
-INNER JOIN content_layout_serialized_files f ON f.file_index = s.serialized_file_index;
+INNER JOIN content_layout_serialized_files_view f ON f.file_index = s.serialized_file_index;
 
 CREATE VIEW IF NOT EXISTS content_layout_serialized_file_dependencies_view AS
 -- File-to-file dependency edges with filenames resolved on both sides.
 SELECT d.serialized_file_index, src.filename, d.position,
-       d.dependency_index, dep.filename AS dependency_filename, dep.cfid AS dependency_cfid
+       d.dependency_index, dep.filename AS dependency_filename, dep.stable_id AS dependency_stable_id
 FROM content_layout_serialized_file_dependencies d
 INNER JOIN content_layout_serialized_files_view src ON src.file_index = d.serialized_file_index
 INNER JOIN content_layout_serialized_files_view dep ON dep.file_index = d.dependency_index;
 
-CREATE VIEW IF NOT EXISTS content_layout_loadable_objects_view AS
--- Loadables resolved to their analyzed object. The object columns are NULL in a layout-only database.
-SELECT l.object_id_hash, l.guid, l.asset_path, l.lfid, l.is_root_asset,
-       f.content_hash || '.cf' AS filename,
-       o.id AS object, t.name AS type, o.name, o.size
-FROM content_layout_loadable_objects l
-LEFT JOIN content_layout_serialized_files f ON f.file_index = l.serialized_file_index
-LEFT JOIN objects o ON o.serialized_file = f.serialized_file AND o.object_id = l.output_lfid
-LEFT JOIN types t ON t.id = o.type;
-
 CREATE VIEW IF NOT EXISTS content_layout_binary_artifacts_view AS
 -- Artifacts with their on-disk filename derived from the content hash and category.
 SELECT artifact_index, content_hash, category, size,
@@ -48,11 +40,10 @@ FROM content_layout_binary_artifacts;
 
 CREATE VIEW IF NOT EXISTS content_layout_resource_files_view AS
 -- The data files (.resS/.resource) each content file uses, derived from the artifact graph.
-SELECT f.file_index, f.content_hash || '.cf' AS filename,
+SELECT f.file_index, f.filename,
        ra.category, rav.filename AS data_filename, ra.size
-FROM content_layout_serialized_files f
-INNER JOIN content_layout_binary_artifacts ca ON ca.content_hash = f.content_hash AND ca.category = 'contentfile'
-INNER JOIN content_layout_artifact_references r ON r.artifact_index = ca.artifact_index
+FROM content_layout_serialized_files_view f
+INNER JOIN content_layout_artifact_references r ON r.artifact_index = f.artifact_index
 INNER JOIN content_layout_binary_artifacts ra ON ra.artifact_index = r.referenced_artifact_index
 INNER JOIN content_layout_binary_artifacts_view rav ON rav.artifact_index = ra.artifact_index
 WHERE ra.category IN ('texture', 'mesh', 'audio', 'video');

Analyzer/Resources/ContentLayoutViews.sql

@@ -168,7 +168,7 @@ WHERE m.type = 'Material';
 
 INSERT INTO types (id, name) VALUES (-1, 'Scene');
 
-PRAGMA user_version = 8;
+PRAGMA user_version = 9;
 
 PRAGMA synchronous = OFF;
 PRAGMA journal_mode = MEMORY;

Analyzer/Resources/Init.sql

@@ -12,7 +12,7 @@ internal class AddContentLayoutLoadableDependency : AbstractCommand
         protected override Dictionary<string, SqliteType> Fields => new()
         {
             { "serialized_file_index", SqliteType.Integer },
-            { "object_id_hash", SqliteType.Text }
+            { "loadable_index", SqliteType.Integer }
         };
     }
 }