Merge pull request #9420 from MaxWang-MS/su_remove_dependency

Remove dotnetwinrt dependency in Scene Understanding

Author: MaxWang-MS

Assets/MRTK/Examples/Experimental/SceneUnderstanding/Scenes/SceneUnderstandingExample.unity

@@ -4926,17 +4926,17 @@ PrefabInstance:
     - target: {fileID: 2113875699234556495, guid: 18470d71939382448be2ecd06efa9662,
         type: 3}
       propertyPath: m_textInfo.characterCount
-      value: 541
+      value: 523
       objectReference: {fileID: 0}
     - target: {fileID: 2113875699234556495, guid: 18470d71939382448be2ecd06efa9662,
         type: 3}
       propertyPath: m_textInfo.spaceCount
-      value: 76
+      value: 73
       objectReference: {fileID: 0}
     - target: {fileID: 2113875699234556495, guid: 18470d71939382448be2ecd06efa9662,
         type: 3}
       propertyPath: m_textInfo.wordCount
-      value: 76
+      value: 73
       objectReference: {fileID: 0}
     - target: {fileID: 2113875699234556495, guid: 18470d71939382448be2ecd06efa9662,
         type: 3}
@@ -4961,10 +4961,10 @@ PrefabInstance:
 
         <size=24><b>Important - Required packages</b></size>
 
-        Use MixedReality Feature Tool to get the Dot Net WinRT and Scene Understanding
-        packages. The Scene Understanding package may not be available at MRTK 2.6
-        launch time but will be released soon after. Please check issue #9402 on the
-        MRTK-Unity GitHub repository for updates on its availability.'
+        Use Mixed Reality Feature Tool to get the Scene Understanding package. The
+        Scene Understanding package may not be available at MRTK 2.6 launch time but
+        will be released soon after. Please check issue #9402 on the MRTK-Unity GitHub
+        repository for updates on its availability.'
       objectReference: {fileID: 0}
     - target: {fileID: 2113875699234556495, guid: 18470d71939382448be2ecd06efa9662,
         type: 3}

Assets/MRTK/Providers/Experimental/WindowsSceneUnderstanding/WindowsSceneUnderstandingObserver.cs

@@ -17,9 +17,6 @@
 #if WINDOWS_UWP
 using Windows.Perception.Spatial;
 using Windows.Perception.Spatial.Preview;
-#else
-using Microsoft.Windows.Perception.Spatial;
-using Microsoft.Windows.Perception.Spatial.Preview;
 #endif // WINDOWS_UWP
 using UnityEngine.Assertions;
 using UnityEngine.EventSystems;
@@ -766,12 +763,7 @@ private async Task RunObserverAsync(CancellationToken cancellationToken)
         private System.Numerics.Matrix4x4 GetSceneToWorldTransform()
         {
             var result = System.Numerics.Matrix4x4.Identity;
-
-            if (Application.isEditor)
-            {
-                return result;
-            }
-
+#if WINDOWS_UWP
             SpatialCoordinateSystem sceneOrigin = SpatialGraphInteropPreview.CreateCoordinateSystemForNode(sceneOriginId);
             SpatialCoordinateSystem worldOrigin = WindowsMixedReality.WindowsMixedRealityUtilities.SpatialCoordinateSystem;
 
@@ -781,7 +773,7 @@ private System.Numerics.Matrix4x4 GetSceneToWorldTransform()
             {
                 result = sceneToWorld.Value; // numerics
             }
-
+#endif
             return result;
         }
 

Assets/MRTK/Tools/MSBuild/Scripts/UnityProjectInfo.cs

@@ -27,6 +27,8 @@ public class UnityProjectInfo
             "LeapMotion",
             "LeapMotion.LeapCSharp",
             "Microsoft.MixedReality.Toolkit.PlaneFinding",
+            "Microsoft.MixedReality.SceneUnderstanding.Projections.Editor",
+            "Microsoft.MixedReality.SceneUnderstanding.Projections.WSA",
 #if UNITY_2019_3_OR_NEWER
             "Oculus.VR",
             "Oculus.VR.Editor",

pipelines/config/settings.yml

@@ -4,7 +4,7 @@ variables:
   Unity2019Version: Unity2019.4.8f1
   # Unity version on internal build agents (release builds)
   Unity2018VersionInternal: Unity2018.4.23f1
-  Unity2019VersionInternal: Unity2019.4.6f1
+  Unity2019VersionInternal: Unity2019.4.17f1
   Unity2020VersionInternal: Unity2020.2.2f1
 
   # Note that when updating this value also ensure that you update the

pipelines/docs-binaries.yml

@@ -66,7 +66,7 @@ jobs:
 
 - job: BuildUnity2018
   pool:
-    name: Analog On-Prem
+    name: Analog N-1
     demands:
     - ${{ variables.Unity2018VersionInternal }}
     - COG-UnityCache-WUS2-01