Skip to content

Commit d5abb13

Browse files
committed
(chocolateyGH-1949) add default variable for msbuild.configuration
In the .uppercut file, there is a call that is lacking a variable being created. Ensure that it is set appropriately to a good default value prior to being used. Remove the call in the build.bat file as it is now unnecessary.
1 parent 3f5fde0 commit d5abb13

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

.uppercut

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
<property name="app.strongname" value="C:${path.separator}Program Files${path.separator}Microsoft SDKs${path.separator}Windows${path.separator}v7.0A${path.separator}Bin${path.separator}sn.exe" />
5454
<property name="app.strongname" value="C:${path.separator}Program Files (x86)${path.separator}Microsoft SDKs${path.separator}Windows${path.separator}v7.0A${path.separator}Bin${path.separator}sn.exe" if="${not file::exists(app.strongname)}" />
5555

56+
<property name="msbuild.configuration" value="Release" overwrite="false" />
5657
<property name="path.key.name.private" value="${environment::get-variable('CHOCOLATEY_OFFICIAL_KEY')}" if="${environment::variable-exists('CHOCOLATEY_OFFICIAL_KEY') and msbuild.configuration == 'ReleaseOfficial'}" />
5758

5859
<property name="app.signtool" value="C:${path.separator}Program Files${path.separator}Microsoft SDKs${path.separator}Windows${path.separator}v7.0A${path.separator}Bin${path.separator}signtool.exe" />

build.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ SET BUILD_DIR=%~d0%~p0%
1313
SET NANT="%BUILD_DIR%lib\Nant\nant.exe"
1414
SET build.config.settings="%DIR%\.uppercut"
1515

16-
%NANT% /logger:"NAnt.Core.DefaultLogger" /quiet /nologo /f:"%BUILD_DIR%.build\default.build" -D:build.config.settings=%build.config.settings% -D:msbuild.configuration="Release" %*
16+
%NANT% /logger:"NAnt.Core.DefaultLogger" /quiet /nologo /f:"%BUILD_DIR%.build\default.build" -D:build.config.settings=%build.config.settings% %*
1717

1818
if %ERRORLEVEL% NEQ 0 goto errors
1919

0 commit comments

Comments
 (0)