Skip to content

Commit cd1ce19

Browse files
authored
Add -pack support for the build CLI so that the zips/msi/packages aren't built by default (dotnet#42384)
2 parents 67fe2d5 + 9d8b4ce commit cd1ce19

File tree

3 files changed

+22
-9
lines changed

3 files changed

+22
-9
lines changed

build.cmd

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
11
@echo off
2-
powershell -NoLogo -NoProfile -ExecutionPolicy ByPass -command "& """%~dp0eng\common\build.ps1""" -restore -build -nativeToolsOnMachine -msbuildEngine dotnet %*"
2+
3+
echo %* | findstr /C:"-pack" >nul
4+
if %errorlevel%==0 (
5+
set PackInstaller=
6+
) else (
7+
set PackInstaller=/p:PackInstaller=false
8+
)
9+
powershell -NoLogo -NoProfile -ExecutionPolicy ByPass -command "& """%~dp0eng\common\build.ps1""" -restore -build -nativeToolsOnMachine -msbuildEngine dotnet %PackInstaller% %*"
310
exit /b %ErrorLevel%

build.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,10 @@ while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symli
88
done
99
ScriptRoot="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
1010

11-
. "$ScriptRoot/eng/common/build.sh" --build --restore "$@"
11+
if [[ "$@" != *"-pack"* ]]; then
12+
packInstallerFlag="/p:PackInstaller=false"
13+
else
14+
packInstallerFlag=
15+
fi
16+
17+
. "$ScriptRoot/eng/common/build.sh" --build --restore $packInstallerFlag "$@"

src/Installer/redist-installer/redist-installer.csproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,15 @@
4242
<Import Project="targets\GenerateBundledVersions.targets" />
4343
<Import Project="targets\Crossgen.targets" />
4444
<Import Project="targets\GenerateLayout.targets" />
45-
<Import Project="targets\GenerateMSBuildExtensions.targets" />
45+
<Import Project="targets\GenerateMSBuildExtensions.targets" Condition="'$(PackInstaller)' != 'false'"/>
4646
<Import Project="targets\FileExtensions.targets" />
47-
<Import Project="targets\GenerateArchives.targets" />
47+
<Import Project="targets\GenerateArchives.targets" Condition="'$(PackInstaller)' != 'false'"/>
4848
<Import Project="targets\GenerateMSIs.targets" />
49-
<Import Project="targets\LinuxNativeInstallerDependencyVersions.targets" />
50-
<Import Project="targets\GenerateDebs.targets" />
51-
<Import Project="targets\GenerateRPMs.targets" />
52-
<Import Project="targets\GeneratePKG.targets" />
53-
<Import Project="targets\GenerateInstallers.targets" />
49+
<Import Project="targets\LinuxNativeInstallerDependencyVersions.targets" Condition="'$(PackInstaller)' != 'false'"/>
50+
<Import Project="targets\GenerateDebs.targets" Condition="'$(PackInstaller)' != 'false'"/>
51+
<Import Project="targets\GenerateRPMs.targets" Condition="'$(PackInstaller)' != 'false'"/>
52+
<Import Project="targets\GeneratePKG.targets" Condition="'$(PackInstaller)' != 'false'"/>
53+
<Import Project="targets\GenerateInstallers.targets" Condition="'$(PackInstaller)' != 'false'"/>
5454
<Import Project="targets\Badge.targets" />
5555

5656
</Project>

0 commit comments

Comments
 (0)