Unity-Technologies · jamesmcgill · Sep 12, 2024 · Sep 9, 2024 · Sep 12, 2024
diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md
@@ -24,6 +24,7 @@ however, it has to be formatted properly to pass verification tests.
 
 ### Changed
 - Use `ProfilerMarker` instead of `Profiler.BeginSample` and `Profiler.EndSample` when appropriate to enable recording of profiling data.
+- Renamed editor Resources directories to PackageResources to fix package validation warnings.
 
 ### Added
 - Added Hinge Angle sensor support for foldable devices.

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/InputActionTreeView.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/InputActionTreeView.cs
@@ -1514,7 +1514,7 @@ private GUIContent plusIcon
         private static readonly GUIContent s_ExpandAllLabel = EditorGUIUtility.TrTextContent("Expand All");
         private static readonly GUIContent s_CollapseAllLabel = EditorGUIUtility.TrTextContent("Collapse All");
 
-        public static string SharedResourcesPath = "Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/Resources/";
+        public static string SharedResourcesPath = "Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/PackageResources/";
         public static string ResourcesPath
         {
             get

diff --git a/...tSystem/Editor/AssetEditor/Resources.meta → .../Editor/AssetEditor/PackageResources.meta b/...tSystem/Editor/AssetEditor/Resources.meta → .../Editor/AssetEditor/PackageResources.meta
diff --git a/...tem/Editor/AssetEditor/Resources/blue.png → ...tor/AssetEditor/PackageResources/blue.png b/...tem/Editor/AssetEditor/Resources/blue.png → ...tor/AssetEditor/PackageResources/blue.png
diff --git a/...ditor/AssetEditor/Resources/blue.png.meta → ...ssetEditor/PackageResources/blue.png.meta b/...ditor/AssetEditor/Resources/blue.png.meta → ...ssetEditor/PackageResources/blue.png.meta
diff --git a/...em/Editor/AssetEditor/Resources/green.png → ...or/AssetEditor/PackageResources/green.png b/...em/Editor/AssetEditor/Resources/green.png → ...or/AssetEditor/PackageResources/green.png
diff --git a/...itor/AssetEditor/Resources/green.png.meta → ...setEditor/PackageResources/green.png.meta b/...itor/AssetEditor/Resources/green.png.meta → ...setEditor/PackageResources/green.png.meta
diff --git a/...ditor/AssetEditor/Resources/personal.meta → ...ssetEditor/PackageResources/personal.meta b/...ditor/AssetEditor/Resources/personal.meta → ...ssetEditor/PackageResources/personal.meta
diff --git a/...sources/personal/actionTreeBackground.png → ...sources/personal/actionTreeBackground.png b/...sources/personal/actionTreeBackground.png → ...sources/personal/actionTreeBackground.png
diff --git a/...es/personal/actionTreeBackground.png.meta → ...es/personal/actionTreeBackground.png.meta b/...es/personal/actionTreeBackground.png.meta → ...es/personal/actionTreeBackground.png.meta
diff --git a/...nal/actionTreeBackgroundWithoutBorder.png → ...nal/actionTreeBackgroundWithoutBorder.png b/...nal/actionTreeBackgroundWithoutBorder.png → ...nal/actionTreeBackgroundWithoutBorder.png
diff --git a/...ctionTreeBackgroundWithoutBorder.png.meta → ...ctionTreeBackgroundWithoutBorder.png.meta b/...ctionTreeBackgroundWithoutBorder.png.meta → ...ctionTreeBackgroundWithoutBorder.png.meta
diff --git a/.../Resources/personal/foldoutBackground.png → ...eResources/personal/foldoutBackground.png b/.../Resources/personal/foldoutBackground.png → ...eResources/personal/foldoutBackground.png
diff --git a/...urces/personal/foldoutBackground.png.meta → ...urces/personal/foldoutBackground.png.meta b/...urces/personal/foldoutBackground.png.meta → ...urces/personal/foldoutBackground.png.meta
diff --git a/...sources/personal/propertiesBackground.png → ...sources/personal/propertiesBackground.png b/...sources/personal/propertiesBackground.png → ...sources/personal/propertiesBackground.png
diff --git a/...es/personal/propertiesBackground.png.meta → ...es/personal/propertiesBackground.png.meta b/...es/personal/propertiesBackground.png.meta → ...es/personal/propertiesBackground.png.meta
diff --git a/...tem/Editor/AssetEditor/Resources/pink.png → ...tor/AssetEditor/PackageResources/pink.png b/...tem/Editor/AssetEditor/Resources/pink.png → ...tor/AssetEditor/PackageResources/pink.png
diff --git a/...ditor/AssetEditor/Resources/pink.png.meta → ...ssetEditor/PackageResources/pink.png.meta b/...ditor/AssetEditor/Resources/pink.png.meta → ...ssetEditor/PackageResources/pink.png.meta
diff --git a/...tem/Editor/AssetEditor/Resources/pro.meta → ...tor/AssetEditor/PackageResources/pro.meta b/...tem/Editor/AssetEditor/Resources/pro.meta → ...tor/AssetEditor/PackageResources/pro.meta
diff --git a/...or/Resources/pro/actionTreeBackground.png → ...ageResources/pro/actionTreeBackground.png b/...or/Resources/pro/actionTreeBackground.png → ...ageResources/pro/actionTreeBackground.png
diff --git a/...sources/pro/actionTreeBackground.png.meta → ...sources/pro/actionTreeBackground.png.meta b/...sources/pro/actionTreeBackground.png.meta → ...sources/pro/actionTreeBackground.png.meta
diff --git a/...pro/actionTreeBackgroundWithoutBorder.png → ...pro/actionTreeBackgroundWithoutBorder.png b/...pro/actionTreeBackgroundWithoutBorder.png → ...pro/actionTreeBackgroundWithoutBorder.png
diff --git a/...ctionTreeBackgroundWithoutBorder.png.meta → ...ctionTreeBackgroundWithoutBorder.png.meta b/...ctionTreeBackgroundWithoutBorder.png.meta → ...ctionTreeBackgroundWithoutBorder.png.meta
diff --git a/...ditor/Resources/pro/foldoutBackground.png → ...ackageResources/pro/foldoutBackground.png b/...ditor/Resources/pro/foldoutBackground.png → ...ackageResources/pro/foldoutBackground.png
diff --git a/.../Resources/pro/foldoutBackground.png.meta → ...eResources/pro/foldoutBackground.png.meta b/.../Resources/pro/foldoutBackground.png.meta → ...eResources/pro/foldoutBackground.png.meta
diff --git a/...or/Resources/pro/propertiesBackground.png → ...ageResources/pro/propertiesBackground.png b/...or/Resources/pro/propertiesBackground.png → ...ageResources/pro/propertiesBackground.png
diff --git a/...sources/pro/propertiesBackground.png.meta → ...sources/pro/propertiesBackground.png.meta b/...sources/pro/propertiesBackground.png.meta → ...sources/pro/propertiesBackground.png.meta
diff --git a/...m/Editor/AssetEditor/Resources/yellow.png → ...r/AssetEditor/PackageResources/yellow.png b/...m/Editor/AssetEditor/Resources/yellow.png → ...r/AssetEditor/PackageResources/yellow.png
diff --git a/...tor/AssetEditor/Resources/yellow.png.meta → ...etEditor/PackageResources/yellow.png.meta b/...tor/AssetEditor/Resources/yellow.png.meta → ...etEditor/PackageResources/yellow.png.meta
diff --git a/...s/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/InputActionsEditorConstants.cs b/...s/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/InputActionsEditorConstants.cs
@@ -6,7 +6,7 @@ internal static class InputActionsEditorConstants
     {
         // Paths
         public const string PackagePath = "Packages/com.unity.inputsystem";
-        public const string ResourcesPath = "/InputSystem/Editor/UITKAssetEditor/Resources";
+        public const string ResourcesPath = "/InputSystem/Editor/UITKAssetEditor/PackageResources";
 
         /// Template names
         public const string ProjectSettingsUxml = "/InputActionsProjectSettings.uxml";

diff --git a/...tem/Editor/UITKAssetEditor/Resources.meta → ...tor/UITKAssetEditor/PackageResources.meta b/...tem/Editor/UITKAssetEditor/Resources.meta → ...tor/UITKAssetEditor/PackageResources.meta
diff --git a/...or/Resources/BindingPanelRowTemplate.uxml → ...ageResources/BindingPanelRowTemplate.uxml b/...or/Resources/BindingPanelRowTemplate.uxml → ...ageResources/BindingPanelRowTemplate.uxml
diff --git a/...sources/BindingPanelRowTemplate.uxml.meta → ...sources/BindingPanelRowTemplate.uxml.meta b/...sources/BindingPanelRowTemplate.uxml.meta → ...sources/BindingPanelRowTemplate.uxml.meta
diff --git a/...ces/CompositeBindingPropertiesEditor.uxml → ...ces/CompositeBindingPropertiesEditor.uxml b/...ces/CompositeBindingPropertiesEditor.uxml → ...ces/CompositeBindingPropertiesEditor.uxml
diff --git a/...ompositeBindingPropertiesEditor.uxml.meta → ...ompositeBindingPropertiesEditor.uxml.meta b/...ompositeBindingPropertiesEditor.uxml.meta → ...ompositeBindingPropertiesEditor.uxml.meta
diff --git a/...CompositePartBindingPropertiesEditor.uxml → ...CompositePartBindingPropertiesEditor.uxml b/...CompositePartBindingPropertiesEditor.uxml → ...CompositePartBindingPropertiesEditor.uxml
diff --git a/...sitePartBindingPropertiesEditor.uxml.meta → ...sitePartBindingPropertiesEditor.uxml.meta b/...sitePartBindingPropertiesEditor.uxml.meta → ...sitePartBindingPropertiesEditor.uxml.meta
diff --git a/...Editor/Resources/ControlSchemeEditor.uxml → ...PackageResources/ControlSchemeEditor.uxml b/...Editor/Resources/ControlSchemeEditor.uxml → ...PackageResources/ControlSchemeEditor.uxml
diff --git a/...r/Resources/ControlSchemeEditor.uxml.meta → ...geResources/ControlSchemeEditor.uxml.meta b/...r/Resources/ControlSchemeEditor.uxml.meta → ...geResources/ControlSchemeEditor.uxml.meta
diff --git a/...esources/InputActionMapsTreeViewItem.uxml → ...esources/InputActionMapsTreeViewItem.uxml b/...esources/InputActionMapsTreeViewItem.uxml → ...esources/InputActionMapsTreeViewItem.uxml
@@ -1,5 +1,5 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../../../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
-    <Style src="project://database/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Resources/InputActionsEditorStyles.uss?fileID=7433441132597879392&amp;guid=7dac9c49a90bca4499371d0adc9b617b&amp;type=3#InputActionsEditorStyles" />
+    <Style src="project://database/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/InputActionsEditorStyles.uss?fileID=7433441132597879392&amp;guid=7dac9c49a90bca4499371d0adc9b617b&amp;type=3#InputActionsEditorStyles" />
     <ui:VisualElement name="item-row" class="unity-list-view__item" style="flex-direction: row; flex-grow: 1; justify-content: space-between; margin-left: 4px; flex-shrink: 0;">
         <ui:VisualElement name="row" style="flex-direction: row; border-left-width: 0; border-left-color: rgb(89, 89, 89); justify-content: flex-start; align-items: center;">
             <ui:TextField picking-mode="Ignore" name="rename-text-field" is-delayed="true" focusable="true" class="unity-input-actions-editor-hidden" style="visibility: visible; flex-shrink: 1;" />

diff --git a/...ces/InputActionMapsTreeViewItem.uxml.meta → ...ces/InputActionMapsTreeViewItem.uxml.meta b/...ces/InputActionMapsTreeViewItem.uxml.meta → ...ces/InputActionMapsTreeViewItem.uxml.meta
diff --git a/...tEditor/Resources/InputActionsEditor.uxml → .../PackageResources/InputActionsEditor.uxml b/...tEditor/Resources/InputActionsEditor.uxml → .../PackageResources/InputActionsEditor.uxml
@@ -1,5 +1,5 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="True">
-    <Style src="project://database/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Resources/InputActionsEditorStyles.uss?fileID=7433441132597879392&amp;guid=7dac9c49a90bca4499371d0adc9b617b&amp;type=3#InputActionsEditorStyles" />
+    <Style src="project://database/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/InputActionsEditorStyles.uss?fileID=7433441132597879392&amp;guid=7dac9c49a90bca4499371d0adc9b617b&amp;type=3#InputActionsEditorStyles" />
     <ui:VisualElement name="action-editor" style="flex-direction: column; flex-grow: 1;">
         <ui:VisualElement name="control-schemes-toolbar-container">
             <uie:Toolbar>

diff --git a/...or/Resources/InputActionsEditor.uxml.meta → ...ageResources/InputActionsEditor.uxml.meta b/...or/Resources/InputActionsEditor.uxml.meta → ...ageResources/InputActionsEditor.uxml.meta
diff --git a/...or/Resources/InputActionsEditorStyles.uss → ...ageResources/InputActionsEditorStyles.uss b/...or/Resources/InputActionsEditorStyles.uss → ...ageResources/InputActionsEditorStyles.uss
diff --git a/...sources/InputActionsEditorStyles.uss.meta → ...sources/InputActionsEditorStyles.uss.meta b/...sources/InputActionsEditorStyles.uss.meta → ...sources/InputActionsEditorStyles.uss.meta
diff --git a/...esources/InputActionsProjectSettings.uxml → ...esources/InputActionsProjectSettings.uxml b/...esources/InputActionsProjectSettings.uxml → ...esources/InputActionsProjectSettings.uxml
@@ -1,5 +1,5 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="True">
-    <Style src="project://database/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Resources/InputActionsEditorStyles.uss?fileID=7433441132597879392&amp;guid=7dac9c49a90bca4499371d0adc9b617b&amp;type=3#InputActionsEditorStyles" />
+    <Style src="project://database/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/InputActionsEditorStyles.uss?fileID=7433441132597879392&amp;guid=7dac9c49a90bca4499371d0adc9b617b&amp;type=3#InputActionsEditorStyles" />
     <ui:VisualElement name="header" class="header">
         <ui:Label text="Input Actions" display-tooltip-when-elided="true" name="title-label" class="header-label" />
         <ui:VisualElement name="asset-menu" style="flex-grow: 0; background-color: rgba(0, 0, 0, 0); width: 16px; flex-shrink: 0; -unity-background-scale-mode: scale-to-fit;" />

diff --git a/...ces/InputActionsProjectSettings.uxml.meta → ...ces/InputActionsProjectSettings.uxml.meta b/...ces/InputActionsProjectSettings.uxml.meta → ...ces/InputActionsProjectSettings.uxml.meta
diff --git a/...r/Resources/InputActionsTreeViewItem.uxml → ...geResources/InputActionsTreeViewItem.uxml b/...r/Resources/InputActionsTreeViewItem.uxml → ...geResources/InputActionsTreeViewItem.uxml
@@ -1,5 +1,5 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../../../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
-    <Style src="project://database/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Resources/InputActionsEditorStyles.uss?fileID=7433441132597879392&amp;guid=7dac9c49a90bca4499371d0adc9b617b&amp;type=3#InputActionsEditorStyles" />
+    <Style src="project://database/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/InputActionsEditorStyles.uss?fileID=7433441132597879392&amp;guid=7dac9c49a90bca4499371d0adc9b617b&amp;type=3#InputActionsEditorStyles" />
     <ui:VisualElement name="item-row" class="unity-list-view__item" style="flex-direction: row; flex-grow: 1; justify-content: space-between; margin-left: 4px; flex-shrink: 0;">
         <ui:VisualElement name="row" style="flex-direction: row; border-left-width: 0; border-left-color: rgb(89, 89, 89); justify-content: flex-start; align-items: center;">
             <ui:VisualElement name="icon" class="tree-view-item-icon" style="height: 19px; -unity-background-scale-mode: scale-to-fit;" />

diff --git a/...ources/InputActionsTreeViewItem.uxml.meta → ...ources/InputActionsTreeViewItem.uxml.meta b/...ources/InputActionsTreeViewItem.uxml.meta → ...ources/InputActionsTreeViewItem.uxml.meta
diff --git a/...Editor/Resources/InputAssetEditorDark.uss → ...PackageResources/InputAssetEditorDark.uss b/...Editor/Resources/InputAssetEditorDark.uss → ...PackageResources/InputAssetEditorDark.uss
diff --git a/...r/Resources/InputAssetEditorDark.uss.meta → ...geResources/InputAssetEditorDark.uss.meta b/...r/Resources/InputAssetEditorDark.uss.meta → ...geResources/InputAssetEditorDark.uss.meta
diff --git a/...ditor/Resources/InputAssetEditorLight.uss → ...ackageResources/InputAssetEditorLight.uss b/...ditor/Resources/InputAssetEditorLight.uss → ...ackageResources/InputAssetEditorLight.uss
diff --git a/.../Resources/InputAssetEditorLight.uss.meta → ...eResources/InputAssetEditorLight.uss.meta b/.../Resources/InputAssetEditorLight.uss.meta → ...eResources/InputAssetEditorLight.uss.meta
diff --git a/...NameAndParameterListViewItemTemplate.uxml → ...NameAndParameterListViewItemTemplate.uxml b/...NameAndParameterListViewItemTemplate.uxml → ...NameAndParameterListViewItemTemplate.uxml
@@ -1,5 +1,5 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../../../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="True">
-    <Style src="project://database/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Resources/InputActionsEditorStyles.uss?fileID=7433441132597879392&amp;guid=7dac9c49a90bca4499371d0adc9b617b&amp;type=3#InputActionsEditorStyles" />
+    <Style src="project://database/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/PackageResources/InputActionsEditorStyles.uss?fileID=7433441132597879392&amp;guid=7dac9c49a90bca4499371d0adc9b617b&amp;type=3#InputActionsEditorStyles" />
     <ui:VisualElement style="margin-bottom: 0; border-bottom-width: 1px; padding-bottom: 5px;">
         <ui:Foldout text="Foldout" name="Foldout" value="true" class="name-and-parameters-list-foldout" style="align-items: stretch;" />
     </ui:VisualElement>

diff --git a/...ndParameterListViewItemTemplate.uxml.meta → ...ndParameterListViewItemTemplate.uxml.meta b/...ndParameterListViewItemTemplate.uxml.meta → ...ndParameterListViewItemTemplate.uxml.meta
diff --git a/...m.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/MatchingControlPaths.cs.meta b/...m.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/MatchingControlPaths.cs.meta