diff --git a/Alive.Net.sln b/Alive.Net.sln index e08fa08..58dd8ed 100644 --- a/Alive.Net.sln +++ b/Alive.Net.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.24720.0 +VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{87BBACD9-21A7-4169-94B9-DD6989B700B7}" EndProject @@ -14,7 +14,7 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Alive.Net", "src\Alive.Net\ EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Alive.Net.UnitTests", "src\Alive.Net.UnitTests\Alive.Net.UnitTests.xproj", "{4CA8001B-27C7-4671-B451-2C2DA00A3827}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Alive.Net.Example", "src\Alive.Net.Example\Alive.Net.Example.xproj", "{43D7C97A-6041-492F-95C6-FD88C7FA7A7B}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Alive.Net.Example", "src\Alive.Net.Example\Alive.Net.Example.xproj", "{52512D4E-0F12-4202-AB70-B93EAF4C5531}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -30,10 +30,10 @@ Global {4CA8001B-27C7-4671-B451-2C2DA00A3827}.Debug|Any CPU.Build.0 = Debug|Any CPU {4CA8001B-27C7-4671-B451-2C2DA00A3827}.Release|Any CPU.ActiveCfg = Release|Any CPU {4CA8001B-27C7-4671-B451-2C2DA00A3827}.Release|Any CPU.Build.0 = Release|Any CPU - {43D7C97A-6041-492F-95C6-FD88C7FA7A7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {43D7C97A-6041-492F-95C6-FD88C7FA7A7B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {43D7C97A-6041-492F-95C6-FD88C7FA7A7B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {43D7C97A-6041-492F-95C6-FD88C7FA7A7B}.Release|Any CPU.Build.0 = Release|Any CPU + {52512D4E-0F12-4202-AB70-B93EAF4C5531}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {52512D4E-0F12-4202-AB70-B93EAF4C5531}.Debug|Any CPU.Build.0 = Debug|Any CPU + {52512D4E-0F12-4202-AB70-B93EAF4C5531}.Release|Any CPU.ActiveCfg = Release|Any CPU + {52512D4E-0F12-4202-AB70-B93EAF4C5531}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -41,6 +41,6 @@ Global GlobalSection(NestedProjects) = preSolution {1628A48E-DD1D-45C7-A316-6CFD8498845C} = {87BBACD9-21A7-4169-94B9-DD6989B700B7} {4CA8001B-27C7-4671-B451-2C2DA00A3827} = {87BBACD9-21A7-4169-94B9-DD6989B700B7} - {43D7C97A-6041-492F-95C6-FD88C7FA7A7B} = {87BBACD9-21A7-4169-94B9-DD6989B700B7} + {52512D4E-0F12-4202-AB70-B93EAF4C5531} = {87BBACD9-21A7-4169-94B9-DD6989B700B7} EndGlobalSection EndGlobal diff --git a/global.json b/global.json index 5ba986f..9d09ab5 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "projects": [ "src", "test" ], "sdk": { - "version": "1.0.0-rc1-update1" + "version": "1.0.0-preview2-003131" } } diff --git a/src/Alive.Net.Example/Alive.Net.Example.xproj b/src/Alive.Net.Example/Alive.Net.Example.xproj index c1caffa..02f9be9 100644 --- a/src/Alive.Net.Example/Alive.Net.Example.xproj +++ b/src/Alive.Net.Example/Alive.Net.Example.xproj @@ -4,12 +4,13 @@ 14.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - + - 43d7c97a-6041-492f-95c6-fd88c7fa7a7b + 52512d4e-0f12-4202-ab70-b93eaf4c5531 Alive.Net.Example - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ + .\obj + .\bin\ + v4.5.2 2.0 @@ -17,7 +18,6 @@ - - + diff --git a/src/Alive.Net.Example/Controllers/HomeController.cs b/src/Alive.Net.Example/Controllers/HomeController.cs index 588ac04..04f589a 100644 --- a/src/Alive.Net.Example/Controllers/HomeController.cs +++ b/src/Alive.Net.Example/Controllers/HomeController.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Microsoft.AspNet.Mvc; +using Microsoft.AspNetCore.Mvc; namespace Alive.Net.Example.Controllers { diff --git a/src/Alive.Net.Example/Program.cs b/src/Alive.Net.Example/Program.cs new file mode 100644 index 0000000..d4b6b3d --- /dev/null +++ b/src/Alive.Net.Example/Program.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Hosting; + +namespace Alive.Net.Example +{ + public class Program + { + public static void Main(string[] args) + { + var host = new WebHostBuilder() + .UseKestrel() + .UseContentRoot(Directory.GetCurrentDirectory()) + .UseIISIntegration() + .UseStartup() + .Build(); + + host.Run(); + } + } +} diff --git a/src/Alive.Net.Example/Project_Readme.html b/src/Alive.Net.Example/Project_Readme.html new file mode 100644 index 0000000..1a0f5b5 --- /dev/null +++ b/src/Alive.Net.Example/Project_Readme.html @@ -0,0 +1,187 @@ + + + + + Welcome to ASP.NET Core + + + + + + + + + + diff --git a/src/Alive.Net.Example/Properties/launchSettings.json b/src/Alive.Net.Example/Properties/launchSettings.json index ee45c40..7ba0b74 100644 --- a/src/Alive.Net.Example/Properties/launchSettings.json +++ b/src/Alive.Net.Example/Properties/launchSettings.json @@ -3,7 +3,7 @@ "windowsAuthentication": false, "anonymousAuthentication": true, "iisExpress": { - "applicationUrl": "http://localhost:6445/", + "applicationUrl": "http://localhost:55653/", "sslPort": 0 } }, @@ -12,13 +12,15 @@ "commandName": "IISExpress", "launchBrowser": true, "environmentVariables": { - "Hosting:Environment": "Development" + "ASPNETCORE_ENVIRONMENT": "Development" } }, - "web": { - "commandName": "web", + "Alive.Net.Example": { + "commandName": "Project", + "launchBrowser": true, + "launchUrl": "http://localhost:5000", "environmentVariables": { - "Hosting:Environment": "Development" + "ASPNETCORE_ENVIRONMENT": "Development" } } } diff --git a/src/Alive.Net.Example/Startup.cs b/src/Alive.Net.Example/Startup.cs index 91e19dc..c3328bf 100644 --- a/src/Alive.Net.Example/Startup.cs +++ b/src/Alive.Net.Example/Startup.cs @@ -2,8 +2,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Hosting; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; @@ -14,14 +14,15 @@ namespace Alive.Net.Example { public Startup(IHostingEnvironment env) { - // Set up configuration sources. var builder = new ConfigurationBuilder() - .AddJsonFile("appsettings.json") + .SetBasePath(env.ContentRootPath) + .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true) + .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true) .AddEnvironmentVariables(); Configuration = builder.Build(); } - public IConfigurationRoot Configuration { get; set; } + public IConfigurationRoot Configuration { get; } // This method gets called by the runtime. Use this method to add services to the container. public void ConfigureServices(IServiceCollection services) @@ -36,37 +37,30 @@ namespace Alive.Net.Example loggerFactory.AddConsole(Configuration.GetSection("Logging")); loggerFactory.AddDebug(); - if(env.IsDevelopment()) + if (env.IsDevelopment()) { - app.UseBrowserLink(); app.UseDeveloperExceptionPage(); + app.UseBrowserLink(); } else { app.UseExceptionHandler("/Home/Error"); } - app.UseAlive(a => - { - a.BodyText = "Im awesome"; - a.StatusCode = System.Net.HttpStatusCode.OK; - a.LivecheckPath = new Microsoft.AspNet.Http.PathString("/CustomLivecheck"); - }); - app.UseAlive(a => a.OnLivecheckResponse = (response) => - { - if(true) - { - response.BodyText = "awesome"; - response.StatusCode = System.Net.HttpStatusCode.BadGateway; - } - else - { - response.BodyText = "awesome"; - response.StatusCode = System.Net.HttpStatusCode.OK; - } - }); - app.UseIISPlatformHandler(); - - app.UseStaticFiles(); + //app.UseAlive(a => + //{ + // a.BodyText = "Im awesome"; + // a.StatusCode = System.Net.HttpStatusCode.OK; + // a.LivecheckPath = new Microsoft.AspNetCore.Http.PathString("/CustomLivecheck"); + //}); + //app.UseAlive(a => a.OnLivecheckResponse = (response) => + //{ + // if(true) + // { + // response.BodyText = "awesome"; + // response.StatusCode = System.Net.HttpStatusCode.BadGateway; + // } + //}); + app.UseStaticFiles(); app.UseMvc(routes => { @@ -75,8 +69,5 @@ namespace Alive.Net.Example template: "{controller=Home}/{action=Index}/{id?}"); }); } - - // Entry point for the application. - public static void Main(string[] args) => WebApplication.Run(args); } -} \ No newline at end of file +} diff --git a/src/Alive.Net.Example/Views/Home/Index.cshtml b/src/Alive.Net.Example/Views/Home/Index.cshtml index 26e337f..3cd243d 100644 --- a/src/Alive.Net.Example/Views/Home/Index.cshtml +++ b/src/Alive.Net.Example/Views/Home/Index.cshtml @@ -11,44 +11,44 @@
- ASP.NET -
+ ASP.NET +

