File tree Expand file tree Collapse file tree 3 files changed +22
-9
lines changed
src/Installer/redist-installer Expand file tree Collapse file tree 3 files changed +22
-9
lines changed Original file line number Diff line number Diff line change 1
1
@ echo off
2
- powershell -NoLogo -NoProfile -ExecutionPolicy ByPass -command " & " " " %~dp0 eng\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 " & " " " %~dp0 eng\common\build.ps1" " " -restore -build -nativeToolsOnMachine -msbuildEngine dotnet %PackInstaller% %* "
3
10
exit /b %ErrorLevel%
Original file line number Diff line number Diff line change @@ -8,4 +8,10 @@ while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symli
8
8
done
9
9
ScriptRoot=" $( cd -P " $( dirname " $SOURCE " ) " && pwd ) "
10
10
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 " $@ "
Original file line number Diff line number Diff line change 42
42
<Import Project =" targets\GenerateBundledVersions.targets" />
43
43
<Import Project =" targets\Crossgen.targets" />
44
44
<Import Project =" targets\GenerateLayout.targets" />
45
- <Import Project =" targets\GenerateMSBuildExtensions.targets" />
45
+ <Import Project =" targets\GenerateMSBuildExtensions.targets" Condition = " '$(PackInstaller)' != 'false' " />
46
46
<Import Project =" targets\FileExtensions.targets" />
47
- <Import Project =" targets\GenerateArchives.targets" />
47
+ <Import Project =" targets\GenerateArchives.targets" Condition = " '$(PackInstaller)' != 'false' " />
48
48
<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' " />
54
54
<Import Project =" targets\Badge.targets" />
55
55
56
56
</Project >
You can’t perform that action at this time.
0 commit comments