Upstream dev branch sync

.editorconfig

@@ -0,0 +1,133 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = crlf
+insert_final_newline = true
+trim_trailing_whitespace = true
+indent_style = space
+indent_size = 4
+
+[*.{json,asmdef,yml,yaml}]
+indent_size = 2
+
+[*.{unity,prefab,asset,mat,meta,anim,controller}]
+# Unity YAML — never reformat, it is machine-owned.
+trim_trailing_whitespace = false
+insert_final_newline = false
+
+[*.cs]
+
+# --- Formatting -------------------------------------------------------------
+csharp_new_line_before_open_brace = all
+csharp_new_line_before_else = true
+csharp_new_line_before_catch = true
+csharp_new_line_before_finally = true
+csharp_prefer_braces = true:warning
+csharp_indent_case_contents = true
+csharp_indent_switch_labels = true
+csharp_space_after_keywords_in_control_flow_statements = true
+
+# --- Usings -----------------------------------------------------------------
+dotnet_sort_system_directives_first = true
+dotnet_separate_import_directive_groups = false
+csharp_using_directive_placement = outside_namespace:warning
+dotnet_diagnostic.IDE0005.severity = warning   # remove unnecessary usings
+
+# --- Language preferences ---------------------------------------------------
+csharp_style_var_when_type_is_apparent = true:suggestion
+csharp_style_expression_bodied_properties = true:suggestion
+csharp_style_expression_bodied_methods = false:suggestion
+dotnet_style_prefer_auto_properties = true:suggestion
+csharp_style_throw_expression = true:suggestion
+csharp_prefer_simple_using_statement = true:suggestion
+
+# ===========================================================================
+# Naming rules
+# ===========================================================================
+
+# --- Styles -----------------------------------------------------------------
+dotnet_naming_style.pascal_case.capitalization = pascal_case
+
+dotnet_naming_style.camel_case.capitalization = camel_case
+
+dotnet_naming_style.underscore_camel_case.capitalization = camel_case
+dotnet_naming_style.underscore_camel_case.required_prefix = _
+
+dotnet_naming_style.interface_prefixed.capitalization = pascal_case
+dotnet_naming_style.interface_prefixed.required_prefix = I
+
+# --- Symbol groups ----------------------------------------------------------
+dotnet_naming_symbols.namespaces_and_types.applicable_kinds = namespace, class, struct, enum, delegate
+dotnet_naming_symbols.namespaces_and_types.applicable_accessibilities = *
+
+dotnet_naming_symbols.interfaces.applicable_kinds = interface
+dotnet_naming_symbols.interfaces.applicable_accessibilities = *
+
+dotnet_naming_symbols.members.applicable_kinds = method, property, event
+dotnet_naming_symbols.members.applicable_accessibilities = *
+
+dotnet_naming_symbols.constants.applicable_kinds = field
+dotnet_naming_symbols.constants.required_modifiers = const
+
+dotnet_naming_symbols.static_readonly_fields.applicable_kinds = field
+dotnet_naming_symbols.static_readonly_fields.required_modifiers = static, readonly
+
+dotnet_naming_symbols.private_fields.applicable_kinds = field
+dotnet_naming_symbols.private_fields.applicable_accessibilities = private, protected, private_protected
+
+# Public fields on MonoBehaviours are Unity's inspector surface. They stay
+# camelCase rather than PascalCase so they read like data, not like members.
+dotnet_naming_symbols.public_fields.applicable_kinds = field
+dotnet_naming_symbols.public_fields.applicable_accessibilities = public, internal, protected_internal
+
+dotnet_naming_symbols.parameters_and_locals.applicable_kinds = parameter, local
+
+# --- Rules ------------------------------------------------------------------
+dotnet_naming_rule.types_are_pascal_case.symbols = namespaces_and_types
+dotnet_naming_rule.types_are_pascal_case.style = pascal_case
+dotnet_naming_rule.types_are_pascal_case.severity = warning
+
+dotnet_naming_rule.interfaces_are_i_prefixed.symbols = interfaces
+dotnet_naming_rule.interfaces_are_i_prefixed.style = interface_prefixed
+dotnet_naming_rule.interfaces_are_i_prefixed.severity = warning
+
+dotnet_naming_rule.members_are_pascal_case.symbols = members
+dotnet_naming_rule.members_are_pascal_case.style = pascal_case
+dotnet_naming_rule.members_are_pascal_case.severity = warning
+
+dotnet_naming_rule.constants_are_pascal_case.symbols = constants
+dotnet_naming_rule.constants_are_pascal_case.style = pascal_case
+dotnet_naming_rule.constants_are_pascal_case.severity = warning
+
+dotnet_naming_rule.static_readonly_are_pascal_case.symbols = static_readonly_fields
+dotnet_naming_rule.static_readonly_are_pascal_case.style = pascal_case
+dotnet_naming_rule.static_readonly_are_pascal_case.severity = warning
+
+dotnet_naming_rule.private_fields_are_underscore_camel.symbols = private_fields
+dotnet_naming_rule.private_fields_are_underscore_camel.style = underscore_camel_case
+dotnet_naming_rule.private_fields_are_underscore_camel.severity = warning
+
+dotnet_naming_rule.public_fields_are_camel_case.symbols = public_fields
+dotnet_naming_rule.public_fields_are_camel_case.style = camel_case
+dotnet_naming_rule.public_fields_are_camel_case.severity = warning
+
+dotnet_naming_rule.parameters_and_locals_are_camel_case.symbols = parameters_and_locals
+dotnet_naming_rule.parameters_and_locals_are_camel_case.style = camel_case
+dotnet_naming_rule.parameters_and_locals_are_camel_case.severity = warning
+
+# ===========================================================================
+# Third-party / vendored code — keep upstream style, do not report on it.
+# ===========================================================================
+
+[Assets/ThirdParty/**.cs]
+dotnet_analyzer_diagnostic.severity = none
+dotnet_diagnostic.IDE0005.severity = none
+
+[Assets/{Oculus,Samples,MetaXR,XRI,XR,Plugins}/**.cs]
+dotnet_analyzer_diagnostic.severity = none
+dotnet_diagnostic.IDE0005.severity = none
+
+[Assets/Lab/**/Lib/**.cs]
+dotnet_analyzer_diagnostic.severity = none
+dotnet_diagnostic.IDE0005.severity = none

.github/workflows/build-upm-from-project-folder.yml

@@ -8,12 +8,16 @@ on:
       upm-branch:
         required: true
         type: string
+      tag-prefix:
+        required: false
+        type: string
+        default: upm
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout release
-        uses: actions/checkout@v3
+        uses: actions/checkout@v7
         with:
           ref: ${{ github.ref }}
       - name: Remove everything except for our project
@@ -46,6 +50,6 @@ jobs:
       - name: Commit
         run: git commit -m "Add upm package for ${GITHUB_REF#refs/*/}"
       - name: Tag
