diff options
| author | Greg Munn <gregm@microsoft.com> | 2019-10-28 18:50:45 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-28 18:50:45 +0300 |
| commit | 445d705919aff3639bd8e95a208f99bdbf122ecd (patch) | |
| tree | db1000708c7e3cb09e8a35521cb42a36b20ae857 /main | |
| parent | c08c6dac81a84a1c387ba159cf19cf04ee3c5f18 (diff) | |
| parent | ce1f7a898aff6e2332d8b091d02012508bbc9279 (diff) | |
Merge pull request #8944 from mono/hide-mono-runtimes
[Ide] Hide .NET Runtimes selection behind feature switch
Diffstat (limited to 'main')
| -rw-r--r-- | main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/MonoTargetRuntimeFactory.cs | 6 | ||||
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/ExtensionModel/GlobalOptionsDialog.addin.xml | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/MonoTargetRuntimeFactory.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/MonoTargetRuntimeFactory.cs index 771a2601c5..ab7abbb6e7 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/MonoTargetRuntimeFactory.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/MonoTargetRuntimeFactory.cs @@ -28,6 +28,7 @@ using System; using System.IO; using System.Collections.Generic; using MonoDevelop.Core.AddIns; +using MonoDevelop.Core.FeatureConfiguration; using MonoDevelop.Core.Serialization; namespace MonoDevelop.Core.Assemblies @@ -51,6 +52,11 @@ namespace MonoDevelop.Core.Assemblies if (currentRuntime != null) { yield return new MonoTargetRuntime (currentRuntime); } + + if (!FeatureSwitchService.IsFeatureEnabled ("RUNTIME_SELECTOR").GetValueOrDefault ()) { + yield break; + } + if (Platform.IsWindows) { string progs = Environment.GetFolderPath (Environment.SpecialFolder.ProgramFiles); foreach (string dir in Directory.EnumerateDirectories (progs, "Mono*")) { diff --git a/main/src/core/MonoDevelop.Ide/ExtensionModel/GlobalOptionsDialog.addin.xml b/main/src/core/MonoDevelop.Ide/ExtensionModel/GlobalOptionsDialog.addin.xml index f89f61d487..590c561b5a 100644 --- a/main/src/core/MonoDevelop.Ide/ExtensionModel/GlobalOptionsDialog.addin.xml +++ b/main/src/core/MonoDevelop.Ide/ExtensionModel/GlobalOptionsDialog.addin.xml @@ -21,7 +21,9 @@ <Section id = "Build" _label = "Build" class = "MonoDevelop.Ide.Gui.OptionPanels.BuildPanel" icon="md-prefs-build"> <Panel id = "BuildMessages" _label = "Errors and Warnings" class = "MonoDevelop.Ide.Gui.OptionPanels.BuildMessagePanel" /> </Section> - <Section id = "MonoRuntime" _label = ".NET Runtimes" fill="true" class = "MonoDevelop.Ide.Gui.OptionPanels.MonoRuntimePanel" /> + <Condition id="FeatureSwitch" name="RUNTIME_SELECTOR" optIn="true"> + <Section id = "MonoRuntime" _label = ".NET Runtimes" fill="true" class = "MonoDevelop.Ide.Gui.OptionPanels.MonoRuntimePanel" /> + </Condition> <Section id = "SdkLocations" _label = "SDK Locations" icon = "md-prefs-sdk-locations" /> </Section> |