From 119bc70df8f07f2ad5063e33571419b956c3543d Mon Sep 17 00:00:00 2001 From: Sarah Blume Date: Thu, 23 Jun 2022 13:36:56 +0200 Subject: [PATCH 1/2] Upgrade the library to .Net6 --- nrtftree-examples/simple-demo/Demo.cs | 38 +++++----- .../simple-demo/simple-demo.csproj | 61 ++------------- nrtftree-library/RtfTree.cs | 2 +- nrtftree-library/nrtftree-library.csproj | 75 +++---------------- nrtftree-test/HeaderSectionsTest.cs | 6 +- nrtftree-test/ImageNodeTest.cs | 16 ++-- nrtftree-test/LoadRtfTest.cs | 48 ++++++------ nrtftree-test/MergeTest.cs | 30 ++++---- nrtftree-test/NavigationTest.cs | 2 +- nrtftree-test/NodeCollectionTest.cs | 2 +- nrtftree-test/ObjectNodeTest.cs | 18 ++--- nrtftree-test/RtfDocumentTest.cs | 18 ++--- nrtftree-test/RtfPullParserTest.cs | 6 +- nrtftree-test/RtfTreeNodeTest.cs | 8 +- nrtftree-test/SelectNodesTest.cs | 42 +++++------ nrtftree-test/nrtftree-test.csproj | 67 +++-------------- nrtftree.sln | 30 +------- 17 files changed, 147 insertions(+), 322 deletions(-) diff --git a/nrtftree-examples/simple-demo/Demo.cs b/nrtftree-examples/simple-demo/Demo.cs index 91c7697..94e4c5e 100644 --- a/nrtftree-examples/simple-demo/Demo.cs +++ b/nrtftree-examples/simple-demo/Demo.cs @@ -182,7 +182,7 @@ private static void PrintSpanishMenu() public static void ExtractDocumentProperties() { RtfTree tree = new RtfTree(); - tree.LoadRtfFile("..\\..\\testdocs\\test-doc.rtf"); + tree.LoadRtfFile("testdocs\\test-doc.rtf"); InfoGroup info = tree.GetInfoGroup(); @@ -201,9 +201,9 @@ public static void ExtractDocumentProperties() public static void GenerateRtfTree() { RtfTree tree = new RtfTree(); - tree.LoadRtfFile("..\\..\\testdocs\\test-doc.rtf"); + tree.LoadRtfFile("testdocs\\test-doc.rtf"); - StreamWriter sw = new StreamWriter("..\\..\\testdocs\\rtftree.txt"); + StreamWriter sw = new StreamWriter("testdocs\\rtftree.txt"); Console.WriteLine("Generating RTF tree..."); @@ -219,9 +219,9 @@ public static void GenerateRtfTree() public static void ExtractPlainText() { RtfTree tree = new RtfTree(); - tree.LoadRtfFile("..\\..\\testdocs\\test-doc.rtf"); + tree.LoadRtfFile("testdocs\\test-doc.rtf"); - StreamWriter sw = new StreamWriter("..\\..\\testdocs\\rtftext.txt"); + StreamWriter sw = new StreamWriter("testdocs\\rtftext.txt"); Console.WriteLine("Extracting text..."); @@ -237,7 +237,7 @@ public static void ExtractPlainText() public static void ExtractDocumentOutline() { RtfTree tree = new RtfTree(); - tree.LoadRtfFile("..\\..\\testdocs\\test-doc.rtf"); + tree.LoadRtfFile("testdocs\\test-doc.rtf"); RtfStyleSheetTable sst = tree.GetStyleSheetTable(); @@ -284,7 +284,7 @@ public static void ExtractDocumentOutline() private static void ExtractHyperlinks() { RtfTree tree = new RtfTree(); - tree.LoadRtfFile("..\\..\\testdocs\\test-doc.rtf"); + tree.LoadRtfFile("testdocs\\test-doc.rtf"); RtfNodeCollection fields = tree.MainGroup.SelectGroups("field"); @@ -326,7 +326,7 @@ private static string ExtractGroupText(RtfTreeNode group) private static void ExtractImages() { RtfTree tree = new RtfTree(); - tree.LoadRtfFile("..\\..\\testdocs\\test-doc.rtf"); + tree.LoadRtfFile("testdocs\\test-doc.rtf"); RtfNodeCollection imageNodes = tree.RootNode.SelectNodes("pict"); @@ -339,7 +339,7 @@ private static void ExtractImages() if (imageNode.ImageFormat == ImageFormat.Png) { - imageNode.SaveImage("..\\..\\testdocs\\image" + i + ".png"); + imageNode.SaveImage("testdocs\\image" + i + ".png"); Console.WriteLine("File '" + "image" + i + ".png" + "' created."); @@ -353,7 +353,7 @@ private static void ExtractImages() private static void ExtractObjects() { RtfTree tree = new RtfTree(); - tree.LoadRtfFile("..\\..\\testdocs\\test-doc.rtf"); + tree.LoadRtfFile("testdocs\\test-doc.rtf"); //Busca el primer nodo de tipo objeto. RtfNodeCollection objects = tree.RootNode.SelectGroups("object"); @@ -372,7 +372,7 @@ private static void ExtractObjects() byte[] data = objectNode.GetByteData(); - FileStream binaryFile = new FileStream("..\\..\\testdocs\\object" + i + ".xls", FileMode.Create, FileAccess.ReadWrite); + FileStream binaryFile = new FileStream("testdocs\\object" + i + ".xls", FileMode.Create, FileAccess.ReadWrite); BinaryWriter bw = new BinaryWriter(binaryFile); for (int j = 38; j < data.Length; j++) @@ -398,13 +398,13 @@ private static void TagFormat() RtfReader reader = new RtfReader(parser); - reader.LoadRtfFile("..\\..\\testdocs\\test-doc2.rtf"); + reader.LoadRtfFile("testdocs\\test-doc2.rtf"); Console.WriteLine("Processing..."); reader.Parse(); - StreamWriter sw = new StreamWriter("..\\..\\testdocs\\taggedfile.txt"); + StreamWriter sw = new StreamWriter("testdocs\\taggedfile.txt"); sw.Write(parser.doc); sw.Flush(); sw.Close(); @@ -416,15 +416,15 @@ private static void TagFormat() private static void MergeDocuments() { - RtfMerger merger = new RtfMerger("..\\..\\testdocs\\test-doc3.rtf"); + RtfMerger merger = new RtfMerger("testdocs\\test-doc3.rtf"); - merger.AddPlaceHolder("[TagTextRTF1]", "..\\..\\testdocs\\merge1.rtf"); - merger.AddPlaceHolder("[TagTextRTF2]", "..\\..\\testdocs\\merge2.rtf"); + merger.AddPlaceHolder("[TagTextRTF1]", "testdocs\\merge1.rtf"); + merger.AddPlaceHolder("[TagTextRTF2]", "testdocs\\merge2.rtf"); Console.WriteLine("Processing..."); RtfTree tree = merger.Merge(); - tree.SaveRtf("..\\..\\testdocs\\merge-result.rtf"); + tree.SaveRtf("testdocs\\merge-result.rtf"); Console.WriteLine("File 'merge-result.txt' created."); @@ -434,7 +434,7 @@ private static void MergeDocuments() private static void ConvertToHtml() { RtfTree tree = new RtfTree(); - tree.LoadRtfFile("..\\..\\testdocs\\test-doc2.rtf"); + tree.LoadRtfFile("testdocs\\test-doc2.rtf"); Rtf2Html rtfToHtml = new Rtf2Html(); @@ -442,7 +442,7 @@ private static void ConvertToHtml() rtfToHtml.IncrustImages = false; string html = rtfToHtml.Convert(tree.Rtf); - StreamWriter sw = new StreamWriter("..\\..\\testdocs\\test.html", false); + StreamWriter sw = new StreamWriter("testdocs\\test.html", false); sw.Write(html); sw.Flush(); sw.Close(); diff --git a/nrtftree-examples/simple-demo/simple-demo.csproj b/nrtftree-examples/simple-demo/simple-demo.csproj index 749bb01..7de8a3c 100644 --- a/nrtftree-examples/simple-demo/simple-demo.csproj +++ b/nrtftree-examples/simple-demo/simple-demo.csproj @@ -1,66 +1,15 @@ - - + - Debug - x86 - 8.0.30703 - 2.0 - {F6B17017-FC6F-4992-8411-DB42CD80D881} Exe - Properties + net6.0 simple_demo simple-demo - v2.0 - 512 - + false - - x86 - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - x86 - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - - {7114E863-9D7D-4507-B38B-B859A0C1B836} - nrtftree-library - + - + - - \ No newline at end of file diff --git a/nrtftree-library/RtfTree.cs b/nrtftree-library/RtfTree.cs index 3832a6b..f510d24 100644 --- a/nrtftree-library/RtfTree.cs +++ b/nrtftree-library/RtfTree.cs @@ -470,7 +470,7 @@ public InfoGroup GetInfoGroup() public Encoding GetEncoding() { //Contributed by Jan Stuchlk - + Encoding.RegisterProvider(CodePagesEncodingProvider.Instance); Encoding encoding = Encoding.Default; RtfTreeNode cpNode = RootNode.SelectSingleNode("ansicpg"); diff --git a/nrtftree-library/nrtftree-library.csproj b/nrtftree-library/nrtftree-library.csproj index e1eab4f..08292e0 100644 --- a/nrtftree-library/nrtftree-library.csproj +++ b/nrtftree-library/nrtftree-library.csproj @@ -1,76 +1,21 @@ - - + - Debug - AnyCPU 8.0.30703 2.0 {7114E863-9D7D-4507-B38B-B859A0C1B836} Library Properties - nrtftree_library + Net.Sgoliver.NRtfTree nrtftree-library - v2.0 - 512 - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - bin\Debug\nrtftree-library.XML - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + net6.0 + false + Library + true + false + 10.0 + CA1416 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - \ No newline at end of file diff --git a/nrtftree-test/HeaderSectionsTest.cs b/nrtftree-test/HeaderSectionsTest.cs index d9dd965..cacf097 100644 --- a/nrtftree-test/HeaderSectionsTest.cs +++ b/nrtftree-test/HeaderSectionsTest.cs @@ -40,11 +40,11 @@ public class HeaderSectionsTest { RtfTree tree = null; - [TestFixtureSetUp] + [OneTimeSetUp] public void InitTestFixture() { tree = new RtfTree(); - tree.LoadRtfFile("..\\..\\testdocs\\testdoc2.rtf"); + tree.LoadRtfFile("testdocs\\testdoc2.rtf"); } [SetUp] @@ -153,7 +153,7 @@ public void InfoGroupTest() //sw.Flush(); //sw.Close(); - StreamReader sr = new StreamReader("..\\..\\testdocs\\infogroup.txt"); + StreamReader sr = new StreamReader("testdocs\\infogroup.txt"); string infoString = sr.ReadToEnd(); sr.Close(); diff --git a/nrtftree-test/ImageNodeTest.cs b/nrtftree-test/ImageNodeTest.cs index 0cb52e2..6269673 100644 --- a/nrtftree-test/ImageNodeTest.cs +++ b/nrtftree-test/ImageNodeTest.cs @@ -39,7 +39,7 @@ namespace Net.Sgoliver.NRtfTree.Test [TestFixture] public class ImageNodeTest { - [TestFixtureSetUp] + [OneTimeSetUp] public void InitTestFixture() { @@ -55,7 +55,7 @@ public void InitTest() public void LoadImageNode() { RtfTree tree = new RtfTree(); - tree.LoadRtfFile("..\\..\\testdocs\\testdoc3.rtf"); + tree.LoadRtfFile("testdocs\\testdoc3.rtf"); RtfTreeNode pictNode = tree.MainGroup.SelectNodes("pict")[2].ParentNode; @@ -77,7 +77,7 @@ public void LoadImageNode() public void ImageHexData() { RtfTree tree = new RtfTree(); - tree.LoadRtfFile("..\\..\\testdocs\\testdoc3.rtf"); + tree.LoadRtfFile("testdocs\\testdoc3.rtf"); RtfTreeNode pictNode = tree.MainGroup.SelectNodes("pict")[2].ParentNode; @@ -85,7 +85,7 @@ public void ImageHexData() StreamReader sr = null; - sr = new StreamReader("..\\..\\testdocs\\imghexdata.txt"); + sr = new StreamReader("testdocs\\imghexdata.txt"); string hexdata = sr.ReadToEnd(); sr.Close(); @@ -96,16 +96,16 @@ public void ImageHexData() public void ImageBinData() { RtfTree tree = new RtfTree(); - tree.LoadRtfFile("..\\..\\testdocs\\testdoc3.rtf"); + tree.LoadRtfFile("testdocs\\testdoc3.rtf"); RtfTreeNode pictNode = tree.MainGroup.SelectNodes("pict")[2].ParentNode; ImageNode imgNode = new ImageNode(pictNode); - imgNode.SaveImage("..\\..\\testdocs\\img-result.png", ImageFormat.Jpeg); + imgNode.SaveImage("testdocs\\img-result.png", ImageFormat.Jpeg); - Stream fs1 = new FileStream("..\\..\\testdocs\\img-result.jpg", FileMode.Open); - Stream fs2 = new FileStream("..\\..\\testdocs\\image1.jpg", FileMode.Open); + Stream fs1 = new FileStream("testdocs\\img-result.jpg", FileMode.Open); + Stream fs2 = new FileStream("testdocs\\image1.jpg", FileMode.Open); Assert.That(fs1, Is.EqualTo(fs2)); } diff --git a/nrtftree-test/LoadRtfTest.cs b/nrtftree-test/LoadRtfTest.cs index a2c8f5f..1828440 100644 --- a/nrtftree-test/LoadRtfTest.cs +++ b/nrtftree-test/LoadRtfTest.cs @@ -36,7 +36,7 @@ namespace Net.Sgoliver.NRtfTree.Test [TestFixture] public class LoadRtfTest { - [TestFixtureSetUp] + [OneTimeSetUp] public void InitTestFixture() { ; @@ -53,7 +53,7 @@ public void LoadSimpleDocFromFile() { RtfTree tree = new RtfTree(); - int res = tree.LoadRtfFile("..\\..\\testdocs\\testdoc1.rtf"); + int res = tree.LoadRtfFile("testdocs\\testdoc1.rtf"); //StreamWriter sw = null; //sw = new StreamWriter("testdocs\\result1-1.txt"); @@ -75,19 +75,19 @@ public void LoadSimpleDocFromFile() StreamReader sr = null; - sr = new StreamReader("..\\..\\testdocs\\result1-1.txt"); + sr = new StreamReader("testdocs\\result1-1.txt"); string strTree1 = sr.ReadToEnd(); sr.Close(); - sr = new StreamReader("..\\..\\testdocs\\result1-2.txt"); + sr = new StreamReader("testdocs\\result1-2.txt"); string strTree2 = sr.ReadToEnd(); sr.Close(); - sr = new StreamReader("..\\..\\testdocs\\rtf1.txt"); + sr = new StreamReader("testdocs\\rtf1.txt"); string rtf1 = sr.ReadToEnd(); sr.Close(); - sr = new StreamReader("..\\..\\testdocs\\text1.txt"); + sr = new StreamReader("testdocs\\text1.txt"); string text1 = sr.ReadToEnd(); sr.Close(); @@ -104,7 +104,7 @@ public void LoadImageDocFromFile() { RtfTree tree = new RtfTree(); - int res = tree.LoadRtfFile("..\\..\\testdocs\\testdoc3.rtf"); + int res = tree.LoadRtfFile("testdocs\\testdoc3.rtf"); //StreamWriter sw = null; //sw = new StreamWriter("testdocs\\rtf5.txt"); @@ -114,11 +114,11 @@ public void LoadImageDocFromFile() StreamReader sr = null; - sr = new StreamReader("..\\..\\testdocs\\rtf5.txt"); + sr = new StreamReader("testdocs\\rtf5.txt"); string rtf5 = sr.ReadToEnd(); sr.Close(); - sr = new StreamReader("..\\..\\testdocs\\text2.txt"); + sr = new StreamReader("testdocs\\text2.txt"); string text2 = sr.ReadToEnd(); sr.Close(); @@ -135,7 +135,7 @@ public void LoadSimpleDocMergeSpecialFromFile() tree.MergeSpecialCharacters = true; - int res = tree.LoadRtfFile("..\\..\\testdocs\\testdoc1.rtf"); + int res = tree.LoadRtfFile("testdocs\\testdoc1.rtf"); //StreamWriter sw = null; //sw = new StreamWriter("testdocs\\result1-3.txt"); @@ -149,19 +149,19 @@ public void LoadSimpleDocMergeSpecialFromFile() StreamReader sr = null; - sr = new StreamReader("..\\..\\testdocs\\result1-3.txt"); + sr = new StreamReader("testdocs\\result1-3.txt"); string strTree1 = sr.ReadToEnd(); sr.Close(); - sr = new StreamReader("..\\..\\testdocs\\result1-4.txt"); + sr = new StreamReader("testdocs\\result1-4.txt"); string strTree2 = sr.ReadToEnd(); sr.Close(); - sr = new StreamReader("..\\..\\testdocs\\rtf1.txt"); + sr = new StreamReader("testdocs\\rtf1.txt"); string rtf1 = sr.ReadToEnd(); sr.Close(); - sr = new StreamReader("..\\..\\testdocs\\text1.txt"); + sr = new StreamReader("testdocs\\text1.txt"); string text1 = sr.ReadToEnd(); sr.Close(); @@ -178,25 +178,25 @@ public void LoadSimpleDocFromString() { RtfTree tree = new RtfTree(); - StreamReader sr = new StreamReader("..\\..\\testdocs\\testdoc1.rtf"); + StreamReader sr = new StreamReader("testdocs\\testdoc1.rtf"); string strDoc = sr.ReadToEnd(); sr.Close(); int res = tree.LoadRtfText(strDoc); - sr = new StreamReader("..\\..\\testdocs\\result1-1.txt"); + sr = new StreamReader("testdocs\\result1-1.txt"); string strTree1 = sr.ReadToEnd(); sr.Close(); - sr = new StreamReader("..\\..\\testdocs\\result1-2.txt"); + sr = new StreamReader("testdocs\\result1-2.txt"); string strTree2 = sr.ReadToEnd(); sr.Close(); - sr = new StreamReader("..\\..\\testdocs\\rtf1.txt"); + sr = new StreamReader("testdocs\\rtf1.txt"); string rtf1 = sr.ReadToEnd(); sr.Close(); - sr = new StreamReader("..\\..\\testdocs\\text1.txt"); + sr = new StreamReader("testdocs\\text1.txt"); string text1 = sr.ReadToEnd(); sr.Close(); @@ -214,25 +214,25 @@ public void LoadSimpleDocMergeSpecialFromString() RtfTree tree = new RtfTree(); tree.MergeSpecialCharacters = true; - StreamReader sr = new StreamReader("..\\..\\testdocs\\testdoc1.rtf"); + StreamReader sr = new StreamReader("testdocs\\testdoc1.rtf"); string strDoc = sr.ReadToEnd(); sr.Close(); int res = tree.LoadRtfText(strDoc); - sr = new StreamReader("..\\..\\testdocs\\result1-3.txt"); + sr = new StreamReader("testdocs\\result1-3.txt"); string strTree1 = sr.ReadToEnd(); sr.Close(); - sr = new StreamReader("..\\..\\testdocs\\result1-4.txt"); + sr = new StreamReader("testdocs\\result1-4.txt"); string strTree2 = sr.ReadToEnd(); sr.Close(); - sr = new StreamReader("..\\..\\testdocs\\rtf1.txt"); + sr = new StreamReader("testdocs\\rtf1.txt"); string rtf1 = sr.ReadToEnd(); sr.Close(); - sr = new StreamReader("..\\..\\testdocs\\text1.txt"); + sr = new StreamReader("testdocs\\text1.txt"); string text1 = sr.ReadToEnd(); sr.Close(); diff --git a/nrtftree-test/MergeTest.cs b/nrtftree-test/MergeTest.cs index 03f12d9..67bc45c 100644 --- a/nrtftree-test/MergeTest.cs +++ b/nrtftree-test/MergeTest.cs @@ -36,7 +36,7 @@ namespace Net.Sgoliver.NRtfTree.Test [TestFixture] public class MergeTest { - [TestFixtureSetUp] + [OneTimeSetUp] public void InitTestFixture() { ; @@ -51,13 +51,13 @@ public void InitTest() [Test] public void MergeDocumentsFile() { - RtfMerger merger = new RtfMerger("..\\..\\testdocs\\merge-template.rtf"); - merger.AddPlaceHolder("$doc1$", "..\\..\\testdocs\\merge-doc1.rtf"); - merger.AddPlaceHolder("$doc2$", "..\\..\\testdocs\\merge-doc2.rtf"); + RtfMerger merger = new RtfMerger("testdocs\\merge-template.rtf"); + merger.AddPlaceHolder("$doc1$", "testdocs\\merge-doc1.rtf"); + merger.AddPlaceHolder("$doc2$", "testdocs\\merge-doc2.rtf"); Assert.That(merger.Placeholders.Count, Is.EqualTo(2)); - merger.AddPlaceHolder("$doc3$", "..\\..\\testdocs\\merge-doc2.rtf"); + merger.AddPlaceHolder("$doc3$", "testdocs\\merge-doc2.rtf"); Assert.That(merger.Placeholders.Count, Is.EqualTo(3)); @@ -66,14 +66,14 @@ public void MergeDocumentsFile() Assert.That(merger.Placeholders.Count, Is.EqualTo(2)); RtfTree tree = merger.Merge(); - tree.SaveRtf("..\\..\\testdocs\\merge-result-1.rtf"); + tree.SaveRtf("testdocs\\merge-result-1.rtf"); StreamReader sr = null; - sr = new StreamReader("..\\..\\testdocs\\merge-result-1.rtf"); + sr = new StreamReader("testdocs\\merge-result-1.rtf"); string rtf1 = sr.ReadToEnd(); sr.Close(); - sr = new StreamReader("..\\..\\testdocs\\rtf3.txt"); + sr = new StreamReader("testdocs\\rtf3.txt"); string rtf3 = sr.ReadToEnd(); sr.Close(); @@ -86,15 +86,15 @@ public void MergeDocumentsInMemory() RtfMerger merger = new RtfMerger(); RtfTree tree = new RtfTree(); - tree.LoadRtfFile("..\\..\\testdocs\\merge-template.rtf"); + tree.LoadRtfFile("testdocs\\merge-template.rtf"); merger.Template = tree; RtfTree ph1 = new RtfTree(); - ph1.LoadRtfFile("..\\..\\testdocs\\merge-doc1.rtf"); + ph1.LoadRtfFile("testdocs\\merge-doc1.rtf"); RtfTree ph2 = new RtfTree(); - ph2.LoadRtfFile("..\\..\\testdocs\\merge-doc2.rtf"); + ph2.LoadRtfFile("testdocs\\merge-doc2.rtf"); merger.AddPlaceHolder("$doc1$", ph1); merger.AddPlaceHolder("$doc2$", ph2); @@ -102,7 +102,7 @@ public void MergeDocumentsInMemory() Assert.That(merger.Placeholders.Count, Is.EqualTo(2)); RtfTree ph3 = new RtfTree(); - ph3.LoadRtfFile("..\\..\\testdocs\\merge-doc2.rtf"); + ph3.LoadRtfFile("testdocs\\merge-doc2.rtf"); merger.AddPlaceHolder("$doc3$", ph3); @@ -113,14 +113,14 @@ public void MergeDocumentsInMemory() Assert.That(merger.Placeholders.Count, Is.EqualTo(2)); RtfTree resTree = merger.Merge(); - resTree.SaveRtf("..\\..\\testdocs\\merge-result-2.rtf"); + resTree.SaveRtf("testdocs\\merge-result-2.rtf"); StreamReader sr = null; - sr = new StreamReader("..\\..\\testdocs\\merge-result-2.rtf"); + sr = new StreamReader("testdocs\\merge-result-2.rtf"); string rtf1 = sr.ReadToEnd(); sr.Close(); - sr = new StreamReader("..\\..\\testdocs\\rtf3.txt"); + sr = new StreamReader("testdocs\\rtf3.txt"); string rtf3 = sr.ReadToEnd(); sr.Close(); diff --git a/nrtftree-test/NavigationTest.cs b/nrtftree-test/NavigationTest.cs index d70367a..4af2678 100644 --- a/nrtftree-test/NavigationTest.cs +++ b/nrtftree-test/NavigationTest.cs @@ -35,7 +35,7 @@ namespace Net.Sgoliver.NRtfTree.Test [TestFixture] public class NavigationTest { - [TestFixtureSetUp] + [OneTimeSetUp] public void InitTestFixture() { ; diff --git a/nrtftree-test/NodeCollectionTest.cs b/nrtftree-test/NodeCollectionTest.cs index e0501d3..4980a36 100644 --- a/nrtftree-test/NodeCollectionTest.cs +++ b/nrtftree-test/NodeCollectionTest.cs @@ -36,7 +36,7 @@ namespace Net.Sgoliver.NRtfTree.Test [TestFixture] public class NodeCollectionTest { - [TestFixtureSetUp] + [OneTimeSetUp] public void InitTestFixture() { ; diff --git a/nrtftree-test/ObjectNodeTest.cs b/nrtftree-test/ObjectNodeTest.cs index 3248e3b..c7c9b43 100644 --- a/nrtftree-test/ObjectNodeTest.cs +++ b/nrtftree-test/ObjectNodeTest.cs @@ -39,7 +39,7 @@ namespace Net.Sgoliver.NRtfTree.Test [TestFixture] public class ObjectNodeTest { - [TestFixtureSetUp] + [OneTimeSetUp] public void InitTestFixture() { @@ -55,7 +55,7 @@ public void InitTest() public void LoadObjectNode() { RtfTree tree = new RtfTree(); - tree.LoadRtfFile("..\\..\\testdocs\\testdoc3.rtf"); + tree.LoadRtfFile("testdocs\\testdoc3.rtf"); RtfTreeNode node = tree.MainGroup.SelectSingleNode("object").ParentNode; @@ -69,7 +69,7 @@ public void LoadObjectNode() public void ObjectHexData() { RtfTree tree = new RtfTree(); - tree.LoadRtfFile("..\\..\\testdocs\\testdoc3.rtf"); + tree.LoadRtfFile("testdocs\\testdoc3.rtf"); RtfTreeNode node = tree.MainGroup.SelectSingleNode("object").ParentNode; @@ -77,7 +77,7 @@ public void ObjectHexData() StreamReader sr = null; - sr = new StreamReader("..\\..\\testdocs\\objhexdata.txt"); + sr = new StreamReader("testdocs\\objhexdata.txt"); string hexdata = sr.ReadToEnd(); sr.Close(); @@ -88,19 +88,19 @@ public void ObjectHexData() public void ObjectBinData() { RtfTree tree = new RtfTree(); - tree.LoadRtfFile("..\\..\\testdocs\\testdoc3.rtf"); + tree.LoadRtfFile("testdocs\\testdoc3.rtf"); RtfTreeNode node = tree.MainGroup.SelectSingleNode("object").ParentNode; ObjectNode objNode = new ObjectNode(node); - BinaryWriter bw = new BinaryWriter(new FileStream("..\\..\\testdocs\\objbindata-result.dat", FileMode.Create)); + BinaryWriter bw = new BinaryWriter(new FileStream("testdocs\\objbindata-result.dat", FileMode.Create)); foreach (byte b in objNode.GetByteData()) bw.Write(b); bw.Close(); - FileStream fs1 = new FileStream("..\\..\\testdocs\\objbindata-result.dat", FileMode.Open); - FileStream fs2 = new FileStream("..\\..\\testdocs\\objbindata.dat", FileMode.Open); + FileStream fs1 = new FileStream("testdocs\\objbindata-result.dat", FileMode.Open); + FileStream fs2 = new FileStream("testdocs\\objbindata.dat", FileMode.Open); Assert.That(fs1, Is.EqualTo(fs2)); } @@ -109,7 +109,7 @@ public void ObjectBinData() public void ResultNode() { RtfTree tree = new RtfTree(); - tree.LoadRtfFile("..\\..\\testdocs\\testdoc3.rtf"); + tree.LoadRtfFile("testdocs\\testdoc3.rtf"); RtfTreeNode node = tree.MainGroup.SelectSingleNode("object").ParentNode; diff --git a/nrtftree-test/RtfDocumentTest.cs b/nrtftree-test/RtfDocumentTest.cs index 9992741..160b4ca 100644 --- a/nrtftree-test/RtfDocumentTest.cs +++ b/nrtftree-test/RtfDocumentTest.cs @@ -39,7 +39,7 @@ namespace Net.Sgoliver.NRtfTree.Test [TestFixture] public class RtfDocumentTest { - [TestFixtureSetUp] + [OneTimeSetUp] public void InitTestFixture() { ; @@ -79,7 +79,7 @@ public void CreateSimpleDocument() doc.AddText("Etiam vitae porttitor enim. Aenean molestie facilisis magna, quis tincidunt leo placerat in. Maecenas malesuada eleifend nunc vitae cursus."); doc.AddNewParagraph(2); - doc.Save("..\\..\\testdocs\\rtfdocument1.rtf"); + doc.Save("testdocs\\rtfdocument1.rtf"); string text1 = doc.Text; string rtfcode1 = doc.Rtf; @@ -117,31 +117,31 @@ public void CreateSimpleDocument() string text2 = doc.Text; string rtfcode2 = doc.Rtf; - doc.Save("..\\..\\testdocs\\rtfdocument2.rtf"); + doc.Save("testdocs\\rtfdocument2.rtf"); StreamReader sr = null; - sr = new StreamReader("..\\..\\testdocs\\rtfdocument1.rtf"); + sr = new StreamReader("testdocs\\rtfdocument1.rtf"); string rtf1 = sr.ReadToEnd(); sr.Close(); sr = null; - sr = new StreamReader("..\\..\\testdocs\\rtfdocument2.rtf"); + sr = new StreamReader("testdocs\\rtfdocument2.rtf"); string rtf2 = sr.ReadToEnd(); sr.Close(); - sr = new StreamReader("..\\..\\testdocs\\rtf4.txt"); + sr = new StreamReader("testdocs\\rtf4.txt"); string rtf4 = sr.ReadToEnd(); sr.Close(); - sr = new StreamReader("..\\..\\testdocs\\rtf6.txt"); + sr = new StreamReader("testdocs\\rtf6.txt"); string rtf6 = sr.ReadToEnd(); sr.Close(); - sr = new StreamReader("..\\..\\testdocs\\doctext1.txt"); + sr = new StreamReader("testdocs\\doctext1.txt"); string doctext1 = sr.ReadToEnd(); sr.Close(); - sr = new StreamReader("..\\..\\testdocs\\doctext2.txt"); + sr = new StreamReader("testdocs\\doctext2.txt"); string doctext2 = sr.ReadToEnd() + " Петяв ñáéíó\r\n\r\n\tStop.\r\n"; sr.Close(); diff --git a/nrtftree-test/RtfPullParserTest.cs b/nrtftree-test/RtfPullParserTest.cs index e3477bc..9b2d1ac 100644 --- a/nrtftree-test/RtfPullParserTest.cs +++ b/nrtftree-test/RtfPullParserTest.cs @@ -37,7 +37,7 @@ namespace Net.Sgoliver.NRtfTree.Test [TestFixture] public class RtfPullParserTest { - [TestFixtureSetUp] + [OneTimeSetUp] public void InitTestFixture() { ; @@ -53,7 +53,7 @@ public void InitTest() public void ParseSimpleDocument() { RtfPullParser parser = new RtfPullParser(); - parser.LoadRtfFile("..\\..\\testdocs\\testdoc1.rtf"); + parser.LoadRtfFile("testdocs\\testdoc1.rtf"); parserTests(parser); } @@ -62,7 +62,7 @@ public void ParseSimpleDocument() public void ParseSimpleRtfText() { RtfTree tree = new RtfTree(); - tree.LoadRtfFile("..\\..\\testdocs\\testdoc1.rtf"); + tree.LoadRtfFile("testdocs\\testdoc1.rtf"); RtfPullParser parser = new RtfPullParser(); parser.LoadRtfText(tree.Rtf); diff --git a/nrtftree-test/RtfTreeNodeTest.cs b/nrtftree-test/RtfTreeNodeTest.cs index 80c27ee..67163b3 100644 --- a/nrtftree-test/RtfTreeNodeTest.cs +++ b/nrtftree-test/RtfTreeNodeTest.cs @@ -35,7 +35,7 @@ namespace Net.Sgoliver.NRtfTree.Test [TestFixture] public class RtfTreeNodeTest { - [TestFixtureSetUp] + [OneTimeSetUp] public void InitTestFixture() { ; @@ -83,7 +83,7 @@ public void TextExtraction() { RtfTree tree = new RtfTree(); - int res = tree.LoadRtfFile("..\\..\\testdocs\\testdoc4.rtf"); + int res = tree.LoadRtfFile("testdocs\\testdoc4.rtf"); RtfTreeNode simpleGroup = tree.MainGroup.SelectSingleGroup("ul"); RtfTreeNode nestedGroups = tree.MainGroup.SelectSingleGroup("cf"); @@ -118,7 +118,7 @@ public void TextExtractionSpecial() { RtfTree tree = new RtfTree(); - int res = tree.LoadRtfFile("..\\..\\testdocs\\testdoc5.rtf"); + int res = tree.LoadRtfFile("testdocs\\testdoc5.rtf"); Assert.That(tree.Text, Is.EqualTo("Esto es una ‘prueba’\r\n\t y otra “prueba” y otra—prueba." + Environment.NewLine)); Assert.That(tree.MainGroup.Text, Is.EqualTo("Esto es una ‘prueba’\r\n\t y otra “prueba” y otra—prueba." + Environment.NewLine)); @@ -130,7 +130,7 @@ public void TextExtractionUnicode() { RtfTree tree = new RtfTree(); - int res = tree.LoadRtfFile("..\\..\\testdocs\\unicodedoc.rtf"); + int res = tree.LoadRtfFile("testdocs\\unicodedoc.rtf"); Assert.That(tree.Text, Is.EqualTo("Prueba Unicode: Вова Петя\r\nSin ignorar caracteres: Вова Петя\r\n")); } diff --git a/nrtftree-test/SelectNodesTest.cs b/nrtftree-test/SelectNodesTest.cs index 8d75318..561d3cd 100644 --- a/nrtftree-test/SelectNodesTest.cs +++ b/nrtftree-test/SelectNodesTest.cs @@ -36,7 +36,7 @@ namespace Net.Sgoliver.NRtfTree.Test [TestFixture] public class SelectNodesTest { - [TestFixtureSetUp] + [OneTimeSetUp] public void InitTestFixture() { ; @@ -53,7 +53,7 @@ public void SelectChildNodesByType() { RtfTree tree = new RtfTree(); - int res = tree.LoadRtfFile("..\\..\\testdocs\\testdoc1.rtf"); + int res = tree.LoadRtfFile("testdocs\\testdoc1.rtf"); RtfNodeCollection lista1 = tree.MainGroup.SelectChildNodes(RtfNodeType.Keyword); //48 nodes RtfNodeCollection lista2 = tree.MainGroup.SelectChildNodes(RtfNodeType.Control); //3 nodes @@ -84,7 +84,7 @@ public void SelectNodesByType() { RtfTree tree = new RtfTree(); - int res = tree.LoadRtfFile("..\\..\\testdocs\\testdoc1.rtf"); + int res = tree.LoadRtfFile("testdocs\\testdoc1.rtf"); RtfNodeCollection lista1 = tree.MainGroup.SelectNodes(RtfNodeType.Keyword); //68 nodes RtfNodeCollection lista2 = tree.MainGroup.SelectNodes(RtfNodeType.Control); //4 nodes @@ -118,7 +118,7 @@ public void SelectSingleNodeByType() { RtfTree tree = new RtfTree(); - int res = tree.LoadRtfFile("..\\..\\testdocs\\testdoc1.rtf"); + int res = tree.LoadRtfFile("testdocs\\testdoc1.rtf"); RtfTreeNode node1 = tree.MainGroup.SelectSingleNode(RtfNodeType.Keyword); //rtf1 RtfTreeNode node2 = tree.MainGroup.SelectSingleNode(RtfNodeType.Control); //* generator @@ -138,7 +138,7 @@ public void SelectSingleChildNodeByType() { RtfTree tree = new RtfTree(); - int res = tree.LoadRtfFile("..\\..\\testdocs\\testdoc1.rtf"); + int res = tree.LoadRtfFile("testdocs\\testdoc1.rtf"); RtfTreeNode node1 = tree.MainGroup.SelectSingleChildNode(RtfNodeType.Keyword); //rtf1 RtfTreeNode node2 = tree.MainGroup.SelectSingleChildNode(RtfNodeType.Control); //'233 @@ -158,7 +158,7 @@ public void SelectChildNodesByKeyword() { RtfTree tree = new RtfTree(); - int res = tree.LoadRtfFile("..\\..\\testdocs\\testdoc1.rtf"); + int res = tree.LoadRtfFile("testdocs\\testdoc1.rtf"); RtfNodeCollection lista1 = tree.MainGroup.SelectChildNodes("fs"); //5 nodes RtfNodeCollection lista2 = tree.MainGroup.SelectChildNodes("f"); //3 nodes @@ -182,7 +182,7 @@ public void SelectNodesByKeyword() { RtfTree tree = new RtfTree(); - int res = tree.LoadRtfFile("..\\..\\testdocs\\testdoc1.rtf"); + int res = tree.LoadRtfFile("testdocs\\testdoc1.rtf"); RtfNodeCollection lista1 = tree.MainGroup.SelectNodes("fs"); //5 nodes RtfNodeCollection lista2 = tree.MainGroup.SelectNodes("f"); //6 nodes @@ -209,7 +209,7 @@ public void SelectSingleNodeByKeyword() { RtfTree tree = new RtfTree(); - int res = tree.LoadRtfFile("..\\..\\testdocs\\testdoc1.rtf"); + int res = tree.LoadRtfFile("testdocs\\testdoc1.rtf"); RtfTreeNode node1 = tree.MainGroup.SelectSingleNode("fs"); RtfTreeNode node2 = tree.MainGroup.SelectSingleNode("f"); @@ -223,7 +223,7 @@ public void SelectSingleChildNodeByKeyword() { RtfTree tree = new RtfTree(); - int res = tree.LoadRtfFile("..\\..\\testdocs\\testdoc1.rtf"); + int res = tree.LoadRtfFile("testdocs\\testdoc1.rtf"); RtfTreeNode node1 = tree.MainGroup.SelectSingleChildNode("fs"); RtfTreeNode node2 = tree.MainGroup.SelectSingleChildNode("f"); @@ -237,7 +237,7 @@ public void SelectChildNodesByKeywordAndParam() { RtfTree tree = new RtfTree(); - int res = tree.LoadRtfFile("..\\..\\testdocs\\testdoc1.rtf"); + int res = tree.LoadRtfFile("testdocs\\testdoc1.rtf"); RtfNodeCollection lista1 = tree.MainGroup.SelectChildNodes("fs", 24); //2 nodes RtfNodeCollection lista2 = tree.MainGroup.SelectChildNodes("f", 1); //1 nodes @@ -256,7 +256,7 @@ public void SelectNodesByKeywordAndParam() { RtfTree tree = new RtfTree(); - int res = tree.LoadRtfFile("..\\..\\testdocs\\testdoc1.rtf"); + int res = tree.LoadRtfFile("testdocs\\testdoc1.rtf"); RtfNodeCollection lista1 = tree.MainGroup.SelectNodes("fs", 24); //2 nodes RtfNodeCollection lista2 = tree.MainGroup.SelectNodes("f", 1); //2 nodes @@ -276,7 +276,7 @@ public void SelectSingleNodeByKeywordAndParam() { RtfTree tree = new RtfTree(); - int res = tree.LoadRtfFile("..\\..\\testdocs\\testdoc1.rtf"); + int res = tree.LoadRtfFile("testdocs\\testdoc1.rtf"); RtfTreeNode node1 = tree.MainGroup.SelectSingleNode("fs", 24); RtfTreeNode node2 = tree.MainGroup.SelectSingleNode("f", 1); @@ -290,7 +290,7 @@ public void SelectSingleChildNodeByKeywordAndParam() { RtfTree tree = new RtfTree(); - int res = tree.LoadRtfFile("..\\..\\testdocs\\testdoc1.rtf"); + int res = tree.LoadRtfFile("testdocs\\testdoc1.rtf"); RtfTreeNode node1 = tree.MainGroup.SelectSingleChildNode("fs", 24); RtfTreeNode node2 = tree.MainGroup.SelectSingleChildNode("f", 1); @@ -304,7 +304,7 @@ public void SelectChildGroups() { RtfTree tree = new RtfTree(); - int res = tree.LoadRtfFile("..\\..\\testdocs\\testdoc1.rtf"); + int res = tree.LoadRtfFile("testdocs\\testdoc1.rtf"); RtfNodeCollection lista1 = tree.MainGroup.SelectChildGroups("colortbl"); //1 node RtfNodeCollection lista2 = tree.MainGroup.SelectChildGroups("f"); //0 nodes @@ -320,7 +320,7 @@ public void SelectGroups() { RtfTree tree = new RtfTree(); - int res = tree.LoadRtfFile("..\\..\\testdocs\\testdoc1.rtf"); + int res = tree.LoadRtfFile("testdocs\\testdoc1.rtf"); RtfNodeCollection lista1 = tree.MainGroup.SelectGroups("colortbl"); //1 node RtfNodeCollection lista2 = tree.MainGroup.SelectGroups("f"); //3 nodes @@ -340,7 +340,7 @@ public void SelectSingleGroup() { RtfTree tree = new RtfTree(); - int res = tree.LoadRtfFile("..\\..\\testdocs\\testdoc1.rtf"); + int res = tree.LoadRtfFile("testdocs\\testdoc1.rtf"); RtfTreeNode node1 = tree.MainGroup.SelectSingleGroup("f"); RtfTreeNode node2 = tree.MainGroup[5].SelectSingleChildGroup("f"); @@ -354,7 +354,7 @@ public void SelectSpecialGroups() { RtfTree tree = new RtfTree(); - int res = tree.LoadRtfFile("..\\..\\testdocs\\testdoc1.rtf"); + int res = tree.LoadRtfFile("testdocs\\testdoc1.rtf"); RtfNodeCollection list1 = tree.MainGroup.SelectChildGroups("generator"); RtfNodeCollection list2 = tree.MainGroup.SelectChildGroups("generator", false); @@ -394,7 +394,7 @@ public void SelectSiblings() { RtfTree tree = new RtfTree(); - int res = tree.LoadRtfFile("..\\..\\testdocs\\testdoc1.rtf"); + int res = tree.LoadRtfFile("testdocs\\testdoc1.rtf"); RtfTreeNode node1 = tree.MainGroup.ChildNodes[4]; //deflang3082 RtfTreeNode node2 = tree.MainGroup.ChildNodes[6].ChildNodes[2]; //colortbl/red @@ -421,7 +421,7 @@ public void FindText() { RtfTree tree = new RtfTree(); - int res = tree.LoadRtfFile("..\\..\\testdocs\\testdoc1.rtf"); + int res = tree.LoadRtfFile("testdocs\\testdoc1.rtf"); RtfNodeCollection list1 = tree.MainGroup.FindText("Italic"); @@ -439,12 +439,12 @@ public void ReplaceText() { RtfTree tree = new RtfTree(); - int res = tree.LoadRtfFile("..\\..\\testdocs\\testdoc1.rtf"); + int res = tree.LoadRtfFile("testdocs\\testdoc1.rtf"); tree.MainGroup.ReplaceText("Italic", "REPLACED"); StreamReader sr = null; - sr = new StreamReader("..\\..\\testdocs\\rtf2.txt"); + sr = new StreamReader("testdocs\\rtf2.txt"); string rtf2 = sr.ReadToEnd(); sr.Close(); diff --git a/nrtftree-test/nrtftree-test.csproj b/nrtftree-test/nrtftree-test.csproj index afd24b1..59e78a0 100644 --- a/nrtftree-test/nrtftree-test.csproj +++ b/nrtftree-test/nrtftree-test.csproj @@ -1,72 +1,25 @@ - - + - Debug - AnyCPU + net6.0 8.0.30703 2.0 - {932E07AC-75B1-4F13-8998-3CA4EAEE8E79} Library Properties nrtftree_test nrtftree-test - v2.0 - 512 - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + true + false + 10.0 + CA1416 - - False - bin\Debug\nunit.framework.dll - - - - - + + - - - - - - - - - - - - + - - {7114E863-9D7D-4507-B38B-B859A0C1B836} - nrtftree-library - + - - \ No newline at end of file diff --git a/nrtftree.sln b/nrtftree.sln index d4e6475..42cdf99 100644 --- a/nrtftree.sln +++ b/nrtftree.sln @@ -12,43 +12,21 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU - Debug|Mixed Platforms = Debug|Mixed Platforms - Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU - Release|Mixed Platforms = Release|Mixed Platforms - Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {7114E863-9D7D-4507-B38B-B859A0C1B836}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7114E863-9D7D-4507-B38B-B859A0C1B836}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7114E863-9D7D-4507-B38B-B859A0C1B836}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {7114E863-9D7D-4507-B38B-B859A0C1B836}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {7114E863-9D7D-4507-B38B-B859A0C1B836}.Debug|x86.ActiveCfg = Debug|Any CPU {7114E863-9D7D-4507-B38B-B859A0C1B836}.Release|Any CPU.ActiveCfg = Release|Any CPU {7114E863-9D7D-4507-B38B-B859A0C1B836}.Release|Any CPU.Build.0 = Release|Any CPU - {7114E863-9D7D-4507-B38B-B859A0C1B836}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {7114E863-9D7D-4507-B38B-B859A0C1B836}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {7114E863-9D7D-4507-B38B-B859A0C1B836}.Release|x86.ActiveCfg = Release|Any CPU {932E07AC-75B1-4F13-8998-3CA4EAEE8E79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {932E07AC-75B1-4F13-8998-3CA4EAEE8E79}.Debug|Any CPU.Build.0 = Debug|Any CPU - {932E07AC-75B1-4F13-8998-3CA4EAEE8E79}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {932E07AC-75B1-4F13-8998-3CA4EAEE8E79}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {932E07AC-75B1-4F13-8998-3CA4EAEE8E79}.Debug|x86.ActiveCfg = Debug|Any CPU {932E07AC-75B1-4F13-8998-3CA4EAEE8E79}.Release|Any CPU.ActiveCfg = Release|Any CPU {932E07AC-75B1-4F13-8998-3CA4EAEE8E79}.Release|Any CPU.Build.0 = Release|Any CPU - {932E07AC-75B1-4F13-8998-3CA4EAEE8E79}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {932E07AC-75B1-4F13-8998-3CA4EAEE8E79}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {932E07AC-75B1-4F13-8998-3CA4EAEE8E79}.Release|x86.ActiveCfg = Release|Any CPU - {F6B17017-FC6F-4992-8411-DB42CD80D881}.Debug|Any CPU.ActiveCfg = Debug|x86 - {F6B17017-FC6F-4992-8411-DB42CD80D881}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 - {F6B17017-FC6F-4992-8411-DB42CD80D881}.Debug|Mixed Platforms.Build.0 = Debug|x86 - {F6B17017-FC6F-4992-8411-DB42CD80D881}.Debug|x86.ActiveCfg = Debug|x86 - {F6B17017-FC6F-4992-8411-DB42CD80D881}.Debug|x86.Build.0 = Debug|x86 - {F6B17017-FC6F-4992-8411-DB42CD80D881}.Release|Any CPU.ActiveCfg = Release|x86 - {F6B17017-FC6F-4992-8411-DB42CD80D881}.Release|Mixed Platforms.ActiveCfg = Release|x86 - {F6B17017-FC6F-4992-8411-DB42CD80D881}.Release|Mixed Platforms.Build.0 = Release|x86 - {F6B17017-FC6F-4992-8411-DB42CD80D881}.Release|x86.ActiveCfg = Release|x86 - {F6B17017-FC6F-4992-8411-DB42CD80D881}.Release|x86.Build.0 = Release|x86 + {F6B17017-FC6F-4992-8411-DB42CD80D881}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F6B17017-FC6F-4992-8411-DB42CD80D881}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F6B17017-FC6F-4992-8411-DB42CD80D881}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F6B17017-FC6F-4992-8411-DB42CD80D881}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From 4658a1e8fa946eaf7860454ae9fd6a574ecf0f2d Mon Sep 17 00:00:00 2001 From: Sarah Blume Date: Thu, 23 Jun 2022 13:39:43 +0200 Subject: [PATCH 2/2] Bump version to 0.5.0 --- nrtftree-examples/simple-demo/Properties/AssemblyInfo.cs | 4 ++-- nrtftree-library/Properties/AssemblyInfo.cs | 4 ++-- nrtftree-test/Properties/AssemblyInfo.cs | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nrtftree-examples/simple-demo/Properties/AssemblyInfo.cs b/nrtftree-examples/simple-demo/Properties/AssemblyInfo.cs index 748cf6e..5511fac 100644 --- a/nrtftree-examples/simple-demo/Properties/AssemblyInfo.cs +++ b/nrtftree-examples/simple-demo/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.4.0")] -[assembly: AssemblyFileVersion("0.4.0")] +[assembly: AssemblyVersion("0.5.0")] +[assembly: AssemblyFileVersion("0.5.0")] diff --git a/nrtftree-library/Properties/AssemblyInfo.cs b/nrtftree-library/Properties/AssemblyInfo.cs index 54b3fa6..98a4461 100644 --- a/nrtftree-library/Properties/AssemblyInfo.cs +++ b/nrtftree-library/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.4.0")] -[assembly: AssemblyFileVersion("0.4.0")] +[assembly: AssemblyVersion("0.5.0")] +[assembly: AssemblyFileVersion("0.5.0")] diff --git a/nrtftree-test/Properties/AssemblyInfo.cs b/nrtftree-test/Properties/AssemblyInfo.cs index 9be01ea..d6dcd30 100644 --- a/nrtftree-test/Properties/AssemblyInfo.cs +++ b/nrtftree-test/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.4.0")] -[assembly: AssemblyFileVersion("0.4.0")] +[assembly: AssemblyVersion("0.5.0")] +[assembly: AssemblyFileVersion("0.5.0")]