Skip to content

Commit 7e0d6e4

Browse files
committed
Enable pipeline.cmd for local testing
1 parent 432d0e3 commit 7e0d6e4

File tree

2 files changed

+16
-4
lines changed

2 files changed

+16
-4
lines changed

release/windows/msi/scripts/pipeline.cmd

+12-4
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,21 @@ if "%WIX_DOWNLOAD_URL%"=="" (
1717

1818
:: Set up the output directory and temp. directories
1919
echo Cleaning previous build artifacts...
20-
set OUTPUT_DIR=%~dp0..\..\..\output\msi
20+
set OUTPUT_DIR=%~dp0..\..\..\..\output\msi
2121
if exist %OUTPUT_DIR% rmdir /s /q %OUTPUT_DIR%
2222
mkdir %OUTPUT_DIR%
2323

24-
set ARTIFACTS_DIR=%~dp0..\..\..\output\msi\artifacts
24+
set ARTIFACTS_DIR=%~dp0..\..\..\..\output\msi\artifacts
2525
mkdir %ARTIFACTS_DIR%
2626

2727
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
2935

3036
::ensure wix is available
3137
if exist %WIX_DIR% (
@@ -45,6 +51,8 @@ if not exist %WIX_DIR% (
4551

4652
if %errorlevel% neq 0 goto ERROR
4753

54+
set PATH=%PATH%;%WIX_DIR%
55+
4856
@echo off
4957

5058
:: During pipeline we want to skip msbuild here and use the AzureDevOps Task instead
@@ -53,7 +61,7 @@ if "%1"=="--skip-msbuild" (
5361
) else (
5462
echo Building MSI...
5563
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%\
5765
start %OUTPUT_DIR%
5866
)
5967

release/windows/msi/sqlcmd.wixproj

+4
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
<SQLCMD_UPGRADE_CODE Condition=" '$(SQLCMD_UPGRADE_CODE)' == '' ">B8C0DBFD-DCED-44D4-9660-206CDE2D91BC</SQLCMD_UPGRADE_CODE>
1313
<DefineSolutionProperties>false</DefineSolutionProperties>
1414
<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>
1519
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
1620
</PropertyGroup>
1721
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' OR '$(Configuration)|$(Platform)' == 'Debug|x64' ">

0 commit comments

Comments
 (0)