Merge pull request #9984 from keveleigh/2.7.1-cherrypicks

keveleigh · web-flow · commit d9ec21daa264 · 2021-06-16T09:36:25.000-07:00
2.7.1 cherry-picks
diff --git a/Assets/MRTK/Core/Inspectors/MixedRealityToolkitInspector.cs b/Assets/MRTK/Core/Inspectors/MixedRealityToolkitInspector.cs
@@ -12,10 +12,12 @@ public class MixedRealityToolkitInspector : UnityEditor.Editor
     {
         private SerializedProperty activeProfile;
         private UnityEditor.Editor activeProfileEditor;
+        private Object cachedProfile;
 
         private void OnEnable()
         {
             activeProfile = serializedObject.FindProperty("activeProfile");
+            cachedProfile = activeProfile.objectReferenceValue;
         }
 
         public override void OnInspectorGUI()
@@ -53,14 +55,16 @@ public override void OnInspectorGUI()
                 EditorGUILayout.HelpBox("MixedRealityToolkit cannot initialize unless an Active Profile is assigned!", MessageType.Error);
             }
 
-            bool changed = MixedRealityInspectorUtility.DrawProfileDropDownList(activeProfile, null, activeProfile.objectReferenceValue, typeof(MixedRealityToolkitConfigurationProfile), false, false);
+            bool changed = MixedRealityInspectorUtility.DrawProfileDropDownList(activeProfile, null, activeProfile.objectReferenceValue, typeof(MixedRealityToolkitConfigurationProfile), false, false) ||
+                cachedProfile != activeProfile.objectReferenceValue;
 
             serializedObject.ApplyModifiedProperties();
 
             if (changed)
             {
                 MixedRealityToolkit.Instance.ResetConfiguration((MixedRealityToolkitConfigurationProfile)activeProfile.objectReferenceValue);
                 activeProfileEditor = null;
+                cachedProfile = activeProfile.objectReferenceValue;
             }
 
             if (activeProfile.objectReferenceValue != null && activeProfileEditor == null)
diff --git a/Assets/MRTK/Core/Inspectors/Profiles/MixedRealityToolkitConfigurationProfileInspector.cs b/Assets/MRTK/Core/Inspectors/Profiles/MixedRealityToolkitConfigurationProfileInspector.cs
@@ -21,7 +21,6 @@ public class MixedRealityToolkitConfigurationProfileInspector : BaseMixedReality
         private static readonly GUIContent TargetScaleContent = new GUIContent("Target Scale:");
 
         // Experience properties
-        private SerializedProperty experienceSettingsType;
         private SerializedProperty experienceSettingsProfile;
 
         // Tracking the old experience scale property for compatibility
@@ -97,7 +96,6 @@ protected override void OnEnable()
             MixedRealityToolkitConfigurationProfile mrtkConfigProfile = target as MixedRealityToolkitConfigurationProfile;
 
             // Experience configuration
-            experienceSettingsType = serializedObject.FindProperty("experienceSettingsType");
             experienceSettingsProfile = serializedObject.FindProperty("experienceSettingsProfile");
             experienceScaleMigration = serializedObject.FindProperty("targetExperienceScale");
 
@@ -155,7 +153,7 @@ protected override void OnEnable()
                             // Reconciling old Experience Scale property with the Experience Settings Profile
                             var oldExperienceSettigsScale = (experienceSettingsProfile.objectReferenceValue as MixedRealityExperienceSettingsProfile)?.TargetExperienceScale;
 
-                            changed |= RenderProfile(experienceSettingsProfile, typeof(MixedRealityExperienceSettingsProfile), true, false,  null, true);
+                            changed |= RenderProfile(experienceSettingsProfile, typeof(MixedRealityExperienceSettingsProfile), true, false,  null);
 
                             // Experience configuration
                             if(!mrtkConfigProfile.ExperienceSettingsProfile.IsNull())
@@ -247,14 +245,24 @@ protected override void OnEnable()
                         return changed;
                     },
                     () => {
-                        var experienceScale = mrtkConfigProfile.ExperienceSettingsProfile.TargetExperienceScale;
-                        if (experienceScale != ExperienceScale.Room)
+                        if(mrtkConfigProfile.ExperienceSettingsProfile.IsNull())
                         {
-                            // Alert the user if the experience scale does not support boundary features.
+                            // Alert that an experience settings profile has not been selected
                             GUILayout.Space(6f);
-                            EditorGUILayout.HelpBox("Boundaries are only supported in Room scale experiences.", MessageType.Warning);
+                            EditorGUILayout.HelpBox("Boundaries require an experience settings profile with a Room scale target experience scale.", MessageType.Warning);
                             GUILayout.Space(6f);
                         }
+                        else
+                        {
+                            var experienceScale = mrtkConfigProfile.ExperienceSettingsProfile.TargetExperienceScale;
+                            if (experienceScale != ExperienceScale.Room)
+                            {
+                                // Alert the user if the experience scale does not support boundary features.
+                                GUILayout.Space(6f);
+                                EditorGUILayout.HelpBox("Boundaries are only supported in Room scale experiences.", MessageType.Warning);
+                                GUILayout.Space(6f);
+                            }
+                        }
 
                         bool changed = false;
                         using (var c = new EditorGUI.ChangeCheckScope())
diff --git a/Assets/MRTK/Core/Providers/UnityInput/UnityJoystickManager.cs b/Assets/MRTK/Core/Providers/UnityInput/UnityJoystickManager.cs
@@ -17,8 +17,7 @@ namespace Microsoft.MixedReality.Toolkit.Input.UnityInput
     [MixedRealityDataProvider(
         typeof(IMixedRealityInputSystem),
         (SupportedPlatforms)(-1),  // All platforms supported by Unity
-        "Unity Joystick Manager",
-        supportedUnityXRPipelines: SupportedUnityXRPipelines.LegacyXR)]
+        "Unity Joystick Manager")]
 #if UNITY_2020_1_OR_NEWER
     [Obsolete("The legacy XR pipeline has been removed in Unity 2020 or newer. Please migrate to XR SDK.")]
 #endif // UNITY_2020_1_OR_NEWER
