Skip to content

Commit f4cdd96

Browse files
Add test project.
1 parent 55b3755 commit f4cdd96

File tree

3 files changed

+56
-0
lines changed

3 files changed

+56
-0
lines changed

StreamMerge.sln

+9
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "StreamMerge", "src\StreamMe
1414
EndProject
1515
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "StreamMerge.App", "src\StreamMerge.App\StreamMerge.App.xproj", "{91E4F266-45AB-4C86-AA4A-87C039DADB40}"
1616
EndProject
17+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{8D131798-B804-4C84-969F-D16DD49DEC98}"
18+
EndProject
19+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "StreamMerge.App.Tests", "test\StreamMerge.App.Tests\StreamMerge.App.Tests.xproj", "{6E1D3265-004D-405D-9D5D-4C2285FD9C41}"
20+
EndProject
1721
Global
1822
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1923
Debug|Any CPU = Debug|Any CPU
@@ -28,12 +32,17 @@ Global
2832
{91E4F266-45AB-4C86-AA4A-87C039DADB40}.Debug|Any CPU.Build.0 = Debug|Any CPU
2933
{91E4F266-45AB-4C86-AA4A-87C039DADB40}.Release|Any CPU.ActiveCfg = Release|Any CPU
3034
{91E4F266-45AB-4C86-AA4A-87C039DADB40}.Release|Any CPU.Build.0 = Release|Any CPU
35+
{6E1D3265-004D-405D-9D5D-4C2285FD9C41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
36+
{6E1D3265-004D-405D-9D5D-4C2285FD9C41}.Debug|Any CPU.Build.0 = Debug|Any CPU
37+
{6E1D3265-004D-405D-9D5D-4C2285FD9C41}.Release|Any CPU.ActiveCfg = Release|Any CPU
38+
{6E1D3265-004D-405D-9D5D-4C2285FD9C41}.Release|Any CPU.Build.0 = Release|Any CPU
3139
EndGlobalSection
3240
GlobalSection(SolutionProperties) = preSolution
3341
HideSolutionNode = FALSE
3442
EndGlobalSection
3543
GlobalSection(NestedProjects) = preSolution
3644
{E86F9012-D1E3-4519-95F0-C64D1AF7F006} = {7E8E6790-35A1-4242-A21A-982DD8EC3B2F}
3745
{91E4F266-45AB-4C86-AA4A-87C039DADB40} = {7E8E6790-35A1-4242-A21A-982DD8EC3B2F}
46+
{6E1D3265-004D-405D-9D5D-4C2285FD9C41} = {8D131798-B804-4C84-969F-D16DD49DEC98}
3847
EndGlobalSection
3948
EndGlobal
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
5+
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
6+
</PropertyGroup>
7+
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
8+
<PropertyGroup Label="Globals">
9+
<ProjectGuid>6e1d3265-004d-405d-9d5d-4c2285fd9c41</ProjectGuid>
10+
<RootNamespace>StreamMerge.App.Tests</RootNamespace>
11+
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
12+
<OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
13+
</PropertyGroup>
14+
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
15+
<AssemblyName>StreamMerge.App.Tests</AssemblyName>
16+
</PropertyGroup>
17+
<PropertyGroup>
18+
<SchemaVersion>2.0</SchemaVersion>
19+
</PropertyGroup>
20+
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
21+
</Project>
+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"version": "1.0.0-*",
3+
"description": "",
4+
"authors": [ "" ],
5+
"tags": [ "" ],
6+
"projectUrl": "",
7+
"licenseUrl": "",
8+
9+
"dependencies": {
10+
"StreamMerge.App": "1.0.0-*",
11+
"Newtonsoft.Json": "7.0.1-beta3",
12+
"xunit": "2.1.0-beta2-build2981"
13+
},
14+
15+
"frameworks": {
16+
"dnx451": { },
17+
"dnxcore50": {
18+
"dependencies": {
19+
"System.Collections": "4.0.10-beta-22816",
20+
"System.Linq": "4.0.0-beta-22816",
21+
"System.Threading": "4.0.10-beta-22816",
22+
"Microsoft.CSharp": "4.0.0-beta-22816"
23+
}
24+
}
25+
}
26+
}

0 commit comments

Comments
 (0)