update to 2.1

This commit is contained in:
Tommy Parnell
2018-11-04 08:27:11 -05:00
parent c82f082280
commit 6cb5199362
4 changed files with 10 additions and 33 deletions

View File

@@ -3,7 +3,7 @@
<PropertyGroup>
<Description>Add support for Turbolinks</Description>
<Authors>Tommy Parnell</Authors>
<TargetFramework>netstandard1.6</TargetFramework>
<TargetFramework>netstandard2.0</TargetFramework>
<AssemblyName>TurboLinks.Net</AssemblyName>
<PackageId>TurboLinks.Net</PackageId>
<PackageTags>TurboLinks Middlewear</PackageTags>
@@ -12,8 +12,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="1.0.2" />
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="1.0.2" />
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.1.1" />
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.1.1" />
</ItemGroup>
</Project>

View File

@@ -24,13 +24,13 @@ namespace TurboLinks.Net
var request = context.Request;
var response = context.Response;
if(!string.IsNullOrWhiteSpace(request.Headers["X-XHR-Referer"]))
if (!string.IsNullOrWhiteSpace(request.Headers["X-XHR-Referer"]))
{
context.Response.Cookies.Append("request_method", request.Method, new CookieOptions { HttpOnly = false });
if(context.Response.StatusCode == 301 || context.Response.StatusCode == 302)
if (context.Response.StatusCode == 301 || context.Response.StatusCode == 302)
{
var uri = new Uri(response.Headers["Location"]);
if(uri.Host.Equals(request.Host.Value))
if (uri.Host.Equals(request.Host.Value))
{
response.Headers["X-XHR-Redirected-To"] = response.Headers["Location"];
}
@@ -45,9 +45,7 @@ namespace TurboLinks.Net
public static class BuilderExtension
{
public static void UseTurboLinks(this IApplicationBuilder app)
{
app.UseMiddleware<TurboLinks>();
}
public static IApplicationBuilder UseTurboLinks(this IApplicationBuilder app) => app.UseMiddleware<TurboLinks>();
}
}

View File

@@ -40,7 +40,6 @@ namespace TurboLinksExample
if (env.IsDevelopment())
{
app.UseDeveloperExceptionPage();
app.UseBrowserLink();
}
else
{

View File

@@ -1,13 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>netcoreapp1.0</TargetFramework>
<TargetFramework>netcoreapp2.1</TargetFramework>
<PreserveCompilationContext>true</PreserveCompilationContext>
<AssemblyName>TurboLinksExample</AssemblyName>
<OutputType>Exe</OutputType>
<PackageId>TurboLinksExample</PackageId>
<RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
<PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;portable-net45+win8</PackageTargetFallback>
</PropertyGroup>
<ItemGroup>
@@ -21,19 +17,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="1.0.2" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.0.3" />
<PackageReference Include="Microsoft.AspNetCore.Routing" Version="1.0.3" />
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.0.2" />
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.0.3" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.0.2" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.0.2" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.0.2" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.0.2" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.0.2" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.0.2" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.0.2" />
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="1.0.1" />
<PackageReference Include="Microsoft.AspNetCore.App" />
</ItemGroup>
<Target Name="PrepublishScript" BeforeTargets="PrepareForPublish">
@@ -41,8 +25,4 @@
<Exec Command="dotnet bundle" />
</Target>
<ItemGroup>
<DotNetCliToolReference Include="BundlerMinifier.Core" Version="2.2.301" />
</ItemGroup>
</Project>