project clean up

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/XmlEditor@4161 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockOpenedFile.cs

@@ -39,5 +39,7 @@ namespace PythonBinding.Tests.Utils
 		public override void UnregisterView(IViewContent view)
 		{
 		}
+		
+		public override event EventHandler FileClosed;
 	}
 }

src/AddIns/BackendBindings/WixBinding/Project/WixBinding.csproj

@@ -229,7 +229,7 @@
       <Name>ICSharpCode.Core.WinForms</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\XmlBinding\XmlEditor.csproj">
+    <ProjectReference Include="..\..\XmlBinding\Project\XmlEditor.csproj">
       <Project>{DCA2703D-250A-463E-A68A-07ED105AE6BD}</Project>
       <Name>XmlEditor</Name>
       <Private>False</Private>

src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlBinding.csproj

@@ -120,7 +120,7 @@
       <Project>{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}</Project>
       <Name>ICSharpCode.AvalonEdit</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\XmlBinding\XmlEditor.csproj">
+    <ProjectReference Include="..\..\XmlBinding\Project\XmlEditor.csproj">
       <Project>{DCA2703D-250A-463E-A68A-07ED105AE6BD}</Project>
       <Name>XmlEditor</Name>
       <Private>False</Private>

src/AddIns/BackendBindings/XmlBinding/Project/XmlEditor.addin

@@ -1,44 +1,55 @@
-<AddIn name        = "Xml Editor"
+<AddIn name        = "Xml Editor"
        author      = "Matt Ward"
        copyright   = "prj:///doc/copyright.txt"
-       description = "Xml Editor"
+       description = "Adds XML completion and formatting support"
        addInManagerHidden = "preinstalled">
 	
-	<Manifest>
-		<Identity name = "ICSharpCode.XmlEditor"/>
-	</Manifest>
-	
-<!--	<Runtime>
+	<Runtime>
 		<Import assembly = "XmlEditor.dll">
 			<ConditionEvaluator name = "StylesheetAssigned" class = "ICSharpCode.XmlEditor.StylesheetAssignedCondition"/>
 		</Import>
 		<Import assembly = ":ICSharpCode.SharpDevelop"/>
-	</Runtime>-->
+	</Runtime>
 	
-	<!-- Xml Editor View -->
-<!--	<Path name = "/SharpDevelop/Workbench/DisplayBindings">
-		<DisplayBinding id = "XmlEditor"
-		                insertbefore = "Text"
-		                title = "${res:Gui.ProjectBrowser.OpenWith.Bindings.XmlEditor}"
-		                class = "ICSharpCode.XmlEditor.XmlDisplayBinding"/>
-	</Path>-->
+	<Manifest>
+		<Identity name = "ICSharpCode.XmlEditor"/>
+	</Manifest>
+	
+	<Path name = "/AddIns/DefaultTextEditor/Formatter/XML">
+		<Class id ="XmlFormatter" class = "ICSharpCode.XmlEditor.XmlFormattingStrategy"/>
+	</Path>
+	
+	<Path name = "/AddIns/DefaultTextEditor/CodeCompletion">
+		<CodeCompletionBinding
+			id = "Xml"
+			extensions  = ".xml;.xsl;.xslt;.xsd;.manifest;.config;.addin;.xshd;.wxs;.wxi;.wxl;.proj;.csproj;.vbproj;.ilproj;.build;.xfrm;.targets;.xpt;.xft;.map;.wsdl;.disco"
+			class = "ICSharpCode.XmlEditor.XmlCodeCompletionBinding"
+		/>
+	</Path>
+	
+	<Path name = "/SharpDevelop/Workbench/DisplayBindings">
+		<DisplayBinding id               = "XmlTreeView"
+		                type             = "Secondary"
+		                insertbefore     = "Text"
+		                class            = "ICSharpCode.XmlEditor.XmlDisplayBinding"/>
+	</Path>
 	
 	<!-- Xml parser used to initiate the folding update -->
-<!--	<Path name = "/Workspace/Parser">
+	<Path name = "/Workspace/Parser">
 		<Parser id = "XmlFoldingParser"
 		        supportedextensions  = ".xml;.xsl;.xslt;.xsd;.manifest;.config;.addin;.xshd;.wxs;.wxi;.wxl;.proj;.csproj;.vbproj;.ilproj;.build;.xfrm;.targets;.xpt;.xft;.map;.wsdl;.disco"
 		        class = "ICSharpCode.XmlEditor.Parser"/>
