diff options
| author | Alan McGovern <alan.mcgovern@gmail.com> | 2015-12-16 13:50:14 +0300 |
|---|---|---|
| committer | Alan McGovern <alan.mcgovern@gmail.com> | 2015-12-16 13:50:14 +0300 |
| commit | bb97c83bdaf344538449d3a51da6cc3a8db191aa (patch) | |
| tree | b5b2fd2bbb5a53b8375da630f7df597031eb91ac /main | |
| parent | 874d975fcb3f8f9cebcd7a9fc9299be591b11bf7 (diff) | |
Revert "[mdtool] Fix tools that depend on PlatformService"
Diffstat (limited to 'main')
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/AssemblyInfo.cs | 1 | ||||
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/DesktopService.cs | 9 | ||||
| -rw-r--r-- | main/src/tools/mdtool/mdtool.csproj | 4 | ||||
| -rw-r--r-- | main/src/tools/mdtool/src/mdtool.cs | 3 |
4 files changed, 0 insertions, 17 deletions
diff --git a/main/src/core/MonoDevelop.Ide/AssemblyInfo.cs b/main/src/core/MonoDevelop.Ide/AssemblyInfo.cs index 30c20c8dbd..f5110291c3 100644 --- a/main/src/core/MonoDevelop.Ide/AssemblyInfo.cs +++ b/main/src/core/MonoDevelop.Ide/AssemblyInfo.cs @@ -32,4 +32,3 @@ using System.Runtime.CompilerServices; [assembly: InternalsVisibleTo("MonoDevelop.CSharpBinding.AspNet")] [assembly: InternalsVisibleTo("MonoDevelop.GtkCore")] [assembly: InternalsVisibleTo("MonoDevelop.PackageManagement")] -[assembly: InternalsVisibleTo("mdtool")] diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/DesktopService.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/DesktopService.cs index 22406f91de..8455c21735 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/DesktopService.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/DesktopService.cs @@ -52,11 +52,6 @@ namespace MonoDevelop.Ide public static void Initialize () { - Initialize (false); - } - - internal static void Initialize (bool noGui) - { if (platformService != null) return; object[] platforms = AddinManager.GetExtensionObjects ("/MonoDevelop/Core/PlatformService"); @@ -67,10 +62,6 @@ namespace MonoDevelop.Ide LoggingService.LogFatalError ("A platform service implementation has not been found."); } PlatformService.Initialize (); - - if (noGui) - return; - if (PlatformService.CanOpenTerminal) Runtime.ProcessService.SetExternalConsoleHandler (PlatformService.StartConsoleProcess); diff --git a/main/src/tools/mdtool/mdtool.csproj b/main/src/tools/mdtool/mdtool.csproj index 227e5b96d6..7d0cbfbf99 100644 --- a/main/src/tools/mdtool/mdtool.csproj +++ b/main/src/tools/mdtool/mdtool.csproj @@ -51,10 +51,6 @@ <Name>Mono.Addins.Setup</Name> <Private>False</Private> </ProjectReference> - <ProjectReference Include="..\..\core\MonoDevelop.Ide\MonoDevelop.Ide.csproj"> - <Project>{27096E7F-C91C-4AC6-B289-6897A701DF21}</Project> - <Name>MonoDevelop.Ide</Name> - </ProjectReference> </ItemGroup> <ItemGroup> <Compile Include="src\AssemblyInfo.cs" /> diff --git a/main/src/tools/mdtool/src/mdtool.cs b/main/src/tools/mdtool/src/mdtool.cs index 903e9ff3fd..e3f82aad9a 100644 --- a/main/src/tools/mdtool/src/mdtool.cs +++ b/main/src/tools/mdtool/src/mdtool.cs @@ -135,9 +135,6 @@ class MonoDevelopProcessHost return badInput? 1 : 0; } - //needed for mimetype service etc - MonoDevelop.Ide.DesktopService.Initialize (true); - var task = tool.Run (toolArgs); task.ContinueWith ((t) => sc.ExitLoop ()); sc.RunMainLoop (); |