diff --git a/samples/features/json/angularjs/dotnet-tour-of-heroes/appsettings.json b/samples/features/json/angularjs/dotnet-tour-of-heroes/appsettings.json
index 9d1e463e..189799a3 100644
--- a/samples/features/json/angularjs/dotnet-tour-of-heroes/appsettings.json
+++ b/samples/features/json/angularjs/dotnet-tour-of-heroes/appsettings.json
@@ -8,6 +8,6 @@
     }
   },
   "ConnectionStrings": {
-    "HeroDb": "Server=.\\SQLEXPRESS;Database=HeroDb;Integrated Security=true"
+    "HeroDb": "Server=.;Database=HeroDb;Integrated Security=true"
   }
 }
diff --git a/samples/features/json/angularjs/dotnet-tour-of-heroes/dotnet-tour-of-heroes.csproj b/samples/features/json/angularjs/dotnet-tour-of-heroes/dotnet-tour-of-heroes.csproj
index def83e94..01c9aef8 100644
--- a/samples/features/json/angularjs/dotnet-tour-of-heroes/dotnet-tour-of-heroes.csproj
+++ b/samples/features/json/angularjs/dotnet-tour-of-heroes/dotnet-tour-of-heroes.csproj
@@ -1,12 +1,11 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp1.0;net46</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1;net46</TargetFrameworks>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <AssemblyName>dotnet-tour-of-heroes</AssemblyName>
     <OutputType>Exe</OutputType>
     <PackageId>dotnet-tour-of-heroes</PackageId>
-    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">1.0.4</RuntimeFrameworkVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/app-routing.module.js b/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/app-routing.module.js
index 984eb50d..20b71faa 100644
--- a/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/app-routing.module.js
+++ b/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/app-routing.module.js
@@ -5,6 +5,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var core_1 = require("@angular/core");
 var router_1 = require("@angular/router");
 var dashboard_component_1 = require("./dashboard.component");
@@ -29,17 +30,17 @@ var routes = [
         component: heroes_component_1.HeroesComponent
     }
 ];
