@@ -1,5 +1,7 @@
 # JavaScriptServices
 
+AppVeyor: [![AppVeyor](https://ci.appveyor.com/api/projects/status/gprilrckx116vc9m/branch/dev?svg=true)](https://ci.appveyor.com/project/aspnetci/javascriptservices/branch/dev)
+
 This project is part of ASP.NET Core. You can find samples, documentation and getting started instructions for ASP.NET Core at the [Home](https://github.com/aspnet/home) repo.
 
 ## What is this?
 
@@ -1,7 +1,47 @@
 init:
   - git config --global core.autocrlf true
+install:
+   - ps: Install-Product node 6.9.2 x64
+   # .NET Core SDK binaries
+   # Download .NET Core SDK and add to PATH
+   - ps: $urlCurrent = "https://go.microsoft.com/fwlink/?LinkID=834991"
+   - ps: $urlPreview = "https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.0/dotnet-dev-win-x64.latest.zip"
+   - ps: $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetsdk"
+   - ps: mkdir $env:DOTNET_INSTALL_DIR -Force | Out-Null
+   - ps: $tempFileCurrent = [System.IO.Path]::GetTempFileName()
+   - ps: $tempFilePreview = [System.IO.Path]::GetTempFileName()
+   - ps: (New-Object System.Net.WebClient).DownloadFile($urlCurrent, $tempFileCurrent)
+   - ps: (New-Object System.Net.WebClient).DownloadFile($urlPreview, $tempFilePreview)
+   - ps: Add-Type -AssemblyName System.IO.Compression.FileSystem; [System.IO.Compression.ZipFile]::ExtractToDirectory($tempFileCurrent, $env:DOTNET_INSTALL_DIR)
+   - ps: Add-Type -AssemblyName System.IO.Compression.FileSystem; [System.IO.Compression.ZipFile]::ExtractToDirectory($tempFilePreview, $env:DOTNET_INSTALL_DIR + "preview")
+   - ps: Copy-Item "${env:DOTNET_INSTALL_DIR}preview\*" "${env:DOTNET_INSTALL_DIR}" -Force -Recurse
+   - ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path"
 build_script:
-  - build.cmd verify
+  - ps: Push-Location
+  - cd templates/package-builder
+  - npm install
+  - npm run build
+  - ps: Pop-Location
+artifacts:
+  - path: templates\package-builder\dist\artifacts\generator-aspnetcore-spa.tar.gz
+    name: generator-aspnetcore-spa
+  - path: templates\package-builder\dist\artifacts\*.nupkg
+    name: Microsoft.AspNetCore.SpaTemplates
+    type: NuGetPackage
+#  - build.cmd verify
 clone_depth: 1
-test: off
+test_script:
+  # - dotnet restore ./src
+  # - npm install -g selenium-standalone
+  # - selenium-standalone install
+  # The nosys flag is needed for selenium to work on Appveyor
+  # - ps: Start-Process selenium-standalone 'start','--','-Djna.nosys=true'
+  # - ps: Push-Location
+  # - cd test
+  # - npm install
+  # - npm test
+on_finish :
+  # - ps: Pop-Location
+  # After running tests, upload results to Appveyor
+  # - ps: (new-object net.webclient).UploadFile("https://ci.appveyor.com/api/testresults/junit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path .\test\tmp\junit\*.xml))
 deploy: off
@@ -1,3 +1,4 @@
 {
-    "projects": ["src"]
+    "projects": ["src"],
+    "sdk": { "version": "1.0.0-preview2-1-003177" }
 }
@@ -2,7 +2,13 @@
 var VERSION='0.1'
 var FULL_VERSION='0.1'
 var AUTHORS='Microsoft Open Technologies, Inc.'
-var SAMPLES_PROJECT_GLOB='templates/*/project.json'
+var TEST_PROJECT_GLOB='templates/*/project.json'
+var SAMPLES_PROJECT_GLOB='samples/misc/*/project.json'
+
+@{
+    // The build quality values are set in each of the project.json files
+    BuildQuality = "";
+}
 
 use-standard-lifecycle
 k-standard-goals
@@ -38,7 +38,8 @@ public override async Task ExecuteResultAsync(ActionContext context)
                 request.GetEncodedUrl(),
                 request.Path + request.QueryString.Value,
                 _dataToSupply,
-                /* timeoutMilliseconds */ 30000
+                /* timeoutMilliseconds */ 30000,
+                /* requestPathBase */ "/"
             );
 
             response.ContentType = "text/html";
 
@@ -1,4 +1,4 @@
-import { createStore, applyMiddleware, compose, combineReducers, GenericStoreEnhancer } from 'redux';
+import { createStore, applyMiddleware, compose, combineReducers, GenericStoreEnhancer, Store as ReduxStore } from 'redux';
 import thunk from 'redux-thunk';
 import { routerReducer } from 'react-router-redux';
 import * as Store from './store';
@@ -16,7 +16,7 @@ export default function configureStore(initialState?: Store.ApplicationState) {
 
     // Combine all reducers and instantiate the app-wide store instance
     const allReducers = buildRootReducer(Store.reducers);
-    const store = createStoreWithMiddleware(allReducers, initialState) as Redux.Store<Store.ApplicationState>;
+    const store = createStoreWithMiddleware(allReducers, initialState) as ReduxStore<Store.ApplicationState>;
 
     // Enable Webpack hot module replacement for reducers
     if (module.hot) {
 
@@ -2,6 +2,7 @@
   "name": "music-store",
   "version": "0.0.0",
   "dependencies": {
+    "@types/history": "^2.0.0",
     "@types/react": "^0.14.29",
     "@types/react-bootstrap": "^0.0.35",
     "@types/react-dom": "^0.14.14",
@@ -41,7 +42,7 @@
     "redux-typed": "^2.0.0",
     "style-loader": "^0.13.0",
     "ts-loader": "^0.8.1",
-    "typescript": "2.0.3",
+    "typescript": "^2.0.3",
     "url-loader": "^0.5.7",
     "webpack": "^1.13.2",
     "webpack-hot-middleware": "^2.12.2",
 
@@ -1,11 +1,19 @@
 {
   "compilerOptions": {
+    "baseUrl": ".",
     "moduleResolution": "node",
     "target": "es6",
     "jsx": "preserve",
     "sourceMap": true,
     "experimentalDecorators": true,
-    "types": [ "webpack-env", "whatwg-fetch" ]
+    "types": [ "webpack-env", "whatwg-fetch" ],
+    "paths": {
+      // Fix "Duplicate identifier" errors caused by multiple dependencies fetching their own copies of type definitions.
+      // We tell TypeScript which type definitions module to treat as the canonical one (instead of combining all of them).
+      "history": ["./node_modules/@types/history/index"],
+      "redux": ["./node_modules/@types/redux/index"],
+      "react": ["./node_modules/@types/react/index"]
+    }
   },
   "exclude": [
       "node_modules"
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
`1`	`1`	`{`
`2`		`- "projects": ["src"]`
	`2`	`+ "projects": ["src"],`
	`3`	`+ "sdk": { "version": "1.0.0-preview2-1-003177" }`
`3`	`4`	`}`