From 269d299fabfe1697931ff7199e717c6512e8f44a Mon Sep 17 00:00:00 2001
From: Vesa Juvonen <vesa.juvonen@hotmail.com>
Date: Mon, 5 Dec 2016 16:22:08 +0200
Subject: [PATCH] Updated to drop 6 and tested with online workbench

---
 .../angular-todo-webpart/config/config.json            |  3 ++-
 .../angular-todo-webpart/config/tslint.json            |  3 +--
 .../angular-todo-webpart/package.json                  | 10 +++++-----
 .../src/webparts/toDo/ToDoWebPart.manifest.json        |  1 +
 .../src/webparts/toDo/ToDoWebPart.ts                   |  2 +-
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/samples/angular-migration/angular-todo-webpart/config/config.json b/samples/angular-migration/angular-todo-webpart/config/config.json
index 655e413c5..bdfdca06f 100755
--- a/samples/angular-migration/angular-todo-webpart/config/config.json
+++ b/samples/angular-migration/angular-todo-webpart/config/config.json
@@ -7,8 +7,9 @@
     }
   ],
   "externals": {
+    "@microsoft/sp-module-loader": "node_modules/@microsoft/sp-module-loader/dist/sp-module-loader.js",
     "@microsoft/sp-client-base": "node_modules/@microsoft/sp-client-base/dist/sp-client-base.js",
-    "@microsoft/sp-client-preview": "node_modules/@microsoft/sp-client-preview/dist/sp-client-preview.js",
+    "@microsoft/sp-webpart-base": "node_modules/@microsoft/sp-webpart-base/dist/sp-webpart-base.js",
     "@microsoft/sp-lodash-subset": "node_modules/@microsoft/sp-lodash-subset/dist/sp-lodash-subset.js",
     "office-ui-fabric-react": "node_modules/office-ui-fabric-react/dist/office-ui-fabric-react.js",
     "react": "node_modules/react/dist/react.min.js",
diff --git a/samples/angular-migration/angular-todo-webpart/config/tslint.json b/samples/angular-migration/angular-todo-webpart/config/tslint.json
index bf3362c87..0010b6105 100755
--- a/samples/angular-migration/angular-todo-webpart/config/tslint.json
+++ b/samples/angular-migration/angular-todo-webpart/config/tslint.json
@@ -44,8 +44,7 @@
       "valid-typeof": true,
       "variable-name": false,
       "whitespace": false,
-      "prefer-const": true,
-      "a11y-role": true
+      "prefer-const": true
     }
   }
 }
\ No newline at end of file
diff --git a/samples/angular-migration/angular-todo-webpart/package.json b/samples/angular-migration/angular-todo-webpart/package.json
index f6d4cdedc..b28922029 100755
--- a/samples/angular-migration/angular-todo-webpart/package.json
+++ b/samples/angular-migration/angular-todo-webpart/package.json
@@ -6,13 +6,13 @@
     "node": ">=0.10.0"
   },
   "dependencies": {
-    "@microsoft/sp-client-base": "~0.4.0",
-    "@microsoft/sp-client-preview": "~0.5.0"
+    "@microsoft/sp-client-base": "~0.5.1",
+    "@microsoft/sp-webpart-base": "~0.2.1"
   },
   "devDependencies": {
-    "@microsoft/sp-build-web": "~0.7.0",
-    "@microsoft/sp-module-interfaces": "~0.4.0",
-    "@microsoft/sp-webpart-workbench": "~0.5.0",
+    "@microsoft/sp-build-web": "~0.8.1",
+    "@microsoft/sp-module-interfaces": "~0.5.1",
+    "@microsoft/sp-webpart-workbench": "~0.6.1",
     "@types/angular": "^1.5.16",
     "gulp": "~3.9.1"
   },
diff --git a/samples/angular-migration/angular-todo-webpart/src/webparts/toDo/ToDoWebPart.manifest.json b/samples/angular-migration/angular-todo-webpart/src/webparts/toDo/ToDoWebPart.manifest.json
index 5789dab66..59ecb691a 100755
--- a/samples/angular-migration/angular-todo-webpart/src/webparts/toDo/ToDoWebPart.manifest.json
+++ b/samples/angular-migration/angular-todo-webpart/src/webparts/toDo/ToDoWebPart.manifest.json
@@ -2,6 +2,7 @@
   "$schema": "../../../node_modules/@microsoft/sp-module-interfaces/lib/manifestSchemas/jsonSchemas/clientSideComponentManifestSchema.json",
 
   "id": "56d31bd5-3965-4f6a-9c08-bedf6f52e587",
+  "alias": "ToDoWebPartAngularMigration", 
   "componentType": "WebPart",
   "version": "0.0.1",
   "manifestVersion": 2,
diff --git a/samples/angular-migration/angular-todo-webpart/src/webparts/toDo/ToDoWebPart.ts b/samples/angular-migration/angular-todo-webpart/src/webparts/toDo/ToDoWebPart.ts
index 6002a1a4a..7e6c25c40 100755
--- a/samples/angular-migration/angular-todo-webpart/src/webparts/toDo/ToDoWebPart.ts
+++ b/samples/angular-migration/angular-todo-webpart/src/webparts/toDo/ToDoWebPart.ts
@@ -4,7 +4,7 @@ import {
   IWebPartContext,
   PropertyPaneTextField,
   PropertyPaneToggle
-} from '@microsoft/sp-client-preview';
+} from '@microsoft/sp-webpart-base';
 
 import styles from './ToDo.module.scss';
 import * as strings from 'toDoStrings';