diff --git a/ports/mpir/CONTROL b/ports/mpir/CONTROL index 79238cbb55c429..6a68f926df7b34 100644 --- a/ports/mpir/CONTROL +++ b/ports/mpir/CONTROL @@ -2,4 +2,4 @@ Source: mpir Version: 3.0.0-7 Homepage: https://github.com/wbhart/mpir Description: Multiple Precision Integers and Rationals. -Supports: !uwp \ No newline at end of file +Supports: !uwp diff --git a/scripts/azure-pipelines/windows/provision-image.ps1 b/scripts/azure-pipelines/windows/provision-image.ps1 index 9a33461ee72b25..1f81785a77eee7 100644 --- a/scripts/azure-pipelines/windows/provision-image.ps1 +++ b/scripts/azure-pipelines/windows/provision-image.ps1 @@ -114,6 +114,9 @@ $Workloads = @( $MpiUrl = 'https://download.microsoft.com/download/A/E/0/AE002626-9D9D-448D-8197-1EA510E297CE/msmpisetup.exe' +$CMakeUrl = 'https://github.com/Kitware/CMake/releases/download/v3.17.2/cmake-3.17.2-win32-x86.msi' +$NinjaUrl = 'https://github.com/ninja-build/ninja/releases/download/v1.10.0/ninja-win.zip' + $CudaUrl = 'https://developer.download.nvidia.com/compute/cuda/10.1/Prod/local_installers/cuda_10.1.243_426.00_win10.exe' $CudaFeatures = 'nvcc_10.1 cuobjdump_10.1 nvprune_10.1 cupti_10.1 gpu_library_advisor_10.1 memcheck_10.1 ' + ` 'nvdisasm_10.1 nvprof_10.1 visual_profiler_10.1 visual_studio_integration_10.1 cublas_10.1 cublas_dev_10.1 ' + ` @@ -430,6 +433,8 @@ Add-MPPreference -ExclusionProcess link.exe Add-MPPreference -ExclusionProcess python.exe InstallVisualStudio -Workloads $Workloads -BootstrapperUrl $VisualStudioBootstrapperUrl -Nickname 'Stable' +InstallMSI 'CMake' $CMakeUrl +InstallZip 'Ninja' $NinjaUrl 'C:\Program Files\CMake\bin' InstallMpi -Url $MpiUrl InstallCuda -Url $CudaUrl -Features $CudaFeatures InstallZip -Url $BinSkimUrl -Name 'BinSkim' -Dir 'C:\BinSkim' @@ -445,3 +450,8 @@ if (-Not ([string]::IsNullOrWhiteSpace($StorageAccountKey))) { -Name StorageAccountKey ` -Value $StorageAccountKey } +Write-Host 'Updating PATH...' +$environmentKey = Get-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Environment' -Name Path +Set-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Environment' ` + -Name Path ` + -Value "$($environmentKey.Path);C:\Program Files\CMake\bin"