diff options
author | Mike Krüger <mkrueger@xamarin.com> | 2011-10-18 09:59:14 +0400 |
---|---|---|
committer | Mike Krüger <mkrueger@xamarin.com> | 2011-10-18 09:59:14 +0400 |
commit | a6e1400af37feff0af739bdf7f4fa788016cc7b3 (patch) | |
tree | d6517af93b46326d3b680674e429fceb76697c09 /extras/MonoDevelop.Database | |
parent | ad63357a0aa97c8b10f01ec3c1e54c54ec1f6f68 (diff) | |
parent | a4954f61e72d18c33e4803e20105407830ad623d (diff) |
Merge branch 'master' into newresolver
Conflicts:
main/src/addins/MonoDevelop.MacDev/Makefile.am
main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs
main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Dom.Parser/TypeResolverVisitor.cs
main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Dom/DomType.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.NavigateToDialog/SearchResult.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/ProjectOperations.cs
Diffstat (limited to 'extras/MonoDevelop.Database')
15 files changed, 75 insertions, 75 deletions
diff --git a/extras/MonoDevelop.Database/MonoDevelop.Database.CodeGenerator/MonoDevelop.Database.CodeGenerator.addin.xml b/extras/MonoDevelop.Database/MonoDevelop.Database.CodeGenerator/MonoDevelop.Database.CodeGenerator.addin.xml index 2d407fac37..1bd8d5de91 100644 --- a/extras/MonoDevelop.Database/MonoDevelop.Database.CodeGenerator/MonoDevelop.Database.CodeGenerator.addin.xml +++ b/extras/MonoDevelop.Database/MonoDevelop.Database.CodeGenerator/MonoDevelop.Database.CodeGenerator.addin.xml @@ -6,7 +6,7 @@ url = "http://www.monodevelop.com" description = "Database CodeGenerator Module" category = "Database" - version = "2.8"> + version = "2.8.1"> <Runtime> <Import assembly="MonoDevelop.Database.CodeGenerator.dll"/> @@ -15,11 +15,11 @@ <Localizer type="Gettext" catalog="monodevelop-database"/> <Dependencies> - <Addin id="Core" version="2.8"/> - <Addin id="Ide" version="2.8"/> - <Addin id="Database.Sql" version="2.8"/> - <Addin id="Database.Components" version="2.8"/> - <Addin id="Database.Query" version="2.8"/> + <Addin id="Core" version="2.8.1"/> + <Addin id="Ide" version="2.8.1"/> + <Addin id="Database.Sql" version="2.8.1"/> + <Addin id="Database.Components" version="2.8.1"/> + <Addin id="Database.Query" version="2.8.1"/> </Dependencies> <Extension path = "/MonoDevelop/Ide/Commands"> diff --git a/extras/MonoDevelop.Database/MonoDevelop.Database.Components/MonoDevelop.Database.Components.addin.xml b/extras/MonoDevelop.Database/MonoDevelop.Database.Components/MonoDevelop.Database.Components.addin.xml index 7ed54d766f..c28d1eb295 100644 --- a/extras/MonoDevelop.Database/MonoDevelop.Database.Components/MonoDevelop.Database.Components.addin.xml +++ b/extras/MonoDevelop.Database/MonoDevelop.Database.Components/MonoDevelop.Database.Components.addin.xml @@ -6,7 +6,7 @@ url = "http://www.monodevelop.com" description = "Database Components Module" category = "Database" - version = "2.8"> + version = "2.8.1"> <Runtime> <Import assembly="MonoDevelop.Database.Components.dll"/> @@ -15,10 +15,10 @@ <Localizer type="Gettext" catalog="monodevelop-database"/> <Dependencies> - <Addin id="Core" version="2.8"/> - <Addin id="Ide" version="2.8"/> - <Addin id="Database.Sql" version="2.8"/> - <Addin id="SourceEditor2" version="2.8"/> + <Addin id="Core" version="2.8.1"/> + <Addin id="Ide" version="2.8.1"/> + <Addin id="Database.Sql" version="2.8.1"/> + <Addin id="SourceEditor2" version="2.8.1"/> </Dependencies> <ExtensionPoint path = "/MonoDevelop/Database/DataGrid/Renderers" name = "DataGrid renderers"> diff --git a/extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/MonoDevelop.Database.ConnectionManager.addin.xml b/extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/MonoDevelop.Database.ConnectionManager.addin.xml index afde25a02d..3364a27d3a 100644 --- a/extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/MonoDevelop.Database.ConnectionManager.addin.xml +++ b/extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/MonoDevelop.Database.ConnectionManager.addin.xml @@ -6,7 +6,7 @@ url = "http://www.monodevelop.com" description = "Database ConnectionManager Module" category = "Database" - version = "2.8"> + version = "2.8.1"> <Runtime> <Import assembly="MonoDevelop.Database.ConnectionManager.dll"/> @@ -15,12 +15,12 @@ <Localizer type="Gettext" catalog="monodevelop-database"/> <Dependencies> - <Addin id="Core" version="2.8"/> - <Addin id="Ide" version="2.8"/> - <Addin id="Database.Sql" version="2.8"/> - <Addin id="Database.Components" version="2.8"/> - <Addin id="Database.Query" version="2.8"/> - <Addin id="Database.Designer" version="2.8"/> + <Addin id="Core" version="2.8.1"/> + <Addin id="Ide" version="2.8.1"/> + <Addin id="Database.Sql" version="2.8.1"/> + <Addin id="Database.Components" version="2.8.1"/> + <Addin id="Database.Query" version="2.8.1"/> + <Addin id="Database.Designer" version="2.8.1"/> </Dependencies> <Extension path = "/MonoDevelop/Ide/Pads"> diff --git a/extras/MonoDevelop.Database/MonoDevelop.Database.Designer/MonoDevelop.Database.Designer.addin.xml b/extras/MonoDevelop.Database/MonoDevelop.Database.Designer/MonoDevelop.Database.Designer.addin.xml index c73273a46f..6d68f68ca7 100644 --- a/extras/MonoDevelop.Database/MonoDevelop.Database.Designer/MonoDevelop.Database.Designer.addin.xml +++ b/extras/MonoDevelop.Database/MonoDevelop.Database.Designer/MonoDevelop.Database.Designer.addin.xml @@ -6,7 +6,7 @@ url = "http://www.monodevelop.com" description = "Database Designer Module" category = "Database" - version = "2.8"> + version = "2.8.1"> <Runtime> <Import assembly="MonoDevelop.Database.Designer.dll"/> @@ -15,9 +15,9 @@ <Localizer type="Gettext" catalog="monodevelop-database"/> <Dependencies> - <Addin id="Core" version="2.8"/> - <Addin id="Ide" version="2.8"/> - <Addin id="Database.Sql" version="2.8"/> + <Addin id="Core" version="2.8.1"/> + <Addin id="Ide" version="2.8.1"/> + <Addin id="Database.Sql" version="2.8.1"/> </Dependencies> </Addin>
\ No newline at end of file diff --git a/extras/MonoDevelop.Database/MonoDevelop.Database.Query/MonoDevelop.Database.Query.addin.xml b/extras/MonoDevelop.Database/MonoDevelop.Database.Query/MonoDevelop.Database.Query.addin.xml index 9f775d462e..f71ad80756 100644 --- a/extras/MonoDevelop.Database/MonoDevelop.Database.Query/MonoDevelop.Database.Query.addin.xml +++ b/extras/MonoDevelop.Database/MonoDevelop.Database.Query/MonoDevelop.Database.Query.addin.xml @@ -6,7 +6,7 @@ url = "http://www.monodevelop.com" description = "Database Query Module" category = "Database" - version = "2.8"> + version = "2.8.1"> <Runtime> <Import assembly="MonoDevelop.Database.Query.dll"/> @@ -15,10 +15,10 @@ <Localizer type="Gettext" catalog="monodevelop-database"/> <Dependencies> - <Addin id="Core" version="2.8"/> - <Addin id="Ide" version="2.8"/> - <Addin id="Database.Sql" version="2.8"/> - <Addin id="Database.Components" version="2.8"/> + <Addin id="Core" version="2.8.1"/> + <Addin id="Ide" version="2.8.1"/> + <Addin id="Database.Sql" version="2.8.1"/> + <Addin id="Database.Components" version="2.8.1"/> </Dependencies> diff --git a/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Firebird/MonoDevelop.Database.Sql.Firebird.addin.xml b/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Firebird/MonoDevelop.Database.Sql.Firebird.addin.xml index d224821e41..c10990962e 100644 --- a/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Firebird/MonoDevelop.Database.Sql.Firebird.addin.xml +++ b/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Firebird/MonoDevelop.Database.Sql.Firebird.addin.xml @@ -6,7 +6,7 @@ url = "http://www.monodevelop.com" description = "Database Module" category = "Database" - version = "2.8"> + version = "2.8.1"> <Runtime> <Import assembly="MonoDevelop.Database.Sql.Firebird.dll"/> @@ -15,7 +15,7 @@ <Localizer type="Gettext" catalog="monodevelop-database"/> <Dependencies> - <Addin id="MonoDevelop.Database.Sql" version="2.8"/> + <Addin id="MonoDevelop.Database.Sql" version="2.8.1"/> </Dependencies> <Extension path = "/Mono/Data/Sql"> diff --git a/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.MySql/MonoDevelop.Database.Sql.MySql.addin.xml b/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.MySql/MonoDevelop.Database.Sql.MySql.addin.xml index 3d7c20265b..5848e65d2e 100644 --- a/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.MySql/MonoDevelop.Database.Sql.MySql.addin.xml +++ b/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.MySql/MonoDevelop.Database.Sql.MySql.addin.xml @@ -6,7 +6,7 @@ url = "http://www.monodevelop.com" description = "Database Module" category = "Database" - version = "2.8"> + version = "2.8.1"> <Runtime> <Import assembly="MonoDevelop.Database.Sql.MySql.dll"/> @@ -15,12 +15,12 @@ <Localizer type="Gettext" catalog="monodevelop-database"/> <Dependencies> - <Addin id="Core" version="2.8"/> - <Addin id="Ide" version="2.8"/> - <Addin id="Database.Sql" version="2.8"/> - <Addin id="Database.Components" version="2.8"/> - <Addin id="Database.Designer" version="2.8"/> - <Addin id="SourceEditor2" version="2.8"/> + <Addin id="Core" version="2.8.1"/> + <Addin id="Ide" version="2.8.1"/> + <Addin id="Database.Sql" version="2.8.1"/> + <Addin id="Database.Components" version="2.8.1"/> + <Addin id="Database.Designer" version="2.8.1"/> + <Addin id="SourceEditor2" version="2.8.1"/> </Dependencies> <Extension path = "/MonoDevelop/Database/Sql"> diff --git a/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Npgsql/MonoDevelop.Database.Sql.Npgsql.addin.xml b/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Npgsql/MonoDevelop.Database.Sql.Npgsql.addin.xml index 8463c0c7c1..b10a126319 100644 --- a/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Npgsql/MonoDevelop.Database.Sql.Npgsql.addin.xml +++ b/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Npgsql/MonoDevelop.Database.Sql.Npgsql.addin.xml @@ -6,7 +6,7 @@ url = "http://www.monodevelop.com" description = "Database Module" category = "Database" - version = "2.8"> + version = "2.8.1"> <Runtime> <Import assembly="MonoDevelop.Database.Sql.Npgsql.dll"/> @@ -15,12 +15,12 @@ <Localizer type="Gettext" catalog="monodevelop-database"/> <Dependencies> - <Addin id="Core" version="2.8"/> - <Addin id="Ide" version="2.8"/> - <Addin id="Database.Sql" version="2.8"/> - <Addin id="Database.Components" version="2.8"/> - <Addin id="Database.Designer" version="2.8"/> - <Addin id="SourceEditor2" version="2.8"/> + <Addin id="Core" version="2.8.1"/> + <Addin id="Ide" version="2.8.1"/> + <Addin id="Database.Sql" version="2.8.1"/> + <Addin id="Database.Components" version="2.8.1"/> + <Addin id="Database.Designer" version="2.8.1"/> + <Addin id="SourceEditor2" version="2.8.1"/> </Dependencies> <Extension path = "/MonoDevelop/Database/Sql"> diff --git a/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Odbc/MonoDevelop.Database.Sql.Odbc.addin.xml b/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Odbc/MonoDevelop.Database.Sql.Odbc.addin.xml index 506ad7595e..3217fdb050 100644 --- a/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Odbc/MonoDevelop.Database.Sql.Odbc.addin.xml +++ b/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Odbc/MonoDevelop.Database.Sql.Odbc.addin.xml @@ -6,7 +6,7 @@ url = "http://www.monodevelop.com" description = "Database Module" category = "Database" - version = "2.8"> + version = "2.8.1"> <Runtime> <Import assembly="MonoDevelop.Database.Sql.Odbc.dll"/> @@ -15,11 +15,11 @@ <Localizer type="Gettext" catalog="monodevelop-database"/> <Dependencies> - <Addin id="Core" version="2.8"/> - <Addin id="Ide" version="2.8"/> - <Addin id="Database.Sql" version="2.8"/> - <Addin id="Database.Components" version="2.8"/> - <Addin id="Database.Designer" version="2.8"/> + <Addin id="Core" version="2.8.1"/> + <Addin id="Ide" version="2.8.1"/> + <Addin id="Database.Sql" version="2.8.1"/> + <Addin id="Database.Components" version="2.8.1"/> + <Addin id="Database.Designer" version="2.8.1"/> </Dependencies> <Extension path = "/MonoDevelop/Database/Sql"> diff --git a/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Oracle/MonoDevelop.Database.Sql.Oracle.addin.xml b/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Oracle/MonoDevelop.Database.Sql.Oracle.addin.xml index 1578fea9da..d42d4142e8 100644 --- a/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Oracle/MonoDevelop.Database.Sql.Oracle.addin.xml +++ b/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Oracle/MonoDevelop.Database.Sql.Oracle.addin.xml @@ -6,7 +6,7 @@ url = "http://www.monodevelop.com" description = "Database Module" category = "Database" - version = "2.8"> + version = "2.8.1"> <Runtime> <Import assembly="MonoDevelop.Database.Sql.Oracle.dll"/> @@ -15,11 +15,11 @@ <Localizer type="Gettext" catalog="monodevelop-database"/> <Dependencies> - <Addin id="Core" version="2.8"/> - <Addin id="Ide" version="2.8"/> - <Addin id="Database.Sql" version="2.8"/> - <Addin id="Database.Components" version="2.8"/> - <Addin id="Database.Designer" version="2.8"/> + <Addin id="Core" version="2.8.1"/> + <Addin id="Ide" version="2.8.1"/> + <Addin id="Database.Sql" version="2.8.1"/> + <Addin id="Database.Components" version="2.8.1"/> + <Addin id="Database.Designer" version="2.8.1"/> </Dependencies> <Extension path = "/MonoDevelop/Database/Sql"> diff --git a/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.SqlServer/MonoDevelop.Database.Sql.SqlServer.addin.xml b/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.SqlServer/MonoDevelop.Database.Sql.SqlServer.addin.xml index 4d188ca763..b46a3f5f88 100644 --- a/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.SqlServer/MonoDevelop.Database.Sql.SqlServer.addin.xml +++ b/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.SqlServer/MonoDevelop.Database.Sql.SqlServer.addin.xml @@ -6,7 +6,7 @@ url = "http://www.monodevelop.com" description = "Database Module" category = "Database" - version = "2.8"> + version = "2.8.1"> <Runtime> <Import assembly="MonoDevelop.Database.Sql.SqlServer.dll"/> @@ -15,12 +15,12 @@ <Localizer type="Gettext" catalog="monodevelop-database"/> <Dependencies> - <Addin id="Core" version="2.8"/> - <Addin id="Ide" version="2.8"/> - <Addin id="Database.Sql" version="2.8"/> - <Addin id="Database.Components" version="2.8"/> - <Addin id="Database.Designer" version="2.8"/> - <Addin id="SourceEditor2" version="2.8"/> + <Addin id="Core" version="2.8.1"/> + <Addin id="Ide" version="2.8.1"/> + <Addin id="Database.Sql" version="2.8.1"/> + <Addin id="Database.Components" version="2.8.1"/> + <Addin id="Database.Designer" version="2.8.1"/> + <Addin id="SourceEditor2" version="2.8.1"/> </Dependencies> <Extension path = "/MonoDevelop/Database/Sql"> diff --git a/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sqlite/MonoDevelop.Database.Sql.Sqlite.addin.xml b/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sqlite/MonoDevelop.Database.Sql.Sqlite.addin.xml index f0b83436e1..69d0f868a5 100644 --- a/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sqlite/MonoDevelop.Database.Sql.Sqlite.addin.xml +++ b/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sqlite/MonoDevelop.Database.Sql.Sqlite.addin.xml @@ -6,7 +6,7 @@ url = "http://www.monodevelop.com" description = "Database Module" category = "Database" - version = "2.8"> + version = "2.8.1"> <Runtime> <Import assembly="MonoDevelop.Database.Sql.Sqlite.dll"/> @@ -15,12 +15,12 @@ <Localizer type="Gettext" catalog="monodevelop-database"/> <Dependencies> - <Addin id="Core" version="2.8"/> - <Addin id="Ide" version="2.8"/> - <Addin id="Database.Sql" version="2.8"/> - <Addin id="Database.Components" version="2.8"/> - <Addin id="Database.Designer" version="2.8"/> - <Addin id="SourceEditor2" version="2.8"/> + <Addin id="Core" version="2.8.1"/> + <Addin id="Ide" version="2.8.1"/> + <Addin id="Database.Sql" version="2.8.1"/> + <Addin id="Database.Components" version="2.8.1"/> + <Addin id="Database.Designer" version="2.8.1"/> + <Addin id="SourceEditor2" version="2.8.1"/> </Dependencies> <Extension path = "/MonoDevelop/Database/Sql"> diff --git a/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sybase/MonoDevelop.Database.Sql.Sybase.addin.xml b/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sybase/MonoDevelop.Database.Sql.Sybase.addin.xml index 25c3e00c5b..641da2cbc1 100644 --- a/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sybase/MonoDevelop.Database.Sql.Sybase.addin.xml +++ b/extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sybase/MonoDevelop.Database.Sql.Sybase.addin.xml @@ -6,7 +6,7 @@ url = "http://www.monodevelop.com" description = "Database Module" category = "Database" - version = "2.8"> + version = "2.8.1"> <Runtime> <Import assembly="MonoDevelop.Database.Sql.Sybase.dll"/> @@ -15,7 +15,7 @@ <Localizer type="Gettext" catalog="monodevelop-database"/> <Dependencies> - <Addin id="MonoDevelop.Database.Sql" version="2.8"/> + <Addin id="MonoDevelop.Database.Sql" version="2.8.1"/> </Dependencies> <Extension path = "/Mono/Data/Sql"> diff --git a/extras/MonoDevelop.Database/MonoDevelop.Database.Sql/MonoDevelop.Database.Sql.addin.xml b/extras/MonoDevelop.Database/MonoDevelop.Database.Sql/MonoDevelop.Database.Sql.addin.xml index 5cd1921901..142937a414 100644 --- a/extras/MonoDevelop.Database/MonoDevelop.Database.Sql/MonoDevelop.Database.Sql.addin.xml +++ b/extras/MonoDevelop.Database/MonoDevelop.Database.Sql/MonoDevelop.Database.Sql.addin.xml @@ -6,14 +6,14 @@ url = "http://www.monodevelop.com" description = "Database Module" category = "Database" - version = "2.8"> + version = "2.8.1"> <Runtime> <Import assembly="MonoDevelop.Database.Sql.dll"/> </Runtime> <Dependencies> - <Addin id="Core" version="2.8"/> + <Addin id="Core" version="2.8.1"/> </Dependencies> <Localizer type="Gettext" catalog="monodevelop-database"/> diff --git a/extras/MonoDevelop.Database/configure.in b/extras/MonoDevelop.Database/configure.in index aaa646bfeb..75adfae4e6 100644 --- a/extras/MonoDevelop.Database/configure.in +++ b/extras/MonoDevelop.Database/configure.in @@ -1,4 +1,4 @@ -AC_INIT([monodevelop-database], 2.8, [monodevelop-list@lists.ximian.com]) +AC_INIT([monodevelop-database], 2.8.1, [monodevelop-list@lists.ximian.com]) AC_PREREQ(2.53) AM_INIT_AUTOMAKE([1.9 tar-ustar]) AM_MAINTAINER_MODE @@ -52,7 +52,7 @@ fi dnl hard dependencies MONOADDINS_REQUIRED_VERSION=0.4 -MONODEVELOP_REQUIRED_VERSION=2.8 +MONODEVELOP_REQUIRED_VERSION=2.8.1 GTKSHARP_REQUIRED_VERSION=2.12.8 PKG_CHECK_MODULES(MONO_ADDINS, mono-addins >= $MONOADDINS_REQUIRED_VERSION) |