From 6d03d1caa2b17876c1e8443d569ca0b5cd50f4b1 Mon Sep 17 00:00:00 2001 From: Michael Ganss Date: Sun, 5 Jun 2016 22:54:31 +0200 Subject: [PATCH] Move HtmlSanitizer to src, HtmlSanitizer.Tests to test Add dotnet test to appveyor.yml --- HtmlSanitizer.sln | 4 ++-- appveyor.yml | 7 ++++--- global.json | 2 +- {HtmlSanitizer => src/HtmlSanitizer}/EventArgs.cs | 0 .../HtmlSanitizer}/HtmlSanitizer.cs | 0 .../HtmlSanitizer}/HtmlSanitizer.csproj | 0 .../HtmlSanitizer}/HtmlSanitizer.project.json | 0 .../HtmlSanitizer}/HtmlSanitizer.snk | Bin .../HtmlSanitizer}/HtmlSanitizer.xproj | 0 .../HtmlSanitizer}/IHtmlSanitizer.cs | 0 .../HtmlSanitizer}/Properties/AssemblyInfo.cs | 0 .../HtmlSanitizer}/RemoveReason.cs | 0 {HtmlSanitizer => src/HtmlSanitizer}/project.json | 0 .../HtmlSanitizer.Tests}/HtmlSanitizer.Tests.csproj | 12 +----------- .../HtmlSanitizer.Tests.project.json | 0 .../HtmlSanitizer.Tests}/Properties/AssemblyInfo.cs | 0 .../HtmlSanitizer.Tests}/Tests.cs | 0 .../HtmlSanitizer.Tests}/project.json | 4 +++- 18 files changed, 11 insertions(+), 18 deletions(-) rename {HtmlSanitizer => src/HtmlSanitizer}/EventArgs.cs (100%) rename {HtmlSanitizer => src/HtmlSanitizer}/HtmlSanitizer.cs (100%) rename {HtmlSanitizer => src/HtmlSanitizer}/HtmlSanitizer.csproj (100%) rename {HtmlSanitizer => src/HtmlSanitizer}/HtmlSanitizer.project.json (100%) rename {HtmlSanitizer => src/HtmlSanitizer}/HtmlSanitizer.snk (100%) rename {HtmlSanitizer => src/HtmlSanitizer}/HtmlSanitizer.xproj (100%) rename {HtmlSanitizer => src/HtmlSanitizer}/IHtmlSanitizer.cs (100%) rename {HtmlSanitizer => src/HtmlSanitizer}/Properties/AssemblyInfo.cs (100%) rename {HtmlSanitizer => src/HtmlSanitizer}/RemoveReason.cs (100%) rename {HtmlSanitizer => src/HtmlSanitizer}/project.json (100%) rename {HtmlSanitizer.Tests => test/HtmlSanitizer.Tests}/HtmlSanitizer.Tests.csproj (82%) rename {HtmlSanitizer.Tests => test/HtmlSanitizer.Tests}/HtmlSanitizer.Tests.project.json (100%) rename {HtmlSanitizer.Tests => test/HtmlSanitizer.Tests}/Properties/AssemblyInfo.cs (100%) rename {HtmlSanitizer.Tests => test/HtmlSanitizer.Tests}/Tests.cs (100%) rename {HtmlSanitizer.Tests => test/HtmlSanitizer.Tests}/project.json (90%) diff --git a/HtmlSanitizer.sln b/HtmlSanitizer.sln index 376fbb9..92e6391 100644 --- a/HtmlSanitizer.sln +++ b/HtmlSanitizer.sln @@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 VisualStudioVersion = 14.0.23107.0 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 -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 Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/appveyor.yml b/appveyor.yml index db014a2..6d944e0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,10 +5,11 @@ environment: CoverityNotificationEmail: secure: m/ox72HU97EeJExWEFWx+0M9uov0cydn6E8mSaQzsQE= 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 pack -c Release HtmlSanitizer -#test_script: + - dotnet pack -c Release src\HtmlSanitizer +test_script: + - dotnet test test\HtmlSanitizer.Tests # - nuget.exe install OpenCover -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 diff --git a/global.json b/global.json index 4c3d132..7ee23dc 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { - "projects": [ "HtmlSanitizer", "HtmlSanitizer.Tests" ], + "projects": [ "src", "test" ], "sdk": { "version": "1.0.0-preview1-002702" } diff --git a/HtmlSanitizer/EventArgs.cs b/src/HtmlSanitizer/EventArgs.cs similarity index 100% rename from HtmlSanitizer/EventArgs.cs rename to src/HtmlSanitizer/EventArgs.cs diff --git a/HtmlSanitizer/HtmlSanitizer.cs b/src/HtmlSanitizer/HtmlSanitizer.cs similarity index 100% rename from HtmlSanitizer/HtmlSanitizer.cs rename to src/HtmlSanitizer/HtmlSanitizer.cs diff --git a/HtmlSanitizer/HtmlSanitizer.csproj b/src/HtmlSanitizer/HtmlSanitizer.csproj similarity index 100% rename from HtmlSanitizer/HtmlSanitizer.csproj rename to src/HtmlSanitizer/HtmlSanitizer.csproj diff --git a/HtmlSanitizer/HtmlSanitizer.project.json b/src/HtmlSanitizer/HtmlSanitizer.project.json similarity index 100% rename from HtmlSanitizer/HtmlSanitizer.project.json rename to src/HtmlSanitizer/HtmlSanitizer.project.json diff --git a/HtmlSanitizer/HtmlSanitizer.snk b/src/HtmlSanitizer/HtmlSanitizer.snk similarity index 100% rename from HtmlSanitizer/HtmlSanitizer.snk rename to src/HtmlSanitizer/HtmlSanitizer.snk diff --git a/HtmlSanitizer/HtmlSanitizer.xproj b/src/HtmlSanitizer/HtmlSanitizer.xproj similarity index 100% rename from HtmlSanitizer/HtmlSanitizer.xproj rename to src/HtmlSanitizer/HtmlSanitizer.xproj diff --git a/HtmlSanitizer/IHtmlSanitizer.cs b/src/HtmlSanitizer/IHtmlSanitizer.cs similarity index 100% rename from HtmlSanitizer/IHtmlSanitizer.cs rename to src/HtmlSanitizer/IHtmlSanitizer.cs diff --git a/HtmlSanitizer/Properties/AssemblyInfo.cs b/src/HtmlSanitizer/Properties/AssemblyInfo.cs similarity index 100% rename from HtmlSanitizer/Properties/AssemblyInfo.cs rename to src/HtmlSanitizer/Properties/AssemblyInfo.cs diff --git a/HtmlSanitizer/RemoveReason.cs b/src/HtmlSanitizer/RemoveReason.cs similarity index 100% rename from HtmlSanitizer/RemoveReason.cs rename to src/HtmlSanitizer/RemoveReason.cs diff --git a/HtmlSanitizer/project.json b/src/HtmlSanitizer/project.json similarity index 100% rename from HtmlSanitizer/project.json rename to src/HtmlSanitizer/project.json diff --git a/HtmlSanitizer.Tests/HtmlSanitizer.Tests.csproj b/test/HtmlSanitizer.Tests/HtmlSanitizer.Tests.csproj similarity index 82% rename from HtmlSanitizer.Tests/HtmlSanitizer.Tests.csproj rename to test/HtmlSanitizer.Tests/HtmlSanitizer.Tests.csproj index 187159d..a1ca4ef 100644 --- a/HtmlSanitizer.Tests/HtmlSanitizer.Tests.csproj +++ b/test/HtmlSanitizer.Tests/HtmlSanitizer.Tests.csproj @@ -40,10 +40,6 @@ 4 - - ..\packages\AngleSharp.0.9.6\lib\net45\AngleSharp.dll - True - @@ -60,7 +56,7 @@ - + {ccdb0c26-d683-4943-b5d8-ac07116461e5} HtmlSanitizer @@ -85,12 +81,6 @@ - - - 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}. - - -