|
12 | 12 | <property name="chocolatey.portable.output.folder" value="${solution.folder}\bin\packages\chocolatey\opencover.portable" />
|
13 | 13 | <property name="checksum.exe" value="${choco.folder}/tools/checksum.exe" />
|
14 | 14 |
|
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" > |
16 | 24 | <delete file="ReleaseNotes.txt" />
|
17 | 25 | <copy file="ReleaseNotes.tmp" tofile="ReleaseNotes.txt" >
|
18 | 26 | <filterchain>
|
|
76 | 84 | <exec program="${nuget.exe}"
|
77 | 85 | 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}" />
|
78 | 86 | </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 | + |
96 | 93 | <property name="buildnumber.rc" value="${buildnumber.ci}" if="${property::exists('buildnumber.ci')}"/>
|
97 | 94 | <property name="buildnumber.rc" value="" unless="${property::exists('buildnumber.rc')}"/>
|
98 | 95 |
|
|
102 | 99 | <exec program="${choco.exe}"
|
103 | 100 | commandline="pack ${solution.folder}\OpenCover.Packages\chocolatey\opencover\OpenCover.nuspec --Version=${buildnumber.major}.${buildnumber.minor}.${buildnumber.build}" />
|
104 | 101 |
|
105 |
| - <move todir="${chocolatey.output.folder}" > |
| 102 | + <move todir="${chocolatey.output.folder}" flatten="true" > |
106 | 103 | <fileset basedir=".">
|
107 |
| - <include name="*.nupkg" /> |
| 104 | + <include name="*.nupkg" /> |
108 | 105 | </fileset>
|
109 | 106 | </move>
|
110 | 107 |
|
111 | 108 | </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}"> |
118 | 113 | <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"' /> |
120 | 115 | </exec>
|
| 116 | + |
121 | 117 | <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 | + |
125 | 132 | </target>
|
126 | 133 |
|
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" > |
128 | 135 |
|
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" > |
131 | 138 | <filterchain>
|
132 | 139 | <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}" /> |
134 | 141 | </filterchain>
|
135 | 142 | </copy>
|
136 | 143 |
|
137 | 144 | <property name="buildnumber.rc" value="${buildnumber.ci}" if="${property::exists('buildnumber.ci')}"/>
|
138 | 145 | <property name="buildnumber.rc" value="" unless="${property::exists('buildnumber.rc')}"/>
|
139 | 146 |
|
140 |
| - <mkdir dir="${chocolatey.output.folder}" /> |
| 147 | + <mkdir dir="${chocolatey.install.output.folder}" /> |
141 | 148 | <mkdir dir="${choco.folder}\lib" />
|
142 | 149 |
|
143 | 150 | <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}" /> |
145 | 152 |
|
146 |
| - <move todir="${chocolatey.portable.output.folder}" > |
| 153 | + <move todir="${chocolatey.install.output.folder}" flatten="true" > |
147 | 154 | <fileset basedir=".">
|
148 | 155 | <include name="*.nupkg" />
|
149 | 156 | </fileset>
|
150 | 157 | </move>
|
151 | 158 |
|
152 | 159 | </target>
|
153 | 160 |
|
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" > |
155 | 186 |
|
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" > |
158 | 189 | <filterchain>
|
159 | 190 | <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}" /> |
161 | 192 | </filterchain>
|
162 | 193 | </copy>
|
163 | 194 |
|
|
168 | 199 | <mkdir dir="${choco.folder}\lib" />
|
169 | 200 |
|
170 | 201 | <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}" /> |
172 | 203 |
|
173 |
| - <move todir="${chocolatey.install.output.folder}" > |
174 |
| - <fileset basedir="."> |
| 204 | + <move todir="${chocolatey.portable.output.folder}" flatten="true"> |
| 205 | + <fileset basedir="." > |
175 | 206 | <include name="*.nupkg" />
|
176 | 207 | </fileset>
|
177 | 208 | </move>
|
|
0 commit comments