From e42984dfea38eb66c363e55114d55f2872251a17 Mon Sep 17 00:00:00 2001 From: sawilde Date: Fri, 17 Jul 2015 22:13:25 +1000 Subject: [PATCH] #323 push releases to github use appveyor for versioning update packaged sample update release notes --- ReleaseNotes.tmp | 1 + appveyor.yml | 24 ++++++++++++++++---- build/version.build | 3 --- default.build | 11 ++++++--- main/OpenCover.NugetPackage/readme.txt | 4 ++-- samples/SampleSln/.nuget/packages.config.tmp | 4 ++-- samples/SampleSln/BomTest/BomTest.csproj | 2 +- samples/SampleSln/BomTest/packages.config | 2 +- samples/SampleSln/coverage.bat.tmp | 4 ++-- 9 files changed, 37 insertions(+), 18 deletions(-) diff --git a/ReleaseNotes.tmp b/ReleaseNotes.tmp index 85684529c..f1750c803 100644 --- a/ReleaseNotes.tmp +++ b/ReleaseNotes.tmp @@ -1,4 +1,5 @@ Version [[version]] +#323 push releases and candidates to github via appveyor (prj-mgmt) #315 update nuget package (fix for VS2015) #320 update packages (fix for VS2015) #304 add switch to control timeout wait (feature) diff --git a/appveyor.yml b/appveyor.yml index a262cf58a..8b8063600 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 1.0.{build} +version: 4.6.{build} os: Unstable shallow_clone: true environment: @@ -7,7 +7,6 @@ environment: cache: - build/Version/opencover.snk - build/Version/opencover.public.snk -- build/Version/build.number nuget: disable_publish_on_pr: true build_script: @@ -37,11 +36,28 @@ deploy: artifact: NugetCandidate on: branch: rc +- provider: GitHub + tag: $(appveyor_build_version)-rc + release: OpenCover (Release Candidiate) $(appveyor_build_version) + auth_token: + secure: bMPwiJusZ78qab84M/zNAxmpMSCW11eaJI3czwnDzl8tK/9u3y4w38+2WOVkNeOg + artifact: Installer, ZipArchive + prerelease: true + on: + branch: rc +- provider: GitHub + tag: $(appveyor_build_version) + release: OpenCover (Release) $(appveyor_build_version) + auth_token: + secure: bMPwiJusZ78qab84M/zNAxmpMSCW11eaJI3czwnDzl8tK/9u3y4w38+2WOVkNeOg + artifact: Installer, ZipArchive + on: + branch: release notifications: - provider: Webhook - url: https://webhooks.gitter.im/e/737fbf46970811e6bfa7 + url: https://webhooks.gitter.im/e/700bdb95a55f23095db9 on_build_success: true on_build_failure: true on_build_status_changed: true on_success: -- build dogfood-release +- build dogfood-release \ No newline at end of file diff --git a/build/version.build b/build/version.build index a736814f8..7a0a9a40e 100644 --- a/build/version.build +++ b/build/version.build @@ -18,9 +18,6 @@ - - 4.5.0.0 - using System.Reflection; [assembly: AssemblyVersion("${buildnumber.version}")] [assembly: AssemblyFileVersion("${buildnumber.version}")] diff --git a/default.build b/default.build index 25097ab90..f4b14db91 100644 --- a/default.build +++ b/default.build @@ -14,9 +14,15 @@ - + + + + + + + @@ -53,8 +59,7 @@ - - + diff --git a/main/OpenCover.NugetPackage/readme.txt b/main/OpenCover.NugetPackage/readme.txt index 1f2c204a0..7e5988f73 100644 --- a/main/OpenCover.NugetPackage/readme.txt +++ b/main/OpenCover.NugetPackage/readme.txt @@ -12,10 +12,10 @@ alongside the utility to get started or you can look at the documentation provided on the wiki https://github.com/OpenCover/opencover/wiki/Usage. Currently OpenCover has no visualization of its results and we recommend that -your use ReportGenerator (1.9 and above) to view the results against your code. +your use ReportGenerator (2.1.8 and above) to view the results against your code. A sample project showing a possible way to use OpenCover with ReportGenerator -has also been installed for your convenience. +has also been provided for your convenience. If you have any issues or feature requests with OpenCover please raise them with the project owners on https://github.com/opencover/opencover. diff --git a/samples/SampleSln/.nuget/packages.config.tmp b/samples/SampleSln/.nuget/packages.config.tmp index 82b564320..981fa5b23 100644 --- a/samples/SampleSln/.nuget/packages.config.tmp +++ b/samples/SampleSln/.nuget/packages.config.tmp @@ -1,6 +1,6 @@  - + - + \ No newline at end of file diff --git a/samples/SampleSln/BomTest/BomTest.csproj b/samples/SampleSln/BomTest/BomTest.csproj index 39f6cff81..2c75f4745 100644 --- a/samples/SampleSln/BomTest/BomTest.csproj +++ b/samples/SampleSln/BomTest/BomTest.csproj @@ -31,7 +31,7 @@ - ..\packages\NUnit.2.6.3\lib\nunit.framework.dll + ..\packages\NUnit.2.6.4\lib\nunit.framework.dll diff --git a/samples/SampleSln/BomTest/packages.config b/samples/SampleSln/BomTest/packages.config index ad37a5282..c714ef3a2 100644 --- a/samples/SampleSln/BomTest/packages.config +++ b/samples/SampleSln/BomTest/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/samples/SampleSln/coverage.bat.tmp b/samples/SampleSln/coverage.bat.tmp index 693f8ce39..985d5997c 100644 --- a/samples/SampleSln/coverage.bat.tmp +++ b/samples/SampleSln/coverage.bat.tmp @@ -1,5 +1,5 @@ -.\packages\OpenCover.[[version]]\OpenCover.Console.exe -register:user "-filter:+[Bom]* -[*Test]*" "-target:.\packages\NUnit.Runners.2.6.3\tools\nunit-console-x86.exe" "-targetargs:/noshadow .\BomTest\bin\Debug\BomTest.dll" +.\packages\OpenCover.[[version]]\tools\OpenCover.Console.exe -register:user "-filter:+[Bom]* -[*Test]*" "-target:.\packages\NUnit.Runners.2.6.4\tools\nunit-console-x86.exe" "-targetargs:/noshadow .\BomTest\bin\Debug\BomTest.dll" -.\packages\ReportGenerator.1.9.1.0\ReportGenerator.exe "-reports:results.xml" "-targetdir:.\coverage" +.\packages\ReportGenerator.2.1.8.0\tools\ReportGenerator.exe "-reports:results.xml" "-targetdir:.\coverage" pause \ No newline at end of file