-	</Path>-->
+	</Path>
 	
 	<!-- Extra project browser icons -->
-<!--	<Path name = "/Workspace/Icons">
+	<Path name = "/Workspace/Icons">
 		<Icon id         = "ExtraXmlFileIcon"
-		      extensions = ".manifest;.config;.xshd;.wxs;.wxi;.wxl;.proj;.csproj;.vbproj;.ilproj;.xfrm;.targets;.xpt;.xft;.map;.wsdl;.disco"
+		      extensions = ".manifest;.config;.xshd;.wxs;.wxi;.wxl;.proj;.csproj;.vbproj;.ilproj;.xfrm;.targets;.xpt;.xft;.map;.wsdl;.disco;.xaml"
 		      resource   = "FileIcons.XmlIcon" />
-	</Path>-->
+	</Path>
 	
 	<!-- Xml file filter -->
-<!--	<Path name = "/SharpDevelop/Workbench/FileFilter">
+	<Path name = "/SharpDevelop/Workbench/FileFilter">
 		<FileFilter id = "Xml"
 		            insertbefore="AllFiles"
 		            name = "${res:SharpDevelop.FileFilter.XmlFiles}"
@@ -47,11 +58,19 @@
 		            insertbefore="AllFiles"
 		            name = "${res:SharpDevelop.FileFilter.XslFiles} (*.xsl;*.xslt)"
 		            extensions = "*.xsl;*.xslt"/>
-	</Path>-->
+	</Path>
 	
 	<!-- XML menu -->
-	<!--<Path name = "/SharpDevelop/Workbench/MainMenu">
-		<Condition name = "WindowActive" activewindow="ICSharpCode.XmlEditor.XmlView">
+	<Path name = "/SharpDevelop/Workbench/MainMenu">
+		<ComplexCondition>
+			<Or>
+				<Condition name = "WindowActive" activewindow="ICSharpCode.XmlEditor.XmlTreeView" />
+				<And>
+					<Condition name = "WindowActive" activewindow="ICSharpCode.SharpDevelop.Editor.ITextEditorProvider" />
+					<Condition name = "TextContent" textcontent="XML" />
+				</And>
+			</Or>
+			
 			<MenuItem id = "Xml" insertafter="View" insertbefore="Tools" label="&amp;XML" type = "Menu">
 				<MenuItem id = "CreateSchema"
 				          label = "${res:ICSharpCode.XmlEditor.CreateSchemaMenuLabel}"
@@ -69,6 +88,7 @@
 					          label="${res:ICSharpCode.XmlEditor.AssignXSLT}"
 					          class="ICSharpCode.XmlEditor.AssignStylesheetCommand"/>
 					<ComplexCondition action="Disable">
+						<!-- evaluate StylesheetAssigned only when XmlView is active - important for lazy loading! -->
 						<And>
 							<Condition name = "WindowActive" activewindow = "ICSharpCode.XmlEditor.XmlView"/>
 							<Condition name = "StylesheetAssigned" action="Disable"/>
@@ -87,11 +107,11 @@
 				          label = "${res:XML.MainMenu.EditMenu.FormatMenu}"
 				          class = "ICSharpCode.XmlEditor.FormatXmlCommand" />
 			</MenuItem>
-		</Condition>
-	</Path>-->
+		</ComplexCondition>
+	</Path>
 	
 	<!-- Right click menu -->
-	<!--<Path name = "/SharpDevelop/ViewContent/XmlEditor/ContextMenu">
+	<Path name = "/SharpDevelop/ViewContent/XmlEditor/ContextMenu">
 		<MenuItem id = "Cut"
 		          label = "${res:XML.TextAreaContextMenu.Cut}"
 		          icon = "Icons.16x16.CutIcon"
@@ -129,11 +149,11 @@
 		          shortcut = "Control|I"
 		          class = "ICSharpCode.SharpDevelop.DefaultEditor.Commands.IndentSelection" />
 		<MenuItem id = "HideXPathResults"
