Merge pull request #4 from microsoft/mrtk_development

Mrtk development

Author: artsouflMS

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.");
             }
         }