Skip to content

Commit

Permalink
Migrate unit test to .NET Core (#690)
Browse files Browse the repository at this point in the history
  • Loading branch information
qinezh committed Sep 13, 2016
1 parent 3f53c16 commit 46cc480
Show file tree
Hide file tree
Showing 58 changed files with 817 additions and 1,957 deletions.
318 changes: 156 additions & 162 deletions All.sln

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion appveyor.yml
Expand Up @@ -3,5 +3,5 @@ image: Visual Studio 2015
init:
- git config --global core.autocrlf true
build_script:
- build.cmd nondnx
- build.cmd
test: off
13 changes: 12 additions & 1 deletion build.cmd
Expand Up @@ -133,6 +133,7 @@ IF NOT [!ERRORLEVEL!]==[0] (
POPD

:AfterBuild
CALL :RunAllTest
CALL :GenerateArtifacts

:: Pull the build summary from the log file
Expand Down Expand Up @@ -165,6 +166,16 @@ FOR /f %%g IN ('DIR /b "src"') DO (
CMD /C dotnet pack src\%%g -c Release -o artifacts\Release
)

:RunAllTest
ECHO run all test
FOR /f %%g IN ('DIR /b "test"') DO (
IF NOT %%g==Shared (
IF NOT %%g==docfx.E2E.Tests (
CMD /C dotnet test test\%%g
)
)
)

:RestorePackage

:RestoreNormalPackage
Expand All @@ -187,7 +198,7 @@ IF NOT [!ERRORLEVEL!]==[0] (
)

:RestoreDnuPackage
FOR /D %%x IN ("src") DO (
FOR /D %%x IN ("src", "test") DO (
PUSHD %%x
CMD /C dotnet restore
POPD
Expand Down

This file was deleted.

@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0.25420" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0.25420</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>7f6019a6-c1ab-4b5c-bd3c-e8d271f3469d</ProjectGuid>
<RootNamespace>Microsoft.DocAsCode.Build.Common.Tests</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
</PropertyGroup>
<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<ItemGroup>
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
</ItemGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>
17 changes: 0 additions & 17 deletions test/Microsoft.DocAsCode.Build.Common.Tests/packages.config

This file was deleted.

25 changes: 25 additions & 0 deletions test/Microsoft.DocAsCode.Build.Common.Tests/project.json
@@ -0,0 +1,25 @@
{
"version": "1.0.0",
"testRunner": "xunit",
"dependencies": {
"Microsoft.DocAsCode.Build.Common": "1.0.0",
"Microsoft.DocAsCode.Build.Engine": "1.0.0",
"Microsoft.DocAsCode.Common": "1.0.0",
"Microsoft.DocAsCode.Dfm": "1.0.0",
"Microsoft.DocAsCode.MarkdownLite": "1.0.0",
"Microsoft.DocAsCode.Plugins": "1.0.0",
"Microsoft.DocAsCode.Utility": "1.0.0",
"Microsoft.DocAsCode.YamlSerialization": "1.0.0",
"HtmlAgilityPack": "1.4.9",
"Jint": "2.5.0",
"Newtonsoft.Json": "9.0.1",
"YamlDotNet.Signed": "3.9.0",
"xunit": "2.2.0-beta2-build3300",
"dotnet-test-xunit": "2.2.0-preview2-build1029",
"System.Collections.Immutable": "1.2.0",
"Microsoft.Composition": "1.0.27"
},
"frameworks": {
"net452": {}
}
}

This file was deleted.

0 comments on commit 46cc480

Please sign in to comment.