-			      label = "${res:ICSharpCode.XmlEditor.HideXPathResults}"
-			      class = "ICSharpCode.XmlEditor.RemoveXPathHighlightingCommand"/>
+		          label = "${res:ICSharpCode.XmlEditor.HideXPathResults}"
+		          class = "ICSharpCode.XmlEditor.RemoveXPathHighlightingCommand"/>
 		<MenuItem id = "GoToDefinition"
-			      label = "${res:ICSharpCode.NAntAddIn.GotoDefinitionMenuLabel}"
-			      class = "ICSharpCode.XmlEditor.GoToSchemaDefinitionCommand"/>
+		          label = "${res:ICSharpCode.NAntAddIn.GotoDefinitionMenuLabel}"
+		          class = "ICSharpCode.XmlEditor.GoToSchemaDefinitionCommand"/>
 		<MenuItem id = "FileMode" label = "${res:XML.TextAreaContextMenu.FileMode}" type="Menu">
 			<MenuItem id = "HighlightBuilder" type="Builder" class = "ICSharpCode.SharpDevelop.DefaultEditor.Commands.HighlightingTypeBuilder" />
 		</MenuItem>
@@ -142,10 +162,10 @@
 		          label = "${res:XML.TextAreaContextMenu.BufferOptions}"
 		          icon = "Icons.16x16.PropertiesIcon"
 		          class ="ICSharpCode.SharpDevelop.DefaultEditor.Commands.ShowBufferOptions"/>
-	</Path>-->
+	</Path>
 	
 	<!-- Options panel -->
-<!--	<Path path = "/SharpDevelop/Dialogs/OptionsDialog/TextEditorOptions">
+	<Path path = "/SharpDevelop/Dialogs/OptionsDialog/TextEditorOptions">
 		<OptionPanel id = "XmlSchemasPanel"
 		             insertafter = "Markers"
 		             label = "${res:ICSharpCode.XmlEditor.XmlSchemasPanel.Title}"
@@ -155,50 +175,50 @@
 		             insertbefore = "XmlSchemasPanel"
 		             label = "${res:ICSharpCode.XmlEditor.XmlEditorOptionsPanel.Title}"
 		             class = "ICSharpCode.XmlEditor.XmlEditorOptionsPanel" />
-	</Path>-->
+	</Path>
 	
-<!--	<Path path = "/AddIns/XmlEditor/EditActions">
+	<Path path = "/AddIns/XmlEditor/EditActions">
 		<EditAction id = "XmlCompletionPopup" class = "ICSharpCode.XmlEditor.CodeCompletionPopupCommand"  keys = "Control|Space"/>
 		<EditAction id = "GoToDefinition" class = "ICSharpCode.XmlEditor.GoToSchemaDefinitionEditAction" keys = "Control|Enter"/>
-	</Path>-->
-
+	</Path>
+	
 	<!-- XPath Query pad -->
-<!--	<Path name = "/SharpDevelop/Workbench/Pads">
-		<Pad id = "XPathQueryPad" 
+	<Path name = "/SharpDevelop/Workbench/Pads">
+		<Pad id = "XPathQueryPad"
 		     category = "Tools"
 		     icon = "PadIcons.XPathQuery"
 		     title = "${res:ICSharpCode.XmlEditor.XPathQueryPad.Title}"
 		     insertafter = "UnitTestingPad"
 		     class = "ICSharpCode.XmlEditor.XPathQueryPad"
 		     defaultPosition = "Bottom, Hidden" />
-	</Path>-->
-
+	</Path>
+	
 	<!-- Menu options to turn off XPath Query result highlighting -->
-<!--	<Path name = "/SharpDevelop/Workbench/MainMenu/Edit/Format">
+	<Path name = "/SharpDevelop/Workbench/MainMenu/Edit/Format">
 		<Condition name = "WindowActive" activewindow="ICSharpCode.XmlEditor.XmlView">
 			<MenuItem id = "RemoveXPathHighlighting"
-			          insertafter = "ShowCodeCoverage" 
+			          insertafter = "ShowCodeCoverage"
 			          label = "${res:ICSharpCode.XmlEditor.HideXPathResults}"
 			          class = "ICSharpCode.XmlEditor.RemoveXPathHighlightingCommand"/>
 		</Condition>
-	</Path>-->
-
+	</Path>
+	
 	<!-- XML Tree context menu options -->
