Skip to content
This repository was archived by the owner on Nov 15, 2021. It is now read-only.

Commit 51924b7

Browse files
sawildesawilde
authored
Merge pull request #1030 from sawilde/bug/1029_chocolatey
#1029 update chocolatey packages
2 parents 06dbc26 + 614e765 commit 51924b7

File tree

4 files changed

+92
-55
lines changed

4 files changed

+92
-55
lines changed

‎appveyor.yml

+16-10
Original file line numberDiff line numberDiff line change
@@ -58,18 +58,22 @@ test: off
5858
artifacts:
5959
- path: main/bin/installer/*.msi
6060
name: Installer
61+
- path: main/bin/installer/*.txt
62+
name: InstallerHash
6163
- path: main/bin/zip/*.zip
6264
name: ZipArchive
65+
- path: main/bin/zip/*.txt
66+
name: ZipArchiveHash
6367
- path: main/bin/packages/nuget/opencover/*.nupkg
6468
name: Nuget
6569
- path: main/bin/packages/nuget/opencover-rc/*.nupkg
6670
name: NugetCandidate
6771
- path: main/bin/packages/chocolatey/opencover/*.nupkg
6872
name: Chocolatey
69-
- path: main/bin/packages/chocolatey/opencover.portable/*.nupkg
70-
name: ChocolateyPortable
7173
- path: main/bin/packages/chocolatey/opencover.install/*.nupkg
7274
name: ChocolateyInstall
75+
- path: main/bin/packages/chocolatey/opencover.portable/*.nupkg
76+
name: ChocolateyPortable
7377
- path: cov-int/build-log.txt
7478
name: Coverity
7579
- path: GenericCoverage.xml
@@ -108,6 +112,14 @@ deploy:
108112
artifact: ChocolateyPortable
109113
on:
110114
branch: release
115+
- provider: NuGet
116+
server: https://chocolatey.org/
117+
api_key:
118+
secure: BbmHnhpI/e+m2xmR/5jxmOqKbQdcYG8RuF7iWT86SbCLIxPhMotbHprgBtw8dA4n
119+
skip_symbols: true
120+
artifact: ChocolateyInstall
121+
on:
122+
branch: release
111123
- provider: NuGet
112124
api_key:
113125
secure: pIYB18F1Lfq/UWtYjWH1CaKuuLc2dLHxeRwH5xO3BZsv4pMce5ETtqglUWa96TWp
@@ -120,7 +132,7 @@ deploy:
120132
release: OpenCover (Release Candidiate) $(appveyor_build_version)
121133
auth_token:
122134
secure: T8hG3PcjoJoYaCr7ND6wFfzJdje9TYqbvBl9pFmh3EmI6relJrXzAGAooe9lBYjt
123-
artifact: Installer, ZipArchive
135+
artifact: Installer, ZipArchive, InstallerHash, ZipArchiveHash
124136
prerelease: true
125137
on:
126138
branch: rc
@@ -129,7 +141,7 @@ deploy:
129141
release: OpenCover (Release) $(appveyor_build_version)
130142
auth_token:
131143
secure: T8hG3PcjoJoYaCr7ND6wFfzJdje9TYqbvBl9pFmh3EmI6relJrXzAGAooe9lBYjt
132-
artifact: Installer, ZipArchive
144+
artifact: Installer, ZipArchive, InstallerHash, ZipArchiveHash
133145
on:
134146
branch: release
135147
- provider: NuGet
@@ -139,12 +151,6 @@ deploy:
139151
artifact: NugetCandidate
140152
on:
141153
branch: master
142-
notifications:
143-
- provider: Webhook
144-
url: https://webhooks.gitter.im/e/700bdb95a55f23095db9
145-
on_build_success: true
146-
on_build_failure: true
147-
on_build_status_changed: true
148154
on_success:
149155
- ps: >-
150156
if ($env:APPVEYOR_SCHEDULED_BUILD -ne "True" -and $env:APPVEYOR_REPO_BRANCH -ne "coverity")

‎build/nuget_package.build

+75-44
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,15 @@
1212
<property name="chocolatey.portable.output.folder" value="${solution.folder}\bin\packages\chocolatey\opencover.portable" />
1313
<property name="checksum.exe" value="${choco.folder}/tools/checksum.exe" />
1414

15-
<target name="generate-release-notes" depends="get-version-number" >
15+
<property
16+
name="checksum.installer.output.file"
17+
value="${solution.folder}\bin\installer\checksum.installer.txt" />
18+
19+
<property
20+
name="checksum.zip.output.file"
21+
value="${solution.folder}\bin\zip\checksum.zip.txt" />
22+
23+
<target name="generate-release-notes" depends="get-version-number" >
1624
<delete file="ReleaseNotes.txt" />
1725
<copy file="ReleaseNotes.tmp" tofile="ReleaseNotes.txt" >
1826
<filterchain>
@@ -76,23 +84,12 @@
7684
<exec program="${nuget.exe}"
7785
commandline="pack ${solution.folder}\OpenCover.Packages\nuget\opencover\OpenCover.nuspec -BasePath ${root.folder} -OutputDirectory ${nugetpackage.folder} -Version ${buildnumber.major}.${buildnumber.minor}.${buildnumber.build}${buildnumber.rc}" />
7886
</target>
79-
80-
<target name="get-installer-checksum">
81-
<property
82-
name="checksum.output.file"
83-
value="${solution.folder}\OpenCover.Packages\chocolatey\opencover\checksum.txt" />
84-
<exec program="${checksum.exe}" output="${checksum.output.file}">
85-
<arg value='-t:sha256' />
86-
<arg value='-f="${solution.folder}\bin\installer\opencover.${buildnumber.major}.${buildnumber.minor}.${buildnumber.build}.msi"' />
87-
</exec>
88-
<loadfile
89-
file="${checksum.output.file}"
90-
property="checksum" />
91-
<delete file="${checksum.output.file}" />
92-
</target>
93-
94-
<target name="chocolatey-package" depends="get-version-number, get-installer-checksum" >
95-
87+
88+
<target name="chocolatey-package-all"
89+
depends="chocolatey-package, chocolatey-package-install, chocolatey-package-portable" />
90+
91+
<target name="chocolatey-package" depends="get-version-number" >
92+
9693
<property name="buildnumber.rc" value="${buildnumber.ci}" if="${property::exists('buildnumber.ci')}"/>
9794
<property name="buildnumber.rc" value="" unless="${property::exists('buildnumber.rc')}"/>
9895

@@ -102,62 +99,96 @@
10299
<exec program="${choco.exe}"
103100
commandline="pack ${solution.folder}\OpenCover.Packages\chocolatey\opencover\OpenCover.nuspec --Version=${buildnumber.major}.${buildnumber.minor}.${buildnumber.build}" />
104101

105-
<move todir="${chocolatey.output.folder}" >
102+
<move todir="${chocolatey.output.folder}" flatten="true" >
106103
<fileset basedir=".">
107-
<include name="*.nupkg" />
104+
<include name="*.nupkg" />
108105
</fileset>
109106
</move>
110107

111108
</target>
112-
113-
<target name="get-zip-checksum">
114-
<property
115-
name="checksum.output.file"
116-
value="${solution.folder}\OpenCover.Packages\chocolatey\opencover\checksum.txt" />
117-
<exec program="${checksum.exe}" output="${checksum.output.file}">
109+
110+
<target name="get-installer-checksum">
111+
112+
<exec program="${checksum.exe}" output="${checksum.installer.output.file}">
118113
<arg value='-t:sha256' />
119-
<arg value='-f="${solution.folder}\bin\zip\opencover.${buildnumber.major}.${buildnumber.minor}.${buildnumber.build}.zip"' />
114+
<arg value='-f="${solution.folder}\bin\installer\opencover.${buildnumber.major}.${buildnumber.minor}.${buildnumber.build}.msi"' />
120115
</exec>
116+
121117
<loadfile
122-
file="${checksum.output.file}"
123-
property="checksum" />
124-
<delete file="${checksum.output.file}" />
118+
file="${checksum.installer.output.file}"
119+
property="checksum.installer" />
120+
121+
<property name="checksum.installer"
122+
value="${string::trim(checksum.installer)}" />
123+
124+
<echo message="Installer CheckSum is '${checksum.installer}'" />
125+
126+
<exec program="${checksum.exe}">
127+
<arg value='-t:sha256' />
128+
<arg value='-c:${checksum.installer}' />
129+
<arg value='-f="${solution.folder}\bin\installer\opencover.${buildnumber.major}.${buildnumber.minor}.${buildnumber.build}.msi"' />
130+
</exec>
131+
125132
</target>
126133

127-
<target name="chocolatey-package-portable" depends="get-version-number, get-zip-checksum" >
134+
<target name="chocolatey-package-install" depends="get-version-number, get-installer-checksum" >
128135

129-
<delete file="${solution.folder}\OpenCover.Packages\chocolatey\opencover.portable\tools\chocolateyInstall.ps1" />
130-
<copy file="${solution.folder}\OpenCover.Packages\chocolatey\opencover.portable\tools\chocolateyInstall.ps1.tmp" tofile="${solution.folder}\OpenCover.Packages\chocolatey\opencover.portable\tools\chocolateyInstall.ps1" >
136+
<delete file="${solution.folder}\OpenCover.Packages\chocolatey\opencover.install\tools\chocolateyInstall.ps1" />
137+
<copy file="${solution.folder}\OpenCover.Packages\chocolatey\opencover.install\tools\chocolateyInstall.ps1.tmp" tofile="${solution.folder}\OpenCover.Packages\chocolatey\opencover.install\tools\chocolateyInstall.ps1" >
131138
<filterchain>
132139
<replacestring from="[[version]]" to="${buildnumber.major}.${buildnumber.minor}.${buildnumber.build}" />
133-
<replacestring from="[[checksum]]" to="${string::trim(checksum)}" />
140+
<replacestring from="[[checksum]]" to="${checksum.installer}" />
134141
</filterchain>
135142
</copy>
136143

137144
<property name="buildnumber.rc" value="${buildnumber.ci}" if="${property::exists('buildnumber.ci')}"/>
138145
<property name="buildnumber.rc" value="" unless="${property::exists('buildnumber.rc')}"/>
139146

140-
<mkdir dir="${chocolatey.output.folder}" />
147+
<mkdir dir="${chocolatey.install.output.folder}" />
141148
<mkdir dir="${choco.folder}\lib" />
142149

143150
<exec program="${choco.exe}"
144-
commandline="pack ${solution.folder}\OpenCover.Packages\chocolatey\opencover.portable\OpenCover.portable.nuspec --Version=${buildnumber.major}.${buildnumber.minor}.${buildnumber.build}" />
151+
commandline="pack ${solution.folder}\OpenCover.Packages\chocolatey\opencover.install\openCover.install.nuspec --Version=${buildnumber.major}.${buildnumber.minor}.${buildnumber.build}" />
145152

146-
<move todir="${chocolatey.portable.output.folder}" >
153+
<move todir="${chocolatey.install.output.folder}" flatten="true" >
147154
<fileset basedir=".">
148155
<include name="*.nupkg" />
149156
</fileset>
150157
</move>
151158

152159
</target>
153160

154-
<target name="chocolatey-package-install" depends="get-version-number, get-zip-checksum" >
161+
<target name="get-zip-checksum">
162+
163+
<exec program="${checksum.exe}" output="${checksum.zip.output.file}">
164+
<arg value='-t:sha256' />
165+
<arg value='-f="${solution.folder}\bin\zip\opencover.${buildnumber.major}.${buildnumber.minor}.${buildnumber.build}.zip"' />
166+
</exec>
167+
168+
<loadfile
169+
file="${checksum.zip.output.file}"
170+
property="checksum.zip" />
171+
172+
<property name="checksum.zip"
173+
value="${string::trim(checksum.zip)}" />
174+
175+
<echo message="Installer CheckSum is '${checksum.zip}'" />
176+
177+
<exec program="${checksum.exe}" >
178+
<arg value='-t:sha256' />
179+
<arg value='-c:${checksum.zip}' />
180+
<arg value='-f="${solution.folder}\bin\zip\opencover.${buildnumber.major}.${buildnumber.minor}.${buildnumber.build}.zip"' />
181+
</exec>
182+
183+
</target>
184+
185+
<target name="chocolatey-package-portable" depends="get-version-number, get-zip-checksum" >
155186

156-
<delete file="${solution.folder}\OpenCover.Packages\chocolatey\opencover.install\tools\chocolateyInstall.ps1" />
157-
<copy file="${solution.folder}\OpenCover.Packages\chocolatey\opencover.install\tools\chocolateyInstall.ps1.tmp" tofile="${solution.folder}\OpenCover.Packages\chocolatey\opencover.install\tools\chocolateyInstall.ps1" >
187+
<delete file="${solution.folder}\OpenCover.Packages\chocolatey\opencover.portable\tools\chocolateyInstall.ps1" />
188+
<copy file="${solution.folder}\OpenCover.Packages\chocolatey\opencover.portable\tools\chocolateyInstall.ps1.tmp" tofile="${solution.folder}\OpenCover.Packages\chocolatey\opencover.portable\tools\chocolateyInstall.ps1" >
158189
<filterchain>
159190
<replacestring from="[[version]]" to="${buildnumber.major}.${buildnumber.minor}.${buildnumber.build}" />
160-
<replacestring from="[[checksum]]" to="${string::trim(checksum)}" />
191+
<replacestring from="[[checksum]]" to="${checksum.zip}" />
161192
</filterchain>
162193
</copy>
163194

@@ -168,10 +199,10 @@
168199
<mkdir dir="${choco.folder}\lib" />
169200

170201
<exec program="${choco.exe}"
171-
commandline="pack ${solution.folder}\OpenCover.Packages\chocolatey\opencover.install\OpenCover.install.nuspec --Version=${buildnumber.major}.${buildnumber.minor}.${buildnumber.build}" />
202+
commandline="pack ${solution.folder}\OpenCover.Packages\chocolatey\opencover.portable\OpenCover.portable.nuspec --Version=${buildnumber.major}.${buildnumber.minor}.${buildnumber.build}" />
172203

173-
<move todir="${chocolatey.install.output.folder}" >
174-
<fileset basedir=".">
204+
<move todir="${chocolatey.portable.output.folder}" flatten="true">
205+
<fileset basedir="." >
175206
<include name="*.nupkg" />
176207
</fileset>
177208
</move>

‎main/.nuget/NuGet.exe

1.03 MB
Binary file not shown.

‎main/Opencover.Packages/chocolatey/opencover.install/opencover.install.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<metadata>
44
<id>openCover.install</id>
55
<version>1.0.0.0</version>
6-
<title>OpenCover - an open source code coverage tool for .NET</title>
6+
<title>OpenCover (Installer) - an open source code coverage tool for .NET</title>
77
<authors>OpenCover, shaun wilde</authors>
88
<owners>shaun wilde</owners>
99
<licenseUrl>https://github.com/OpenCover/opencover/blob/master/LICENSE</licenseUrl>

0 commit comments

Comments
 (0)