diff --git a/Assets/MRTK/Tests/EditModeTests/Core/Utilities/BuildAndDeploy/UwpAppxBuildToolsTest.cs b/Assets/MRTK/Tests/EditModeTests/Core/Utilities/BuildAndDeploy/UwpAppxBuildToolsTest.cs
@@ -26,7 +26,7 @@ class UwpAppxBuildToolsTest
                      xmlns:mobile='http://schemas.microsoft.com/appx/manifest/mobile/windows10'
                      IgnorableNamespaces='uap uap2 uap3 uap4 mp mobile iot'
                      xmlns='http://schemas.microsoft.com/appx/manifest/foundation/windows10'>
-              <Identity Name='Microsoft.MixedReality.Toolkit' Publisher='CN=Microsoft' Version='2.7.0.0' />
+              <Identity Name='Microsoft.MixedReality.Toolkit' Publisher='CN=Microsoft' Version='2.7.1.0' />
               <mp:PhoneIdentity PhoneProductId='85c8bcd4-fbac-44ed-adf6-bfc01242a27f' PhonePublisherId='00000000-0000-0000-0000-000000000000' />
               <Properties>
                 <DisplayName>MixedRealityToolkit</DisplayName>
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
@@ -118,7 +118,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 2.7.0
+  bundleVersion: 2.7.1
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
@@ -687,7 +687,7 @@ PlayerSettings:
   m_RenderingPath: 1
   m_MobileRenderingPath: 1
   metroPackageName: Microsoft.MixedReality.Toolkit
-  metroPackageVersion: 2.7.0.0
+  metroPackageVersion: 2.7.1.0
   metroCertificatePath: Assets/WSATestCertificate.pfx
   metroCertificatePassword: 
   metroCertificateSubject: Microsoft
diff --git a/pipelines/ci-packaging-internal.yml b/pipelines/ci-packaging-internal.yml
@@ -13,11 +13,13 @@ jobs:
 - job: UnityValidation
   timeoutInMinutes: 90
   pool:
-    name: Analog N-1
+    name: Analog On-Prem
     demands:
     - ${{ variables.Unity2018VersionInternal }}
     - COG-UnityCache-WUS2-01
     - SDK_18362 -equals TRUE
+  workspace:
+    clean: resources
   steps:
   - template: templates/ci-common.yml
     parameters:
diff --git a/pipelines/ci-release.yml b/pipelines/ci-release.yml
@@ -17,11 +17,13 @@ jobs:
 - job: CIReleaseValidation
   timeoutInMinutes: 90
   pool:
-    name: Analog N-1
+    name: Analog On-Prem
     demands:
     - ${{ variables.Unity2018VersionInternal }}
     - COG-UnityCache-WUS2-01
     - SDK_18362 -equals TRUE
+  workspace:
+    clean: resources
   steps:
   - template: templates/compilemsbuild.yml
     parameters:
diff --git a/pipelines/ci-weekly-internal.yml b/pipelines/ci-weekly-internal.yml
@@ -5,7 +5,7 @@ schedules:
 - cron: 0 8 * * 1  # every Monday at 8:00 UTC
   displayName: Weekly build
   branches:
-    include: 
+    include:
     - main
 
 variables:
@@ -19,11 +19,13 @@ jobs:
 - job: Compliance
   timeoutInMinutes: 90
   pool:
-    name: Analog N-1
+    name: Analog On-Prem
     demands:
     - ${{ variables.Unity2018VersionInternal }}
     - COG-UnityCache-WUS2-01
     - SDK_18362 -equals TRUE
+  workspace:
+    clean: resources
   steps:
   # the following tasks should only be run on main branch, otherwise we risk issue being reported multiple times on topic/release branches
   - task: PoliCheck@1
diff --git a/pipelines/config/settings.yml b/pipelines/config/settings.yml
@@ -3,7 +3,7 @@ variables:
   Unity2018Version: Unity2018.4.26f1
   Unity2019Version: Unity2019.4.8f1
   # Unity version on internal build agents (release builds)
