Skip to content

Commit ac72143

Browse files
Merge pull request #8 from luisgoncalves/feature-net451
Add support for ASP.NET Core running on full .NET framework
2 parents 0892826 + ddccf3a commit ac72143

File tree

5 files changed

+22
-10
lines changed

5 files changed

+22
-10
lines changed

build.cake

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,13 @@ Task("Test")
2424
.Does(() =>
2525
{
2626
var testSettings = new DotNetCoreTestSettings { NoBuild = true, Configuration = configuration };
27+
28+
// Couldn't get 'dotnet-test-xunit' to run on .NET 4.5.1 on Ubuntu
29+
if(IsRunningOnUnix())
30+
{
31+
testSettings.Framework = "netcoreapp1.0";
32+
}
33+
2734
var testProjects = GetFiles("./test/*.Tests/project.json");
2835
foreach(var p in testProjects){
2936
DotNetCoreTest(p.ToString(), testSettings);

src/AspNetCore.Mvc.CookieTempData/CustomSaveTempDataFilter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ void IResultFilter.OnResultExecuting(ResultExecutingContext context)
3535
context.HttpContext.Response.OnStarting(() =>
3636
{
3737
tempDataDictionary.Save();
38-
return Task.CompletedTask;
38+
return Task.FromResult<object>(null);
3939
});
4040
}
4141

src/AspNetCore.Mvc.CookieTempData/project.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@
2222
},
2323

2424
"dependencies": {
25-
"NETStandard.Library": "1.6.0",
2625
"Microsoft.AspNetCore.Mvc.ViewFeatures": "1.0.0",
2726
"Microsoft.AspNetCore.DataProtection": "1.0.0",
2827
"Microsoft.Extensions.Options": "1.0.0",
2928
"Newtonsoft.Json": "9.0.1"
3029
},
3130

3231
"frameworks": {
33-
"netstandard1.6": {}
32+
"netstandard1.6": {},
33+
"net451": {}
3434
}
3535
}

test/AspNetCore.Mvc.CookieTempData.Client/project.json

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,20 @@
33
"AspNetCore.Mvc.CookieTempData": { "target": "project" },
44
"Microsoft.AspNetCore.Diagnostics": "1.0.0",
55
"Microsoft.AspNetCore.Mvc": "1.0.0",
6-
"Microsoft.NETCore.App": {
7-
"version": "1.0.0",
8-
"type": "platform"
9-
},
106
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0",
117
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0"
128
},
139

1410
"frameworks": {
15-
"netcoreapp1.0": {}
11+
"netcoreapp1.0": {
12+
"dependencies": {
13+
"Microsoft.NETCore.App": {
14+
"version": "1.0.0",
15+
"type": "platform"
16+
}
17+
}
18+
},
19+
"net451": {}
1620
},
1721

1822
"tools": {

test/AspNetCore.Mvc.CookieTempData.Tests/project.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"debugType": "portable"
55
},
66
"dependencies": {
7-
"xunit": "2.1.0",
7+
"xunit": "2.2.0-beta2-build3300",
88
"dotnet-test-xunit": "2.2.0-preview2-build1029",
99
"Moq": "4.6.25-*",
1010
"AspNetCore.Mvc.CookieTempData": { "target": "project" }
@@ -23,6 +23,7 @@
2323
"dotnet5.4",
2424
"portable-net451+win8"
2525
]
26-
}
26+
},
27+
"net451": {}
2728
}
2829
}

0 commit comments

Comments
 (0)