File tree 2 files changed +16
-4
lines changed
2 files changed +16
-4
lines changed Original file line number Diff line number Diff line change @@ -17,15 +17,21 @@ if "%WIX_DOWNLOAD_URL%"=="" (
17
17
18
18
:: Set up the output directory and temp. directories
19
19
echo Cleaning previous build artifacts...
20
- set OUTPUT_DIR = %~dp0 ..\..\..\output\msi
20
+ set OUTPUT_DIR = %~dp0 ..\..\..\..\ output\msi
21
21
if exist %OUTPUT_DIR% rmdir /s /q %OUTPUT_DIR%
22
22
mkdir %OUTPUT_DIR%
23
23
24
- set ARTIFACTS_DIR = %~dp0 ..\..\..\output\msi\artifacts
24
+ set ARTIFACTS_DIR = %~dp0 ..\..\..\..\ output\msi\artifacts
25
25
mkdir %ARTIFACTS_DIR%
26
26
27
27
set WIX_DIR = %ARTIFACTS_DIR% \wix
28
- set REPO_ROOT = %~dp0 ..\..\..
28
+ set REPO_ROOT = %~dp0 ..\..\..\..
29
+
30
+ set PIPELINE_WORKSPACE = %ARTIFACTS_DIR% \workspace
31
+
32
+ mkdir %PIPELINE_WORKSPACE% \SqlcmdWindowsAmd64
33
+
34
+ copy /y %REPO_ROOT% \sqlcmd.exe %PIPELINE_WORKSPACE% \SqlcmdWindowsAmd64\sqlcmd.exe
29
35
30
36
:: ensure wix is available
31
37
if exist %WIX_DIR% (
@@ -45,6 +51,8 @@ if not exist %WIX_DIR% (
45
51
46
52
if %errorlevel% neq 0 goto ERROR
47
53
54
+ set PATH = %PATH% ;%WIX_DIR%
55
+
48
56
@ echo off
49
57
50
58
:: During pipeline we want to skip msbuild here and use the AzureDevOps Task instead
@@ -53,7 +61,7 @@ if "%1"=="--skip-msbuild" (
53
61
) else (
54
62
echo Building MSI...
55
63
cd %OUTPUT_DIR%
56
- msbuild /t:rebuild /p:Configuration=Release %REPO_ROOT% \release\windows\msi\sqlcmd.wixproj
64
+ msbuild /t:rebuild /p:Configuration=Release %REPO_ROOT% \release\windows\msi\sqlcmd.wixproj -p:OutDir= %OUTPUT_DIR% \
57
65
start %OUTPUT_DIR%
58
66
)
59
67
Original file line number Diff line number Diff line change 12
12
<SQLCMD_UPGRADE_CODE Condition =" '$(SQLCMD_UPGRADE_CODE)' == '' " >B8C0DBFD-DCED-44D4-9660-206CDE2D91BC</SQLCMD_UPGRADE_CODE >
13
13
<DefineSolutionProperties >false</DefineSolutionProperties >
14
14
<WixTargetsPath Condition =" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' " >$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath >
15
+ <WixTargetsPath Condition =" '$(WIX_DOWNLOAD_URL)' != '' " >$(WIX_DIR)\Wix.targets</WixTargetsPath >
16
+ <WixToolPath Condition =" '$(WIX_DOWNLOAD_URL)' != '' " >$(WIX_DIR)</WixToolPath >
17
+ <WixTasksPath Condition =" '$(WIX_DOWNLOAD_URL)' != '' " >$(WixToolPath)\wixtasks.dll</WixTasksPath >
18
+ <WixExtDir Condition =" '$(WIX_DOWNLOAD_URL)' != '' " >$(WixToolPath)</WixExtDir >
15
19
<WixTargetsPath Condition =" '$(WixTargetsPath)' == '' " >$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath >
16
20
</PropertyGroup >
17
21
<PropertyGroup Condition =" '$(Configuration)|$(Platform)' == 'Debug|x86' OR '$(Configuration)|$(Platform)' == 'Debug|x64' " >
You can’t perform that action at this time.
0 commit comments