Update checks for 2018.4 and special case 2019.1

michael-house · web-flow · commit fc4a7ef22b9e · 2020-01-14T16:35:08.000-08:00
diff --git a/Assets/MixedRealityToolkit/Utilities/Editor/EditorProjectUtilities.cs b/Assets/MixedRealityToolkit/Utilities/Editor/EditorProjectUtilities.cs
@@ -29,7 +29,7 @@ static EditorProjectUtilities()
         /// </remarks>
         public static void CheckMinimumEditorVersion()
         {
-#if !UNITY_2018_3_OR_NEWER
+#if !UNITY_2018_4_OR_NEWER && !UNITY_2019_1_OR_NEWER
             DisplayIncorrectEditorVersionDialog();
 #endif
         }
@@ -42,7 +42,7 @@ private static void DisplayIncorrectEditorVersionDialog()
         {
             if (!EditorUtility.DisplayDialog(
                 "Mixed Reality Toolkit",
-                "The Mixed Reality Toolkit requires Unity 2018.3 or newer.\n\nUsing an older version of Unity may result in compile errors or incorrect behavior.",
+                "The Mixed Reality Toolkit requires Unity 2018.4 or newer.\n\nUsing an older version of Unity may result in compile errors or incorrect behavior.",
                 "Continue", "Close Editor"))
             {
                 EditorApplication.Exit(0);

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ static EditorProjectUtilities()`
`29`	`29`	`/// </remarks>`
`30`	`30`	`public static void CheckMinimumEditorVersion()`
`31`	`31`	`{`
`32`		`-#if !UNITY_2018_3_OR_NEWER`
	`32`	`+#if !UNITY_2018_4_OR_NEWER && !UNITY_2019_1_OR_NEWER`
`33`	`33`	`DisplayIncorrectEditorVersionDialog();`
`34`	`34`	`#endif`
`35`	`35`	`}`
`@@ -42,7 +42,7 @@ private static void DisplayIncorrectEditorVersionDialog()`
`42`	`42`	`{`
`43`	`43`	`if (!EditorUtility.DisplayDialog(`
`44`	`44`	`"Mixed Reality Toolkit",`
`45`		`- "The Mixed Reality Toolkit requires Unity 2018.3 or newer.\n\nUsing an older version of Unity may result in compile errors or incorrect behavior.",`
	`45`	`+ "The Mixed Reality Toolkit requires Unity 2018.4 or newer.\n\nUsing an older version of Unity may result in compile errors or incorrect behavior.",`
`46`	`46`	`"Continue", "Close Editor"))`
`47`	`47`	`{`
`48`	`48`	`EditorApplication.Exit(0);`