-<!--	<Path name = "/AddIns/XmlEditor/XmlTree/AttributesGrid/ContextMenu">
+	<Path name = "/AddIns/XmlEditor/XmlTree/AttributesGrid/ContextMenu">
 		<Condition name = "Ownerstate" ownerstate="ElementSelected" action="Disable">
 			<MenuItem id = "AddAttribute"
-				label = "${res:ICSharpCode.XmlEditor.XmlTreeView.AddAttributeMenuLabel}"
-				class = "ICSharpCode.XmlEditor.AddAttributeCommand"/>
+			          label = "${res:ICSharpCode.XmlEditor.XmlTreeView.AddAttributeMenuLabel}"
+			          class = "ICSharpCode.XmlEditor.AddAttributeCommand"/>
 		</Condition>
 		<Condition name = "Ownerstate" ownerstate="AttributeSelected" action="Disable">
 			<MenuItem id = "RemoveAttribute"
-				label = "${res:ICSharpCode.XmlEditor.XmlTreeView.RemoveAttributeMenuLabel}"
-				icon = "Icons.16x16.DeleteIcon"
-				class = "ICSharpCode.XmlEditor.RemoveAttributeCommand"/>
+			          label = "${res:ICSharpCode.XmlEditor.XmlTreeView.RemoveAttributeMenuLabel}"
+			          icon = "Icons.16x16.DeleteIcon"
+			          class = "ICSharpCode.XmlEditor.RemoveAttributeCommand"/>
 		</Condition>
-	</Path>-->
-
-	<!--<Path name = "/AddIns/XmlEditor/XmlTree/ContextMenu">
+	</Path>
+	
+	<Path name = "/AddIns/XmlEditor/XmlTree/ContextMenu">
 		<MenuItem id = "Cut"
 		          label = "${res:XML.TextAreaContextMenu.Cut}"
 		          icon = "Icons.16x16.CutIcon"
@@ -230,16 +250,16 @@
 				</And>
 			</Or>
 			<MenuItem id = "InsertElementBefore"
-				label = "${res:ICSharpCode.XmlEditor.XmlTreeView.InsertElementBeforeMenuLabel}"
-				class = "ICSharpCode.XmlEditor.InsertElementBeforeCommand"/>
+			          label = "${res:ICSharpCode.XmlEditor.XmlTreeView.InsertElementBeforeMenuLabel}"
+			          class = "ICSharpCode.XmlEditor.InsertElementBeforeCommand"/>
 			<MenuItem id = "InsertElementAfter"
-				label = "${res:ICSharpCode.XmlEditor.XmlTreeView.InsertElementAfterMenuLabel}"
-				class = "ICSharpCode.XmlEditor.InsertElementAfterCommand"/>
+			          label = "${res:ICSharpCode.XmlEditor.XmlTreeView.InsertElementAfterMenuLabel}"
+			          class = "ICSharpCode.XmlEditor.InsertElementAfterCommand"/>
 		</ComplexCondition>
 		<Condition name = "Ownerstate" ownerstate = "ElementSelected" action = "Disable">
 			<MenuItem id = "AddChildElement"
-				label = "${res:ICSharpCode.XmlEditor.XmlTreeView.AddChildElementMenuLabel}"
-				class = "ICSharpCode.XmlEditor.AddChildElementCommand"/>
+			          label = "${res:ICSharpCode.XmlEditor.XmlTreeView.AddChildElementMenuLabel}"
+			          class = "ICSharpCode.XmlEditor.AddChildElementCommand"/>
 		</Condition>
 		<ComplexCondition action = "Disable">
 			<Or>
@@ -254,16 +274,16 @@
 			</Or>
 			<MenuItem id = "TextNodeCommandsSeparator" type = "Separator"/>
 			<MenuItem id = "InsertTextNodeBefore"
-				label = "${res:ICSharpCode.XmlEditor.XmlTreeView.InsertTextNodeBeforeMenuLabel}"
-				class = "ICSharpCode.XmlEditor.InsertTextNodeBeforeCommand"/>
+			          label = "${res:ICSharpCode.XmlEditor.XmlTreeView.InsertTextNodeBeforeMenuLabel}"
+			          class = "ICSharpCode.XmlEditor.InsertTextNodeBeforeCommand"/>
 			<MenuItem id = "InsertTextNodeAfter"