-  Unity2018VersionInternal: Unity2018.4.23f1
+  Unity2018VersionInternal: Unity2018.4.26f1
   Unity2019VersionInternal: Unity2019.4.17f1
   Unity2020VersionInternal: Unity2020.2.2f1
 
@@ -12,7 +12,7 @@ variables:
   # match (see scripts/packaging/versionmetadata.ps1)
   # ProjectSettings/ProjectSettings.asset:  bundleVersion: x.x.x
   # ProjectSettings/ProjectSettings.asset:  metroPackageVersion: x.x.x.0
-  MRTKVersion: 2.7.0
+  MRTKVersion: 2.7.1
   MRTKReleaseTag: ''  # final version component, e.g. 'RC2.1' or empty string
   ToolsRepoName: mixedrealitytoolkit.build
   ToolsDir: $(Build.SourcesDirectory)\$(ToolsRepoName)
diff --git a/pipelines/docs-binaries.yml b/pipelines/docs-binaries.yml
@@ -64,10 +64,12 @@ jobs:
 
 - job: BuildUnity2018
   pool:
-    name: Analog N-1
+    name: Analog On-Prem
     demands:
     - ${{ variables.Unity2018VersionInternal }}
     - COG-UnityCache-WUS2-01
+  workspace:
+    clean: resources
 
   steps:
   - checkout: self
diff --git a/pipelines/packageupmpublic.yaml b/pipelines/packageupmpublic.yaml
@@ -4,24 +4,41 @@ variables:
 - template: config/settings.yml
 
 parameters:
-- name: IsFinal
-  type: boolean
-  default: false
-- name: PreviewNumber
+- name: SourcePipeline
   type: string
-  default: 0
+  default: stabilization_ci
+  values:
+    - stabilization_ci
+    - mrtk_ci
+- name: PreviewNumber
+  type: number
+  default: -1
 
 jobs:
 - job: UPMPublicRelease
   timeoutInMinutes: 30
   pool:
     vmImage: windows-2019
   steps:
-  - ${{ if eq(parameters.IsFinal, false) }}:
-    - template: templates/tasks/pack-upm.yml
-      parameters:
+  - 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:
+      ${{ if ge(parameters.PreviewNumber, 0) }}:
         previewNumber: ${{ parameters.PreviewNumber }}
-  - ${{ if eq(parameters.IsFinal, true) }}:
-    - template: templates/tasks/pack-upm.yml
-      parameters:
+      ${{ if lt(parameters.PreviewNumber, 0) }}:
         previewNumber: ""
+      projectRoot: $(Agent.TempDirectory)
+      repack: true
diff --git a/pipelines/templates/tasks/pack-upm.yml b/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'
diff --git a/scripts/packaging/createupmpackages.ps1 b/scripts/packaging/createupmpackages.ps1

Original file line number	Diff line number	Diff line change
`@@ -12,10 +12,12 @@ public class MixedRealityToolkitInspector : UnityEditor.Editor`
`12`	`12`	`{`
`13`	`13`	`private SerializedProperty activeProfile;`
`14`	`14`	`private UnityEditor.Editor activeProfileEditor;`
	`15`	`+ private Object cachedProfile;`
`15`	`16`
`16`	`17`	`private void OnEnable()`
`17`	`18`	`{`
`18`	`19`	`activeProfile = serializedObject.FindProperty("activeProfile");`
	`20`	`+ cachedProfile = activeProfile.objectReferenceValue;`
`19`	`21`	`}`
`20`	`22`
`21`	`23`	`public override void OnInspectorGUI()`
`@@ -53,14 +55,16 @@ public override void OnInspectorGUI()`
`53`	`55`	`EditorGUILayout.HelpBox("MixedRealityToolkit cannot initialize unless an Active Profile is assigned!", MessageType.Error);`
`54`	`56`	`}`
`55`	`57`
`56`		`- bool changed = MixedRealityInspectorUtility.DrawProfileDropDownList(activeProfile, null, activeProfile.objectReferenceValue, typeof(MixedRealityToolkitConfigurationProfile), false, false);`
	`58`	`+ bool changed = MixedRealityInspectorUtility.DrawProfileDropDownList(activeProfile, null, activeProfile.objectReferenceValue, typeof(MixedRealityToolkitConfigurationProfile), false, false) \|\|`
	`59`	`+ cachedProfile != activeProfile.objectReferenceValue;`
`57`	`60`
`58`	`61`	`serializedObject.ApplyModifiedProperties();`
`59`	`62`
`60`	`63`	`if (changed)`
`61`	`64`	`{`
`62`	`65`	`MixedRealityToolkit.Instance.ResetConfiguration((MixedRealityToolkitConfigurationProfile)activeProfile.objectReferenceValue);`
`63`	`66`	`activeProfileEditor = null;`
	`67`	`+ cachedProfile = activeProfile.objectReferenceValue;`
`64`	`68`	`}`
`65`	`69`
`66`	`70`	`if (activeProfile.objectReferenceValue != null && activeProfileEditor == null)`