Merge pull request #6729 from davidkline-ms/moveMsbToConfigurator

Move MSBuild for Unity enabling to MRTK Configurator

Author: David Kline

Assets/MixedRealityToolkit/Inspectors/Setup/MixedRealityProjectConfiguratorWindow.cs

@@ -20,6 +20,7 @@ public class MixedRealityProjectConfiguratorWindow : EditorWindow
             {MRConfig.VirtualRealitySupported, true },
             {MRConfig.SinglePassInstancing, true },
             {MRConfig.SpatialAwarenessLayer, true },
+            {MRConfig.EnableMSBuildForUnity, true },
             // UWP Capabilities
             {MRConfig.MicrophoneCapability, true },
             {MRConfig.InternetClientCapability, true },
@@ -144,7 +145,7 @@ private void RenderConfigurations()
             }
             RenderToggle(MRConfig.SinglePassInstancing, "Set Single Pass Instanced rendering path");
             RenderToggle(MRConfig.SpatialAwarenessLayer, "Set Default Spatial Awareness Layer");
-
+            RenderToggle(MRConfig.EnableMSBuildForUnity, "Enable MSBuild for Unity");
             EditorGUILayout.Space();
 
             if (MixedRealityOptimizeUtils.IsBuildTargetUWP())

Assets/MixedRealityToolkit/Utilities/Editor/EditorProjectUtilities.cs

@@ -18,7 +18,6 @@ public static class EditorProjectUtilities
         static EditorProjectUtilities()
         {
             CheckMinimumEditorVersion();
-            PackageManifestUpdater.EnsureMSBuildForUnity();
             ApplyARFoundationUWPCompileFix();
         }
 

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

@@ -13,8 +13,6 @@ namespace Microsoft.MixedReality.Toolkit.Utilities.Editor
     /// </summary>
     internal static class PackageManifestUpdater
     {
-        private static string PackageManifestRelativePath = Path.Combine("Packages", "manifest.json");
-
         /// <summary>
         /// Ensures the required settings exist in the package manager to allow for
         /// installing MSBuild for Unity.
@@ -23,12 +21,13 @@ internal static void EnsureMSBuildForUnity()
         {
             // Locate the full path to the package manifest.
             DirectoryInfo projectRoot = new DirectoryInfo(Application.dataPath).Parent;
-            string manifestPath = Path.Combine(projectRoot.FullName, PackageManifestRelativePath);
-            
+            string[] paths = { projectRoot.FullName, "Packages", "manifest.json" };
+            string manifestPath = Path.Combine(paths);
+
             // Verify that the package manifest file exists.
             if (!File.Exists(manifestPath))
             {
-                Debug.LogError("Unable to locate the package manifest file");
+                Debug.LogError($"Package manifest file ({manifestPath}) could not be found.");
                 return;
             }
 
@@ -58,7 +57,7 @@ internal static void EnsureMSBuildForUnity()
 
             if (manifest == null)
             {
-                Debug.LogError("Failed to load the package manifest");
+                Debug.LogError($"Failed to read the package manifest file ({manifestPath})");
                 return;
             }
 

Assets/MixedRealityToolkit/Utilities/Editor/Setup/MixedRealityProjectConfigurator.cs

@@ -32,6 +32,7 @@ public enum Configurations
             VirtualRealitySupported,
             SinglePassInstancing,
             SpatialAwarenessLayer,
+            EnableMSBuildForUnity,
 
             // WSA Capabilities
             SpatialPerceptionCapability = 1000,
@@ -60,6 +61,7 @@ public enum Configurations
             { Configurations.VirtualRealitySupported,  () => { return PlayerSettings.virtualRealitySupported; } },
             { Configurations.SinglePassInstancing,  () => { return MixedRealityOptimizeUtils.IsSinglePassInstanced(); } },
             { Configurations.SpatialAwarenessLayer,  () => { return HasSpatialAwarenessLayer(); } },
+            { Configurations.EnableMSBuildForUnity, () => { return IsMSBuildForUnityEnabled(); } },
 
             // UWP Capabilities
             { Configurations.SpatialPerceptionCapability,  () => { return PlayerSettings.WSA.GetCapability(PlayerSettings.WSACapability.SpatialPerception); } },
@@ -91,6 +93,7 @@ public enum Configurations
             { Configurations.VirtualRealitySupported,  () => { PlayerSettings.virtualRealitySupported = true; } },
             { Configurations.SinglePassInstancing,  () => { MixedRealityOptimizeUtils.SetSinglePassInstanced(); } },
             { Configurations.SpatialAwarenessLayer,  () => { SetSpatialAwarenessLayer(); } },
+            { Configurations.EnableMSBuildForUnity, () => { PackageManifestUpdater.EnsureMSBuildForUnity(); } },
 
             // UWP Capabilities
             { Configurations.SpatialPerceptionCapability,  () => { PlayerSettings.WSA.SetCapability(PlayerSettings.WSACapability.SpatialPerception, true); } },
@@ -105,7 +108,7 @@ public enum Configurations
             { Configurations.AndroidMinSdkVersion, () => { PlayerSettings.Android.minSdkVersion = MinAndroidSdk; } },
 
             // iOS Settings
-            { Configurations.IOSMinOSVersion, () => { PlayerSettings.iOS.targetOSVersionString = iOSMinOsVersion.ToString(); } },
+            { Configurations.IOSMinOSVersion, () => { PlayerSettings.iOS.targetOSVersionString = iOSMinOsVersion.ToString("n1"); } },
             { Configurations.IOSArchitecture, () => { PlayerSettings.SetArchitecture(BuildTargetGroup.iOS, RequirediOSArchitecture); } },
             { Configurations.IOSCameraUsageDescription, () => { PlayerSettings.iOS.cameraUsageDescription = iOSCameraUsageDescription; } },
         };
@@ -213,6 +216,36 @@ public static bool IsForceTextSerialization()
             return EditorSettings.serializationMode == SerializationMode.ForceText;
         }
 