-				label = "${res:ICSharpCode.XmlEditor.XmlTreeView.InsertTextNodeAfterMenuLabel}"
-				class = "ICSharpCode.XmlEditor.InsertTextNodeAfterCommand"/>
-		</ComplexCondition>		
+			          label = "${res:ICSharpCode.XmlEditor.XmlTreeView.InsertTextNodeAfterMenuLabel}"
+			          class = "ICSharpCode.XmlEditor.InsertTextNodeAfterCommand"/>
+		</ComplexCondition>
 		<Condition name = "Ownerstate" ownerstate = "ElementSelected" action = "Disable">
 			<MenuItem id = "AddChildTextNode"
-				label = "${res:ICSharpCode.XmlEditor.XmlTreeView.AddChildTextNodeAfterMenuLabel}"
-				class = "ICSharpCode.XmlEditor.AddChildTextNodeCommand"/>			
+			          label = "${res:ICSharpCode.XmlEditor.XmlTreeView.AddChildTextNodeAfterMenuLabel}"
+			          class = "ICSharpCode.XmlEditor.AddChildTextNodeCommand"/>
 		</Condition>
 		<ComplexCondition action = "Disable">
 			<Or>
@@ -273,16 +293,16 @@
 			</Or>
 			<MenuItem id = "CommentNodeCommandsSeparator" type = "Separator"/>
 			<MenuItem id = "InsertCommentBefore"
-				label = "${res:ICSharpCode.XmlEditor.XmlTreeView.InsertCommentBeforeMenuLabel}"
-				class = "ICSharpCode.XmlEditor.InsertCommentBeforeCommand"/>
+			          label = "${res:ICSharpCode.XmlEditor.XmlTreeView.InsertCommentBeforeMenuLabel}"
+			          class = "ICSharpCode.XmlEditor.InsertCommentBeforeCommand"/>
 			<MenuItem id = "InsertCommentAfter"
-				label = "${res:ICSharpCode.XmlEditor.XmlTreeView.InsertCommentAfterMenuLabel}"
-				class = "ICSharpCode.XmlEditor.InsertCommentAfterCommand"/>
+			          label = "${res:ICSharpCode.XmlEditor.XmlTreeView.InsertCommentAfterMenuLabel}"
+			          class = "ICSharpCode.XmlEditor.InsertCommentAfterCommand"/>
 		</ComplexCondition>
 		<Condition name = "Ownerstate" ownerstate = "ElementSelected" action = "Disable">
 			<MenuItem id = "AddChildCommentNode"
-				label = "${res:ICSharpCode.XmlEditor.XmlTreeView.AddChildCommentMenuLabel}"
-				class = "ICSharpCode.XmlEditor.AddChildCommentCommand"/>			
+			          label = "${res:ICSharpCode.XmlEditor.XmlTreeView.AddChildCommentMenuLabel}"
+			          class = "ICSharpCode.XmlEditor.AddChildCommentCommand"/>
 		</Condition>
-	</Path>-->
+	</Path>
 </AddIn>

src/AddIns/BackendBindings/XmlBinding/Project/XmlEditor.csproj

@@ -1,149 +1,170 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
+    <ProjectGuid>{DCA2703D-250A-463E-A68A-07ED105AE6BD}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{6B717BD1-CD5E-498C-A42E-9E6A4584DC48}</ProjectGuid>
+    <OutputType>Library</OutputType>
     <RootNamespace>ICSharpCode.XmlEditor</RootNamespace>
     <AssemblyName>XmlEditor</AssemblyName>
-    <OutputType>Library</OutputType>
-    <WarningLevel>4</WarningLevel>
-    <NoStdLib>False</NoStdLib>
-    <NoConfig>False</NoConfig>
-    <RunPostBuildEvent>OnSuccessfulBuild</RunPostBuildEvent>
-    <ProductVersion>8.0.50215</ProductVersion>
-    <StartAction>Program</StartAction>
-    <StartProgram>..\..\..\..\..\bin\SharpDevelop.exe</StartProgram>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
-    <BaseAddress>110100480</BaseAddress>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <FileAlignment>4096</FileAlignment>
-    <NoWarn>0618</NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <Optimize>False</Optimize>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <SourceAnalysisOverrideSettingsFile>C:\Users\Siegfried\AppData\Roaming\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis</SourceAnalysisOverrideSettingsFile>
     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
