microsoftgraph · jasonjoh · Apr 15, 2020 · Mar 13, 2020 · Mar 13, 2020 · Mar 13, 2020
diff --git a/README.md b/README.md
@@ -8,19 +8,11 @@ In this lab you will create an Angular single-page application, configured with
 
 - [Angular Microsoft Graph tutorial](https://docs.microsoft.com/graph/tutorials/angular)
 
-## Demos
-
-The [Demos](demos) directory in this repository contains copies of the project that correspond to completing individual sections of the tutorial. If you just want to demo a particular section of the tutorial, you can start with the version from the previous section.
-
-- [01-create-app](demos/01-create-app): Completed [Create an Angular single-page app](https://docs.microsoft.com/graph/tutorials/angular?tutorial-step=1)
-- [02-add-aad-auth](demos/02-add-aad-auth): Completed [Add Azure AD authentication](https://docs.microsoft.com/graph/tutorials/angular?tutorial-step=3)
-- [03-add-msgraph](demos/03-add-msgraph): Completed [Get calendar data](https://docs.microsoft.com/graph/tutorials/angular?tutorial-step=4)
-
 ## Completed sample
 
 If you just want the completed sample generated by following this lab, you can find it here.
 
-- [Completed project](demos/03-add-msgraph)
+- [Completed project](demo)
 
 ## Watch the Module
 
@@ -40,6 +32,7 @@ This module has been recorded and is available in the Office Development YouTube
 
 | Version |       Date       |                     Comments                     |
 | ------- | ---------------- | ------------------------------------------------ |
+| 1.6     | March 16, 2020   | Updated sample to latest versions                |
 | 1.5     | June 18, 2019    | Updated readme to refreshed screencast recording |
 | 1.4     | May 24, 2019     | 2019Q4 content refresh                           |
 | 1.3     | May 6, 2019      | Updated AAD app registration steps               |

diff --git a/demos/03-add-msgraph/README.md → demo/README.md b/demos/03-add-msgraph/README.md → demo/README.md
@@ -4,7 +4,7 @@
 
 To run the completed project in this folder, you need the following:
 
-- [Node.js](https://nodejs.org) installed on your development machine. If you do not have Node.js, visit the previous link for download options. (**Note:** This tutorial was written with Node version 10.7.0. The steps in this guide may work with other versions, but that has not been tested.)
+- [Node.js](https://nodejs.org) installed on your development machine. If you do not have Node.js, visit the previous link for download options. (**Note:** This tutorial was written with Node version 12.16.1. The steps in this guide may work with other versions, but that has not been tested.)
 - [Angular CLI](https://cli.angular.io/) installed on your development machine.
 - Either a personal Microsoft account with a mailbox on Outlook.com, or a Microsoft work or school account.
 

diff --git a/...1-create-app/graph-tutorial/.editorconfig → demo/graph-tutorial/.editorconfig b/...1-create-app/graph-tutorial/.editorconfig → demo/graph-tutorial/.editorconfig
diff --git a/...s/01-create-app/graph-tutorial/.gitignore → demo/graph-tutorial/.gitignore b/...s/01-create-app/graph-tutorial/.gitignore → demo/graph-tutorial/.gitignore
diff --git a/demos/01-create-app/graph-tutorial/README.md → demo/graph-tutorial/README.md b/demos/01-create-app/graph-tutorial/README.md → demo/graph-tutorial/README.md
@@ -1,6 +1,6 @@
 # GraphTutorial
 
-This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 8.3.20.
+This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 9.0.6.
 
 ## Development server
 

diff --git a/...3-add-msgraph/graph-tutorial/angular.json → demo/graph-tutorial/angular.json b/...3-add-msgraph/graph-tutorial/angular.json → demo/graph-tutorial/angular.json
@@ -1,6 +1,6 @@
 {
   "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
-  "version": 1,
+  "version": 1, 
   "newProjectRoot": "projects",
   "projects": {
     "graph-tutorial": {
@@ -18,7 +18,7 @@
             "main": "src/main.ts",
             "polyfills": "src/polyfills.ts",
             "tsConfig": "tsconfig.app.json",
-            "aot": false,
+            "aot": true,
             "assets": [
               "src/favicon.ico",
               "src/assets"
@@ -41,7 +41,6 @@
               "sourceMap": false,
               "extractCss": true,
               "namedChunks": false,
-              "aot": true,
               "extractLicenses": true,
               "vendorChunk": false,
               "buildOptimizer": true,
@@ -122,4 +121,4 @@
       }
     }},
   "defaultProject": "graph-tutorial"
-}
+}
diff --git a/...01-create-app/graph-tutorial/browserslist → demo/graph-tutorial/browserslist b/...01-create-app/graph-tutorial/browserslist → demo/graph-tutorial/browserslist
diff --git a/...app/graph-tutorial/e2e/protractor.conf.js → demo/graph-tutorial/e2e/protractor.conf.js b/...app/graph-tutorial/e2e/protractor.conf.js → demo/graph-tutorial/e2e/protractor.conf.js
diff --git a/...pp/graph-tutorial/e2e/src/app.e2e-spec.ts → demo/graph-tutorial/e2e/src/app.e2e-spec.ts b/...pp/graph-tutorial/e2e/src/app.e2e-spec.ts → demo/graph-tutorial/e2e/src/app.e2e-spec.ts
diff --git a/...-msgraph/graph-tutorial/e2e/src/app.po.ts → demo/graph-tutorial/e2e/src/app.po.ts b/...-msgraph/graph-tutorial/e2e/src/app.po.ts → demo/graph-tutorial/e2e/src/app.po.ts
@@ -1,11 +1,11 @@
 import { browser, by, element } from 'protractor';
 
 export class AppPage {
-  navigateTo() {
-    return browser.get(browser.baseUrl) as Promise<any>;
+  navigateTo(): Promise<unknown> {
+    return browser.get(browser.baseUrl) as Promise<unknown>;
   }
 
-  getTitleText() {
+  getTitleText(): Promise<string> {
     return element(by.css('app-root .content span')).getText() as Promise<string>;
   }
 }
diff --git a/...eate-app/graph-tutorial/e2e/tsconfig.json → demo/graph-tutorial/e2e/tsconfig.json b/...eate-app/graph-tutorial/e2e/tsconfig.json → demo/graph-tutorial/e2e/tsconfig.json
diff --git a/...1-create-app/graph-tutorial/karma.conf.js → demo/graph-tutorial/karma.conf.js b/...1-create-app/graph-tutorial/karma.conf.js → demo/graph-tutorial/karma.conf.js