chore (esnext-aspnetcore and typescript-aspnetcore): Support ASP.Net …

…Core RTM ASP.Net Core RTM changes from RC2 (global.json, project.json) Typescript skeleton e2e.js to use gulp-typescript rather than gulp-tsb (which wasn't in the devdepencies list) package.json to include postinstall step of running typings .gitignore updated to ignore typings
aurelia · Jun 28, 2016 · 0d1e449 · 0d1e449
1 parent 4274e4d
commit 0d1e449
Show file tree

Hide file tree

Showing 10 changed files with 142 additions and 142 deletions.
diff --git a/skeleton-esnext-aspnetcore/global.json b/skeleton-esnext-aspnetcore/global.json
@@ -1,6 +1,6 @@
 {
   "projects": [ "src", "test" ],
     "sdk": {
-        "version": "1.0.0-preview1-002702"
+        "version": "1.0.0-preview2-003121"
     }
 }
diff --git a/skeleton-esnext-aspnetcore/src/skeleton-navigation-esnext-vs/Properties/launchSettings.json b/skeleton-esnext-aspnetcore/src/skeleton-navigation-esnext-vs/Properties/launchSettings.json
@@ -3,7 +3,7 @@
     "windowsAuthentication": false,
     "anonymousAuthentication": true,
     "iisExpress": {
-      "applicationUrl": "http://localhost:49849/",
+      "applicationUrl": "http://localhost:49859/",
       "sslPort": 0
     }
   },

