File tree Expand file tree Collapse file tree 3 files changed +7
-5
lines changed Expand file tree Collapse file tree 3 files changed +7
-5
lines changed Original file line number Diff line number Diff line change 47
47
timeoutInMinutes : 90
48
48
49
49
steps :
50
-
51
50
- task : UseDotNet@2
52
51
inputs :
53
52
useGlobalJson : true
58
57
- script : .\build.cmd EnableSkipStrongNames
59
58
displayName : Windows Build - EnableSkipStrongNames
60
59
61
- - script : .\build.cmd Build /p:BuildPortable=true /p:Desktop=false
60
+ - script : .\build.cmd Build /p:BuildPortable=true
62
61
displayName : Windows Build
63
62
64
63
- task : CodeQL3000Finalize@0
Original file line number Diff line number Diff line change 65
65
66
66
- script : .\build.cmd EnableSkipStrongNames
67
67
displayName : Enable SkipStrongNames
68
- - script : .\build.cmd $(_BuildTarget) /p:Desktop=false /p: BuildPortable=true ^
68
+ - script : .\build.cmd $(_BuildTarget) /p:BuildPortable=true ^
69
69
/binaryLogger:artifacts/msbuild.binlog /p:Configuration=$(_Configuration) /p:StyleCopEnabled=$(_StyleCopEnabled) ^
70
70
/fileLoggerParameters:LogFile=artifacts/msbuild.log;Summary;Verbosity=minimal
71
71
displayName : Build
Original file line number Diff line number Diff line change @@ -38,15 +38,18 @@ if exist "%InstallDir%\MSBuild\15.0\Bin\MSBuild.exe" (
38
38
goto BuildFail
39
39
)
40
40
41
+ REM Are we running in a local dev environment (not on CI)?
42
+ if DEFINED CI (set Desktop=false) else if DEFINED TEAMCITY_VERSION (set Desktop=false) else (set Desktop=true)
43
+
41
44
if " %1 " == " " goto BuildDefaults
42
45
43
- %MSBuild% Runtime.msbuild /m /nr:false /p:Platform=" Any CPU" /p:Desktop=true /v:M ^
46
+ %MSBuild% Runtime.msbuild /m /nr:false /p:Platform=" Any CPU" /p:Desktop=%Desktop% /v:M ^
44
47
/fl /fileLoggerParameters:LogFile=bin\msbuild.log;Verbosity=Normal /consoleLoggerParameters:Summary /t:%*
45
48
if %ERRORLEVEL% neq 0 goto BuildFail
46
49
goto BuildSuccess
47
50
48
51
:BuildDefaults
49
- %MSBuild% Runtime.msbuild /m /nr:false /p:Platform=" Any CPU" /p:Desktop=true /v:M ^
52
+ %MSBuild% Runtime.msbuild /m /nr:false /p:Platform=" Any CPU" /p:Desktop=%Desktop% /v:M ^
50
53
/fl /fileLoggerParameters:LogFile=bin\msbuild.log;Verbosity=Normal /consoleLoggerParameters:Summary
51
54
if %ERRORLEVEL% neq 0 goto BuildFail
52
55
goto BuildSuccess
You can’t perform that action at this time.
0 commit comments