From fe8ce66242e2962e9129b4c066a649b8b4c69417 Mon Sep 17 00:00:00 2001 From: Joe Audette Date: Tue, 28 Jun 2016 07:40:10 -0400 Subject: [PATCH] migrate to rtm --- global.json | 6 +- src/PagingDemo.Web/Project_Readme.html | 187 ------------------ src/PagingDemo.Web/bundleconfig.json | 24 +++ src/PagingDemo.Web/gulpfile.js | 45 ----- src/PagingDemo.Web/project.json | 156 +++++++-------- src/PagingDemo.Web/wwwroot/_references.js | 2 +- src/cloudscribe.Web.Pagination/project.json | 22 ++- .../project.json | 20 +- 8 files changed, 127 insertions(+), 335 deletions(-) delete mode 100644 src/PagingDemo.Web/Project_Readme.html create mode 100644 src/PagingDemo.Web/bundleconfig.json delete mode 100644 src/PagingDemo.Web/gulpfile.js diff --git a/global.json b/global.json index b51e28b..5d9312a 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "projects": [ "src", "test" ], - "sdk": { - "version": "1.0.0-preview1-002702" - } + "sdk": { + "version": "1.0.0-preview2-003121" + } } diff --git a/src/PagingDemo.Web/Project_Readme.html b/src/PagingDemo.Web/Project_Readme.html deleted file mode 100644 index bddf864..0000000 --- a/src/PagingDemo.Web/Project_Readme.html +++ /dev/null @@ -1,187 +0,0 @@ - - - - - Welcome to ASP.NET Core - - - - - - -
-
-

This application consists of:

-
    -
  • Sample pages using ASP.NET Core MVC
    • -
  • Gulp and Bower for managing client-side libraries
    • -
  • Theming using Bootstrap
    • -
-
-
-

How to

- -
-
-

Overview

- -
-
-

Run & Deploy

