Fixes to the CI document (dotnet#2161)

.travis.yml

@@ -9,11 +9,21 @@ matrix:
     - os: osx # OSX 10.11
       osx_image: xcode7.2
       dotnet: 1.0.0-preview2-003121
+    - os: osx # OSX 10.12
+      osx_image: xcode7.3
+      dotnet: 1.0.0-rc4-0044771
+
+## If `dotnet` configuration doesnt work, use install script instead
+# install:
+#  - export DOTNET_INSTALL_DIR="$PWD/.dotnetsdk"
+#  - curl -sSL https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0/scripts/obtain/dotnet-install.sh | bash /dev/stdin --version "$CLI_VERSION" --install-dir "$DOTNET_INSTALL_DIR"
+#  - export PATH="$DOTNET_INSTALL_DIR:$PATH"  
 
 script:
+  - dotnet --info
   # Run a new console app
   - mkdir -p "test/test-dotnet-new" && pushd "test/test-dotnet-new"
   - dotnet new
   - dotnet restore
-  - dotnet --verbose run a b
+  - dotnet run a b
   - popd

appveyor.yml

@@ -1,33 +1,27 @@
 os: Visual Studio 2015
 
-## .NET Core SDK preview1 is already installed in the build worker image Visual Studio 2015
-##
-## To install a specific version:
-##
-## install:
-##   # .NET Core SDK binaries
-##   ## 1) from direct url  
-##   - ps: $url = "https://go.microsoft.com/fwlink/?LinkID=798402" # v1.0.0-preview1 x64
-##   ## 2) from url based on version, for example using an env var CLI_VERSION that can be a
-##   ##    a specific version `1.0.0-preview2-003121` or `Latest` (for latest dev version)
-##   - ps: $url = "https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/$($env:CLI_VERSION)/dotnet-dev-win-x64.$($env:CLI_VERSION.ToLower()).zip"
-##   # Download .NET Core SDK and add to PATH
-##   - ps: $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetsdk"
-##   - ps: mkdir $env:DOTNET_INSTALL_DIR -Force | Out-Null
-##   - ps: $tempFile = [System.IO.Path]::GetTempFileName()
-##   - ps: (New-Object System.Net.WebClient).DownloadFile($url, $tempFile)
-##   - ps: Add-Type -AssemblyName System.IO.Compression.FileSystem; [System.IO.Compression.ZipFile]::ExtractToDirectory($tempFile, $env:DOTNET_INSTALL_DIR)
-##   - ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path"
+# NOTE .NET Core SDK preview2 is already installed in the build worker image Visual Studio 2015
+# so the `install` section is not required
+
+environment:
+  CLI_VERSION: 1.0.0-rc4-004771
+
+install:
+  - ps: $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetsdk"
+  - ps: mkdir $env:DOTNET_INSTALL_DIR -Force | Out-Null
+  - ps: Invoke-WebRequest -Uri "https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0/scripts/obtain/dotnet-install.ps1" -OutFile "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1"
+  - ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version $env:CLI_VERSION -InstallDir $env:DOTNET_INSTALL_DIR'
+  - ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path"
 
 build_script:
   # dotnet info
   - ps: dotnet --info
   # Run dotnet new 
   - ps: mkdir "test\test-dotnet-new" -Force | Push-Location
-  - ps: dotnet new --lang fsharp
+  - ps: dotnet new console -lang f#
   - ps: dotnet restore
-  - ps: dotnet --verbose build
-  - ps: dotnet --verbose run a b
+  - ps: dotnet build
+  - ps: dotnet run a b
   - ps: Pop-Location