Skip to content

Commit a734474

Browse files
committed
PR feedback
1 parent 7e0d6e4 commit a734474

File tree

6 files changed

+11
-15
lines changed

6 files changed

+11
-15
lines changed

Diff for: build/azure-pipelines/package-common-test.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,5 @@ steps:
3232
filePath: '$(Build.SourcesDirectory)\release\windows\msi\scripts\pipeline-test.ps1'
3333
failOnStderr: true
3434
env:
35-
CLI_VERSION: $(VERSION_TAG)
35+
CLI_VERSION: $(VERSION_TAG)
36+

Diff for: build/azure-pipelines/package-product.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ pr: none
66

77
variables:
88
Build.SourcesCliDirectory: '$(Build.SourcesDirectory)/'
9-
wix_download_url: 'https://azdataartifacts.blob.core.windows.net/util/wix314-binaries-mirror.zip'
9+
#wix_download_url: 'https://azdataartifacts.blob.core.windows.net/util/wix314-binaries-mirror.zip'
1010
MSI_OUTPUT_DIR: '$(Build.SourcesCliDirectory)/output'
1111

1212
stages:

Diff for: release/windows/msi/README.md

+5-10
Original file line numberDiff line numberDiff line change
@@ -13,34 +13,29 @@ This document provides instructions on creating the MSI.
1313

1414
1. Set the `CLI_VERSION` environment variable
1515
2. Run `release\windows\msi\scripts\pipeline.cmd`
16-
3. The unsigned MSI will be in the `.\release\windows\out` folder
16+
3. The unsigned MSI will be in the `.\output\msi` folder
1717

1818
> **Note:** For `building step 1.` above set both env-vars to the same version-tag for the immediate, this will consolidated in the future.
1919
2020
## Release Install/Update/Uninstall Steps
2121

2222
> **Note:** Replace `{{HOST}}` and `{{CLI_VERSION}}` with the appropriate values.
2323
24-
### Install SQLCMD TOOLS CLI on Windows
24+
### Install `Sqlcmd Tools` on Windows
2525

26-
The MSI distributable is used for installing or updating the SQLCMD Tools CLI on Windows.
26+
The MSI distributable is used for installing or updating the `Sqlcmd Tools` CLI on Windows.
2727

2828
[Download the MSI Installer](http://{{HOST}}/sqlcmd-{{CLI_VERSION}}.msi)
2929

3030
When the installer asks if it can make changes to your computer, click the `Yes` box.
3131

32-
### Update
33-
34-
Once removed, [Install SQLCMD Tools CLI on Windows](#install-sqlcmd-on-windows)
35-
3632
### Uninstall
3733

38-
You can uninstall the SQLCMD CLI from the Windows _Apps and Features_ list. To uninstall:
34+
You can uninstall the `SqlCmd Tools` from the Windows _Apps and Features_ list. To uninstall:
3935

4036
| Platform | Instructions |
4137
| ------------- |--------------------------------------------------------|
4238
| Windows 10 | Start > Settings > Apps |
4339
| Windows 8 | Start > Control Panel > Programs > Uninstall a program |
4440

45-
46-
The program to uninstall is listed as **SQLCMD Tools CLI** . Select this application, then click the `Uninstall` button.
41+
The program to uninstall is listed as **Sqlcmd Tools** . Select this application, then click the `Uninstall` button.

Diff for: release/windows/msi/scripts/pipeline-test.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,4 @@ $env:Path = [System.Environment]::GetEnvironmentVariable("Path", "Machine")
4242
Write-Output "$env:path"
4343

4444
$sqlcmd = $env:ProgramFiles + "\SqlCmd\Tools\sqlcmd"
45-
& $sqlcmd --help
45+
& $sqlcmd --help

Diff for: release/windows/msi/scripts/pipeline.cmd

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,4 +73,4 @@ exit /b 1
7373

7474
:END
7575
exit /b 0
76-
popd
76+
popd

Diff for: release/windows/msi/sqlcmd.wixproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,4 @@
4444
</WixExtension>
4545
</ItemGroup>
4646
<Import Project="$(WixTargetsPath)" />
47-
</Project>
47+
</Project>

0 commit comments

Comments
 (0)