diff options
author | Lluis Sanchez <lluis@xamarin.com> | 2013-07-25 02:47:48 +0400 |
---|---|---|
committer | Lluis Sanchez <lluis@xamarin.com> | 2013-07-25 02:47:48 +0400 |
commit | 52fd57b8161854936414a7a185b6fabe4f1c44f6 (patch) | |
tree | 1e8d90c0704ae155ab2fcc9354431773ecc7d909 /main/src/addins/GnomePlatform | |
parent | cf5ded2395b7e8b9622df14988b68ffde8b42738 (diff) | |
parent | e9529a7aadea89eb9dab74ecbe03bdb6551779c1 (diff) |
Merge remote-tracking branch 'origin/master' into retina2
Conflicts:
main/src/addins/GnomePlatform/GnomePlatform.csproj
main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogWidget.cs
main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlNodeExtension.cs
main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlService.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockBarItem.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ListWindow.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
Diffstat (limited to 'main/src/addins/GnomePlatform')
-rw-r--r-- | main/src/addins/GnomePlatform/AddinInfo.cs | 16 | ||||
-rw-r--r-- | main/src/addins/GnomePlatform/GnomePlatform.addin.xml | 23 | ||||
-rw-r--r-- | main/src/addins/GnomePlatform/GnomePlatform.csproj | 6 |
3 files changed, 25 insertions, 20 deletions
diff --git a/main/src/addins/GnomePlatform/AddinInfo.cs b/main/src/addins/GnomePlatform/AddinInfo.cs new file mode 100644 index 0000000000..f1665d52f2 --- /dev/null +++ b/main/src/addins/GnomePlatform/AddinInfo.cs @@ -0,0 +1,16 @@ + +using System; +using Mono.Addins; +using Mono.Addins.Description; + +[assembly:Addin ("GnomePlatform", + Namespace = "MonoDevelop", + Version = MonoDevelop.BuildInfo.Version, + Flags = AddinFlags.Hidden, + Category = "MonoDevelop Core")] + +[assembly:AddinName ("GNOME Platform Support")] +[assembly:AddinDescription ("GNOME Platform Support for MonoDevelop")] + +[assembly:AddinDependency ("Core", MonoDevelop.BuildInfo.Version)] +[assembly:AddinDependency ("Ide", MonoDevelop.BuildInfo.Version)] diff --git a/main/src/addins/GnomePlatform/GnomePlatform.addin.xml b/main/src/addins/GnomePlatform/GnomePlatform.addin.xml index 08c8168da6..a0f3bc7449 100644 --- a/main/src/addins/GnomePlatform/GnomePlatform.addin.xml +++ b/main/src/addins/GnomePlatform/GnomePlatform.addin.xml @@ -1,24 +1,7 @@ -<Addin id = "GnomePlatform" - namespace = "MonoDevelop" - name = "GNOME Platform Support" - author = "Geoff Norton" - copyright = "MIT X11" - url = "http://monodevelop.com/" - description = "GNOME Platform Support for MonoDevelop" - category = "MonoDevelop Core" - flags = "Hidden" - version = "4.1.4"> - - <Runtime> - <Import assembly="GnomePlatform.dll"/> - </Runtime> - - <Dependencies> - <Addin id="Core" version="4.1.4"/> - <Addin id="Ide" version="4.1.4"/> - </Dependencies> +<ExtensionModel> <Extension path = "/MonoDevelop/Core/PlatformService"> <Class class = "MonoDevelop.Platform.GnomePlatform"/> </Extension> -</Addin> + +</ExtensionModel> diff --git a/main/src/addins/GnomePlatform/GnomePlatform.csproj b/main/src/addins/GnomePlatform/GnomePlatform.csproj index 03f600175e..59f30a6425 100644 --- a/main/src/addins/GnomePlatform/GnomePlatform.csproj +++ b/main/src/addins/GnomePlatform/GnomePlatform.csproj @@ -70,6 +70,11 @@ <Name>Xwt</Name> <Private>False</Private> </ProjectReference> + <ProjectReference Include="..\..\..\external\mono-addins\Mono.Addins\Mono.Addins.csproj"> + <Project>{91DD5A2D-9FE3-4C3C-9253-876141874DAD}</Project> + <Name>Mono.Addins</Name> + <Private>False</Private> + </ProjectReference> </ItemGroup> <ItemGroup> <EmbeddedResource Include="GnomePlatform.addin.xml"> @@ -80,6 +85,7 @@ <Compile Include="GnomePlatform.cs" /> <Compile Include="AssemblyInfo.cs" /> <Compile Include="Gio.cs" /> + <Compile Include="AddinInfo.cs" /> </ItemGroup> <ItemGroup> <None Include="GnomePlatform.dll.config"> |