-    <OutputPath>..\..\..\..\..\AddIns\AddIns\DisplayBindings\XmlEditor\</OutputPath>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <Optimize>True</Optimize>
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <OutputPath>..\..\..\..\..\AddIns\AddIns\DisplayBindings\XmlEditor\</OutputPath>
+    <NoStdLib>False</NoStdLib>
+    <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <OutputPath>..\..\..\..\..\AddIns\AddIns\BackendBindings\XmlEditor\</OutputPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <DebugType>Full</DebugType>
     <DebugSymbols>true</DebugSymbols>
+    <DebugType>Full</DebugType>
+    <Optimize>False</Optimize>
+    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <DebugSymbols>False</DebugSymbols>
     <DebugType>None</DebugType>
-    <DebugSymbols>false</DebugSymbols>
+    <Optimize>True</Optimize>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
     <DefineConstants>TRACE</DefineConstants>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
+    <BaseAddress>4194304</BaseAddress>
+    <PlatformTarget>x86</PlatformTarget>
+    <FileAlignment>4096</FileAlignment>
+  </PropertyGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
   <ItemGroup>
+    <Reference Include="PresentationCore">
+      <RequiredTargetFramework>3.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="PresentationFramework">
+      <RequiredTargetFramework>3.0</RequiredTargetFramework>
+    </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Core" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
     <Reference Include="System.Data" />
+    <Reference Include="System.Data.DataSetExtensions">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Windows.Presentation">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
     <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="WindowsBase">
+      <RequiredTargetFramework>3.0</RequiredTargetFramework>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
+    <None Include="XmlEditor.addin">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <Compile Include="Configuration\AssemblyInfo.cs" />
+    <Compile Include="Src\AddAttributeCommand.cs" />
     <Compile Include="Src\AddChildCommentCommand.cs" />
+    <Compile Include="Src\AddChildElementCommand.cs" />
     <Compile Include="Src\AddChildTextNodeCommand.cs" />
-    <Compile Include="Src\AddXmlNodeDialog.cs" />
+    <Compile Include="Src\AddXmlNodeDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Src\AssignStylesheetCommand.cs" />
+    <Compile Include="Src\CodeCompletionPopupCommand.cs" />
+    <Compile Include="Src\CreateSchemaCommand.cs" />
+    <Compile Include="Src\EncodedStringWriter.cs" />
+    <Compile Include="Src\FormatXmlCommand.cs" />
+    <Compile Include="Src\GoToSchemaDefinitionCommand.cs" />
+    <Compile Include="Src\GoToSchemaDefinitionEditAction.cs" />
     <Compile Include="Src\IAddXmlNodeDialog.cs" />
     <Compile Include="Src\InsertCommentAfterCommand.cs" />
     <Compile Include="Src\InsertCommentBeforeCommand.cs" />
+    <Compile Include="Src\InsertElementAfterCommand.cs" />
+    <Compile Include="Src\InsertElementBeforeCommand.cs" />
     <Compile Include="Src\InsertTextNodeAfterCommand.cs" />
     <Compile Include="Src\InsertTextNodeBeforeCommand.cs" />
+    <Compile Include="Src\IXmlTreeView.cs" />
+    <Compile Include="Src\OpenStylesheetCommand.cs" />
+    <Compile Include="Src\Parser.cs" />
+    <Compile Include="Src\QualifiedName.cs" />
+    <Compile Include="Src\QualifiedNameCollection.cs" />
+    <Compile Include="Src\RemoveAttributeCommand.cs" />
+    <Compile Include="Src\RemoveXPathHighlightingCommand.cs" />
+    <Compile Include="Src\RunXslTransformCommand.cs" />
+    <Compile Include="Src\SelectXmlSchema.xaml.cs">
+      <DependentUpon>SelectXmlSchema.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Src\ValidateXmlCommand.cs" />
+    <Compile Include="Src\XmlAttributePropertyDescriptor.cs" />
+    <Compile Include="Src\XmlAttributeTypeDescriptor.cs" />
     <Compile Include="Src\XmlCharacterDataTreeNode.cs" />
+    <Compile Include="Src\XmlCodeCompletionBinding.cs" />
     <Compile Include="Src\XmlCommentTreeNode.cs" />
-    <Compile Include="Src\XmlEditorControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
     <Compile Include="Src\XmlCompletionDataProvider.cs" />
