Merge branch 'Dev_Unity_2017.2.0' into Dev_Unity_2017.2.0

Author: StephenHodgson

Assets/HoloToolkit-Examples/AdaptiveQuality/AdaptiveQualityExample.cs

@@ -1,16 +1,23 @@
-using UnityEngine;
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+using UnityEngine;
 using HoloToolkit.Unity;
 
 public class AdaptiveQualityExample : MonoBehaviour
 {
-	public TextMesh text;
-	public AdaptiveQuality quality;
+    public TextMesh Text;
+    public AdaptiveQuality Quality;
 
-	private void Update ()
-	{
-		text.text = string.Format("GPUTime:{0:N2}\nQualityLevel:{1}\nViewportScale:{2:N2}", 
-			GpuTiming.GetTime("Frame") * 1000.0f,
-			quality.QualityLevel,
-			UnityEngine.XR.XRSettings.renderViewportScale);
-	}
+    private void Update()
+    {
+        Text.text = string.Format("GPUTime:{0:N2}\nQualityLevel:{1}\nViewportScale:{2:N2}",
+            GpuTiming.GetTime("Frame") * 1000.0f,
+            Quality.QualityLevel,
+#if UNITY_2017_2_OR_NEWER
+            UnityEngine.XR.XRSettings.renderViewportScale);
+#else
+            UnityEngine.VR.VRSettings.renderViewportScale);
+#endif
+    }
 }

Assets/HoloToolkit-Examples/Boundary/Scripts/BoundaryTest.cs

@@ -11,7 +11,7 @@ public class BoundaryTest : MonoBehaviour
 
         private void Start()
         {
-#if UNITY_WSA
+#if UNITY_WSA && UNITY_2017_2_OR_NEWER
             BoundaryManager.Instance.RenderBoundary = true;
             BoundaryManager.Instance.RenderFloor = true;