Merge pull request #8 from luisgoncalves/feature-net451

Add support for ASP.NET Core running on full .NET framework
luisgoncalves · Aug 1, 2016 · ac72143 · ac72143
2 parents 0892826 + ddccf3a
commit ac72143
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 10 deletions.
diff --git a/build.cake b/build.cake
@@ -24,6 +24,13 @@ Task("Test")
  .Does(() => 
  {
  var testSettings = new DotNetCoreTestSettings { NoBuild = true, Configuration = configuration };
+
+ // Couldn't get 'dotnet-test-xunit' to run on .NET 4.5.1 on Ubuntu 
+ if(IsRunningOnUnix())
+ {
+ testSettings.Framework = "netcoreapp1.0";
+ }
+
  var testProjects = GetFiles("./test/*.Tests/project.json"); 
  foreach(var p in testProjects){
  DotNetCoreTest(p.ToString(), testSettings);

diff --git a/src/AspNetCore.Mvc.CookieTempData/CustomSaveTempDataFilter.cs b/src/AspNetCore.Mvc.CookieTempData/CustomSaveTempDataFilter.cs
@@ -35,7 +35,7 @@ void IResultFilter.OnResultExecuting(ResultExecutingContext context)
  context.HttpContext.Response.OnStarting(() =>
  {
  tempDataDictionary.Save();
- return Task.CompletedTask;
+ return Task.FromResult<object>(null);
  });
  }
 

diff --git a/src/AspNetCore.Mvc.CookieTempData/project.json b/src/AspNetCore.Mvc.CookieTempData/project.json
@@ -22,14 +22,14 @@
  },
 
  "dependencies": {
- "NETStandard.Library": "1.6.0",
  "Microsoft.AspNetCore.Mvc.ViewFeatures": "1.0.0",
  "Microsoft.AspNetCore.DataProtection": "1.0.0",
  "Microsoft.Extensions.Options": "1.0.0",
  "Newtonsoft.Json": "9.0.1"
  },
 
  "frameworks": {
- "netstandard1.6": {}
+ "netstandard1.6": {},
+ "net451": {}
  }
 }
diff --git a/test/AspNetCore.Mvc.CookieTempData.Client/project.json b/test/AspNetCore.Mvc.CookieTempData.Client/project.json
@@ -3,16 +3,20 @@
  "AspNetCore.Mvc.CookieTempData": { "target": "project" },
  "Microsoft.AspNetCore.Diagnostics": "1.0.0",
  "Microsoft.AspNetCore.Mvc": "1.0.0",
- "Microsoft.NETCore.App": {
- "version": "1.0.0",
- "type": "platform"
- },
  "Microsoft.AspNetCore.Server.Kestrel": "1.0.0",
  "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0"
  },
 
  "frameworks": {
- "netcoreapp1.0": {}
+ "netcoreapp1.0": {
+ "dependencies": {
+ "Microsoft.NETCore.App": {
+ "version": "1.0.0",
+ "type": "platform"
+ }
+ }
+ },
+ "net451": {}
  },
 
  "tools": {

diff --git a/test/AspNetCore.Mvc.CookieTempData.Tests/project.json b/test/AspNetCore.Mvc.CookieTempData.Tests/project.json
@@ -4,7 +4,7 @@
  "debugType": "portable"
  },
  "dependencies": {
- "xunit": "2.1.0",
+ "xunit": "2.2.0-beta2-build3300",
  "dotnet-test-xunit": "2.2.0-preview2-build1029",
  "Moq": "4.6.25-*",
  "AspNetCore.Mvc.CookieTempData": { "target": "project" }
@@ -23,6 +23,7 @@
  "dotnet5.4",
  "portable-net451+win8"
  ]
- }
+ },
+ "net451": {}
  }
 }