-    <Compile Include="Src\XmlCompletionData.cs" />
-    <Compile Include="Src\XmlCompletionDataImageList.cs" />
-    <Compile Include="Src\XmlParser.cs" />
-    <Compile Include="Src\XmlSchemaCompletionData.cs" />
-    <Compile Include="Src\XmlSchemaCompletionDataCollection.cs" />
-    <Compile Include="Src\XmlFoldingStrategy.cs" />
-    <Compile Include="Src\QualifiedName.cs" />
-    <Compile Include="Src\XmlElementPath.cs" />
-    <Compile Include="Src\QualifiedNameCollection.cs" />
-    <Compile Include="Src\XmlCompletionDataCollection.cs" />
+    <Compile Include="Src\XmlCompletionItem.cs" />
+    <Compile Include="Src\XmlCompletionItemCollection.cs" />
+    <Compile Include="Src\XmlCompletionItemList.cs" />
     <Compile Include="Src\XmlDisplayBinding.cs" />
-    <Compile Include="Src\XmlView.cs" />
-    <Compile Include="Src\XmlSchemaManager.cs" />
-    <Compile Include="Src\Parser.cs" />
-    <Compile Include="Src\ValidateXmlCommand.cs" />
-    <Compile Include="Src\XmlSchemasPanel.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Src\XmlSchemaListBoxItem.cs" />
     <Compile Include="Src\XmlEditorAddInOptions.cs" />
-    <Compile Include="Src\SelectXmlSchemaForm.cs">
-      <SubType>Form</SubType>
+    <Compile Include="Src\XmlEditorOptionsPanel.xaml.cs">
+      <DependentUpon>XmlEditorOptionsPanel.xaml</DependentUpon>
+      <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Src\CodeCompletionPopupCommand.cs" />
-    <Compile Include="Src\XmlSchemaAssociation.cs" />
-    <Compile Include="Src\XmlSchemaAssociationListBoxItem.cs" />
-    <Compile Include="Src\XmlEditorOptionsPanel.cs">
-      <SubType>UserControl</SubType>
+    <Compile Include="Src\XmlElementPath.cs" />
+    <Compile Include="Src\XmlElementTreeNode.cs" />
+    <Compile Include="Src\XmlEncoder.cs" />
+    <Compile Include="Src\XmlFormattingStrategy.cs">
     </Compile>
-    <Compile Include="Src\CreateSchemaCommand.cs" />
-    <Compile Include="Src\EncodedStringWriter.cs" />
-    <EmbeddedResource Include="Resources\XmlSchemasPanel.xfrm" />
-    <EmbeddedResource Include="Resources\SelectXmlSchema.xfrm" />
-    <EmbeddedResource Include="Resources\XmlEditorOptionsPanel.xfrm" />
-    <EmbeddedResource Include="Resources\XmlCommentTreeNodeIcon.png" />
-    <None Include="PostBuildEvent.proj" />
-    <None Include="XmlEditor.addin">
-      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-    </None>
-    <Compile Include="Src\RunXslTransformCommand.cs" />
-    <Compile Include="Src\XslOutputView.cs" />
-    <Compile Include="Src\AssignStylesheetCommand.cs" />
-    <Compile Include="Src\OpenStylesheetCommand.cs" />
     <Compile Include="Src\StylesheetAssignedCondition.cs" />
-    <Compile Include="..\..\..\..\Main\GlobalAssemblyInfo.cs">
-      <Link>Configuration\GlobalAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="Src\FormatXmlCommand.cs" />
-    <Compile Include="Src\XPathQueryPad.cs" />
-    <Compile Include="Src\XPathQueryControl.cs" />
+    <Compile Include="Src\XmlFoldingStrategy.cs" />
     <Compile Include="Src\XmlNamespace.cs" />
-    <Compile Include="Src\XPathNodeMatch.cs" />
-    <Compile Include="Src\XPathNodeTextMarker.cs" />
-    <Compile Include="Src\RemoveXPathHighlightingCommand.cs" />
-    <Compile Include="Src\GoToSchemaDefinitionCommand.cs" />
-    <Compile Include="Src\GoToSchemaDefinitionEditAction.cs" />
+    <Compile Include="Src\XmlParser.cs" />
+    <Compile Include="Src\XmlSchemaAssociation.cs" />
+    <Compile Include="Src\XmlSchemaAssociationListBoxItem.cs" />
+    <Compile Include="Src\XmlSchemaCompletionData.cs" />
+    <Compile Include="Src\XmlSchemaCompletionDataCollection.cs" />
+    <Compile Include="Src\XmlSchemaListBoxItem.cs" />
+    <Compile Include="Src\XmlSchemaManager.cs" />
+    <Compile Include="Src\XmlSchemasPanel.xaml.cs">
+      <DependentUpon>XmlSchemasPanel.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Src\XmlTextTreeNode.cs" />
     <Compile Include="Src\XmlTreeEditor.cs" />
