Merge pull request #7251 from davidkline-ms/configurator230

Configurator better honors filter when setting configuratons

Author: David Kline

Assets/MixedReality.Toolkit.Foundation.nuspec

@@ -14,7 +14,7 @@
     <releaseNotes>$releaseNotes$</releaseNotes>
     <tags>Unity MixedReality MixedRealityToolkit MRTK</tags>
     <dependencies>
-      <dependency id="Microsoft.Windows.MixedReality.DotNetWinRT" version="0.5.1043" />
+      <dependency id="Microsoft.Windows.MixedReality.DotNetWinRT" version="0.5.1044" />
     </dependencies>
     <contentFiles>
       <files include="any\any\.PkgSrc\**" buildAction="None" copyToOutput="false" />

Assets/MixedRealityToolkit.Providers/WindowsMixedReality/Shared/DotNetAdapter/DotNetAdapter.csproj

@@ -19,7 +19,7 @@
   <Import Project="Sdk.props" Sdk="Microsoft.Build.NoTargets" Version="1.0.85" />
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Windows.MixedReality.DotNetWinRT" Version="0.5.1043" />
+    <PackageReference Include="Microsoft.Windows.MixedReality.DotNetWinRT" Version="0.5.1044" />
   </ItemGroup>
 
   <Import Project="Sdk.targets" Sdk="Microsoft.Build.NoTargets" Version="1.0.85" />

Assets/MixedRealityToolkit/Inspectors/Setup/MixedRealityProjectConfiguratorWindow.cs

@@ -6,7 +6,7 @@
 using UnityEditor;
 using UnityEditor.Compilation;
 using UnityEngine;
-
+using UnityEngine.Experimental.UIElements;
 using MRConfig = Microsoft.MixedReality.Toolkit.Utilities.Editor.MixedRealityProjectConfigurator.Configurations;
 
 namespace Microsoft.MixedReality.Toolkit.Utilities.Editor
@@ -20,7 +20,10 @@ public class MixedRealityProjectConfiguratorWindow : EditorWindow
             { MRConfig.VirtualRealitySupported, true },
             { MRConfig.SinglePassInstancing, true },
             { MRConfig.SpatialAwarenessLayer, true },
+            // Issue #7239: Disable MSBuild for Unity on Unity 2019.3 and newer while the cause of the loop is investigated
+#if !UNITY_2019_3_OR_NEWER
             { MRConfig.EnableMSBuildForUnity, true },
+#endif // !UNITY_2019_3_OR_NEWER
             // UWP Capabilities
             { MRConfig.MicrophoneCapability, true },
             { MRConfig.InternetClientCapability, true },
@@ -92,22 +95,26 @@ private void OnGUI()
         {
             MixedRealityInspectorUtility.RenderMixedRealityToolkitLogo();
 
+            string foldoutHeader;
+
             if (!MixedRealityProjectConfigurator.IsProjectConfigured())
             {
+                foldoutHeader = "Modify Configurations";
                 RenderChoiceDialog();
-
-                EditorGUILayout.Space();
-
-                showConfigurations = EditorGUILayout.Foldout(showConfigurations, "Modify Configurations", true);
-                if (showConfigurations)
-                {
-                    RenderConfigurations();
-                }
             }
             else
             {
+                foldoutHeader = "Configurations";
                 RenderConfiguredConfirmation();
             }
+
+            EditorGUILayout.Space();
+
+            showConfigurations = EditorGUILayout.Foldout(showConfigurations, foldoutHeader, true);
+            if (showConfigurations)
+            {
+                RenderConfigurations();
+            }
         }
 
         private void RenderConfiguredConfirmation()

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

@@ -183,9 +183,14 @@ public static bool IsConfigured(Configurations config)
         /// <param name="config">The setting configuration that needs to be checked</param>
         public static void Configure(Configurations config)
         {
-            if (ConfigurationSetters.ContainsKey(config))
+            // We use the config getter to check to see if a configuration is valid for the current build target.
+            if (ConfigurationGetters.ContainsKey(config))
             {
-                ConfigurationSetters[config].Invoke();
+                var configGetter = ConfigurationGetters[config];
+                if (configGetter.IsActiveBuildTargetValid() && ConfigurationSetters.ContainsKey(config))
+                {
+                    ConfigurationSetters[config].Invoke();
+                }
             }
         }
 
@@ -216,17 +221,14 @@ public static void ConfigureProject(HashSet<Configurations> filter = null)
             {
                 foreach (var setter in ConfigurationSetters)
                 {
-                    setter.Value.Invoke();
+                    Configure(setter.Key);
                 }
             }
             else
             {
                 foreach (var key in filter)
                 {
-                    if (ConfigurationSetters.ContainsKey(key))
-                    {
-                        ConfigurationSetters[key].Invoke();
-                    }
+                    Configure(key);
                 }
             }
 

Documentation/ReleaseNotes.md

@@ -170,6 +170,12 @@ To resolve these errors:
 
     ![Duplicate dependencies](Images/ReleaseNotes/DuplicateDependencies.png)
 
+**MRTK Configurator dialog does not show 'Enable MSBuild for Unity' in Unity 2019.3**
+
+An issue exists where enabling MSBuild for Unity in 2019.3 may result in an infinite loop restoring packages ([#7239](https://github.com/microsoft/MixedRealityToolkit-Unity/issues/7239)).
+
+As a workaround, the Microsoft.Windows.DotNetWinRT package can be imported using [NuGet for Unity](https://github.com/GlitchEnzo/NuGetForUnity/releases/latest).
+
 **Issues with the Unity 2019.3 new XR platform on Windows Mixed Reality**
 
 The following issues are known when using the new XR platform and version **2.0.4 (preview.3)** of the Windows XR Plugin: