From 5c1d3585c0cfce5262093f3fdaf889bd9955947d Mon Sep 17 00:00:00 2001
From: Steve Sanderson <SteveSandersonMS@users.noreply.github.com>
Date: Mon, 5 Jun 2017 13:03:39 +0100
Subject: [PATCH 1/2] Stop doing NPM restores during CI builds, as the result
 isn't used anyway

---
 build/repo.targets | 12 ------------
 1 file changed, 12 deletions(-)
 delete mode 100644 build/repo.targets

diff --git a/build/repo.targets b/build/repo.targets
deleted file mode 100644
index 537aa367..00000000
--- a/build/repo.targets
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project>
-  <Target Name="NpmRestore" AfterTargets="Restore" Condition="'$(PreflightRestore)' != 'true'">
-    <ItemGroup>
-      <NpmModules Include="$(RepositoryRoot)**\package.json"
-        Exclude="$(RepositoryRoot)**\node_modules\**\*" />
-    </ItemGroup>
-
-    <Message Text="Restoring NPM modules for: %0A - @(NpmModules -> '%(FullPath)','%0A - ')" Importance="high" />
-
-    <Exec Command="npm install --silent" WorkingDirectory="%(NpmModules.RootDir)%(Directory)" />
-  </Target>
-</Project>

From 2ee84884695d14ef559643ed07630552b415dcb2 Mon Sep 17 00:00:00 2001
From: Adam Amrine <amrinea@gmail.com>
Date: Mon, 5 Jun 2017 09:38:07 -0400
Subject: [PATCH 2/2] Moved FormsModule and HttpModule from from
 app.module.client to app.module.shared

---
 templates/AngularSpa/ClientApp/app/app.module.client.ts | 4 ----
 templates/AngularSpa/ClientApp/app/app.module.shared.ts | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/templates/AngularSpa/ClientApp/app/app.module.client.ts b/templates/AngularSpa/ClientApp/app/app.module.client.ts
index ee778122..55c9f08e 100644
--- a/templates/AngularSpa/ClientApp/app/app.module.client.ts
+++ b/templates/AngularSpa/ClientApp/app/app.module.client.ts
@@ -1,7 +1,5 @@
 import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
-import { FormsModule } from '@angular/forms';
-import { HttpModule } from '@angular/http';
 import { sharedConfig } from './app.module.shared';
 
 @NgModule({
@@ -9,8 +7,6 @@ import { sharedConfig } from './app.module.shared';
     declarations: sharedConfig.declarations,
     imports: [
         BrowserModule,
-        FormsModule,
-        HttpModule,
         ...sharedConfig.imports
     ],
     providers: [
diff --git a/templates/AngularSpa/ClientApp/app/app.module.shared.ts b/templates/AngularSpa/ClientApp/app/app.module.shared.ts
index 18615017..798e03a3 100644
--- a/templates/AngularSpa/ClientApp/app/app.module.shared.ts
+++ b/templates/AngularSpa/ClientApp/app/app.module.shared.ts
@@ -1,4 +1,6 @@
 import { NgModule } from '@angular/core';
+import { FormsModule } from '@angular/forms';
+import { HttpModule } from '@angular/http';
 import { RouterModule } from '@angular/router';
 
 import { AppComponent } from './components/app/app.component'
@@ -17,6 +19,8 @@ export const sharedConfig: NgModule = {
         HomeComponent
     ],
     imports: [
+        FormsModule,
+        HttpModule,
         RouterModule.forRoot([
             { path: '', redirectTo: 'home', pathMatch: 'full' },
             { path: 'home', component: HomeComponent },