From 7e09cca5fb99c5f5fa038b48439f80b58edbb043 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Tue, 27 Mar 2018 13:08:25 +0100
Subject: [PATCH] ci: use Angular 6 project with CLI using fixed RxJs

---
 .appveyor.yml                      | 2 +-
 .travis.yml                        | 8 ++++----
 package.json                       | 2 +-
 packages/@angular/cli/package.json | 2 +-
 tests/e2e/utils/project.ts         | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 060d7cc811..a100dd8f83 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -15,7 +15,7 @@ test_script:
   - npm --version
   - npm run test:packages
   - npm run test:cli
-  - node tests\run_e2e.js --appveyor "--glob=tests/{basic,commands,generate,build/styles}/**"
+  - node tests\run_e2e.js --appveyor "--glob=tests/{basic,commands,generate,build/styles}/**" --ng-version="6.0.0-rc.0"
 
 build: off
 
diff --git a/.travis.yml b/.travis.yml
index 9ecc30fd03..35147b7afc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,19 +36,19 @@ matrix:
       env: test
     - node_js: "8"
       os: linux
-      script: node tests/run_e2e.js --nb-shards=4 --shard=0 --nosilent
+      script: node tests/run_e2e.js --nb-shards=4 --shard=0 --nosilent --ng-version="6.0.0-rc.0"
       env: e2e-0
     - node_js: "8"
       os: linux
-      script: node tests/run_e2e.js --nb-shards=4 --shard=1 --nosilent
+      script: node tests/run_e2e.js --nb-shards=4 --shard=1 --nosilent --ng-version="6.0.0-rc.0"
       env: e2e-1
     - node_js: "8"
       os: linux
-      script: node tests/run_e2e.js --nb-shards=4 --shard=2 --nosilent
+      script: node tests/run_e2e.js --nb-shards=4 --shard=2 --nosilent --ng-version="6.0.0-rc.0"
       env: e2e-2
     - node_js: "8"
       os: linux
-      script: node tests/run_e2e.js --nb-shards=4 --shard=3 --nosilent
+      script: node tests/run_e2e.js --nb-shards=4 --shard=3 --nosilent --ng-version="6.0.0-rc.0"
       env: e2e-3
     - node_js: "8"
       os: linux
diff --git a/package.json b/package.json
index 2b4048016c..a3816c485a 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,7 @@
     "node-modules-path": "^1.0.0",
     "opn": "~5.1.0",
     "resolve": "^1.1.7",
-    "rxjs": "^5.5.6",
+    "rxjs": "^5.5.8",
     "semver": "^5.3.0",
     "silent-error": "^1.0.0",
     "typescript": "~2.6.2",
diff --git a/packages/@angular/cli/package.json b/packages/@angular/cli/package.json
index 0531a891fe..23327d71d9 100644
--- a/packages/@angular/cli/package.json
+++ b/packages/@angular/cli/package.json
@@ -44,7 +44,7 @@
     "node-modules-path": "^1.0.0",
     "opn": "~5.1.0",
     "resolve": "^1.1.7",
-    "rxjs": "^5.5.6",
+    "rxjs": "^5.5.8",
     "semver": "^5.1.0",
     "silent-error": "^1.0.0",
     "yargs-parser": "^9.0.2"
diff --git a/tests/e2e/utils/project.ts b/tests/e2e/utils/project.ts
index be841366df..ede9a5153d 100644
--- a/tests/e2e/utils/project.ts
+++ b/tests/e2e/utils/project.ts
@@ -159,7 +159,7 @@ export function useNgVersion(version: string) {
       json['devDependencies']['typescript'] = '~2.5.0';
     } else {
       json['devDependencies']['typescript'] = '~2.7.0';
-      json['dependencies']['rxjs'] = '6.0.0-beta.0';
+      json['dependencies']['rxjs'] = '6.0.0-beta.3';
     }
   });
 }