-    <Compile Include="Src\IXmlTreeView.cs" />
     <Compile Include="Src\XmlTreeView.cs" />
-    <Compile Include="Src\XmlTreeViewContainerControl.cs" />
+    <Compile Include="Src\XmlTreeViewContainerControl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
     <Compile Include="Src\XmlTreeViewControl.cs" />
+    <Compile Include="Src\XmlView.cs" />
+    <Compile Include="Src\XPathNodeMatch.cs" />
+    <Compile Include="Src\XPathNodeTextMarker.cs" />
+    <Compile Include="Src\XPathQueryControl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Src\XPathQueryPad.cs" />
+    <Compile Include="Src\XslOutputView.cs" />
+    <EmbeddedResource Include="Resources\XmlCommentTreeNodeIcon.png" />
     <EmbeddedResource Include="Resources\XmlElementTreeNodeIcon.png" />
-    <Compile Include="Src\XmlElementTreeNode.cs" />
-    <Compile Include="Src\XmlTextTreeNode.cs" />
     <EmbeddedResource Include="Resources\XmlTextTreeNodeIcon.png" />
-    <Compile Include="Src\XmlAttributePropertyDescriptor.cs" />
-    <Compile Include="Src\XmlAttributeTypeDescriptor.cs" />
-    <Compile Include="Src\XmlEncoder.cs" />
-    <Compile Include="Src\AddAttributeCommand.cs" />
-    <Compile Include="Src\RemoveAttributeCommand.cs" />
-    <Compile Include="Src\AddChildElementCommand.cs" />
-    <Compile Include="Src\InsertElementBeforeCommand.cs" />
-    <Compile Include="Src\InsertElementAfterCommand.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Page Include="Src\SelectXmlSchema.xaml" />
+    <Page Include="Src\XmlEditorOptionsPanel.xaml" />
+    <Page Include="Src\XmlSchemasPanel.xaml" />
+    <ProjectReference Include="..\..\..\..\Libraries\AvalonEdit\ICSharpCode.AvalonEdit\ICSharpCode.AvalonEdit.csproj">
+      <Project>{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}</Project>
+      <Name>ICSharpCode.AvalonEdit</Name>
+      <Private>False</Private>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\..\Main\Base\Project\ICSharpCode.SharpDevelop.csproj">
       <Project>{2748AD25-9C63-4E12-877B-4DCE96FBED54}</Project>
       <Name>ICSharpCode.SharpDevelop</Name>
@@ -154,9 +175,9 @@
       <Name>ICSharpCode.Core</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Libraries\ICSharpCode.TextEditor\Project\ICSharpCode.TextEditor.csproj">
-      <Project>{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}</Project>
-      <Name>ICSharpCode.TextEditor</Name>
+    <ProjectReference Include="..\..\..\..\Main\ICSharpCode.Core.Presentation\ICSharpCode.Core.Presentation.csproj">
+      <Project>{7E4A7172-7FF5-48D0-B719-7CD959DD1AC9}</Project>
+      <Name>ICSharpCode.Core.Presentation</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\..\Main\ICSharpCode.Core.WinForms\ICSharpCode.Core.WinForms.csproj">
@@ -170,6 +191,4 @@
       <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
-  <Import Project="PostBuildEvent.proj" />
 </Project>

src/AddIns/BackendBindings/XmlBinding/Test/AssemblyInfo.cs

@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 984 $</version>
 // </file>
 
 using System.Reflection;

src/AddIns/BackendBindings/XmlBinding/Test/Completion/FirstCompletionListItemSelectedTestFixture.cs

@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 3490 $</version>
 // </file>
 
 using System;

src/AddIns/BackendBindings/XmlBinding/Test/Completion/ProcessKeyTests.cs

@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 2760 $</version>
 // </file>
 
 using System;