From 60854751c79e17445d859ca86fdace3c1a6a6a90 Mon Sep 17 00:00:00 2001 From: Richard Schneider Date: Wed, 3 Jul 2019 13:04:06 +1200 Subject: [PATCH 1/5] feat: allow source debugging from package --- src/Dns.csproj | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/src/Dns.csproj b/src/Dns.csproj index 8cdbaeb..649780b 100644 --- a/src/Dns.csproj +++ b/src/Dns.csproj @@ -4,13 +4,12 @@ net472;net45;netstandard14;netstandard2 Makaretu.Dns Makaretu.Dns - Makaretu.Dns.xml - full + portable true - 0.42.1 - 0.42.1 + 0.42 + 0.42 Makaretu.Dns @@ -22,16 +21,30 @@ © 2018-2019 Richard Schneider dns True - https://github.com/richardschneider/net-dns/blob/master/LICENSE https://github.com/richardschneider/net-dns + + true + true + + + true + + false + + true + snupkg + .pdb;$(AllowedOutputExtensionsInPackageBuildOutputFolder) + + NETSTANDARD14 + From 8cead7dc4e0a1ce10316141caebb065bfbe82da0 Mon Sep 17 00:00:00 2001 From: Richard Schneider Date: Thu, 4 Jul 2019 11:41:28 +1200 Subject: [PATCH 2/5] chore: faster build --- appveyor.yml | 40 +++++++-------- doc/MSBuild.dll.config | 112 ----------------------------------------- doc/packages.config | 7 --- src/Dns.csproj | 2 +- 4 files changed, 20 insertions(+), 141 deletions(-) delete mode 100644 doc/MSBuild.dll.config delete mode 100644 doc/packages.config diff --git a/appveyor.yml b/appveyor.yml index c7007a2..03d5b12 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -32,7 +32,6 @@ environment: # tools we need for bulding/testing/deploying install: - choco install gitversion.portable -y - - choco install docfx -y - npm install gh-pages -g # gitversion will change the assembly info @@ -40,38 +39,37 @@ pull_requests: do_not_increment_build_number: true before_build: - - nuget restore - ps: gitversion /output buildserver /updateAssemblyInfo >gitversion.log build_script: - dotnet build -c %CONFIGURATION% -p:Version=%GitVersion_MajorMinorPatch% -p:AssemblyVersion=%GitVersion_MajorMinorPatch% - - dotnet pack -c %CONFIGURATION% --no-build --no-restore -p:Version=%GitVersion_MajorMinorPatch% -p:AssemblyVersion=%GitVersion_MajorMinorPatch% after_build: - - cmd: appveyor PushArtifact "src\bin\%CONFIGURATION%\Makaretu.Dns.%GitVersion_MajorMinorPatch%.nupkg" +# Build documentation in doc\_site + - choco install docfx -y + - docfx doc\docfx.json --logLevel Warning --warningsAsErrors + - 7z a -tzip docs.zip doc\_site + - appveyor PushArtifact docs.zip + - if defined git_token gh-pages -d doc\_site -m "new docs %GitVersion_FullSemVer%" test_script: - dotnet test -c %CONFIGURATION% --no-build --no-restore test after_test: # Generate coverage report - - packages\OpenCover.4.6.519\tools\OpenCover.Console.exe - -register:user -filter:"+[Makaretu.Dns*]* -[*Tests]*" - -target:"c:\Program Files\dotnet\dotnet.exe" - -targetargs:"test -c Release --no-build --no-restore --framework net45 test" - -output:coverage.xml - -mergeoutput - -hideskipped:File - -oldStyle - - if defined COVERALLS_REPO_TOKEN - packages\coveralls.net.0.6.0\tools\csmacnz.coveralls.exe - --opencover -i ./coverage.xml --useRelativePaths --serviceName appveyor --jobId %APPVEYOR_BUILD_NUMBER% -# Build documentation in doc\_site - - del src\obj\*.* /s /q - - docfx doc\docfx.json --logLevel Warning - - 7z a -tzip docs.zip doc\_site - - appveyor PushArtifact docs.zip - - if defined git_token gh-pages -d doc\_site -m "new docs %GitVersion_FullSemVer%" + - dotnet test -c %CONFIGURATION% -f netcoreapp2 --no-build --no-restore test /p:CollectCoverage=true + - choco install codecov -y + - codecov -f "test/coverage.opencover.xml" + - dotnet tool install --global coveralls.net --version 1.0.0 + - if defined COVERALLS_REPO_TOKEN + csmacnz.coveralls.exe + --opencover -i test/coverage.opencover.xml --useRelativePaths --serviceName appveyor --jobId %APPVEYOR_BUILD_NUMBER% + +artifacts: + - path: 'src/**/*.nupkg' + name: nupkg + - path: 'src/**/*.snupkg' + name: snupkg # publish NuGet package on tag build nuget: diff --git a/doc/MSBuild.dll.config b/doc/MSBuild.dll.config deleted file mode 100644 index 3e1c5af..0000000 --- a/doc/MSBuild.dll.config +++ /dev/null @@ -1,112 +0,0 @@ - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/doc/packages.config b/doc/packages.config deleted file mode 100644 index cad44f5..0000000 --- a/doc/packages.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/src/Dns.csproj b/src/Dns.csproj index 649780b..78529b4 100644 --- a/src/Dns.csproj +++ b/src/Dns.csproj @@ -44,7 +44,7 @@ - + From 52a1a73bbfe0b6a20e39549291db248854dc3bae Mon Sep 17 00:00:00 2001 From: Richard Schneider Date: Thu, 4 Jul 2019 11:54:54 +1200 Subject: [PATCH 3/5] chore: get code coverage working --- appveyor.yml | 2 +- test/DnsTests.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 03d5b12..28996ff 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -57,7 +57,7 @@ test_script: after_test: # Generate coverage report - - dotnet test -c %CONFIGURATION% -f netcoreapp2 --no-build --no-restore test /p:CollectCoverage=true + - dotnet test -c %CONFIGURATION% -f netcoreapp2.1 --no-build --no-restore test /p:CollectCoverage=true - choco install codecov -y - codecov -f "test/coverage.opencover.xml" - dotnet tool install --global coveralls.net --version 1.0.0 diff --git a/test/DnsTests.csproj b/test/DnsTests.csproj index 99bb08a..b0ddabe 100644 --- a/test/DnsTests.csproj +++ b/test/DnsTests.csproj @@ -1,7 +1,7 @@  - net472;net45;netcoreapp2;netcoreapp1.1 + net472;net45;netcoreapp2.1;netcoreapp1.1 false full From 58951401b187483b25ebdaa8e9fde6eb537e289e Mon Sep 17 00:00:00 2001 From: Richard Schneider Date: Thu, 4 Jul 2019 12:17:42 +1200 Subject: [PATCH 4/5] chore: need coverlet --- .travis.yml | 6 +++--- test/DnsTests.csproj | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index f9afdd4..b29ac0f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: csharp mono: none -dotnet: 2.0.0 -dist: trusty +dist: xenial +dotnet: 2.2.300 sudo: required os: - linux @@ -12,4 +12,4 @@ install: script: - dotnet build -c Release --no-restore --framework netstandard2 ./src - - dotnet test -c Release --no-restore --framework netcoreapp2 ./test + - dotnet test -c Release --no-restore --framework netcoreapp2.1 ./test diff --git a/test/DnsTests.csproj b/test/DnsTests.csproj index b0ddabe..e22427e 100644 --- a/test/DnsTests.csproj +++ b/test/DnsTests.csproj @@ -12,6 +12,7 @@ + From 362d95379cd2e27f1dd17d4652fd945762132b34 Mon Sep 17 00:00:00 2001 From: Richard Schneider Date: Thu, 4 Jul 2019 12:32:06 +1200 Subject: [PATCH 5/5] chore: need coverlet properties --- test/DnsTests.csproj | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/test/DnsTests.csproj b/test/DnsTests.csproj index e22427e..80f34c8 100644 --- a/test/DnsTests.csproj +++ b/test/DnsTests.csproj @@ -8,10 +8,18 @@ Makaretu.Dns + + + + false + opencover + + + - - - + + +