Move HtmlSanitizer to src, HtmlSanitizer.Tests to test

Add dotnet test to appveyor.yml
This commit is contained in:
Michael Ganss
2016-06-05 22:54:31 +02:00
parent 18ecec5d46
commit 6d03d1caa2
18 changed files with 11 additions and 18 deletions

View File

@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14 # Visual Studio 14
VisualStudioVersion = 14.0.23107.0 VisualStudioVersion = 14.0.23107.0
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HtmlSanitizer", "HtmlSanitizer\HtmlSanitizer.csproj", "{CCDB0C26-D683-4943-B5D8-AC07116461E5}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HtmlSanitizer", "src\HtmlSanitizer\HtmlSanitizer.csproj", "{CCDB0C26-D683-4943-B5D8-AC07116461E5}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HtmlSanitizer.Tests", "HtmlSanitizer.Tests\HtmlSanitizer.Tests.csproj", "{55D772A0-8D8C-4CF7-A876-E6DAB8ED42C0}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HtmlSanitizer.Tests", "test\HtmlSanitizer.Tests\HtmlSanitizer.Tests.csproj", "{55D772A0-8D8C-4CF7-A876-E6DAB8ED42C0}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution

View File

@@ -5,10 +5,11 @@ environment:
CoverityNotificationEmail: CoverityNotificationEmail:
secure: m/ox72HU97EeJExWEFWx+0M9uov0cydn6E8mSaQzsQE= secure: m/ox72HU97EeJExWEFWx+0M9uov0cydn6E8mSaQzsQE=
build_script: build_script:
- ps: (Get-Content HtmlSanitizer\project.json).Replace("1.0.0-VERSION", $env:APPVEYOR_BUILD_VERSION) | Set-Content HtmlSanitizer\project.json - ps: (Get-Content src\HtmlSanitizer\project.json).Replace("1.0.0-VERSION", $env:APPVEYOR_BUILD_VERSION) | Set-Content src\HtmlSanitizer\project.json
- dotnet restore - dotnet restore
- dotnet pack -c Release HtmlSanitizer - dotnet pack -c Release src\HtmlSanitizer
#test_script: test_script:
- dotnet test test\HtmlSanitizer.Tests
# - nuget.exe install OpenCover -ExcludeVersion # - nuget.exe install OpenCover -ExcludeVersion
# - nuget.exe install NUnit.Runners -ExcludeVersion # - nuget.exe install NUnit.Runners -ExcludeVersion
# - OpenCover\tools\OpenCover.Console.exe -register:user -filter:"+[HtmlSanitizer]*" -target:"NUnit.ConsoleRunner\tools\nunit3-console.exe" "-targetargs:/domain:single HtmlSanitizer.Tests\bin\release\HtmlSanitizer.Tests.dll" -returntargetcode -hideskipped:All -output:coverage.xml # - OpenCover\tools\OpenCover.Console.exe -register:user -filter:"+[HtmlSanitizer]*" -target:"NUnit.ConsoleRunner\tools\nunit3-console.exe" "-targetargs:/domain:single HtmlSanitizer.Tests\bin\release\HtmlSanitizer.Tests.dll" -returntargetcode -hideskipped:All -output:coverage.xml

View File

@@ -1,5 +1,5 @@
{ {
"projects": [ "HtmlSanitizer", "HtmlSanitizer.Tests" ], "projects": [ "src", "test" ],
"sdk": { "sdk": {
"version": "1.0.0-preview1-002702" "version": "1.0.0-preview1-002702"
} }

View File

@@ -40,10 +40,6 @@
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="AngleSharp, Version=0.9.6.41832, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
<HintPath>..\packages\AngleSharp.0.9.6\lib\net45\AngleSharp.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Net" /> <Reference Include="System.Net" />
</ItemGroup> </ItemGroup>
@@ -60,7 +56,7 @@
<Compile Include="Tests.cs" /> <Compile Include="Tests.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\HtmlSanitizer\HtmlSanitizer.csproj"> <ProjectReference Include="..\..\src\HtmlSanitizer\HtmlSanitizer.csproj">
<Project>{ccdb0c26-d683-4943-b5d8-ac07116461e5}</Project> <Project>{ccdb0c26-d683-4943-b5d8-ac07116461e5}</Project>
<Name>HtmlSanitizer</Name> <Name>HtmlSanitizer</Name>
</ProjectReference> </ProjectReference>
@@ -85,12 +81,6 @@
</Choose> </Choose>
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" /> <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props'))" />
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- 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. Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild"> <Target Name="BeforeBuild">

View File

@@ -2,7 +2,9 @@
"version": "1.0.0-*", "version": "1.0.0-*",
"testRunner": "xunit", "testRunner": "xunit",
"dependencies": { "dependencies": {
"HtmlSanitizer": "1.0.0-VERSION", "HtmlSanitizer": {
"target": "project"
},
"xunit": "2.1.0", "xunit": "2.1.0",
"dotnet-test-xunit": "1.0.0-rc2-build10025" "dotnet-test-xunit": "1.0.0-rc2-build10025"
}, },