diff --git a/TurboLinks.Net.sln b/TurboLinks.Net.sln
index 4e7202b..a9adb45 100644
--- a/TurboLinks.Net.sln
+++ b/TurboLinks.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", "{D0D99B75-30C7-485A-B978-3008D6908B7B}"
EndProject
@@ -12,7 +12,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "TurboLinks.Net", "src\TurboLinks.Net\TurboLinks.Net.xproj", "{54979581-020C-4F8B-99B0-36C28FFBBADE}"
EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "TurboLinks.Net.Example", "src\TurboLinks.Net.Example\TurboLinks.Net.Example.xproj", "{7DB26401-AE70-47FC-8187-C8875B67196D}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "TurboLinksExample", "src\TurboLinksExample\TurboLinksExample.xproj", "{16DC6FE0-A511-45E0-BD49-28933EAD8A98}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -24,16 +24,16 @@ Global
{54979581-020C-4F8B-99B0-36C28FFBBADE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{54979581-020C-4F8B-99B0-36C28FFBBADE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{54979581-020C-4F8B-99B0-36C28FFBBADE}.Release|Any CPU.Build.0 = Release|Any CPU
- {7DB26401-AE70-47FC-8187-C8875B67196D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {7DB26401-AE70-47FC-8187-C8875B67196D}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {7DB26401-AE70-47FC-8187-C8875B67196D}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {7DB26401-AE70-47FC-8187-C8875B67196D}.Release|Any CPU.Build.0 = Release|Any CPU
+ {16DC6FE0-A511-45E0-BD49-28933EAD8A98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {16DC6FE0-A511-45E0-BD49-28933EAD8A98}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {16DC6FE0-A511-45E0-BD49-28933EAD8A98}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {16DC6FE0-A511-45E0-BD49-28933EAD8A98}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{54979581-020C-4F8B-99B0-36C28FFBBADE} = {D0D99B75-30C7-485A-B978-3008D6908B7B}
- {7DB26401-AE70-47FC-8187-C8875B67196D} = {D0D99B75-30C7-485A-B978-3008D6908B7B}
+ {16DC6FE0-A511-45E0-BD49-28933EAD8A98} = {D0D99B75-30C7-485A-B978-3008D6908B7B}
EndGlobalSection
EndGlobal
diff --git a/appveyor.yml b/appveyor.yml
index 4465ab3..ee349a3 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -8,15 +8,10 @@ init:
- git config --global core.autocrlf true
before_build:
- - ps: "&{$Branch='dev';iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/aspnet/Home/dev/dnvminstall.ps1'))}"
- - ps: dnvm upgrade
- - ps: dnvm update-self
- - ps: dnvm install 1.0.0-rc1-final
- - ps: dnvm list
- - ps: dnvm use 1.0.0-rc1-final
- - ps: npm cache clean
- - ps: dnu restore
- - cmd: set PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;%PATH%
+- ps: >-
+ (new-object net.webclient).DownloadFile('https://go.microsoft.com/fwlink/?LinkID=827524','core.exe')
+ core.exe /install /quiet /norestart
+ dotnet restore
artifacts:
- path: artifacts\bin\TurboLinks.Net\Release\*.nupkg
\ No newline at end of file
diff --git a/global.json b/global.json
index e9536a8..0ac230b 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
{
"projects": [ "src", "test" ],
"sdk": {
- "version": "1.0.0-beta8"
+ "version": "1.0.0-preview2-003131"
}
}
diff --git a/src/TurboLinks.Net.Example/Views/Shared/Error.cshtml b/src/TurboLinks.Net.Example/Views/Shared/Error.cshtml
deleted file mode 100644
index 4852442..0000000
--- a/src/TurboLinks.Net.Example/Views/Shared/Error.cshtml
+++ /dev/null
@@ -1,6 +0,0 @@
-@{
- ViewData["Title"] = "Error";
-}
-
-
Error.
-An error occurred while processing your request.
diff --git a/src/TurboLinks.Net.Example/Views/_ViewImports.cshtml b/src/TurboLinks.Net.Example/Views/_ViewImports.cshtml
deleted file mode 100644
index 0699136..0000000
--- a/src/TurboLinks.Net.Example/Views/_ViewImports.cshtml
+++ /dev/null
@@ -1,2 +0,0 @@
-@using TurboLinks.Net.Example
-@addTagHelper "*, Microsoft.AspNet.Mvc.TagHelpers"
diff --git a/src/TurboLinks.Net.Example/bower.json b/src/TurboLinks.Net.Example/bower.json
deleted file mode 100644
index ac5514c..0000000
--- a/src/TurboLinks.Net.Example/bower.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "name": "ASP.NET",
- "private": true,
- "dependencies": {
- "bootstrap": "3.3.5",
- "jquery": "2.1.4",
- "jquery-validation": "1.14.0",
- "jquery-validation-unobtrusive": "3.2.4"
- }
-}
diff --git a/src/TurboLinks.Net.Example/gulpfile.js b/src/TurboLinks.Net.Example/gulpfile.js
deleted file mode 100644
index f79a1eb..0000000
--- a/src/TurboLinks.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/TurboLinks.Net.Example/package.json b/src/TurboLinks.Net.Example/package.json
deleted file mode 100644
index d4d71a9..0000000
--- a/src/TurboLinks.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/TurboLinks.Net.Example/project.json b/src/TurboLinks.Net.Example/project.json
deleted file mode 100644
index f99f217..0000000
--- a/src/TurboLinks.Net.Example/project.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
- "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",
- "TurboLinks.Net": ""
- },
-
- "commands": {
- "web": "Microsoft.AspNet.Server.Kestrel"
- },
-
- "frameworks": {
- "dnx451": { },
- "dnxcore50": { }
- },
-
- "exclude": [
- "wwwroot",
- "node_modules"
- ],
- "publishExclude": [
- "**.user",
- "**.vspscc"
- ],
- "scripts": {
- "prepublish": [ "npm install", "bower install", "gulp clean", "gulp min" ]
- }
-}
\ No newline at end of file
diff --git a/src/TurboLinks.Net/TurboLinks.cs b/src/TurboLinks.Net/TurboLinks.cs
index 3861e0f..b0129e3 100644
--- a/src/TurboLinks.Net/TurboLinks.cs
+++ b/src/TurboLinks.Net/TurboLinks.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 TurboLinks.Net
{
diff --git a/src/TurboLinks.Net/project.json b/src/TurboLinks.Net/project.json
index ecf7e64..ce76ffe 100644
--- a/src/TurboLinks.Net/project.json
+++ b/src/TurboLinks.Net/project.json
@@ -1,23 +1,22 @@
{
- "version": "1.1.0",
+ "version": "1.1.1",
"description": "Add support for Turbolinks",
"authors": [ "Tommy Parnell" ],
- "tags": [ "TurboLinks Middlewear" ],
- "projectUrl": "https://github.com/tparnell8/TurboLinks.Net",
- "licenseUrl": "https://opensource.org/licenses/MIT",
- "dependencies": {
- "Microsoft.AspNet.Http.Abstractions": "1.0.0-rc1-final"
+ "packOptions": {
+ "tags": [ "TurboLinks Middlewear" ],
+ "projectUrl": "https://github.com/tparnell8/TurboLinks.Net",
+ "licenseUrl": "https://opensource.org/licenses/MIT"
},
+ "dependencies": {
+ "NETStandard.Library": "1.6.0",
+ "Microsoft.AspNetCore.Http.Abstractions": "1.0.0",
+ "Microsoft.AspNetCore.Hosting.Abstractions": "1.0.0",
+ "Microsoft.AspNetCore.StaticFiles": "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
diff --git a/src/TurboLinks.Net.Example/.bowerrc b/src/TurboLinksExample/.bowerrc
similarity index 100%
rename from src/TurboLinks.Net.Example/.bowerrc
rename to src/TurboLinksExample/.bowerrc
diff --git a/src/TurboLinks.Net.Example/Controllers/HomeController.cs b/src/TurboLinksExample/Controllers/HomeController.cs
similarity index 89%
rename from src/TurboLinks.Net.Example/Controllers/HomeController.cs
rename to src/TurboLinksExample/Controllers/HomeController.cs
index 6d6b590..6ef54af 100644
--- a/src/TurboLinks.Net.Example/Controllers/HomeController.cs
+++ b/src/TurboLinksExample/Controllers/HomeController.cs
@@ -2,9 +2,9 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNetCore.Mvc;
-namespace TurboLinks.Net.Example.Controllers
+namespace TurboLinksExample.Controllers
{
public class HomeController : Controller
{
diff --git a/src/TurboLinksExample/Program.cs b/src/TurboLinksExample/Program.cs
new file mode 100644
index 0000000..999cbf5
--- /dev/null
+++ b/src/TurboLinksExample/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 TurboLinksExample
+{
+ 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/TurboLinks.Net.Example/Project_Readme.html b/src/TurboLinksExample/Project_Readme.html
similarity index 89%
rename from src/TurboLinks.Net.Example/Project_Readme.html
rename to src/TurboLinksExample/Project_Readme.html
index 0fc12df..1a0f5b5 100644
--- a/src/TurboLinks.Net.Example/Project_Readme.html
+++ b/src/TurboLinksExample/Project_Readme.html
@@ -2,7 +2,7 @@
- Welcome to ASP.NET 5
+ Welcome to ASP.NET Core