Learn how to build ASP.NET apps that can run anywhere. - + Learn More

- Visual Studio -
+ Visual Studio +

There are powerful new features in Visual Studio for building modern web apps. - + Learn More

- Package Management -
+ Package Management +

Bring in libraries from NuGet, Bower, and npm, and automate tasks using Grunt or Gulp. - + Learn More

- Microsoft Azure -
+ Microsoft Azure +

Learn how Microsoft's Azure cloud platform allows you to build, deploy, and scale web apps. - + Learn More

@@ -69,8 +69,8 @@

Application uses

    -
  • Sample pages using ASP.NET MVC 6
    • -
  • Gulp and Bower for managing client-side libraries
    • +
  • Sample pages using ASP.NET Core MVC
    • +
  • Bower for managing client-side libraries
  • Theming using Bootstrap
@@ -78,7 +78,7 @@

How to

@@ -51,11 +51,11 @@ - - diff --git a/src/Alive.Net.Example/Views/_ViewImports.cshtml b/src/Alive.Net.Example/Views/_ViewImports.cshtml index f52b23f..6944639 100644 --- a/src/Alive.Net.Example/Views/_ViewImports.cshtml +++ b/src/Alive.Net.Example/Views/_ViewImports.cshtml @@ -1,2 +1,2 @@ @using Alive.Net.Example -@addTagHelper "*, Microsoft.AspNet.Mvc.TagHelpers" +@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers diff --git a/src/Alive.Net.Example/appsettings.json b/src/Alive.Net.Example/appsettings.json index cc127a8..fa8ce71 100644 --- a/src/Alive.Net.Example/appsettings.json +++ b/src/Alive.Net.Example/appsettings.json @@ -2,7 +2,7 @@ "Logging": { "IncludeScopes": false, "LogLevel": { - "Default": "Verbose", + "Default": "Debug", "System": "Information", "Microsoft": "Information" } diff --git a/src/Alive.Net.Example/bower.json b/src/Alive.Net.Example/bower.json index ac5514c..69159b6 100644 --- a/src/Alive.Net.Example/bower.json +++ b/src/Alive.Net.Example/bower.json @@ -1,10 +1,10 @@ { - "name": "ASP.NET", + "name": "asp.net", "private": true, "dependencies": { - "bootstrap": "3.3.5", - "jquery": "2.1.4", + "bootstrap": "3.3.6", + "jquery": "2.2.0", "jquery-validation": "1.14.0", - "jquery-validation-unobtrusive": "3.2.4" + "jquery-validation-unobtrusive": "3.2.6" } } diff --git a/src/Alive.Net.Example/bundleconfig.json b/src/Alive.Net.Example/bundleconfig.json new file mode 100644 index 0000000..04754ba --- /dev/null +++ b/src/Alive.Net.Example/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/Alive.Net.Example/gulpfile.js b/src/Alive.Net.Example/gulpfile.js deleted file mode 100644 index f79a1eb..0000000 --- a/src/Alive.Net.Example/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 paths = { - webroot: "./wwwroot/" -}; - -paths.js = paths.webroot + "js/**/*.js"; -paths.minJs = paths.webroot + "js/**/*.min.js"; -paths.css = paths.webroot + "css/**/*.css"; -paths.minCss = paths.webroot + "css/**/*.min.css"; -paths.concatJsDest = paths.webroot + "js/site.min.js"; -paths.concatCssDest = paths.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/Alive.Net.Example/package.json b/src/Alive.Net.Example/package.json deleted file mode 100644 index d4d71a9..0000000 --- a/src/Alive.Net.Example/package.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name": "ASP.NET", - "version": "0.0.0", - "devDependencies": { - "gulp": "3.8.11", - "gulp-concat": "2.5.2", - "gulp-cssmin": "0.1.7", - "gulp-uglify": "1.2.0", - "rimraf": "2.2.8" - } -} diff --git a/src/Alive.Net.Example/project.json b/src/Alive.Net.Example/project.json index e088a47..8e8aa85 100644 --- a/src/Alive.Net.Example/project.json +++ b/src/Alive.Net.Example/project.json @@ -1,44 +1,66 @@ { - "version": "1.0.0-*", - "compilationOptions": { - "emitEntryPoint": true - }, - "dependencies": { - "Microsoft.AspNet.Diagnostics": "1.0.0-rc1-final", - "Microsoft.AspNet.IISPlatformHandler": "1.0.0-rc1-final", - "Microsoft.AspNet.Mvc": "6.0.0-rc1-final", - "Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-rc1-final", - "Microsoft.AspNet.Server.Kestrel": "1.0.0-rc1-final", - "Microsoft.AspNet.StaticFiles": "1.0.0-rc1-final", - "Microsoft.AspNet.Tooling.Razor": "1.0.0-rc1-final", - "Microsoft.Extensions.Configuration.FileProviderExtensions": "1.0.0-rc1-final", - "Microsoft.Extensions.Configuration.Json": "1.0.0-rc1-final", - "Microsoft.Extensions.Logging": "1.0.0-rc1-final", - "Microsoft.Extensions.Logging.Console": "1.0.0-rc1-final", - "Microsoft.Extensions.Logging.Debug": "1.0.0-rc1-final", - "Microsoft.VisualStudio.Web.BrowserLink.Loader": "14.0.0-rc1-final", - "Alive.Net": "" + "Microsoft.NETCore.App": { + "version": "1.0.1", + "type": "platform" + }, + "Microsoft.AspNetCore.Diagnostics": "1.0.0", + "Microsoft.AspNetCore.Mvc": "1.0.1", + "Microsoft.AspNetCore.Razor.Tools": { + "version": "1.0.0-preview2-final", + "type": "build" + }, + "Microsoft.AspNetCore.Routing": "1.0.1", + "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0", + "Microsoft.AspNetCore.Server.Kestrel": "1.0.1", + "Microsoft.AspNetCore.StaticFiles": "1.0.0", + "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0", + "Microsoft.Extensions.Configuration.Json": "1.0.0", + "Microsoft.Extensions.Logging": "1.0.0", + "Microsoft.Extensions.Logging.Console": "1.0.0", + "Microsoft.Extensions.Logging.Debug": "1.0.0", + "Microsoft.Extensions.Options.ConfigurationExtensions": "1.0.0", + "Microsoft.VisualStudio.Web.BrowserLink.Loader": "14.0.0", + "Alive.Net": "*" }, - "commands": { - "web": "Microsoft.AspNet.Server.Kestrel" + "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" }, "frameworks": { - "dnx451": { }, - "dnxcore50": { } + "netcoreapp1.0": { + "imports": [ + "dotnet5.6", + "portable-net45+win8" + ] + } + }, + + "buildOptions": { + "emitEntryPoint": true, + "preserveCompilationContext": true + }, + + "runtimeOptions": { + "configProperties": { + "System.GC.Server": true + } + }, + + "publishOptions": { + "include": [ + "wwwroot", + "**/*.cshtml", + "appsettings.json", + "web.config" + ] }, - "exclude": [ - "wwwroot", - "node_modules" - ], - "publishExclude": [ - "**.user", - "**.vspscc" - ], "scripts": { - "prepublish": [ "npm install", "bower install", "gulp clean", "gulp min" ] + "prepublish": [ "bower install", "dotnet bundle" ], + "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ] } -} \ No newline at end of file +} diff --git a/src/Alive.Net.Example/web.config b/src/Alive.Net.Example/web.config new file mode 100644 index 0000000..dc0514f --- /dev/null +++ b/src/Alive.Net.Example/web.config @@ -0,0 +1,14 @@ + + + + + + + + + + + + diff --git a/src/Alive.Net.Example/wwwroot/_references.js b/src/Alive.Net.Example/wwwroot/_references.js index 9b2a791..b6fe9d6 100644 --- a/src/Alive.Net.Example/wwwroot/_references.js +++ b/src/Alive.Net.Example/wwwroot/_references.js @@ -1,5 +1,4 @@ /// -/// /// /// /// diff --git a/src/Alive.Net.Example/wwwroot/css/site.css b/src/Alive.Net.Example/wwwroot/css/site.css index 1eaae3d..a157770 100644 --- a/src/Alive.Net.Example/wwwroot/css/site.css +++ b/src/Alive.Net.Example/wwwroot/css/site.css @@ -18,17 +18,21 @@ textarea { } /* Carousel */ -.carousel-caption { - z-index: 10 !important; +.carousel-caption p { + font-size: 20px; + line-height: 1.4; } - .carousel-caption p { - font-size: 20px; - line-height: 1.4; - } - -@media (min-width: 768px) { - .carousel-caption { - z-index: 10 !important; - } +/* Make .svg files in the carousel display properly in older browsers */ +.carousel-inner .item img[src$=".svg"] +{ + width: 100%; +} + +/* Hide/rearrange for smaller screens */ +@media screen and (max-width: 767px) { + /* Hide captions */ + .carousel-caption { + display: none + } } diff --git a/src/Alive.Net.Example/wwwroot/css/site.min.css b/src/Alive.Net.Example/wwwroot/css/site.min.css new file mode 100644 index 0000000..3beb45f --- /dev/null +++ b/src/Alive.Net.Example/wwwroot/css/site.min.css @@ -0,0 +1 @@ +body{padding-top:50px;padding-bottom:20px}.body-content{padding-left:15px;padding-right:15px}input,select,textarea{max-width:280px}.carousel-caption p{font-size:20px;line-height:1.4}.carousel-inner .item img[src$=".svg"]{width:100%}@media screen and (max-width:767px){.carousel-caption{display:none}} \ No newline at end of file diff --git a/src/Alive.Net.Example/wwwroot/images/ASP-NET-Banners-01.png b/src/Alive.Net.Example/wwwroot/images/ASP-NET-Banners-01.png deleted file mode 100644 index ad3c267..0000000 Binary files a/src/Alive.Net.Example/wwwroot/images/ASP-NET-Banners-01.png and /dev/null differ diff --git a/src/Alive.Net.Example/wwwroot/images/ASP-NET-Banners-02.png b/src/Alive.Net.Example/wwwroot/images/ASP-NET-Banners-02.png deleted file mode 100644 index 16c37fc..0000000 Binary files a/src/Alive.Net.Example/wwwroot/images/ASP-NET-Banners-02.png and /dev/null differ diff --git a/src/Alive.Net.Example/wwwroot/images/Banner-01-Azure.png b/src/Alive.Net.Example/wwwroot/images/Banner-01-Azure.png deleted file mode 100644 index 59fb923..0000000 Binary files a/src/Alive.Net.Example/wwwroot/images/Banner-01-Azure.png and /dev/null differ diff --git a/src/Alive.Net.Example/wwwroot/images/Banner-02-VS.png b/src/Alive.Net.Example/wwwroot/images/Banner-02-VS.png deleted file mode 100644 index c9f4611..0000000 Binary files a/src/Alive.Net.Example/wwwroot/images/Banner-02-VS.png and /dev/null differ diff --git a/src/Alive.Net.Example/wwwroot/images/banner1.svg b/src/Alive.Net.Example/wwwroot/images/banner1.svg new file mode 100644 index 0000000..1ab32b6 --- /dev/null +++ b/src/Alive.Net.Example/wwwroot/images/banner1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/Alive.Net.Example/wwwroot/images/banner2.svg b/src/Alive.Net.Example/wwwroot/images/banner2.svg new file mode 100644 index 0000000..9679c60 --- /dev/null +++ b/src/Alive.Net.Example/wwwroot/images/banner2.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/Alive.Net.Example/wwwroot/images/banner3.svg b/src/Alive.Net.Example/wwwroot/images/banner3.svg new file mode 100644 index 0000000..9be2c25 --- /dev/null +++ b/src/Alive.Net.Example/wwwroot/images/banner3.svg @@ -0,0 +1 @@ +banner3b \ No newline at end of file diff --git a/src/Alive.Net.Example/wwwroot/images/banner4.svg b/src/Alive.Net.Example/wwwroot/images/banner4.svg new file mode 100644 index 0000000..38b3d7c --- /dev/null +++ b/src/Alive.Net.Example/wwwroot/images/banner4.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/Alive.Net.Example/wwwroot/js/site.min.js b/src/Alive.Net.Example/wwwroot/js/site.min.js new file mode 100644 index 0000000..e69de29 diff --git a/src/Alive.Net.Example/wwwroot/web.config b/src/Alive.Net.Example/wwwroot/web.config deleted file mode 100644 index 8485f67..0000000 --- a/src/Alive.Net.Example/wwwroot/web.config +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/src/Alive.Net.UnitTests/Alive.Net.UnitTests.xproj b/src/Alive.Net.UnitTests/Alive.Net.UnitTests.xproj index 4362708..13b28ac 100644 --- a/src/Alive.Net.UnitTests/Alive.Net.UnitTests.xproj +++ b/src/Alive.Net.UnitTests/Alive.Net.UnitTests.xproj @@ -9,7 +9,7 @@ 4ca8001b-27c7-4671-b451-2c2da00a3827 Alive.Net.UnitTests ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ + .\bin\ 2.0 diff --git a/src/Alive.Net.UnitTests/MainUnitTests.cs b/src/Alive.Net.UnitTests/MainUnitTests.cs index 88f6f7b..4631d44 100644 --- a/src/Alive.Net.UnitTests/MainUnitTests.cs +++ b/src/Alive.Net.UnitTests/MainUnitTests.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Http; using Moq; using Xunit; diff --git a/src/Alive.Net.UnitTests/project.json b/src/Alive.Net.UnitTests/project.json index 8e613b4..a39eab9 100644 --- a/src/Alive.Net.UnitTests/project.json +++ b/src/Alive.Net.UnitTests/project.json @@ -2,19 +2,24 @@ "version": "1.0.0-*", "description": "Alive.Net.UnitTests Class Library", "authors": [ "Tommy Parnell" ], + "testRunner": "xunit", "tags": [ "" ], "projectUrl": "", "licenseUrl": "", "dependencies": { - "Alive.Net": "", - "xunit": "2.1.0", - "xunit.runner.dnx": "2.1.0-rc1-build204", - "Moq": "4.2.1507.118" + "Alive.Net": "1.0.2", + "xunit": "2.2.0-beta2-build3300", + "dotnet-test-xunit": "2.2.0-preview2-build1029", + "Moq": "4.6.38-alpha" }, "frameworks": { - "dnx451": { } - }, - "commands": { - "test": "xunit.runner.dnx" + "netcoreapp1.0": { + "dependencies": { + "Microsoft.NETCore.App": { + "type": "platform", + "version": "1.0.0" + } + } + } } } \ No newline at end of file diff --git a/src/Alive.Net/Alive.Net.xproj b/src/Alive.Net/Alive.Net.xproj index 972c641..4cea509 100644 --- a/src/Alive.Net/Alive.Net.xproj +++ b/src/Alive.Net/Alive.Net.xproj @@ -4,17 +4,15 @@ 14.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - 1628a48e-dd1d-45c7-a316-6cfd8498845c Alive.Net ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ + .\bin\ - 2.0 - + \ No newline at end of file diff --git a/src/Alive.Net/Alive.cs b/src/Alive.Net/Alive.cs index cf246c7..9eab2f2 100644 --- a/src/Alive.Net/Alive.cs +++ b/src/Alive.Net/Alive.cs @@ -1,8 +1,8 @@ using System; using System.IO; using System.Threading.Tasks; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Http; namespace Alive.Net { diff --git a/src/Alive.Net/AliveOptions.cs b/src/Alive.Net/AliveOptions.cs index acc64be..f95b9d2 100644 --- a/src/Alive.Net/AliveOptions.cs +++ b/src/Alive.Net/AliveOptions.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Net; using System.Threading.Tasks; -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Http; namespace Alive.Net { diff --git a/src/Alive.Net/project.json b/src/Alive.Net/project.json index 3aec2f7..f40425c 100644 --- a/src/Alive.Net/project.json +++ b/src/Alive.Net/project.json @@ -1,23 +1,20 @@ { - "version": "1.0.1", + "version": "1.0.2", "description": "Livecheck middlewear", "authors": [ "Tommy Parnell" ], - "tags": [ "aspcore", "livecheck", "middlewear" ], - "projectUrl": "https://github.com/tparnell8/Alive.Net", - "licenseUrl": "", - "dependencies": { - "Microsoft.AspNet.Http.Abstractions": "1.0.0-rc1-final" + "packOptions": { + "tags": [ "aspcore", "livecheck", "middlewear" ], + "projectUrl": "https://github.com/tparnell8/Alive.Net" }, + "dependencies": { + "NETStandard.Library": "1.6.0", + "Microsoft.AspNetCore.Http.Abstractions": "1.0.0", + "Microsoft.AspNetCore.Hosting.Abstractions": "1.0.0" + }, + "frameworks": { - "net451": { }, - "dotnet5.4": { - "dependencies": { - "Microsoft.CSharp": "4.0.1-beta-23516", - "System.Collections": "4.0.11-beta-23516", - "System.Linq": "4.0.1-beta-23516", - "System.Runtime": "4.0.21-beta-23516", - "System.Threading": "4.0.11-beta-23516" - } + "netstandard1.6": { + "imports": "dnxcore50" } } -} \ No newline at end of file + } \ No newline at end of file