diff --git a/src/Bio.sln b/src/Bio.sln
index 0e5d702..90f65c2 100644
--- a/src/Bio.sln
+++ b/src/Bio.sln
@@ -1,14 +1,12 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
-VisualStudioVersion = 14.0.23107.0
+VisualStudioVersion = 14.0.25123.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bio.Core", "Source\Framework\Bio.Core\Bio.Core.csproj", "{DFB9C4E2-C98C-4401-A650-756ABAB52663}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shims", "Shims", "{9AD1F00F-4C1B-49A6-8525-4FFAED741F22}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bio.Platform.Helpers", "Source\Framework\Shims\Bio.Platform.Helpers\Bio.Platform.Helpers.csproj", "{83CBB611-4049-456A-B87B-0B2CFC4797FA}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bio.Platform.Helpers.Desktop", "Source\Framework\Shims\Bio.Platform.Helpers.Desktop\Bio.Platform.Helpers.Desktop.csproj", "{2A6BB04D-047F-4F04-9AFB-9BF8941A292A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bio.Platform.Helpers.iOS", "Source\Framework\Shims\Bio.Platform.Helpers.iOS\Bio.Platform.Helpers.iOS.csproj", "{9DE0E489-511D-4E4C-BBDA-D47C887BAF93}"
@@ -61,10 +59,7 @@ Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
Source\Tests\TestData\TestData.projitems*{fc09fa89-39a2-4db7-bb26-4df616918506}*SharedItemsImports = 4
Source\Framework\Shared\Shared.projitems*{14a64db3-6621-4950-b25d-e24615d9386b}*SharedItemsImports = 4
- Source\Framework\Shared\Shared.projitems*{c1249952-18e4-4d6d-bd8d-32a51af2d3f3}*SharedItemsImports = 4
- Source\Framework\Shared\Shared.projitems*{a482be8f-67d5-4991-84bd-da3bf6ed84fa}*SharedItemsImports = 4
Source\Tests\TestData\TestData.projitems*{64b51721-d4fd-4da6-b722-95dbae696f03}*SharedItemsImports = 13
- Source\Framework\Shared\Shared.projitems*{8647c589-c5b4-49ef-b722-3b8a12a2e13c}*SharedItemsImports = 4
Source\Framework\Shared\Shared.projitems*{bdb423a3-d3b6-434c-96ba-102025e2ea3b}*SharedItemsImports = 13
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -88,16 +83,6 @@ Global
{DFB9C4E2-C98C-4401-A650-756ABAB52663}.Release|ARM.ActiveCfg = Release|Any CPU
{DFB9C4E2-C98C-4401-A650-756ABAB52663}.Release|x64.ActiveCfg = Release|Any CPU
{DFB9C4E2-C98C-4401-A650-756ABAB52663}.Release|x86.ActiveCfg = Release|Any CPU
- {83CBB611-4049-456A-B87B-0B2CFC4797FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {83CBB611-4049-456A-B87B-0B2CFC4797FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {83CBB611-4049-456A-B87B-0B2CFC4797FA}.Debug|ARM.ActiveCfg = Debug|Any CPU
- {83CBB611-4049-456A-B87B-0B2CFC4797FA}.Debug|x64.ActiveCfg = Debug|Any CPU
- {83CBB611-4049-456A-B87B-0B2CFC4797FA}.Debug|x86.ActiveCfg = Debug|Any CPU
- {83CBB611-4049-456A-B87B-0B2CFC4797FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {83CBB611-4049-456A-B87B-0B2CFC4797FA}.Release|Any CPU.Build.0 = Release|Any CPU
- {83CBB611-4049-456A-B87B-0B2CFC4797FA}.Release|ARM.ActiveCfg = Release|Any CPU
- {83CBB611-4049-456A-B87B-0B2CFC4797FA}.Release|x64.ActiveCfg = Release|Any CPU
- {83CBB611-4049-456A-B87B-0B2CFC4797FA}.Release|x86.ActiveCfg = Release|Any CPU
{2A6BB04D-047F-4F04-9AFB-9BF8941A292A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2A6BB04D-047F-4F04-9AFB-9BF8941A292A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2A6BB04D-047F-4F04-9AFB-9BF8941A292A}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -275,7 +260,6 @@ Global
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
- {83CBB611-4049-456A-B87B-0B2CFC4797FA} = {9AD1F00F-4C1B-49A6-8525-4FFAED741F22}
{2A6BB04D-047F-4F04-9AFB-9BF8941A292A} = {9AD1F00F-4C1B-49A6-8525-4FFAED741F22}
{9DE0E489-511D-4E4C-BBDA-D47C887BAF93} = {9AD1F00F-4C1B-49A6-8525-4FFAED741F22}
{17D7434B-E7F2-43F4-BB1E-FC40FDC5FB0B} = {9AD1F00F-4C1B-49A6-8525-4FFAED741F22}
diff --git a/src/Source/Framework/Bio.Android/Bio.Android.csproj b/src/Source/Framework/Bio.Android/Bio.Android.csproj
index 3d62c4d..0f8137c 100644
--- a/src/Source/Framework/Bio.Android/Bio.Android.csproj
+++ b/src/Source/Framework/Bio.Android/Bio.Android.csproj
@@ -15,7 +15,7 @@
Resources\Resource.Designer.cs
Off
True
- v5.0
+ v6.0
true
@@ -61,10 +61,6 @@
{dfb9c4e2-c98c-4401-a650-756abab52663}
Bio.Core
-
- {83cbb611-4049-456a-b87b-0b2cfc4797fa}
- Bio.Platform.Helpers
-
diff --git a/src/Source/Framework/Bio.Android/Bio.Android.csproj.bak b/src/Source/Framework/Bio.Android/Bio.Android.csproj.bak
new file mode 100644
index 0000000..3d62c4d
--- /dev/null
+++ b/src/Source/Framework/Bio.Android/Bio.Android.csproj.bak
@@ -0,0 +1,82 @@
+
+
+
+ Debug
+ AnyCPU
+ 8.0.30703
+ 2.0
+ {C1249952-18E4-4D6D-BD8D-32A51AF2D3F3}
+ {EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ Library
+ Properties
+ Bio
+ Bio.Android
+ 512
+ Resources\Resource.Designer.cs
+ Off
+ True
+ v5.0
+
+
+ true
+ full
+ false
+ bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+ bin\Debug\Bio.Android.XML
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+ bin\Release\Bio.Android.XML
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {dfb9c4e2-c98c-4401-a650-756abab52663}
+ Bio.Core
+
+
+ {83cbb611-4049-456a-b87b-0b2cfc4797fa}
+ Bio.Platform.Helpers
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Source/Framework/Bio.Android/Resources/Resource.Designer.cs b/src/Source/Framework/Bio.Android/Resources/Resource.Designer.cs
index cc690e5..94acd28 100644
--- a/src/Source/Framework/Bio.Android/Resources/Resource.Designer.cs
+++ b/src/Source/Framework/Bio.Android/Resources/Resource.Designer.cs
@@ -1,15 +1,15 @@
#pragma warning disable 1591
-// ------------------------------------------------------------------------------
-//
-// This code was generated by a tool.
-// Mono Runtime Version: 4.0.30319.17020
-//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-//
-// ------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Runtime Version:4.0.30319.42000
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
-[assembly: Android.Runtime.ResourceDesignerAttribute("Bio.Resource", IsApplication=false)]
+[assembly: global::Android.Runtime.ResourceDesignerAttribute("Bio.Resource", IsApplication=false)]
namespace Bio
{
diff --git a/src/Source/Framework/Bio.iOS/Bio.iOS.csproj b/src/Source/Framework/Bio.iOS/Bio.iOS.csproj
index 1ba3274..d0c52b7 100644
--- a/src/Source/Framework/Bio.iOS/Bio.iOS.csproj
+++ b/src/Source/Framework/Bio.iOS/Bio.iOS.csproj
@@ -43,10 +43,6 @@
{dfb9c4e2-c98c-4401-a650-756abab52663}
Bio.Core
-
- {83cbb611-4049-456a-b87b-0b2cfc4797fa}
- Bio.Platform.Helpers
-
diff --git a/src/Source/Tests/Bio.TestUtils/Util/Constants.cs b/src/Source/Tests/Bio.TestUtils/Util/Constants.cs
index cf8a1dd..4b5b1e8 100644
--- a/src/Source/Tests/Bio.TestUtils/Util/Constants.cs
+++ b/src/Source/Tests/Bio.TestUtils/Util/Constants.cs
@@ -1578,8 +1578,10 @@ namespace Bio.TestAutomation.Util
public const string OutputFilePathNode = "OutputFilePath";
public const string ParserFileTypes = ".txt, .tre, .newick";
public const string ParserName = "Newick";
- public const string ParserDescription = "Reads from a source of text that is formatted according to the Newick flat\nfile specification, and converts the data to in-memory PhylogeneticTree object.";
- public const string FormatDescription = "Writes a PhylogeneticTree to a particular location, usually a file. The output is formatted\naccording to the Newick format.";
+ public static readonly string ParserDescription = "Reads from a source of text that is formatted according to the Newick flat" +
+ System.Environment.NewLine + "file specification, and converts the data to in-memory PhylogeneticTree object.";
+ public static readonly string FormatDescription = "Writes a PhylogeneticTree to a particular location, usually a file. The output is formatted" +
+ System.Environment.NewLine + "according to the Newick format.";
public const string SpecialCharSmallSizePhyloTreeNode =
"SpecialCharSmallSizePhyloTree";
public const string InvalidateNewickParseNode =
@@ -1944,10 +1946,12 @@ namespace Bio.TestAutomation.Util
public const string CIGARNode = "CIGAR";
public const string SAMFileWithRefNode = "SAMFileWithRef";
public const string ReferenceSeqNode = "ReferenceSeq";
- public const string SAMParserDescription =
- "A SAMParser reads from a source of text that is formatted according to the SAM \nfile specification, and converts the data to in-memory SequenceAlignmentMap objects.";
- public const string SAMFormatterDescription =
- "Writes a SequenceAlignmentMap to a particular location, usually a file. The output is formatted\naccording to the SAM file format.";
+ public static readonly string SAMParserDescription =
+ "A SAMParser reads from a source of text that is formatted according to the SAM " +
+ System.Environment.NewLine + "file specification, and converts the data to in-memory SequenceAlignmentMap objects.";
+ public static readonly string SAMFormatterDescription =
+ "Writes a SequenceAlignmentMap to a particular location, usually a file. The output is formatted" +
+ System.Environment.NewLine + "according to the SAM file format.";
public const string SAMName = "SAM";
public const string SAMFileType = ".sam";
public const string EmptySamFileNode =
diff --git a/src/Source/Tests/Bio.Tests/Bio.Tests.Core.csproj b/src/Source/Tests/Bio.Tests/Bio.Tests.Core.csproj
index 86a76ef..6411f35 100644
--- a/src/Source/Tests/Bio.Tests/Bio.Tests.Core.csproj
+++ b/src/Source/Tests/Bio.Tests/Bio.Tests.Core.csproj
@@ -269,9 +269,8 @@
-->
-
-
-
+
+
\ No newline at end of file
diff --git a/src/Source/Tests/Bio.Tests/ToStringBvtTestCases.cs b/src/Source/Tests/Bio.Tests/ToStringBvtTestCases.cs
index 5df1b39..9f83128 100644
--- a/src/Source/Tests/Bio.Tests/ToStringBvtTestCases.cs
+++ b/src/Source/Tests/Bio.Tests/ToStringBvtTestCases.cs
@@ -145,7 +145,7 @@ namespace Bio.Tests
var seq = new QualitativeSequence(Alphabets.DNA,
FastQFormatType.Illumina_v1_3, seqData, qualityScores);
string actualString = seq.ToString();
- string expectedString = "ATCG\nAAAB"; // This is dangerously platform specific
+ string expectedString = "ATCG" + System.Environment.NewLine + "AAAB";
Assert.AreEqual(expectedString, actualString);
}