diff options
| author | Mike Krüger <mkrueger@xamarin.com> | 2011-10-05 17:28:55 +0400 |
|---|---|---|
| committer | Mike Krüger <mkrueger@xamarin.com> | 2011-10-05 17:28:55 +0400 |
| commit | 8495e02f2cdc3e39da448188114f63527f1ea6c2 (patch) | |
| tree | f078fd3f88437abf22a8b50ea8a30ea8adff2043 /main/src/addins/VBNetBinding | |
| parent | c898cfaa91aae5405e21380eeab0c5fdcb24a0ff (diff) | |
| parent | f36dd68c0c0a46e9b80b09d5e112139eed4d879e (diff) | |
Merge branch 'master' into newresolver
Conflicts:
main/contrib/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj
main/contrib/ICSharpCode.NRefactory.CSharp/Ast/AstNode.cs
main/contrib/ICSharpCode.NRefactory.CSharp/Ast/CSharpModifierToken.cs
main/contrib/ICSharpCode.NRefactory.CSharp/Ast/Expressions/IdentifierExpression.cs
main/contrib/ICSharpCode.NRefactory.CSharp/Ast/Expressions/MemberReferenceExpression.cs
main/contrib/ICSharpCode.NRefactory.CSharp/Ast/Expressions/PointerReferenceExpression.cs
main/contrib/ICSharpCode.NRefactory.CSharp/Ast/Expressions/QueryExpression.cs
main/contrib/ICSharpCode.NRefactory.CSharp/Ast/GeneralScope/Constraint.cs
main/contrib/ICSharpCode.NRefactory.CSharp/Ast/GeneralScope/DelegateDeclaration.cs
main/contrib/ICSharpCode.NRefactory.CSharp/Ast/GeneralScope/ExternAliasDeclaration.cs
main/contrib/ICSharpCode.NRefactory.CSharp/Ast/GeneralScope/NamespaceDeclaration.cs
main/contrib/ICSharpCode.NRefactory.CSharp/Ast/GeneralScope/TypeDeclaration.cs
main/contrib/ICSharpCode.NRefactory.CSharp/Ast/GeneralScope/TypeParameterDeclaration.cs
main/contrib/ICSharpCode.NRefactory.CSharp/Ast/GeneralScope/UsingAliasDeclaration.cs
main/contrib/ICSharpCode.NRefactory.CSharp/Ast/Identifier.cs
main/contrib/ICSharpCode.NRefactory.CSharp/Ast/MemberType.cs
main/contrib/ICSharpCode.NRefactory.CSharp/Ast/SimpleType.cs
main/contrib/ICSharpCode.NRefactory.CSharp/Ast/Statements/ForeachStatement.cs
main/contrib/ICSharpCode.NRefactory.CSharp/Ast/Statements/GotoStatement.cs
main/contrib/ICSharpCode.NRefactory.CSharp/Ast/Statements/LabelStatement.cs
main/contrib/ICSharpCode.NRefactory.CSharp/Ast/Statements/TryCatchStatement.cs
main/contrib/ICSharpCode.NRefactory.CSharp/Ast/TypeMembers/EnumMemberDeclaration.cs
main/contrib/ICSharpCode.NRefactory.CSharp/Ast/TypeMembers/FixedVariableInitializer.cs
main/contrib/ICSharpCode.NRefactory.CSharp/Ast/TypeMembers/MemberDeclaration.cs
main/contrib/ICSharpCode.NRefactory.CSharp/Ast/TypeMembers/ParameterDeclaration.cs
main/contrib/ICSharpCode.NRefactory.CSharp/Ast/TypeMembers/VariableInitializer.cs
main/contrib/ICSharpCode.NRefactory.CSharp/Formatter/AstFormattingVisitor.cs
main/contrib/ICSharpCode.NRefactory.CSharp/Parser/CSharpParser.cs
main/contrib/ICSharpCode.NRefactory.CSharp/Parser/TypeSystemConvertVisitor.cs
main/contrib/ICSharpCode.NRefactory.CSharp/Parser/mcs/anonymous.cs
main/contrib/ICSharpCode.NRefactory.CSharp/Parser/mcs/async.cs
main/contrib/ICSharpCode.NRefactory.CSharp/Parser/mcs/cs-parser.cs
main/contrib/ICSharpCode.NRefactory.CSharp/Parser/mcs/cs-tokenizer.cs
main/contrib/ICSharpCode.NRefactory.CSharp/Parser/mcs/ecore.cs
main/contrib/ICSharpCode.NRefactory.CSharp/Parser/mcs/expression.cs
main/contrib/ICSharpCode.NRefactory.CSharp/Parser/mcs/flowanalysis.cs
main/contrib/ICSharpCode.NRefactory.CSharp/Parser/mcs/method.cs
main/contrib/ICSharpCode.NRefactory.CSharp/Parser/mcs/report.cs
main/contrib/ICSharpCode.NRefactory.CSharp/Refactoring/ContextAction/GenerateSwitchLabels.cs
main/contrib/ICSharpCode.NRefactory.CSharp/Refactoring/ContextAction/InsertAnonymousMethodSignature.cs
main/contrib/ICSharpCode.NRefactory.CSharp/Refactoring/ContextAction/RemoveBackingStore.cs
main/contrib/ICSharpCode.NRefactory.CSharp/Refactoring/RefactoringContext.cs
main/contrib/ICSharpCode.NRefactory.CSharp/Resolver/CSharpAttribute.cs
main/contrib/ICSharpCode.NRefactory.CSharp/Resolver/CSharpResolver.cs
main/contrib/ICSharpCode.NRefactory.CSharp/Resolver/ConstantValues.cs
main/contrib/ICSharpCode.NRefactory.CSharp/Resolver/OverloadResolution.cs
main/contrib/ICSharpCode.NRefactory.CSharp/Resolver/TypeInference.cs
main/contrib/ICSharpCode.NRefactory/CSharp/Analysis/MinimalResolveContext.cs
main/contrib/ICSharpCode.NRefactory/CSharp/Ast/Expressions/NamedArgumentExpression.cs
main/contrib/ICSharpCode.NRefactory/CSharp/Ast/Expressions/TypeReferenceExpression.cs
main/contrib/ICSharpCode.NRefactory/CSharp/Formatter/ITextEditorAdapter.cs
main/contrib/ICSharpCode.NRefactory/CSharp/OutputVisitor/IOutputFormatter.cs
main/contrib/ICSharpCode.NRefactory/CSharp/OutputVisitor/TextWriterOutputFormatter.cs
main/contrib/ICSharpCode.NRefactory/CSharp/Parser/ParsedFile.cs
main/contrib/ICSharpCode.NRefactory/CSharp/Parser/mcs/cs-parser.jay
main/contrib/ICSharpCode.NRefactory/CSharp/Refactoring/TypeSystemAstBuilder.cs
main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/AliasNamespaceReference.cs
main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/AmbiguousResolveResult.cs
main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/ByReferenceResolveResult.cs
main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/ConstantResolveResult.cs
main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/Conversions.cs
main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/ErrorResolveResult.cs
main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/IResolveVisitorNavigator.cs
main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/ITypeOrNamespaceReference.cs
main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/LocalResolveResult.cs
main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/MapTypeIntoNewContext.cs
main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/MemberLookup.cs
main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/MemberResolveResult.cs
main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/MemberTypeOrNamespaceReference.cs
main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/MethodGroupResolveResult.cs
main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/NamespaceResolveResult.cs
main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/NodeListResolveVisitorNavigator.cs
main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/ResolveResult.cs
main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/ResolveVisitor.cs
main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/SimpleTypeOrNamespaceReference.cs
main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/TypeResolveResult.cs
main/contrib/ICSharpCode.NRefactory/Documentation/IDStringProvider.cs
main/contrib/ICSharpCode.NRefactory/Documentation/XmlDocumentationProvider.cs
main/contrib/ICSharpCode.NRefactory/ICSharpCode.NRefactory.csproj
main/contrib/ICSharpCode.NRefactory/Makefile.am
main/contrib/ICSharpCode.NRefactory/PatternMatching/IPatternAstVisitor.cs
main/contrib/ICSharpCode.NRefactory/TypeSystem/ArrayType.cs
main/contrib/ICSharpCode.NRefactory/TypeSystem/ByReferenceType.cs
main/contrib/ICSharpCode.NRefactory/TypeSystem/CecilLoader.cs
main/contrib/ICSharpCode.NRefactory/TypeSystem/DomRegion.cs
main/contrib/ICSharpCode.NRefactory/TypeSystem/Error.cs
main/contrib/ICSharpCode.NRefactory/TypeSystem/ExtensionMethods.cs
main/contrib/ICSharpCode.NRefactory/TypeSystem/IAnnotatable.cs
main/contrib/ICSharpCode.NRefactory/TypeSystem/IParsedFile.cs
main/contrib/ICSharpCode.NRefactory/TypeSystem/IProjectContent.cs
main/contrib/ICSharpCode.NRefactory/TypeSystem/ITypeResolveContext.cs
main/contrib/ICSharpCode.NRefactory/TypeSystem/Implementation/AbstractType.cs
main/contrib/ICSharpCode.NRefactory/TypeSystem/Implementation/CompositeTypeResolveContext.cs
main/contrib/ICSharpCode.NRefactory/TypeSystem/Implementation/CompoundTypeDefinition.cs
main/contrib/ICSharpCode.NRefactory/TypeSystem/Implementation/DefaultTypeDefinition.cs
main/contrib/ICSharpCode.NRefactory/TypeSystem/Implementation/DefaultTypeParameter.cs
main/contrib/ICSharpCode.NRefactory/TypeSystem/Implementation/GetClassTypeReference.cs
main/contrib/ICSharpCode.NRefactory/TypeSystem/Implementation/ProxyTypeResolveContext.cs
main/contrib/ICSharpCode.NRefactory/TypeSystem/Implementation/SimpleProjectContent.cs
main/contrib/ICSharpCode.NRefactory/TypeSystem/Implementation/SpecializedMember.cs
main/contrib/ICSharpCode.NRefactory/TypeSystem/Implementation/TypeStorage.cs
main/contrib/ICSharpCode.NRefactory/TypeSystem/ParameterizedType.cs
main/contrib/ICSharpCode.NRefactory/TypeSystem/PointerType.cs
main/contrib/ICSharpCode.NRefactory/TypeSystem/SharedTypes.cs
main/contrib/ICSharpCode.NRefactory/Utils/DotNet35Compat.cs
main/contrib/ICSharpCode.NRefactory/Utils/EmptyList.cs
main/contrib/ICSharpCode.NRefactory/Utils/Platform.cs
main/src/addins/CSharpBinding/CSharpBinding.csproj
main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs
main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/MemberCompletionData.cs
main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/MethodParameterDataProvider.cs
main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/NewOverrideCompletionData.cs
main/src/addins/CSharpBinding/MonoDevelop.CSharp.ContextAction/MDRefactoringContext.cs
main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormatter.cs
main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/CSharpSyntaxMode.cs
main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpCodeGenerator.cs
main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CreateMethod/CreateMethodCodeGenerator.cs
main/src/addins/CSharpBinding/MonoDevelop.CSharp.Resolver/NRefactoryResolver.cs
main/src/addins/CSharpBinding/MonoDevelop.CSharp/CSharpAmbience.cs
main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs
main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/ColoredCSharpFormatter.cs
main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/DomEventNodeBuilder.cs
main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/DomFieldNodeBuilder.cs
main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/DomMethodNodeBuilder.cs
main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/DomPropertyNodeBuilder.cs
main/src/addins/MonoDevelop.CodeMetrics/MonoDevelop.CodeMetrics.csproj
main/src/addins/MonoDevelop.MacDev/ObjCIntegration/NSObjectInfoService.cs
main/src/addins/MonoDevelop.MacDev/ObjCIntegration/NSObjectProjectInfo.cs
main/src/addins/MonoDevelop.MacDev/ObjCIntegration/NSObjectTypeInfo.cs
main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/FindDerivedClassesHandler.cs
main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/FindReferencesHandler.cs
main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/GotoDeclarationHandler.cs
main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs
main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorWidget.cs
main/src/core/Mono.Texteditor/Mono.TextEditor/CodeSegmentPreviewWindow.cs
main/src/core/Mono.Texteditor/Mono.TextEditor/Document.cs
main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Dom.Parser/ProjectDom.cs
main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Dom.Serialization/CodeCompletionDatabase.cs
main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Dom.Serialization/DatabaseProjectDom.cs
main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Dom.Serialization/ProjectCodeCompletionDatabase.cs
main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Dom/DomCecilType.cs
main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Dom/DomType.cs
main/src/core/MonoDevelop.Core/MonoDevelop.Projects/HelpService.cs
main/src/core/MonoDevelop.Ide/ExtensionModel/MonoDevelop.Ide.addin.xml
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/AboutMonoDevelopTabPage.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/CommonAboutDialog.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/VersionInformationTabPage.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/Ide.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.TypeSystem/AmbienceService.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.TypeSystem/CodeGenerator.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.TypeSystem/OutputFlags.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.TypeSystem/OutputSettings.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.TypeSystem/ParsedDocument.cs
main/tests/UnitTests/MonoDevelop.CSharpBinding/TopLevelTests.cs
Diffstat (limited to 'main/src/addins/VBNetBinding')
5 files changed, 22 insertions, 11 deletions
diff --git a/main/src/addins/VBNetBinding/Project/VBCompilerParameters.cs b/main/src/addins/VBNetBinding/Project/VBCompilerParameters.cs index 0ad44f32c0..e09c4748d1 100644 --- a/main/src/addins/VBNetBinding/Project/VBCompilerParameters.cs +++ b/main/src/addins/VBNetBinding/Project/VBCompilerParameters.cs @@ -103,6 +103,16 @@ namespace MonoDevelop.VBNetBinding [ItemProperty ("AdditionalParameters")]
string additionalParameters = String.Empty;
+ + public override void AddDefineSymbol (string symbol) + { + DefineConstants += symbol + ";"; + } + + public override void RemoveDefineSymbol (string symbol) + { + DefineConstants = DefineConstants.Replace (symbol + ";", ""); + } public bool DefineDebug { get { return defineDebug; } diff --git a/main/src/addins/VBNetBinding/VBNetBinding.addin.xml b/main/src/addins/VBNetBinding/VBNetBinding.addin.xml index af8e72a700..ca2f8aa94c 100644 --- a/main/src/addins/VBNetBinding/VBNetBinding.addin.xml +++ b/main/src/addins/VBNetBinding/VBNetBinding.addin.xml @@ -6,11 +6,11 @@ url = "http://bard.sytes.net/vbnetbinding" description = "VB.NET Language Binding" category = "Language bindings" - version = "2.7"> + version = "2.8"> <Dependencies> - <Addin id="Core" version="2.7"/> - <Addin id="Ide" version="2.7"/> + <Addin id="Core" version="2.8"/> + <Addin id="Ide" version="2.8"/> </Dependencies> <Extension path = "/MonoDevelop/ProjectModel/MSBuildItemTypes"> diff --git a/main/src/addins/VBNetBinding/VBNetBinding.csproj b/main/src/addins/VBNetBinding/VBNetBinding.csproj index c22296fc96..44f6bad843 100644 --- a/main/src/addins/VBNetBinding/VBNetBinding.csproj +++ b/main/src/addins/VBNetBinding/VBNetBinding.csproj @@ -45,6 +45,7 @@ <ProjectReference Include="..\..\..\contrib\NRefactory\Project\NRefactory.csproj"> <Project>{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}</Project> <Name>NRefactory</Name> + <Private>False</Private> </ProjectReference> </ItemGroup> <ItemGroup> diff --git a/main/src/addins/VBNetBinding/templates/VBConsoleApplicationProject.xpt.xml b/main/src/addins/VBNetBinding/templates/VBConsoleApplicationProject.xpt.xml index a669ebf3ee..43b7b12256 100644 --- a/main/src/addins/VBNetBinding/templates/VBConsoleApplicationProject.xpt.xml +++ b/main/src/addins/VBNetBinding/templates/VBConsoleApplicationProject.xpt.xml @@ -26,7 +26,7 @@ <Project name = "${ProjectName}" directory = "."> <Options ExternalConsole="True"/> <References> - <Reference type="Gac" refto="System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> + <Reference type="Package" refto="System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> </References> <Files> <File name = "Application.vb" AddStandardHeader="True"> diff --git a/main/src/addins/VBNetBinding/templates/VBGtkSharp2Project.xpt.xml b/main/src/addins/VBNetBinding/templates/VBGtkSharp2Project.xpt.xml index af31171f31..61ed9d68af 100644 --- a/main/src/addins/VBNetBinding/templates/VBGtkSharp2Project.xpt.xml +++ b/main/src/addins/VBNetBinding/templates/VBGtkSharp2Project.xpt.xml @@ -27,13 +27,13 @@ <Options Target="WinExe"/> <References> - <Reference type="Gac" refto="System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> - <Reference type="Gac" SpecificVersion="false" refto="gtk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" /> - <Reference type="Gac" SpecificVersion="false" refto="gdk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" /> - <Reference type="Gac" SpecificVersion="false" refto="glib-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" /> - <Reference type="Gac" SpecificVersion="false" refto="glade-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" /> - <Reference type="Gac" SpecificVersion="false" refto="pango-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" /> - <Reference type="Gac" SpecificVersion="false" refto="atk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" /> + <Reference type="Package" refto="System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> + <Reference type="Package" SpecificVersion="false" refto="gtk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" /> + <Reference type="Package" SpecificVersion="false" refto="gdk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" /> + <Reference type="Package" SpecificVersion="false" refto="glib-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" /> + <Reference type="Package" SpecificVersion="false" refto="glade-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" /> + <Reference type="Package" SpecificVersion="false" refto="pango-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" /> + <Reference type="Package" SpecificVersion="false" refto="atk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" /> </References> <Files> |