-var AppRoutingModule = (function () {
+var AppRoutingModule = /** @class */ (function () {
     function AppRoutingModule() {
     }
+    AppRoutingModule = __decorate([
+        core_1.NgModule({
+            imports: [router_1.RouterModule.forRoot(routes)],
+            exports: [router_1.RouterModule]
+        })
+    ], AppRoutingModule);
     return AppRoutingModule;
 }());
-AppRoutingModule = __decorate([
-    core_1.NgModule({
-        imports: [router_1.RouterModule.forRoot(routes)],
-        exports: [router_1.RouterModule]
-    })
-], AppRoutingModule);
 exports.AppRoutingModule = AppRoutingModule;
 exports.routedComponents = [dashboard_component_1.DashboardComponent, heroes_component_1.HeroesComponent, hero_detail_component_1.HeroDetailComponent];
 //# sourceMappingURL=app-routing.module.js.map
\ No newline at end of file
diff --git a/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/app-routing.module.js.map b/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/app-routing.module.js.map
index 701a495e..dbea0a11 100644
--- a/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/app-routing.module.js.map
+++ b/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/app-routing.module.js.map
@@ -1 +1 @@
-{"version":3,"file":"app-routing.module.js","sourceRoot":"","sources":["app-routing.module.ts"],"names":[],"mappings":";;;;;;;AAAA,sCAAyC;AACzC,0CAAuD;AAEvD,6DAA2D;AAC3D,uDAAqD;AACrD,iEAA8D;AAE9D,IAAM,MAAM,GAAW;IACrB;QACE,IAAI,EAAE,EAAE;QACR,UAAU,EAAE,YAAY;QACxB,SAAS,EAAE,MAAM;KAClB;IACD;QACE,IAAI,EAAE,WAAW;QACjB,SAAS,EAAE,wCAAkB;KAC9B;IACD;QACE,IAAI,EAAE,YAAY;QAClB,SAAS,EAAE,2CAAmB;KAC/B;IACD;QACE,IAAI,EAAE,QAAQ;QACd,SAAS,EAAE,kCAAe;KAC3B;CACF,CAAC;AAMF,IAAa,gBAAgB;IAA7B;IAAgC,CAAC;IAAD,uBAAC;AAAD,CAAC,AAAjC,IAAiC;AAApB,gBAAgB;IAJ5B,eAAQ,CAAC;QACR,OAAO,EAAE,CAAC,qBAAY,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACvC,OAAO,EAAE,CAAC,qBAAY,CAAC;KACxB,CAAC;GACW,gBAAgB,CAAI;AAApB,4CAAgB;AAEhB,QAAA,gBAAgB,GAAG,CAAC,wCAAkB,EAAE,kCAAe,EAAE,2CAAmB,CAAC,CAAC"}
\ No newline at end of file
+{"version":3,"file":"app-routing.module.js","sourceRoot":"","sources":["app-routing.module.ts"],"names":[],"mappings":";;;;;;;;AAAA,sCAAyC;AACzC,0CAAuD;AAEvD,6DAA2D;AAC3D,uDAAqD;AACrD,iEAA8D;AAE9D,IAAM,MAAM,GAAW;IACrB;QACE,IAAI,EAAE,EAAE;QACR,UAAU,EAAE,YAAY;QACxB,SAAS,EAAE,MAAM;KAClB;IACD;QACE,IAAI,EAAE,WAAW;QACjB,SAAS,EAAE,wCAAkB;KAC9B;IACD;QACE,IAAI,EAAE,YAAY;QAClB,SAAS,EAAE,2CAAmB;KAC/B;IACD;QACE,IAAI,EAAE,QAAQ;QACd,SAAS,EAAE,kCAAe;KAC3B;CACF,CAAC;AAMF;IAAA;IAAgC,CAAC;IAApB,gBAAgB;QAJ5B,eAAQ,CAAC;YACR,OAAO,EAAE,CAAC,qBAAY,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YACvC,OAAO,EAAE,CAAC,qBAAY,CAAC;SACxB,CAAC;OACW,gBAAgB,CAAI;IAAD,uBAAC;CAAA,AAAjC,IAAiC;AAApB,4CAAgB;AAEhB,QAAA,gBAAgB,GAAG,CAAC,wCAAkB,EAAE,kCAAe,EAAE,2CAAmB,CAAC,CAAC"}
\ No newline at end of file
diff --git a/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/app.component.js b/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/app.component.js
index 2dd8ecf6..49278c07 100644
--- a/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/app.component.js
+++ b/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/app.component.js
@@ -5,20 +5,21 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var core_1 = require("@angular/core");
-var AppComponent = (function () {
+var AppComponent = /** @class */ (function () {
     function AppComponent() {
         this.title = 'Tour of Heroes';
     }
+    AppComponent = __decorate([
+        core_1.Component({
+            moduleId: module.id,
+            selector: 'my-app',
+            template: "\n    <h1>{{title}}</h1>\n    <div class=\"header-bar\"></div>\n    <nav>\n      <a routerLink=\"/dashboard\" routerLinkActive=\"active\">Dashboard</a>\n      <a routerLink=\"/heroes\" routerLinkActive=\"active\">Heroes</a>\n    </nav>\n    <router-outlet></router-outlet>\n  ",
+            styleUrls: ['app.component.css']
+        })
+    ], AppComponent);
     return AppComponent;
 }());
-AppComponent = __decorate([
-    core_1.Component({
-        moduleId: module.id,
-        selector: 'my-app',
-        template: "\n    <h1>{{title}}</h1>\n    <div class=\"header-bar\"></div>\n    <nav>\n      <a routerLink=\"/dashboard\" routerLinkActive=\"active\">Dashboard</a>\n      <a routerLink=\"/heroes\" routerLinkActive=\"active\">Heroes</a>\n    </nav>\n    <router-outlet></router-outlet>\n  ",
-        styleUrls: ['app.component.css']
-    })
-], AppComponent);
 exports.AppComponent = AppComponent;
 //# sourceMappingURL=app.component.js.map
\ No newline at end of file
diff --git a/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/app.component.js.map b/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/app.component.js.map
index 0edb8ae8..6fddb844 100644
--- a/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/app.component.js.map
+++ b/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/app.component.js.map
@@ -1 +1 @@
-{"version":3,"file":"app.component.js","sourceRoot":"","sources":["app.component.ts"],"names":[],"mappings":";;;;;;;AAAA,sCAA0C;AAgB1C,IAAa,YAAY;IAdzB;QAeE,UAAK,GAAG,gBAAgB,CAAC;IAC3B,CAAC;IAAD,mBAAC;AAAD,CAAC,AAFD,IAEC;AAFY,YAAY;IAdxB,gBAAS,CAAC;QACT,QAAQ,EAAE,MAAM,CAAC,EAAE;QACnB,QAAQ,EAAE,QAAQ;QAClB,QAAQ,EAAE,sRAQT;QACD,SAAS,EAAE,CAAC,mBAAmB,CAAC;KACjC,CAAC;GACW,YAAY,CAExB;AAFY,oCAAY"}
\ No newline at end of file
+{"version":3,"file":"app.component.js","sourceRoot":"","sources":["app.component.ts"],"names":[],"mappings":";;;;;;;;AAAA,sCAA0C;AAgB1C;IAdA;QAeE,UAAK,GAAG,gBAAgB,CAAC;IAC3B,CAAC;IAFY,YAAY;QAdxB,gBAAS,CAAC;YACT,QAAQ,EAAE,MAAM,CAAC,EAAE;YACnB,QAAQ,EAAE,QAAQ;YAClB,QAAQ,EAAE,sRAQT;YACD,SAAS,EAAE,CAAC,mBAAmB,CAAC;SACjC,CAAC;OACW,YAAY,CAExB;IAAD,mBAAC;CAAA,AAFD,IAEC;AAFY,oCAAY"}
\ No newline at end of file
diff --git a/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/app.module.js b/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/app.module.js
index 1edc79bb..3d424aa2 100644
--- a/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/app.module.js
+++ b/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/app.module.js
@@ -5,6 +5,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var core_1 = require("@angular/core");
 var platform_browser_1 = require("@angular/platform-browser");
 var forms_1 = require("@angular/forms");
@@ -16,29 +17,30 @@ var app_component_1 = require("./app.component");
 var app_routing_module_1 = require("./app-routing.module");
 var hero_service_1 = require("./hero.service");
 var hero_search_component_1 = require("./hero-search.component");
-var AppModule = (function () {
+var AppModule = /** @class */ (function () {
     function AppModule() {
     }
+    AppModule = __decorate([
+        core_1.NgModule({
+            imports: [
+                platform_browser_1.BrowserModule,
+                forms_1.FormsModule,
+                app_routing_module_1.AppRoutingModule,
+                http_1.HttpModule //,
+                //InMemoryWebApiModule.forRoot(InMemoryDataService, { delay: 600 })
+            ],
+            declarations: [
+                app_component_1.AppComponent,
+                hero_search_component_1.HeroSearchComponent,
+                app_routing_module_1.routedComponents
+            ],
+            providers: [
+                hero_service_1.HeroService
+            ],
+            bootstrap: [app_component_1.AppComponent]
+        })
+    ], AppModule);
     return AppModule;
 }());
-AppModule = __decorate([
-    core_1.NgModule({
-        imports: [
-            platform_browser_1.BrowserModule,
-            forms_1.FormsModule,
-            app_routing_module_1.AppRoutingModule,
-            http_1.HttpModule //,
-        ],
-        declarations: [
-            app_component_1.AppComponent,
-            hero_search_component_1.HeroSearchComponent,
-            app_routing_module_1.routedComponents
-        ],
-        providers: [
-            hero_service_1.HeroService
-        ],
-        bootstrap: [app_component_1.AppComponent]
-    })
-], AppModule);
 exports.AppModule = AppModule;
 //# sourceMappingURL=app.module.js.map
\ No newline at end of file
diff --git a/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/app.module.js.map b/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/app.module.js.map
index bc1787aa..e4e3674b 100644
--- a/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/app.module.js.map
+++ b/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/app.module.js.map
@@ -1 +1 @@
-{"version":3,"file":"app.module.js","sourceRoot":"","sources":["app.module.ts"],"names":[],"mappings":";;;;;;;AAAA,sCAAyC;AACzC,8DAA0D;AAC1D,wCAA6C;AAC7C,sCAA2C;AAE3C,mEAAmE;AACnE,iEAAiE;AAEjE,6BAA2B;AAC3B,iDAA+C;AAC/C,2DAA0E;AAC1E,+CAA6C;AAC7C,iEAA8D;AAoB9D,IAAa,SAAS;IAAtB;IAAyB,CAAC;IAAD,gBAAC;AAAD,CAAC,AAA1B,IAA0B;AAAb,SAAS;IAlBrB,eAAQ,CAAC;QACR,OAAO,EAAE;YACP,gCAAa;YACb,mBAAW;YACX,qCAAgB;YAChB,iBAAU,CAAA,GAAG;SAEd;QACD,YAAY,EAAE;YACZ,4BAAY;YACZ,2CAAmB;YACnB,qCAAgB;SACjB;QACD,SAAS,EAAE;YACT,0BAAW;SACZ;QACD,SAAS,EAAE,CAAC,4BAAY,CAAC;KAC1B,CAAC;GACW,SAAS,CAAI;AAAb,8BAAS"}
\ No newline at end of file
+{"version":3,"file":"app.module.js","sourceRoot":"","sources":["app.module.ts"],"names":[],"mappings":";;;;;;;;AAAA,sCAAyC;AACzC,8DAA0D;AAC1D,wCAA6C;AAC7C,sCAA2C;AAE3C,mEAAmE;AACnE,iEAAiE;AAEjE,6BAA2B;AAC3B,iDAA+C;AAC/C,2DAA0E;AAC1E,+CAA6C;AAC7C,iEAA8D;AAoB9D;IAAA;IAAyB,CAAC;IAAb,SAAS;QAlBrB,eAAQ,CAAC;YACR,OAAO,EAAE;gBACP,gCAAa;gBACb,mBAAW;gBACX,qCAAgB;gBAChB,iBAAU,CAAA,GAAG;gBACb,mEAAmE;aACpE;YACD,YAAY,EAAE;gBACZ,4BAAY;gBACZ,2CAAmB;gBACnB,qCAAgB;aACjB;YACD,SAAS,EAAE;gBACT,0BAAW;aACZ;YACD,SAAS,EAAE,CAAC,4BAAY,CAAC;SAC1B,CAAC;OACW,SAAS,CAAI;IAAD,gBAAC;CAAA,AAA1B,IAA0B;AAAb,8BAAS"}
\ No newline at end of file
diff --git a/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/dashboard.component.js b/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/dashboard.component.js
index f5776828..00830df8 100644
--- a/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/dashboard.component.js
+++ b/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/dashboard.component.js
@@ -8,10 +8,11 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var core_1 = require("@angular/core");
 var router_1 = require("@angular/router");
 var hero_service_1 = require("./hero.service");
-var DashboardComponent = (function () {
+var DashboardComponent = /** @class */ (function () {
     function DashboardComponent(router, heroService) {
         this.router = router;
         this.heroService = heroService;
@@ -26,17 +27,17 @@ var DashboardComponent = (function () {
         var link = ['/detail', hero.id];
         this.router.navigate(link);
     };
+    DashboardComponent = __decorate([
+        core_1.Component({
+            moduleId: module.id,
+            selector: 'my-dashboard',
+            templateUrl: 'dashboard.component.html',
+            styleUrls: ['dashboard.component.css']
+        }),
+        __metadata("design:paramtypes", [router_1.Router,
+            hero_service_1.HeroService])
+    ], DashboardComponent);
     return DashboardComponent;
 }());
-DashboardComponent = __decorate([
-    core_1.Component({
-        moduleId: module.id,
-        selector: 'my-dashboard',
-        templateUrl: 'dashboard.component.html',
-        styleUrls: ['dashboard.component.css']
-    }),
-    __metadata("design:paramtypes", [router_1.Router,
-        hero_service_1.HeroService])
-], DashboardComponent);
 exports.DashboardComponent = DashboardComponent;
 //# sourceMappingURL=dashboard.component.js.map
\ No newline at end of file
diff --git a/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/dashboard.component.js.map b/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/dashboard.component.js.map
index cfb4f163..5922ad28 100644
--- a/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/dashboard.component.js.map
+++ b/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/dashboard.component.js.map
@@ -1 +1 @@
-{"version":3,"file":"dashboard.component.js","sourceRoot":"","sources":["dashboard.component.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,sCAAkD;AAClD,0CAAyC;AAGzC,+CAA6C;AAQ7C,IAAa,kBAAkB;IAG7B,4BACU,MAAc,EACd,WAAwB;QADxB,WAAM,GAAN,MAAM,CAAQ;QACd,gBAAW,GAAX,WAAW,CAAa;QAJlC,WAAM,GAAW,EAAE,CAAC;IAKpB,CAAC;IAED,qCAAQ,GAAR;QAAA,iBAGC;QAFC,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE;aACzB,IAAI,CAAC,UAAA,MAAM,IAAI,OAAA,KAAI,CAAC,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,EAAhC,CAAgC,CAAC,CAAC;IACtD,CAAC;IAED,uCAAU,GAAV,UAAW,IAAU;QACnB,IAAI,IAAI,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;QAChC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC7B,CAAC;IACH,yBAAC;AAAD,CAAC,AAjBD,IAiBC;AAjBY,kBAAkB;IAN9B,gBAAS,CAAC;QACT,QAAQ,EAAE,MAAM,CAAC,EAAE;QACnB,QAAQ,EAAE,cAAc;QACxB,WAAW,EAAE,0BAA0B;QACvC,SAAS,EAAE,CAAC,yBAAyB,CAAC;KACvC,CAAC;qCAKkB,eAAM;QACD,0BAAW;GALvB,kBAAkB,CAiB9B;AAjBY,gDAAkB"}
\ No newline at end of file
+{"version":3,"file":"dashboard.component.js","sourceRoot":"","sources":["dashboard.component.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,sCAAkD;AAClD,0CAAyC;AAGzC,+CAA6C;AAQ7C;IAGE,4BACU,MAAc,EACd,WAAwB;QADxB,WAAM,GAAN,MAAM,CAAQ;QACd,gBAAW,GAAX,WAAW,CAAa;QAJlC,WAAM,GAAW,EAAE,CAAC;IAKpB,CAAC;IAED,qCAAQ,GAAR;QAAA,iBAGC;QAFC,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE;aACzB,IAAI,CAAC,UAAA,MAAM,IAAI,OAAA,KAAI,CAAC,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,EAAhC,CAAgC,CAAC,CAAC;IACtD,CAAC;IAED,uCAAU,GAAV,UAAW,IAAU;QACnB,IAAI,IAAI,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;QAChC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC7B,CAAC;IAhBU,kBAAkB;QAN9B,gBAAS,CAAC;YACT,QAAQ,EAAE,MAAM,CAAC,EAAE;YACnB,QAAQ,EAAE,cAAc;YACxB,WAAW,EAAE,0BAA0B;YACvC,SAAS,EAAE,CAAC,yBAAyB,CAAC;SACvC,CAAC;yCAKkB,eAAM;YACD,0BAAW;OALvB,kBAAkB,CAiB9B;IAAD,yBAAC;CAAA,AAjBD,IAiBC;AAjBY,gDAAkB"}
\ No newline at end of file
diff --git a/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/hero-detail.component.js b/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/hero-detail.component.js
index 993c078b..b667991b 100644
--- a/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/hero-detail.component.js
+++ b/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/hero-detail.component.js
@@ -8,11 +8,12 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var core_1 = require("@angular/core");
 var router_1 = require("@angular/router");
 var hero_1 = require("./hero");
 var hero_service_1 = require("./hero.service");
-var HeroDetailComponent = (function () {
+var HeroDetailComponent = /** @class */ (function () {
     function HeroDetailComponent(heroService, route) {
         this.heroService = heroService;
         this.route = route;
@@ -51,25 +52,25 @@ var HeroDetailComponent = (function () {
             window.history.back();
         }
     };
+    __decorate([
+        core_1.Input(),
+        __metadata("design:type", hero_1.Hero)
+    ], HeroDetailComponent.prototype, "hero", void 0);
+    __decorate([
+        core_1.Output(),
+        __metadata("design:type", Object)
+    ], HeroDetailComponent.prototype, "close", void 0);
+    HeroDetailComponent = __decorate([
+        core_1.Component({
+            moduleId: module.id,
+            selector: 'my-hero-detail',
+            templateUrl: 'hero-detail.component.html',
+            styleUrls: ['hero-detail.component.css']
+        }),
+        __metadata("design:paramtypes", [hero_service_1.HeroService,
+            router_1.ActivatedRoute])
+    ], HeroDetailComponent);
     return HeroDetailComponent;
 }());
-__decorate([
-    core_1.Input(),
-    __metadata("design:type", hero_1.Hero)
-], HeroDetailComponent.prototype, "hero", void 0);
-__decorate([
-    core_1.Output(),
-    __metadata("design:type", Object)
-], HeroDetailComponent.prototype, "close", void 0);
-HeroDetailComponent = __decorate([
-    core_1.Component({
-        moduleId: module.id,
-        selector: 'my-hero-detail',
-        templateUrl: 'hero-detail.component.html',
-        styleUrls: ['hero-detail.component.css']
-    }),
-    __metadata("design:paramtypes", [hero_service_1.HeroService,
-        router_1.ActivatedRoute])
-], HeroDetailComponent);
 exports.HeroDetailComponent = HeroDetailComponent;
 //# sourceMappingURL=hero-detail.component.js.map
\ No newline at end of file
diff --git a/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/hero-detail.component.js.map b/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/hero-detail.component.js.map
index 61b6b975..4573f7c1 100644
--- a/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/hero-detail.component.js.map
+++ b/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/hero-detail.component.js.map
@@ -1 +1 @@
-{"version":3,"file":"hero-detail.component.js","sourceRoot":"","sources":["hero-detail.component.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,sCAA+E;AAC/E,0CAAyD;AAEzD,+BAA8B;AAC9B,+CAA6C;AAQ7C,IAAa,mBAAmB;IAM9B,6BACU,WAAwB,EACxB,KAAqB;QADrB,gBAAW,GAAX,WAAW,CAAa;QACxB,UAAK,GAAL,KAAK,CAAgB;QANrB,UAAK,GAAG,IAAI,mBAAY,EAAE,CAAC;QAErC,cAAS,GAAG,KAAK,CAAC,CAAC,yBAAyB;IAK5C,CAAC;IAED,sCAAQ,GAAR;QAAA,iBAYC;QAXC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,UAAC,MAAc;YACvC,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC;gBAC/B,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;gBACvB,KAAI,CAAC,SAAS,GAAG,IAAI,CAAC;gBACtB,KAAI,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC;qBACvB,IAAI,CAAC,UAAA,IAAI,IAAI,OAAA,KAAI,CAAC,IAAI,GAAG,IAAI,EAAhB,CAAgB,CAAC,CAAC;YACtC,CAAC;YAAC,IAAI,CAAC,CAAC;gBACN,KAAI,CAAC,SAAS,GAAG,KAAK,CAAC;gBACvB,KAAI,CAAC,IAAI,GAAG,IAAI,WAAI,EAAE,CAAC;YACzB,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,kCAAI,GAAJ;QAAA,iBAQC;QAPC,IAAI,CAAC,WAAW;aACX,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;aACf,IAAI,CAAC,UAAA,IAAI;YACR,KAAI,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC,2BAA2B;YAC7C,KAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACpB,CAAC,CAAC;aACD,KAAK,CAAC,UAAA,KAAK,IAAI,OAAA,KAAI,CAAC,KAAK,GAAG,KAAK,EAAlB,CAAkB,CAAC,CAAC,CAAC,8BAA8B;IACzE,CAAC;IAED,oCAAM,GAAN,UAAO,SAAsB;QAAtB,0BAAA,EAAA,gBAAsB;QAC3B,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC3B,EAAE,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;YAAC,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QAAC,CAAC;IAChD,CAAC;IACH,0BAAC;AAAD,CAAC,AAvCD,IAuCC;AAtCU;IAAR,YAAK,EAAE;8BAAO,WAAI;iDAAC;AACV;IAAT,aAAM,EAAE;;kDAA4B;AAF1B,mBAAmB;IAN/B,gBAAS,CAAC;QACT,QAAQ,EAAE,MAAM,CAAC,EAAE;QACnB,QAAQ,EAAE,gBAAgB;QAC1B,WAAW,EAAE,4BAA4B;QACzC,SAAS,EAAE,CAAC,2BAA2B,CAAC;KACzC,CAAC;qCAQuB,0BAAW;QACjB,uBAAc;GARpB,mBAAmB,CAuC/B;AAvCY,kDAAmB"}
\ No newline at end of file
+{"version":3,"file":"hero-detail.component.js","sourceRoot":"","sources":["hero-detail.component.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,sCAA+E;AAC/E,0CAAyD;AAEzD,+BAA8B;AAC9B,+CAA6C;AAQ7C;IAME,6BACU,WAAwB,EACxB,KAAqB;QADrB,gBAAW,GAAX,WAAW,CAAa;QACxB,UAAK,GAAL,KAAK,CAAgB;QANrB,UAAK,GAAG,IAAI,mBAAY,EAAE,CAAC;QAErC,cAAS,GAAG,KAAK,CAAC,CAAC,yBAAyB;IAK5C,CAAC;IAED,sCAAQ,GAAR;QAAA,iBAYC;QAXC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,UAAC,MAAc;YACvC,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,SAAS,EAAE;gBAC9B,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;gBACvB,KAAI,CAAC,SAAS,GAAG,IAAI,CAAC;gBACtB,KAAI,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC;qBACvB,IAAI,CAAC,UAAA,IAAI,IAAI,OAAA,KAAI,CAAC,IAAI,GAAG,IAAI,EAAhB,CAAgB,CAAC,CAAC;aACrC;iBAAM;gBACL,KAAI,CAAC,SAAS,GAAG,KAAK,CAAC;gBACvB,KAAI,CAAC,IAAI,GAAG,IAAI,WAAI,EAAE,CAAC;aACxB;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,kCAAI,GAAJ;QAAA,iBAQC;QAPC,IAAI,CAAC,WAAW;aACX,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;aACf,IAAI,CAAC,UAAA,IAAI;YACR,KAAI,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC,2BAA2B;YAC7C,KAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACpB,CAAC,CAAC;aACD,KAAK,CAAC,UAAA,KAAK,IAAI,OAAA,KAAI,CAAC,KAAK,GAAG,KAAK,EAAlB,CAAkB,CAAC,CAAC,CAAC,8BAA8B;IACzE,CAAC;IAED,oCAAM,GAAN,UAAO,SAAsB;QAAtB,0BAAA,EAAA,gBAAsB;QAC3B,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC3B,IAAI,IAAI,CAAC,SAAS,EAAE;YAAE,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;SAAE;IAChD,CAAC;IArCQ;QAAR,YAAK,EAAE;kCAAO,WAAI;qDAAC;IACV;QAAT,aAAM,EAAE;;sDAA4B;IAF1B,mBAAmB;QAN/B,gBAAS,CAAC;YACT,QAAQ,EAAE,MAAM,CAAC,EAAE;YACnB,QAAQ,EAAE,gBAAgB;YAC1B,WAAW,EAAE,4BAA4B;YACzC,SAAS,EAAE,CAAC,2BAA2B,CAAC;SACzC,CAAC;yCAQuB,0BAAW;YACjB,uBAAc;OARpB,mBAAmB,CAuC/B;IAAD,0BAAC;CAAA,AAvCD,IAuCC;AAvCY,kDAAmB"}
\ No newline at end of file
diff --git a/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/hero-search.component.js b/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/hero-search.component.js
index 9609e993..a5b68a44 100644
--- a/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/hero-search.component.js
+++ b/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/hero-search.component.js
@@ -8,12 +8,13 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var core_1 = require("@angular/core");
 var router_1 = require("@angular/router");
 var Observable_1 = require("rxjs/Observable");
 var Subject_1 = require("rxjs/Subject");
 var hero_search_service_1 = require("./hero-search.service");
-var HeroSearchComponent = (function () {
+var HeroSearchComponent = /** @class */ (function () {
     function HeroSearchComponent(heroSearchService, router) {
         this.heroSearchService = heroSearchService;
         this.router = router;
@@ -29,7 +30,9 @@ var HeroSearchComponent = (function () {
             .debounceTime(300) // wait for 300ms pause in events
             .distinctUntilChanged() // ignore if next search term is same as previous
             .switchMap(function (term) { return term // switch to new observable each time
+            // return the http search observable
             ? _this.heroSearchService.search(term)
+            // or the observable of empty heroes if no search term
             : Observable_1.Observable.of([]); })
             .catch(function (error) {
             // TODO: real error handling
@@ -41,18 +44,18 @@ var HeroSearchComponent = (function () {
         var link = ['/detail', hero.id];
         this.router.navigate(link);
     };
+    HeroSearchComponent = __decorate([
+        core_1.Component({
+            moduleId: module.id,
+            selector: 'hero-search',
+            templateUrl: 'hero-search.component.html',
+            styleUrls: ['hero-search.component.css'],
+            providers: [hero_search_service_1.HeroSearchService]
+        }),
+        __metadata("design:paramtypes", [hero_search_service_1.HeroSearchService,
+            router_1.Router])
+    ], HeroSearchComponent);
     return HeroSearchComponent;
 }());
-HeroSearchComponent = __decorate([
-    core_1.Component({
-        moduleId: module.id,
-        selector: 'hero-search',
-        templateUrl: 'hero-search.component.html',
-        styleUrls: ['hero-search.component.css'],
-        providers: [hero_search_service_1.HeroSearchService]
-    }),
-    __metadata("design:paramtypes", [hero_search_service_1.HeroSearchService,
-        router_1.Router])
-], HeroSearchComponent);
 exports.HeroSearchComponent = HeroSearchComponent;
 //# sourceMappingURL=hero-search.component.js.map
\ No newline at end of file
diff --git a/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/hero-search.component.js.map b/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/hero-search.component.js.map
index dadaf299..0f933d3a 100644
--- a/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/hero-search.component.js.map
+++ b/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/hero-search.component.js.map
@@ -1 +1 @@
-{"version":3,"file":"hero-search.component.js","sourceRoot":"","sources":["hero-search.component.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,sCAAkD;AAClD,0CAAyC;AACzC,8CAA6C;AAC7C,wCAAuC;AAEvC,6DAA0D;AAU1D,IAAa,mBAAmB;IAI9B,6BACU,iBAAoC,EACpC,MAAc;QADd,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,WAAM,GAAN,MAAM,CAAQ;QAJhB,gBAAW,GAAG,IAAI,iBAAO,EAAU,CAAC;IAIhB,CAAC;IAE7B,oCAAM,GAAN,UAAO,IAAY;QACjB,iDAAiD;QACjD,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC9B,CAAC;IAED,sCAAQ,GAAR;QAAA,iBAcC;QAbC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,WAAW;aAC3B,YAAY,CAAC,GAAG,CAAC,CAAQ,iCAAiC;aAC1D,oBAAoB,EAAE,CAAG,iDAAiD;aAC1E,SAAS,CAAC,UAAA,IAAI,IAAI,OAAA,IAAI,CAAG,qCAAqC;cAE3D,KAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC;cAEnC,uBAAU,CAAC,EAAE,CAAS,EAAE,CAAC,EAJV,CAIU,CAAC;aAC7B,KAAK,CAAC,UAAA,KAAK;YACV,4BAA4B;YAC5B,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YACnB,MAAM,CAAC,uBAAU,CAAC,EAAE,CAAS,EAAE,CAAC,CAAC;QACnC,CAAC,CAAC,CAAC;IACP,CAAC;IAED,wCAAU,GAAV,UAAW,IAAU;QACnB,IAAI,IAAI,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;QAChC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC7B,CAAC;IACH,0BAAC;AAAD,CAAC,AAjCD,IAiCC;AAjCY,mBAAmB;IAP/B,gBAAS,CAAC;QACT,QAAQ,EAAE,MAAM,CAAC,EAAE;QACnB,QAAQ,EAAE,aAAa;QACvB,WAAW,EAAE,4BAA4B;QACzC,SAAS,EAAE,CAAC,2BAA2B,CAAC;QACxC,SAAS,EAAE,CAAC,uCAAiB,CAAC;KAC/B,CAAC;qCAM6B,uCAAiB;QAC5B,eAAM;GANb,mBAAmB,CAiC/B;AAjCY,kDAAmB"}
\ No newline at end of file
+{"version":3,"file":"hero-search.component.js","sourceRoot":"","sources":["hero-search.component.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,sCAAkD;AAClD,0CAAyC;AACzC,8CAA6C;AAC7C,wCAAuC;AAEvC,6DAA0D;AAU1D;IAIE,6BACU,iBAAoC,EACpC,MAAc;QADd,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,WAAM,GAAN,MAAM,CAAQ;QAJhB,gBAAW,GAAG,IAAI,iBAAO,EAAU,CAAC;IAIhB,CAAC;IAE7B,oCAAM,GAAN,UAAO,IAAY;QACjB,iDAAiD;QACjD,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC9B,CAAC;IAED,sCAAQ,GAAR;QAAA,iBAcC;QAbC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,WAAW;aAC3B,YAAY,CAAC,GAAG,CAAC,CAAQ,iCAAiC;aAC1D,oBAAoB,EAAE,CAAG,iDAAiD;aAC1E,SAAS,CAAC,UAAA,IAAI,IAAI,OAAA,IAAI,CAAG,qCAAqC;YAC7D,oCAAoC;YACpC,CAAC,CAAC,KAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC;YACrC,sDAAsD;YACtD,CAAC,CAAC,uBAAU,CAAC,EAAE,CAAS,EAAE,CAAC,EAJV,CAIU,CAAC;aAC7B,KAAK,CAAC,UAAA,KAAK;YACV,4BAA4B;YAC5B,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YACnB,OAAO,uBAAU,CAAC,EAAE,CAAS,EAAE,CAAC,CAAC;QACnC,CAAC,CAAC,CAAC;IACP,CAAC;IAED,wCAAU,GAAV,UAAW,IAAU;QACnB,IAAI,IAAI,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;QAChC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC7B,CAAC;IAhCU,mBAAmB;QAP/B,gBAAS,CAAC;YACT,QAAQ,EAAE,MAAM,CAAC,EAAE;YACnB,QAAQ,EAAE,aAAa;YACvB,WAAW,EAAE,4BAA4B;YACzC,SAAS,EAAE,CAAC,2BAA2B,CAAC;YACxC,SAAS,EAAE,CAAC,uCAAiB,CAAC;SAC/B,CAAC;yCAM6B,uCAAiB;YAC5B,eAAM;OANb,mBAAmB,CAiC/B;IAAD,0BAAC;CAAA,AAjCD,IAiCC;AAjCY,kDAAmB"}
\ No newline at end of file
diff --git a/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/hero-search.service.js b/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/hero-search.service.js
index da37276f..da23b265 100644
--- a/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/hero-search.service.js
+++ b/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/hero-search.service.js
@@ -8,9 +8,10 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var core_1 = require("@angular/core");
 var http_1 = require("@angular/http");
-var HeroSearchService = (function () {
+var HeroSearchService = /** @class */ (function () {
     function HeroSearchService(http) {
         this.http = http;
     }
@@ -19,11 +20,11 @@ var HeroSearchService = (function () {
             .get("app/heroes/?name=" + term)
             .map(function (r) { return r.json(); });
     };
+    HeroSearchService = __decorate([
+        core_1.Injectable(),
+        __metadata("design:paramtypes", [http_1.Http])
+    ], HeroSearchService);
     return HeroSearchService;
 }());
-HeroSearchService = __decorate([
-    core_1.Injectable(),
-    __metadata("design:paramtypes", [http_1.Http])
-], HeroSearchService);
 exports.HeroSearchService = HeroSearchService;
 //# sourceMappingURL=hero-search.service.js.map
\ No newline at end of file
diff --git a/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/hero-search.service.js.map b/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/hero-search.service.js.map
index c3bf56e8..d972b7b8 100644
--- a/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/hero-search.service.js.map
+++ b/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/hero-search.service.js.map
@@ -1 +1 @@
-{"version":3,"file":"hero-search.service.js","sourceRoot":"","sources":["hero-search.service.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,sCAA2C;AAC3C,sCAA+C;AAM/C,IAAa,iBAAiB;IAC5B,2BAAoB,IAAU;QAAV,SAAI,GAAJ,IAAI,CAAM;IAAI,CAAC;IAEnC,kCAAM,GAAN,UAAO,IAAY;QACjB,MAAM,CAAC,IAAI,CAAC,IAAI;aACb,GAAG,CAAC,sBAAoB,IAAM,CAAC;aAC/B,GAAG,CAAC,UAAC,CAAW,IAAK,OAAA,CAAC,CAAC,IAAI,EAAY,EAAlB,CAAkB,CAAC,CAAC;IAC9C,CAAC;IACH,wBAAC;AAAD,CAAC,AARD,IAQC;AARY,iBAAiB;IAD7B,iBAAU,EAAE;qCAEe,WAAI;GADnB,iBAAiB,CAQ7B;AARY,8CAAiB"}
\ No newline at end of file
+{"version":3,"file":"hero-search.service.js","sourceRoot":"","sources":["hero-search.service.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,sCAA2C;AAC3C,sCAA+C;AAM/C;IACE,2BAAoB,IAAU;QAAV,SAAI,GAAJ,IAAI,CAAM;IAAI,CAAC;IAEnC,kCAAM,GAAN,UAAO,IAAY;QACjB,OAAO,IAAI,CAAC,IAAI;aACb,GAAG,CAAC,sBAAoB,IAAM,CAAC;aAC/B,GAAG,CAAC,UAAC,CAAW,IAAK,OAAA,CAAC,CAAC,IAAI,EAAY,EAAlB,CAAkB,CAAC,CAAC;IAC9C,CAAC;IAPU,iBAAiB;QAD7B,iBAAU,EAAE;yCAEe,WAAI;OADnB,iBAAiB,CAQ7B;IAAD,wBAAC;CAAA,AARD,IAQC;AARY,8CAAiB"}
\ No newline at end of file
diff --git a/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/hero.js b/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/hero.js
index e0d68eb2..fdae9ce8 100644
--- a/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/hero.js
+++ b/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/hero.js
@@ -1,5 +1,6 @@
 "use strict";
-var Hero = (function () {
+Object.defineProperty(exports, "__esModule", { value: true });
+var Hero = /** @class */ (function () {
     function Hero() {
     }
     return Hero;
diff --git a/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/hero.js.map b/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/hero.js.map
index 73fd7335..d84dacc3 100644
--- a/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/hero.js.map
+++ b/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/hero.js.map
@@ -1 +1 @@
-{"version":3,"file":"hero.js","sourceRoot":"","sources":["hero.ts"],"names":[],"mappings":";AAAA;IAAA;IAGA,CAAC;IAAD,WAAC;AAAD,CAAC,AAHD,IAGC;AAHY,oBAAI"}
\ No newline at end of file
+{"version":3,"file":"hero.js","sourceRoot":"","sources":["hero.ts"],"names":[],"mappings":";;AAAA;IAAA;IAGA,CAAC;IAAD,WAAC;AAAD,CAAC,AAHD,IAGC;AAHY,oBAAI"}
\ No newline at end of file
diff --git a/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/hero.service.js b/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/hero.service.js
index 6e178e73..de83e3a0 100644
--- a/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/hero.service.js
+++ b/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/hero.service.js
@@ -8,10 +8,11 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var core_1 = require("@angular/core");
 var http_1 = require("@angular/http");
 require("rxjs/add/operator/toPromise");
-var HeroService = (function () {
+var HeroService = /** @class */ (function () {
     function HeroService(http) {
         this.http = http;
         this.heroesUrl = 'app/heroes'; // URL to web api
@@ -71,11 +72,11 @@ var HeroService = (function () {
         console.error('An error occurred', error);
         return Promise.reject(error.message || error);
     };
+    HeroService = __decorate([
+        core_1.Injectable(),
+        __metadata("design:paramtypes", [http_1.Http])
+    ], HeroService);
     return HeroService;
 }());
-HeroService = __decorate([
-    core_1.Injectable(),
-    __metadata("design:paramtypes", [http_1.Http])
-], HeroService);
 exports.HeroService = HeroService;
 //# sourceMappingURL=hero.service.js.map
\ No newline at end of file
diff --git a/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/hero.service.js.map b/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/hero.service.js.map
index 8ef43996..d6a69d93 100644
--- a/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/hero.service.js.map
+++ b/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/hero.service.js.map
@@ -1 +1 @@
-{"version":3,"file":"hero.service.js","sourceRoot":"","sources":["hero.service.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"hero.service.js","sourceRoot":"","sources":["hero.service.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/heroes.component.js b/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/heroes.component.js
index 99db44ec..03352b8b 100644
--- a/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/heroes.component.js
+++ b/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/heroes.component.js
@@ -8,10 +8,11 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var core_1 = require("@angular/core");
 var router_1 = require("@angular/router");
 var hero_service_1 = require("./hero.service");
-var HeroesComponent = (function () {
+var HeroesComponent = /** @class */ (function () {
     function HeroesComponent(router, heroService) {
         this.router = router;
         this.heroService = heroService;
@@ -57,17 +58,17 @@ var HeroesComponent = (function () {
     HeroesComponent.prototype.gotoDetail = function () {
         this.router.navigate(['/detail', this.selectedHero.id]);
     };
+    HeroesComponent = __decorate([
+        core_1.Component({
+            moduleId: module.id,
+            selector: 'my-heroes',
+            templateUrl: 'heroes.component.html',
+            styleUrls: ['heroes.component.css']
+        }),
+        __metadata("design:paramtypes", [router_1.Router,
+            hero_service_1.HeroService])
+    ], HeroesComponent);
     return HeroesComponent;
 }());
-HeroesComponent = __decorate([
-    core_1.Component({
-        moduleId: module.id,
-        selector: 'my-heroes',
-        templateUrl: 'heroes.component.html',
-        styleUrls: ['heroes.component.css']
-    }),
-    __metadata("design:paramtypes", [router_1.Router,
-        hero_service_1.HeroService])
-], HeroesComponent);
 exports.HeroesComponent = HeroesComponent;
 //# sourceMappingURL=heroes.component.js.map
\ No newline at end of file
diff --git a/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/heroes.component.js.map b/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/heroes.component.js.map
index f61fd2b6..06f9d0d1 100644
--- a/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/heroes.component.js.map
+++ b/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/heroes.component.js.map
@@ -1 +1 @@
-{"version":3,"file":"heroes.component.js","sourceRoot":"","sources":["heroes.component.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,sCAAkD;AAClD,0CAAyC;AAGzC,+CAA6C;AAQ7C,IAAa,eAAe;IAM1B,yBACU,MAAc,EACd,WAAwB;QADxB,WAAM,GAAN,MAAM,CAAQ;QACd,gBAAW,GAAX,WAAW,CAAa;QALlC,eAAU,GAAG,KAAK,CAAC;IAKmB,CAAC;IAEvC,mCAAS,GAAT;QAAA,iBAKC;QAJC,IAAI,CAAC,WAAW;aACb,SAAS,EAAE;aACX,IAAI,CAAC,UAAA,MAAM,IAAI,OAAA,KAAI,CAAC,MAAM,GAAG,MAAM,EAApB,CAAoB,CAAC;aACpC,KAAK,CAAC,UAAA,KAAK,IAAI,OAAA,KAAI,CAAC,KAAK,GAAG,KAAK,EAAlB,CAAkB,CAAC,CAAC;IACxC,CAAC;IAED,iCAAO,GAAP;QACE,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACvB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;IAC3B,CAAC;IAED,+BAAK,GAAL,UAAM,SAAe;QACnB,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;QACxB,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;YAAC,IAAI,CAAC,SAAS,EAAE,CAAC;QAAC,CAAC;IACtC,CAAC;IAED,oCAAU,GAAV,UAAW,IAAU,EAAE,KAAU;QAAjC,iBASC;QARC,KAAK,CAAC,eAAe,EAAE,CAAC;QACxB,IAAI,CAAC,WAAW;aACb,MAAM,CAAC,IAAI,CAAC;aACZ,IAAI,CAAC,UAAA,GAAG;YACP,KAAI,CAAC,MAAM,GAAG,KAAI,CAAC,MAAM,CAAC,MAAM,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,KAAK,IAAI,EAAV,CAAU,CAAC,CAAC;YAClD,EAAE,CAAC,CAAC,KAAI,CAAC,YAAY,KAAK,IAAI,CAAC,CAAC,CAAC;gBAAC,KAAI,CAAC,YAAY,GAAG,IAAI,CAAC;YAAC,CAAC;QAC/D,CAAC,CAAC;aACD,KAAK,CAAC,UAAA,KAAK,IAAI,OAAA,KAAI,CAAC,KAAK,GAAG,KAAK,EAAlB,CAAkB,CAAC,CAAC;IACxC,CAAC;IAED,kCAAQ,GAAR;QACE,IAAI,CAAC,SAAS,EAAE,CAAC;IACnB,CAAC;IAED,kCAAQ,GAAR,UAAS,IAAU;QACjB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QACzB,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;IAC1B,CAAC;IAED,oCAAU,GAAV;QACE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,EAAE,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1D,CAAC;IACH,sBAAC;AAAD,CAAC,AAlDD,IAkDC;AAlDY,eAAe;IAN3B,gBAAS,CAAC;QACT,QAAQ,EAAE,MAAM,CAAC,EAAE;QACnB,QAAQ,EAAE,WAAW;QACrB,WAAW,EAAE,uBAAuB;QACpC,SAAS,EAAE,CAAC,sBAAsB,CAAC;KACpC,CAAC;qCAQkB,eAAM;QACD,0BAAW;GARvB,eAAe,CAkD3B;AAlDY,0CAAe"}
\ No newline at end of file
+{"version":3,"file":"heroes.component.js","sourceRoot":"","sources":["heroes.component.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,sCAAkD;AAClD,0CAAyC;AAGzC,+CAA6C;AAQ7C;IAME,yBACU,MAAc,EACd,WAAwB;QADxB,WAAM,GAAN,MAAM,CAAQ;QACd,gBAAW,GAAX,WAAW,CAAa;QALlC,eAAU,GAAG,KAAK,CAAC;IAKmB,CAAC;IAEvC,mCAAS,GAAT;QAAA,iBAKC;QAJC,IAAI,CAAC,WAAW;aACb,SAAS,EAAE;aACX,IAAI,CAAC,UAAA,MAAM,IAAI,OAAA,KAAI,CAAC,MAAM,GAAG,MAAM,EAApB,CAAoB,CAAC;aACpC,KAAK,CAAC,UAAA,KAAK,IAAI,OAAA,KAAI,CAAC,KAAK,GAAG,KAAK,EAAlB,CAAkB,CAAC,CAAC;IACxC,CAAC;IAED,iCAAO,GAAP;QACE,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACvB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;IAC3B,CAAC;IAED,+BAAK,GAAL,UAAM,SAAe;QACnB,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;QACxB,IAAI,SAAS,EAAE;YAAE,IAAI,CAAC,SAAS,EAAE,CAAC;SAAE;IACtC,CAAC;IAED,oCAAU,GAAV,UAAW,IAAU,EAAE,KAAU;QAAjC,iBASC;QARC,KAAK,CAAC,eAAe,EAAE,CAAC;QACxB,IAAI,CAAC,WAAW;aACb,MAAM,CAAC,IAAI,CAAC;aACZ,IAAI,CAAC,UAAA,GAAG;YACP,KAAI,CAAC,MAAM,GAAG,KAAI,CAAC,MAAM,CAAC,MAAM,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,KAAK,IAAI,EAAV,CAAU,CAAC,CAAC;YAClD,IAAI,KAAI,CAAC,YAAY,KAAK,IAAI,EAAE;gBAAE,KAAI,CAAC,YAAY,GAAG,IAAI,CAAC;aAAE;QAC/D,CAAC,CAAC;aACD,KAAK,CAAC,UAAA,KAAK,IAAI,OAAA,KAAI,CAAC,KAAK,GAAG,KAAK,EAAlB,CAAkB,CAAC,CAAC;IACxC,CAAC;IAED,kCAAQ,GAAR;QACE,IAAI,CAAC,SAAS,EAAE,CAAC;IACnB,CAAC;IAED,kCAAQ,GAAR,UAAS,IAAU;QACjB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QACzB,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;IAC1B,CAAC;IAED,oCAAU,GAAV;QACE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,EAAE,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1D,CAAC;IAjDU,eAAe;QAN3B,gBAAS,CAAC;YACT,QAAQ,EAAE,MAAM,CAAC,EAAE;YACnB,QAAQ,EAAE,WAAW;YACrB,WAAW,EAAE,uBAAuB;YACpC,SAAS,EAAE,CAAC,sBAAsB,CAAC;SACpC,CAAC;yCAQkB,eAAM;YACD,0BAAW;OARvB,eAAe,CAkD3B;IAAD,sBAAC;CAAA,AAlDD,IAkDC;AAlDY,0CAAe"}
\ No newline at end of file
diff --git a/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/main.js b/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/main.js
index 4178a02d..0df2b4a6 100644
--- a/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/main.js
+++ b/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/main.js
@@ -1,4 +1,5 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var platform_browser_dynamic_1 = require("@angular/platform-browser-dynamic");
 var app_module_1 = require("./app.module");
 platform_browser_dynamic_1.platformBrowserDynamic().bootstrapModule(app_module_1.AppModule)
diff --git a/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/main.js.map b/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/main.js.map
index d0ca2545..b7dbe63a 100644
--- a/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/main.js.map
+++ b/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/main.js.map
@@ -1 +1 @@
-{"version":3,"file":"main.js","sourceRoot":"","sources":["main.ts"],"names":[],"mappings":";AAAA,8EAA2E;AAE3E,2CAAyC;AAEzC,iDAAsB,EAAE,CAAC,eAAe,CAAC,sBAAS,CAAC;KAChD,IAAI,CAAC,UAAA,OAAO,IAAI,OAAA,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,EAAhC,CAAgC,CAAC;KACjD,KAAK,CAAC,UAAA,KAAK,IAAI,OAAA,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,EAAlB,CAAkB,CAAC,CAAC"}
\ No newline at end of file
+{"version":3,"file":"main.js","sourceRoot":"","sources":["main.ts"],"names":[],"mappings":";;AAAA,8EAA2E;AAE3E,2CAAyC;AAEzC,iDAAsB,EAAE,CAAC,eAAe,CAAC,sBAAS,CAAC;KAChD,IAAI,CAAC,UAAA,OAAO,IAAI,OAAA,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,EAAhC,CAAgC,CAAC;KACjD,KAAK,CAAC,UAAA,KAAK,IAAI,OAAA,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,EAAlB,CAAkB,CAAC,CAAC"}
\ No newline at end of file
diff --git a/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/rxjs-extensions.js b/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/rxjs-extensions.js
index ee3443a4..6c6b78de 100644
--- a/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/rxjs-extensions.js
+++ b/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/rxjs-extensions.js
@@ -1,4 +1,5 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 // Observable class extensions
 require("rxjs/add/observable/of");
 require("rxjs/add/observable/throw");
diff --git a/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/rxjs-extensions.js.map b/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/rxjs-extensions.js.map
index 440c4058..f4dfb05a 100644
--- a/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/rxjs-extensions.js.map
+++ b/samples/features/json/angularjs/dotnet-tour-of-heroes/wwwroot/app/rxjs-extensions.js.map
@@ -1 +1 @@
-{"version":3,"file":"rxjs-extensions.js","sourceRoot":"","sources":["rxjs-extensions.ts"],"names":[],"mappings":";AAAA,8BAA8B;AAC9B,kCAAgC;AAChC,qCAAmC;AAEnC,uBAAuB;AACvB,mCAAiC;AACjC,0CAAwC;AACxC,kDAAgD;AAChD,gCAA8B;AAC9B,oCAAkC;AAClC,iCAA+B;AAC/B,uCAAqC"}
\ No newline at end of file
+{"version":3,"file":"rxjs-extensions.js","sourceRoot":"","sources":["rxjs-extensions.ts"],"names":[],"mappings":";;AAAA,8BAA8B;AAC9B,kCAAgC;AAChC,qCAAmC;AAEnC,uBAAuB;AACvB,mCAAiC;AACjC,0CAAwC;AACxC,kDAAgD;AAChD,gCAA8B;AAC9B,oCAAkC;AAClC,iCAA+B;AAC/B,uCAAqC"}
\ No newline at end of file