Merge pull request #6829 from microsoft/prerelease/2.2.0_stabilization

Prerelease/2.2.0 stabilization -> dev

Author: keveleigh

Assets/MixedRealityToolkit.Providers/WindowsMixedReality/DotNetAdapter/DotNetAdapter.csproj

@@ -16,18 +16,18 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Windows.MixedReality.DotNetWinRT">
-      <Version>0.5.*</Version>
-    </PackageReference>
-    <PackageReference Include="MSBuildForUnity">
-      <Version>0.8.*</Version>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    <PackageReference Include="MSBuildForUnity" Version="0.8.*">
       <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
   </ItemGroup>
 
   <!-- Note that this is the special "NoTarget" SDK to prevent this project from producing a dll. -->
   <Import Project="Sdk.props" Sdk="Microsoft.Build.NoTargets" Version="1.0.80" />
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Windows.MixedReality.DotNetWinRT" Version="0.5.*" />
+  </ItemGroup>
+
   <Import Project="Sdk.targets" Sdk="Microsoft.Build.NoTargets" Version="1.0.80" />
 </Project>

Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Collections/GridObjectCollection.cs

@@ -42,12 +42,12 @@ public OrientationType OrientType
             set { orientType = value; }
         }
 
-        [Tooltip("Whether to sort objects by row first or by column first")]
+        [Tooltip("Specify direction in which children are laid out.")]
         [SerializeField]
-        private LayoutOrder layout = LayoutOrder.ColumnThenRow;
+        private LayoutOrder layout = LayoutOrder.RowThenColumn;
 
         /// <summary>