- -
- - -
- - - diff --git a/src/PagingDemo.Web/bundleconfig.json b/src/PagingDemo.Web/bundleconfig.json new file mode 100644 index 0000000..04754ba --- /dev/null +++ b/src/PagingDemo.Web/bundleconfig.json @@ -0,0 +1,24 @@ +// Configure bundling and minification for the project. +// More info at https://go.microsoft.com/fwlink/?LinkId=808241 +[ + { + "outputFileName": "wwwroot/css/site.min.css", + // An array of relative input file paths. Globbing patterns supported + "inputFiles": [ + "wwwroot/css/site.css" + ] + }, + { + "outputFileName": "wwwroot/js/site.min.js", + "inputFiles": [ + "wwwroot/js/site.js" + ], + // Optionally specify minification options + "minify": { + "enabled": true, + "renameLocals": true + }, + // Optinally generate .map file + "sourceMap": false + } +] diff --git a/src/PagingDemo.Web/gulpfile.js b/src/PagingDemo.Web/gulpfile.js deleted file mode 100644 index dba0904..0000000 --- a/src/PagingDemo.Web/gulpfile.js +++ /dev/null @@ -1,45 +0,0 @@ -/// -"use strict"; - -var gulp = require("gulp"), - rimraf = require("rimraf"), - concat = require("gulp-concat"), - cssmin = require("gulp-cssmin"), - uglify = require("gulp-uglify"); - -var webroot = "./wwwroot/"; - -var paths = { - js: webroot + "js/**/*.js", - minJs: webroot + "js/**/*.min.js", - css: webroot + "css/**/*.css", - minCss: webroot + "css/**/*.min.css", - concatJsDest: webroot + "js/site.min.js", - concatCssDest: webroot + "css/site.min.css" -}; - -gulp.task("clean:js", function (cb) { - rimraf(paths.concatJsDest, cb); -}); - -gulp.task("clean:css", function (cb) { - rimraf(paths.concatCssDest, cb); -}); - -gulp.task("clean", ["clean:js", "clean:css"]); - -gulp.task("min:js", function () { - return gulp.src([paths.js, "!" + paths.minJs], { base: "." }) - .pipe(concat(paths.concatJsDest)) - .pipe(uglify()) - .pipe(gulp.dest(".")); -}); - -gulp.task("min:css", function () { - return gulp.src([paths.css, "!" + paths.minCss]) - .pipe(concat(paths.concatCssDest)) - .pipe(cssmin()) - .pipe(gulp.dest(".")); -}); - -gulp.task("min", ["min:js", "min:css"]); diff --git a/src/PagingDemo.Web/project.json b/src/PagingDemo.Web/project.json index 88dfa98..899fc5b 100644 --- a/src/PagingDemo.Web/project.json +++ b/src/PagingDemo.Web/project.json @@ -1,93 +1,87 @@ { - "userSecretsId": "aspnet-PagingDemo.Web-dd4ade04-aa17-411b-bb33-2277d7fea5e5", + "userSecretsId": "aspnet-PagingDemo.Web-dd4ade04-aa17-411b-bb33-2277d7fea5e5", - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.0.0-rc2-3002702", - "type": "platform" + "dependencies": { + "Microsoft.NETCore.App": { + "version": "1.0.0", + "type": "platform" + }, + "cloudscribe.Web.Pagination": "1.0.2-*", + "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-preview2-final", + "type": "build" + }, + "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0", + "Microsoft.AspNetCore.Server.Kestrel": "1.0.0", + "Microsoft.AspNetCore.StaticFiles": "1.0.0", + "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-preview2-final", + "type": "build" + }, + "Microsoft.VisualStudio.Web.CodeGenerators.Mvc": { + "version": "1.0.0-preview2-final", + "type": "build" + } }, - "cloudscribe.Web.Pagination": "1.0.1-*", - "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.AspNetCore.Razor.Tools": { - "version": "1.0.0-preview1-final", - "type": "build" + + "tools": { + "BundlerMinifier.Core": "2.0.238", + "Microsoft.AspNetCore.Razor.Tools": "1.0.0-preview2-final", + "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-preview2-final", + "Microsoft.EntityFrameworkCore.Tools": "1.0.0-preview2-final", + "Microsoft.Extensions.SecretManager.Tools": "1.0.0-preview2-final", + "Microsoft.VisualStudio.Web.CodeGeneration.Tools": { + "version": "1.0.0-preview2-final", + "imports": [ + "portable-net45+win8" + ] + } }, - "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.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.VisualStudio.Web.CodeGeneration.Tools": { - "version": "1.0.0-preview1-final", - "type": "build" + + "frameworks": { + "netcoreapp1.0": { + "imports": [ + "dotnet5.6", + "portable-net45+win8" + ] + } }, - "Microsoft.VisualStudio.Web.CodeGenerators.Mvc": { - "version": "1.0.0-preview1-final", - "type": "build" - } - }, - "tools": { - "Microsoft.AspNetCore.Razor.Tools": { - "version": "1.0.0-preview1-final", - "imports": "portable-net45+win8+dnxcore50" + "buildOptions": { + "emitEntryPoint": true, + "preserveCompilationContext": true }, - "Microsoft.AspNetCore.Server.IISIntegration.Tools": { - "version": "1.0.0-preview1-final", - "imports": "portable-net45+win8+dnxcore50" + + "runtimeOptions": { + "configProperties": { + "System.GC.Server": true + } }, - "Microsoft.Extensions.SecretManager.Tools": { - "version": "1.0.0-preview1-final", - "imports": "portable-net45+win8+dnxcore50" + + "publishOptions": { + "include": [ + "wwwroot", + "Views", + "Areas/**/Views", + "appsettings.json", + "web.config" + ] }, - "Microsoft.VisualStudio.Web.CodeGeneration.Tools": { - "version": "1.0.0-preview1-final", - "imports": [ - "portable-net45+win8+dnxcore50", - "portable-net45+win8" - ] - } - }, - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dotnet5.6", - "dnxcore50", - "portable-net45+win8" - ] + "scripts": { + "prepublish": [ "bower install", "dotnet bundle" ], + "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ] } - }, - - "buildOptions": { - "emitEntryPoint": true, - "preserveCompilationContext": true - }, - - "runtimeOptions": { - "gcServer": true - }, - - "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%" ] - } } diff --git a/src/PagingDemo.Web/wwwroot/_references.js b/src/PagingDemo.Web/wwwroot/_references.js index 98c8560..9fc69e9 100644 --- a/src/PagingDemo.Web/wwwroot/_references.js +++ b/src/PagingDemo.Web/wwwroot/_references.js @@ -1,8 +1,8 @@ /// -/// /// /// /// /// +/// /// /// diff --git a/src/cloudscribe.Web.Pagination/project.json b/src/cloudscribe.Web.Pagination/project.json index 4212e0e..99e46e3 100644 --- a/src/cloudscribe.Web.Pagination/project.json +++ b/src/cloudscribe.Web.Pagination/project.json @@ -1,5 +1,5 @@ { - "version": "1.0.1-rc20160609", + "version": "1.0.2", "description": "an AspNetCore TagHelper for pagination", "authors": [ "Joe Audette" ], "copyright": "2015 Source Tree Solutions", @@ -8,22 +8,28 @@ "tags": [ "cloudscribe", "mvc", "pagination", "navigation", "bootstrap" ], "iconUrl": "https://raw.githubusercontent.com/joeaudette/cloudscribe.Web.Pagination/master/cloudscribe-icon-32.png", "requireLicenseAcceptance": false, - "releaseNotes": "update to asp.net5 rc1", + "releaseNotes": "update for ASP.NET Core RTM", "projectUrl": "https://github.com/joeaudette/cloudscribe.Web.Pagination", "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0" }, "dependencies": { - "Microsoft.AspNetCore.Mvc": "1.0.0-rc2-final", - "Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.0-rc2-final", - "NETStandard.Library": "1.5.0-rc2-24027", - "System.Linq.Queryable": "4.0.1-rc2-24027" + "Microsoft.AspNetCore.Mvc": "1.0.0", + "Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.0", + "NETStandard.Library": "1.6.0" + }, "frameworks": { - "netstandard1.0": { - "imports": "dnxcore50" + "net452": { }, + "net451": { }, + "net46": { }, + "netstandard1.6": { + "imports": "dnxcore50", + "dependencies": { + "System.Linq.Queryable": "4.0.1" + } } } } diff --git a/test/cloudscribe.Web.Pagination.Test/project.json b/test/cloudscribe.Web.Pagination.Test/project.json index c4cd60a..4a9d853 100644 --- a/test/cloudscribe.Web.Pagination.Test/project.json +++ b/test/cloudscribe.Web.Pagination.Test/project.json @@ -9,13 +9,13 @@ "dependencies": { "cloudscribe.MetaWeblog": "1.0.0-*", - "xunit": "2.1.0-rc2-build3176", + "xunit": "2.1.0", "dotnet-test-xunit": { - "version": "1.0.0-rc2-*", + "version": "2.2.0-preview2-build1029", "target": "package" }, - "Microsoft.NETCore.Platforms": "1.0.1-rc2-*", - "cloudscribe.Web.Pagination": "1.0.1-*" + "Microsoft.NETCore.Platforms": "1.0.1", + "cloudscribe.Web.Pagination": "1.0.2-*" }, @@ -23,14 +23,14 @@ "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-rc2-*", + "version": "1.0.0", "type": "platform" }, - "Microsoft.CSharp": "4.0.1-rc2-*", - "System.Collections": "4.0.11-rc2-*", - "System.Linq": "4.1.0-rc2-*", - "System.Runtime": "4.1.0-rc2-*", - "System.Threading": "4.0.11-rc2-*" + "Microsoft.CSharp": "4.0.1", + "System.Collections": "4.0.11", + "System.Linq": "4.1.0", + "System.Runtime": "4.1.0", + "System.Threading": "4.0.11" }, "imports": [ "dnxcore50",