diff --git a/build/dependencies.props b/build/dependencies.props index 6357e113ef..2a301f9789 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -2,6 +2,7 @@ 2.0.0-* 0.10.3 + 4.3.0 2.0.0-* 4.1.0 1.0.* diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Microsoft.AspNetCore.Mvc.Abstractions.csproj b/src/Microsoft.AspNetCore.Mvc.Abstractions/Microsoft.AspNetCore.Mvc.Abstractions.csproj index f7420d0d75..d56306d8ce 100644 --- a/src/Microsoft.AspNetCore.Mvc.Abstractions/Microsoft.AspNetCore.Mvc.Abstractions.csproj +++ b/src/Microsoft.AspNetCore.Mvc.Abstractions/Microsoft.AspNetCore.Mvc.Abstractions.csproj @@ -19,6 +19,7 @@ Microsoft.AspNetCore.Mvc.IActionResult + diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Microsoft.AspNetCore.Mvc.Core.csproj b/src/Microsoft.AspNetCore.Mvc.Core/Microsoft.AspNetCore.Mvc.Core.csproj index 540895d096..6fc978d20b 100644 --- a/src/Microsoft.AspNetCore.Mvc.Core/Microsoft.AspNetCore.Mvc.Core.csproj +++ b/src/Microsoft.AspNetCore.Mvc.Core/Microsoft.AspNetCore.Mvc.Core.csproj @@ -39,6 +39,7 @@ Microsoft.AspNetCore.Mvc.RouteAttribute + diff --git a/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Microsoft.AspNetCore.Mvc.DataAnnotations.csproj b/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Microsoft.AspNetCore.Mvc.DataAnnotations.csproj index 526abe375f..d48a59c82d 100644 --- a/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Microsoft.AspNetCore.Mvc.DataAnnotations.csproj +++ b/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Microsoft.AspNetCore.Mvc.DataAnnotations.csproj @@ -15,5 +15,6 @@ + diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Microsoft.AspNetCore.Mvc.Razor.csproj b/src/Microsoft.AspNetCore.Mvc.Razor/Microsoft.AspNetCore.Mvc.Razor.csproj index a88cf75224..cc83d825b6 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor/Microsoft.AspNetCore.Mvc.Razor.csproj +++ b/src/Microsoft.AspNetCore.Mvc.Razor/Microsoft.AspNetCore.Mvc.Razor.csproj @@ -24,6 +24,6 @@ + - diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/FSharpWebSiteTest.cs b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/FSharpWebSiteTest.cs deleted file mode 100644 index 44c50206cb..0000000000 --- a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/FSharpWebSiteTest.cs +++ /dev/null @@ -1,44 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Net; -using System.Net.Http; -using System.Threading.Tasks; -using Xunit; - -namespace Microsoft.AspNetCore.Mvc.FunctionalTests -{ - public class FSharpWebSiteTest : IClassFixture> - { - public FSharpWebSiteTest(MvcTestFixture fixture) - { - Client = fixture.Client; - } - - public HttpClient Client { get; } - - [Fact] - public async Task HomeIndex_ReturnsHtml() - { - // Act - var response = await Client.GetAsync("http://localhost/"); - var responseBody = await response.Content.ReadAsStringAsync(); - - // Assert - Assert.Equal(HttpStatusCode.OK, response.StatusCode); - Assert.Contains("

Hello from FSharpWebSite

", responseBody); - } - - [Fact] - public async Task HomeAsyncAction_ReturnsContentAsynchronously() - { - // Act - var response = await Client.GetAsync("http://localhost/home/asyncaction"); - var responseBody = await response.Content.ReadAsStringAsync(); - - // Assert - Assert.Equal(HttpStatusCode.OK, response.StatusCode); - Assert.Contains("Action completed asynchronously", responseBody); - } - } -} diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj index 9c5d44ad52..6fb9fcadf3 100644 --- a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj +++ b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj @@ -4,13 +4,25 @@ netcoreapp2.0;net461 netcoreapp2.0 - $(PackageTargetFallback);portable-net451+win8 + $(PackageTargetFallback);portable-net451+win8 $(DefineConstants);GENERATE_BASELINES $(DefineConstants);__RemoveThisBitTo__GENERATE_BASELINES $(DefineConstants);FUNCTIONAL_TESTS + + + x86 + + + true + true + + @@ -32,7 +44,6 @@ - @@ -47,7 +58,6 @@ - diff --git a/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest.csproj b/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest.csproj index 823cb6bbf3..a0ed489f22 100644 --- a/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest.csproj +++ b/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest.csproj @@ -3,9 +3,11 @@ - netcoreapp2.0;net461 + netcoreapp2.0 netcoreapp2.0 - $(PackageTargetFallback);portable-net451+win8 + $(PackageTargetFallback);portable-net451+win8 + true + true diff --git a/test/WebSites/FSharpWebSite/FSharpWebSite.fsproj b/test/WebSites/FSharpWebSite/FSharpWebSite.fsproj index 3727a0472a..5b250bab5f 100644 --- a/test/WebSites/FSharpWebSite/FSharpWebSite.fsproj +++ b/test/WebSites/FSharpWebSite/FSharpWebSite.fsproj @@ -2,8 +2,7 @@ - netcoreapp2.0;net461 - netcoreapp2.0 + netcoreapp2.0 diff --git a/test/WebSites/WebApiCompatShimWebSite/WebApiCompatShimWebSite.csproj b/test/WebSites/WebApiCompatShimWebSite/WebApiCompatShimWebSite.csproj index 9f77abdfbe..18f2f3b10b 100644 --- a/test/WebSites/WebApiCompatShimWebSite/WebApiCompatShimWebSite.csproj +++ b/test/WebSites/WebApiCompatShimWebSite/WebApiCompatShimWebSite.csproj @@ -15,5 +15,6 @@ +