diff --git a/assets/Product.wxs b/assets/Product.wxs index ab516102b86..31432c18616 100644 --- a/assets/Product.wxs +++ b/assets/Product.wxs @@ -60,6 +60,30 @@ + + + + + + + + + + + + + + + + + + = "14.0.23918")]]> + + + = "14.0.23918")]]> + diff --git a/docs/installation/windows.md b/docs/installation/windows.md index 325b7619196..b764f0f346a 100644 --- a/docs/installation/windows.md +++ b/docs/installation/windows.md @@ -14,14 +14,14 @@ There is a shortcut placed in the Start Menu upon installation. ### Prerequisites -* Install the [Universal C Runtime](https://www.microsoft.com/en-us/download/details.aspx?id=50410) on Windows versions prior to Windows 10. +* Install the [Universal C Runtime](https://www.microsoft.com/download/details.aspx?id=50410) on Windows versions prior to Windows 10. It is available via direct download or Windows Update. Fully patched (including optional packages), supported systems will already have this installed. -* Install the [Visual C++ Redistributable](https://my.visualstudio.com/Downloads?pid=2082) for VS2015. +* Install the [Visual C++ Redistributable](https://www.microsoft.com/download/details.aspx?id=48145) for VS2015. ## Deploying on Nano Server -These instructions assume that Windows PowerShell is running on the Nano Server image and that it has been generated by the [Nano Server Image Builder](https://technet.microsoft.com/en-us/windows-server-docs/get-started/deploy-nano-server). +These instructions assume that Windows PowerShell is running on the Nano Server image and that it has been generated by the [Nano Server Image Builder](https://technet.microsoft.com/windows-server-docs/get-started/deploy-nano-server). Nano Server is a "headless" OS and deployment of PowerShell Core binaries can happen in two different ways: 1. Offline - Mount the Nano Server VHD and unzip the contents of the zip file to your chosen location within the mounted image. diff --git a/test/powershell/Installer/WindowsInstaller.Tests.ps1 b/test/powershell/Installer/WindowsInstaller.Tests.ps1 new file mode 100644 index 00000000000..ef1a08ae180 --- /dev/null +++ b/test/powershell/Installer/WindowsInstaller.Tests.ps1 @@ -0,0 +1,26 @@ +$thisTestFolder = Split-Path $MyInvocation.MyCommand.Path -Parent +$wixProductFile = Join-Path $thisTestFolder "..\..\..\assets\Product.wxs" + +Describe "Windows Installer" -Tags "Scenario" { + + Context "Universal C Runtime Download Link" { + $universalCRuntimeDownloadLink = 'https://www.microsoft.com/download/details.aspx?id=50410' + It "Wix file should have download link about Universal C runtime" { + (Get-Content $wixProductFile -Raw).Contains($universalCRuntimeDownloadLink) | Should Be $true + } + It "Should have download link about Universal C runtime that is reachable" { + (Invoke-WebRequest $universalCRuntimeDownloadLink.Replace("https://",'http://')) | Should Not Be $null + } + } + + Context "Visual Studio C++ Redistributables Link" { + $visualStudioCPlusPlusRedistributablesDownloadLink = 'https://www.microsoft.com/download/details.aspx?id=48145' + It "WiX file should have documentation about Visual Studio C++ redistributables" { + (Get-Content $wixProductFile -Raw).Contains($visualStudioCPlusPlusRedistributablesDownloadLink) | Should Be $true + } + It "Should have download link about Universal C runtime that is reachable" { + (Invoke-WebRequest $visualStudioCPlusPlusRedistributablesDownloadLink.Replace("https://",'http://')) | Should Not Be $null + } + } + +} \ No newline at end of file