diff --git a/SharpDevelop.Tests.sln b/SharpDevelop.Tests.sln
index 7269d9cb16..432c4becc9 100644
--- a/SharpDevelop.Tests.sln
+++ b/SharpDevelop.Tests.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
-# SharpDevelop 4.2.0.8658-Beta 2
+# SharpDevelop 4.2.0.8679-Beta 2
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Main", "Main", "{256F5C28-532C-44C0-8AB8-D8EC5E492E01}"
ProjectSection(SolutionItems) = postProject
EndProjectSection
@@ -79,6 +79,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.CSha
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.Xml", "src\Libraries\NRefactory\ICSharpCode.NRefactory.Xml\ICSharpCode.NRefactory.Xml.csproj", "{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.Tests", "src\Libraries\NRefactory\ICSharpCode.NRefactory.Tests\ICSharpCode.NRefactory.Tests.csproj", "{63D3B27A-D966-4902-90B3-30290E1692F1}"
+EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvalonDock", "src\Libraries\AvalonDock\AvalonDock\AvalonDock.csproj", "{2FF700C2-A38A-48BD-A637-8CAFD4FE6237}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.AvalonEdit", "src\Libraries\AvalonEdit\ICSharpCode.AvalonEdit\ICSharpCode.AvalonEdit.csproj", "{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}"
@@ -445,6 +447,18 @@ Global
{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.Release|Win32.ActiveCfg = Release|Any CPU
{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.Release|x86.Build.0 = Release|Any CPU
{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.Release|x86.ActiveCfg = Release|Any CPU
+ {63D3B27A-D966-4902-90B3-30290E1692F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {63D3B27A-D966-4902-90B3-30290E1692F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {63D3B27A-D966-4902-90B3-30290E1692F1}.Debug|Win32.Build.0 = Debug|Any CPU
+ {63D3B27A-D966-4902-90B3-30290E1692F1}.Debug|Win32.ActiveCfg = Debug|Any CPU
+ {63D3B27A-D966-4902-90B3-30290E1692F1}.Debug|x86.Build.0 = Debug|x86
+ {63D3B27A-D966-4902-90B3-30290E1692F1}.Debug|x86.ActiveCfg = Debug|x86
+ {63D3B27A-D966-4902-90B3-30290E1692F1}.Release|Any CPU.Build.0 = Release|Any CPU
+ {63D3B27A-D966-4902-90B3-30290E1692F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {63D3B27A-D966-4902-90B3-30290E1692F1}.Release|Win32.Build.0 = Release|Any CPU
+ {63D3B27A-D966-4902-90B3-30290E1692F1}.Release|Win32.ActiveCfg = Release|Any CPU
+ {63D3B27A-D966-4902-90B3-30290E1692F1}.Release|x86.Build.0 = Release|x86
+ {63D3B27A-D966-4902-90B3-30290E1692F1}.Release|x86.ActiveCfg = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -471,6 +485,7 @@ Global
{3B2A5653-EC97-4001-BB9B-D90F1AF2C371} = {E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}
{53DCA265-3C3C-42F9-B647-F72BA678122B} = {E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}
{DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6} = {E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}
+ {63D3B27A-D966-4902-90B3-30290E1692F1} = {E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}
{F208FF4F-E5D8-41D5-A7C7-B463976F156E} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
{E0646C25-36F2-4524-969F-FA621353AB94} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
{F3662720-9EA2-4591-BBC6-97361DCE50A9} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Parser/Parser.cs b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Parser/Parser.cs
index ce6bc0b3f5..10cf2efac0 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Parser/Parser.cs
+++ b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Parser/Parser.cs
@@ -79,13 +79,7 @@ namespace CSharpBinding.Parser
{
CSharpParser parser = new CSharpParser();
parser.GenerateTypeSystemMode = !fullParseInformationRequested;
- CompilationUnit cu;
- try {
- cu = parser.Parse(fileContent.CreateReader(), fileName);
- } catch (Exception ex) {
- LoggingService.Error(ex);
- cu = new CompilationUnit();
- }
+ CompilationUnit cu = parser.Parse(fileContent.CreateReader(), fileName);
CSharpParsedFile file = cu.ToTypeSystem();
ParseInformation parseInfo;
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit.Tests/Document/ChangeTrackingTest.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit.Tests/Document/ChangeTrackingTest.cs
index f82c3072fb..f5b3715415 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit.Tests/Document/ChangeTrackingTest.cs
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit.Tests/Document/ChangeTrackingTest.cs
@@ -15,11 +15,10 @@ namespace ICSharpCode.AvalonEdit.Document
public void NoChanges()
{
TextDocument document = new TextDocument("initial text");
- ChangeTrackingCheckpoint checkpoint1, checkpoint2;
- ITextSource snapshot1 = document.CreateSnapshot(out checkpoint1);
- ITextSource snapshot2 = document.CreateSnapshot(out checkpoint2);
- Assert.AreEqual(0, checkpoint1.CompareAge(checkpoint2));
- Assert.AreEqual(0, checkpoint1.GetChangesTo(checkpoint2).Count());
+ ITextSource snapshot1 = document.CreateSnapshot();
+ ITextSource snapshot2 = document.CreateSnapshot();
+ Assert.AreEqual(0, snapshot1.Version.CompareAge(snapshot2.Version));
+ Assert.AreEqual(0, snapshot1.Version.GetChangesTo(snapshot2.Version).Count());
Assert.AreEqual(document.Text, snapshot1.Text);
Assert.AreEqual(document.Text, snapshot2.Text);
}
@@ -28,13 +27,12 @@ namespace ICSharpCode.AvalonEdit.Document
public void ForwardChanges()
{
TextDocument document = new TextDocument("initial text");
- ChangeTrackingCheckpoint checkpoint1, checkpoint2;
- ITextSource snapshot1 = document.CreateSnapshot(out checkpoint1);
+ ITextSource snapshot1 = document.CreateSnapshot();
document.Replace(0, 7, "nw");
document.Insert(1, "e");
- ITextSource snapshot2 = document.CreateSnapshot(out checkpoint2);
- Assert.AreEqual(-1, checkpoint1.CompareAge(checkpoint2));
- DocumentChangeEventArgs[] arr = checkpoint1.GetChangesTo(checkpoint2).ToArray();
+ ITextSource snapshot2 = document.CreateSnapshot();
+ Assert.AreEqual(-1, snapshot1.Version.CompareAge(snapshot2.Version));
+ TextChangeEventArgs[] arr = snapshot1.Version.GetChangesTo(snapshot2.Version).ToArray();
Assert.AreEqual(2, arr.Length);
Assert.AreEqual("nw", arr[0].InsertedText);
Assert.AreEqual("e", arr[1].InsertedText);
@@ -47,13 +45,12 @@ namespace ICSharpCode.AvalonEdit.Document
public void BackwardChanges()
{
TextDocument document = new TextDocument("initial text");
- ChangeTrackingCheckpoint checkpoint1, checkpoint2;
- ITextSource snapshot1 = document.CreateSnapshot(out checkpoint1);
+ ITextSource snapshot1 = document.CreateSnapshot();
document.Replace(0, 7, "nw");
document.Insert(1, "e");
- ITextSource snapshot2 = document.CreateSnapshot(out checkpoint2);
- Assert.AreEqual(1, checkpoint2.CompareAge(checkpoint1));
- DocumentChangeEventArgs[] arr = checkpoint2.GetChangesTo(checkpoint1).ToArray();
+ ITextSource snapshot2 = document.CreateSnapshot();
+ Assert.AreEqual(1, snapshot2.Version.CompareAge(snapshot1.Version));
+ TextChangeEventArgs[] arr = snapshot2.Version.GetChangesTo(snapshot1.Version).ToArray();
Assert.AreEqual(2, arr.Length);
Assert.AreEqual("", arr[0].InsertedText);
Assert.AreEqual("initial", arr[1].InsertedText);
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit.Tests/ICSharpCode.AvalonEdit.Tests.csproj b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit.Tests/ICSharpCode.AvalonEdit.Tests.csproj
index 32d4aca6f9..61a27f0c36 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit.Tests/ICSharpCode.AvalonEdit.Tests.csproj
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit.Tests/ICSharpCode.AvalonEdit.Tests.csproj
@@ -20,6 +20,7 @@
false
..\..\..\..\bin\UnitTests\
OnBuildSuccess
+ Client
true
@@ -91,12 +92,7 @@
-
-
-
- Always
-
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit.Tests/XmlParser/ParserTests.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit.Tests/XmlParser/ParserTests.cs
deleted file mode 100644
index 89c32d6993..0000000000
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit.Tests/XmlParser/ParserTests.cs
+++ /dev/null
@@ -1,223 +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.Generic;
-using System.Linq;
-using System.Diagnostics;
-using System.IO;
-using System.Text;
-
-using ICSharpCode.AvalonEdit.Xml;
-using ICSharpCode.SharpZipLib.Zip;
-using NUnit.Framework;
-
-namespace ICSharpCode.AvalonEdit.Xml
-{
- class TestFile
- {
- public string Name { get; set; }
- public string Content { get; set; }
- public string Canonical { get; set; }
- public string Description { get; set; }
- }
-
- [TestFixture]
- public class ParserTests
- {
- readonly string zipFileName = @"XmlParser\W3C.zip";
-
- List xmlFiles = new List();
-
- [TestFixtureSetUp]
- public void OpenZipFile()
- {
- ZipFile zipFile = new ZipFile(zipFileName);
-
- Dictionary xmlFiles = new Dictionary();
-
- // Decompress XML files
- foreach(ZipEntry zipEntry in zipFile.Cast().Where(zip => zip.IsFile && zip.Name.EndsWith(".xml"))) {
- Stream stream = zipFile.GetInputStream(zipEntry);
- string content = new StreamReader(stream).ReadToEnd();
- xmlFiles.Add(zipEntry.Name, new TestFile { Name = zipEntry.Name, Content = content });
- }
- // Add descriptions
- foreach(TestFile metaData in xmlFiles.Values.Where(f => f.Name.StartsWith("ibm/ibm_oasis"))) {
- var doc = System.Xml.Linq.XDocument.Parse(metaData.Content);
- foreach(var testElem in doc.Descendants("TEST")) {
- string uri = "ibm/" + testElem.Attribute("URI").Value;
- string description = testElem.Value.Replace("\n ", "\n").TrimStart('\n');
- if (xmlFiles.ContainsKey(uri))
- xmlFiles[uri].Description = description;
- }
- }
- // Copy canonical forms
- foreach(TestFile canonical in xmlFiles.Values.Where(f => f.Name.Contains("/out/"))) {
- string uri = canonical.Name.Replace("/out/", "/");
- if (xmlFiles.ContainsKey(uri))
- xmlFiles[uri].Canonical = canonical.Content;
- }
- // Copy resuts to field
- this.xmlFiles.AddRange(xmlFiles.Values.Where(f => !f.Name.Contains("/out/")));
- }
-
- IEnumerable GetXmlFilesStartingWith(string directory)
- {
- return xmlFiles.Where(f => f.Name.StartsWith(directory));
- }
-
- [Test]
- public void W3C_Valid()
- {
- string[] exclude = {
- // NAME in DTD infoset
- "ibm02v01", "ibm03v01", "ibm85v01", "ibm86v01", "ibm87v01", "ibm88v01", "ibm89v01",
- };
- TestFiles(GetXmlFilesStartingWith("ibm/valid/"), true, exclude);
- }
-
- [Test]
- public void W3C_Invalid()
- {
- string[] exclude = {
- // Default attribute value
- "ibm56i03",
- };
- TestFiles(GetXmlFilesStartingWith("ibm/invalid/"), true, exclude);
- }
-
- [Test]
- public void W3C_NotWellformed()
- {
- string[] exclude = {
- // XML declaration well formed
- "ibm23n", "ibm24n", "ibm26n01", "ibm32n", "ibm80n06", "ibm81n01", "ibm81n02", "ibm81n03", "ibm81n04", "ibm81n05", "ibm81n06", "ibm81n07", "ibm81n08", "ibm81n09",
- // Invalid chars in a comment - do we care?
- "ibm02n",
- // Invalid char ref - do we care?
- "ibm66n12", "ibm66n13", "ibm66n14", "ibm66n15",
- // DTD in wrong location
- "ibm27n01", "ibm43n",
- // Entity refs depending on DTD
- "ibm41n10", "ibm41n11", "ibm41n12", "ibm41n13", "ibm41n14", "ibm68n04", "ibm68n06", "ibm68n07", "ibm68n08", "ibm68n09", "ibm68n10",
- // DTD Related tests
- "ibm09n01", "ibm09n02", "ibm13n01", "ibm13n02", "ibm13n03", "ibm28n01", "ibm28n02", "ibm28n03", "ibm29n01", "ibm29n03", "ibm29n04", "ibm29n07", "ibm30n01", "ibm31n01", "ibm45n01", "ibm45n02", "ibm45n03", "ibm45n04", "ibm45n05", "ibm45n06", "ibm46n01", "ibm46n02", "ibm46n03", "ibm46n04",
- "ibm46n05", "ibm47n01", "ibm47n02", "ibm47n03", "ibm47n04", "ibm47n05", "ibm47n06", "ibm48n01", "ibm48n02", "ibm48n03", "ibm48n04", "ibm48n05", "ibm48n06", "ibm48n07", "ibm49n01", "ibm49n02", "ibm49n03", "ibm49n04", "ibm49n05", "ibm49n06", "ibm50n01", "ibm50n02", "ibm50n03", "ibm50n04",
- "ibm50n05", "ibm50n06", "ibm50n07", "ibm51n01", "ibm51n02", "ibm51n03", "ibm51n04", "ibm51n05", "ibm51n06", "ibm51n07", "ibm52n01", "ibm52n02", "ibm52n03", "ibm53n01", "ibm53n02", "ibm53n03", "ibm53n04", "ibm53n05", "ibm53n06", "ibm53n07", "ibm53n08", "ibm54n01", "ibm54n02", "ibm55n01",
- "ibm55n02", "ibm55n03", "ibm56n01", "ibm56n02", "ibm56n03", "ibm56n04", "ibm56n05", "ibm56n06", "ibm56n07", "ibm57n01", "ibm58n01", "ibm58n02", "ibm58n03", "ibm58n04", "ibm58n05", "ibm58n06", "ibm58n07", "ibm58n08", "ibm59n01", "ibm59n02", "ibm59n03", "ibm59n04", "ibm59n05", "ibm59n06",
- "ibm60n01", "ibm60n02", "ibm60n03", "ibm60n04", "ibm60n05", "ibm60n06", "ibm60n07", "ibm60n08", "ibm61n01", "ibm62n01", "ibm62n02", "ibm62n03", "ibm62n04", "ibm62n05", "ibm62n06", "ibm62n07", "ibm62n08", "ibm63n01", "ibm63n02", "ibm63n03", "ibm63n04", "ibm63n05", "ibm63n06", "ibm63n07",
- "ibm64n01", "ibm64n02", "ibm64n03", "ibm65n01", "ibm65n02", "ibm66n01", "ibm66n03", "ibm66n05", "ibm66n07", "ibm66n09", "ibm66n11", "ibm69n01", "ibm69n02", "ibm69n03", "ibm69n04", "ibm69n05", "ibm69n06", "ibm69n07", "ibm70n01", "ibm71n01", "ibm71n02", "ibm71n03", "ibm71n04", "ibm71n05",
- "ibm72n01", "ibm72n02", "ibm72n03", "ibm72n04", "ibm72n05", "ibm72n06", "ibm72n09", "ibm73n01", "ibm73n03", "ibm74n01", "ibm75n01", "ibm75n02", "ibm75n03", "ibm75n04", "ibm75n05", "ibm75n06", "ibm75n07", "ibm75n08", "ibm75n09", "ibm75n10", "ibm75n11", "ibm75n12", "ibm75n13", "ibm76n01",
- "ibm76n02", "ibm76n03", "ibm76n04", "ibm76n05", "ibm76n06", "ibm76n07", "ibm77n01", "ibm77n02", "ibm77n03", "ibm77n04", "ibm78n01", "ibm78n02", "ibm79n01", "ibm79n02", "ibm82n01", "ibm82n02", "ibm82n03", "ibm82n04", "ibm82n08", "ibm83n01", "ibm83n03", "ibm83n04", "ibm83n05", "ibm83n06",
- // No idea what this is
- "misc/432gewf", "ibm28an01",
- };
- TestFiles(GetXmlFilesStartingWith("ibm/not-wf/"), false, exclude);
- }
-
- StringBuilder errorOutput;
-
- void TestFiles(IEnumerable files, bool areWellFormed, string[] exclude)
- {
- errorOutput = new StringBuilder();
- int testsRun = 0;
- int ignored = 0;
- foreach (TestFile file in files) {
- if (exclude.Any(exc => file.Name.Contains(exc))) {
- ignored++;
- } else {
- testsRun++;
- TestFile(file, areWellFormed);
- }
- }
- if (testsRun == 0) {
- Assert.Fail("Test files not found");
- }
- if (errorOutput.Length > 0) {
- // Can not output ]]> otherwise nuint will crash
- Assert.Fail(errorOutput.Replace("]]>", "]]~NUNIT~>").ToString());
- }
- }
-
- ///
- /// If using DTD, canonical representation is not checked
- /// If using DTD, uknown entiry references are not error
- ///
- bool TestFile(TestFile testFile, bool isWellFormed)
- {
- bool passed = true;
-
- string content = testFile.Content;
- Debug.WriteLine("Testing " + testFile.Name + "...");
- AXmlParser parser = new AXmlParser();
-
- bool usingDTD = content.Contains("
-
-
-
-";
-
- string finalDocumentText = @"
-
-
-
-
-
-
-
-
-
-
-
-
-";
-
- int offset = @"
-".Length;
-
- string original = @"
-
- ";
-
- string replacement = @"
-
-
-
-
-
-
-
-
-
-
- ";
- #endregion
-
- [Test]
- public void ReplacementTest1()
- {
- /*
- * REPRODUCTION STEPS
- *
- * 1. Run XmlDOM project
- * 2. paste text from initialDocumentText (see Test Data region)
- * 3. select lines 4 to 6
- * 4. replace with replacement (see Test Data region)
- * 5. exception thrown:
- * ICSharpCode.AvalonEdit.Xml.InternalException : Assertion failed: cached elements must not have zero length
- * at ICSharpCode.AvalonEdit.Xml.AXmlParser.Assert(Boolean condition, String message)
- * in c:\Projects\SharpDevelop\4.0\SharpDevelop\src\Libraries\AvalonEdit\ICSharpCode.AvalonEdit\Xml\AXmlParser.cs:line 121
- * at ICSharpCode.AvalonEdit.Xml.TagReader.TryReadFromCacheOrNew[T](T& res, Predicate`1 condition)
- * in c:\Projects\SharpDevelop\4.0\SharpDevelop\src\Libraries\AvalonEdit\ICSharpCode.AvalonEdit\Xml\TagReader.cs:line 39
- * at ICSharpCode.AvalonEdit.Xml.TagReader.d__12.MoveNext()
- * in c:\Projects\SharpDevelop\4.0\SharpDevelop\src\Libraries\AvalonEdit\ICSharpCode.AvalonEdit\Xml\TagReader.cs:line 456
- * at System.Collections.Generic.List`1.InsertRange(Int32 index, IEnumerable`1 collection)
- * at System.Collections.Generic.List`1.AddRange(IEnumerable`1 collection)
- * at ICSharpCode.AvalonEdit.Xml.TagReader.ReadAllTags()
- * in c:\Projects\SharpDevelop\4.0\SharpDevelop\src\Libraries\AvalonEdit\ICSharpCode.AvalonEdit\Xml\TagReader.cs:line 73
- * at ICSharpCode.AvalonEdit.Xml.AXmlParser.Parse(String input, IEnumerable`1 changesSinceLastParse)
- * in c:\Projects\SharpDevelop\4.0\SharpDevelop\src\Libraries\AvalonEdit\ICSharpCode.AvalonEdit\Xml\AXmlParser.cs:line 161
- * at ICSharpCode.AvalonEdit.Tests.XmlParser.TextReplacementTests.RunTest()
- * in c:\Projects\SharpDevelop\4.0\SharpDevelop\src\Libraries\AvalonEdit\ICSharpCode.AvalonEdit.Tests\XmlParser\TextReplacementTests.cs:line 114
- * at ICSharpCode.AvalonEdit.Tests.XmlParser.TextReplacementTests.TestMethod(
- * ) in c:\Projects\SharpDevelop\4.0\SharpDevelop\src\Libraries\AvalonEdit\ICSharpCode.AvalonEdit.Tests\XmlParser\TextReplacementTests.cs:line 97
- * */
- Assert.DoesNotThrow(RunTest1);
- }
-
- void RunTest1()
- {
- AXmlParser parser = new AXmlParser();
-
- try {
- parser.Lock.EnterWriteLock();
-
- parser.Parse(initialDocumentText, null); // full reparse
-
- IList changes = new List();
-
- changes.Add(new DocumentChangeEventArgs(offset, original, replacement));
-
- parser.Parse(finalDocumentText, changes);
- } finally {
- parser.Lock.ExitWriteLock();
- }
- }
- }
-}
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit.Tests/XmlParser/W3C.zip b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit.Tests/XmlParser/W3C.zip
deleted file mode 100644
index 4ffe475b3f..0000000000
Binary files a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit.Tests/XmlParser/W3C.zip and /dev/null differ
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit.Tests/app.config b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit.Tests/app.config
index 2400cda528..c5b0892691 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit.Tests/app.config
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit.Tests/app.config
@@ -1,11 +1,13 @@
-
+
-
+
+
+
+
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Document/DocumentChangeEventArgs.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Document/DocumentChangeEventArgs.cs
index 901fef1606..431d6ab4db 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Document/DocumentChangeEventArgs.cs
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Document/DocumentChangeEventArgs.cs
@@ -84,10 +84,8 @@ namespace ICSharpCode.AvalonEdit.Document
}
}
- ///
- /// Creates DocumentChangeEventArgs for the reverse change.
- ///
- public DocumentChangeEventArgs Invert()
+ ///
+ public override TextChangeEventArgs Invert()
{
OffsetChangeMap map = this.OffsetChangeMapOrNull;
if (map != null) {
diff --git a/src/Main/Base/Test/ICSharpCode.SharpDevelop.Tests.csproj b/src/Main/Base/Test/ICSharpCode.SharpDevelop.Tests.csproj
index e49bd94b4f..8dea0c8a56 100644
--- a/src/Main/Base/Test/ICSharpCode.SharpDevelop.Tests.csproj
+++ b/src/Main/Base/Test/ICSharpCode.SharpDevelop.Tests.csproj
@@ -24,7 +24,7 @@
False
x86
false
- v4.0
+ v4.5
true
diff --git a/src/Main/Base/Test/ICSharpCode.SharpDevelop.Tests.csproj.user b/src/Main/Base/Test/ICSharpCode.SharpDevelop.Tests.csproj.user
index 7ff3943f7c..3ea973d02f 100644
--- a/src/Main/Base/Test/ICSharpCode.SharpDevelop.Tests.csproj.user
+++ b/src/Main/Base/Test/ICSharpCode.SharpDevelop.Tests.csproj.user
@@ -1 +1,2 @@
-
\ No newline at end of file
+
+
\ No newline at end of file