diff --git a/skeleton-esnext-aspnetcore/src/skeleton-navigation-esnext-vs/project.json b/skeleton-esnext-aspnetcore/src/skeleton-navigation-esnext-vs/project.json
@@ -1,74 +1,74 @@
 {
-  "userSecretsId": "aspnet5-skeleton_navigation_esnext_vs-6df5fca9-b862-4931-8867-c46d52bbed68",
+    "userSecretsId": "skeleton-esnext-aspnetcore-{601C7C72-554C-416D-85EE-3E9211B950D2}",
 
     "dependencies": {
         "Microsoft.NETCore.App": {
-            "version": "1.0.0-rc2-3002702",
+            "version": "1.0.0",
             "type": "platform"
         },
-        "Microsoft.ApplicationInsights.AspNetCore": "1.0.0-rc2-final",
-        "Microsoft.AspNetCore.Authentication.Cookies": "1.0.0-rc2-final",
-        "Microsoft.AspNetCore.Diagnostics": "1.0.0-rc2-final",
-        "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "1.0.0-rc2-final",
-        "Microsoft.AspNetCore.Identity.EntityFrameworkCore": "1.0.0-rc2-final",
-        "Microsoft.AspNetCore.Mvc": "1.0.0-rc2-final",
+        "Microsoft.ApplicationInsights.AspNetCore": "1.0.0",
+        "Microsoft.AspNetCore.Authentication.Cookies": "1.0.0",
+        "Microsoft.AspNetCore.Diagnostics": "1.0.0",
+        "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "1.0.0",
+        "Microsoft.AspNetCore.Identity.EntityFrameworkCore": "1.0.0",
+        "Microsoft.AspNetCore.Mvc": "1.0.0",
         "Microsoft.AspNetCore.Razor.Tools": {
-            "version": "1.0.0-preview1-final",
+            "version": "1.0.0-preview2-final",
             "type": "build"
         },
-        "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-rc2-final",
-        "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-final",
-        "Microsoft.AspNetCore.StaticFiles": "1.0.0-rc2-final",
-        "Microsoft.EntityFrameworkCore.SqlServer": "1.0.0-rc2-final",
+        "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0",
+        "Microsoft.AspNetCore.Server.Kestrel": "1.0.0",
+        "Microsoft.AspNetCore.StaticFiles": "1.0.0",
+        "Microsoft.EntityFrameworkCore.SqlServer": "1.0.0",
         "Microsoft.EntityFrameworkCore.Tools": {
-            "version": "1.0.0-preview1-final",
+            "version": "1.0.0-preview2-final",
             "type": "build"
         },
-        "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0-rc2-final",
-        "Microsoft.Extensions.Configuration.Json": "1.0.0-rc2-final",
-        "Microsoft.Extensions.Configuration.UserSecrets": "1.0.0-rc2-final",
-        "Microsoft.Extensions.Logging": "1.0.0-rc2-final",
-        "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-final",
-        "Microsoft.Extensions.Logging.Debug": "1.0.0-rc2-final",
-        "Microsoft.VisualStudio.Web.BrowserLink.Loader": "14.0.0-rc2-final",
+        "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0",
+        "Microsoft.Extensions.Configuration.Json": "1.0.0",
+        "Microsoft.Extensions.Configuration.UserSecrets": "1.0.0",
+        "Microsoft.Extensions.Logging": "1.0.0",
+        "Microsoft.Extensions.Logging.Console": "1.0.0",
+        "Microsoft.Extensions.Logging.Debug": "1.0.0",
+        "Microsoft.VisualStudio.Web.BrowserLink.Loader": "14.0.0",
         "Microsoft.VisualStudio.Web.CodeGeneration.Tools": {
-            "version": "1.0.0-preview1-final",
+            "version": "1.0.0-preview2-final",
             "type": "build"
         },
         "Microsoft.VisualStudio.Web.CodeGenerators.Mvc": {
-            "version": "1.0.0-preview1-final",
+            "version": "1.0.0-preview2-final",
             "type": "build"
         }
     },
 
-  "tools": {
-    "Microsoft.AspNetCore.Razor.Tools": {
-      "version": "1.0.0-preview1-final",
-      "imports": "portable-net45+win8+dnxcore50"
-    },
-    "Microsoft.AspNetCore.Server.IISIntegration.Tools": {
-      "version": "1.0.0-preview1-final",
-      "imports": "portable-net45+win8+dnxcore50"
-    },
-    "Microsoft.EntityFrameworkCore.Tools": {
-      "version": "1.0.0-preview1-final",
-      "imports": [
-        "portable-net45+win8+dnxcore50",
-        "portable-net45+win8"
-      ]
-    },
-    "Microsoft.Extensions.SecretManager.Tools": {
-      "version": "1.0.0-preview1-final",
-      "imports": "portable-net45+win8+dnxcore50"
+    "tools": {
+        "Microsoft.AspNetCore.Razor.Tools": {
+            "version": "1.0.0-preview2-final",
+            "imports": "portable-net45+win8+dnxcore50"
+        },
+        "Microsoft.AspNetCore.Server.IISIntegration.Tools": {
+            "version": "1.0.0-preview2-final",
+            "imports": "portable-net45+win8+dnxcore50"
+        },
+        "Microsoft.EntityFrameworkCore.Tools": {
+            "version": "1.0.0-preview2-final",
+            "imports": [
+                "portable-net45+win8+dnxcore50",
+                "portable-net45+win8"
+            ]
+        },
+        "Microsoft.Extensions.SecretManager.Tools": {
+            "version": "1.0.0-preview2-final",
+            "imports": "portable-net45+win8+dnxcore50"
+        },
+        "Microsoft.VisualStudio.Web.CodeGeneration.Tools": {
+            "version": "1.0.0-preview2-final",
+            "imports": [
+                "portable-net45+win8+dnxcore50",
+                "portable-net45+win8"
+            ]
+        }
     },
-    "Microsoft.VisualStudio.Web.CodeGeneration.Tools": {
-      "version": "1.0.0-preview1-final",
-      "imports": [
-        "portable-net45+win8+dnxcore50",
-        "portable-net45+win8"
-      ]
-    }
-  },
 
     "frameworks": {
         "netcoreapp1.0": {
@@ -91,21 +91,21 @@
         }
     },
 
-  "runtimeOptions": {
-    "gcServer": true
-  },
+    "runtimeOptions": {
+        "gcServer": true
+    },
 
-  "publishOptions": {
-    "include": [
-      "wwwroot",
-      "Views",
-      "appsettings.json",
-      "web.config"
-    ]
-  },
+    "publishOptions": {
+        "include": [
+            "wwwroot",
+            "Views",
+            "appsettings.json",
+            "web.config"
+        ]
+    },
 
-  "scripts": {
-    "prepublish": [ "npm install", "bower install", "gulp clean", "gulp min" ],
-    "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ]
-  }
+    "scripts": {
+        "prepublish": [ "npm install", "bower install", "gulp clean", "gulp min" ],
+        "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ]
+    }
 }
diff --git a/skeleton-typescript-aspnetcore/global.json b/skeleton-typescript-aspnetcore/global.json
@@ -1,6 +1,6 @@
 {
   "projects": [ "src", "test" ],
     "sdk": {
-        "version": "1.0.0-preview1-002702"
+        "version": "1.0.0-preview2-003121"
     }
 }
diff --git a/skeleton-typescript-aspnetcore/src/skeleton-navigation-typescript-vs/.gitignore b/skeleton-typescript-aspnetcore/src/skeleton-navigation-typescript-vs/.gitignore
@@ -182,6 +182,7 @@ ClientBin/
 *.pfx
 *.publishsettings
 node_modules/
+typings/
 wwwroot/dist/
 wwwroot/lib/
 wwwroot/jspm_packages/

diff --git a/...ypescript-aspnetcore/src/skeleton-navigation-typescript-vs/Properties/launchSettings.json b/...ypescript-aspnetcore/src/skeleton-navigation-typescript-vs/Properties/launchSettings.json
@@ -3,7 +3,7 @@
     "windowsAuthentication": false,
     "anonymousAuthentication": true,
     "iisExpress": {
-      "applicationUrl": "http://localhost:49851/",
+      "applicationUrl": "http://localhost:49861/",
       "sslPort": 0
     }
   },

