From fea395030befef43b4aa4aa2aa9f5037dd314c4f Mon Sep 17 00:00:00 2001 From: Matt Ward Date: Sun, 7 Oct 2012 16:33:57 +0100 Subject: [PATCH] Fix EF PowerShell extensions not finding SharpDevelop's EnvDTE assembly. Move EnvDTE API to separate assembly. Create EnvDTE interfaces in VB.NET to allow COM parameterised properties to be implemented to match Visual Studio's API. Rename EnvDTE namespace from ICSharpCode.PackageManagement.EnvDTE to EnvDTE --- .../Project/PackageManagement.Cmdlets.csproj | 5 + .../PackageManagement.Cmdlets.Tests.csproj | 4 + .../EnvDTEHelpers/Project/Globals.vb | 45 ------ .../PackageManagement.EnvDTEHelpers.vbproj | 50 ------- .../PackageManagement/PackageManagement.sln | 18 +-- .../Project/PackageManagement.csproj | 24 +--- .../Project/Src/EnvDTE/ChildProjectItems.cs | 6 +- .../Project/Src/EnvDTE/CodeAttribute.cs | 6 +- .../Project/Src/EnvDTE/CodeAttribute2.cs | 4 +- .../Src/EnvDTE/CodeAttributeArgument.cs | 2 +- .../Project/Src/EnvDTE/CodeClass.cs | 10 +- .../Project/Src/EnvDTE/CodeClass2.cs | 12 +- .../Project/Src/EnvDTE/CodeDelegate.cs | 6 +- .../Project/Src/EnvDTE/CodeElement.cs | 22 +-- .../Project/Src/EnvDTE/CodeElements.cs | 17 --- .../Project/Src/EnvDTE/CodeElementsList.cs | 8 +- .../Project/Src/EnvDTE/CodeFunction.cs | 26 ++-- .../Project/Src/EnvDTE/CodeFunction2.cs | 18 +-- .../Src/EnvDTE/CodeGetterOrSetterFunction.cs | 4 +- .../Project/Src/EnvDTE/CodeImport.cs | 6 +- .../Project/Src/EnvDTE/CodeInterface.cs | 8 +- .../Project/Src/EnvDTE/CodeModel.cs | 6 +- .../Project/Src/EnvDTE/CodeNamespace.cs | 10 +- .../Project/Src/EnvDTE/CodeParameter.cs | 10 +- .../Project/Src/EnvDTE/CodeParameter2.cs | 18 +-- .../Project/Src/EnvDTE/CodeProperty.cs | 18 +-- .../Project/Src/EnvDTE/CodeProperty2.cs | 14 +- .../Project/Src/EnvDTE/CodeStruct.cs | 6 +- .../Project/Src/EnvDTE/CodeType.cs | 20 +-- .../Project/Src/EnvDTE/CodeTypeRef.cs | 8 +- .../Project/Src/EnvDTE/CodeTypeRef2.cs | 2 +- .../Project/Src/EnvDTE/CodeVariable.cs | 12 +- .../Project/Src/EnvDTE/ColorableItems.cs | 2 +- .../Project/Src/EnvDTE/Configuration.cs | 4 +- .../Src/EnvDTE/ConfigurationManager.cs | 4 +- .../Project/Src/EnvDTE/Constants.cs | 14 -- .../Project/Src/EnvDTE/DTE.cs | 12 +- .../Src/EnvDTE/DirectoryProjectItems.cs | 4 +- .../Project/Src/EnvDTE/Document.cs | 2 +- .../Project/Src/EnvDTE/EditPoint.cs | 6 +- .../Src/EnvDTE/EnumerableProjectItems.cs | 6 +- .../Project/Src/EnvDTE/FileCodeModel2.cs | 4 +- .../Src/EnvDTE/FileCodeModelCodeNamespace.cs | 2 +- .../Project/Src/EnvDTE/FileProjectItems.cs | 4 +- .../Project/Src/EnvDTE/FontsAndColorsItems.cs | 4 +- .../Src/EnvDTE/IReturnTypeExtensions.cs | 38 ++--- .../Project/Src/EnvDTE/ItemOperations.cs | 4 +- .../Project/Src/EnvDTE/Project.cs | 14 +- .../Project/Src/EnvDTE/ProjectItem.cs | 43 +++--- .../Src/EnvDTE/ProjectItemRelationship.cs | 2 +- .../Project/Src/EnvDTE/ProjectItems.cs | 12 +- .../Src/EnvDTE/ProjectItemsInsideProject.cs | 4 +- .../Project/Src/EnvDTE/ProjectObject.cs | 8 +- .../Project/Src/EnvDTE/Projects.cs | 4 +- .../Project/Src/EnvDTE/Properties.cs | 4 +- .../Project/Src/EnvDTE/Property.cs | 2 +- .../Project/Src/EnvDTE/Reference.cs | 4 +- .../Project/Src/EnvDTE/Reference3.cs | 2 +- .../Project/Src/EnvDTE/References.cs | 6 +- .../Project/Src/EnvDTE/Solution.cs | 10 +- .../Project/Src/EnvDTE/SolutionBuild.cs | 4 +- .../Src/EnvDTE/SolutionConfiguration.cs | 2 +- .../Project/Src/EnvDTE/SolutionGlobals.cs | 2 +- .../Project/Src/EnvDTE/SourceControl.cs | 2 +- .../Project/Src/EnvDTE/TextDocument.cs | 4 +- .../Project/Src/EnvDTE/TextPoint.cs | 4 +- .../Project/Src/EnvDTE/Window.cs | 4 +- .../Project/Src/EnvDTE/vsCMAccess.cs | 13 -- .../Project/Src/EnvDTE/vsCMClassKind.cs | 13 -- .../Project/Src/EnvDTE/vsCMElement.cs | 23 ---- .../Project/Src/EnvDTE/vsCMFunction.cs | 14 -- .../Project/Src/EnvDTE/vsCMInfoLocation.cs | 13 -- .../Project/Src/EnvDTE/vsCMOverrideKind.cs | 17 --- .../Project/Src/EnvDTE/vsCMParameterKind.cs | 17 --- .../Project/Src/EnvDTE/vsCMPropertyKind.cs | 14 -- .../Project/Src/EnvDTE/vsCMTypeRef.cs | 28 ---- .../Src/EnvDTE/vsEPReplaceTextOptions.cs | 15 -- .../Src/VisualStudio/FlavoredProject.cs | 38 ++--- .../VisualStudio/IVsAggregatableProject.cs | 12 -- .../Project/Src/VisualStudio/IVsHierarchy.cs | 12 -- .../Project/Src/VisualStudio/IVsSolution.cs | 12 -- .../Configuration/AssemblyInfo.vb | 4 +- .../SharpDevelop.EnvDTE.vbproj | 130 ++++++++++++++++++ .../SharpDevelop.EnvDTE/Src/CodeAttribute.vb | 11 ++ .../SharpDevelop.EnvDTE/Src/CodeAttribute2.vb | 10 ++ .../Src/CodeAttributeArgument.vb | 10 ++ .../SharpDevelop.EnvDTE/Src/CodeClass.vb | 11 ++ .../SharpDevelop.EnvDTE/Src/CodeClass2.vb | 13 ++ .../SharpDevelop.EnvDTE/Src/CodeDelegate.vb | 9 ++ .../SharpDevelop.EnvDTE/Src/CodeElement.vb | 16 +++ .../SharpDevelop.EnvDTE/Src/CodeElements.vb | 12 ++ .../SharpDevelop.EnvDTE/Src/CodeFunction.vb | 17 +++ .../SharpDevelop.EnvDTE/Src/CodeFunction2.vb | 11 ++ .../SharpDevelop.EnvDTE/Src/CodeImport.vb | 10 ++ .../SharpDevelop.EnvDTE/Src/CodeInterface.vb | 10 ++ .../SharpDevelop.EnvDTE/Src/CodeModel.vb | 11 ++ .../Src/CodeModelLanguageConstants.vb | 9 ++ .../SharpDevelop.EnvDTE/Src/CodeNamespace.vb | 11 ++ .../SharpDevelop.EnvDTE/Src/CodeParameter.vb | 11 ++ .../SharpDevelop.EnvDTE/Src/CodeParameter2.vb | 10 ++ .../SharpDevelop.EnvDTE/Src/CodeProperty.vb | 15 ++ .../SharpDevelop.EnvDTE/Src/CodeProperty2.vb | 11 ++ .../SharpDevelop.EnvDTE/Src/CodeStruct.vb | 9 ++ .../SharpDevelop.EnvDTE/Src/CodeType.vb | 22 +++ .../SharpDevelop.EnvDTE/Src/CodeTypeRef.vb | 12 ++ .../SharpDevelop.EnvDTE/Src/CodeTypeRef2.vb | 10 ++ .../SharpDevelop.EnvDTE/Src/CodeVariable.vb | 10 ++ .../SharpDevelop.EnvDTE/Src/ColorableItems.vb | 11 ++ .../SharpDevelop.EnvDTE/Src/Configuration.vb | 8 ++ .../Src/ConfigurationManager.vb | 8 ++ .../SharpDevelop.EnvDTE/Src/Constants.vb | 10 ++ .../SharpDevelop.EnvDTE/Src/DTE.vb | 14 ++ .../SharpDevelop.EnvDTE/Src/Document.vb | 11 ++ .../SharpDevelop.EnvDTE/Src/EditPoint.vb | 11 ++ .../SharpDevelop.EnvDTE/Src/FileCodeModel2.vb | 10 ++ .../Src/FontsAndColorsItems.vb | 8 ++ .../SharpDevelop.EnvDTE/Src/Globals.vb | 48 +++++++ .../SharpDevelop.EnvDTE/Src/ItemOperations.vb | 10 ++ .../SharpDevelop.EnvDTE/Src/Project.vb | 21 +++ .../SharpDevelop.EnvDTE/Src/ProjectItem.vb | 21 +++ .../SharpDevelop.EnvDTE/Src/ProjectItems.vb | 17 +++ .../SharpDevelop.EnvDTE/Src/ProjectObject.vb | 11 ++ .../SharpDevelop.EnvDTE/Src/Projects.vb | 15 ++ .../SharpDevelop.EnvDTE/Src/Properties.vb | 10 ++ .../SharpDevelop.EnvDTE/Src/Property.vb | 10 ++ .../SharpDevelop.EnvDTE/Src/Reference.vb | 12 ++ .../SharpDevelop.EnvDTE/Src/Reference3.vb | 10 ++ .../SharpDevelop.EnvDTE/Src/References.vb | 17 +++ .../SharpDevelop.EnvDTE/Src/Solution.vb | 15 ++ .../SharpDevelop.EnvDTE/Src/SolutionBuild.vb | 15 ++ .../Src/SolutionConfiguration.vb | 8 ++ .../SharpDevelop.EnvDTE/Src/SourceControl.vb | 10 ++ .../SharpDevelop.EnvDTE/Src/TextDocument.vb | 8 ++ .../SharpDevelop.EnvDTE/Src/TextPoint.vb | 11 ++ .../VisualStudio/IVsAggregatableProject.vb | 10 ++ .../Src/VisualStudio/IVsHierarchy.vb | 8 ++ .../Src/VisualStudio/IVsSolution.vb | 10 ++ .../SharpDevelop.EnvDTE/Src/Window.vb | 8 ++ .../SharpDevelop.EnvDTE/Src/vsCMAccess.vb | 9 ++ .../SharpDevelop.EnvDTE/Src/vsCMClassKind.vb | 9 ++ .../SharpDevelop.EnvDTE/Src/vsCMElement.vb | 19 +++ .../SharpDevelop.EnvDTE/Src/vsCMFunction.vb | 10 ++ .../Src/vsCMInfoLocation.vb | 9 ++ .../Src/vsCMOverrideKind.vb | 13 ++ .../Src/vsCMParameterKind.vb | 13 ++ .../Src/vsCMPropertyKind.vb | 10 ++ .../SharpDevelop.EnvDTE/Src/vsCMTypeRef.vb | 24 ++++ .../Src/vsEPReplaceTextOptions.vb | 11 ++ .../Test/PackageManagement.Tests.csproj | 8 +- .../Test/Src/ClassCodeGeneratorTests.cs | 8 +- .../Test/Src/EnvDTE/CodeAttribute2Tests.cs | 12 +- .../Test/Src/EnvDTE/CodeClass2Tests.cs | 44 +++--- .../Test/Src/EnvDTE/CodeDelegateTests.cs | 12 +- .../Test/Src/EnvDTE/CodeFunction2Tests.cs | 24 ++-- .../Test/Src/EnvDTE/CodeFunctionTests.cs | 40 +++--- .../Test/Src/EnvDTE/CodeImportTests.cs | 4 +- .../Test/Src/EnvDTE/CodeInterfaceTests.cs | 4 +- .../Test/Src/EnvDTE/CodeModelTests.cs | 26 ++-- .../Test/Src/EnvDTE/CodeNamespaceTests.cs | 16 +-- .../Test/Src/EnvDTE/CodeParameter2Tests.cs | 24 ++-- .../Test/Src/EnvDTE/CodeParameterTests.cs | 6 +- .../Test/Src/EnvDTE/CodeProperty2Tests.cs | 88 ++++++------ .../Test/Src/EnvDTE/CodeStructTests.cs | 12 +- .../Test/Src/EnvDTE/CodeTypeRef2Tests.cs | 76 +++++----- .../Test/Src/EnvDTE/CodeTypeTests.cs | 10 +- .../Test/Src/EnvDTE/CodeVariableTests.cs | 20 +-- .../Test/Src/EnvDTE/DTETests.cs | 10 +- .../Test/Src/EnvDTE/EditPointTests.cs | 14 +- .../Test/Src/EnvDTE/FileProjectItemsTests.cs | 4 +- .../Src/EnvDTE/FontsAndColorItemsTests.cs | 14 +- .../Test/Src/EnvDTE/ItemOperationsTests.cs | 2 +- .../Src/EnvDTE/ProjectItemPropertyTests.cs | 2 +- .../Test/Src/EnvDTE/ProjectItemTests.cs | 94 ++++++------- .../Test/Src/EnvDTE/ProjectItemsTests.cs | 34 ++--- .../Test/Src/EnvDTE/ProjectPropertyTests.cs | 6 +- .../Test/Src/EnvDTE/ProjectTests.cs | 10 +- .../Test/Src/EnvDTE/ProjectsTests.cs | 8 +- .../Test/Src/EnvDTE/Reference3Tests.cs | 4 +- .../Test/Src/EnvDTE/ReferencesTests.cs | 8 +- .../Test/Src/EnvDTE/SolutionGlobalsTests.cs | 2 +- .../Test/Src/EnvDTE/SolutionTests.cs | 14 +- ...ditorFontsAndColorsPropertyFactoryTests.cs | 8 +- .../Src/Helpers/CodeElementsExtensions.cs | 32 ++--- .../Test/Src/Helpers/PropertiesHelper.cs | 2 +- 184 files changed, 1579 insertions(+), 974 deletions(-) delete mode 100644 src/AddIns/Misc/PackageManagement/EnvDTEHelpers/Project/Globals.vb delete mode 100644 src/AddIns/Misc/PackageManagement/EnvDTEHelpers/Project/PackageManagement.EnvDTEHelpers.vbproj delete mode 100644 src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeElements.cs delete mode 100644 src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/Constants.cs delete mode 100644 src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/vsCMAccess.cs delete mode 100644 src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/vsCMClassKind.cs delete mode 100644 src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/vsCMElement.cs delete mode 100644 src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/vsCMFunction.cs delete mode 100644 src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/vsCMInfoLocation.cs delete mode 100644 src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/vsCMOverrideKind.cs delete mode 100644 src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/vsCMParameterKind.cs delete mode 100644 src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/vsCMPropertyKind.cs delete mode 100644 src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/vsCMTypeRef.cs delete mode 100644 src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/vsEPReplaceTextOptions.cs delete mode 100644 src/AddIns/Misc/PackageManagement/Project/Src/VisualStudio/IVsAggregatableProject.cs delete mode 100644 src/AddIns/Misc/PackageManagement/Project/Src/VisualStudio/IVsHierarchy.cs delete mode 100644 src/AddIns/Misc/PackageManagement/Project/Src/VisualStudio/IVsSolution.cs rename src/AddIns/Misc/PackageManagement/{EnvDTEHelpers/Project => SharpDevelop.EnvDTE}/Configuration/AssemblyInfo.vb (88%) create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/SharpDevelop.EnvDTE.vbproj create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeAttribute.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeAttribute2.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeAttributeArgument.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeClass.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeClass2.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeDelegate.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeElement.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeElements.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeFunction.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeFunction2.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeImport.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeInterface.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeModel.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeModelLanguageConstants.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeNamespace.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeParameter.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeParameter2.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeProperty.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeProperty2.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeStruct.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeType.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeTypeRef.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeTypeRef2.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeVariable.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/ColorableItems.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/Configuration.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/ConfigurationManager.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/Constants.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/DTE.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/Document.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/EditPoint.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/FileCodeModel2.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/FontsAndColorsItems.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/Globals.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/ItemOperations.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/Project.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/ProjectItem.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/ProjectItems.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/ProjectObject.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/Projects.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/Properties.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/Property.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/Reference.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/Reference3.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/References.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/Solution.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/SolutionBuild.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/SolutionConfiguration.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/SourceControl.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/TextDocument.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/TextPoint.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/VisualStudio/IVsAggregatableProject.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/VisualStudio/IVsHierarchy.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/VisualStudio/IVsSolution.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/Window.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/vsCMAccess.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/vsCMClassKind.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/vsCMElement.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/vsCMFunction.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/vsCMInfoLocation.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/vsCMOverrideKind.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/vsCMParameterKind.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/vsCMPropertyKind.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/vsCMTypeRef.vb create mode 100644 src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/vsEPReplaceTextOptions.vb diff --git a/src/AddIns/Misc/PackageManagement/Cmdlets/Project/PackageManagement.Cmdlets.csproj b/src/AddIns/Misc/PackageManagement/Cmdlets/Project/PackageManagement.Cmdlets.csproj index c4440c2144..15eb357068 100644 --- a/src/AddIns/Misc/PackageManagement/Cmdlets/Project/PackageManagement.Cmdlets.csproj +++ b/src/AddIns/Misc/PackageManagement/Cmdlets/Project/PackageManagement.Cmdlets.csproj @@ -73,6 +73,11 @@ PackageManagement False + + {6FB1260D-68A2-41A0-BB09-F5F710842E99} + SharpDevelop.EnvDTE + False + diff --git a/src/AddIns/Misc/PackageManagement/Cmdlets/Test/PackageManagement.Cmdlets.Tests.csproj b/src/AddIns/Misc/PackageManagement/Cmdlets/Test/PackageManagement.Cmdlets.Tests.csproj index 35893a9283..030facd03c 100644 --- a/src/AddIns/Misc/PackageManagement/Cmdlets/Test/PackageManagement.Cmdlets.Tests.csproj +++ b/src/AddIns/Misc/PackageManagement/Cmdlets/Test/PackageManagement.Cmdlets.Tests.csproj @@ -81,6 +81,10 @@ {AE4AB0FA-6087-4480-AF37-0FA1452B3DA1} PackageManagement + + {6FB1260D-68A2-41A0-BB09-F5F710842E99} + SharpDevelop.EnvDTE + {56E98A01-8398-4A08-9578-C7337711A52B} PackageManagement.Tests diff --git a/src/AddIns/Misc/PackageManagement/EnvDTEHelpers/Project/Globals.vb b/src/AddIns/Misc/PackageManagement/EnvDTEHelpers/Project/Globals.vb deleted file mode 100644 index bbcdbcb09e..0000000000 --- a/src/AddIns/Misc/PackageManagement/EnvDTEHelpers/Project/Globals.vb +++ /dev/null @@ -1,45 +0,0 @@ -' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -''' -''' EnvDTE.Globals class defined in VB.NET so multiple parameterized properties can be defined -''' which are not supported in C#. This allows Powershell to use the properties as methods: -''' -''' $dte.Solution.Globals.VariablePersists("MyVariable") = $true -''' $dte.Solution.Globals.VariablePersists("MyVariable") -''' $dte.Solution.Globals.VariableValue("MyVariable") = "path/to/tool" -''' $dte.Solution.Globals.VariablePersists("MyVariable") = $true -''' -Public MustInherit Class Globals - Public Property VariableValue(ByVal name As String) As Object - Get - Return GetVariableValue(name) - End Get - Set - SetVariableValue(name, value) - End Set - End Property - - Protected MustOverride Function GetVariableValue(ByVal name As String) As Object - Protected MustOverride Sub SetVariableValue(ByVal name As String, ByVal value As Object) - - Public Property VariablePersists(ByVal name As String) As Boolean - Get - Return GetVariablePersists(name) - End Get - Set - SetVariablePersists(name, value) - End Set - End Property - - Protected MustOverride Function GetVariablePersists(ByVal name As String) As Boolean - Protected MustOverride Sub SetVariablePersists(ByVal name As String, ByVal value As Boolean) - - Public ReadOnly Property VariableExists(ByVal name As string) As Boolean - Get - Return GetVariableExists(name) - End Get - End Property - - Protected MustOverride Function GetVariableExists(ByVal name As String) As Boolean -End Class diff --git a/src/AddIns/Misc/PackageManagement/EnvDTEHelpers/Project/PackageManagement.EnvDTEHelpers.vbproj b/src/AddIns/Misc/PackageManagement/EnvDTEHelpers/Project/PackageManagement.EnvDTEHelpers.vbproj deleted file mode 100644 index a438d502c4..0000000000 --- a/src/AddIns/Misc/PackageManagement/EnvDTEHelpers/Project/PackageManagement.EnvDTEHelpers.vbproj +++ /dev/null @@ -1,50 +0,0 @@ - - - - {F7886FB7-3764-4574-B981-25EB164B532E} - Debug - AnyCPU - Library - Windows - ICSharpCode.PackageManagement.EnvDTE - PackageManagement.EnvDTEHelpers - v4.0 - Properties - On - ..\..\..\..\..\..\AddIns\Misc\PackageManagement\ - - - AnyCPU - - - True - Full - False - DEBUG=1,TRACE=1 - - - False - None - True - TRACE=1 - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/PackageManagement.sln b/src/AddIns/Misc/PackageManagement/PackageManagement.sln index bd76daab5e..7cf8b3de0b 100644 --- a/src/AddIns/Misc/PackageManagement/PackageManagement.sln +++ b/src/AddIns/Misc/PackageManagement/PackageManagement.sln @@ -36,7 +36,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvalonEdit.AddIn", "..\..\D EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PackageManagement.PowerShell", "PowerShell\Project\PackageManagement.PowerShell.csproj", "{A406803B-C584-43A3-BCEE-A0BB3132CB5F}" EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "PackageManagement.EnvDTEHelpers", "EnvDTEHelpers\Project\PackageManagement.EnvDTEHelpers.vbproj", "{F7886FB7-3764-4574-B981-25EB164B532E}" +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "SharpDevelop.EnvDTE", "SharpDevelop.EnvDTE\SharpDevelop.EnvDTE.vbproj", "{6FB1260D-68A2-41A0-BB09-F5F710842E99}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -182,13 +182,13 @@ Global {AE4AB0FA-6087-4480-AF37-0FA1452B3DA1}.Debug|Any CPU.ActiveCfg = Debug|x86 {AE4AB0FA-6087-4480-AF37-0FA1452B3DA1}.Release|Any CPU.Build.0 = Release|x86 {AE4AB0FA-6087-4480-AF37-0FA1452B3DA1}.Release|Any CPU.ActiveCfg = Release|x86 - {F7886FB7-3764-4574-B981-25EB164B532E}.Debug|x86.Build.0 = Debug|Any CPU - {F7886FB7-3764-4574-B981-25EB164B532E}.Debug|x86.ActiveCfg = Debug|Any CPU - {F7886FB7-3764-4574-B981-25EB164B532E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F7886FB7-3764-4574-B981-25EB164B532E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F7886FB7-3764-4574-B981-25EB164B532E}.Release|x86.Build.0 = Release|Any CPU - {F7886FB7-3764-4574-B981-25EB164B532E}.Release|x86.ActiveCfg = Release|Any CPU - {F7886FB7-3764-4574-B981-25EB164B532E}.Release|Any CPU.Build.0 = Release|Any CPU - {F7886FB7-3764-4574-B981-25EB164B532E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6FB1260D-68A2-41A0-BB09-F5F710842E99}.Debug|x86.Build.0 = Debug|Any CPU + {6FB1260D-68A2-41A0-BB09-F5F710842E99}.Debug|x86.ActiveCfg = Debug|Any CPU + {6FB1260D-68A2-41A0-BB09-F5F710842E99}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6FB1260D-68A2-41A0-BB09-F5F710842E99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6FB1260D-68A2-41A0-BB09-F5F710842E99}.Release|x86.Build.0 = Release|Any CPU + {6FB1260D-68A2-41A0-BB09-F5F710842E99}.Release|x86.ActiveCfg = Release|Any CPU + {6FB1260D-68A2-41A0-BB09-F5F710842E99}.Release|Any CPU.Build.0 = Release|Any CPU + {6FB1260D-68A2-41A0-BB09-F5F710842E99}.Release|Any CPU.ActiveCfg = Release|Any CPU EndGlobalSection EndGlobal diff --git a/src/AddIns/Misc/PackageManagement/Project/PackageManagement.csproj b/src/AddIns/Misc/PackageManagement/Project/PackageManagement.csproj index 2775ed4766..5b05c822e9 100644 --- a/src/AddIns/Misc/PackageManagement/Project/PackageManagement.csproj +++ b/src/AddIns/Misc/PackageManagement/Project/PackageManagement.csproj @@ -91,7 +91,6 @@ - @@ -118,7 +117,6 @@ - @@ -145,16 +143,6 @@ - - - - - - - - - - @@ -466,9 +454,6 @@ - - - @@ -531,14 +516,15 @@ AvalonEdit.AddIn False - - {F7886FB7-3764-4574-B981-25EB164B532E} - PackageManagement.EnvDTEHelpers - {A406803B-C584-43A3-BCEE-A0BB3132CB5F} PackageManagement.PowerShell + + {6FB1260D-68A2-41A0-BB09-F5F710842E99} + SharpDevelop.EnvDTE + False + diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/ChildProjectItems.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/ChildProjectItems.cs index d1548b0569..842e0a4b7f 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/ChildProjectItems.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/ChildProjectItems.cs @@ -16,7 +16,7 @@ namespace ICSharpCode.PackageManagement.EnvDTE public ChildProjectItems(ProjectItem projectItem) { this.ProjectItem = projectItem; - this.Project = projectItem.ContainingProject; + this.Project = (Project)projectItem.ContainingProject; this.ProjectItems = new List(); } @@ -24,14 +24,14 @@ namespace ICSharpCode.PackageManagement.EnvDTE Project Project { get; set; } List ProjectItems { get; set; } - protected override IEnumerable GetProjectItems() + protected override IEnumerable GetProjectItems() { foreach (SD.ProjectItem msbuildProjectItem in Project.MSBuildProject.Items) { ProjectItem item = GetChildProjectItem(msbuildProjectItem); if (!IgnoreChildProjectItem(item)) { yield return item; } - } + } } ProjectItem GetChildProjectItem(SD.ProjectItem msbuildProjectItem) diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeAttribute.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeAttribute.cs index ab54ce3dcf..7afdfeaa50 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeAttribute.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeAttribute.cs @@ -7,7 +7,7 @@ using ICSharpCode.SharpDevelop.Dom; namespace ICSharpCode.PackageManagement.EnvDTE { - public class CodeAttribute : CodeElement + public class CodeAttribute : CodeElement, global::EnvDTE.CodeAttribute { IAttribute attribute; static readonly string AttributeEndName = "Attribute"; @@ -21,8 +21,8 @@ namespace ICSharpCode.PackageManagement.EnvDTE this.attribute = attribute; } - public override vsCMElement Kind { - get { return vsCMElement.vsCMElementAttribute; } + public override global::EnvDTE.vsCMElement Kind { + get { return global::EnvDTE.vsCMElement.vsCMElementAttribute; } } public override string Name { diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeAttribute2.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeAttribute2.cs index e6ff87b69f..6a67032bdb 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeAttribute2.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeAttribute2.cs @@ -6,7 +6,7 @@ using ICSharpCode.SharpDevelop.Dom; namespace ICSharpCode.PackageManagement.EnvDTE { - public class CodeAttribute2 : CodeAttribute + public class CodeAttribute2 : CodeAttribute, global::EnvDTE.CodeAttribute2 { IAttribute attribute; @@ -20,7 +20,7 @@ namespace ICSharpCode.PackageManagement.EnvDTE this.attribute = attribute; } - public virtual CodeElements Arguments { + public virtual global::EnvDTE.CodeElements Arguments { get { return new CodeAttributeArguments(attribute); } } } diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeAttributeArgument.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeAttributeArgument.cs index d848da261f..f673cdb3ba 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeAttributeArgument.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeAttributeArgument.cs @@ -5,7 +5,7 @@ using System; namespace ICSharpCode.PackageManagement.EnvDTE { - public class CodeAttributeArgument : CodeElement + public class CodeAttributeArgument : CodeElement, global::EnvDTE.CodeAttributeArgument { string name; string value; diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeClass.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeClass.cs index 9b59155337..ce883d72b8 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeClass.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeClass.cs @@ -6,7 +6,7 @@ using ICSharpCode.SharpDevelop.Dom; namespace ICSharpCode.PackageManagement.EnvDTE { - public class CodeClass : CodeType + public class CodeClass : CodeType, global::EnvDTE.CodeClass { public CodeClass(IProjectContent projectContent, IClass c) : base(projectContent, c) @@ -17,15 +17,15 @@ namespace ICSharpCode.PackageManagement.EnvDTE { } - public override vsCMElement Kind { - get { return vsCMElement.vsCMElementClass; } + public override global::EnvDTE.vsCMElement Kind { + get { return global::EnvDTE.vsCMElement.vsCMElementClass; } } - public virtual CodeElements ImplementedInterfaces { + public virtual global::EnvDTE.CodeElements ImplementedInterfaces { get { return new ImplementedInterfacesOnClass(ProjectContent, Class); } } - public virtual CodeVariable AddVariable(string name, object type, object Position = null, vsCMAccess Access = vsCMAccess.vsCMAccessPublic, object Location = null) + public virtual global::EnvDTE.CodeVariable AddVariable(string name, object type, object Position = null, global::EnvDTE.vsCMAccess Access = global::EnvDTE.vsCMAccess.vsCMAccessPublic, object Location = null) { var codeGenerator = new ClassCodeGenerator(Class); return codeGenerator.AddPublicVariable(name, (string)type); diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeClass2.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeClass2.cs index db0a41464c..afc479042c 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeClass2.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeClass2.cs @@ -6,7 +6,7 @@ using ICSharpCode.SharpDevelop.Dom; namespace ICSharpCode.PackageManagement.EnvDTE { - public class CodeClass2 : CodeClass + public class CodeClass2 : CodeClass, global::EnvDTE.CodeClass2 { IClassKindUpdater classKindUpdater; @@ -21,7 +21,7 @@ namespace ICSharpCode.PackageManagement.EnvDTE { } - public CodeElements PartialClasses { + public global::EnvDTE.CodeElements PartialClasses { get { return new PartialClasses(this); } } @@ -35,15 +35,15 @@ namespace ICSharpCode.PackageManagement.EnvDTE get { return Class.DotNetName.Contains("`"); } } - public vsCMClassKind ClassKind { + public global::EnvDTE.vsCMClassKind ClassKind { get { if (Class.IsPartial) { - return vsCMClassKind.vsCMClassKindPartialClass; + return global::EnvDTE.vsCMClassKind.vsCMClassKindPartialClass; } - return vsCMClassKind.vsCMClassKindMainClass; + return global::EnvDTE.vsCMClassKind.vsCMClassKindMainClass; } set { - if (value == vsCMClassKind.vsCMClassKindPartialClass) { + if (value == global::EnvDTE.vsCMClassKind.vsCMClassKindPartialClass) { classKindUpdater.MakeClassPartial(); } else { throw new NotImplementedException(); diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeDelegate.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeDelegate.cs index 5b82bbb7df..2776009ec1 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeDelegate.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeDelegate.cs @@ -6,7 +6,7 @@ using ICSharpCode.SharpDevelop.Dom; namespace ICSharpCode.PackageManagement.EnvDTE { - public class CodeDelegate : CodeType + public class CodeDelegate : CodeType, global::EnvDTE.CodeDelegate { public CodeDelegate(IProjectContent projectContent, IClass c) : base(projectContent, c) @@ -17,8 +17,8 @@ namespace ICSharpCode.PackageManagement.EnvDTE { } - public override vsCMElement Kind { - get { return vsCMElement.vsCMElementDelegate; } + public override global::EnvDTE.vsCMElement Kind { + get { return global::EnvDTE.vsCMElement.vsCMElementDelegate; } } } } diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeElement.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeElement.cs index 41e3a9b599..f65e420952 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeElement.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeElement.cs @@ -7,10 +7,10 @@ using ICSharpCode.SharpDevelop.Project; namespace ICSharpCode.PackageManagement.EnvDTE { - public class CodeElement : MarshalByRefObject + public class CodeElement : MarshalByRefObject, global::EnvDTE.CodeElement { DTE dte; - + public CodeElement() { } @@ -47,19 +47,19 @@ namespace ICSharpCode.PackageManagement.EnvDTE public virtual string Language { get; protected set; } // default is vsCMPart.vsCMPartWholeWithAttributes - public virtual TextPoint GetStartPoint() + public virtual global::EnvDTE.TextPoint GetStartPoint() { return null; } - public virtual TextPoint GetEndPoint() + public virtual global::EnvDTE.TextPoint GetEndPoint() { return null; } - public virtual vsCMInfoLocation InfoLocation { get; protected set; } + public virtual global::EnvDTE.vsCMInfoLocation InfoLocation { get; protected set; } - public virtual DTE DTE { + public virtual global::EnvDTE.DTE DTE { get { if (dte == null) { dte = new DTE(); @@ -68,16 +68,16 @@ namespace ICSharpCode.PackageManagement.EnvDTE } } - protected vsCMAccess GetAccess() + protected global::EnvDTE.vsCMAccess GetAccess() { if (Entity.IsPublic) { - return vsCMAccess.vsCMAccessPublic; + return global::EnvDTE.vsCMAccess.vsCMAccessPublic; } - return vsCMAccess.vsCMAccessPrivate; + return global::EnvDTE.vsCMAccess.vsCMAccessPrivate; } - public virtual vsCMElement Kind { - get { return vsCMElement.vsCMElementOther; } + public virtual global::EnvDTE.vsCMElement Kind { + get { return global::EnvDTE.vsCMElement.vsCMElementOther; } } } } diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeElements.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeElements.cs deleted file mode 100644 index 6f51e8b134..0000000000 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeElements.cs +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.Collections; - -namespace ICSharpCode.PackageManagement.EnvDTE -{ - public interface CodeElements : IEnumerable - { - new IEnumerator GetEnumerator(); - - int Count { get; } - - CodeElement Item(object index); - } -} diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeElementsList.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeElementsList.cs index 57cd1926b7..37224dd41e 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeElementsList.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeElementsList.cs @@ -8,7 +8,7 @@ using System.Linq; namespace ICSharpCode.PackageManagement.EnvDTE { - public class CodeElementsList : MarshalByRefObject, CodeElements + public class CodeElementsList : MarshalByRefObject, global::EnvDTE.CodeElements { List elements = new List(); @@ -30,7 +30,7 @@ namespace ICSharpCode.PackageManagement.EnvDTE return elements.GetEnumerator(); } - public CodeElement Item(object index) + public global::EnvDTE.CodeElement Item(object index) { if (index is int) { return Item((int)index); @@ -38,12 +38,12 @@ namespace ICSharpCode.PackageManagement.EnvDTE return Item((string)index); } - CodeElement Item(int index) + global::EnvDTE.CodeElement Item(int index) { return elements[index - 1]; } - CodeElement Item(string name) + global::EnvDTE.CodeElement Item(string name) { return elements.Single(item => item.Name == name); } diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeFunction.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeFunction.cs index b1afbed8d1..7a2c4404c7 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeFunction.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeFunction.cs @@ -6,7 +6,7 @@ using ICSharpCode.SharpDevelop.Dom; namespace ICSharpCode.PackageManagement.EnvDTE { - public class CodeFunction : CodeElement + public class CodeFunction : CodeElement, global::EnvDTE.CodeFunction { IDocumentLoader documentLoader; IVirtualMethodUpdater methodUpdater; @@ -35,34 +35,34 @@ namespace ICSharpCode.PackageManagement.EnvDTE protected IMethodOrProperty Method { get; private set; } - public override vsCMElement Kind { - get { return vsCMElement.vsCMElementFunction; } + public override global::EnvDTE.vsCMElement Kind { + get { return global::EnvDTE.vsCMElement.vsCMElementFunction; } } - public virtual vsCMAccess Access { + public virtual global::EnvDTE.vsCMAccess Access { get { return GetAccess(); } set { } } - public override TextPoint GetStartPoint() + public override global::EnvDTE.TextPoint GetStartPoint() { return new TextPoint(Method.GetStartPosition(), documentLoader); } - public override TextPoint GetEndPoint() + public override global::EnvDTE.TextPoint GetEndPoint() { return new TextPoint(Method.GetEndPosition(), documentLoader); } - public virtual CodeElements Parameters { + public virtual global::EnvDTE.CodeElements Parameters { get { return new CodeParameters(Method.ProjectContent, Method.Parameters); } } - public virtual CodeTypeRef2 Type { + public virtual global::EnvDTE.CodeTypeRef2 Type { get { return new CodeTypeRef2(Method.ProjectContent, this, Method.ReturnType); } } - public virtual CodeElements Attributes { + public virtual global::EnvDTE.CodeElements Attributes { get { return new CodeAttributes(Method); } } @@ -75,16 +75,16 @@ namespace ICSharpCode.PackageManagement.EnvDTE } } - public virtual vsCMFunction FunctionKind { + public virtual global::EnvDTE.vsCMFunction FunctionKind { get { return GetFunctionKind(); } } - vsCMFunction GetFunctionKind() + global::EnvDTE.vsCMFunction GetFunctionKind() { if (Method.IsConstructor()) { - return vsCMFunction.vsCMFunctionConstructor; + return global::EnvDTE.vsCMFunction.vsCMFunctionConstructor; } - return vsCMFunction.vsCMFunctionFunction; + return global::EnvDTE.vsCMFunction.vsCMFunctionFunction; } public virtual bool IsShared { diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeFunction2.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeFunction2.cs index 6b7cf2f682..2e8cf86a4d 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeFunction2.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeFunction2.cs @@ -6,7 +6,7 @@ using ICSharpCode.SharpDevelop.Dom; namespace ICSharpCode.PackageManagement.EnvDTE { - public class CodeFunction2 : CodeFunction + public class CodeFunction2 : CodeFunction, global::EnvDTE.CodeFunction2 { public CodeFunction2(IMethod method) : base(method) @@ -17,24 +17,24 @@ namespace ICSharpCode.PackageManagement.EnvDTE get { return Method.HasTypeParameters(); } } - public virtual vsCMOverrideKind OverrideKind { + public virtual global::EnvDTE.vsCMOverrideKind OverrideKind { get { return GetOverrideKind(); } } - vsCMOverrideKind GetOverrideKind() + global::EnvDTE.vsCMOverrideKind GetOverrideKind() { if (Method.IsAbstract) { - return vsCMOverrideKind.vsCMOverrideKindAbstract; + return global::EnvDTE.vsCMOverrideKind.vsCMOverrideKindAbstract; } else if (Method.IsVirtual) { - return vsCMOverrideKind.vsCMOverrideKindVirtual; + return global::EnvDTE.vsCMOverrideKind.vsCMOverrideKindVirtual; } else if (Method.IsOverride) { - return vsCMOverrideKind.vsCMOverrideKindOverride; + return global::EnvDTE.vsCMOverrideKind.vsCMOverrideKindOverride; } else if (Method.IsSealed) { - return vsCMOverrideKind.vsCMOverrideKindSealed; + return global::EnvDTE.vsCMOverrideKind.vsCMOverrideKindSealed; } else if (Method.IsNew) { - return vsCMOverrideKind.vsCMOverrideKindNew; + return global::EnvDTE.vsCMOverrideKind.vsCMOverrideKindNew; } - return vsCMOverrideKind.vsCMOverrideKindNone; + return global::EnvDTE.vsCMOverrideKind.vsCMOverrideKindNone; } } } diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeGetterOrSetterFunction.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeGetterOrSetterFunction.cs index f23ae2c603..b73b1306ca 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeGetterOrSetterFunction.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeGetterOrSetterFunction.cs @@ -16,12 +16,12 @@ namespace ICSharpCode.PackageManagement.EnvDTE this.modifier = modifier; } - public override vsCMAccess Access { + public override global::EnvDTE.vsCMAccess Access { get { if (modifier == ModifierEnum.None) { return base.Access; } - return vsCMAccess.vsCMAccessPrivate; + return global::EnvDTE.vsCMAccess.vsCMAccessPrivate; } set { } } diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeImport.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeImport.cs index 662aa9d63f..ec93aaf0bd 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeImport.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeImport.cs @@ -7,7 +7,7 @@ using ICSharpCode.SharpDevelop.Dom; namespace ICSharpCode.PackageManagement.EnvDTE { - public class CodeImport : CodeElement + public class CodeImport : CodeElement, global::EnvDTE.CodeImport { IUsing import; @@ -33,8 +33,8 @@ namespace ICSharpCode.PackageManagement.EnvDTE public string Namespace { get; private set; } - public override vsCMElement Kind { - get { return vsCMElement.vsCMElementImportStmt; } + public override global::EnvDTE.vsCMElement Kind { + get { return global::EnvDTE.vsCMElement.vsCMElementImportStmt; } } } } diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeInterface.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeInterface.cs index 1331663668..4536904b94 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeInterface.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeInterface.cs @@ -6,7 +6,7 @@ using ICSharpCode.SharpDevelop.Dom; namespace ICSharpCode.PackageManagement.EnvDTE { - public class CodeInterface : CodeType + public class CodeInterface : CodeType, global::EnvDTE.CodeInterface { string fullName; @@ -22,8 +22,8 @@ namespace ICSharpCode.PackageManagement.EnvDTE fullName = type.GetFullName(); } - public override vsCMElement Kind { - get { return vsCMElement.vsCMElementInterface; } + public override global::EnvDTE.vsCMElement Kind { + get { return global::EnvDTE.vsCMElement.vsCMElementInterface; } } /// @@ -38,7 +38,7 @@ namespace ICSharpCode.PackageManagement.EnvDTE return null; } - public CodeFunction AddFunction(string name, vsCMFunction kind, object type, object Position = null, vsCMAccess Access = vsCMAccess.vsCMAccessPublic) + public global::EnvDTE.CodeFunction AddFunction(string name, global::EnvDTE.vsCMFunction kind, object type, object Position = null, global::EnvDTE.vsCMAccess Access = global::EnvDTE.vsCMAccess.vsCMAccessPublic) { var codeGenerator = new ClassCodeGenerator(Class); return codeGenerator.AddPublicMethod(name, (string)type); diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeModel.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeModel.cs index 42b4994a4b..b704917798 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeModel.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeModel.cs @@ -6,7 +6,7 @@ using ICSharpCode.SharpDevelop.Dom; namespace ICSharpCode.PackageManagement.EnvDTE { - public class CodeModel : MarshalByRefObject + public class CodeModel : MarshalByRefObject, global::EnvDTE.CodeModel { IProjectContent projectContent; CodeElementsInNamespace codeElements; @@ -16,7 +16,7 @@ namespace ICSharpCode.PackageManagement.EnvDTE this.projectContent = projectContent; } - public CodeElements CodeElements { + public global::EnvDTE.CodeElements CodeElements { get { if (codeElements == null) { codeElements = new CodeElementsInNamespace(projectContent, String.Empty); @@ -25,7 +25,7 @@ namespace ICSharpCode.PackageManagement.EnvDTE } } - public CodeType CodeTypeFromFullName(string name) + public global::EnvDTE.CodeType CodeTypeFromFullName(string name) { IClass matchedClass = projectContent.GetClass(name, 0); if (matchedClass != null) { diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeNamespace.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeNamespace.cs index a5b323dff9..f7de2ae4a8 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeNamespace.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeNamespace.cs @@ -6,7 +6,7 @@ using ICSharpCode.SharpDevelop.Dom; namespace ICSharpCode.PackageManagement.EnvDTE { - public class CodeNamespace : CodeElement + public class CodeNamespace : CodeElement, global::EnvDTE.CodeNamespace { NamespaceName namespaceName; IProjectContent projectContent; @@ -20,12 +20,12 @@ namespace ICSharpCode.PackageManagement.EnvDTE { this.projectContent = projectContent; this.namespaceName = namespaceName; - this.InfoLocation = vsCMInfoLocation.vsCMInfoLocationExternal; + this.InfoLocation = global::EnvDTE.vsCMInfoLocation.vsCMInfoLocationExternal; this.Language = GetLanguage(projectContent); } - public override vsCMElement Kind { - get { return vsCMElement.vsCMElementNamespace; } + public override global::EnvDTE.vsCMElement Kind { + get { return global::EnvDTE.vsCMElement.vsCMElementNamespace; } } internal NamespaceName NamespaceName { @@ -40,7 +40,7 @@ namespace ICSharpCode.PackageManagement.EnvDTE get { return namespaceName.LastPart; } } - public virtual CodeElements Members { + public virtual global::EnvDTE.CodeElements Members { get { return new CodeElementsInNamespace(projectContent, namespaceName); } } } diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeParameter.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeParameter.cs index a8c16b5ad4..8e8d446dfd 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeParameter.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeParameter.cs @@ -6,7 +6,7 @@ using ICSharpCode.SharpDevelop.Dom; namespace ICSharpCode.PackageManagement.EnvDTE { - public class CodeParameter : CodeElement + public class CodeParameter : CodeElement, global::EnvDTE.CodeParameter { IProjectContent projectContent; @@ -18,19 +18,19 @@ namespace ICSharpCode.PackageManagement.EnvDTE protected IParameter Parameter { get; private set; } - public override vsCMElement Kind { - get { return vsCMElement.vsCMElementParameter; } + public override global::EnvDTE.vsCMElement Kind { + get { return global::EnvDTE.vsCMElement.vsCMElementParameter; } } public override string Name { get { return Parameter.Name; } } - public virtual CodeTypeRef2 Type { + public virtual global::EnvDTE.CodeTypeRef2 Type { get { return new CodeTypeRef2(projectContent, this, Parameter.ReturnType); } } - public virtual CodeElements Attributes { + public virtual global::EnvDTE.CodeElements Attributes { get { return new CodeAttributes(Parameter); } } } diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeParameter2.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeParameter2.cs index 40b78f73ec..a423f01740 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeParameter2.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeParameter2.cs @@ -6,31 +6,31 @@ using ICSharpCode.SharpDevelop.Dom; namespace ICSharpCode.PackageManagement.EnvDTE { - public class CodeParameter2 : CodeParameter + public class CodeParameter2 : CodeParameter, global::EnvDTE.CodeParameter2 { public CodeParameter2(IProjectContent projectContent, IParameter parameter) : base(projectContent, parameter) { } - public virtual vsCMParameterKind ParameterKind { + public virtual global::EnvDTE.vsCMParameterKind ParameterKind { get { return GetParameterKind(); } } - vsCMParameterKind GetParameterKind() + global::EnvDTE.vsCMParameterKind GetParameterKind() { if (Parameter.IsOptional) { - return vsCMParameterKind.vsCMParameterKindOptional; + return global::EnvDTE.vsCMParameterKind.vsCMParameterKindOptional; } else if (Parameter.IsOut) { - return vsCMParameterKind.vsCMParameterKindOut; + return global::EnvDTE.vsCMParameterKind.vsCMParameterKindOut; } else if (Parameter.IsRef) { - return vsCMParameterKind.vsCMParameterKindRef; + return global::EnvDTE.vsCMParameterKind.vsCMParameterKindRef; } else if (Parameter.IsParams) { - return vsCMParameterKind.vsCMParameterKindParamArray; + return global::EnvDTE.vsCMParameterKind.vsCMParameterKindParamArray; } else if (Parameter.IsIn()) { - return vsCMParameterKind.vsCMParameterKindIn; + return global::EnvDTE.vsCMParameterKind.vsCMParameterKindIn; } - return vsCMParameterKind.vsCMParameterKindNone; + return global::EnvDTE.vsCMParameterKind.vsCMParameterKindNone; } } } diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeProperty.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeProperty.cs index 899532c110..edf4a39bcc 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeProperty.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeProperty.cs @@ -6,7 +6,7 @@ using ICSharpCode.SharpDevelop.Dom; namespace ICSharpCode.PackageManagement.EnvDTE { - public class CodeProperty : CodeElement + public class CodeProperty : CodeElement, global::EnvDTE.CodeProperty { public CodeProperty() { @@ -20,28 +20,28 @@ namespace ICSharpCode.PackageManagement.EnvDTE protected IProperty Property { get; private set; } - public override vsCMElement Kind { - get { return vsCMElement.vsCMElementProperty; } + public override global::EnvDTE.vsCMElement Kind { + get { return global::EnvDTE.vsCMElement.vsCMElementProperty; } } - public virtual vsCMAccess Access { + public virtual global::EnvDTE.vsCMAccess Access { get { return GetAccess(); } set { } } - public virtual CodeClass Parent { + public virtual global::EnvDTE.CodeClass Parent { get { return new CodeClass(Property.ProjectContent, Property.DeclaringType); } } - public virtual CodeElements Attributes { + public virtual global::EnvDTE.CodeElements Attributes { get { return new CodeAttributes(Property); } } - public virtual CodeTypeRef Type { + public virtual global::EnvDTE.CodeTypeRef Type { get { return new CodeTypeRef2(Property.ProjectContent, this, Property.ReturnType); } } - public virtual CodeFunction Getter { + public virtual global::EnvDTE.CodeFunction Getter { get { return GetGetter(); } } @@ -53,7 +53,7 @@ namespace ICSharpCode.PackageManagement.EnvDTE return null; } - public virtual CodeFunction Setter { + public virtual global::EnvDTE.CodeFunction Setter { get { return GetSetter(); } } diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeProperty2.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeProperty2.cs index 30b4d41513..fc37a54d71 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeProperty2.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeProperty2.cs @@ -6,7 +6,7 @@ using ICSharpCode.SharpDevelop.Dom; namespace ICSharpCode.PackageManagement.EnvDTE { - public class CodeProperty2 : CodeProperty + public class CodeProperty2 : CodeProperty, global::EnvDTE.CodeProperty2 { public CodeProperty2() { @@ -17,21 +17,21 @@ namespace ICSharpCode.PackageManagement.EnvDTE { } - public vsCMPropertyKind ReadWrite { + public global::EnvDTE.vsCMPropertyKind ReadWrite { get { return GetPropertyKind(); } } - vsCMPropertyKind GetPropertyKind() + global::EnvDTE.vsCMPropertyKind GetPropertyKind() { if (Property.CanSet && Property.CanGet) { - return vsCMPropertyKind.vsCMPropertyKindReadWrite; + return global::EnvDTE.vsCMPropertyKind.vsCMPropertyKindReadWrite; } else if (Property.CanSet) { - return vsCMPropertyKind.vsCMPropertyKindWriteOnly; + return global::EnvDTE.vsCMPropertyKind.vsCMPropertyKindWriteOnly; } - return vsCMPropertyKind.vsCMPropertyKindReadOnly; + return global::EnvDTE.vsCMPropertyKind.vsCMPropertyKindReadOnly; } - public CodeElements Parameters { + public global::EnvDTE.CodeElements Parameters { get { return new CodeParameters(null, Property.Parameters); } } } diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeStruct.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeStruct.cs index 741a078a9f..ec55400f8e 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeStruct.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeStruct.cs @@ -6,7 +6,7 @@ using ICSharpCode.SharpDevelop.Dom; namespace ICSharpCode.PackageManagement.EnvDTE { - public class CodeStruct : CodeType + public class CodeStruct : CodeType, global::EnvDTE.CodeStruct { public CodeStruct() { @@ -17,8 +17,8 @@ namespace ICSharpCode.PackageManagement.EnvDTE { } - public override vsCMElement Kind { - get { return vsCMElement.vsCMElementStruct; } + public override global::EnvDTE.vsCMElement Kind { + get { return global::EnvDTE.vsCMElement.vsCMElementStruct; } } } } diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeType.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeType.cs index 25b9df8a8b..d7433c1690 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeType.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeType.cs @@ -8,7 +8,7 @@ using ICSharpCode.SharpDevelop.Project; namespace ICSharpCode.PackageManagement.EnvDTE { - public class CodeType : CodeElement + public class CodeType : CodeElement, global::EnvDTE.CodeType { CodeTypeMembers members; @@ -25,12 +25,12 @@ namespace ICSharpCode.PackageManagement.EnvDTE InfoLocation = GetInfoLocation(projectContent, c); } - vsCMInfoLocation GetInfoLocation(IProjectContent projectContent, IClass c) + global::EnvDTE.vsCMInfoLocation GetInfoLocation(IProjectContent projectContent, IClass c) { if (projectContent.Project == c.ProjectContent.Project) { - return vsCMInfoLocation.vsCMInfoLocationProject; + return global::EnvDTE.vsCMInfoLocation.vsCMInfoLocationProject; } - return vsCMInfoLocation.vsCMInfoLocationExternal; + return global::EnvDTE.vsCMInfoLocation.vsCMInfoLocationExternal; } public CodeType() @@ -40,7 +40,7 @@ namespace ICSharpCode.PackageManagement.EnvDTE protected IClass Class { get; private set; } protected IProjectContent ProjectContent { get; private set; } - public virtual vsCMAccess Access { + public virtual global::EnvDTE.vsCMAccess Access { get { return GetAccess(); } set { } } @@ -49,7 +49,7 @@ namespace ICSharpCode.PackageManagement.EnvDTE get { return Class.FullyQualifiedName; } } - public virtual CodeElements Members { + public virtual global::EnvDTE.CodeElements Members { get { if (members == null) { members = new CodeTypeMembers(ProjectContent, Class); @@ -58,19 +58,19 @@ namespace ICSharpCode.PackageManagement.EnvDTE } } - public virtual CodeElements Bases { + public virtual global::EnvDTE.CodeElements Bases { get { return new CodeTypeBaseTypes(ProjectContent, Class); } } - public virtual CodeElements Attributes { + public virtual global::EnvDTE.CodeElements Attributes { get { return new CodeAttributes(Class); } } - public virtual CodeNamespace Namespace { + public virtual global::EnvDTE.CodeNamespace Namespace { get { return new FileCodeModelCodeNamespace(ProjectContent, Class.Namespace); } } - public virtual ProjectItem ProjectItem { + public virtual global::EnvDTE.ProjectItem ProjectItem { get { if (ProjectContent.Project != null) { return new ProjectItem(ProjectContent, Class); diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeTypeRef.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeTypeRef.cs index 6c1aa2b600..cec687d923 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeTypeRef.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeTypeRef.cs @@ -6,7 +6,7 @@ using ICSharpCode.SharpDevelop.Dom; namespace ICSharpCode.PackageManagement.EnvDTE { - public class CodeTypeRef : MarshalByRefObject + public class CodeTypeRef : MarshalByRefObject, global::EnvDTE.CodeTypeRef { IProjectContent projectContent; CodeElement parent; @@ -37,15 +37,15 @@ namespace ICSharpCode.PackageManagement.EnvDTE } } - public virtual CodeElement Parent { + public virtual global::EnvDTE.CodeElement Parent { get { return parent; } } - public virtual CodeType CodeType { + public virtual global::EnvDTE.CodeType CodeType { get { return new CodeClass2(projectContent, ReturnType.GetUnderlyingClass()); } } - public virtual vsCMTypeRef TypeKind { + public virtual global::EnvDTE.vsCMTypeRef TypeKind { get { return ReturnType.GetTypeKind(); } } } diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeTypeRef2.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeTypeRef2.cs index e8f603f183..d159f10c6b 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeTypeRef2.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeTypeRef2.cs @@ -6,7 +6,7 @@ using ICSharpCode.SharpDevelop.Dom; namespace ICSharpCode.PackageManagement.EnvDTE { - public class CodeTypeRef2 : CodeTypeRef + public class CodeTypeRef2 : CodeTypeRef, global::EnvDTE.CodeTypeRef2 { public CodeTypeRef2(IProjectContent projectContent, CodeElement parent, IReturnType returnType) : base(projectContent, parent, returnType) diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeVariable.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeVariable.cs index 8c94cc9507..291e52de11 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeVariable.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeVariable.cs @@ -6,7 +6,7 @@ using ICSharpCode.SharpDevelop.Dom; namespace ICSharpCode.PackageManagement.EnvDTE { - public class CodeVariable : CodeElement + public class CodeVariable : CodeElement, global::EnvDTE.CodeVariable { IField field; IDocumentLoader documentLoader; @@ -27,21 +27,21 @@ namespace ICSharpCode.PackageManagement.EnvDTE this.documentLoader = documentLoader; } - public override vsCMElement Kind { - get { return vsCMElement.vsCMElementVariable; } + public override global::EnvDTE.vsCMElement Kind { + get { return global::EnvDTE.vsCMElement.vsCMElementVariable; } } - public vsCMAccess Access { + public global::EnvDTE.vsCMAccess Access { get { return GetAccess(); } set { } } - public override TextPoint GetStartPoint() + public override global::EnvDTE.TextPoint GetStartPoint() { return new TextPoint(field.GetStartPosition(), documentLoader); } - public override TextPoint GetEndPoint() + public override global::EnvDTE.TextPoint GetEndPoint() { return new TextPoint(field.GetEndPosition(), documentLoader); } diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/ColorableItems.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/ColorableItems.cs index 43344550be..85b4ae6b2c 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/ColorableItems.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/ColorableItems.cs @@ -8,7 +8,7 @@ using ICSharpCode.AvalonEdit.AddIn; namespace ICSharpCode.PackageManagement.EnvDTE { - public class ColorableItems : MarshalByRefObject + public class ColorableItems : MarshalByRefObject, global::EnvDTE.ColorableItems { public static readonly Wpf.Color DefaultForegroundColor = System.Windows.SystemColors.WindowTextColor; public static readonly Wpf.Color DefaultBackgroundColor = System.Windows.SystemColors.WindowColor; diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/Configuration.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/Configuration.cs index ada8d24a7b..12afb67242 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/Configuration.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/Configuration.cs @@ -5,7 +5,7 @@ using System; namespace ICSharpCode.PackageManagement.EnvDTE { - public class Configuration : MarshalByRefObject + public class Configuration : MarshalByRefObject, global::EnvDTE.Configuration { Project project; @@ -14,7 +14,7 @@ namespace ICSharpCode.PackageManagement.EnvDTE this.project = project; } - public Properties Properties { + public global::EnvDTE.Properties Properties { get { return project.Properties; } } } diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/ConfigurationManager.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/ConfigurationManager.cs index 78317fc3f5..967e88b994 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/ConfigurationManager.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/ConfigurationManager.cs @@ -5,7 +5,7 @@ using System; namespace ICSharpCode.PackageManagement.EnvDTE { - public class ConfigurationManager : MarshalByRefObject + public class ConfigurationManager : MarshalByRefObject, global::EnvDTE.ConfigurationManager { Configuration activeConfiguration; @@ -14,7 +14,7 @@ namespace ICSharpCode.PackageManagement.EnvDTE activeConfiguration = new Configuration(project); } - public Configuration ActiveConfiguration { + public global::EnvDTE.Configuration ActiveConfiguration { get { return activeConfiguration; } } } diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/Constants.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/Constants.cs deleted file mode 100644 index 7e7c8164db..0000000000 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/Constants.cs +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; - -namespace ICSharpCode.PackageManagement.EnvDTE -{ - public static class Constants - { - public static readonly string vsProjectItemKindPhysicalFile = "{6BB5F8EE-4483-11D3-8BCF-00C04F8EC28C}"; - public static readonly string vsProjectItemKindPhysicalFolder = "{6BB5F8EF-4483-11D3-8BCF-00C04F8EC28C}"; - public static readonly string vsViewKindCode = "{7651A701-06E5-11D1-8EBD-00A0C90F26EA}"; - } -} diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/DTE.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/DTE.cs index d9c165e856..0176cbecc6 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/DTE.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/DTE.cs @@ -9,7 +9,7 @@ using SD = ICSharpCode.SharpDevelop.Project; namespace ICSharpCode.PackageManagement.EnvDTE { - public class DTE : MarshalByRefObject + public class DTE : MarshalByRefObject, global::EnvDTE.DTE { IPackageManagementProjectService projectService; IPackageManagementFileService fileService; @@ -34,7 +34,7 @@ namespace ICSharpCode.PackageManagement.EnvDTE get { return "10.0"; } } - public Solution Solution { + public global::EnvDTE.Solution Solution { get { if (IsSolutionOpen) { CreateSolution(); @@ -63,9 +63,9 @@ namespace ICSharpCode.PackageManagement.EnvDTE return false; } - public ItemOperations ItemOperations { get; private set; } + public global::EnvDTE.ItemOperations ItemOperations { get; private set; } - public Properties Properties(string category, string page) + public global::EnvDTE.Properties Properties(string category, string page) { var properties = new DTEProperties(); return properties.GetProperties(category, page); @@ -74,13 +74,13 @@ namespace ICSharpCode.PackageManagement.EnvDTE public object ActiveSolutionProjects { get { if (IsSolutionOpen) { - return Solution.Projects.ToArray(); + return Solution.Projects.OfType().ToArray(); } return new Project[0]; } } - public SourceControl SourceControl { + public global::EnvDTE.SourceControl SourceControl { get { return null; } } } diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/DirectoryProjectItems.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/DirectoryProjectItems.cs index 1569024717..185e9b5b9b 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/DirectoryProjectItems.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/DirectoryProjectItems.cs @@ -12,12 +12,12 @@ namespace ICSharpCode.PackageManagement.EnvDTE ProjectItem projectItem; public DirectoryProjectItems(ProjectItem projectItem) - : base(projectItem.ContainingProject, projectItem, new PackageManagementFileService()) + : base((Project)projectItem.ContainingProject, projectItem, new PackageManagementFileService()) { this.projectItem = projectItem; } - protected override IEnumerable GetProjectItems() + protected override IEnumerable GetProjectItems() { return new ChildProjectItems(projectItem); } diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/Document.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/Document.cs index 542e116a5a..fe846c0e4b 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/Document.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/Document.cs @@ -6,7 +6,7 @@ using ICSharpCode.SharpDevelop.Gui; namespace ICSharpCode.PackageManagement.EnvDTE { - public class Document : MarshalByRefObject + public class Document : MarshalByRefObject, global::EnvDTE.Document { IViewContent view; diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/EditPoint.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/EditPoint.cs index 74c7f069b7..e974b654e1 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/EditPoint.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/EditPoint.cs @@ -7,7 +7,7 @@ using ICSharpCode.SharpDevelop.Dom.Refactoring; namespace ICSharpCode.PackageManagement.EnvDTE { - public class EditPoint : TextPoint + public class EditPoint : TextPoint, global::EnvDTE.EditPoint { IRefactoringDocument document; IRefactoringDocumentView documentView; @@ -19,10 +19,10 @@ namespace ICSharpCode.PackageManagement.EnvDTE public void ReplaceText(object pointOrCount, string text, int flags) { - ReplaceText((TextPoint)pointOrCount, text, (vsEPReplaceTextOptions)flags); + ReplaceText((TextPoint)pointOrCount, text, (global::EnvDTE.vsEPReplaceTextOptions)flags); } - void ReplaceText(TextPoint endPoint, string text, vsEPReplaceTextOptions textFormatOptions) + void ReplaceText(TextPoint endPoint, string text, global::EnvDTE.vsEPReplaceTextOptions textFormatOptions) { OpenDocument(); int offset = GetStartOffset(); diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/EnumerableProjectItems.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/EnumerableProjectItems.cs index 7bef56ffef..4ac135a033 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/EnumerableProjectItems.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/EnumerableProjectItems.cs @@ -8,7 +8,7 @@ using System.Linq; namespace ICSharpCode.PackageManagement.EnvDTE { - public abstract class EnumerableProjectItems : MarshalByRefObject, IEnumerable + public abstract class EnumerableProjectItems : MarshalByRefObject, IEnumerable { public EnumerableProjectItems() { @@ -19,12 +19,12 @@ namespace ICSharpCode.PackageManagement.EnvDTE return GetEnumerator(); } - public IEnumerator GetEnumerator() + public IEnumerator GetEnumerator() { return GetProjectItems().ToList().GetEnumerator(); } - protected abstract IEnumerable GetProjectItems(); + protected abstract IEnumerable GetProjectItems(); internal virtual int Count { get { return GetProjectItems().Count(); } diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/FileCodeModel2.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/FileCodeModel2.cs index f0cb71267d..eb90728f79 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/FileCodeModel2.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/FileCodeModel2.cs @@ -7,7 +7,7 @@ using ICSharpCode.SharpDevelop.Project; namespace ICSharpCode.PackageManagement.EnvDTE { - public class FileCodeModel2 : MarshalByRefObject + public class FileCodeModel2 : MarshalByRefObject, global::EnvDTE.FileCodeModel2 { Project project; FileProjectItem projectItem; @@ -28,7 +28,7 @@ namespace ICSharpCode.PackageManagement.EnvDTE this.namespaceCreator = namespaceCreator; } - public CodeElements CodeElements { + public global::EnvDTE.CodeElements CodeElements { get { return new FileCodeModelCodeElements(GetCompilationUnit()); } } diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/FileCodeModelCodeNamespace.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/FileCodeModelCodeNamespace.cs index 12fb129859..9978b6e81c 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/FileCodeModelCodeNamespace.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/FileCodeModelCodeNamespace.cs @@ -26,7 +26,7 @@ namespace ICSharpCode.PackageManagement.EnvDTE get { return base.FullName; } } - public override CodeElements Members { + public override global::EnvDTE.CodeElements Members { get { return members; } } diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/FileProjectItems.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/FileProjectItems.cs index 523a352117..6d4cb1136e 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/FileProjectItems.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/FileProjectItems.cs @@ -25,13 +25,13 @@ namespace ICSharpCode.PackageManagement.EnvDTE } public FileProjectItems(ProjectItem projectItem, IPackageManagementFileService fileService) - : base(projectItem.ContainingProject, projectItem, fileService) + : base((Project)projectItem.ContainingProject, projectItem, fileService) { this.projectItem = projectItem; this.fileService = fileService; } - protected override IEnumerable GetProjectItems() + protected override IEnumerable GetProjectItems() { return GetChildDependentProjectItems().ToList(); } diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/FontsAndColorsItems.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/FontsAndColorsItems.cs index 3c31403854..979983b123 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/FontsAndColorsItems.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/FontsAndColorsItems.cs @@ -7,7 +7,7 @@ using ICSharpCode.AvalonEdit.AddIn; namespace ICSharpCode.PackageManagement.EnvDTE { - public class FontsAndColorsItems : MarshalByRefObject + public class FontsAndColorsItems : MarshalByRefObject, global::EnvDTE.FontsAndColorsItems { static readonly string PlainTextItem = "Plain Text"; @@ -24,7 +24,7 @@ namespace ICSharpCode.PackageManagement.EnvDTE this.highlightingRules = highlightingRules; } - public ColorableItems Item(string name) + public global::EnvDTE.ColorableItems Item(string name) { if (IsPlainText(name)) { return CreatePlainTextColorableItems(); diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/IReturnTypeExtensions.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/IReturnTypeExtensions.cs index ca3b769d7c..621f6ee762 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/IReturnTypeExtensions.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/IReturnTypeExtensions.cs @@ -36,51 +36,51 @@ namespace ICSharpCode.PackageManagement.EnvDTE return returnType.GetFullName(); } - public static vsCMTypeRef GetTypeKind(this IReturnType returnType) + public static global::EnvDTE.vsCMTypeRef GetTypeKind(this IReturnType returnType) { - vsCMTypeRef typeRef = GetSystemTypeKind(returnType.FullyQualifiedName); - if (typeRef != vsCMTypeRef.vsCMTypeRefOther) { + global::EnvDTE.vsCMTypeRef typeRef = GetSystemTypeKind(returnType.FullyQualifiedName); + if (typeRef != global::EnvDTE.vsCMTypeRef.vsCMTypeRefOther) { return typeRef; } if (returnType.IsReferenceType.GetValueOrDefault()) { - return vsCMTypeRef.vsCMTypeRefCodeType; + return global::EnvDTE.vsCMTypeRef.vsCMTypeRefCodeType; } - return vsCMTypeRef.vsCMTypeRefOther; + return global::EnvDTE.vsCMTypeRef.vsCMTypeRefOther; } - static vsCMTypeRef GetSystemTypeKind(string fullyQualifiedTypeName) + static global::EnvDTE.vsCMTypeRef GetSystemTypeKind(string fullyQualifiedTypeName) { switch (fullyQualifiedTypeName) { case "System.String": - return vsCMTypeRef.vsCMTypeRefString; + return global::EnvDTE.vsCMTypeRef.vsCMTypeRefString; case "System.Void": - return vsCMTypeRef.vsCMTypeRefVoid; + return global::EnvDTE.vsCMTypeRef.vsCMTypeRefVoid; case "System.Boolean": - return vsCMTypeRef.vsCMTypeRefBool; + return global::EnvDTE.vsCMTypeRef.vsCMTypeRefBool; case "System.Int16": case "System.UInt16": - return vsCMTypeRef.vsCMTypeRefShort; + return global::EnvDTE.vsCMTypeRef.vsCMTypeRefShort; case "System.Int32": case "System.UInt32": - return vsCMTypeRef.vsCMTypeRefInt; + return global::EnvDTE.vsCMTypeRef.vsCMTypeRefInt; case "System.Int64": case "System.UInt64": - return vsCMTypeRef.vsCMTypeRefLong; + return global::EnvDTE.vsCMTypeRef.vsCMTypeRefLong; case "System.Decimal": - return vsCMTypeRef.vsCMTypeRefDecimal; + return global::EnvDTE.vsCMTypeRef.vsCMTypeRefDecimal; case "System.Char": - return vsCMTypeRef.vsCMTypeRefChar; + return global::EnvDTE.vsCMTypeRef.vsCMTypeRefChar; case "System.Byte": - return vsCMTypeRef.vsCMTypeRefByte; + return global::EnvDTE.vsCMTypeRef.vsCMTypeRefByte; case "System.Object": - return vsCMTypeRef.vsCMTypeRefObject; + return global::EnvDTE.vsCMTypeRef.vsCMTypeRefObject; case "System.Double": - return vsCMTypeRef.vsCMTypeRefDouble; + return global::EnvDTE.vsCMTypeRef.vsCMTypeRefDouble; case "System.Single": - return vsCMTypeRef.vsCMTypeRefFloat; + return global::EnvDTE.vsCMTypeRef.vsCMTypeRefFloat; } - return vsCMTypeRef.vsCMTypeRefOther; + return global::EnvDTE.vsCMTypeRef.vsCMTypeRefOther; } } } diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/ItemOperations.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/ItemOperations.cs index 83e53f065a..c79a7fee37 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/ItemOperations.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/ItemOperations.cs @@ -5,7 +5,7 @@ using System; namespace ICSharpCode.PackageManagement.EnvDTE { - public class ItemOperations : MarshalByRefObject + public class ItemOperations : MarshalByRefObject, global::EnvDTE.ItemOperations { IPackageManagementFileService fileService; @@ -24,7 +24,7 @@ namespace ICSharpCode.PackageManagement.EnvDTE fileService.OpenFile(url); } - public Window NewFile(string fileName) + public global::EnvDTE.Window NewFile(string fileName) { throw new NotImplementedException(); } diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/Project.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/Project.cs index 17a71d99b3..f756463a05 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/Project.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/Project.cs @@ -15,7 +15,7 @@ using SD = ICSharpCode.SharpDevelop.Project; namespace ICSharpCode.PackageManagement.EnvDTE { - public class Project : MarshalByRefObject + public class Project : MarshalByRefObject, global::EnvDTE.Project { IPackageManagementProjectService projectService; IPackageManagementFileService fileService; @@ -75,10 +75,10 @@ namespace ICSharpCode.PackageManagement.EnvDTE } public virtual object Object { get; private set; } - public virtual Properties Properties { get; private set; } - public virtual ProjectItems ProjectItems { get; private set; } + public virtual global::EnvDTE.Properties Properties { get; private set; } + public virtual global::EnvDTE.ProjectItems ProjectItems { get; private set; } - public virtual DTE DTE { + public virtual global::EnvDTE.DTE DTE { get { if (dte == null) { dte = new DTE(projectService, fileService); @@ -215,11 +215,11 @@ namespace ICSharpCode.PackageManagement.EnvDTE return names; } - public virtual CodeModel CodeModel { + public virtual global::EnvDTE.CodeModel CodeModel { get { return new CodeModel(projectService.GetProjectContent(MSBuildProject) ); } } - public virtual ConfigurationManager ConfigurationManager { + public virtual global::EnvDTE.ConfigurationManager ConfigurationManager { get { return new ConfigurationManager(this); } } @@ -233,7 +233,7 @@ namespace ICSharpCode.PackageManagement.EnvDTE fileService.RemoveFile(fileName); } - public ProjectItem AddDirectoryProjectItemUsingFullPath(string directory) + internal ProjectItem AddDirectoryProjectItemUsingFullPath(string directory) { AddDirectoryProjectItemsRecursively(directory); return DirectoryProjectItem.CreateDirectoryProjectItemFromFullPath(this, directory); diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/ProjectItem.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/ProjectItem.cs index 98dcbf1c3d..c3f4bbaaed 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/ProjectItem.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/ProjectItem.cs @@ -13,9 +13,10 @@ using SD = ICSharpCode.SharpDevelop.Project; namespace ICSharpCode.PackageManagement.EnvDTE { - public class ProjectItem : MarshalByRefObject + public class ProjectItem : MarshalByRefObject, global::EnvDTE.ProjectItem { SD.FileProjectItem projectItem; + Project containingProject; public const string CopyToOutputDirectoryPropertyName = "CopyToOutputDirectory"; public const string CustomToolPropertyName = "CustomTool"; @@ -24,13 +25,13 @@ namespace ICSharpCode.PackageManagement.EnvDTE public ProjectItem(Project project, FileProjectItem projectItem) { this.projectItem = projectItem; - this.ContainingProject = project; + this.containingProject = project; this.ProjectItems = CreateProjectItems(projectItem); CreateProperties(); Kind = GetKindFromFileProjectItemType(); } - ProjectItems CreateProjectItems(FileProjectItem projectItem) + global::EnvDTE.ProjectItems CreateProjectItems(FileProjectItem projectItem) { if (projectItem.ItemType == ItemType.Folder) { return new DirectoryProjectItems(this); @@ -51,9 +52,9 @@ namespace ICSharpCode.PackageManagement.EnvDTE string GetKindFromFileProjectItemType() { if (IsDirectory) { - return Constants.vsProjectItemKindPhysicalFolder; + return global::EnvDTE.Constants.vsProjectItemKindPhysicalFolder; } - return Constants.vsProjectItemKindPhysicalFile; + return global::EnvDTE.Constants.vsProjectItemKindPhysicalFile; } bool IsDirectory { @@ -76,13 +77,15 @@ namespace ICSharpCode.PackageManagement.EnvDTE public virtual string Kind { get; set; } - public Project SubProject { + public global::EnvDTE.Project SubProject { get { return null; } } - public virtual Properties Properties { get; private set; } - public virtual Project ContainingProject { get; private set; } - public virtual ProjectItems ProjectItems { get; private set; } + public virtual global::EnvDTE.Properties Properties { get; private set; } + public virtual global::EnvDTE.Project ContainingProject { + get { return this.containingProject; } + } + public virtual global::EnvDTE.ProjectItems ProjectItems { get; private set; } internal virtual object GetProperty(string name) { @@ -140,14 +143,14 @@ namespace ICSharpCode.PackageManagement.EnvDTE public void Delete() { - ContainingProject.DeleteFile(projectItem.FileName); - ContainingProject.Save(); + containingProject.DeleteFile(projectItem.FileName); + containingProject.Save(); } - public FileCodeModel2 FileCodeModel { + public global::EnvDTE.FileCodeModel2 FileCodeModel { get { if (!IsDirectory) { - return new FileCodeModel2(ContainingProject, projectItem); + return new FileCodeModel2(containingProject, projectItem); } return null; } @@ -155,7 +158,7 @@ namespace ICSharpCode.PackageManagement.EnvDTE internal string GetIncludePath(string fileName) { - string relativeDirectory = ContainingProject.GetRelativePath(projectItem.FileName); + string relativeDirectory = containingProject.GetRelativePath(projectItem.FileName); return Path.Combine(relativeDirectory, fileName); } @@ -166,8 +169,8 @@ namespace ICSharpCode.PackageManagement.EnvDTE public virtual void Remove() { - ContainingProject.RemoveProjectItem(this); - ContainingProject.Save(); + containingProject.RemoveProjectItem(this); + containingProject.Save(); } internal FileProjectItem MSBuildProjectItem { @@ -183,22 +186,22 @@ namespace ICSharpCode.PackageManagement.EnvDTE get { return projectItem.FileName; } } - public virtual Document Document { + public virtual global::EnvDTE.Document Document { get { return GetOpenDocument(); } } Document GetOpenDocument() { - IViewContent view = ContainingProject.GetOpenFile(FileName); + IViewContent view = containingProject.GetOpenFile(FileName); if (view != null) { return new Document(FileName, view); } return null; } - public virtual Window Open(string viewKind) + public virtual global::EnvDTE.Window Open(string viewKind) { - ContainingProject.OpenFile(FileName); + containingProject.OpenFile(FileName); return null; } diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/ProjectItemRelationship.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/ProjectItemRelationship.cs index f679f52bab..cc3718ebf3 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/ProjectItemRelationship.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/ProjectItemRelationship.cs @@ -16,7 +16,7 @@ namespace ICSharpCode.PackageManagement.EnvDTE { this.ParentProjectItem = parentProjectItem; this.MSBuildProjectItem = msbuildProjectItem; - this.Project = parentProjectItem.ContainingProject; + this.Project = (Project)parentProjectItem.ContainingProject; GetRelationship(); } diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/ProjectItems.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/ProjectItems.cs index 8014052d0b..12706fb2b5 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/ProjectItems.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/ProjectItems.cs @@ -9,7 +9,7 @@ using System.Linq; namespace ICSharpCode.PackageManagement.EnvDTE { - public class ProjectItems : MarshalByRefObject, IEnumerable + public class ProjectItems : MarshalByRefObject, IEnumerable, global::EnvDTE.ProjectItems { IPackageManagementFileService fileService; object parent; @@ -77,7 +77,7 @@ namespace ICSharpCode.PackageManagement.EnvDTE return GetProjectItems().GetEnumerator(); } - protected virtual IEnumerable GetProjectItems() + protected virtual IEnumerable GetProjectItems() { return new ProjectItemsInsideProject(Project); } @@ -96,10 +96,10 @@ namespace ICSharpCode.PackageManagement.EnvDTE { return GetProjectItems() .Skip(index - 1) - .First(); + .First() as ProjectItem; } - public virtual ProjectItem Item(object index) + public virtual global::EnvDTE.ProjectItem Item(object index) { if (index is int) { return Item((int)index); @@ -107,7 +107,7 @@ namespace ICSharpCode.PackageManagement.EnvDTE return Item(index as string); } - public virtual ProjectItem AddFromDirectory(string directory) + public virtual global::EnvDTE.ProjectItem AddFromDirectory(string directory) { using (IProjectBrowserUpdater updater = Project.CreateProjectBrowserUpdater()) { ProjectItem directoryItem = Project.AddDirectoryProjectItemUsingFullPath(directory); @@ -116,7 +116,7 @@ namespace ICSharpCode.PackageManagement.EnvDTE } } - public virtual ProjectItem AddFromFile(string fileName) + public virtual global::EnvDTE.ProjectItem AddFromFile(string fileName) { using (IProjectBrowserUpdater updater = Project.CreateProjectBrowserUpdater()) { ProjectItem projectItem = AddFileProjectItemToProject(fileName); diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/ProjectItemsInsideProject.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/ProjectItemsInsideProject.cs index 9288b193a1..9dfd84fe39 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/ProjectItemsInsideProject.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/ProjectItemsInsideProject.cs @@ -21,7 +21,7 @@ namespace ICSharpCode.PackageManagement.EnvDTE this.project = project; } - protected override IEnumerable GetProjectItems() + protected override IEnumerable GetProjectItems() { foreach (SD.ProjectItem item in project.MSBuildProject.Items) { ProjectItem projectItem = ConvertToProjectItem(item); @@ -117,7 +117,7 @@ namespace ICSharpCode.PackageManagement.EnvDTE { var directoryItem = new FileProjectItem(project.MSBuildProject, ItemType.Folder); directoryItem.Include = directoryName; - return new ProjectItem(project, directoryItem) { Kind = Constants.vsProjectItemKindPhysicalFolder }; + return new ProjectItem(project, directoryItem) { Kind = global::EnvDTE.Constants.vsProjectItemKindPhysicalFolder }; } string GetFirstSubDirectoryName(string include) diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/ProjectObject.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/ProjectObject.cs index c52670b8d0..6c179fdca7 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/ProjectObject.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/ProjectObject.cs @@ -6,7 +6,7 @@ using ICSharpCode.SharpDevelop.Project; namespace ICSharpCode.PackageManagement.EnvDTE { - public class ProjectObject : MarshalByRefObject + public class ProjectObject : MarshalByRefObject, global::EnvDTE.ProjectObject { public ProjectObject(Project project) { @@ -14,10 +14,10 @@ namespace ICSharpCode.PackageManagement.EnvDTE References = new References(project); } - public References References { get; private set; } - public Project Project { get; private set; } + public global::EnvDTE.References References { get; private set; } + public global::EnvDTE.Project Project { get; private set; } - public DTE DTE { + public global::EnvDTE.DTE DTE { get { return Project.DTE; } } } diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/Projects.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/Projects.cs index c60763915b..997aa2256c 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/Projects.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/Projects.cs @@ -9,7 +9,7 @@ using SD = ICSharpCode.SharpDevelop.Project; namespace ICSharpCode.PackageManagement.EnvDTE { - public class Projects : MarshalByRefObject, IEnumerable + public class Projects : MarshalByRefObject, IEnumerable, global::EnvDTE.Projects { IPackageManagementProjectService projectService; @@ -43,7 +43,7 @@ namespace ICSharpCode.PackageManagement.EnvDTE /// /// Index of 1 returns the first project. /// - public Project Item(int index) + public global::EnvDTE.Project Item(int index) { return GetProjectsInSolution() .Skip(index - 1) diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/Properties.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/Properties.cs index 85effea22c..7036da01cb 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/Properties.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/Properties.cs @@ -8,7 +8,7 @@ using ICSharpCode.SharpDevelop.Project; namespace ICSharpCode.PackageManagement.EnvDTE { - public class Properties : MarshalByRefObject, IEnumerable + public class Properties : MarshalByRefObject, global::EnvDTE.Properties { IPropertyFactory propertyFactory; @@ -21,7 +21,7 @@ namespace ICSharpCode.PackageManagement.EnvDTE { } - public virtual Property Item(string propertyName) + public virtual global::EnvDTE.Property Item(string propertyName) { return propertyFactory.CreateProperty(propertyName); } diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/Property.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/Property.cs index 6f380af2c3..72a56e21c8 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/Property.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/Property.cs @@ -6,7 +6,7 @@ using ICSharpCode.SharpDevelop.Project; namespace ICSharpCode.PackageManagement.EnvDTE { - public class Property : MarshalByRefObject + public class Property : MarshalByRefObject, global::EnvDTE.Property { public Property(string name) { diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/Reference.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/Reference.cs index a95ede8dfc..b26834b15c 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/Reference.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/Reference.cs @@ -6,7 +6,7 @@ using ICSharpCode.SharpDevelop.Project; namespace ICSharpCode.PackageManagement.EnvDTE { - public class Reference : MarshalByRefObject + public class Reference : MarshalByRefObject, global::EnvDTE.Reference { ReferenceProjectItem referenceProjectItem; Project project; @@ -31,7 +31,7 @@ namespace ICSharpCode.PackageManagement.EnvDTE project.Save(); } - public Project SourceProject { + public global::EnvDTE.Project SourceProject { get { var projectReference = referenceProjectItem as ProjectReferenceProjectItem; if (projectReference != null) { diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/Reference3.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/Reference3.cs index 6f03d5cbc4..517b2245dd 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/Reference3.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/Reference3.cs @@ -6,7 +6,7 @@ using ICSharpCode.SharpDevelop.Project; namespace ICSharpCode.PackageManagement.EnvDTE { - public class Reference3 : Reference + public class Reference3 : Reference, global::EnvDTE.Reference3 { public Reference3(Project project, ReferenceProjectItem referenceProjectItem) : base(project, referenceProjectItem) diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/References.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/References.cs index dbf123ff93..3162d8a441 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/References.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/References.cs @@ -10,7 +10,7 @@ using ICSharpCode.SharpDevelop.Project; namespace ICSharpCode.PackageManagement.EnvDTE { - public class References : MarshalByRefObject, IEnumerable + public class References : MarshalByRefObject, IEnumerable, global::EnvDTE.References { MSBuildBasedProject msbuildProject; IPackageManagementProjectService projectService; @@ -63,12 +63,12 @@ namespace ICSharpCode.PackageManagement.EnvDTE return GetEnumerator(); } - public Reference Item(string identity) + public global::EnvDTE.Reference Item(string identity) { return Find(identity); } - public Reference Find(string identity) + public global::EnvDTE.Reference Find(string identity) { foreach (Reference reference in this) { if (IsMatch(reference, identity)) { diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/Solution.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/Solution.cs index d6b8ec7502..396f3cd585 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/Solution.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/Solution.cs @@ -8,7 +8,7 @@ using SD = ICSharpCode.SharpDevelop.Project; namespace ICSharpCode.PackageManagement.EnvDTE { - public class Solution : MarshalByRefObject + public class Solution : MarshalByRefObject, global::EnvDTE.Solution { IPackageManagementProjectService projectService; SD.Solution solution; @@ -33,8 +33,8 @@ namespace ICSharpCode.PackageManagement.EnvDTE get { return projectService.OpenSolution == solution; } } - public Projects Projects { get; private set; } - public Globals Globals { get; private set; } + public global::EnvDTE.Projects Projects { get; private set; } + public global::EnvDTE.Globals Globals { get; private set; } internal IList Sections { get { return solution.Sections; } @@ -45,7 +45,7 @@ namespace ICSharpCode.PackageManagement.EnvDTE projectService.Save(solution); } - public ProjectItem FindProjectItem(string fileName) + public global::EnvDTE.ProjectItem FindProjectItem(string fileName) { foreach (Project project in Projects) { ProjectItem item = project.FindProjectItem(fileName); @@ -56,7 +56,7 @@ namespace ICSharpCode.PackageManagement.EnvDTE return null; } - public SolutionBuild SolutionBuild { + public global::EnvDTE.SolutionBuild SolutionBuild { get { throw new NotImplementedException(); } } } diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/SolutionBuild.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/SolutionBuild.cs index 722aafe0ce..5d2530fbb2 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/SolutionBuild.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/SolutionBuild.cs @@ -5,13 +5,13 @@ using System; namespace ICSharpCode.PackageManagement.EnvDTE { - public class SolutionBuild + public class SolutionBuild : MarshalByRefObject, global::EnvDTE.SolutionBuild { public SolutionBuild() { } - public SolutionConfiguration ActiveConfiguration { + public global::EnvDTE.SolutionConfiguration ActiveConfiguration { get { throw new NotImplementedException(); } } diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/SolutionConfiguration.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/SolutionConfiguration.cs index 686c376784..6693543403 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/SolutionConfiguration.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/SolutionConfiguration.cs @@ -5,7 +5,7 @@ using System; namespace ICSharpCode.PackageManagement.EnvDTE { - public class SolutionConfiguration + public class SolutionConfiguration : MarshalByRefObject, global::EnvDTE.SolutionConfiguration { public SolutionConfiguration() { diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/SolutionGlobals.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/SolutionGlobals.cs index 05c72489f2..1a2b7d6d93 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/SolutionGlobals.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/SolutionGlobals.cs @@ -5,7 +5,7 @@ using System; namespace ICSharpCode.PackageManagement.EnvDTE { - public class SolutionGlobals : Globals + public class SolutionGlobals : global::EnvDTE.Globals { SolutionExtensibilityGlobals extensibilityGlobals; SolutionExtensibilityGlobalsPersistence extensibilityGlobalsPersistence; diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/SourceControl.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/SourceControl.cs index 0e9f48ecf9..cc782deda5 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/SourceControl.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/SourceControl.cs @@ -5,7 +5,7 @@ using System; namespace ICSharpCode.PackageManagement.EnvDTE { - public class SourceControl : MarshalByRefObject + public class SourceControl : MarshalByRefObject, global::EnvDTE.SourceControl { public SourceControl() { diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/TextDocument.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/TextDocument.cs index 0a0425d338..559b96ecc8 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/TextDocument.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/TextDocument.cs @@ -5,13 +5,13 @@ using System; namespace ICSharpCode.PackageManagement.EnvDTE { - public class TextDocument + public class TextDocument : MarshalByRefObject, global::EnvDTE.TextDocument { public TextDocument() { } - public TextPoint StartPoint { + public global::EnvDTE.TextPoint StartPoint { get { throw new NotImplementedException(); } } } diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/TextPoint.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/TextPoint.cs index 617d9f2ff2..4316b8b83c 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/TextPoint.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/TextPoint.cs @@ -6,7 +6,7 @@ using ICSharpCode.SharpDevelop.Dom; namespace ICSharpCode.PackageManagement.EnvDTE { - public class TextPoint : MarshalByRefObject + public class TextPoint : MarshalByRefObject, global::EnvDTE.TextPoint { internal TextPoint(FilePosition filePosition, IDocumentLoader documentLoader) { @@ -25,7 +25,7 @@ namespace ICSharpCode.PackageManagement.EnvDTE get { return FilePosition.Line; } } - public EditPoint CreateEditPoint() + public global::EnvDTE.EditPoint CreateEditPoint() { return new EditPoint(FilePosition, DocumentLoader); } diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/Window.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/Window.cs index a7974ddd7d..f51563d892 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/Window.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/Window.cs @@ -5,13 +5,13 @@ using System; namespace ICSharpCode.PackageManagement.EnvDTE { - public class Window : MarshalByRefObject + public class Window : MarshalByRefObject, global::EnvDTE.Window { public Window() { } - public Document Document { + public global::EnvDTE.Document Document { get { throw new NotImplementedException(); } } } diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/vsCMAccess.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/vsCMAccess.cs deleted file mode 100644 index a056e508f7..0000000000 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/vsCMAccess.cs +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; - -namespace ICSharpCode.PackageManagement.EnvDTE -{ - public enum vsCMAccess - { - vsCMAccessPublic = 1, - vsCMAccessPrivate = 2 - } -} diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/vsCMClassKind.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/vsCMClassKind.cs deleted file mode 100644 index 05c70f5c68..0000000000 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/vsCMClassKind.cs +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; - -namespace ICSharpCode.PackageManagement.EnvDTE -{ - public enum vsCMClassKind - { - vsCMClassKindMainClass = 1, - vsCMClassKindPartialClass = 4 - } -} diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/vsCMElement.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/vsCMElement.cs deleted file mode 100644 index 2040675d7b..0000000000 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/vsCMElement.cs +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; - -namespace ICSharpCode.PackageManagement.EnvDTE -{ - public enum vsCMElement - { - vsCMElementOther = 0, - vsCMElementClass = 1, - vsCMElementFunction = 2, - vsCMElementVariable = 3, - vsCMElementProperty = 4, - vsCMElementNamespace = 5, - vsCMElementParameter = 6, - vsCMElementAttribute = 7, - vsCMElementInterface = 8, - vsCMElementDelegate = 9, - vsCMElementStruct = 11, - vsCMElementImportStmt = 35 - } -} diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/vsCMFunction.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/vsCMFunction.cs deleted file mode 100644 index f74bc36afe..0000000000 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/vsCMFunction.cs +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; - -namespace ICSharpCode.PackageManagement.EnvDTE -{ - public enum vsCMFunction - { - vsCMFunctionOther = 0, - vsCMFunctionConstructor = 1, - vsCMFunctionFunction = 128 - } -} diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/vsCMInfoLocation.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/vsCMInfoLocation.cs deleted file mode 100644 index 0eff3ade8b..0000000000 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/vsCMInfoLocation.cs +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; - -namespace ICSharpCode.PackageManagement.EnvDTE -{ - public enum vsCMInfoLocation - { - vsCMInfoLocationProject = 1, - vsCMInfoLocationExternal = 2 - } -} diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/vsCMOverrideKind.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/vsCMOverrideKind.cs deleted file mode 100644 index 83d54ec1a1..0000000000 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/vsCMOverrideKind.cs +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; - -namespace ICSharpCode.PackageManagement.EnvDTE -{ - public enum vsCMOverrideKind - { - vsCMOverrideKindNone = 0, - vsCMOverrideKindAbstract = 1, - vsCMOverrideKindVirtual = 2, - vsCMOverrideKindOverride = 4, - vsCMOverrideKindNew = 8, - vsCMOverrideKindSealed = 16 - } -} diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/vsCMParameterKind.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/vsCMParameterKind.cs deleted file mode 100644 index 8ffd82a8d2..0000000000 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/vsCMParameterKind.cs +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; - -namespace ICSharpCode.PackageManagement.EnvDTE -{ - public enum vsCMParameterKind - { - vsCMParameterKindNone = 0, - vsCMParameterKindIn = 1, - vsCMParameterKindRef = 2, - vsCMParameterKindOut = 4, - vsCMParameterKindOptional = 8, - vsCMParameterKindParamArray = 16 - } -} diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/vsCMPropertyKind.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/vsCMPropertyKind.cs deleted file mode 100644 index c8b6de6aac..0000000000 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/vsCMPropertyKind.cs +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; - -namespace ICSharpCode.PackageManagement.EnvDTE -{ - public enum vsCMPropertyKind - { - vsCMPropertyKindReadWrite = 0, - vsCMPropertyKindReadOnly = 1, - vsCMPropertyKindWriteOnly = 2, - } -} diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/vsCMTypeRef.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/vsCMTypeRef.cs deleted file mode 100644 index 670eb8549d..0000000000 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/vsCMTypeRef.cs +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; - -namespace ICSharpCode.PackageManagement.EnvDTE -{ - public enum vsCMTypeRef - { - vsCMTypeRefOther = 0, - vsCMTypeRefCodeType = 1, - vsCMTypeRefArray = 2, - vsCMTypeRefVoid = 3, - vsCMTypeRefPointer = 4, - vsCMTypeRefString = 5, - vsCMTypeRefObject = 6, - vsCMTypeRefByte = 7, - vsCMTypeRefChar = 8, - vsCMTypeRefShort = 9, - vsCMTypeRefInt = 10, - vsCMTypeRefLong = 11, - vsCMTypeRefFloat = 12, - vsCMTypeRefDouble = 13, - vsCMTypeRefDecimal = 14, - vsCMTypeRefBool = 15, - vsCMTypeRefVariant = 16 - } -} diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/vsEPReplaceTextOptions.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/vsEPReplaceTextOptions.cs deleted file mode 100644 index a16ecbed11..0000000000 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/vsEPReplaceTextOptions.cs +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; - -namespace ICSharpCode.PackageManagement.EnvDTE -{ - public enum vsEPReplaceTextOptions - { - vsEPReplaceTextKeepMarkers = 1, - vsEPReplaceTextNormalizeNewlines = 2, - vsEPReplaceTextTabsSpaces = 4, - vsEPReplaceTextAutoformat = 8 - } -} diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/VisualStudio/FlavoredProject.cs b/src/AddIns/Misc/PackageManagement/Project/Src/VisualStudio/FlavoredProject.cs index 2a82552659..cafb96307d 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/VisualStudio/FlavoredProject.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/VisualStudio/FlavoredProject.cs @@ -14,32 +14,32 @@ namespace Microsoft.VisualStudio.Shell.Flavor public FlavoredProject(MSBuildBasedProject project) { - this.project = project; + this.project = project; } - - public int GetAggregateProjectTypeGuids(out string projTypeGuids) - { - projTypeGuids = GetProjectTypeGuidsFromProject(); - if (projTypeGuids == null) { - projTypeGuids = GetProjectTypeGuidsBasedOnProjectFileExtension(); - } - return VsConstants.S_OK; - } - + + public int GetAggregateProjectTypeGuids(out string projTypeGuids) + { + projTypeGuids = GetProjectTypeGuidsFromProject(); + if (projTypeGuids == null) { + projTypeGuids = GetProjectTypeGuidsBasedOnProjectFileExtension(); + } + return VsConstants.S_OK; + } + string GetProjectTypeGuidsFromProject() { return project.GetUnevalatedProperty("ProjectTypeGuids"); } - + string GetProjectTypeGuidsBasedOnProjectFileExtension() { - var projectType = new ProjectType(project); - if (projectType.Type == ProjectType.CSharp) { - return ProjectTypeGuids.CSharp; - } else if (projectType.Type == ProjectType.VBNet) { - return ProjectTypeGuids.VBNet; - } - return String.Empty; + var projectType = new ProjectType(project); + if (projectType.Type == ProjectType.CSharp) { + return ProjectTypeGuids.CSharp; + } else if (projectType.Type == ProjectType.VBNet) { + return ProjectTypeGuids.VBNet; + } + return String.Empty; } } } diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/VisualStudio/IVsAggregatableProject.cs b/src/AddIns/Misc/PackageManagement/Project/Src/VisualStudio/IVsAggregatableProject.cs deleted file mode 100644 index 9acbf4c814..0000000000 --- a/src/AddIns/Misc/PackageManagement/Project/Src/VisualStudio/IVsAggregatableProject.cs +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; - -namespace Microsoft.VisualStudio.Shell.Interop -{ - public interface IVsAggregatableProject - { - int GetAggregateProjectTypeGuids(out string projTypeGuids); - } -} diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/VisualStudio/IVsHierarchy.cs b/src/AddIns/Misc/PackageManagement/Project/Src/VisualStudio/IVsHierarchy.cs deleted file mode 100644 index e7ccc041a3..0000000000 --- a/src/AddIns/Misc/PackageManagement/Project/Src/VisualStudio/IVsHierarchy.cs +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; - -namespace Microsoft.VisualStudio.Shell.Interop -{ - public interface IVsHierarchy - { - - } -} diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/VisualStudio/IVsSolution.cs b/src/AddIns/Misc/PackageManagement/Project/Src/VisualStudio/IVsSolution.cs deleted file mode 100644 index 6b62c8f73c..0000000000 --- a/src/AddIns/Misc/PackageManagement/Project/Src/VisualStudio/IVsSolution.cs +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; - -namespace Microsoft.VisualStudio.Shell.Interop -{ - public interface IVsSolution - { - int GetProjectOfUniqueName(string uniqueName, out IVsHierarchy hierarchy); - } -} diff --git a/src/AddIns/Misc/PackageManagement/EnvDTEHelpers/Project/Configuration/AssemblyInfo.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Configuration/AssemblyInfo.vb similarity index 88% rename from src/AddIns/Misc/PackageManagement/EnvDTEHelpers/Project/Configuration/AssemblyInfo.vb rename to src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Configuration/AssemblyInfo.vb index 24e51cc723..75c08b3822 100644 --- a/src/AddIns/Misc/PackageManagement/EnvDTEHelpers/Project/Configuration/AssemblyInfo.vb +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Configuration/AssemblyInfo.vb @@ -8,8 +8,8 @@ Imports System.Runtime.InteropServices ' change them to the information which is associated with the assembly ' you compile. - - + + diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/SharpDevelop.EnvDTE.vbproj b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/SharpDevelop.EnvDTE.vbproj new file mode 100644 index 0000000000..68d78d4cce --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/SharpDevelop.EnvDTE.vbproj @@ -0,0 +1,130 @@ + + + + {6FB1260D-68A2-41A0-BB09-F5F710842E99} + Debug + AnyCPU + Library + Empty + SharpDevelop.EnvDTE + v4.0 + Client + Properties + On + False + On + Off + Binary + 4 + false + ..\..\..\..\..\bin\ + + + AnyCPU + False + Auto + 4194304 + + + true + Full + False + DEBUG=1,TRACE=1 + + + False + None + True + TRACE=1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeAttribute.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeAttribute.vb new file mode 100644 index 0000000000..96585cacca --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeAttribute.vb @@ -0,0 +1,11 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + Public Interface CodeAttribute + Inherits CodeElement + + ReadOnly Property FullName() As String + Property Value() As String + End Interface +End Namespace \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeAttribute2.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeAttribute2.vb new file mode 100644 index 0000000000..502c39b4f1 --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeAttribute2.vb @@ -0,0 +1,10 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + Public Interface CodeAttribute2 + Inherits CodeAttribute + + ReadOnly Property Arguments() As CodeElements + End Interface +End Namespace \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeAttributeArgument.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeAttributeArgument.vb new file mode 100644 index 0000000000..53aa73f800 --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeAttributeArgument.vb @@ -0,0 +1,10 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + Public Interface CodeAttributeArgument + Inherits CodeElement + + ReadOnly Property Value() As String + End Interface +End Namespace \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeClass.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeClass.vb new file mode 100644 index 0000000000..28600a35ef --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeClass.vb @@ -0,0 +1,11 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + Public Interface CodeClass + Inherits CodeType + + ReadOnly Property ImplementedInterfaces() As CodeElements + Function AddVariable(name As String, type As Object, Optional Position As Object = Nothing, Optional Access As vsCMAccess = vsCMAccess.vsCMAccessPublic, Optional Location As Object = Nothing) As CodeVariable + End Interface +End Namespace \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeClass2.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeClass2.vb new file mode 100644 index 0000000000..59a4dd16b8 --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeClass2.vb @@ -0,0 +1,13 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + Public Interface CodeClass2 + Inherits CodeClass + + ReadOnly Property PartialClasses() As CodeElements + ReadOnly Property IsGeneric() As Boolean + Property ClassKind() As vsCMClassKind + ReadOnly Property IsAbstract() As Boolean + End Interface +End Namespace \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeDelegate.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeDelegate.vb new file mode 100644 index 0000000000..bd3e04ddd9 --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeDelegate.vb @@ -0,0 +1,9 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + Public Interface CodeDelegate + Inherits CodeType + + End Interface +End Namespace \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeElement.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeElement.vb new file mode 100644 index 0000000000..e8e5c6a124 --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeElement.vb @@ -0,0 +1,16 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + Public Interface CodeElement + ReadOnly Property Name() As String + ReadOnly Property Language() As String + ReadOnly Property InfoLocation() As vsCMInfoLocation + ReadOnly Property DTE() As DTE + ReadOnly Property Kind() As vsCMElement + + ' default is vsCMPart.vsCMPartWholeWithAttributes + Function GetStartPoint() As TextPoint + Function GetEndPoint() As TextPoint + End Interface +End Namespace \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeElements.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeElements.vb new file mode 100644 index 0000000000..c311094cf5 --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeElements.vb @@ -0,0 +1,12 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + Public Interface CodeElements + Inherits IEnumerable + + ReadOnly Property Count() As Integer + + Function Item(index As Object) As CodeElement + End Interface +End Namespace \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeFunction.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeFunction.vb new file mode 100644 index 0000000000..e7e51e283b --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeFunction.vb @@ -0,0 +1,17 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + Public Interface CodeFunction + Inherits CodeElement + + Property Access() As vsCMAccess + ReadOnly Property Parameters() As CodeElements + ReadOnly Property Type() As CodeTypeRef2 + ReadOnly Property Attributes() As CodeElements + Property CanOverride() As Boolean + ReadOnly Property FunctionKind() As vsCMFunction + ReadOnly Property IsShared() As Boolean + ReadOnly Property MustImplement() As Boolean + End Interface +End Namespace \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeFunction2.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeFunction2.vb new file mode 100644 index 0000000000..b852106fbd --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeFunction2.vb @@ -0,0 +1,11 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + Public Interface CodeFunction2 + Inherits CodeFunction + + ReadOnly Property IsGeneric() As Boolean + ReadOnly Property OverrideKind() As vsCMOverrideKind + End Interface +End Namespace \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeImport.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeImport.vb new file mode 100644 index 0000000000..24018dac54 --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeImport.vb @@ -0,0 +1,10 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + Public Interface CodeImport + Inherits CodeElement + + ReadOnly Property [Namespace]() As String + End Interface +End Namespace \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeInterface.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeInterface.vb new file mode 100644 index 0000000000..4b03e5a60f --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeInterface.vb @@ -0,0 +1,10 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + Public Interface CodeInterface + Inherits CodeType + + Function AddFunction(name As String, kind As vsCMFunction, type As Object, Optional Position As Object = Nothing, Optional Access As vsCMAccess = vsCMAccess.vsCMAccessPublic) As CodeFunction + End Interface +End Namespace \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeModel.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeModel.vb new file mode 100644 index 0000000000..0d42891e7c --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeModel.vb @@ -0,0 +1,11 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + Public Interface CodeModel + ReadOnly Property CodeElements() As CodeElements + ReadOnly Property Language() As String + + Function CodeTypeFromFullName(name As String) As CodeType + End Interface +End Namespace \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeModelLanguageConstants.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeModelLanguageConstants.vb new file mode 100644 index 0000000000..da5a0b0b70 --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeModelLanguageConstants.vb @@ -0,0 +1,9 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + Public MustInherit Class CodeModelLanguageConstants + Public Const vsCMLanguageCSharp As String = "{B5E9BD34-6D3E-4B5D-925E-8A43B79820B4}" + Public Const vsCMLanguageVB As String = "{B5E9BD33-6D3E-4B5D-925E-8A43B79820B4}" + End Class +End Namespace \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeNamespace.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeNamespace.vb new file mode 100644 index 0000000000..259b2a05ae --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeNamespace.vb @@ -0,0 +1,11 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + Public Interface CodeNamespace + ReadOnly Property Kind() As vsCMElement + ReadOnly Property FullName() As String + ReadOnly Property Name() As String + ReadOnly Property Members() As CodeElements + End Interface +End Namespace \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeParameter.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeParameter.vb new file mode 100644 index 0000000000..8bf4b56d9f --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeParameter.vb @@ -0,0 +1,11 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + Public Interface CodeParameter + Inherits CodeElement + + ReadOnly Property Type() As CodeTypeRef2 + ReadOnly Property Attributes() As CodeElements + End Interface +End Namespace \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeParameter2.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeParameter2.vb new file mode 100644 index 0000000000..69db481d23 --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeParameter2.vb @@ -0,0 +1,10 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + Public Interface CodeParameter2 + Inherits CodeParameter + + ReadOnly Property ParameterKind() As vsCMParameterKind + End Interface +End Namespace \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeProperty.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeProperty.vb new file mode 100644 index 0000000000..748b898904 --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeProperty.vb @@ -0,0 +1,15 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + Public Interface CodeProperty + Inherits CodeElement + + Property Access() As vsCMAccess + ReadOnly Property Parent() As CodeClass + ReadOnly Property Attributes() As CodeElements + ReadOnly Property Type() As CodeTypeRef + ReadOnly Property Getter() As CodeFunction + ReadOnly Property Setter() As CodeFunction + End Interface +End Namespace \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeProperty2.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeProperty2.vb new file mode 100644 index 0000000000..e0847e6406 --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeProperty2.vb @@ -0,0 +1,11 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + Public Interface CodeProperty2 + Inherits CodeProperty + + ReadOnly Property ReadWrite() As vsCMPropertyKind + ReadOnly Property Parameters() As CodeElements + End Interface +End Namespace \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeStruct.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeStruct.vb new file mode 100644 index 0000000000..b6e7d3da52 --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeStruct.vb @@ -0,0 +1,9 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + Public Interface CodeStruct + Inherits CodeType + + End Interface +End Namespace \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeType.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeType.vb new file mode 100644 index 0000000000..39480aa503 --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeType.vb @@ -0,0 +1,22 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + Public Interface CodeType + Inherits CodeElement + + Property Access() As vsCMAccess + ReadOnly Property FullName() As String + ReadOnly Property Members() As CodeElements + ReadOnly Property Bases() As CodeElements + ReadOnly Property Attributes() As CodeElements + ReadOnly Property [Namespace]() As CodeNamespace + ReadOnly Property ProjectItem() As ProjectItem + + ''' + ''' Returns true if the current type matches the fully qualified name or any of its + ''' base types are a match. + ''' + Function IsDerivedFrom(fullName As String) As Boolean + End Interface +End Namespace \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeTypeRef.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeTypeRef.vb new file mode 100644 index 0000000000..ccd3df60a7 --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeTypeRef.vb @@ -0,0 +1,12 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + Public Interface CodeTypeRef + ReadOnly Property AsFullName() As String + ReadOnly Property AsString() As String + ReadOnly Property Parent() As CodeElement + ReadOnly Property CodeType() As CodeType + ReadOnly Property TypeKind() As vsCMTypeRef + End Interface +End Namespace \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeTypeRef2.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeTypeRef2.vb new file mode 100644 index 0000000000..4c40249af6 --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeTypeRef2.vb @@ -0,0 +1,10 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + Public Interface CodeTypeRef2 + Inherits CodeTypeRef + + ReadOnly Property IsGeneric As Boolean + End Interface +End Namespace \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeVariable.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeVariable.vb new file mode 100644 index 0000000000..4ca4d78cc0 --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/CodeVariable.vb @@ -0,0 +1,10 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + Public Interface CodeVariable + Inherits CodeElement + + Property Access() As vsCMAccess + End Interface +End Namespace \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/ColorableItems.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/ColorableItems.vb new file mode 100644 index 0000000000..229c3e3998 --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/ColorableItems.vb @@ -0,0 +1,11 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + Public Interface ColorableItems + ReadOnly Property Name() As String + Property Bold() As Boolean + Property Foreground() As UInteger + Property Background() As UInt32 + End Interface +End Namespace \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/Configuration.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/Configuration.vb new file mode 100644 index 0000000000..48772296e1 --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/Configuration.vb @@ -0,0 +1,8 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + Public Interface Configuration + ReadOnly Property Properties As Properties + End Interface +End Namespace \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/ConfigurationManager.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/ConfigurationManager.vb new file mode 100644 index 0000000000..c8f06780ca --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/ConfigurationManager.vb @@ -0,0 +1,8 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + Public Interface ConfigurationManager + ReadOnly Property ActiveConfiguration As Configuration + End Interface +End Namespace \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/Constants.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/Constants.vb new file mode 100644 index 0000000000..93a5926df2 --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/Constants.vb @@ -0,0 +1,10 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + Public MustInherit Class Constants + Public Const vsProjectItemKindPhysicalFile As String = "{6BB5F8EE-4483-11D3-8BCF-00C04F8EC28C}" + Public Const vsProjectItemKindPhysicalFolder As String = "{6BB5F8EF-4483-11D3-8BCF-00C04F8EC28C}" + Public Const vsViewKindCode As String = "{7651A701-06E5-11D1-8EBD-00A0C90F26EA}" + End Class +End Namespace \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/DTE.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/DTE.vb new file mode 100644 index 0000000000..72e9a39a03 --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/DTE.vb @@ -0,0 +1,14 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + Public Interface DTE + ReadOnly Property Version() As String + ReadOnly Property Solution() As Solution + ReadOnly Property ItemOperations() As ItemOperations + ReadOnly Property ActiveSolutionProjects() As Object + ReadOnly Property SourceControl() As SourceControl + + Function Properties(category As String, page As String) As Properties + End Interface +End Namespace \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/Document.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/Document.vb new file mode 100644 index 0000000000..4e4af77fea --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/Document.vb @@ -0,0 +1,11 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + Public Interface Document + Property Saved() As Boolean + ReadOnly Property FullName() As String + + Function [Object](modelKind As String) As Object + End Interface +End Namespace \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/EditPoint.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/EditPoint.vb new file mode 100644 index 0000000000..d3623b10bc --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/EditPoint.vb @@ -0,0 +1,11 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + Public Interface EditPoint + Inherits TextPoint + + Sub ReplaceText(pointOrCount As Object, text As String, flags As Integer) + Sub Insert(text As String) + End Interface +End Namespace \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/FileCodeModel2.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/FileCodeModel2.vb new file mode 100644 index 0000000000..650d88ec86 --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/FileCodeModel2.vb @@ -0,0 +1,10 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + Public Interface FileCodeModel2 + ReadOnly Property CodeElements() As CodeElements + + Sub AddImport(name As String, Optional position As Object = Nothing, Optional [alias] As String = Nothing) + End Interface +End Namespace \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/FontsAndColorsItems.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/FontsAndColorsItems.vb new file mode 100644 index 0000000000..fd9cacd71c --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/FontsAndColorsItems.vb @@ -0,0 +1,8 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + Public Interface FontsAndColorsItems + Function Item(name As String) As ColorableItems + End Interface +End Namespace \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/Globals.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/Globals.vb new file mode 100644 index 0000000000..6497b7a2c1 --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/Globals.vb @@ -0,0 +1,48 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + + ''' + ''' EnvDTE.Globals class defined in VB.NET so multiple parameterized properties can be defined + ''' which are not supported in C#. This allows Powershell to use the properties as methods: + ''' + ''' $dte.Solution.Globals.VariablePersists("MyVariable") = $true + ''' $dte.Solution.Globals.VariablePersists("MyVariable") + ''' $dte.Solution.Globals.VariableValue("MyVariable") = "path/to/tool" + ''' $dte.Solution.Globals.VariablePersists("MyVariable") = $true + ''' + Public MustInherit Class Globals + Public Property VariableValue(ByVal name As String) As Object + Get + Return GetVariableValue(name) + End Get + Set + SetVariableValue(name, value) + End Set + End Property + + Protected MustOverride Function GetVariableValue(ByVal name As String) As Object + Protected MustOverride Sub SetVariableValue(ByVal name As String, ByVal value As Object) + + Public Property VariablePersists(ByVal name As String) As Boolean + Get + Return GetVariablePersists(name) + End Get + Set + SetVariablePersists(name, value) + End Set + End Property + + Protected MustOverride Function GetVariablePersists(ByVal name As String) As Boolean + Protected MustOverride Sub SetVariablePersists(ByVal name As String, ByVal value As Boolean) + + Public ReadOnly Property VariableExists(ByVal name As string) As Boolean + Get + Return GetVariableExists(name) + End Get + End Property + + Protected MustOverride Function GetVariableExists(ByVal name As String) As Boolean + End Class +End Namespace \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/ItemOperations.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/ItemOperations.vb new file mode 100644 index 0000000000..bea47a59f2 --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/ItemOperations.vb @@ -0,0 +1,10 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + Public Interface ItemOperations + Sub OpenFile(fileName As String) + Sub Navigate(url As String) + Function NewFile(fileName As String) As Window + End Interface +End Namespace \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/Project.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/Project.vb new file mode 100644 index 0000000000..26e5edd8a6 --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/Project.vb @@ -0,0 +1,21 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + Public Interface Project + ReadOnly Property Name() As String + ReadOnly Property UniqueName() As String + ReadOnly Property FileName() As String + ReadOnly Property FullName() As String + ReadOnly Property [Object]() As Object + ReadOnly Property Properties() As Properties + ReadOnly Property ProjectItems() As ProjectItems + ReadOnly Property DTE() As DTE + ReadOnly Property Type() As String + ReadOnly Property Kind() As String + ReadOnly Property CodeModel() As CodeModel + ReadOnly Property ConfigurationManager() As ConfigurationManager + + Sub Save() + End Interface +End Namespace \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/ProjectItem.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/ProjectItem.vb new file mode 100644 index 0000000000..7b6445075f --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/ProjectItem.vb @@ -0,0 +1,21 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + Public Interface ProjectItem + ReadOnly Property Name() As String + Property Kind() As String + ReadOnly Property SubProject() As Project + ReadOnly Property Properties() As Global.EnvDTE.Properties + ReadOnly Property ContainingProject() As Project + ReadOnly Property ProjectItems() As ProjectItems + ReadOnly Property FileCodeModel() As FileCodeModel2 + ReadOnly Property Document() As Document + ReadOnly Property FileCount() As Short + + Sub Delete() + Sub Remove() + Function FileNames(index As Short) As String + Function Open(viewKind As String) As Global.EnvDTE.Window + End Interface +End Namespace \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/ProjectItems.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/ProjectItems.vb new file mode 100644 index 0000000000..6389542a48 --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/ProjectItems.vb @@ -0,0 +1,17 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + Public Interface ProjectItems + Inherits IEnumerable + Sub AddFromFileCopy(filePath As String) + + Function Item(index As Object) As ProjectItem + Function AddFromDirectory(directory As String) As ProjectItem + Function AddFromFile(fileName As String) As ProjectItem + + ReadOnly Property Parent() As Object + ReadOnly Property Count() As Integer + ReadOnly Property Kind() As String + End Interface +End Namespace \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/ProjectObject.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/ProjectObject.vb new file mode 100644 index 0000000000..3e7d9d3d9d --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/ProjectObject.vb @@ -0,0 +1,11 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + Public Interface ProjectObject + + ReadOnly Property References() As References + ReadOnly Property Project() As Project + ReadOnly Property DTE() As DTE + End Interface +End Namespace \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/Projects.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/Projects.vb new file mode 100644 index 0000000000..0201a8d53a --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/Projects.vb @@ -0,0 +1,15 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + Public Interface Projects + Inherits IEnumerable + + ''' + ''' Index of 1 returns the first project. + ''' + Function Item(index As Integer) As Project + + ReadOnly Property Count() As Integer + End Interface +End Namespace \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/Properties.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/Properties.vb new file mode 100644 index 0000000000..8231cbfc1e --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/Properties.vb @@ -0,0 +1,10 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + Public Interface Properties + Inherits IEnumerable + + Function Item(propertyName As String) As [Property] + End Interface +End Namespace \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/Property.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/Property.vb new file mode 100644 index 0000000000..88391e8a00 --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/Property.vb @@ -0,0 +1,10 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + Public Interface [Property] + ReadOnly Property Name() As String + Property Value() As Object + Property [Object]() As Object + End Interface +End Namespace \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/Reference.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/Reference.vb new file mode 100644 index 0000000000..17bc5edc03 --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/Reference.vb @@ -0,0 +1,12 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + Public Interface Reference + ReadOnly Property Name() As String + ReadOnly Property Path() As String + ReadOnly Property SourceProject() As Project + + Sub Remove() + End Interface +End Namespace \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/Reference3.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/Reference3.vb new file mode 100644 index 0000000000..7b39878911 --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/Reference3.vb @@ -0,0 +1,10 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + Public Interface Reference3 + Inherits Reference + + ReadOnly Property AutoReferenced() As Boolean + End Interface +End Namespace \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/References.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/References.vb new file mode 100644 index 0000000000..ba4ab41a7d --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/References.vb @@ -0,0 +1,17 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + Public Interface References + Inherits IEnumerable + + ''' + ''' This method should be in a separate AssemblyReferences class that is exposed by web projects. + ''' + Sub AddFromGAC(assemblyName As String) + Sub Add(path As String) + + Function Item(identity As String) As Reference + Function Find(identity As String) As Reference + End Interface +End Namespace \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/Solution.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/Solution.vb new file mode 100644 index 0000000000..67b80bb51f --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/Solution.vb @@ -0,0 +1,15 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + Public Interface Solution + ReadOnly Property FullName() As String + ReadOnly Property FileName() As String + ReadOnly Property IsOpen() As Boolean + ReadOnly Property Projects() As Projects + ReadOnly Property Globals() As Globals + ReadOnly Property SolutionBuild() As SolutionBuild + + Function FindProjectItem(fileName As String) As ProjectItem + End Interface +End Namespace diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/SolutionBuild.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/SolutionBuild.vb new file mode 100644 index 0000000000..9b63d58942 --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/SolutionBuild.vb @@ -0,0 +1,15 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + Public Interface SolutionBuild + ReadOnly Property ActiveConfiguration() As SolutionConfiguration + + ''' + ''' Returns the number of projects that failed to build. + ''' + ReadOnly Property LastBuildInfo() As Integer + + Sub BuildProject(solutionConfiguration As String, projectUniqueName As String, waitForBuildToFinish As Boolean) + End Interface +End Namespace \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/SolutionConfiguration.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/SolutionConfiguration.vb new file mode 100644 index 0000000000..de4c3ee663 --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/SolutionConfiguration.vb @@ -0,0 +1,8 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + Public Interface SolutionConfiguration + ReadOnly Property Name As String + End Interface +End Namespace \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/SourceControl.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/SourceControl.vb new file mode 100644 index 0000000000..b730abedd5 --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/SourceControl.vb @@ -0,0 +1,10 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + Public Interface SourceControl + Function IsItemCheckedOut(itemName As String) As Boolean + Function IsItemUnderSCC(itemName As String) As Boolean + Function CheckOutItem(itemName As String) As Boolean + End Interface +End Namespace \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/TextDocument.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/TextDocument.vb new file mode 100644 index 0000000000..2206ffed19 --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/TextDocument.vb @@ -0,0 +1,8 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + Public Interface TextDocument + ReadOnly Property StartPoint() As TextPoint + End Interface +End Namespace \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/TextPoint.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/TextPoint.vb new file mode 100644 index 0000000000..c7bc633157 --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/TextPoint.vb @@ -0,0 +1,11 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + Public Interface TextPoint + ReadOnly Property LineCharOffset() As Integer + ReadOnly Property Line() As Integer + + Function CreateEditPoint() As EditPoint + End Interface +End Namespace \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/VisualStudio/IVsAggregatableProject.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/VisualStudio/IVsAggregatableProject.vb new file mode 100644 index 0000000000..a3e9f096a6 --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/VisualStudio/IVsAggregatableProject.vb @@ -0,0 +1,10 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Imports System.Runtime.InteropServices + +Namespace Microsoft.VisualStudio.Shell.Interop + Public Interface IVsAggregatableProject + Function GetAggregateProjectTypeGuids( ByRef projTypeGuids As String) As Integer + End Interface +End Namespace diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/VisualStudio/IVsHierarchy.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/VisualStudio/IVsHierarchy.vb new file mode 100644 index 0000000000..03b9c6d69c --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/VisualStudio/IVsHierarchy.vb @@ -0,0 +1,8 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace Microsoft.VisualStudio.Shell.Interop + Public Interface IVsHierarchy + + End Interface +End Namespace diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/VisualStudio/IVsSolution.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/VisualStudio/IVsSolution.vb new file mode 100644 index 0000000000..47fc80af28 --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/VisualStudio/IVsSolution.vb @@ -0,0 +1,10 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Imports System.Runtime.InteropServices + +Namespace Microsoft.VisualStudio.Shell.Interop + Public Interface IVsSolution + Function GetProjectOfUniqueName(uniqueName As String, ByRef hierarchy As IVsHierarchy) As Integer + End Interface +End Namespace \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/Window.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/Window.vb new file mode 100644 index 0000000000..6a067e927a --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/Window.vb @@ -0,0 +1,8 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + Public Interface Window + ReadOnly Property Document As Document + End Interface +End Namespace diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/vsCMAccess.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/vsCMAccess.vb new file mode 100644 index 0000000000..5fb82953bd --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/vsCMAccess.vb @@ -0,0 +1,9 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + Public Enum vsCMAccess + vsCMAccessPublic = 1 + vsCMAccessPrivate = 2 + End Enum +End Namespace \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/vsCMClassKind.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/vsCMClassKind.vb new file mode 100644 index 0000000000..ee984c4dc6 --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/vsCMClassKind.vb @@ -0,0 +1,9 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + Public Enum vsCMClassKind + vsCMClassKindMainClass = 1 + vsCMClassKindPartialClass = 4 + End Enum +End Namespace \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/vsCMElement.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/vsCMElement.vb new file mode 100644 index 0000000000..8c34de4973 --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/vsCMElement.vb @@ -0,0 +1,19 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + Public Enum vsCMElement + vsCMElementOther = 0 + vsCMElementClass = 1 + vsCMElementFunction = 2 + vsCMElementVariable = 3 + vsCMElementProperty = 4 + vsCMElementNamespace = 5 + vsCMElementParameter = 6 + vsCMElementAttribute = 7 + vsCMElementInterface = 8 + vsCMElementDelegate = 9 + vsCMElementStruct = 11 + vsCMElementImportStmt = 35 + End Enum +End Namespace \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/vsCMFunction.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/vsCMFunction.vb new file mode 100644 index 0000000000..d52aea91e7 --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/vsCMFunction.vb @@ -0,0 +1,10 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + Public Enum vsCMFunction + vsCMFunctionOther = 0 + vsCMFunctionConstructor = 1 + vsCMFunctionFunction = 128 + End Enum +End Namespace \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/vsCMInfoLocation.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/vsCMInfoLocation.vb new file mode 100644 index 0000000000..04dbe4f639 --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/vsCMInfoLocation.vb @@ -0,0 +1,9 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + Public Enum vsCMInfoLocation + vsCMInfoLocationProject = 1 + vsCMInfoLocationExternal = 2 + End Enum +End Namespace \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/vsCMOverrideKind.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/vsCMOverrideKind.vb new file mode 100644 index 0000000000..155533f15a --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/vsCMOverrideKind.vb @@ -0,0 +1,13 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + Public Enum vsCMOverrideKind + vsCMOverrideKindNone = 0 + vsCMOverrideKindAbstract = 1 + vsCMOverrideKindVirtual = 2 + vsCMOverrideKindOverride = 4 + vsCMOverrideKindNew = 8 + vsCMOverrideKindSealed = 16 + End Enum +End Namespace \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/vsCMParameterKind.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/vsCMParameterKind.vb new file mode 100644 index 0000000000..b3806d3c60 --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/vsCMParameterKind.vb @@ -0,0 +1,13 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + Public Enum vsCMParameterKind + vsCMParameterKindNone = 0 + vsCMParameterKindIn = 1 + vsCMParameterKindRef = 2 + vsCMParameterKindOut = 4 + vsCMParameterKindOptional = 8 + vsCMParameterKindParamArray = 16 + End Enum +End Namespace \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/vsCMPropertyKind.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/vsCMPropertyKind.vb new file mode 100644 index 0000000000..888a41b633 --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/vsCMPropertyKind.vb @@ -0,0 +1,10 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + Public Enum vsCMPropertyKind + vsCMPropertyKindReadWrite = 0 + vsCMPropertyKindReadOnly = 1 + vsCMPropertyKindWriteOnly = 2 + End Enum +End Namespace \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/vsCMTypeRef.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/vsCMTypeRef.vb new file mode 100644 index 0000000000..fa9c122c41 --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/vsCMTypeRef.vb @@ -0,0 +1,24 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + Public Enum vsCMTypeRef + vsCMTypeRefOther = 0 + vsCMTypeRefCodeType = 1 + vsCMTypeRefArray = 2 + vsCMTypeRefVoid = 3 + vsCMTypeRefPointer = 4 + vsCMTypeRefString = 5 + vsCMTypeRefObject = 6 + vsCMTypeRefByte = 7 + vsCMTypeRefChar = 8 + vsCMTypeRefShort = 9 + vsCMTypeRefInt = 10 + vsCMTypeRefLong = 11 + vsCMTypeRefFloat = 12 + vsCMTypeRefDouble = 13 + vsCMTypeRefDecimal = 14 + vsCMTypeRefBool = 15 + vsCMTypeRefVariant = 16 + End Enum +End Namespace \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/vsEPReplaceTextOptions.vb b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/vsEPReplaceTextOptions.vb new file mode 100644 index 0000000000..ec611702fd --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/Src/vsEPReplaceTextOptions.vb @@ -0,0 +1,11 @@ +' Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) +' This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +Namespace EnvDTE + Public Enum vsEPReplaceTextOptions + vsEPReplaceTextKeepMarkers = 1 + vsEPReplaceTextNormalizeNewlines = 2 + vsEPReplaceTextTabsSpaces = 4 + vsEPReplaceTextAutoformat = 8 + End Enum +End Namespace diff --git a/src/AddIns/Misc/PackageManagement/Test/PackageManagement.Tests.csproj b/src/AddIns/Misc/PackageManagement/Test/PackageManagement.Tests.csproj index 750344421d..a8a3cc9244 100644 --- a/src/AddIns/Misc/PackageManagement/Test/PackageManagement.Tests.csproj +++ b/src/AddIns/Misc/PackageManagement/Test/PackageManagement.Tests.csproj @@ -360,10 +360,6 @@ {0162E499-42D0-409B-AA25-EED21F75336B} AvalonEdit.AddIn - - {F7886FB7-3764-4574-B981-25EB164B532E} - PackageManagement.EnvDTEHelpers - {A406803B-C584-43A3-BCEE-A0BB3132CB5F} PackageManagement.PowerShell @@ -372,6 +368,10 @@ {AE4AB0FA-6087-4480-AF37-0FA1452B3DA1} PackageManagement + + {6FB1260D-68A2-41A0-BB09-F5F710842E99} + SharpDevelop.EnvDTE + diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/ClassCodeGeneratorTests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/ClassCodeGeneratorTests.cs index 1bfda086e8..7fe1237516 100644 --- a/src/AddIns/Misc/PackageManagement/Test/Src/ClassCodeGeneratorTests.cs +++ b/src/AddIns/Misc/PackageManagement/Test/Src/ClassCodeGeneratorTests.cs @@ -137,8 +137,8 @@ namespace PackageManagement.Tests AddPublicVariable("MyVariable", "System.String"); - TextPoint start = codeVariable.GetStartPoint(); - TextPoint end = codeVariable.GetEndPoint(); + TextPoint start = (TextPoint)codeVariable.GetStartPoint(); + TextPoint end = (TextPoint)codeVariable.GetEndPoint(); Assert.AreEqual("MyVariable", codeVariable.Name); Assert.AreEqual(1, start.Line); Assert.AreEqual(2, start.LineCharOffset); @@ -264,8 +264,8 @@ namespace PackageManagement.Tests AddPublicMethod("MyMethod", "System.String"); - TextPoint start = codeFunction.GetStartPoint(); - TextPoint end = codeFunction.GetEndPoint(); + TextPoint start = (TextPoint)codeFunction.GetStartPoint(); + TextPoint end = (TextPoint)codeFunction.GetEndPoint(); Assert.AreEqual("MyMethod", codeFunction.Name); Assert.AreEqual(1, start.Line); Assert.AreEqual(2, start.LineCharOffset); diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeAttribute2Tests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeAttribute2Tests.cs index 4a6bf59640..a4a4a0af08 100644 --- a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeAttribute2Tests.cs +++ b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeAttribute2Tests.cs @@ -96,7 +96,7 @@ namespace PackageManagement.Tests.EnvDTE helper.AddPositionalArguments("StringValue"); CreateAttribute(); - CodeElements args = codeAttribute.Arguments; + global::EnvDTE.CodeElements args = codeAttribute.Arguments; CodeAttributeArgument attributeArg = args.FirstCodeAttributeArgumentOrDefault(); @@ -112,7 +112,7 @@ namespace PackageManagement.Tests.EnvDTE helper.AddNamedArgument("Name", "StringValue"); CreateAttribute(); - CodeElements args = codeAttribute.Arguments; + global::EnvDTE.CodeElements args = codeAttribute.Arguments; CodeAttributeArgument attributeArg = args.FirstCodeAttributeArgumentOrDefault(); @@ -127,7 +127,7 @@ namespace PackageManagement.Tests.EnvDTE helper.AddPositionalArguments("StringValue", false); CreateAttribute(); - CodeElements args = codeAttribute.Arguments; + global::EnvDTE.CodeElements args = codeAttribute.Arguments; CodeAttributeArgument arg = args.Item(2) as CodeAttributeArgument; @@ -142,7 +142,7 @@ namespace PackageManagement.Tests.EnvDTE helper.AddNamedArgument("Two", false); CreateAttribute(); - CodeElements args = codeAttribute.Arguments; + global::EnvDTE.CodeElements args = codeAttribute.Arguments; CodeAttributeArgument arg = args.Item("Two") as CodeAttributeArgument; @@ -166,9 +166,9 @@ namespace PackageManagement.Tests.EnvDTE CreateMSBuildAttribute("System.ComponentModel.DataAnnotations.DisplayColumnAttribute"); CreateAttribute(); - vsCMElement kind = codeAttribute.Kind; + global::EnvDTE.vsCMElement kind = codeAttribute.Kind; - Assert.AreEqual(vsCMElement.vsCMElementAttribute, kind); + Assert.AreEqual(global::EnvDTE.vsCMElement.vsCMElementAttribute, kind); } } } diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeClass2Tests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeClass2Tests.cs index 90056df6c2..9ca7413188 100644 --- a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeClass2Tests.cs +++ b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeClass2Tests.cs @@ -138,9 +138,9 @@ namespace PackageManagement.Tests.EnvDTE CreateProjectContent(); CreatePublicClass("MyClass"); - vsCMAccess access = codeClass.Access; + global::EnvDTE.vsCMAccess access = codeClass.Access; - Assert.AreEqual(vsCMAccess.vsCMAccessPublic, access); + Assert.AreEqual(global::EnvDTE.vsCMAccess.vsCMAccessPublic, access); } [Test] @@ -149,9 +149,9 @@ namespace PackageManagement.Tests.EnvDTE CreateProjectContent(); CreatePrivateClass("MyClass"); - vsCMAccess access = codeClass.Access; + global::EnvDTE.vsCMAccess access = codeClass.Access; - Assert.AreEqual(vsCMAccess.vsCMAccessPrivate, access); + Assert.AreEqual(global::EnvDTE.vsCMAccess.vsCMAccessPrivate, access); } [Test] @@ -161,7 +161,7 @@ namespace PackageManagement.Tests.EnvDTE CreatePublicClass("MyClass"); AddInterfaceToClassBaseTypes("System.Collections.Generic.ICollection", "System.Collections.Generic.ICollection{System.String}"); - CodeElements codeElements = codeClass.ImplementedInterfaces; + global::EnvDTE.CodeElements codeElements = codeClass.ImplementedInterfaces; CodeInterface codeInterface = codeElements.FirstCodeInterfaceOrDefault(); Assert.AreEqual(1, codeElements.Count); @@ -175,7 +175,7 @@ namespace PackageManagement.Tests.EnvDTE CreatePublicClass("MyClass"); AddClassToClassBaseTypes("MyNamespace.MyBaseClass"); - CodeElements codeElements = codeClass.ImplementedInterfaces; + global::EnvDTE.CodeElements codeElements = codeClass.ImplementedInterfaces; Assert.AreEqual(0, codeElements.Count); } @@ -187,7 +187,7 @@ namespace PackageManagement.Tests.EnvDTE CreatePublicClass("MyClass"); AddBaseTypeToClass("System.Object"); - CodeElements codeElements = codeClass.Bases; + global::EnvDTE.CodeElements codeElements = codeClass.Bases; CodeClass2 baseClass = codeElements.FirstCodeClass2OrDefault(); Assert.AreEqual(1, codeElements.Count); @@ -201,7 +201,7 @@ namespace PackageManagement.Tests.EnvDTE CreateProjectContent(); CreatePublicClass("System.Object"); - CodeElements codeElements = codeClass.Bases; + global::EnvDTE.CodeElements codeElements = codeClass.Bases; Assert.AreEqual(0, codeElements.Count); } @@ -213,7 +213,7 @@ namespace PackageManagement.Tests.EnvDTE CreatePublicClass("MyClass"); AddMethodToClass("MyClass.MyMethod"); - CodeElements codeElements = codeClass.Members; + global::EnvDTE.CodeElements codeElements = codeClass.Members; CodeFunction2 codeFunction = codeElements.FirstCodeFunction2OrDefault(); Assert.AreEqual(1, codeElements.Count); @@ -227,7 +227,7 @@ namespace PackageManagement.Tests.EnvDTE CreatePublicClass("MyClass"); AddPropertyToClass("MyClass.MyProperty"); - CodeElements codeElements = codeClass.Members; + global::EnvDTE.CodeElements codeElements = codeClass.Members; CodeProperty2 codeFunction = codeElements.FirstCodeProperty2OrDefault(); Assert.AreEqual(1, codeElements.Count); @@ -241,7 +241,7 @@ namespace PackageManagement.Tests.EnvDTE CreatePublicClass("MyClass"); AddFieldToClass("MyClass.MyField"); - CodeElements codeElements = codeClass.Members; + global::EnvDTE.CodeElements codeElements = codeClass.Members; CodeVariable codeVariable = codeElements.FirstCodeVariableOrDefault(); Assert.AreEqual(1, codeElements.Count); @@ -254,9 +254,9 @@ namespace PackageManagement.Tests.EnvDTE CreateProjectContent(); CreatePublicClass("MyClass"); - vsCMElement kind = codeClass.Kind; + global::EnvDTE.vsCMElement kind = codeClass.Kind; - Assert.AreEqual(vsCMElement.vsCMElementClass, kind); + Assert.AreEqual(global::EnvDTE.vsCMElement.vsCMElementClass, kind); } [Test] @@ -267,7 +267,7 @@ namespace PackageManagement.Tests.EnvDTE helper.AddClassNamespace("MyNamespace.Test"); CreateClass(); - CodeNamespace codeNamespace = codeClass.Namespace; + global::EnvDTE.CodeNamespace codeNamespace = codeClass.Namespace; Assert.AreEqual("MyNamespace.Test", codeNamespace.FullName); } @@ -280,7 +280,7 @@ namespace PackageManagement.Tests.EnvDTE helper.AddClassNamespace("MyNamespace.Test"); CreateClass(); - CodeNamespace codeNamespace = codeClass.Namespace; + global::EnvDTE.CodeNamespace codeNamespace = codeClass.Namespace; Assert.AreEqual("MyNamespace.Test", codeNamespace.Name); } @@ -292,7 +292,7 @@ namespace PackageManagement.Tests.EnvDTE CreatePublicClass("MyNamespace.MyClass"); CreateClass(); - CodeElements partialClasses = codeClass.PartialClasses; + global::EnvDTE.CodeElements partialClasses = codeClass.PartialClasses; CodeClass firstClass = partialClasses.FirstCodeClass2OrDefault(); Assert.AreEqual(1, partialClasses.Count); @@ -345,9 +345,9 @@ namespace PackageManagement.Tests.EnvDTE CreatePublicClass("MyClass"); ClassIsPartial(); - vsCMClassKind kind = codeClass.ClassKind; + global::EnvDTE.vsCMClassKind kind = codeClass.ClassKind; - Assert.AreEqual(vsCMClassKind.vsCMClassKindPartialClass, kind); + Assert.AreEqual(global::EnvDTE.vsCMClassKind.vsCMClassKindPartialClass, kind); } [Test] @@ -356,9 +356,9 @@ namespace PackageManagement.Tests.EnvDTE CreateProjectContent(); CreatePublicClass("MyClass"); - vsCMClassKind kind = codeClass.ClassKind; + global::EnvDTE.vsCMClassKind kind = codeClass.ClassKind; - Assert.AreEqual(vsCMClassKind.vsCMClassKindMainClass, kind); + Assert.AreEqual(global::EnvDTE.vsCMClassKind.vsCMClassKindMainClass, kind); } [Test] @@ -391,7 +391,7 @@ namespace PackageManagement.Tests.EnvDTE CreateProjectContent(); CreatePublicClass("MyClass"); - codeClass.ClassKind = vsCMClassKind.vsCMClassKindPartialClass; + codeClass.ClassKind = global::EnvDTE.vsCMClassKind.vsCMClassKindPartialClass; classKindUpdater.AssertWasCalled(updater => updater.MakeClassPartial()); } @@ -402,7 +402,7 @@ namespace PackageManagement.Tests.EnvDTE CreateProjectContent(); CreatePublicClass("MyClass"); - Assert.Throws(() => codeClass.ClassKind = vsCMClassKind.vsCMClassKindMainClass); + Assert.Throws(() => codeClass.ClassKind = global::EnvDTE.vsCMClassKind.vsCMClassKindMainClass); } } } diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeDelegateTests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeDelegateTests.cs index def6241fcf..63fc572215 100644 --- a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeDelegateTests.cs +++ b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeDelegateTests.cs @@ -44,9 +44,9 @@ namespace PackageManagement.Tests.EnvDTE { CreatePublicDelegate("MyDelegate"); - vsCMAccess access = codeDelegate.Access; + global::EnvDTE.vsCMAccess access = codeDelegate.Access; - Assert.AreEqual(vsCMAccess.vsCMAccessPublic, access); + Assert.AreEqual(global::EnvDTE.vsCMAccess.vsCMAccessPublic, access); } [Test] @@ -54,9 +54,9 @@ namespace PackageManagement.Tests.EnvDTE { CreatePrivateDelegate("MyDelegate"); - vsCMAccess access = codeDelegate.Access; + global::EnvDTE.vsCMAccess access = codeDelegate.Access; - Assert.AreEqual(vsCMAccess.vsCMAccessPrivate, access); + Assert.AreEqual(global::EnvDTE.vsCMAccess.vsCMAccessPrivate, access); } [Test] @@ -64,9 +64,9 @@ namespace PackageManagement.Tests.EnvDTE { CreatePublicDelegate("MyDelegate"); - vsCMElement kind = codeDelegate.Kind; + global::EnvDTE.vsCMElement kind = codeDelegate.Kind; - Assert.AreEqual(vsCMElement.vsCMElementDelegate, kind); + Assert.AreEqual(global::EnvDTE.vsCMElement.vsCMElementDelegate, kind); } } } diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeFunction2Tests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeFunction2Tests.cs index ce4cac4b7f..9656b88d91 100644 --- a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeFunction2Tests.cs +++ b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeFunction2Tests.cs @@ -36,9 +36,9 @@ namespace PackageManagement.Tests.EnvDTE { CreatePublicFunction("MyClass.MyFunction"); - vsCMOverrideKind kind = codeFunction.OverrideKind; + global::EnvDTE.vsCMOverrideKind kind = codeFunction.OverrideKind; - Assert.AreEqual(vsCMOverrideKind.vsCMOverrideKindNone, kind); + Assert.AreEqual(global::EnvDTE.vsCMOverrideKind.vsCMOverrideKindNone, kind); } [Test] @@ -47,9 +47,9 @@ namespace PackageManagement.Tests.EnvDTE CreatePublicFunction("MyClass.MyFunction"); helper.MakeMethodAbstract(); - vsCMOverrideKind kind = codeFunction.OverrideKind; + global::EnvDTE.vsCMOverrideKind kind = codeFunction.OverrideKind; - Assert.AreEqual(vsCMOverrideKind.vsCMOverrideKindAbstract, kind); + Assert.AreEqual(global::EnvDTE.vsCMOverrideKind.vsCMOverrideKindAbstract, kind); } [Test] @@ -58,9 +58,9 @@ namespace PackageManagement.Tests.EnvDTE CreatePublicFunction("MyClass.MyFunction"); helper.MakeMethodVirtual(); - vsCMOverrideKind kind = codeFunction.OverrideKind; + global::EnvDTE.vsCMOverrideKind kind = codeFunction.OverrideKind; - Assert.AreEqual(vsCMOverrideKind.vsCMOverrideKindVirtual, kind); + Assert.AreEqual(global::EnvDTE.vsCMOverrideKind.vsCMOverrideKindVirtual, kind); } [Test] @@ -69,9 +69,9 @@ namespace PackageManagement.Tests.EnvDTE CreatePublicFunction("MyClass.MyFunction"); helper.MakeMethodOverride(); - vsCMOverrideKind kind = codeFunction.OverrideKind; + global::EnvDTE.vsCMOverrideKind kind = codeFunction.OverrideKind; - Assert.AreEqual(vsCMOverrideKind.vsCMOverrideKindOverride, kind); + Assert.AreEqual(global::EnvDTE.vsCMOverrideKind.vsCMOverrideKindOverride, kind); } [Test] @@ -80,9 +80,9 @@ namespace PackageManagement.Tests.EnvDTE CreatePublicFunction("MyClass.MyFunction"); helper.MakeMethodSealed(); - vsCMOverrideKind kind = codeFunction.OverrideKind; + global::EnvDTE.vsCMOverrideKind kind = codeFunction.OverrideKind; - Assert.AreEqual(vsCMOverrideKind.vsCMOverrideKindSealed, kind); + Assert.AreEqual(global::EnvDTE.vsCMOverrideKind.vsCMOverrideKindSealed, kind); } [Test] @@ -91,9 +91,9 @@ namespace PackageManagement.Tests.EnvDTE CreatePublicFunction("MyClass.MyFunction"); helper.MakeMethodNewOverride(); - vsCMOverrideKind kind = codeFunction.OverrideKind; + global::EnvDTE.vsCMOverrideKind kind = codeFunction.OverrideKind; - Assert.AreEqual(vsCMOverrideKind.vsCMOverrideKindNew, kind); + Assert.AreEqual(global::EnvDTE.vsCMOverrideKind.vsCMOverrideKindNew, kind); } [Test] diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeFunctionTests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeFunctionTests.cs index 8fcd19c0cd..bfd94c0212 100644 --- a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeFunctionTests.cs +++ b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeFunctionTests.cs @@ -103,9 +103,9 @@ namespace PackageManagement.Tests.EnvDTE { CreatePublicFunction("Class1.MyFunction"); - vsCMAccess access = codeFunction.Access; + global::EnvDTE.vsCMAccess access = codeFunction.Access; - Assert.AreEqual(vsCMAccess.vsCMAccessPublic, access); + Assert.AreEqual(global::EnvDTE.vsCMAccess.vsCMAccessPublic, access); } [Test] @@ -113,9 +113,9 @@ namespace PackageManagement.Tests.EnvDTE { CreatePrivateFunction("Class1.MyFunction"); - vsCMAccess access = codeFunction.Access; + global::EnvDTE.vsCMAccess access = codeFunction.Access; - Assert.AreEqual(vsCMAccess.vsCMAccessPrivate, access); + Assert.AreEqual(global::EnvDTE.vsCMAccess.vsCMAccessPrivate, access); } [Test] @@ -125,7 +125,7 @@ namespace PackageManagement.Tests.EnvDTE SetDeclaringType("Class1"); helper.FunctionStartsAtColumn(3); - TextPoint point = codeFunction.GetStartPoint(); + global::EnvDTE.TextPoint point = codeFunction.GetStartPoint(); int offset = point.LineCharOffset; Assert.AreEqual(3, offset); @@ -138,7 +138,7 @@ namespace PackageManagement.Tests.EnvDTE SetDeclaringType("Class1"); helper.FunctionStartsAtLine(2); - TextPoint point = codeFunction.GetStartPoint(); + global::EnvDTE.TextPoint point = codeFunction.GetStartPoint(); int line = point.Line; Assert.AreEqual(2, line); @@ -151,7 +151,7 @@ namespace PackageManagement.Tests.EnvDTE SetDeclaringType("Class1"); helper.FunctionBodyEndsAtColumn(4); - TextPoint point = codeFunction.GetEndPoint(); + global::EnvDTE.TextPoint point = codeFunction.GetEndPoint(); int offset = point.LineCharOffset; Assert.AreEqual(4, offset); @@ -164,7 +164,7 @@ namespace PackageManagement.Tests.EnvDTE SetDeclaringType("Class1"); helper.FunctionBodyEndsAtLine(4); - TextPoint point = codeFunction.GetEndPoint(); + global::EnvDTE.TextPoint point = codeFunction.GetEndPoint(); int line = point.Line; Assert.AreEqual(4, line); @@ -175,9 +175,9 @@ namespace PackageManagement.Tests.EnvDTE { CreatePublicFunction("MyFunction"); - vsCMElement kind = codeFunction.Kind; + global::EnvDTE.vsCMElement kind = codeFunction.Kind; - Assert.AreEqual(vsCMElement.vsCMElementFunction, kind); + Assert.AreEqual(global::EnvDTE.vsCMElement.vsCMElementFunction, kind); } [Test] @@ -188,7 +188,7 @@ namespace PackageManagement.Tests.EnvDTE helper.SetRegion(new DomRegion(1, 1, 1, 10)); helper.SetBodyRegion(new DomRegion(1, 10, 0, 0)); - TextPoint point = codeFunction.GetEndPoint(); + global::EnvDTE.TextPoint point = codeFunction.GetEndPoint(); Assert.AreEqual(1, point.Line); Assert.AreEqual(10, point.LineCharOffset); @@ -199,7 +199,7 @@ namespace PackageManagement.Tests.EnvDTE { CreatePublicFunction("MyClass.MyMethod"); - CodeElements parameters = codeFunction.Parameters; + global::EnvDTE.CodeElements parameters = codeFunction.Parameters; Assert.AreEqual(0, parameters.Count); } @@ -254,7 +254,7 @@ namespace PackageManagement.Tests.EnvDTE CreatePublicFunction("MyClass.MyFunction"); AddReturnTypeToMethod("System.String"); - CodeTypeRef2 typeRef = codeFunction.Type; + global::EnvDTE.CodeTypeRef2 typeRef = codeFunction.Type; Assert.AreEqual("System.String", typeRef.AsFullName); } @@ -265,7 +265,7 @@ namespace PackageManagement.Tests.EnvDTE CreatePublicFunction("MyClass.MyFunction"); AddReturnTypeToMethod("System.String"); - CodeTypeRef2 typeRef = codeFunction.Type; + global::EnvDTE.CodeTypeRef2 typeRef = codeFunction.Type; Assert.AreEqual("string", typeRef.AsString); } @@ -276,7 +276,7 @@ namespace PackageManagement.Tests.EnvDTE CreatePublicFunction("MyClass.MyFunction"); AddReturnTypeToMethod("System.String"); - CodeTypeRef2 typeRef = codeFunction.Type; + global::EnvDTE.CodeTypeRef2 typeRef = codeFunction.Type; Assert.AreEqual(codeFunction, typeRef.Parent); } @@ -286,9 +286,9 @@ namespace PackageManagement.Tests.EnvDTE { CreatePublicFunction("MyClass.MyFunction"); - vsCMFunction kind = codeFunction.FunctionKind; + global::EnvDTE.vsCMFunction kind = codeFunction.FunctionKind; - Assert.AreEqual(vsCMFunction.vsCMFunctionFunction, kind); + Assert.AreEqual(global::EnvDTE.vsCMFunction.vsCMFunctionFunction, kind); } [Test] @@ -296,9 +296,9 @@ namespace PackageManagement.Tests.EnvDTE { CreatePublicConstructor("MyClass.MyClass"); - vsCMFunction kind = codeFunction.FunctionKind; + global::EnvDTE.vsCMFunction kind = codeFunction.FunctionKind; - Assert.AreEqual(vsCMFunction.vsCMFunctionConstructor, kind); + Assert.AreEqual(global::EnvDTE.vsCMFunction.vsCMFunctionConstructor, kind); } [Test] @@ -370,7 +370,7 @@ namespace PackageManagement.Tests.EnvDTE CreatePublicFunction("MyClass.MyFunction"); AddMethodAttribute("System.ObsoleteAttribute"); - CodeElements attributes = codeFunction.Attributes; + global::EnvDTE.CodeElements attributes = codeFunction.Attributes; CodeAttribute2 attribute = attributes.FirstCodeAttribute2OrDefault(); Assert.AreEqual(1, attributes.Count); diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeImportTests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeImportTests.cs index b319f12a50..74e1f0d958 100644 --- a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeImportTests.cs +++ b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeImportTests.cs @@ -33,9 +33,9 @@ namespace PackageManagement.Tests.EnvDTE { CreateCodeImport("System.Xml"); - vsCMElement kind = codeImport.Kind; + global::EnvDTE.vsCMElement kind = codeImport.Kind; - Assert.AreEqual(vsCMElement.vsCMElementImportStmt, kind); + Assert.AreEqual(global::EnvDTE.vsCMElement.vsCMElementImportStmt, kind); } [Test] diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeInterfaceTests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeInterfaceTests.cs index f17a244ce5..fdc82970df 100644 --- a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeInterfaceTests.cs +++ b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeInterfaceTests.cs @@ -32,9 +32,9 @@ namespace PackageManagement.Tests.EnvDTE { CreateInterface(); - vsCMElement kind = codeInterface.Kind; + global::EnvDTE.vsCMElement kind = codeInterface.Kind; - Assert.AreEqual(vsCMElement.vsCMElementInterface, kind); + Assert.AreEqual(global::EnvDTE.vsCMElement.vsCMElementInterface, kind); } } } diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeModelTests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeModelTests.cs index 3837f0d9b7..c80bd3b7cf 100644 --- a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeModelTests.cs +++ b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeModelTests.cs @@ -57,7 +57,7 @@ namespace PackageManagement.Tests.EnvDTE { CreateCodeModel(); - CodeType codeType = codeModel.CodeTypeFromFullName("UnknownType"); + global::EnvDTE.CodeType codeType = codeModel.CodeTypeFromFullName("UnknownType"); Assert.IsNull(codeType); } @@ -102,8 +102,8 @@ namespace PackageManagement.Tests.EnvDTE CreateCodeModel(); helper.AddNamespaceCompletionEntryInNamespace(String.Empty, "Test"); - CodeElements codeElements = codeModel.CodeElements; - CodeNamespace codeNamespace = codeElements.FirstCodeNamespaceOrDefault(); + global::EnvDTE.CodeElements codeElements = codeModel.CodeElements; + global::EnvDTE.CodeNamespace codeNamespace = codeElements.FirstCodeNamespaceOrDefault(); Assert.AreEqual(1, codeElements.Count); Assert.AreEqual("Test", codeNamespace.FullName); @@ -117,8 +117,8 @@ namespace PackageManagement.Tests.EnvDTE helper.AddNamespaceCompletionEntryInNamespace(String.Empty, "First"); helper.AddNamespaceCompletionEntryInNamespace("First", "Second"); - CodeElements codeElements = codeModel.CodeElements; - CodeNamespace codeNamespace = codeElements.FirstCodeNamespaceOrDefault(); + global::EnvDTE.CodeElements codeElements = codeModel.CodeElements; + global::EnvDTE.CodeNamespace codeNamespace = codeElements.FirstCodeNamespaceOrDefault(); Assert.AreEqual(1, codeElements.Count); Assert.AreEqual("First", codeNamespace.FullName); @@ -131,7 +131,7 @@ namespace PackageManagement.Tests.EnvDTE CreateCodeModel(); AddClassToProjectContent(String.Empty, "TestClass"); - CodeElements codeElements = codeModel.CodeElements; + global::EnvDTE.CodeElements codeElements = codeModel.CodeElements; CodeClass2 codeClass = codeElements.FirstCodeClass2OrDefault(); Assert.AreEqual(1, codeElements.Count); @@ -147,10 +147,10 @@ namespace PackageManagement.Tests.EnvDTE helper.NoCompletionItemsInNamespace("First.A"); helper.NoCompletionItemsInNamespace("First.B"); - CodeElements codeElements = codeModel.CodeElements; + global::EnvDTE.CodeElements codeElements = codeModel.CodeElements; CodeNamespace codeNamespace = codeElements.FirstCodeNamespaceOrDefault(); - CodeElements members = codeNamespace.Members; + global::EnvDTE.CodeElements members = codeNamespace.Members; CodeNamespace firstChildNamespace = members.FirstCodeNamespaceOrDefault(); CodeNamespace secondChildNamespace = members.LastCodeNamespaceOrDefault(); @@ -167,7 +167,7 @@ namespace PackageManagement.Tests.EnvDTE CreateCodeModel(); helper.AddNamespaceCompletionEntriesInNamespace(String.Empty, String.Empty, "Tests"); - CodeElements members = codeModel.CodeElements; + global::EnvDTE.CodeElements members = codeModel.CodeElements; CodeNamespace codeNamespace = members.FirstCodeNamespaceOrDefault(); Assert.AreEqual(1, members.Count); @@ -182,7 +182,7 @@ namespace PackageManagement.Tests.EnvDTE var codeClass = codeModel.CodeTypeFromFullName("Tests.TestClass") as CodeClass2; - Assert.AreEqual(vsCMInfoLocation.vsCMInfoLocationProject, codeClass.InfoLocation); + Assert.AreEqual(global::EnvDTE.vsCMInfoLocation.vsCMInfoLocationProject, codeClass.InfoLocation); } [Test] @@ -193,7 +193,7 @@ namespace PackageManagement.Tests.EnvDTE var codeClass = codeModel.CodeTypeFromFullName("Tests.TestClass") as CodeClass2; - Assert.AreEqual(vsCMInfoLocation.vsCMInfoLocationExternal, codeClass.InfoLocation); + Assert.AreEqual(global::EnvDTE.vsCMInfoLocation.vsCMInfoLocationExternal, codeClass.InfoLocation); } [Test] @@ -204,7 +204,7 @@ namespace PackageManagement.Tests.EnvDTE var codeInterface = codeModel.CodeTypeFromFullName("Tests.ITest") as CodeInterface; - Assert.AreEqual(vsCMInfoLocation.vsCMInfoLocationProject, codeInterface.InfoLocation); + Assert.AreEqual(global::EnvDTE.vsCMInfoLocation.vsCMInfoLocationProject, codeInterface.InfoLocation); } [Test] @@ -215,7 +215,7 @@ namespace PackageManagement.Tests.EnvDTE var codeInterface = codeModel.CodeTypeFromFullName("Tests.ITest") as CodeInterface; - Assert.AreEqual(vsCMInfoLocation.vsCMInfoLocationExternal, codeInterface.InfoLocation); + Assert.AreEqual(global::EnvDTE.vsCMInfoLocation.vsCMInfoLocationExternal, codeInterface.InfoLocation); } } } diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeNamespaceTests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeNamespaceTests.cs index a540ebcc1f..ed20292651 100644 --- a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeNamespaceTests.cs +++ b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeNamespaceTests.cs @@ -42,7 +42,7 @@ namespace PackageManagement.Tests.EnvDTE AddClassToProjectContent("Tests", "Tests.MyClass"); CreateCodeNamespace("Tests"); - CodeElements members = codeNamespace.Members; + global::EnvDTE.CodeElements members = codeNamespace.Members; CodeClass2 codeClass = members.FirstCodeClass2OrDefault(); Assert.AreEqual(1, members.Count); @@ -56,7 +56,7 @@ namespace PackageManagement.Tests.EnvDTE helper.AddNamespaceCompletionEntryInNamespace("First", "Second"); CreateCodeNamespace("First"); - CodeElements members = codeNamespace.Members; + global::EnvDTE.CodeElements members = codeNamespace.Members; CodeNamespace childNamespace = members.FirstCodeNamespaceOrDefault(); Assert.AreEqual("First", codeNamespace.Name); @@ -71,7 +71,7 @@ namespace PackageManagement.Tests.EnvDTE CreateProjectContent(); CreateCodeNamespace("Test"); - Assert.AreEqual(vsCMInfoLocation.vsCMInfoLocationExternal, codeNamespace.InfoLocation); + Assert.AreEqual(global::EnvDTE.vsCMInfoLocation.vsCMInfoLocationExternal, codeNamespace.InfoLocation); } [Test] @@ -83,7 +83,7 @@ namespace PackageManagement.Tests.EnvDTE helper.NoCompletionItemsInNamespace("First.Second.Third"); CreateCodeNamespace("First"); - CodeElements members = codeNamespace.Members; + global::EnvDTE.CodeElements members = codeNamespace.Members; CodeNamespace secondNamespace = members.FirstCodeNamespaceOrDefault(); CodeNamespace thirdNamespace = secondNamespace.Members.FirstCodeNamespaceOrDefault(); @@ -104,7 +104,7 @@ namespace PackageManagement.Tests.EnvDTE helper.AddNamespaceCompletionEntriesInNamespace("First.Second", "Third", "Different"); CreateCodeNamespace("First"); - CodeElements members = codeNamespace.Members; + global::EnvDTE.CodeElements members = codeNamespace.Members; CodeNamespace secondNamespace = members.FirstOrDefault() as CodeNamespace; Assert.AreEqual("First", codeNamespace.Name); @@ -121,7 +121,7 @@ namespace PackageManagement.Tests.EnvDTE AddUnknownCompletionEntryToNamespace("Tests"); CreateCodeNamespace("Tests"); - CodeElements members = codeNamespace.Members; + global::EnvDTE.CodeElements members = codeNamespace.Members; Assert.AreEqual(0, members.Count); } @@ -156,9 +156,9 @@ namespace PackageManagement.Tests.EnvDTE CreateProjectContent(); CreateCodeNamespace(String.Empty); - vsCMElement kind = codeNamespace.Kind; + global::EnvDTE.vsCMElement kind = codeNamespace.Kind; - Assert.AreEqual(vsCMElement.vsCMElementNamespace, kind); + Assert.AreEqual(global::EnvDTE.vsCMElement.vsCMElementNamespace, kind); } } } diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeParameter2Tests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeParameter2Tests.cs index ad0b6d934d..6dcdc36ccc 100644 --- a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeParameter2Tests.cs +++ b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeParameter2Tests.cs @@ -30,9 +30,9 @@ namespace PackageManagement.Tests.EnvDTE { CreateParameter(); - vsCMParameterKind kind = parameter.ParameterKind; + global::EnvDTE.vsCMParameterKind kind = parameter.ParameterKind; - Assert.AreEqual(vsCMParameterKind.vsCMParameterKindNone, kind); + Assert.AreEqual(global::EnvDTE.vsCMParameterKind.vsCMParameterKindNone, kind); } [Test] @@ -41,9 +41,9 @@ namespace PackageManagement.Tests.EnvDTE CreateParameter(); helper.MakeOptionalParameter(); - vsCMParameterKind kind = parameter.ParameterKind; + global::EnvDTE.vsCMParameterKind kind = parameter.ParameterKind; - Assert.AreEqual(vsCMParameterKind.vsCMParameterKindOptional, kind); + Assert.AreEqual(global::EnvDTE.vsCMParameterKind.vsCMParameterKindOptional, kind); } [Test] @@ -52,9 +52,9 @@ namespace PackageManagement.Tests.EnvDTE CreateParameter(); helper.MakeOutParameter(); - vsCMParameterKind kind = parameter.ParameterKind; + global::EnvDTE.vsCMParameterKind kind = parameter.ParameterKind; - Assert.AreEqual(vsCMParameterKind.vsCMParameterKindOut, kind); + Assert.AreEqual(global::EnvDTE.vsCMParameterKind.vsCMParameterKindOut, kind); } [Test] @@ -63,9 +63,9 @@ namespace PackageManagement.Tests.EnvDTE CreateParameter(); helper.MakeRefParameter(); - vsCMParameterKind kind = parameter.ParameterKind; + global::EnvDTE.vsCMParameterKind kind = parameter.ParameterKind; - Assert.AreEqual(vsCMParameterKind.vsCMParameterKindRef, kind); + Assert.AreEqual(global::EnvDTE.vsCMParameterKind.vsCMParameterKindRef, kind); } [Test] @@ -74,9 +74,9 @@ namespace PackageManagement.Tests.EnvDTE CreateParameter(); helper.MakeParamArrayParameter(); - vsCMParameterKind kind = parameter.ParameterKind; + global::EnvDTE.vsCMParameterKind kind = parameter.ParameterKind; - Assert.AreEqual(vsCMParameterKind.vsCMParameterKindParamArray, kind); + Assert.AreEqual(global::EnvDTE.vsCMParameterKind.vsCMParameterKindParamArray, kind); } [Test] @@ -85,9 +85,9 @@ namespace PackageManagement.Tests.EnvDTE CreateParameter(); helper.MakeInParameter(); - vsCMParameterKind kind = parameter.ParameterKind; + global::EnvDTE.vsCMParameterKind kind = parameter.ParameterKind; - Assert.AreEqual(vsCMParameterKind.vsCMParameterKindIn, kind); + Assert.AreEqual(global::EnvDTE.vsCMParameterKind.vsCMParameterKindIn, kind); } } } diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeParameterTests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeParameterTests.cs index f596afbfe9..690c5891bf 100644 --- a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeParameterTests.cs +++ b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeParameterTests.cs @@ -30,9 +30,9 @@ namespace PackageManagement.Tests.EnvDTE { CreateParameter(); - vsCMElement kind = parameter.Kind; + global::EnvDTE.vsCMElement kind = parameter.Kind; - Assert.AreEqual(vsCMElement.vsCMElementParameter, kind); + Assert.AreEqual(global::EnvDTE.vsCMElement.vsCMElementParameter, kind); } [Test] @@ -41,7 +41,7 @@ namespace PackageManagement.Tests.EnvDTE CreateParameter(); helper.AddAttributeToParameter("System.Web.Mvc.BindAttribute"); - CodeElements attributes = parameter.Attributes; + global::EnvDTE.CodeElements attributes = parameter.Attributes; CodeAttribute2 attribute = parameter.Attributes.FirstCodeAttribute2OrDefault(); Assert.AreEqual(1, attributes.Count); diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeProperty2Tests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeProperty2Tests.cs index 4c030cef73..4618607501 100644 --- a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeProperty2Tests.cs +++ b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeProperty2Tests.cs @@ -32,7 +32,7 @@ namespace PackageManagement.Tests.EnvDTE helper.AddAttribute("Tests.TestAttribute", "TestAttribute"); CreateCodeProperty2(); - CodeElements attributes = property.Attributes; + global::EnvDTE.CodeElements attributes = property.Attributes; CodeAttribute2 attribute = attributes.Item(1) as CodeAttribute2; @@ -58,7 +58,7 @@ namespace PackageManagement.Tests.EnvDTE helper.AddParentClass("Tests.Class1"); CreateCodeProperty2(); - CodeClass parentClass = property.Parent; + global::EnvDTE.CodeClass parentClass = property.Parent; Assert.AreEqual("Tests.Class1", parentClass.FullName); } @@ -69,9 +69,9 @@ namespace PackageManagement.Tests.EnvDTE helper.CreatePublicProperty("MyProperty"); CreateCodeProperty2(); - vsCMAccess access = property.Access; + global::EnvDTE.vsCMAccess access = property.Access; - Assert.AreEqual(vsCMAccess.vsCMAccessPublic, access); + Assert.AreEqual(global::EnvDTE.vsCMAccess.vsCMAccessPublic, access); } [Test] @@ -80,9 +80,9 @@ namespace PackageManagement.Tests.EnvDTE helper.CreatePrivateProperty("MyProperty"); CreateCodeProperty2(); - vsCMAccess access = property.Access; + global::EnvDTE.vsCMAccess access = property.Access; - Assert.AreEqual(vsCMAccess.vsCMAccessPrivate, access); + Assert.AreEqual(global::EnvDTE.vsCMAccess.vsCMAccessPrivate, access); } [Test] @@ -92,9 +92,9 @@ namespace PackageManagement.Tests.EnvDTE helper.HasGetterAndSetter(); CreateCodeProperty2(); - vsCMPropertyKind kind = property.ReadWrite; + global::EnvDTE.vsCMPropertyKind kind = property.ReadWrite; - Assert.AreEqual(vsCMPropertyKind.vsCMPropertyKindReadWrite, kind); + Assert.AreEqual(global::EnvDTE.vsCMPropertyKind.vsCMPropertyKindReadWrite, kind); } [Test] @@ -104,9 +104,9 @@ namespace PackageManagement.Tests.EnvDTE helper.HasGetterOnly(); CreateCodeProperty2(); - vsCMPropertyKind kind = property.ReadWrite; + global::EnvDTE.vsCMPropertyKind kind = property.ReadWrite; - Assert.AreEqual(vsCMPropertyKind.vsCMPropertyKindReadOnly, kind); + Assert.AreEqual(global::EnvDTE.vsCMPropertyKind.vsCMPropertyKindReadOnly, kind); } [Test] @@ -116,9 +116,9 @@ namespace PackageManagement.Tests.EnvDTE helper.HasSetterOnly(); CreateCodeProperty2(); - vsCMPropertyKind kind = property.ReadWrite; + global::EnvDTE.vsCMPropertyKind kind = property.ReadWrite; - Assert.AreEqual(vsCMPropertyKind.vsCMPropertyKindWriteOnly, kind); + Assert.AreEqual(global::EnvDTE.vsCMPropertyKind.vsCMPropertyKindWriteOnly, kind); } [Test] @@ -128,7 +128,7 @@ namespace PackageManagement.Tests.EnvDTE helper.AddParameter("item"); CreateCodeProperty2(); - CodeElements parameters = property.Parameters; + global::EnvDTE.CodeElements parameters = property.Parameters; CodeParameter parameter = parameters.FirstCodeParameterOrDefault(); Assert.AreEqual(1, parameters.Count); @@ -143,10 +143,10 @@ namespace PackageManagement.Tests.EnvDTE helper.GetterModifierIsNone(); CreateCodeProperty2(); - CodeFunction getter = property.Getter; - vsCMAccess access = getter.Access; + global::EnvDTE.CodeFunction getter = property.Getter; + global::EnvDTE.vsCMAccess access = getter.Access; - Assert.AreEqual(vsCMAccess.vsCMAccessPublic, access); + Assert.AreEqual(global::EnvDTE.vsCMAccess.vsCMAccessPublic, access); } [Test] @@ -157,10 +157,10 @@ namespace PackageManagement.Tests.EnvDTE helper.GetterModifierIsNone(); CreateCodeProperty2(); - CodeFunction getter = property.Getter; - vsCMAccess access = getter.Access; + global::EnvDTE.CodeFunction getter = property.Getter; + global::EnvDTE.vsCMAccess access = getter.Access; - Assert.AreEqual(vsCMAccess.vsCMAccessPrivate, access); + Assert.AreEqual(global::EnvDTE.vsCMAccess.vsCMAccessPrivate, access); } [Test] @@ -169,7 +169,7 @@ namespace PackageManagement.Tests.EnvDTE helper.CreatePublicProperty("MyProperty"); CreateCodeProperty2(); - CodeFunction getter = property.Getter; + global::EnvDTE.CodeFunction getter = property.Getter; Assert.IsNull(getter); } @@ -182,10 +182,10 @@ namespace PackageManagement.Tests.EnvDTE helper.GetterModifierIsPrivate(); CreateCodeProperty2(); - CodeFunction getter = property.Getter; - vsCMAccess access = getter.Access; + global::EnvDTE.CodeFunction getter = property.Getter; + global::EnvDTE.vsCMAccess access = getter.Access; - Assert.AreEqual(vsCMAccess.vsCMAccessPrivate, access); + Assert.AreEqual(global::EnvDTE.vsCMAccess.vsCMAccessPrivate, access); } [Test] @@ -196,10 +196,10 @@ namespace PackageManagement.Tests.EnvDTE helper.SetterModifierIsNone(); CreateCodeProperty2(); - CodeFunction setter = property.Setter; - vsCMAccess access = setter.Access; + global::EnvDTE.CodeFunction setter = property.Setter; + global::EnvDTE.vsCMAccess access = setter.Access; - Assert.AreEqual(vsCMAccess.vsCMAccessPublic, access); + Assert.AreEqual(global::EnvDTE.vsCMAccess.vsCMAccessPublic, access); } [Test] @@ -210,10 +210,10 @@ namespace PackageManagement.Tests.EnvDTE helper.SetterModifierIsNone(); CreateCodeProperty2(); - CodeFunction setter = property.Setter; - vsCMAccess access = setter.Access; + global::EnvDTE.CodeFunction setter = property.Setter; + global::EnvDTE.vsCMAccess access = setter.Access; - Assert.AreEqual(vsCMAccess.vsCMAccessPrivate, access); + Assert.AreEqual(global::EnvDTE.vsCMAccess.vsCMAccessPrivate, access); } [Test] @@ -222,7 +222,7 @@ namespace PackageManagement.Tests.EnvDTE helper.CreatePublicProperty("MyProperty"); CreateCodeProperty2(); - CodeFunction setter = property.Setter; + global::EnvDTE.CodeFunction setter = property.Setter; Assert.IsNull(setter); } @@ -235,10 +235,10 @@ namespace PackageManagement.Tests.EnvDTE helper.SetterModifierIsPrivate(); CreateCodeProperty2(); - CodeFunction setter = property.Setter; - vsCMAccess access = setter.Access; + global::EnvDTE.CodeFunction setter = property.Setter; + global::EnvDTE.vsCMAccess access = setter.Access; - Assert.AreEqual(vsCMAccess.vsCMAccessPrivate, access); + Assert.AreEqual(global::EnvDTE.vsCMAccess.vsCMAccessPrivate, access); } [Test] @@ -248,7 +248,7 @@ namespace PackageManagement.Tests.EnvDTE helper.SetPropertyReturnType("System.String"); CreateCodeProperty2(); - CodeTypeRef typeRef = property.Type; + global::EnvDTE.CodeTypeRef typeRef = property.Type; string fullName = typeRef.AsFullName; Assert.AreEqual("System.String", fullName); @@ -261,8 +261,8 @@ namespace PackageManagement.Tests.EnvDTE helper.SetPropertyReturnType("System.String"); CreateCodeProperty2(); - CodeTypeRef typeRef = property.Type; - CodeElement parent = typeRef.Parent; + global::EnvDTE.CodeTypeRef typeRef = property.Type; + global::EnvDTE.CodeElement parent = typeRef.Parent; Assert.AreEqual(property, parent); } @@ -279,10 +279,10 @@ namespace PackageManagement.Tests.EnvDTE helper.ReturnTypeHelper.AddUnderlyingClass(classHelper.Class); CreateCodeProperty2(); - CodeTypeRef typeRef = property.Type; - vsCMInfoLocation location = typeRef.CodeType.InfoLocation; + global::EnvDTE.CodeTypeRef typeRef = property.Type; + global::EnvDTE.vsCMInfoLocation location = typeRef.CodeType.InfoLocation; - Assert.AreEqual(vsCMInfoLocation.vsCMInfoLocationExternal, location); + Assert.AreEqual(global::EnvDTE.vsCMInfoLocation.vsCMInfoLocationExternal, location); } [Test] @@ -297,10 +297,10 @@ namespace PackageManagement.Tests.EnvDTE helper.ReturnTypeHelper.AddUnderlyingClass(classHelper.Class); CreateCodeProperty2(); - CodeTypeRef typeRef = property.Type; - vsCMInfoLocation location = typeRef.CodeType.InfoLocation; + global::EnvDTE.CodeTypeRef typeRef = property.Type; + global::EnvDTE.vsCMInfoLocation location = typeRef.CodeType.InfoLocation; - Assert.AreEqual(vsCMInfoLocation.vsCMInfoLocationProject, location); + Assert.AreEqual(global::EnvDTE.vsCMInfoLocation.vsCMInfoLocationProject, location); } [Test] @@ -308,9 +308,9 @@ namespace PackageManagement.Tests.EnvDTE { helper.CreatePublicProperty("MyProperty"); - vsCMElement kind = property.Kind; + global::EnvDTE.vsCMElement kind = property.Kind; - Assert.AreEqual(vsCMElement.vsCMElementProperty, kind); + Assert.AreEqual(global::EnvDTE.vsCMElement.vsCMElementProperty, kind); } } } diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeStructTests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeStructTests.cs index 5bc98df487..159af8f1b5 100644 --- a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeStructTests.cs +++ b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeStructTests.cs @@ -44,9 +44,9 @@ namespace PackageManagement.Tests.EnvDTE { CreatePublicStruct("MyStruct"); - vsCMAccess access = codeStruct.Access; + global::EnvDTE.vsCMAccess access = codeStruct.Access; - Assert.AreEqual(vsCMAccess.vsCMAccessPublic, access); + Assert.AreEqual(global::EnvDTE.vsCMAccess.vsCMAccessPublic, access); } [Test] @@ -54,9 +54,9 @@ namespace PackageManagement.Tests.EnvDTE { CreatePrivateStruct("MyStruct"); - vsCMAccess access = codeStruct.Access; + global::EnvDTE.vsCMAccess access = codeStruct.Access; - Assert.AreEqual(vsCMAccess.vsCMAccessPrivate, access); + Assert.AreEqual(global::EnvDTE.vsCMAccess.vsCMAccessPrivate, access); } [Test] @@ -64,9 +64,9 @@ namespace PackageManagement.Tests.EnvDTE { CreatePublicStruct("MyStruct"); - vsCMElement kind = codeStruct.Kind; + global::EnvDTE.vsCMElement kind = codeStruct.Kind; - Assert.AreEqual(vsCMElement.vsCMElementStruct, kind); + Assert.AreEqual(global::EnvDTE.vsCMElement.vsCMElementStruct, kind); } } } diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeTypeRef2Tests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeTypeRef2Tests.cs index 68a2acad41..bb8ba254e5 100644 --- a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeTypeRef2Tests.cs +++ b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeTypeRef2Tests.cs @@ -80,9 +80,9 @@ namespace PackageManagement.Tests.EnvDTE CreateCodeTypeRef2(); CodeClass2 codeClass = typeRef.CodeType as CodeClass2; - vsCMInfoLocation location = codeClass.InfoLocation; + global::EnvDTE.vsCMInfoLocation location = codeClass.InfoLocation; - Assert.AreEqual(vsCMInfoLocation.vsCMInfoLocationExternal, location); + Assert.AreEqual(global::EnvDTE.vsCMInfoLocation.vsCMInfoLocationExternal, location); } [Test] @@ -94,9 +94,9 @@ namespace PackageManagement.Tests.EnvDTE CreateCodeTypeRef2(); CodeClass2 codeClass = typeRef.CodeType as CodeClass2; - vsCMInfoLocation location = codeClass.InfoLocation; + global::EnvDTE.vsCMInfoLocation location = codeClass.InfoLocation; - Assert.AreEqual(vsCMInfoLocation.vsCMInfoLocationProject, location); + Assert.AreEqual(global::EnvDTE.vsCMInfoLocation.vsCMInfoLocationProject, location); } [Test] @@ -196,9 +196,9 @@ namespace PackageManagement.Tests.EnvDTE helper.MakeReferenceType(); CreateCodeTypeRef2(); - vsCMTypeRef kind = typeRef.TypeKind; + global::EnvDTE.vsCMTypeRef kind = typeRef.TypeKind; - Assert.AreEqual(vsCMTypeRef.vsCMTypeRefCodeType, kind); + Assert.AreEqual(global::EnvDTE.vsCMTypeRef.vsCMTypeRefCodeType, kind); } [Test] @@ -207,9 +207,9 @@ namespace PackageManagement.Tests.EnvDTE helper.CreateReturnType("Test.MyClass"); CreateCodeTypeRef2(); - vsCMTypeRef kind = typeRef.TypeKind; + global::EnvDTE.vsCMTypeRef kind = typeRef.TypeKind; - Assert.AreEqual(vsCMTypeRef.vsCMTypeRefOther, kind); + Assert.AreEqual(global::EnvDTE.vsCMTypeRef.vsCMTypeRefOther, kind); } [Test] @@ -218,9 +218,9 @@ namespace PackageManagement.Tests.EnvDTE helper.CreateReturnType("System.Void"); CreateCodeTypeRef2(); - vsCMTypeRef kind = typeRef.TypeKind; + global::EnvDTE.vsCMTypeRef kind = typeRef.TypeKind; - Assert.AreEqual(vsCMTypeRef.vsCMTypeRefVoid, kind); + Assert.AreEqual(global::EnvDTE.vsCMTypeRef.vsCMTypeRefVoid, kind); } [Test] @@ -230,9 +230,9 @@ namespace PackageManagement.Tests.EnvDTE helper.MakeReferenceType(); CreateCodeTypeRef2(); - vsCMTypeRef kind = typeRef.TypeKind; + global::EnvDTE.vsCMTypeRef kind = typeRef.TypeKind; - Assert.AreEqual(vsCMTypeRef.vsCMTypeRefString, kind); + Assert.AreEqual(global::EnvDTE.vsCMTypeRef.vsCMTypeRefString, kind); } [Test] @@ -241,9 +241,9 @@ namespace PackageManagement.Tests.EnvDTE helper.CreateReturnType("System.Boolean"); CreateCodeTypeRef2(); - vsCMTypeRef kind = typeRef.TypeKind; + global::EnvDTE.vsCMTypeRef kind = typeRef.TypeKind; - Assert.AreEqual(vsCMTypeRef.vsCMTypeRefBool, kind); + Assert.AreEqual(global::EnvDTE.vsCMTypeRef.vsCMTypeRefBool, kind); } [Test] @@ -252,9 +252,9 @@ namespace PackageManagement.Tests.EnvDTE helper.CreateReturnType("System.Byte"); CreateCodeTypeRef2(); - vsCMTypeRef kind = typeRef.TypeKind; + global::EnvDTE.vsCMTypeRef kind = typeRef.TypeKind; - Assert.AreEqual(vsCMTypeRef.vsCMTypeRefByte, kind); + Assert.AreEqual(global::EnvDTE.vsCMTypeRef.vsCMTypeRefByte, kind); } [Test] @@ -263,9 +263,9 @@ namespace PackageManagement.Tests.EnvDTE helper.CreateReturnType("System.Char"); CreateCodeTypeRef2(); - vsCMTypeRef kind = typeRef.TypeKind; + global::EnvDTE.vsCMTypeRef kind = typeRef.TypeKind; - Assert.AreEqual(vsCMTypeRef.vsCMTypeRefChar, kind); + Assert.AreEqual(global::EnvDTE.vsCMTypeRef.vsCMTypeRefChar, kind); } [Test] @@ -274,9 +274,9 @@ namespace PackageManagement.Tests.EnvDTE helper.CreateReturnType("System.Decimal"); CreateCodeTypeRef2(); - vsCMTypeRef kind = typeRef.TypeKind; + global::EnvDTE.vsCMTypeRef kind = typeRef.TypeKind; - Assert.AreEqual(vsCMTypeRef.vsCMTypeRefDecimal, kind); + Assert.AreEqual(global::EnvDTE.vsCMTypeRef.vsCMTypeRefDecimal, kind); } [Test] @@ -285,9 +285,9 @@ namespace PackageManagement.Tests.EnvDTE helper.CreateReturnType("System.Double"); CreateCodeTypeRef2(); - vsCMTypeRef kind = typeRef.TypeKind; + global::EnvDTE.vsCMTypeRef kind = typeRef.TypeKind; - Assert.AreEqual(vsCMTypeRef.vsCMTypeRefDouble, kind); + Assert.AreEqual(global::EnvDTE.vsCMTypeRef.vsCMTypeRefDouble, kind); } [Test] @@ -296,9 +296,9 @@ namespace PackageManagement.Tests.EnvDTE helper.CreateReturnType("System.Single"); CreateCodeTypeRef2(); - vsCMTypeRef kind = typeRef.TypeKind; + global::EnvDTE.vsCMTypeRef kind = typeRef.TypeKind; - Assert.AreEqual(vsCMTypeRef.vsCMTypeRefFloat, kind); + Assert.AreEqual(global::EnvDTE.vsCMTypeRef.vsCMTypeRefFloat, kind); } [Test] @@ -307,9 +307,9 @@ namespace PackageManagement.Tests.EnvDTE helper.CreateReturnType("System.Int32"); CreateCodeTypeRef2(); - vsCMTypeRef kind = typeRef.TypeKind; + global::EnvDTE.vsCMTypeRef kind = typeRef.TypeKind; - Assert.AreEqual(vsCMTypeRef.vsCMTypeRefInt, kind); + Assert.AreEqual(global::EnvDTE.vsCMTypeRef.vsCMTypeRefInt, kind); } [Test] @@ -318,9 +318,9 @@ namespace PackageManagement.Tests.EnvDTE helper.CreateReturnType("System.Int16"); CreateCodeTypeRef2(); - vsCMTypeRef kind = typeRef.TypeKind; + global::EnvDTE.vsCMTypeRef kind = typeRef.TypeKind; - Assert.AreEqual(vsCMTypeRef.vsCMTypeRefShort, kind); + Assert.AreEqual(global::EnvDTE.vsCMTypeRef.vsCMTypeRefShort, kind); } [Test] @@ -329,9 +329,9 @@ namespace PackageManagement.Tests.EnvDTE helper.CreateReturnType("System.Int64"); CreateCodeTypeRef2(); - vsCMTypeRef kind = typeRef.TypeKind; + global::EnvDTE.vsCMTypeRef kind = typeRef.TypeKind; - Assert.AreEqual(vsCMTypeRef.vsCMTypeRefLong, kind); + Assert.AreEqual(global::EnvDTE.vsCMTypeRef.vsCMTypeRefLong, kind); } [Test] @@ -340,9 +340,9 @@ namespace PackageManagement.Tests.EnvDTE helper.CreateReturnType("System.UInt32"); CreateCodeTypeRef2(); - vsCMTypeRef kind = typeRef.TypeKind; + global::EnvDTE.vsCMTypeRef kind = typeRef.TypeKind; - Assert.AreEqual(vsCMTypeRef.vsCMTypeRefInt, kind); + Assert.AreEqual(global::EnvDTE.vsCMTypeRef.vsCMTypeRefInt, kind); } [Test] @@ -351,9 +351,9 @@ namespace PackageManagement.Tests.EnvDTE helper.CreateReturnType("System.UInt16"); CreateCodeTypeRef2(); - vsCMTypeRef kind = typeRef.TypeKind; + global::EnvDTE.vsCMTypeRef kind = typeRef.TypeKind; - Assert.AreEqual(vsCMTypeRef.vsCMTypeRefShort, kind); + Assert.AreEqual(global::EnvDTE.vsCMTypeRef.vsCMTypeRefShort, kind); } [Test] @@ -362,9 +362,9 @@ namespace PackageManagement.Tests.EnvDTE helper.CreateReturnType("System.UInt64"); CreateCodeTypeRef2(); - vsCMTypeRef kind = typeRef.TypeKind; + global::EnvDTE.vsCMTypeRef kind = typeRef.TypeKind; - Assert.AreEqual(vsCMTypeRef.vsCMTypeRefLong, kind); + Assert.AreEqual(global::EnvDTE.vsCMTypeRef.vsCMTypeRefLong, kind); } [Test] @@ -373,9 +373,9 @@ namespace PackageManagement.Tests.EnvDTE helper.CreateReturnType("System.Object"); CreateCodeTypeRef2(); - vsCMTypeRef kind = typeRef.TypeKind; + global::EnvDTE.vsCMTypeRef kind = typeRef.TypeKind; - Assert.AreEqual(vsCMTypeRef.vsCMTypeRefObject, kind); + Assert.AreEqual(global::EnvDTE.vsCMTypeRef.vsCMTypeRefObject, kind); } } } diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeTypeTests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeTypeTests.cs index 4935c36043..327b1a3a83 100644 --- a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeTypeTests.cs +++ b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeTypeTests.cs @@ -65,7 +65,7 @@ namespace PackageManagement.Tests.EnvDTE AddAttributeToClass("TestAttribute"); CreateCodeType(); - CodeElements attributes = codeType.Attributes; + global::EnvDTE.CodeElements attributes = codeType.Attributes; CodeAttribute2 attribute = attributes.Item(1) as CodeAttribute2; @@ -80,7 +80,7 @@ namespace PackageManagement.Tests.EnvDTE CreateClass("Class1"); CreateCodeType(); - ProjectItem item = codeType.ProjectItem; + global::EnvDTE.ProjectItem item = codeType.ProjectItem; Assert.IsNull(item); } @@ -94,7 +94,7 @@ namespace PackageManagement.Tests.EnvDTE CreateClass("Class1"); CreateCodeType(); - ProjectItem item = codeType.ProjectItem; + global::EnvDTE.ProjectItem item = codeType.ProjectItem; Assert.IsNotNull(item); } @@ -109,7 +109,7 @@ namespace PackageManagement.Tests.EnvDTE CreateClass("Class1"); CreateCodeType(); - ProjectItem item = codeType.ProjectItem; + global::EnvDTE.ProjectItem item = codeType.ProjectItem; Assert.AreEqual(@"d:\projects\MyProject\MyProject.csproj", item.ContainingProject.FileName); } @@ -125,7 +125,7 @@ namespace PackageManagement.Tests.EnvDTE CreateClass("Class1"); CreateCodeType(); - ProjectItem item = codeType.ProjectItem; + global::EnvDTE.ProjectItem item = codeType.ProjectItem; Assert.AreEqual("test.cs", item.Name); } diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeVariableTests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeVariableTests.cs index d85b98d199..3a2b961c4c 100644 --- a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeVariableTests.cs +++ b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeVariableTests.cs @@ -64,9 +64,9 @@ namespace PackageManagement.Tests.EnvDTE { CreatePublicVariable("MyVariable"); - vsCMAccess access = codeVariable.Access; + global::EnvDTE.vsCMAccess access = codeVariable.Access; - Assert.AreEqual(vsCMAccess.vsCMAccessPublic, access); + Assert.AreEqual(global::EnvDTE.vsCMAccess.vsCMAccessPublic, access); } [Test] @@ -74,9 +74,9 @@ namespace PackageManagement.Tests.EnvDTE { CreatePrivateVariable("MyVariable"); - vsCMAccess access = codeVariable.Access; + global::EnvDTE.vsCMAccess access = codeVariable.Access; - Assert.AreEqual(vsCMAccess.vsCMAccessPrivate, access); + Assert.AreEqual(global::EnvDTE.vsCMAccess.vsCMAccessPrivate, access); } [Test] @@ -85,7 +85,7 @@ namespace PackageManagement.Tests.EnvDTE CreatePublicVariable("MyVariable"); VariableStartsAtColumn(5); - TextPoint point = codeVariable.GetStartPoint(); + global::EnvDTE.TextPoint point = codeVariable.GetStartPoint(); int offset = point.LineCharOffset; Assert.AreEqual(5, offset); @@ -97,7 +97,7 @@ namespace PackageManagement.Tests.EnvDTE CreatePublicVariable("MyVariable"); VariableStartsAtLine(1); - TextPoint point = codeVariable.GetStartPoint(); + global::EnvDTE.TextPoint point = codeVariable.GetStartPoint(); int line = point.Line; Assert.AreEqual(1, line); @@ -109,7 +109,7 @@ namespace PackageManagement.Tests.EnvDTE CreatePublicVariable("MyVariable"); VariableEndsAtColumn(10); - TextPoint point = codeVariable.GetEndPoint(); + global::EnvDTE.TextPoint point = codeVariable.GetEndPoint(); int offset = point.LineCharOffset; Assert.AreEqual(10, offset); @@ -121,7 +121,7 @@ namespace PackageManagement.Tests.EnvDTE CreatePublicVariable("MyVariable"); VariableEndsAtLine(2); - TextPoint point = codeVariable.GetEndPoint(); + global::EnvDTE.TextPoint point = codeVariable.GetEndPoint(); int line = point.Line; Assert.AreEqual(2, line); @@ -132,9 +132,9 @@ namespace PackageManagement.Tests.EnvDTE { CreatePublicVariable("MyVariable"); - vsCMElement kind = codeVariable.Kind; + global::EnvDTE.vsCMElement kind = codeVariable.Kind; - Assert.AreEqual(vsCMElement.vsCMElementVariable, kind); + Assert.AreEqual(global::EnvDTE.vsCMElement.vsCMElementVariable, kind); } } } diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/DTETests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/DTETests.cs index 28ebcc8329..3e00dd7c9c 100644 --- a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/DTETests.cs +++ b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/DTETests.cs @@ -78,7 +78,7 @@ namespace PackageManagement.Tests.EnvDTE CreateDTE(); NoOpenSolution(); - Solution solution = dte.Solution; + global::EnvDTE.Solution solution = dte.Solution; Assert.IsNull(solution); } @@ -88,7 +88,7 @@ namespace PackageManagement.Tests.EnvDTE { CreateDTE(); - Properties properties = dte.Properties("FontsAndColors", "TextEditor"); + global::EnvDTE.Properties properties = dte.Properties("FontsAndColors", "TextEditor"); Assert.IsNotNull(properties); } @@ -98,7 +98,7 @@ namespace PackageManagement.Tests.EnvDTE { CreateDTE(); - Properties properties = dte.Properties("UnknownCategory", "UnknownPage"); + global::EnvDTE.Properties properties = dte.Properties("UnknownCategory", "UnknownPage"); Assert.IsNull(properties); } @@ -108,7 +108,7 @@ namespace PackageManagement.Tests.EnvDTE { CreateDTE(); - Properties properties = dte.Properties("FONTSANDCOLORS", "TEXTEDITOR"); + global::EnvDTE.Properties properties = dte.Properties("FONTSANDCOLORS", "TEXTEDITOR"); Assert.IsNotNull(properties); } @@ -175,7 +175,7 @@ namespace PackageManagement.Tests.EnvDTE { CreateDTE(); SetOpenSolutionFileName(@"d:\projects\first\first.sln"); - Solution firstSolution = dte.Solution; + global::EnvDTE.Solution firstSolution = dte.Solution; OpenSolution(@"d:\projects\second\second.sln"); diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/EditPointTests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/EditPointTests.cs index 1cf28aa08b..99063c1ad7 100644 --- a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/EditPointTests.cs +++ b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/EditPointTests.cs @@ -62,22 +62,22 @@ namespace PackageManagement.Tests.EnvDTE void CreateFieldEditPoint() { var codeVariable = new CodeVariable(fieldHelper.Field, documentLoader); - TextPoint startPoint = codeVariable.GetStartPoint(); - endPoint = codeVariable.GetEndPoint(); - editPoint = startPoint.CreateEditPoint(); + TextPoint startPoint = (TextPoint)codeVariable.GetStartPoint(); + endPoint = (TextPoint)codeVariable.GetEndPoint(); + editPoint = (EditPoint)startPoint.CreateEditPoint(); } void CreateMethodEditPoint() { var codeFunction = new CodeFunction(methodHelper.Method, documentLoader, null); - TextPoint startPoint = codeFunction.GetStartPoint(); - endPoint = codeFunction.GetEndPoint(); - editPoint = startPoint.CreateEditPoint(); + TextPoint startPoint = (TextPoint)codeFunction.GetStartPoint(); + endPoint = (TextPoint)codeFunction.GetEndPoint(); + editPoint = (EditPoint)startPoint.CreateEditPoint(); } void ReplaceText(string text) { - editPoint.ReplaceText(endPoint, text, (int)vsEPReplaceTextOptions.vsEPReplaceTextAutoformat); + editPoint.ReplaceText(endPoint, text, (int)global::EnvDTE.vsEPReplaceTextOptions.vsEPReplaceTextAutoformat); } void DocumentFileName(string fileName) diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/FileProjectItemsTests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/FileProjectItemsTests.cs index 9d6dff0c76..e61b0828cb 100644 --- a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/FileProjectItemsTests.cs +++ b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/FileProjectItemsTests.cs @@ -37,7 +37,7 @@ namespace PackageManagement.Tests.EnvDTE void CreateFileProjectItemsFromFileInProjectFolder(string include) { - DTE.ProjectItem projectItem = project.ProjectItems.Item(include); + DTE.ProjectItem projectItem = (DTE.ProjectItem)project.ProjectItems.Item(include); fileProjectItems = new DTE.FileProjectItems(projectItem, fakeFileService); } @@ -70,7 +70,7 @@ namespace PackageManagement.Tests.EnvDTE CreateFileProjectItemsFromFileInProjectFolder("MainForm.cs"); string fileName = @"d:\projects\myproject\MainForm.Designer.cs"; - DTE.ProjectItem itemAdded = fileProjectItems.AddFromFile(fileName); + global::EnvDTE.ProjectItem itemAdded = fileProjectItems.AddFromFile(fileName); string fullPath = (string)itemAdded.Properties.Item("FullPath").Value; Assert.AreEqual("MainForm.Designer.cs", itemAdded.Name); diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/FontsAndColorItemsTests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/FontsAndColorItemsTests.cs index 9c2b0d0495..3badf50af3 100644 --- a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/FontsAndColorItemsTests.cs +++ b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/FontsAndColorItemsTests.cs @@ -38,7 +38,7 @@ namespace PackageManagement.Tests.EnvDTE CreateFontsAndColorItems(); AddDefaultTextAndBackgroundColorToRules(); - ColorableItems colorableItems = items.Item("Plain Text"); + global::EnvDTE.ColorableItems colorableItems = items.Item("Plain Text"); string name = colorableItems.Name; Assert.AreEqual("Plain Text", name); @@ -50,7 +50,7 @@ namespace PackageManagement.Tests.EnvDTE CreateFontsAndColorItems(); AddDefaultTextAndBackgroundColorToRules(); - ColorableItems colorableItems = items.Item("Unknown item"); + global::EnvDTE.ColorableItems colorableItems = items.Item("Unknown item"); Assert.IsNull(colorableItems); } @@ -61,7 +61,7 @@ namespace PackageManagement.Tests.EnvDTE CreateFontsAndColorItems(); AddDefaultTextAndBackgroundColorToRules(); - ColorableItems colorableItems = items.Item("PLAIN TEXT"); + global::EnvDTE.ColorableItems colorableItems = items.Item("PLAIN TEXT"); string name = colorableItems.Name; Assert.AreEqual("Plain Text", name); @@ -74,7 +74,7 @@ namespace PackageManagement.Tests.EnvDTE CustomizedHighlightingColor defaultColor = AddDefaultTextAndBackgroundColorToRules(); defaultColor.Background = Colors.Blue; - ColorableItems colorableItems = items.Item("Plain Text"); + global::EnvDTE.ColorableItems colorableItems = items.Item("Plain Text"); uint backgroundOleColor = colorableItems.Background; Color backgroundColor = ColorHelper.ConvertToColor(backgroundOleColor); @@ -86,11 +86,11 @@ namespace PackageManagement.Tests.EnvDTE { CreateFontsAndColorItems(); - ColorableItems colorableItems = items.Item("Plain Text"); + global::EnvDTE.ColorableItems colorableItems = items.Item("Plain Text"); uint backgroundOleColor = colorableItems.Background; Color backgroundColor = ColorHelper.ConvertToColor(backgroundOleColor); - Assert.AreEqual(ColorableItems.DefaultBackgroundColor, backgroundColor); + Assert.AreEqual(ColorableItems.DefaultBackgroundColor, backgroundColor); } [Test] @@ -98,7 +98,7 @@ namespace PackageManagement.Tests.EnvDTE { CreateFontsAndColorItems(); - ColorableItems colorableItems = items.Item("Plain Text"); + global::EnvDTE.ColorableItems colorableItems = items.Item("Plain Text"); colorableItems.Bold = true; CustomizedHighlightingColor color = diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/ItemOperationsTests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/ItemOperationsTests.cs index ab8d37718b..53590333e4 100644 --- a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/ItemOperationsTests.cs +++ b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/ItemOperationsTests.cs @@ -22,7 +22,7 @@ namespace PackageManagement.Tests.EnvDTE fakeProjectService = new FakePackageManagementProjectService(); fakeFileService = new FakeFileService(null); dte = new DTE(fakeProjectService, fakeFileService); - itemOperations = dte.ItemOperations; + itemOperations = (ItemOperations)dte.ItemOperations; } [Test] diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/ProjectItemPropertyTests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/ProjectItemPropertyTests.cs index f6ceb2b12f..190c865964 100644 --- a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/ProjectItemPropertyTests.cs +++ b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/ProjectItemPropertyTests.cs @@ -27,7 +27,7 @@ namespace PackageManagement.Tests.EnvDTE msbuildProject = project.TestableProject; msbuildFileProjectItem = new SD.FileProjectItem(msbuildProject, SD.ItemType.Compile); projectItem = new ProjectItem(project, msbuildFileProjectItem); - properties = projectItem.Properties; + properties = (Properties)projectItem.Properties; } void AssertContainsProperty(string propertyName, IEnumerable items) diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/ProjectItemTests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/ProjectItemTests.cs index 801266f38a..bfeddc9c40 100644 --- a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/ProjectItemTests.cs +++ b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/ProjectItemTests.cs @@ -25,7 +25,7 @@ namespace PackageManagement.Tests.EnvDTE { project = new TestableDTEProject(); msbuildProject = project.TestableProject; - projectItems = project.ProjectItems; + projectItems = (ProjectItems)project.ProjectItems; fakeFileService = project.FakeFileService; } @@ -51,9 +51,9 @@ namespace PackageManagement.Tests.EnvDTE { CreateProjectItems(); msbuildProject.AddFile(@"src\program.cs"); - - ProjectItem directoryItem = projectItems.Item("src"); - ProjectItems directoryProjectItems = directoryItem.ProjectItems; + + global::EnvDTE.ProjectItem directoryItem = projectItems.Item("src"); + global::EnvDTE.ProjectItems directoryProjectItems = directoryItem.ProjectItems; string[] expectedFiles = new string[] { "program.cs" @@ -67,9 +67,9 @@ namespace PackageManagement.Tests.EnvDTE { CreateProjectItems(); msbuildProject.AddDirectory(@"src\test"); - - ProjectItem directoryItem = projectItems.Item("src"); - ProjectItems directoryProjectItems = directoryItem.ProjectItems; + + global::EnvDTE.ProjectItem directoryItem = projectItems.Item("src"); + global::EnvDTE.ProjectItems directoryProjectItems = directoryItem.ProjectItems; var items = directoryProjectItems as IEnumerable; string[] expectedItems = new string[] { @@ -85,9 +85,9 @@ namespace PackageManagement.Tests.EnvDTE CreateProjectItems(); msbuildProject.AddFile(@"src\test.cs"); msbuildProject.AddFile("program.cs"); - - ProjectItem directoryItem = projectItems.Item("src"); - ProjectItems directoryProjectItems = directoryItem.ProjectItems; + + global::EnvDTE.ProjectItem directoryItem = projectItems.Item("src"); + global::EnvDTE.ProjectItems directoryProjectItems = directoryItem.ProjectItems; var items = directoryProjectItems as IEnumerable; string[] expectedItems = new string[] { @@ -103,9 +103,9 @@ namespace PackageManagement.Tests.EnvDTE CreateProjectItems(); msbuildProject.AddFile(@"src\test\test.cs"); - ProjectItem directoryItem = projectItems.Item("src"); - ProjectItem testDirectoryItem = directoryItem.ProjectItems.Item("test"); - ProjectItems testDirectoryProjectItems = testDirectoryItem.ProjectItems; + global::EnvDTE.ProjectItem directoryItem = projectItems.Item("src"); + global::EnvDTE.ProjectItem testDirectoryItem = directoryItem.ProjectItems.Item("test"); + global::EnvDTE.ProjectItems testDirectoryProjectItems = testDirectoryItem.ProjectItems; var items = testDirectoryProjectItems as IEnumerable; string[] expectedItems = new string[] { @@ -121,11 +121,11 @@ namespace PackageManagement.Tests.EnvDTE CreateProjectItems(); msbuildProject.AddFile(@"src\program.cs"); - ProjectItem directoryItem = projectItems.Item("src"); + ProjectItem directoryItem = (ProjectItem)projectItems.Item("src"); string kind = directoryItem.Kind; - Assert.AreEqual(Constants.vsProjectItemKindPhysicalFolder, kind); + Assert.AreEqual(global::EnvDTE.Constants.vsProjectItemKindPhysicalFolder, kind); } [Test] @@ -134,12 +134,12 @@ namespace PackageManagement.Tests.EnvDTE CreateProjectItems(); msbuildProject.AddFile(@"src\program.cs"); - ProjectItem directoryItem = projectItems.Item("src"); - ProjectItem fileItem = directoryItem.ProjectItems.Item("program.cs"); + global::EnvDTE.ProjectItem directoryItem = projectItems.Item("src"); + global::EnvDTE.ProjectItem fileItem = directoryItem.ProjectItems.Item("program.cs"); string kind = fileItem.Kind; - Assert.AreEqual(Constants.vsProjectItemKindPhysicalFile, kind); + Assert.AreEqual(global::EnvDTE.Constants.vsProjectItemKindPhysicalFile, kind); } [Test] @@ -148,8 +148,8 @@ namespace PackageManagement.Tests.EnvDTE CreateProjectItems(); msbuildProject.FileName = @"d:\projects\myproject\myproject.csproj"; msbuildProject.AddFile(@"src\program.cs"); - ProjectItem directoryItem = projectItems.Item("src"); - ProjectItem fileItem = directoryItem.ProjectItems.Item("program.cs"); + global::EnvDTE.ProjectItem directoryItem = projectItems.Item("src"); + global::EnvDTE.ProjectItem fileItem = directoryItem.ProjectItems.Item("program.cs"); fileItem.Delete(); @@ -162,8 +162,8 @@ namespace PackageManagement.Tests.EnvDTE CreateProjectItems(); msbuildProject.FileName = @"d:\projects\myproject\myproject.csproj"; msbuildProject.AddFile(@"src\program.cs"); - ProjectItem directoryItem = projectItems.Item("src"); - ProjectItem fileItem = directoryItem.ProjectItems.Item("program.cs"); + global::EnvDTE.ProjectItem directoryItem = projectItems.Item("src"); + global::EnvDTE.ProjectItem fileItem = directoryItem.ProjectItems.Item("program.cs"); fileItem.Delete(); @@ -176,9 +176,9 @@ namespace PackageManagement.Tests.EnvDTE CreateProjectItems(); msbuildProject.AddFile(@"src\program.cs"); - ProjectItem directoryItem = projectItems.Item("src"); + global::EnvDTE.ProjectItem directoryItem = projectItems.Item("src"); - FileCodeModel2 fileCodeModel = directoryItem.FileCodeModel; + global::EnvDTE.FileCodeModel2 fileCodeModel = directoryItem.FileCodeModel; Assert.IsNull(fileCodeModel); } @@ -189,10 +189,10 @@ namespace PackageManagement.Tests.EnvDTE CreateProjectItems(); msbuildProject.AddFile(@"src\program.cs"); - ProjectItem directoryItem = projectItems.Item("src"); - ProjectItem fileItem = directoryItem.ProjectItems.Item("program.cs"); + global::EnvDTE.ProjectItem directoryItem = projectItems.Item("src"); + global::EnvDTE.ProjectItem fileItem = directoryItem.ProjectItems.Item("program.cs"); - FileCodeModel2 fileCodeModel = fileItem.FileCodeModel; + global::EnvDTE.FileCodeModel2 fileCodeModel = fileItem.FileCodeModel; Assert.IsNotNull(fileCodeModel); } @@ -203,11 +203,11 @@ namespace PackageManagement.Tests.EnvDTE CreateProjectItems(); msbuildProject.FileName = @"d:\projects\MyProject\MyProject.csproj"; msbuildProject.AddFile(@"src\program.cs"); - - ProjectItem directoryItem = projectItems.Item("src"); - ProjectItem fileItem = directoryItem.ProjectItems.Item("program.cs"); - CodeElements codeElements = fileItem.FileCodeModel.CodeElements; + global::EnvDTE.ProjectItem directoryItem = projectItems.Item("src"); + global::EnvDTE.ProjectItem fileItem = directoryItem.ProjectItems.Item("program.cs"); + + global::EnvDTE.CodeElements codeElements = fileItem.FileCodeModel.CodeElements; Assert.AreEqual(@"d:\projects\MyProject\src\program.cs", fakeFileService.FileNamePassedToGetCompilationUnit); Assert.AreEqual(0, codeElements.Count); @@ -219,7 +219,7 @@ namespace PackageManagement.Tests.EnvDTE CreateProjectItems(); msbuildProject.AddFile(@"program.cs"); - ProjectItem fileItem = projectItems.Item("program.cs"); + global::EnvDTE.ProjectItem fileItem = projectItems.Item("program.cs"); fileItem.Remove(); Assert.AreEqual(0, msbuildProject.Items.Count); @@ -231,7 +231,7 @@ namespace PackageManagement.Tests.EnvDTE CreateProjectItems(); msbuildProject.AddFile(@"program.cs"); - ProjectItem fileItem = projectItems.Item("program.cs"); + global::EnvDTE.ProjectItem fileItem = projectItems.Item("program.cs"); fileItem.Remove(); Assert.IsTrue(msbuildProject.IsSaved); @@ -243,7 +243,7 @@ namespace PackageManagement.Tests.EnvDTE CreateProjectItems(); msbuildProject.FileName = @"d:\projects\MyProject\MyProject.csproj"; msbuildProject.AddFile(@"src\program.cs"); - ProjectItem directoryItem = projectItems.Item("src"); + global::EnvDTE.ProjectItem directoryItem = projectItems.Item("src"); string fileName = directoryItem.FileNames(1); @@ -256,9 +256,9 @@ namespace PackageManagement.Tests.EnvDTE CreateProjectItems(); msbuildProject.FileName = @"d:\projects\MyProject\MyProject.csproj"; msbuildProject.AddFile(@"program.cs"); - ProjectItem item = projectItems.Item("program.cs"); + global::EnvDTE.ProjectItem item = projectItems.Item("program.cs"); - Document document = item.Document; + global::EnvDTE.Document document = item.Document; Assert.IsNull(document); } @@ -269,11 +269,11 @@ namespace PackageManagement.Tests.EnvDTE CreateProjectItems(); msbuildProject.FileName = @"d:\projects\MyProject\MyProject.csproj"; msbuildProject.AddFile(@"program.cs"); - ProjectItem item = projectItems.Item("program.cs"); + global::EnvDTE.ProjectItem item = projectItems.Item("program.cs"); string projectItemFileName = @"d:\projects\MyProject\program.cs"; OpenSavedFileInSharpDevelop(projectItemFileName); - Document document = item.Document; + global::EnvDTE.Document document = item.Document; Assert.AreEqual(projectItemFileName, document.FullName); } @@ -284,10 +284,10 @@ namespace PackageManagement.Tests.EnvDTE CreateProjectItems(); msbuildProject.FileName = @"d:\projects\MyProject\MyProject.csproj"; msbuildProject.AddFile(@"program.cs"); - ProjectItem item = projectItems.Item("program.cs"); + global::EnvDTE.ProjectItem item = projectItems.Item("program.cs"); OpenSavedFileInSharpDevelop(@"d:\projects\MyProject\program.cs"); - Document document = item.Document; + global::EnvDTE.Document document = item.Document; Assert.IsTrue(document.Saved); } @@ -298,10 +298,10 @@ namespace PackageManagement.Tests.EnvDTE CreateProjectItems(); msbuildProject.FileName = @"d:\projects\MyProject\MyProject.csproj"; msbuildProject.AddFile(@"program.cs"); - ProjectItem item = projectItems.Item("program.cs"); + global::EnvDTE.ProjectItem item = projectItems.Item("program.cs"); OpenUnsavedFileInSharpDevelop(@"d:\projects\MyProject\program.cs"); - Document document = item.Document; + global::EnvDTE.Document document = item.Document; Assert.IsFalse(document.Saved); } @@ -312,9 +312,9 @@ namespace PackageManagement.Tests.EnvDTE CreateProjectItems(); msbuildProject.FileName = @"d:\projects\MyProject\MyProject.csproj"; msbuildProject.AddFile(@"program.cs"); - ProjectItem item = projectItems.Item("program.cs"); + global::EnvDTE.ProjectItem item = projectItems.Item("program.cs"); - Window window = item.Open(Constants.vsViewKindCode); + global::EnvDTE.Window window = item.Open(global::EnvDTE.Constants.vsViewKindCode); Assert.AreEqual(@"d:\projects\MyProject\program.cs", fakeFileService.FileNamePassedToOpenFile); } @@ -326,7 +326,7 @@ namespace PackageManagement.Tests.EnvDTE msbuildProject.AddFile("MainForm.cs"); msbuildProject.AddDependentFile("MainForm.Designer.cs", "MainForm.cs"); - ProjectItems projectItems = project.ProjectItems; + global::EnvDTE.ProjectItems projectItems = project.ProjectItems; string[] expectedFiles = new string[] { "MainForm.cs" @@ -350,9 +350,9 @@ namespace PackageManagement.Tests.EnvDTE CreateProjectItems(); msbuildProject.AddFile("MainForm.cs"); msbuildProject.AddDependentFile("MainForm.Designer.cs", "MainForm.cs"); - ProjectItem mainFormItem = project.ProjectItems.Item("MainForm.cs"); + global::EnvDTE.ProjectItem mainFormItem = project.ProjectItems.Item("MainForm.cs"); - ProjectItems mainFormProjectItems = mainFormItem.ProjectItems; + global::EnvDTE.ProjectItems mainFormProjectItems = mainFormItem.ProjectItems; string[] expectedFiles = new string[] { "MainForm.Designer.cs" diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/ProjectItemsTests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/ProjectItemsTests.cs index e53150ff99..3e953cd48d 100644 --- a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/ProjectItemsTests.cs +++ b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/ProjectItemsTests.cs @@ -28,7 +28,7 @@ namespace PackageManagement.Tests.EnvDTE { project = new TestableDTEProject(); msbuildProject = project.TestableProject; - projectItems = project.ProjectItems; + projectItems = (ProjectItems)project.ProjectItems; fakeFileService = project.FakeFileService; } @@ -37,7 +37,7 @@ namespace PackageManagement.Tests.EnvDTE CreateProjectItems(); msbuildProject.FileName = projectFileName; msbuildProject.AddDirectory(folderName); - projectItems = project.ProjectItems.Item(folderName).ProjectItems; + projectItems = (ProjectItems)project.ProjectItems.Item(folderName).ProjectItems; } void AddFileToFakeFileSystem(string directory, string relativeFileName) @@ -57,19 +57,19 @@ namespace PackageManagement.Tests.EnvDTE return projectBrowserUpdater; } - DTE.ProjectItem GetChildItem(ProjectItems projectItems, string name) + DTE.ProjectItem GetChildItem(global::EnvDTE.ProjectItems projectItems, string name) { return projectItems .OfType() .SingleOrDefault(item => item.Name == name); } - DTE.ProjectItem GetFirstChildItem(ProjectItems projectItems) + DTE.ProjectItem GetFirstChildItem(global::EnvDTE.ProjectItems projectItems) { return projectItems.OfType().FirstOrDefault(); } - List GetAllChildItems(ProjectItems projectItems) + List GetAllChildItems(global::EnvDTE.ProjectItems projectItems) { return projectItems.OfType().ToList(); } @@ -481,7 +481,7 @@ namespace PackageManagement.Tests.EnvDTE string fileName = @"d:\projects\myproject\tools\test.cs"; msbuildProject.ItemTypeToReturnFromGetDefaultItemType = ItemType.Page; - DTE.ProjectItem item = projectItems.AddFromFile(fileName); + global::EnvDTE.ProjectItem item = projectItems.AddFromFile(fileName); string fullPath = (string)item.Properties.Item("FullPath").Value; @@ -522,12 +522,12 @@ namespace PackageManagement.Tests.EnvDTE msbuildProject.FileName = @"d:\projects\myproject\myproject.csproj"; string directory = @"d:\projects\myproject\tools"; - DTE.ProjectItem item = projectItems.AddFromDirectory(directory); + global::EnvDTE.ProjectItem item = projectItems.AddFromDirectory(directory); string name = item.Name; Assert.AreEqual("tools", name); Assert.AreEqual(project, item.ContainingProject); - Assert.AreEqual(Constants.vsProjectItemKindPhysicalFolder, item.Kind); + Assert.AreEqual(global::EnvDTE.Constants.vsProjectItemKindPhysicalFolder, item.Kind); } [Test] @@ -587,12 +587,12 @@ namespace PackageManagement.Tests.EnvDTE string directory = @"d:\projects\myproject\tools"; AddFileToFakeFileSystem(directory, "a.txt"); - DTE.ProjectItem item = projectItems.AddFromDirectory(directory); + global::EnvDTE.ProjectItem item = projectItems.AddFromDirectory(directory); string name = item.Name; Assert.AreEqual("tools", name); Assert.AreEqual(project, item.ContainingProject); - Assert.AreEqual(Constants.vsProjectItemKindPhysicalFolder, item.Kind); + Assert.AreEqual(global::EnvDTE.Constants.vsProjectItemKindPhysicalFolder, item.Kind); } [Test] @@ -603,16 +603,16 @@ namespace PackageManagement.Tests.EnvDTE string parentDirectory = @"d:\projects\myproject\tools"; AddDirectoryToFakeFileSystem(parentDirectory, "packages"); - DTE.ProjectItem item = projectItems.AddFromDirectory(parentDirectory); + global::EnvDTE.ProjectItem item = projectItems.AddFromDirectory(parentDirectory); string name = item.Name; - DTE.ProjectItem childItem = item.ProjectItems.Item("packages"); + global::EnvDTE.ProjectItem childItem = item.ProjectItems.Item("packages"); Assert.AreEqual("tools", name); Assert.AreEqual(project, item.ContainingProject); - Assert.AreEqual(Constants.vsProjectItemKindPhysicalFolder, item.Kind); + Assert.AreEqual(global::EnvDTE.Constants.vsProjectItemKindPhysicalFolder, item.Kind); Assert.AreEqual(1, item.ProjectItems.Count); - Assert.AreEqual(Constants.vsProjectItemKindPhysicalFolder, childItem.Kind); + Assert.AreEqual(global::EnvDTE.Constants.vsProjectItemKindPhysicalFolder, childItem.Kind); } [Test] @@ -724,7 +724,7 @@ namespace PackageManagement.Tests.EnvDTE DTE.ProjectItem scaffolderFolderItem = GetChildItem(codeTemplatesFolderItem.ProjectItems, "Scaffolders"); DTE.ProjectItem jqueryPluginFolderItem = GetChildItem(scaffolderFolderItem.ProjectItems, "jQueryPlugin"); - DTE.ProjectItem jqueryPluginFileItem = jqueryPluginFolderItem.ProjectItems.Item("jQueryPlugin.ps1"); + global::EnvDTE.ProjectItem jqueryPluginFileItem = jqueryPluginFolderItem.ProjectItems.Item("jQueryPlugin.ps1"); Assert.AreEqual("jQueryPlugin.ps1", jqueryPluginFileItem.Name); } @@ -824,7 +824,7 @@ namespace PackageManagement.Tests.EnvDTE msbuildProject.AddFile(@"AccountController.generated.cs"); msbuildProject.AddFile(@"Controllers\AccountController.cs"); - DTE.ProjectItem projectItem = projectItems + global::EnvDTE.ProjectItem projectItem = projectItems .Item("Controllers") .ProjectItems .Item(1); @@ -849,7 +849,7 @@ namespace PackageManagement.Tests.EnvDTE msbuildProject.AddFile("MainForm.cs"); string fileName = @"d:\projects\myproject\MainForm.Designer.cs"; msbuildProject.ItemTypeToReturnFromGetDefaultItemType = ItemType.Page; - projectItems = project.ProjectItems.Item("MainForm.cs").ProjectItems; + projectItems = (ProjectItems)project.ProjectItems.Item("MainForm.cs").ProjectItems; projectItems.AddFromFile(fileName); diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/ProjectPropertyTests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/ProjectPropertyTests.cs index eeeb27a8e6..b887bd2440 100644 --- a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/ProjectPropertyTests.cs +++ b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/ProjectPropertyTests.cs @@ -121,7 +121,7 @@ namespace PackageManagement.Tests.EnvDTE CreateProperties(); msbuildProject.SetProperty("TargetFrameworkVersion", "4.0"); - Property targetFrameworkVersionProperty = PropertiesHelper.FindProperty(project.Properties, "TargetFrameworkVersion"); + global::EnvDTE.Property targetFrameworkVersionProperty = PropertiesHelper.FindProperty(project.Properties, "TargetFrameworkVersion"); string targetFrameworkVersion = targetFrameworkVersionProperty.Value as string; Assert.AreEqual("4.0", targetFrameworkVersion); @@ -133,7 +133,7 @@ namespace PackageManagement.Tests.EnvDTE CreateProperties(); msbuildProject.FileName = @"d:\projects\MyProject\MyProject.csproj"; - Property fullPathProperty = project.Properties.Item("FullPath"); + global::EnvDTE.Property fullPathProperty = project.Properties.Item("FullPath"); string fullPath = fullPathProperty.Value as string; string expectedFullPath = @"d:\projects\MyProject"; @@ -146,7 +146,7 @@ namespace PackageManagement.Tests.EnvDTE CreateProperties(); msbuildProject.FileName = @"d:\projects\MyProject\MyProject.csproj"; - Property fullPathProperty = project.Properties.Item("FULLPATH"); + global::EnvDTE.Property fullPathProperty = project.Properties.Item("FULLPATH"); string fullPath = fullPathProperty.Value as string; string expectedFullPath = @"d:\projects\MyProject"; diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/ProjectTests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/ProjectTests.cs index 263b44463e..ba716c5a04 100644 --- a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/ProjectTests.cs +++ b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/ProjectTests.cs @@ -199,7 +199,7 @@ namespace PackageManagement.Tests.EnvDTE { CreateProject(); msbuildProject.SetProperty("OutputPath", @"bin\debug\"); - Configuration activeConfig = project.ConfigurationManager.ActiveConfiguration; + global::EnvDTE.Configuration activeConfig = project.ConfigurationManager.ActiveConfiguration; string outputPath = (string)activeConfig.Properties.Item("OutputPath").Value; @@ -211,7 +211,7 @@ namespace PackageManagement.Tests.EnvDTE { CreateProject(); - CodeType codeType = project.CodeModel.CodeTypeFromFullName("UnknownTypeName"); + global::EnvDTE.CodeType codeType = project.CodeModel.CodeTypeFromFullName("UnknownTypeName"); Assert.IsNull(codeType); } @@ -222,7 +222,7 @@ namespace PackageManagement.Tests.EnvDTE CreateProject(); AddClassToProjectContent("Tests.MyClass"); - CodeType codeType = project.CodeModel.CodeTypeFromFullName("Tests.MyClass"); + global::EnvDTE.CodeType codeType = project.CodeModel.CodeTypeFromFullName("Tests.MyClass"); Assert.IsNotNull(codeType); } @@ -236,7 +236,7 @@ namespace PackageManagement.Tests.EnvDTE CodeElement element = project.CodeModel.CodeElements.FirstOrDefault(); - Assert.AreEqual(vsCMInfoLocation.vsCMInfoLocationProject, element.InfoLocation); + Assert.AreEqual(global::EnvDTE.vsCMInfoLocation.vsCMInfoLocationProject, element.InfoLocation); } [Test] @@ -248,7 +248,7 @@ namespace PackageManagement.Tests.EnvDTE CodeElement element = project.CodeModel.CodeElements.FirstOrDefault(); - Assert.AreEqual(vsCMInfoLocation.vsCMInfoLocationExternal, element.InfoLocation); + Assert.AreEqual(global::EnvDTE.vsCMInfoLocation.vsCMInfoLocationExternal, element.InfoLocation); } } } diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/ProjectsTests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/ProjectsTests.cs index 5a51e64ded..9b0b74e9b3 100644 --- a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/ProjectsTests.cs +++ b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/ProjectsTests.cs @@ -18,7 +18,7 @@ namespace PackageManagement.Tests.EnvDTE { solutionHelper = new SolutionHelper(); solutionHelper.AddProjectToSolution(projectName); - projects = solutionHelper.Solution.Projects; + projects = (Projects)solutionHelper.Solution.Projects; } void CreateSolutionWithTwoProjects(string projectName1, string projectName2) @@ -26,7 +26,7 @@ namespace PackageManagement.Tests.EnvDTE solutionHelper = new SolutionHelper(); solutionHelper.AddProjectToSolution(projectName1); solutionHelper.AddProjectToSolution(projectName2); - projects = solutionHelper.Solution.Projects; + projects = (Projects)solutionHelper.Solution.Projects; } [Test] @@ -34,7 +34,7 @@ namespace PackageManagement.Tests.EnvDTE { CreateSolutionWithSingleProject("MyProject"); - Project project = projects.Item(1); + global::EnvDTE.Project project = projects.Item(1); Assert.AreEqual("MyProject", project.Name); } @@ -44,7 +44,7 @@ namespace PackageManagement.Tests.EnvDTE { CreateSolutionWithTwoProjects("MyProject1", "MyProject2"); - Project project = projects.Item(2); + global::EnvDTE.Project project = projects.Item(2); Assert.AreEqual("MyProject2", project.Name); } diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/Reference3Tests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/Reference3Tests.cs index 3a76981946..c5935df118 100644 --- a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/Reference3Tests.cs +++ b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/Reference3Tests.cs @@ -82,7 +82,7 @@ namespace PackageManagement.Tests.EnvDTE { CreateReference("System.Xml"); - Project project = reference.SourceProject; + global::EnvDTE.Project project = reference.SourceProject; Assert.IsNull(project); } @@ -93,7 +93,7 @@ namespace PackageManagement.Tests.EnvDTE TestableProject referencedProject = CreateProjectReference(); referencedProject.FileName = @"d:\projects\referencedproject.csproj"; - Project project = reference.SourceProject; + global::EnvDTE.Project project = reference.SourceProject; Assert.AreEqual(@"d:\projects\referencedproject.csproj", project.FileName); } diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/ReferencesTests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/ReferencesTests.cs index 7b0fd8888b..fa2912611b 100644 --- a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/ReferencesTests.cs +++ b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/ReferencesTests.cs @@ -27,7 +27,7 @@ namespace PackageManagement.Tests.EnvDTE msbuildProject = project.TestableProject; fakeProjectService = project.FakeProjectService; ProjectObject projectObject = (ProjectObject)project.Object; - references = projectObject.References; + references = (References)projectObject.References; } void ReferenceCollectionAssertAreEqual(string[] expectedReferences, List referenceList) @@ -165,7 +165,7 @@ namespace PackageManagement.Tests.EnvDTE CreateReferences(); msbuildProject.AddReference("System.Xml"); - Reference reference = references.Find("System.Xml"); + global::EnvDTE.Reference reference = references.Find("System.Xml"); Assert.AreEqual("System.Xml", reference.Name); } @@ -176,7 +176,7 @@ namespace PackageManagement.Tests.EnvDTE CreateReferences(); msbuildProject.AddReference("System.Xml"); - Reference reference = references.Find("SYSTEM.XML"); + global::EnvDTE.Reference reference = references.Find("SYSTEM.XML"); Assert.AreEqual("System.Xml", reference.Name); } @@ -187,7 +187,7 @@ namespace PackageManagement.Tests.EnvDTE CreateReferences(); msbuildProject.AddReference("System.Xml"); - Reference reference = references.Item("System.Xml"); + global::EnvDTE.Reference reference = references.Item("System.Xml"); Assert.AreEqual("System.Xml", reference.Name); } diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/SolutionGlobalsTests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/SolutionGlobalsTests.cs index bf68330d9e..78482cfda3 100644 --- a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/SolutionGlobalsTests.cs +++ b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/SolutionGlobalsTests.cs @@ -13,7 +13,7 @@ namespace PackageManagement.Tests.EnvDTE public class SolutionGlobalsTests { SolutionHelper solutionHelper; - Globals globals; + global::EnvDTE.Globals globals; void CreateSolution() { diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/SolutionTests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/SolutionTests.cs index be2a20d467..9a3d30ca3c 100644 --- a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/SolutionTests.cs +++ b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/SolutionTests.cs @@ -90,7 +90,8 @@ namespace PackageManagement.Tests.EnvDTE { CreateSolution(); - int count = solution.Projects.ToList().Count; + Projects projects = (Projects)solution.Projects; + int count = projects.ToList().Count; Assert.AreEqual(0, count); } @@ -101,7 +102,8 @@ namespace PackageManagement.Tests.EnvDTE CreateSolution(); AddProjectToSolution("MyProject"); - Project project = solution.Projects.First(); + Projects projects = (Projects)solution.Projects; + Project project = projects.First(); Assert.AreEqual("MyProject", project.Name); } @@ -112,7 +114,7 @@ namespace PackageManagement.Tests.EnvDTE CreateSolution(); AddProjectToSolution("MyProject"); - ProjectItem item = solution.FindProjectItem(@"c:\projects\MyProject\test.cs"); + global::EnvDTE.ProjectItem item = solution.FindProjectItem(@"c:\projects\MyProject\test.cs"); Assert.IsNull(item); } @@ -125,7 +127,7 @@ namespace PackageManagement.Tests.EnvDTE AddFileToFirstProjectInSolution(@"src\test.cs"); string fileName = @"c:\projects\MyProject\src\test.cs"; - ProjectItem item = solution.FindProjectItem(fileName); + global::EnvDTE.ProjectItem item = solution.FindProjectItem(fileName); Assert.AreEqual("test.cs", item.Name); } @@ -138,7 +140,7 @@ namespace PackageManagement.Tests.EnvDTE AddFileToFirstProjectInSolution(@"src\test.cs"); string fileName = @"c:\projects\MyProject\src\test.cs"; - ProjectItem item = solution.FindProjectItem(fileName); + global::EnvDTE.ProjectItem item = solution.FindProjectItem(fileName); Assert.AreEqual(@"c:\projects\MyProject\MyProject.csproj", item.ContainingProject.FileName); } @@ -152,7 +154,7 @@ namespace PackageManagement.Tests.EnvDTE AddFileToSecondProjectInSolution(@"src\test.cs"); string fileName = @"c:\projects\MyProject2\src\test.cs"; - ProjectItem item = solution.FindProjectItem(fileName); + global::EnvDTE.ProjectItem item = solution.FindProjectItem(fileName); Assert.AreEqual("test.cs", item.Name); } diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/TextEditorFontsAndColorsPropertyFactoryTests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/TextEditorFontsAndColorsPropertyFactoryTests.cs index 9b87b9fa3d..db9ce6a5ca 100644 --- a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/TextEditorFontsAndColorsPropertyFactoryTests.cs +++ b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/TextEditorFontsAndColorsPropertyFactoryTests.cs @@ -24,7 +24,7 @@ namespace PackageManagement.Tests.EnvDTE void AssertPropertiesContainProperty(string expectedPropertyName) { - Property property = PropertiesHelper.FindProperty(properties, expectedPropertyName); + global::EnvDTE.Property property = PropertiesHelper.FindProperty(properties, expectedPropertyName); Assert.IsNotNull(property, "Unable to find property: " + expectedPropertyName); } @@ -52,7 +52,7 @@ namespace PackageManagement.Tests.EnvDTE { CreateProperties(); - Property property = properties.Item("UnknownPropertyName"); + global::EnvDTE.Property property = properties.Item("UnknownPropertyName"); Assert.IsNull(property); } @@ -61,7 +61,7 @@ namespace PackageManagement.Tests.EnvDTE { CreateProperties(); - Property property = properties.Item("FONTSANDCOLORSITEMS"); + global::EnvDTE.Property property = properties.Item("FONTSANDCOLORSITEMS"); Assert.IsNotNull(property); } @@ -81,7 +81,7 @@ namespace PackageManagement.Tests.EnvDTE { CreateProperties(); - Property property = properties.Item("FONTSIZE"); + global::EnvDTE.Property property = properties.Item("FONTSIZE"); Assert.IsNotNull(property); } diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/Helpers/CodeElementsExtensions.cs b/src/AddIns/Misc/PackageManagement/Test/Src/Helpers/CodeElementsExtensions.cs index a7d0eec627..8636d423fa 100644 --- a/src/AddIns/Misc/PackageManagement/Test/Src/Helpers/CodeElementsExtensions.cs +++ b/src/AddIns/Misc/PackageManagement/Test/Src/Helpers/CodeElementsExtensions.cs @@ -10,7 +10,7 @@ namespace PackageManagement.Tests.Helpers { public static class CodeElementsExtensions { - public static List ToList(this CodeElements codeElements) + public static List ToList(this global::EnvDTE.CodeElements codeElements) { var list = new List(); foreach (CodeElement codeElement in codeElements) { @@ -19,77 +19,77 @@ namespace PackageManagement.Tests.Helpers return list; } - public static CodeElement FirstOrDefault(this CodeElements codeElements) + public static CodeElement FirstOrDefault(this global::EnvDTE.CodeElements codeElements) { return ToList(codeElements).FirstOrDefault(); } - public static CodeFunction2 FirstCodeFunction2OrDefault(this CodeElements codeElements) + public static CodeFunction2 FirstCodeFunction2OrDefault(this global::EnvDTE.CodeElements codeElements) { return codeElements.FirstOrDefault() as CodeFunction2; } - public static CodeClass2 FirstCodeClass2OrDefault(this CodeElements codeElements) + public static CodeClass2 FirstCodeClass2OrDefault(this global::EnvDTE.CodeElements codeElements) { return codeElements.FirstOrDefault() as CodeClass2; } - public static CodeInterface FirstCodeInterfaceOrDefault(this CodeElements codeElements) + public static CodeInterface FirstCodeInterfaceOrDefault(this global::EnvDTE.CodeElements codeElements) { return codeElements.FirstOrDefault() as CodeInterface; } - public static CodeAttributeArgument FirstCodeAttributeArgumentOrDefault(this CodeElements codeElements) + public static CodeAttributeArgument FirstCodeAttributeArgumentOrDefault(this global::EnvDTE.CodeElements codeElements) { return codeElements.FirstOrDefault() as CodeAttributeArgument; } - public static CodeNamespace FirstCodeNamespaceOrDefault(this CodeElements codeElements) + public static CodeNamespace FirstCodeNamespaceOrDefault(this global::EnvDTE.CodeElements codeElements) { return codeElements.FirstOrDefault() as CodeNamespace; } - public static CodeNamespace LastCodeNamespaceOrDefault(this CodeElements codeElements) + public static CodeNamespace LastCodeNamespaceOrDefault(this global::EnvDTE.CodeElements codeElements) { return codeElements.LastOrDefault() as CodeNamespace; } - public static CodeElement LastOrDefault(this CodeElements codeElements) + public static CodeElement LastOrDefault(this global::EnvDTE.CodeElements codeElements) { return codeElements.ToList().LastOrDefault(); } - public static CodeAttribute2 FirstCodeAttribute2OrDefault(this CodeElements codeElements) + public static CodeAttribute2 FirstCodeAttribute2OrDefault(this global::EnvDTE.CodeElements codeElements) { return codeElements.FirstOrDefault() as CodeAttribute2; } - public static CodeProperty2 FirstCodeProperty2OrDefault(this CodeElements codeElements) + public static CodeProperty2 FirstCodeProperty2OrDefault(this global::EnvDTE.CodeElements codeElements) { return codeElements.FirstOrDefault() as CodeProperty2; } - public static CodeVariable FirstCodeVariableOrDefault(this CodeElements codeElements) + public static CodeVariable FirstCodeVariableOrDefault(this global::EnvDTE.CodeElements codeElements) { return codeElements.FirstOrDefault() as CodeVariable; } - public static CodeParameter FirstCodeParameterOrDefault(this CodeElements codeElements) + public static CodeParameter FirstCodeParameterOrDefault(this global::EnvDTE.CodeElements codeElements) { return codeElements.FirstOrDefault() as CodeParameter; } - public static CodeParameter2 FirstCodeParameter2OrDefault(this CodeElements codeElements) + public static CodeParameter2 FirstCodeParameter2OrDefault(this global::EnvDTE.CodeElements codeElements) { return codeElements.FirstOrDefault() as CodeParameter2; } - public static CodeImport FirstCodeImportOrDefault(this CodeElements codeElements) + public static CodeImport FirstCodeImportOrDefault(this global::EnvDTE.CodeElements codeElements) { return codeElements.FirstOrDefault() as CodeImport; } - public static CodeClass2 LastCodeClass2OrDefault(this CodeElements codeElements) + public static CodeClass2 LastCodeClass2OrDefault(this global::EnvDTE.CodeElements codeElements) { return codeElements.LastOrDefault() as CodeClass2; } diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/Helpers/PropertiesHelper.cs b/src/AddIns/Misc/PackageManagement/Test/Src/Helpers/PropertiesHelper.cs index 92b082e5fb..65983b99f7 100644 --- a/src/AddIns/Misc/PackageManagement/Test/Src/Helpers/PropertiesHelper.cs +++ b/src/AddIns/Misc/PackageManagement/Test/Src/Helpers/PropertiesHelper.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; using ICSharpCode.PackageManagement; -using ICSharpCode.PackageManagement.EnvDTE; +using EnvDTE; namespace PackageManagement.Tests.Helpers {