-        run: git tag -a upm-${GITHUB_REF#refs/*/} -m ""
+        run: git tag -a ${{ inputs.tag-prefix }}-${GITHUB_REF#refs/*/} -m ""
       - name: Push
         run: git push --follow-tags --set-upstream origin ${{ inputs.upm-branch }}

.github/workflows/upm.yml

@@ -1,10 +1,18 @@
-name: Update upm branch on release
+name: Update upm branches on release
 on:
   push:
     tags: [ 'unity-v*.*.*' ]
 jobs:
-  build-upm:
+  build-upm-core:
     uses: ./.github/workflows/build-upm-from-project-folder.yml
     with:
       project-folder: Assets/Lab/Core
-      upm-branch: upm
+      upm-branch: upm
+      tag-prefix: upm
+  build-upm-eventsystem:
+    needs: build-upm-core
+    uses: ./.github/workflows/build-upm-from-project-folder.yml
+    with:
+      project-folder: Assets/Lab/EventSystem
+      upm-branch: upm-eventsystem
+      tag-prefix: upm-eventsystem

Assets/Lab/Core/Editor/Util/AssetBatch.cs

@@ -0,0 +1,60 @@
+using System;
+using System.Linq;
+using UnityEditor;
+using UnityEditor.SceneManagement;
+using UnityEngine;
+
+/// <summary>
+/// Runs an operation on every GameObject in all prefabs and scenes under the given folders.
+/// The operation returns how many issues it found/fixed on that object; assets are only saved when save is true.
+/// </summary>
+public static class AssetBatch
+{
+    public static int Run(string[] folders, bool save, Func<GameObject, string, int> process)
+    {
+        int total = 0;
+
+        // Prefabs first, so scene instances of fixed prefabs are already clean
+        foreach (string path in Find("t:Prefab", folders))
+        {
+            // Model files (.fbx etc.) show up as prefabs too but can't be edited
+            if (PrefabUtility.GetPrefabAssetType(AssetDatabase.LoadMainAssetAtPath(path)) == PrefabAssetType.Model)
+                continue;
+
+            GameObject root = PrefabUtility.LoadPrefabContents(path);
+            int count = Walk(root, path, process);
+            if (save && count > 0)
+                PrefabUtility.SaveAsPrefabAsset(root, path);
+            PrefabUtility.UnloadPrefabContents(root);
+            total += count;
+        }
+
+        string activeScene = EditorSceneManager.GetActiveScene().path;
+        foreach (string path in Find("t:Scene", folders))
+        {
+            var scene = EditorSceneManager.OpenScene(path, OpenSceneMode.Single);
+            int count = scene.GetRootGameObjects().Sum(go => Walk(go, path, process));
+            if (save && count > 0)
+                EditorSceneManager.SaveScene(scene);
+            total += count;
+        }
+        if (!string.IsNullOrEmpty(activeScene))
+            EditorSceneManager.OpenScene(activeScene);
+
+        return total;
+    }
+
+    public static string GetPath(GameObject go) =>
+        go.transform.parent ? GetPath(go.transform.parent.gameObject) + "/" + go.name : go.name;
+
+    private static int Walk(GameObject go, string assetPath, Func<GameObject, string, int> process)
+    {
+        int count = process(go, assetPath);
+        foreach (Transform child in go.transform)
+            count += Walk(child.gameObject, assetPath, process);
+        return count;
+    }
+
+    private static string[] Find(string filter, string[] folders) =>
+        AssetDatabase.FindAssets(filter, folders).Select(AssetDatabase.GUIDToAssetPath).ToArray();
+}

Assets/Lab/Core/Editor/Util/EndpointsSetup.cs

@@ -0,0 +1,52 @@
+using UnityEditor;
+using UnityEngine;
+using VaSiLi.Networking;
+
+/// <summary>
+/// Warns on editor start when no VasiliEndpoints config exists and offers a menu item to create one.
+/// The config holds the project's server addresses, so it is not part of the public repository.
+/// </summary>
+[InitializeOnLoad]
+public static class EndpointsSetup
+{
+    private const string DefaultPath = "Assets/Resources/" + VasiliEndpoints.ResourceName + ".asset";
+
+    static EndpointsSetup()
+    {
+        // Wait until the asset database is ready
+        EditorApplication.delayCall += () =>
+        {
+            if (Find() == null)
+                Debug.LogWarning("[Va.Si.Li] No endpoints configured: all services will use localhost. " +
+                                 "Create a config via Tools > Va.Si.Li > Create Endpoints Config and enter your server addresses.");
+        };
+    }
+
+    [MenuItem("Tools/Va.Si.Li/Create Endpoints Config")]
+    private static void Create()
+    {
+        var existing = Find();
+        if (existing == null)
+        {
+            if (!AssetDatabase.IsValidFolder("Assets/Resources"))
+                AssetDatabase.CreateFolder("Assets", "Resources");
+            existing = ScriptableObject.CreateInstance<VasiliEndpoints>();
+            AssetDatabase.CreateAsset(existing, DefaultPath);
+            AssetDatabase.SaveAssets();
+        }
+        Selection.activeObject = existing;
+        EditorGUIUtility.PingObject(existing);
+    }
+
+    // Only assets inside a Resources folder are picked up at runtime
+    private static VasiliEndpoints Find()
+    {
+        foreach (string guid in AssetDatabase.FindAssets("t:" + nameof(VasiliEndpoints)))
+        {
+            string path = AssetDatabase.GUIDToAssetPath(guid);
+            if (path.Contains("/Resources/") && System.IO.Path.GetFileNameWithoutExtension(path) == VasiliEndpoints.ResourceName)
+                return AssetDatabase.LoadAssetAtPath<VasiliEndpoints>(path);
+        }
+        return null;
+    }
+}