diff --git a/skeleton-typescript-aspnetcore/src/skeleton-navigation-typescript-vs/build/tasks/e2e.js b/skeleton-typescript-aspnetcore/src/skeleton-navigation-typescript-vs/build/tasks/e2e.js
@@ -4,7 +4,7 @@ var plumber = require('gulp-plumber');
 var webdriverUpdate = require('gulp-protractor').webdriver_update;
 var webdriverStandalone = require('gulp-protractor').webdriver_standalone;
 var protractor = require('gulp-protractor').protractor;
-var typescript = require('gulp-tsb');
+var typescript = require('gulp-typescript');
 var assign = Object.assign || require('object.assign');
 var del = require('del');
 

diff --git a/skeleton-typescript-aspnetcore/src/skeleton-navigation-typescript-vs/package.json b/skeleton-typescript-aspnetcore/src/skeleton-navigation-typescript-vs/package.json
@@ -45,10 +45,11 @@
     "typescript",
     "vscode"
   ],
-  "scripts": {
-    "test": "gulp test",
-    "e2e": "gulp serve e2e"
-  },
+    "scripts": {
+        "postinstall": "./node_modules/.bin/typings install",
+        "test": "gulp test",
+        "e2e": "gulp serve e2e"
+    },
   "jspm": {
     "directories": {
       "baseURL": "wwwroot"

diff --git a/skeleton-typescript-aspnetcore/src/skeleton-navigation-typescript-vs/project.json b/skeleton-typescript-aspnetcore/src/skeleton-navigation-typescript-vs/project.json
@@ -1,74 +1,74 @@
 {
-    "userSecretsId": "aspnet-skeleton-navigation-typescript-vs-20160526030316",
+    "userSecretsId": "skeleton-typescript-aspnetcore-{E0EE09F7-ABEB-45D0-A957-2163DB134112}",
 
     "dependencies": {
         "Microsoft.NETCore.App": {
-            "version": "1.0.0-rc2-3002702",
+            "version": "1.0.0",
             "type": "platform"
         },
-        "Microsoft.ApplicationInsights.AspNetCore": "1.0.0-rc2-final",
-        "Microsoft.AspNetCore.Authentication.Cookies": "1.0.0-rc2-final",
-        "Microsoft.AspNetCore.Diagnostics": "1.0.0-rc2-final",
-        "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "1.0.0-rc2-final",
-        "Microsoft.AspNetCore.Identity.EntityFrameworkCore": "1.0.0-rc2-final",
-        "Microsoft.AspNetCore.Mvc": "1.0.0-rc2-final",
+        "Microsoft.ApplicationInsights.AspNetCore": "1.0.0",
+        "Microsoft.AspNetCore.Authentication.Cookies": "1.0.0",
+        "Microsoft.AspNetCore.Diagnostics": "1.0.0",
+        "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "1.0.0",
+        "Microsoft.AspNetCore.Identity.EntityFrameworkCore": "1.0.0",
+        "Microsoft.AspNetCore.Mvc": "1.0.0",
         "Microsoft.AspNetCore.Razor.Tools": {
-            "version": "1.0.0-preview1-final",
+            "version": "1.0.0-preview2-final",
             "type": "build"
         },
-        "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-rc2-final",
-        "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-final",
-        "Microsoft.AspNetCore.StaticFiles": "1.0.0-rc2-final",
-        "Microsoft.EntityFrameworkCore.SqlServer": "1.0.0-rc2-final",
+        "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0",
+        "Microsoft.AspNetCore.Server.Kestrel": "1.0.0",
+        "Microsoft.AspNetCore.StaticFiles": "1.0.0",
+        "Microsoft.EntityFrameworkCore.SqlServer": "1.0.0",
         "Microsoft.EntityFrameworkCore.Tools": {
-            "version": "1.0.0-preview1-final",
+            "version": "1.0.0-preview2-final",
             "type": "build"
         },
-        "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0-rc2-final",
-        "Microsoft.Extensions.Configuration.Json": "1.0.0-rc2-final",
-        "Microsoft.Extensions.Configuration.UserSecrets": "1.0.0-rc2-final",
-        "Microsoft.Extensions.Logging": "1.0.0-rc2-final",
-        "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-final",
-        "Microsoft.Extensions.Logging.Debug": "1.0.0-rc2-final",
-        "Microsoft.VisualStudio.Web.BrowserLink.Loader": "14.0.0-rc2-final",
+        "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0",
+        "Microsoft.Extensions.Configuration.Json": "1.0.0",
+        "Microsoft.Extensions.Configuration.UserSecrets": "1.0.0",
+        "Microsoft.Extensions.Logging": "1.0.0",
+        "Microsoft.Extensions.Logging.Console": "1.0.0",
+        "Microsoft.Extensions.Logging.Debug": "1.0.0",
+        "Microsoft.VisualStudio.Web.BrowserLink.Loader": "14.0.0",
         "Microsoft.VisualStudio.Web.CodeGeneration.Tools": {
-            "version": "1.0.0-preview1-final",
+            "version": "1.0.0-preview2-final",
             "type": "build"
         },
         "Microsoft.VisualStudio.Web.CodeGenerators.Mvc": {
-            "version": "1.0.0-preview1-final",
+            "version": "1.0.0-preview2-final",
             "type": "build"
         }
     },
 
-  "tools": {
-    "Microsoft.AspNetCore.Razor.Tools": {
-      "version": "1.0.0-preview1-final",
-      "imports": "portable-net45+win8+dnxcore50"
-    },
-    "Microsoft.AspNetCore.Server.IISIntegration.Tools": {
-      "version": "1.0.0-preview1-final",
-      "imports": "portable-net45+win8+dnxcore50"
-    },
-    "Microsoft.EntityFrameworkCore.Tools": {
-      "version": "1.0.0-preview1-final",
-      "imports": [
-        "portable-net45+win8+dnxcore50",
-        "portable-net45+win8"
-      ]
-    },
-    "Microsoft.Extensions.SecretManager.Tools": {
-      "version": "1.0.0-preview1-final",
-      "imports": "portable-net45+win8+dnxcore50"
+    "tools": {
+        "Microsoft.AspNetCore.Razor.Tools": {
+            "version": "1.0.0-preview2-final",
+            "imports": "portable-net45+win8+dnxcore50"
+        },
+        "Microsoft.AspNetCore.Server.IISIntegration.Tools": {
+            "version": "1.0.0-preview2-final",
+            "imports": "portable-net45+win8+dnxcore50"
+        },
+        "Microsoft.EntityFrameworkCore.Tools": {
+            "version": "1.0.0-preview2-final",
+            "imports": [
+                "portable-net45+win8+dnxcore50",
+                "portable-net45+win8"
+            ]
+        },
+        "Microsoft.Extensions.SecretManager.Tools": {
+            "version": "1.0.0-preview2-final",
+            "imports": "portable-net45+win8+dnxcore50"
+        },
+        "Microsoft.VisualStudio.Web.CodeGeneration.Tools": {
+            "version": "1.0.0-preview2-final",
+            "imports": [
+                "portable-net45+win8+dnxcore50",
+                "portable-net45+win8"
+            ]
+        }
     },
-    "Microsoft.VisualStudio.Web.CodeGeneration.Tools": {
-      "version": "1.0.0-preview1-final",
-      "imports": [
-        "portable-net45+win8+dnxcore50",
-        "portable-net45+win8"
-      ]
-    }
-  },
 
     "frameworks": {
         "netcoreapp1.0": {
@@ -91,21 +91,21 @@
         }
     },
 
-  "runtimeOptions": {
-    "gcServer": true
-  },
+    "runtimeOptions": {
+        "gcServer": true
+    },
 
-  "publishOptions": {
-    "include": [
-      "wwwroot",
-      "Views",
-      "appsettings.json",
-      "web.config"
-    ]
-  },
+    "publishOptions": {
+        "include": [
+            "wwwroot",
+            "Views",
+            "appsettings.json",
+            "web.config"
+        ]
+    },
 
-  "scripts": {
-    "prepublish": [ "npm install", "bower install", "gulp clean", "gulp min" ],
-    "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ]
-  }
+    "scripts": {
+        "prepublish": [ "npm install", "bower install", "gulp clean", "gulp min" ],
+        "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ]
+    }
 }