Merge pull request #325 from OpenCover/master

Create release candidate
OpenCover · Jul 17, 2015 · 9254a10 · 9254a10
2 parents 2cd12bc + a59b6ec
commit 9254a10
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 18 deletions.
diff --git 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
@@ -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
diff --git a/build/version.build b/build/version.build
@@ -18,9 +18,6 @@
 	</target>
 
 	<target name="get-version-number" >
-		<property name="version.file" value="${build.folder}\Version\build.number" />
-    <echo file="${version.file}" unless="${file::exists(version.file)}">4.5.0.0</echo>
-		<version path="${version.file}" buildtype="MonthDay" revisiontype="Increment" startdate="01/08/2012" />
 		<echo file="${build.folder}\Version\Version.cs">using System.Reflection;&#xa;</echo>
 		<echo file="${build.folder}\Version\Version.cs" append="true">[assembly: AssemblyVersion("${buildnumber.version}")]&#xa;</echo>
 		<echo file="${build.folder}\Version\Version.cs" append="true">[assembly: AssemblyFileVersion("${buildnumber.version}")]&#xa;</echo>

diff --git a/default.build b/default.build
@@ -14,9 +14,15 @@
 	<property name="netfx.framework.folder" value="${netfx.folder}/Framework" if="${directory::exists(netfx.folder + '/Framework')}" />
 	<property name="netfx.framework.folder" value="${netfx.folder}/Framework64" if="${directory::exists(netfx.folder + '/Framework64')}" />
 	<property name="netfx4.folder" value="${netfx.framework.folder}/v4.0.30319" />
-	<property name="ci.buildNumber" value="${environment::get-variable('bamboo_buildNumber')}" if="${environment::variable-exists('bamboo_buildNumber')}"/>
 	<property name="ci.buildNumber" value="${environment::get-variable('APPVEYOR_BUILD_NUMBER')}" if="${environment::variable-exists('APPVEYOR_BUILD_NUMBER')}"/>
+	<property name="ci.buildNumber" value="0" unless="${property::exists('ci.buildNumber')}" />
 
+  <property name="buildnumber.major" value="4" />
+  <property name="buildnumber.minor" value="6" />
+  <property name="buildnumber.build" value="${ci.buildNumber}" />
+  <property name="buildnumber.revision" value="0" />
+  <property name="buildnumber.version" value="${buildnumber.major}.${buildnumber.minor}.${buildnumber.build}.${buildnumber.revision}" />
+
 	<loadtasks assembly="${build.folder}/nantcontrib-0.85/bin/NAnt.Contrib.Tasks.dll" />
 
 	<include buildfile="${build.folder}/version.build" />
@@ -53,8 +59,7 @@
 	</target>
 
   <target name="set-rc-property" >
-    <property name="buildnumber.ci" value="-rc${ci.buildNumber}" if="${property::exists('ci.buildNumber')}" />
-    <property name="buildnumber.ci" value="-rc${buildnumber.revision}" unless="${property::exists('buildnumber.ci')}" />
+    <property name="buildnumber.ci" value="-rc" />
   </target>
 
   <target name="create-release-candidate" depends="build-environment, build-release-platforms, test, test-cpp, set-rc-property, nuget-package, create-zip-package">

diff --git 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
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NUnit.Runners" version="2.6.3" />
+  <package id="NUnit.Runners" version="2.6.4" />
   <package id="OpenCover" version="[[version]]" />
-  <package id="ReportGenerator" version="1.9.1.0" />
+  <package id="ReportGenerator" version="2.1.8.0" />
 </packages>
diff --git a/samples/SampleSln/BomTest/BomTest.csproj b/samples/SampleSln/BomTest/BomTest.csproj
@@ -31,7 +31,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="nunit.framework">
-      <HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
+      <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/samples/SampleSln/BomTest/packages.config b/samples/SampleSln/BomTest/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NUnit" version="2.6.3" targetFramework="net45" />
+  <package id="NUnit" version="2.6.4" targetFramework="net45" />
 </packages>
diff --git 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