+        /// <summary>
+        /// Checks package manifest to see if MSBuild for Unity is included in the dependencies.
+        /// </summary>
+        public static bool IsMSBuildForUnityEnabled()
+        {
+            // Locate the full path to the package manifest.
+            DirectoryInfo projectRoot = new DirectoryInfo(Application.dataPath).Parent;
+            string[] paths = { projectRoot.FullName, "Packages", "manifest.json" };
+            string manifestPath = Path.Combine(paths);
+
+            // Verify that the package manifest file exists.
+            if (!File.Exists(manifestPath))
+            {
+                Debug.LogError($"Package manifest file ({manifestPath}) could not be found.");
+                return false;
+            }
+
+            // Load the manfiest file.
+            string manifestFileContents = File.ReadAllText(manifestPath);
+            if (string.IsNullOrWhiteSpace(manifestFileContents))
+            {
+                Debug.LogError($"Failed to read the package manifest file ({manifestPath})");
+                return false;
+            }
+
+            // Attempt to find the MSBuild for Unity package name.
+            const string msBuildPackageName = "com.microsoft.msbuildforunity";
+            return manifestFileContents.Contains(msBuildPackageName);
+        }
+
         /// <summary>
         /// Configures current Unity project to force text serialization
         /// </summary>

ProjectSettings/ProjectSettings.asset

@@ -179,7 +179,7 @@ PlayerSettings:
   StripUnusedMeshComponents: 0
   VertexChannelCompressionMask: 214
   iPhoneSdkVersion: 988
-  iOSTargetOSVersionString: 11
+  iOSTargetOSVersionString: 11.0
   tvOSSdkVersion: 0
   tvOSRequireExtendedGameController: 0
   tvOSTargetOSVersionString: 9.0