Merge pull request #1 from vphadnav/vphadnav/vs2015_nunit3_console

update compile on Windows and run tests
This commit is contained in:
Venkatesh Phadnavis 2017-03-15 13:40:34 -07:00 коммит произвёл GitHub
Родитель 9b37835319 25824a54ab
Коммит 4d463ab378
8 изменённых файлов: 107 добавлений и 46 удалений

Просмотреть файл

@ -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}

Просмотреть файл

@ -15,7 +15,7 @@
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
<TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v6.0</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@ -61,10 +61,6 @@
<Project>{dfb9c4e2-c98c-4401-a650-756abab52663}</Project>
<Name>Bio.Core</Name>
</ProjectReference>
<ProjectReference Include="..\Shims\Bio.Platform.Helpers\Bio.Platform.Helpers.csproj">
<Project>{83cbb611-4049-456a-b87b-0b2cfc4797fa}</Project>
<Name>Bio.Platform.Helpers</Name>
</ProjectReference>
</ItemGroup>
<Import Project="..\Shared\Shared.projitems" Label="Shared" Condition="Exists('..\Shared\Shared.projitems')" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />

Просмотреть файл

@ -0,0 +1,82 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{C1249952-18E4-4D6D-BD8D-32A51AF2D3F3}</ProjectGuid>
<ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Bio</RootNamespace>
<AssemblyName>Bio.Android</AssemblyName>
<FileAlignment>512</FileAlignment>
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
<TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Debug\Bio.Android.XML</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Release\Bio.Android.XML</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="Mono.Android" />
<Reference Include="mscorlib" />
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Xml" />
<Reference Include="System.Runtime" />
<Reference Include="System.IO" />
</ItemGroup>
<ItemGroup>
<Compile Include="Resources\Resource.Designer.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\AboutResources.txt" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\Values\Strings.xml" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Bio.Core\Bio.Core.csproj">
<Project>{dfb9c4e2-c98c-4401-a650-756abab52663}</Project>
<Name>Bio.Core</Name>
</ProjectReference>
<ProjectReference Include="..\Shims\Bio.Platform.Helpers\Bio.Platform.Helpers.csproj">
<Project>{83cbb611-4049-456a-b87b-0b2cfc4797fa}</Project>
<Name>Bio.Platform.Helpers</Name>
</ProjectReference>
</ItemGroup>
<Import Project="..\Shared\Shared.projitems" Label="Shared" Condition="Exists('..\Shared\Shared.projitems')" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>

Просмотреть файл

@ -1,15 +1,15 @@
#pragma warning disable 1591
// ------------------------------------------------------------------------------
// <autogenerated>
// 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.
// </autogenerated>
// ------------------------------------------------------------------------------
//------------------------------------------------------------------------------
// <auto-generated>
// 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.
// </auto-generated>
//------------------------------------------------------------------------------
[assembly: Android.Runtime.ResourceDesignerAttribute("Bio.Resource", IsApplication=false)]
[assembly: global::Android.Runtime.ResourceDesignerAttribute("Bio.Resource", IsApplication=false)]
namespace Bio
{

Просмотреть файл

@ -43,10 +43,6 @@
<Project>{dfb9c4e2-c98c-4401-a650-756abab52663}</Project>
<Name>Bio.Core</Name>
</ProjectReference>
<ProjectReference Include="..\Shims\Bio.Platform.Helpers\Bio.Platform.Helpers.csproj">
<Project>{83cbb611-4049-456a-b87b-0b2cfc4797fa}</Project>
<Name>Bio.Platform.Helpers</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Reference Include="System" />

Просмотреть файл

@ -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 =

Просмотреть файл

@ -269,9 +269,8 @@
</Target>
-->
<ItemGroup />
<ItemGroup>
<Folder Include="PacBio\" />
<Folder Include="Variant\" />
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
<ItemGroup />
</Project>

Просмотреть файл

@ -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);
}