From 31b1150229da46f88fa733ef2ed7d97b2bd9b31c Mon Sep 17 00:00:00 2001
From: Jason Jean <jasonjean1993@gmail.com>
Date: Thu, 17 May 2018 01:30:15 -0400
Subject: [PATCH] fix(schematics): use migrate-only flag to skip installation
 during upgrade

---
 .../20180515-switch-to-nx6.ts                 | 19 ++++++++++++-------
 .../migrations/update-6-0-0/update-6-0-0.ts   |  3 ++-
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/packages/schematics/migrations/legacy-migrations/20180515-switch-to-nx6.ts b/packages/schematics/migrations/legacy-migrations/20180515-switch-to-nx6.ts
index 3720ff0c5d..b494b36dea 100644
--- a/packages/schematics/migrations/legacy-migrations/20180515-switch-to-nx6.ts
+++ b/packages/schematics/migrations/legacy-migrations/20180515-switch-to-nx6.ts
@@ -34,13 +34,18 @@ export default {
         execSync('npm install', { stdio: [0, 1, 2] });
       }
 
-      execSync('ng update @angular/cli --from 1.7.4 --to 6.0.1', {
-        stdio: [0, 1, 2]
-      });
-      // TODO: remove --next before releasing 6.0.0 final
-      execSync('ng update @nrwl/schematics --from 1.0.3 --to 6.0.0 --next', {
-        stdio: [0, 1, 2]
-      });
+      execSync(
+        'ng update @angular/cli --from 1.7.4 --to 6.0.1 --migrate-only',
+        {
+          stdio: [0, 1, 2]
+        }
+      );
+      execSync(
+        'ng generate @schematics/update:migrate --package @nrwl/schematics --collection @nrwl/schematics/migrations/migrations.json --from 1.0.3 --to 6.0.0',
+        {
+          stdio: [0, 1, 2]
+        }
+      );
     } catch (e) {
       console.warn(stripIndents`
         The automatic upgrade to Nx 6 has failed with the following error: ${e}.
diff --git a/packages/schematics/migrations/update-6-0-0/update-6-0-0.ts b/packages/schematics/migrations/update-6-0-0/update-6-0-0.ts
index e1f39025e9..9547c69d5a 100644
--- a/packages/schematics/migrations/update-6-0-0/update-6-0-0.ts
+++ b/packages/schematics/migrations/update-6-0-0/update-6-0-0.ts
@@ -344,7 +344,8 @@ const updatePackageJson = updateJsonInTree('package.json', json => {
     '@ngrx/store': '5.2.0',
     '@ngrx/store-devtools': '5.2.0',
 
-    '@nrwl/nx': '6.0.0'
+    // todo: Change to 6.0.0 when it is released
+    '@nrwl/nx': '6.0.0-rc.3'
   };
   json.devDependencies = {
     ...json.devDependencies,