Merge branch 'mrtk3' into MRH3-62-EyeTrackingSample-Feedback

Pipelines/Config/settings.yaml

@@ -5,5 +5,5 @@ variables:
   # ProjectSettings/ProjectSettings.asset:  bundleVersion: x.x.x
   # ProjectSettings/ProjectSettings.asset:  metroPackageVersion: x.x.x.0
   MRTKVersion: 3.0.0        # used for overall build number, but each package version is read from the package.json file in each package directory.
-  MRTKReleaseTag: 'pre.17'  # final version component, e.g. 'RC2.1' or empty string.
+  MRTKReleaseTag: 'pre.18'  # final version component, e.g. 'RC2.1' or empty string.
   ReleasePackages: 'None'   # array of packages that shouldn't get the prerelease tag  e.g.  '"com.microsoft.mrtk.core,com.microsoft.mrtk.tools"'

UnityProjects/MRTKDevTemplate/Assets/BuildAssets/BuildApp.cs

@@ -15,6 +15,9 @@ public static class BuildApp
         private static string[] scenes = {
             "Assets/Scenes/Audio/AudioLoFiExample.unity",
             "Assets/Scenes/Audio/AudioOcclusionExample.unity",
+            "Assets/Scenes/Experimental/ScrollingExample.unity",
+            "Assets/Scenes/Experimental/NonNativeKeyboard.unity",
+            "Assets/Scenes/Experimental/VirtualizedScrollRectList.unity",
             "Assets/Scenes/BoundsControlExamples.unity",
             "Assets/Scenes/CanvasExample.unity",
             "Assets/Scenes/CanvasUITearsheet.unity",
@@ -42,9 +45,7 @@ public static class BuildApp
             "Assets/Scenes/TapToPlaceExample.unity",
             "Assets/Scenes/ToggleCollectionExample.unity",
             "Assets/Scenes/TopNavigationExample.unity",
-            "Assets/Scenes/VanillaUGUIExample.unity",
-            "Assets/Scenes/Experimental/VirtualizedScrollRectList.unity",
-            "Assets/Scenes/Experimental/NonNativeKeyboard.unity" };
+            "Assets/Scenes/VanillaUGUIExample.unity" };
 
         private static string buildPath = "build";