Fix how 'current' and 'preview' SDKs are merged in Appveyor builds

This commit is contained in:
SteveSandersonMS
2016-12-15 19:31:09 +00:00
parent 67cd5f6093
commit 17b107bb42

View File

@@ -13,7 +13,7 @@ install:
- ps: (New-Object System.Net.WebClient).DownloadFile($urlPreview, $tempFilePreview) - ps: (New-Object System.Net.WebClient).DownloadFile($urlPreview, $tempFilePreview)
- ps: Add-Type -AssemblyName System.IO.Compression.FileSystem; [System.IO.Compression.ZipFile]::ExtractToDirectory($tempFileCurrent, $env:DOTNET_INSTALL_DIR) - ps: Add-Type -AssemblyName System.IO.Compression.FileSystem; [System.IO.Compression.ZipFile]::ExtractToDirectory($tempFileCurrent, $env:DOTNET_INSTALL_DIR)
- ps: Add-Type -AssemblyName System.IO.Compression.FileSystem; [System.IO.Compression.ZipFile]::ExtractToDirectory($tempFilePreview, $env:DOTNET_INSTALL_DIR + "preview") - ps: Add-Type -AssemblyName System.IO.Compression.FileSystem; [System.IO.Compression.ZipFile]::ExtractToDirectory($tempFilePreview, $env:DOTNET_INSTALL_DIR + "preview")
- ps: Move-Item "${env:DOTNET_INSTALL_DIR}preview\sdk\*" "${env:DOTNET_INSTALL_DIR}\sdk\" - ps: Copy-Item "${env:DOTNET_INSTALL_DIR}preview\*" "${env:DOTNET_INSTALL_DIR}" -Force -Recurse
- ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path" - ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path"
build_script: build_script:
- npm install -g npm@^3.0.0 - npm install -g npm@^3.0.0