-        /// Whether to sort objects by row first or by column first
+        /// Specify direction in which children are laid out.
         /// </summary>
         public LayoutOrder Layout
         {
@@ -471,7 +471,6 @@ private void PerformVersionPatching()
             {
                 string friendlyName = GetUserFriendlyName();
 
-                Debug.Log($"Upgrade GridObjectCollection on {friendlyName} from version 0 to version 1 for MRTK 2.2 release. Please save scene / prefab.");
                 // Migrate from version 0 to version 1
                 UpgradeAssetToVersion1();
                 assetVersion = 1;
@@ -491,7 +490,7 @@ private void UpgradeAssetToVersion1()
             {
                 Layout = LayoutOrder.RowThenColumn;
                 var friendlyName = GetUserFriendlyName();
-                Debug.Log($"Changing LayoutOrder for {friendlyName} from ColumnThenRow to RowThenColumn. See https://github.com/microsoft/MixedRealityToolkit-Unity/issues/6773#issuecomment-561918891 for details.");
+                Debug.Log($"[MRTK 2.2 asset upgrade] Changing LayoutOrder for {friendlyName} from ColumnThenRow to RowThenColumn. See https://github.com/microsoft/MixedRealityToolkit-Unity/issues/6773#issuecomment-561918891 for details.");
             }
         }
 

Assets/MixedRealityToolkit.Tools/MSBuild/MSBuildMRTKTemplates/WSA.Player.Template.props.template

@@ -14,7 +14,7 @@
     <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
   </PropertyGroup>
 
-  <!-- This is for succesful building step from dotnet cli -->
+  <!-- This is for successful building step from dotnet cli -->
   <Choose>
     <When Condition="'$(MSBuildExtensionsPathOverride)'!= ''">
       <PropertyGroup>

Assets/MixedRealityToolkit/Inspectors/Utilities/MixedRealityInspectorUtility.cs

@@ -87,7 +87,12 @@ public static void AddMixedRealityToolkitToScene(MixedRealityToolkitConfiguratio
                 MixedRealityToolkit.SetActiveInstance(newInstance);
                 Selection.activeObject = newInstance;
 
-                if (configProfile != null)
+                if (configProfile == null)
+                {
+                    // if we don't have a profile set we get the default profile
+                    newInstance.ActiveProfile = GetDefaultConfigProfile();
+                }
+                else
                 {
                     newInstance.ActiveProfile = configProfile;
                 }

Assets/MixedRealityToolkit/Utilities/Editor/PackageManifest/PackageManifestUpdater.cs

@@ -18,7 +18,7 @@ internal static class PackageManifestUpdater
         private static string[] MSBuildRegistryScopes = new string[] { "com.microsoft" };
 
         private static string MSBuildPackageName = "com.microsoft.msbuildforunity";
-        private static string MSBuildPackageVersion = "0.8.2";
+        private static string MSBuildPackageVersion = "0.8.3";
 
         /// <summary>
         /// Ensures the required settings exist in the package manager to allow for

Documentation/GettingStartedWithTheMRTK.md

@@ -97,17 +97,8 @@ To create a **HoloLens application**, switch to Universal Windows Platform:
 
 ![Configure to scene](../Documentation/Images/MRTK_ConfigureScene.png)
 
-4. In the Inspector, you will see a prompt like this:
-
-![MRTK Configure Dialog](../Documentation/Images/MRTK_NoProfileMessage.png)
-
-Click "OK".
-
-5. Select "DefaultMixedRealityToolkitConfigurationProfile" from the list.
-
-![MRTK Select Configure Dialog](../Documentation/Images/MRTK_SelectConfigurationProfile.png)
-
-For more information on profiles, please see the [profiles](Profiles/Profiles.md) article.
+The inspector will now show the currently active MRTK configuration profile and the profile selection dropdown, where the default profile is already preselected. 
+Profiles configure the behavior of MRTK core components and are described in more detail in the [profiles](Profiles/Profiles.md) article.
 
 > [!NOTE] 
 > If you are getting started on the HoloLens or HoloLens 2, you should choose the "DefaultHoloLens1ConfigurationProfile" or DefaultHoloLens2ConfigurationProfile" instead.

Documentation/ReleaseNotes.md

@@ -216,6 +216,25 @@ A new example scene has been added, which demonstrates surface magnetism and the
 
 MRTK adds support for articulated hands and eye tracking when running an application via Holographic Remoting on a HoloLens 2.
 
+To enable hand and eye tracking via Holographic Remoting, the following one-time steps are required.
+
+1. Run the MRTK Configurator Utility (**Mixed Reality Toolkit > Utilities > Configure Unity Project**)
+    - Expand **Modify Configurations**
+    - Ensure that **Enable MSBuild for Unity** is selected
+    - Click **Apply**
+1. Ensure the latest Holographic Remoting application is installed, via the Microsoft Store application, on the HoloLens.
+1. Open **Window > Package Manager** and ensure the latest version of the **Windows Mixed Reality** package is installed.
+
+Once the previous steps have been performed, the following will allow running the application on a HoloLens 2 from within the Unity Editor.
+
+1. On the HoloLens 2, launch **Holographic Remoting**
+1. Open **Window > XR > Holographic Emulation**.
+1. Set the **Enumulation Mode** to **Remote to Device**.
+1. Set **Device Version** to **HoloLens 2**.
+1. Enter the IP Address displayed in the HoloLens 2.
+1. Click **Connect**.
+1. When **Connection Status** becomes **Connected**, click the Unityh Editor's play button.
+
 > [!Note]
 > This feature requires installing MSBuild for Unity, which will install the [Microsoft.Windows.MixedReality.DotNetWinRT](https://www.nuget.org/packages/Microsoft.Windows.MixedReality.DotNetWinRT/) package from NuGet.
 
@@ -258,6 +277,14 @@ To work around this issue, please perform one of the following steps:
 - Switch the scripting backend to IL2CPP
 - In the Build Settings window, uncheck **Unity C# Projects"
 
+**System.IO.DirectoryNotFoundException: Could not find a part of the path**
+
+There has been an issue discovered related to projects with a space in the folder path (ex: C:\New Project). This may manifest as a failure to load one or more Package Manager packages. If you encounter this situation, please close Unity and rename the folder containing the spaces.
+
+For the latest status of the issue, please refer to the following on GitHub.
+
+- https://github.com/microsoft/MixedRealityToolkit-Unity/issues/6810
+
 **Assembly has reference to non-existent assembly 'Unity.XR.ARFoundation'**
 
 If the Providers.UnityAR package is installed, the following error indicates that Unity's AR Foundation package has not been installed. Please review the [How to configure MRTK for iOS and Android](CrossPlatform/UsingARFoundation.md) article for requirements and instructions.