Merge remote-tracking branch 'upstream/main'

Author: davidkline-ms

Assets/MRTK/Core/Inspectors/Profiles/MixedRealityProfileCloneWindow.cs

@@ -14,10 +14,25 @@ public class MixedRealityProfileCloneWindow : EditorWindow
     {
         public enum ProfileCloneBehavior
         {
-            UseExisting,        // Use the existing reference
-            CloneExisting,      // Create a clone of the sub-profile
-            UseSubstitution,    // Manually select a profile
-            LeaveEmpty,         // Set the reference to null
+            /// <summary>
+            /// Use the existing reference.
+            /// </summary>
+            UseExisting,
+
+            /// <summary>
+            /// Create a clone of the sub-profile.
+            /// </summary>
+            CloneExisting,
+
+            /// <summary>
+            /// Manually select a profile.
+            /// </summary>
+            UseSubstitution,
+
+            /// <summary>
+            /// Set the reference to null.
+            /// </summary>
+            LeaveEmpty,
         }
 
         private struct SubProfileAction
@@ -70,7 +85,7 @@ public static void OpenWindow(BaseMixedRealityProfile parentProfile, BaseMixedRe
                 cloneWindow.Close();
             }
 
-            cloneWindow = (MixedRealityProfileCloneWindow)GetWindow<MixedRealityProfileCloneWindow>(true, "Clone Profile", true);
+            cloneWindow = GetWindow<MixedRealityProfileCloneWindow>(true, "Clone Profile", true);
             cloneWindow.Initialize(parentProfile, childProfile, childProperty, selectionTarget);
             cloneWindow.Show(true);
         }
@@ -125,7 +140,7 @@ private void Initialize(BaseMixedRealityProfile parentProfile, BaseMixedRealityP
 
             cloneWindow.maxSize = MinWindowSizeBasic;
 
-            targetFolder = EnsureTargetFolder(targetFolder);
+            targetFolder = EnsureTargetFolder(targetFolder, false);
         }
 
         private void OnGUI()
@@ -195,7 +210,7 @@ private void OnGUI()
                                     if (GUILayout.Button("Put in original folder", EditorStyles.miniButton, GUILayout.MaxWidth(120)))
                                     {
                                         string profilePath = AssetDatabase.GetAssetPath(action.Property.objectReferenceValue);
-                                        action.TargetFolder = AssetDatabase.LoadAssetAtPath<Object>(System.IO.Path.GetDirectoryName(profilePath));
+                                        action.TargetFolder = AssetDatabase.LoadAssetAtPath<Object>(Path.GetDirectoryName(profilePath));
                                     }
                                 }
                                 break;
@@ -220,10 +235,10 @@ private void OnGUI()
             using (new EditorGUILayout.HorizontalScope())
             {
                 targetFolder = EditorGUILayout.ObjectField("Target Folder", targetFolder, typeof(DefaultAsset), false);
-                if (GUILayout.Button("Put in original folder", EditorStyles.miniButton, GUILayout.MaxWidth(120)))
+                if (GUILayout.Button("Put in original folder", EditorStyles.miniButton, GUILayout.MaxWidth(125)))
                 {
                     string profilePath = AssetDatabase.GetAssetPath(childProfile);
-                    targetFolder = AssetDatabase.LoadAssetAtPath<Object>(System.IO.Path.GetDirectoryName(profilePath));
+                    targetFolder = AssetDatabase.LoadAssetAtPath<Object>(Path.GetDirectoryName(profilePath));
                 }
             }
 
@@ -263,7 +278,7 @@ private void OnGUI()
 
         private void CloneMainProfile()
         {
-            var newChildProfile = CloneProfile(parentProfile, childProfile, childProfileTypeName, childProperty, targetFolder, childProfileAssetName);
+            var newChildProfile = CloneProfile(childProfileTypeName, childProperty, targetFolder, childProfileAssetName);
             SerializedObject newChildSerializedObject = new SerializedObject(newChildProfile);
             // First paste all values outright
             PasteProfileValues(parentProfile, childProfile, newChildSerializedObject);
@@ -302,7 +317,7 @@ private void CloneMainProfile()
 
                         // Clone the sub profile
                         Object subTargetFolder = (action.TargetFolder == null) ? targetFolder : action.TargetFolder;
-                        var newSubProfile = CloneProfile(newChildProfile, subProfileToClone, action.ProfileType.Name, actionProperty, subTargetFolder, action.CloneName);
+                        var newSubProfile = CloneProfile(action.ProfileType.Name, actionProperty, subTargetFolder, action.CloneName);
                         SerializedObject newSubProfileSerializedObject = new SerializedObject(newSubProfile);
                         // Paste values from existing profile
                         PasteProfileValues(newChildProfile, subProfileToClone, newSubProfileSerializedObject);
@@ -334,7 +349,7 @@ private void CloneMainProfile()
             cloneWindow.Close();
         }
 
-        private static BaseMixedRealityProfile CloneProfile(BaseMixedRealityProfile parentProfile, BaseMixedRealityProfile profileToClone, string childProfileTypeName, SerializedProperty childProperty, Object targetFolder, string profileName)
+        private static BaseMixedRealityProfile CloneProfile(string childProfileTypeName, SerializedProperty childProperty, Object targetFolder, string profileName)
         {
             ScriptableObject instance = CreateInstance(childProfileTypeName);
             instance.name = string.IsNullOrEmpty(profileName) ? childProfileTypeName : profileName;
@@ -394,21 +409,21 @@ private static System.Type FindProfileType(string profileTypeName)
         /// If the targetFolder is invalid asset folder, this will create the CustomProfiles
         /// folder and use that as the default target.
         /// </summary>
-        private static Object EnsureTargetFolder(Object targetFolder)
+        private static Object EnsureTargetFolder(Object targetFolder, bool createDefaultIfNeeded = true)
         {
             if (targetFolder != null && AssetDatabase.IsValidFolder(AssetDatabase.GetAssetPath(targetFolder)))
             {
                 return targetFolder;
             }
 
             string customProfilesFolderPath = DefaultCustomProfileFolder;
-            if (!AssetDatabase.IsValidFolder(customProfilesFolderPath))
+            if (createDefaultIfNeeded && !AssetDatabase.IsValidFolder(customProfilesFolderPath))
             {
                 // AssetDatabase.CreateFolder must be called to create each child of the asset folder
-                // path individually. 
+                // path individually.
 
-                // If the packages have been imported via NugetForUnity, MixedRealityToolkitFiles.GetGeneratedFolder
-                // will also create the MixedRealityToolkit.Generated Folder and return the path to the folder.
+                // MixedRealityToolkitFiles.GetGeneratedFolder will create the MixedRealityToolkit.Generated
+                // folder if needed.
                 AssetDatabase.CreateFolder(MixedRealityToolkitFiles.GetGeneratedFolder, "CustomProfiles");
             }
             return AssetDatabase.LoadAssetAtPath(DefaultCustomProfileFolder, typeof(Object));

Assets/MRTK/Examples/Demos/PulseShader/Profile/PulseShaderSpatialAwarenessSystemProfile.asset

@@ -33,5 +33,12 @@ MonoBehaviour:
         Microsoft.MixedReality.Toolkit.Providers.XRSDK
     componentName: XR SDK Spatial Mesh Observer
     priority: 0
-    runtimePlatform: -1
+    runtimePlatform: 2039
+    observerProfile: {fileID: 11400000, guid: 4f5009fa6e8234540be72702bb09d29a, type: 2}
+  - componentType:
+      reference: Microsoft.MixedReality.Toolkit.XRSDK.OpenXR.OpenXRSpatialAwarenessMeshObserver,
+        Microsoft.MixedReality.Toolkit.Providers.OpenXR
+    componentName: OpenXR Spatial Mesh Observer
+    priority: 0
+    runtimePlatform: 8
     observerProfile: {fileID: 11400000, guid: 4f5009fa6e8234540be72702bb09d29a, type: 2}

Assets/MRTK/Extensions/HandPhysicsService/Examples/HandPhysicsServiceExample.unity

@@ -2344,7 +2344,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 83d9acc7968244a8886f3af591305bcb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  activeProfile: {fileID: 11400000, guid: fbb8235a0e1db804880e49990996f5a4, type: 2}
+  activeProfile: {fileID: 11400000, guid: ec6c5962fb980c041854a25f84d6f2e6, type: 2}
 --- !u!4 &1462653017
 Transform:
   m_ObjectHideFlags: 0

Assets/MRTK/SDK/Profiles/DefaultMixedRealitySpatialAwarenessSystemProfile.asset

@@ -33,7 +33,7 @@ MonoBehaviour:
         Microsoft.MixedReality.Toolkit.Providers.XRSDK
     componentName: XR SDK Spatial Mesh Observer
     priority: 0
-    runtimePlatform: -9
+    runtimePlatform: 2039
     observerProfile: {fileID: 11400000, guid: 8be0bcd2117dd214da41ed98f0def2e3, type: 2}
   - componentType:
       reference: Microsoft.MixedReality.Toolkit.XRSDK.OpenXR.OpenXRSpatialAwarenessMeshObserver,

pipelines/packageupmpublic.yaml

@@ -4,16 +4,41 @@ variables:
 - template: config/settings.yml
 
 parameters:
-- name: PreviewNumber
+- name: SourcePipeline
   type: string
-  default: ''
+  default: stabilization_ci
+  values:
+    - stabilization_ci
+    - mrtk_ci
+- name: PreviewNumber
+  type: number
+  default: -1
 
 jobs:
 - job: UPMPublicRelease
   timeoutInMinutes: 30
   pool:
     vmImage: windows-2019
   steps:
+  - task: DownloadPipelineArtifact@2
+    displayName: Download tarballs
+    inputs:
+      source: specific
+      project: $(System.TeamProjectId)
+      ${{ if eq(parameters.SourcePipeline, 'stabilization_ci') }}:
+        pipeline: 32
+      ${{ if eq(parameters.SourcePipeline, 'mrtk_ci') }}:
+        pipeline: 15
+      runVersion: latestFromBranch
+      runBranch: $(Build.SourceBranch)
+      artifactName: mrtk-upm
+      path: $(Agent.TempDirectory)
+
   - template: templates/tasks/pack-upm.yml
     parameters:
-      previewNumber: ${{ parameters.PreviewNumber }}
+      ${{ if ge(parameters.PreviewNumber, 0) }}:
+        previewNumber: ${{ parameters.PreviewNumber }}
+      ${{ if lt(parameters.PreviewNumber, 0) }}:
+        previewNumber: ""
+      projectRoot: $(Agent.TempDirectory)
+      repack: true

pipelines/templates/tasks/pack-upm.yml

@@ -5,34 +5,47 @@ parameters:
   outputDirectory: $(Build.ArtifactStagingDirectory)\build\upm\output
   version: $(MRTKVersion)
   previewNumber: $(Build.BuildNumber)
+  repack: false
 
 steps:
 - task: NodeTool@0
   inputs:
     versionSpec: '12.18.0'
 
-- ${{ if not(eq(parameters.previewNumber, '')) }}:
-  - task: PowerShell@2
+- task: PowerShell@2
+  ${{ if not(eq(parameters.previewNumber, '')) }}:
     displayName: 'Build PREVIEW UPM packages'
-    inputs:
-      targetType: filePath
-      filePath: ./scripts/packaging/createupmpackages.ps1
-      arguments: >
-        -ProjectRoot ${{ parameters.projectRoot }}
-        -OutputDirectory ${{ parameters.outputDirectory }}
-        -Version ${{ parameters.version }}
-        -PreviewNumber ${{ parameters.previewNumber }}
-
-- ${{ if eq(parameters.previewNumber, '') }}:
-  - task: PowerShell@2
+  ${{ if eq(parameters.previewNumber, '') }}:
     displayName: 'Build OFFICIAL UPM packages'
-    inputs:
-      targetType: filePath
-      filePath: ./scripts/packaging/createupmpackages.ps1
-      arguments: >
-        -ProjectRoot ${{ parameters.projectRoot }}
-        -OutputDirectory ${{ parameters.outputDirectory }}
-        -Version ${{ parameters.version }}
+  inputs:
+    targetType: filePath
+    filePath: ./scripts/packaging/createupmpackages.ps1
+    ${{ if not(eq(parameters.previewNumber, '')) }}:
+      ${{ if eq(parameters.repack, true) }}:
+        arguments: >
+          -ProjectRoot ${{ parameters.projectRoot }}
+          -OutputDirectory ${{ parameters.outputDirectory }}
+          -Version ${{ parameters.version }}
+          -PreviewNumber ${{ parameters.previewNumber }}
+          -Repack
+      ${{ if eq(parameters.repack, false) }}:
+        arguments: >
+          -ProjectRoot ${{ parameters.projectRoot }}
+          -OutputDirectory ${{ parameters.outputDirectory }}
+          -Version ${{ parameters.version }}
+          -PreviewNumber ${{ parameters.previewNumber }}
+    ${{ if eq(parameters.previewNumber, '') }}:
+      ${{ if eq(parameters.repack, true) }}:
+        arguments: >
+          -ProjectRoot ${{ parameters.projectRoot }}
+          -OutputDirectory ${{ parameters.outputDirectory }}
+          -Version ${{ parameters.version }}
+          -Repack
+      ${{ if eq(parameters.repack, false) }}:
+        arguments: >
+          -ProjectRoot ${{ parameters.projectRoot }}
+          -OutputDirectory ${{ parameters.outputDirectory }}
+          -Version ${{ parameters.version }}
 
 - task: PublishBuildArtifacts@1
   displayName: 'Publish UPM artifacts'