huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update tests to latest compat switch

This commit is contained in:
Pranav K 2018-08-14 16:13:17 -07:00
parent e2de54a92d
commit 8eea0ad44c
60 changed files with 495 additions and 253 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
samples/MvcSandbox/Startup.cs
View File

@ -14,7 +14,7 @@ namespace MvcSandbox
// This method gets called by the runtime. Use this method to add services to the container.
public void ConfigureServices(IServiceCollection services)
{
services.AddMvc().SetCompatibilityVersion(Microsoft.AspNetCore.Mvc.CompatibilityVersion.Version_2_2);
services.AddMvc().SetCompatibilityVersion(Microsoft.AspNetCore.Mvc.CompatibilityVersion.Latest);
}
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.

15
src/Microsoft.AspNetCore.Mvc.Core/Internal/MvcEndpointDataSource.cs
View File

@ -13,6 +13,7 @@ using Microsoft.AspNetCore.Mvc.Infrastructure;
using Microsoft.AspNetCore.Mvc.Routing;
using Microsoft.AspNetCore.Routing;
using Microsoft.AspNetCore.Routing.Patterns;
using Microsoft.Extensions.FileProviders;
using Microsoft.Extensions.Primitives;
namespace Microsoft.AspNetCore.Mvc.Internal
@ -59,10 +60,6 @@ namespace Microsoft.AspNetCore.Mvc.Internal
_httpContextInstance = new DefaultHttpContext() { RequestServices = serviceProvider };
ConventionalEndpointInfos = new List<MvcEndpointInfo>();
Extensions.Primitives.ChangeToken.OnChange(
GetCompositeChangeToken,
UpdateEndpoints);
}
private List<Endpoint> CreateEndpoints()
@ -454,7 +451,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal
return new CompositeChangeToken(changeTokens);
}
public override IChangeToken GetChangeToken() => GetCompositeChangeToken();
public override IChangeToken GetChangeToken() => NullChangeToken.Singleton;
public override IReadOnlyList<Endpoint> Endpoints
{
@ -479,14 +476,6 @@ namespace Microsoft.AspNetCore.Mvc.Internal
}
}
private void UpdateEndpoints()
{
lock (_lock)
{
_endpoints = CreateEndpoints();
}
}
public List<MvcEndpointInfo> ConventionalEndpointInfos { get; }
private class SuppressLinkGenerationMetadata : ISuppressLinkGenerationMetadata { }

4
test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/MvcEndpointDataSourceTests.cs
View File

@ -133,7 +133,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal
Assert.True(actionInvokerCalled);
}
[Fact]
[Fact(Skip = "https://github.com/aspnet/Routing/issues/722")]
public void GetChangeToken_MultipleChangeTokenProviders_ComposedResult()
{
// Arrange
@ -287,7 +287,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal
actionDescriptorCollectionProviderMock.VerifyGet(m => m.ActionDescriptors, Times.Once);
}
[Fact]
[Fact(Skip = "https://github.com/aspnet/Routing/issues/722")]
public void Endpoints_ChangeTokenTriggered_EndpointsRecreated()
{
// Arrange

2
test/Microsoft.AspNetCore.Mvc.FunctionalTests/ApiExplorerTest.cs
View File

@ -1087,7 +1087,7 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests
});
}
[Fact]
[Fact(Skip = "https://github.com/aspnet/Routing/issues/722")]
public async Task ApiExplorer_Updates_WhenActionDescriptorCollectionIsUpdated()
{
// Act - 1

2
test/Microsoft.AspNetCore.Mvc.FunctionalTests/ApplicationModelTest.cs
View File

@ -128,7 +128,7 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests
Assert.Equal("From Header - HelloWorld", body);
}
[Fact]
[Fact(Skip = "https://github.com/aspnet/Routing/issues/721")]
public async Task ActionModelSuppressedForPathMatching_CannotBeRouted()
{
// Arrange & Act

25
test/Microsoft.AspNetCore.Mvc.FunctionalTests/CorsEndpointRoutingTests.cs
View File

@ -1,34 +1,13 @@
// 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 Microsoft.AspNetCore.Cors.Infrastructure;
using Xunit;
namespace Microsoft.AspNetCore.Mvc.FunctionalTests
{
public class CorsEndpointRoutingTests : CorsTestsBase<CorsWebSite.StartupWithEndpointRouting>
public class CorsEndpointRoutingTests : CorsTestsBase<CorsWebSite.Startup>
{
public CorsEndpointRoutingTests(MvcTestFixture<CorsWebSite.StartupWithEndpointRouting> fixture)
public CorsEndpointRoutingTests(MvcTestFixture<CorsWebSite.Startup> fixture)
: base(fixture)
{
}
[Fact] // This intentionally returns a 405 with endpoint routing
public override async Task PreflightRequestOnNonCorsEnabledController_DoesNotMatchTheAction()
{
// Arrange
var request = new HttpRequestMessage(new HttpMethod("OPTIONS"), "http://localhost/NonCors/Post");
request.Headers.Add(CorsConstants.Origin, "http://example.com");
request.Headers.Add(CorsConstants.AccessControlRequestMethod, "POST");
// Act
var response = await Client.SendAsync(request);
// Assert
Assert.Equal(HttpStatusCode.MethodNotAllowed, response.StatusCode);
}
}
}

25
test/Microsoft.AspNetCore.Mvc.FunctionalTests/CorsTests.cs
View File

@ -1,13 +1,34 @@
// 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 Microsoft.AspNetCore.Cors.Infrastructure;
using Xunit;
namespace Microsoft.AspNetCore.Mvc.FunctionalTests
{
public class CorsTests : CorsTestsBase<CorsWebSite.Startup>
public class CorsTests : CorsTestsBase<CorsWebSite.StartupWith21Compat>
{
public CorsTests(MvcTestFixture<CorsWebSite.Startup> fixture)
public CorsTests(MvcTestFixture<CorsWebSite.StartupWith21Compat> fixture)
: base(fixture)
{
}
[Fact]
public override async Task PreflightRequestOnNonCorsEnabledController_DoesNotMatchTheAction()
{
// Arrange
var request = new HttpRequestMessage(new HttpMethod("OPTIONS"), "http://localhost/NonCors/Post");
request.Headers.Add(CorsConstants.Origin, "http://example.com");
request.Headers.Add(CorsConstants.AccessControlRequestMethod, "POST");
// Act
var response = await Client.SendAsync(request);
// Assert
Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
}
}
}

2
test/Microsoft.AspNetCore.Mvc.FunctionalTests/CorsTestsBase.cs
View File

@ -94,7 +94,7 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests
var response = await Client.SendAsync(request);
// Assert
Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
Assert.Equal(HttpStatusCode.MethodNotAllowed, response.StatusCode);
}
[Theory]

39
test/Microsoft.AspNetCore.Mvc.FunctionalTests/EndpointRoutingTest.cs
View File

@ -10,9 +10,9 @@ using Xunit;
namespace Microsoft.AspNetCore.Mvc.FunctionalTests
{
public class EndpointRoutingTest : RoutingTestsBase<RoutingWebSite.StartupWithEndpointRouting>
public class EndpointRoutingTest : RoutingTestsBase<RoutingWebSite.Startup>
{
public EndpointRoutingTest(MvcTestFixture<RoutingWebSite.StartupWithEndpointRouting> fixture)
public EndpointRoutingTest(MvcTestFixture<RoutingWebSite.Startup> fixture)
: base(fixture)
{
}
@ -32,26 +32,6 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests
Assert.True(result);
}
[Fact]
public override Task AttributeRoutedAction_InArea_StaysInArea_ActionDoesntExist()
{
// By design, this test cannot work in EndpointRouting world. This is because in case of old routing test
// when a link generation to an attribute routed controller with a non-existing action does not succeeed,
// the next route in the route collection is considered and since the next route in the route collection is
// a conventional area route, the old routing test succeeds. But this cannot happen in case of endpoint
// routing as the action does not exist to begin with.
return Task.CompletedTask;
}
[Fact]
public override Task ConventionalRoutedAction_InArea_StaysInArea()
{
// By design, this test cannot work in EndpointRouting world. In old routing test a link is being generated
// to a non-existing action on a controller which is in an area. In case of endpoint routing, we cannot
// generate links as the action does not exist to begin with.
return Task.CompletedTask;
}
[Fact]
public async override Task RouteData_Routers_ConventionalRoute()
{
@ -97,21 +77,6 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests
Assert.Equal(HttpStatusCode.MethodNotAllowed, response.StatusCode);
}
// Endpoint routing exposes HTTP 405s for HTTP method mismatches
[Fact]
public override async Task AttributeRoutedAction_MultipleRouteAttributes_RouteAttributeTemplatesIgnoredForOverrideActions()
{
// Arrange
var url = "http://localhost/api/v1/Maps";
// Act
var response = await Client.SendAsync(new HttpRequestMessage(new HttpMethod("POST"), url));
// Assert
Assert.Equal(HttpStatusCode.MethodNotAllowed, response.StatusCode);
}
// Endpoint routing exposes HTTP 405s for HTTP method mismatches
[Theory]
[MemberData(nameof(AttributeRoutedAction_MultipleRouteAttributes_WithMultipleHttpAttributes_RespectsConstraintsData))]
public override async Task AttributeRoutedAction_MultipleRouteAttributes_WithMultipleHttpAttributes_RespectsConstraints(

10
test/Microsoft.AspNetCore.Mvc.FunctionalTests/GlobalAuthorizationFilterTest.cs
View File

@ -6,9 +6,7 @@ using System.Net;
using System.Net.Http;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc.Infrastructure;
using Microsoft.AspNetCore.Mvc.Testing;
using Microsoft.Extensions.DependencyInjection;
using Xunit;
namespace Microsoft.AspNetCore.Mvc.FunctionalTests
@ -58,11 +56,9 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests
public async Task AuthorizationPoliciesDoNotCombine_WithV2_0()
{
// Arrange & Act
var factory = Factory.WithWebHostBuilder(
builder => builder.ConfigureServices(
services => services.Configure<MvcCompatibilityOptions>(
options => options.CompatibilityVersion = CompatibilityVersion.Version_2_0)));
var client = factory.CreateDefaultClient();
var client = Factory
.WithWebHostBuilder(builder => builder.UseStartup<SecurityWebSite.StartupWith20CompatAndGlobalDenyAnonymousFilter>())
.CreateDefaultClient();
var response = await client.PostAsync("http://localhost/Administration/SignInCookie2", null);
// Assert

40
test/Microsoft.AspNetCore.Mvc.FunctionalTests/HtmlGenerationTest.cs
View File

@ -10,8 +10,8 @@ using System.Net.Http.Headers;
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
using AngleSharp.Dom;
using AngleSharp.Dom.Html;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc.Testing;
using Xunit;
namespace Microsoft.AspNetCore.Mvc.FunctionalTests
@ -26,14 +26,21 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests
MvcTestFixture<HtmlGenerationWebSite.Startup> fixture,
MvcEncodedTestFixture<HtmlGenerationWebSite.Startup> encodedFixture)
{
Factory = fixture.Factories.FirstOrDefault() ?? fixture.WithWebHostBuilder(ConfigureWebHostBuilder);
Client = fixture.CreateDefaultClient();
EncodedClient = encodedFixture.CreateDefaultClient();
}
private static void ConfigureWebHostBuilder(IWebHostBuilder builder) =>
builder.UseStartup<HtmlGenerationWebSite.Startup>();
public HttpClient Client { get; }
public HttpClient EncodedClient { get; }
public WebApplicationFactory<HtmlGenerationWebSite.Startup> Factory { get; }
public static TheoryData<string, string> WebPagesData
{
get
@ -131,6 +138,35 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests
}
}
[Fact]
public async Task HtmlGenerationWebSite_LinkGeneration_With21CompatibilityBehavior()
{
// Arrange
var client = Factory
.WithWebHostBuilder(builder => builder.UseStartup<HtmlGenerationWebSite.StartupWith21CompatibilityBehavior>())
.CreateDefaultClient();
var expectedMediaType = MediaTypeHeaderValue.Parse("text/html; charset=utf-8");
var outputFile = "compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Index21Compat.html";
var expectedContent =
await ResourceFile.ReadResourceAsync(_resourcesAssembly, outputFile, sourceFile: false);
// Act
// The host is not important as everything runs in memory and tests are isolated from each other.
var response = await client.GetAsync("http://localhost/HtmlGeneration_Home/");
var responseContent = await response.Content.ReadAsStringAsync();
// Assert
Assert.Equal(HttpStatusCode.OK, response.StatusCode);
Assert.Equal(expectedMediaType, response.Content.Headers.ContentType);
responseContent = responseContent.Trim();
#if GENERATE_BASELINES
ResourceFile.UpdateFile(_resourcesAssembly, outputFile, expectedContent, responseContent);
#else
Assert.Equal(expectedContent.Trim(), responseContent, ignoreLineEndingDifferences: true);
#endif
}
public static TheoryData<string, string> EncodedPagesData
{
get

4
test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/MvcTestFixture.cs
View File

@ -3,7 +3,6 @@
using System.Globalization;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc.Infrastructure;
using Microsoft.AspNetCore.Mvc.Testing;
using Microsoft.AspNetCore.TestHost;
using Microsoft.Extensions.DependencyInjection;
@ -26,9 +25,6 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests
var testSink = new TestSink();
var loggerFactory = new TestLoggerFactory(testSink, enabled: true);
services.AddSingleton<ILoggerFactory>(loggerFactory);
services.Configure<MvcCompatibilityOptions>(
options => options.CompatibilityVersion = CompatibilityVersion.Version_2_1);
});
}

2
test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPagesTest.cs
View File

@ -919,7 +919,7 @@ Hello from /Pages/WithViewStart/Index.cshtml!";
{
// Arrange
var expected =
@"Microsoft.AspNetCore.Mvc.Routing.UrlHelper
@"Microsoft.AspNetCore.Mvc.Routing.EndpointRoutingUrlHelper
Microsoft.AspNetCore.Mvc.ViewFeatures.HtmlHelper`1[AspNetCore.InjectedPageProperties]
Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary`1[AspNetCore.InjectedPageProperties]";

61
test/Microsoft.AspNetCore.Mvc.FunctionalTests/RoutingTests.cs
View File

@ -2,6 +2,7 @@
// 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 Microsoft.AspNetCore.Mvc.Internal;
using Microsoft.AspNetCore.Routing;
@ -10,9 +11,9 @@ using Xunit;
namespace Microsoft.AspNetCore.Mvc.FunctionalTests
{
public class RoutingTests : RoutingTestsBase<RoutingWebSite.Startup>
public class RoutingTests : RoutingTestsBase<RoutingWebSite.StartupWith21Compat>
{
public RoutingTests(MvcTestFixture<RoutingWebSite.Startup> fixture)
public RoutingTests(MvcTestFixture<RoutingWebSite.StartupWith21Compat> fixture)
: base(fixture)
{
}
@ -32,6 +33,62 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests
Assert.False(result);
}
// Legacy routing supports linking to actions that don't exist
[Fact]
public async Task AttributeRoutedAction_InArea_StaysInArea_ActionDoesntExist()
{
// Arrange
var url = LinkFrom("http://localhost/ContosoCorp/Trains")
.To(new { action = "Contact", controller = "Home", });
// Act
var response = await Client.GetAsync(url);
// Assert
Assert.Equal(HttpStatusCode.OK, response.StatusCode);
var body = await response.Content.ReadAsStringAsync();
var result = JsonConvert.DeserializeObject<RoutingResult>(body);
Assert.Equal("Rail", result.Controller);
Assert.Equal("Index", result.Action);
Assert.Equal("/Travel/Home/Contact", result.Link);
}
[Fact]
public async Task ConventionalRoutedAction_InArea_StaysInArea()
{
// Arrange
var url = LinkFrom("http://localhost/Travel/Flight").To(new { action = "Contact", controller = "Home", });
// Act
var response = await Client.GetAsync(url);
// Assert
Assert.Equal(HttpStatusCode.OK, response.StatusCode);
var body = await response.Content.ReadAsStringAsync();
var result = JsonConvert.DeserializeObject<RoutingResult>(body);
Assert.Equal("Flight", result.Controller);
Assert.Equal("Index", result.Action);
Assert.Equal("/Travel/Home/Contact", result.Link);
}
// Legacy routing returns 404 when an action does not support a HTTP method.
[Fact]
public override async Task AttributeRoutedAction_MultipleRouteAttributes_RouteAttributeTemplatesIgnoredForOverrideActions()
{
// Arrange
var url = "http://localhost/api/v1/Maps";
// Act
var response = await Client.SendAsync(new HttpRequestMessage(new HttpMethod("POST"), url));
// Assert
Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
}
[Fact]
public async override Task RouteData_Routers_ConventionalRoute()
{

49
test/Microsoft.AspNetCore.Mvc.FunctionalTests/RoutingTestsBase.cs
View File

@ -340,7 +340,7 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests
var response = await Client.SendAsync(new HttpRequestMessage(new HttpMethod("POST"), url));
// Assert
Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
Assert.Equal(HttpStatusCode.MethodNotAllowed, response.StatusCode);
}
[Theory]
@ -1016,26 +1016,6 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests
Assert.Equal("/", result.Link);
}
[Fact]
public virtual async Task ConventionalRoutedAction_InArea_StaysInArea()
{
// Arrange
var url = LinkFrom("http://localhost/Travel/Flight").To(new { action = "Contact", controller = "Home", });
// Act
var response = await Client.GetAsync(url);
// Assert
Assert.Equal(HttpStatusCode.OK, response.StatusCode);
var body = await response.Content.ReadAsStringAsync();
var result = JsonConvert.DeserializeObject<RoutingResult>(body);
Assert.Equal("Flight", result.Controller);
Assert.Equal("Index", result.Action);
Assert.Equal("/Travel/Home/Contact", result.Link);
}
[Fact]
public virtual async Task AttributeRoutedAction_LinkToArea()
{
@ -1098,26 +1078,7 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests
Assert.Equal("/", result.Link);
}
[Fact]
public virtual async Task AttributeRoutedAction_InArea_StaysInArea_ActionDoesntExist()
{
// Arrange
var url = LinkFrom("http://localhost/ContosoCorp/Trains")
.To(new { action = "Contact", controller = "Home", });
// Act
var response = await Client.GetAsync(url);
// Assert
Assert.Equal(HttpStatusCode.OK, response.StatusCode);
var body = await response.Content.ReadAsStringAsync();
var result = JsonConvert.DeserializeObject<RoutingResult>(body);
Assert.Equal("Rail", result.Controller);
Assert.Equal("Index", result.Action);
Assert.Equal("/Travel/Home/Contact", result.Link);
}
[Fact]
public virtual async Task AttributeRoutedAction_InArea_LinkToConventionalRoutedActionInArea()
@ -1280,13 +1241,13 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests
Assert.Equal(actionName, result.Action);
}
private static LinkBuilder LinkFrom(string url)
protected static LinkBuilder LinkFrom(string url)
{
return new LinkBuilder(url);
}
// See TestResponseGenerator in RoutingWebSite for the code that generates this data.
private class RoutingResult
protected class RoutingResult
{
public string[] ExpectedUrls { get; set; }
@ -1303,7 +1264,7 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests
public string Link { get; set; }
}
private class LinkBuilder
protected class LinkBuilder
{
public LinkBuilder(string url)
{

4
test/Microsoft.AspNetCore.Mvc.FunctionalTests/VersioningEndpointRoutingTests.cs
View File

@ -9,9 +9,9 @@ using Xunit;
namespace Microsoft.AspNetCore.Mvc.FunctionalTests
{
public class VersioningEndpointRoutingTests : VersioningTestsBase<VersioningWebSite.StartupWithEndpointRouting>
public class VersioningEndpointRoutingTests : VersioningTestsBase<VersioningWebSite.Startup>
{
public VersioningEndpointRoutingTests(MvcTestFixture<VersioningWebSite.StartupWithEndpointRouting> fixture)
public VersioningEndpointRoutingTests(MvcTestFixture<VersioningWebSite.Startup> fixture)
: base(fixture)
{
}

4
test/Microsoft.AspNetCore.Mvc.FunctionalTests/VersioningTests.cs
View File

@ -8,9 +8,9 @@ using Xunit;
namespace Microsoft.AspNetCore.Mvc.FunctionalTests
{
public class VersioningTests : VersioningTestsBase<VersioningWebSite.Startup>
public class VersioningTests : VersioningTestsBase<VersioningWebSite.StartupWith21Compat>
{
public VersioningTests(MvcTestFixture<VersioningWebSite.Startup> fixture)
public VersioningTests(MvcTestFixture<VersioningWebSite.StartupWith21Compat> fixture)
: base(fixture)
{
}

14
test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Index.Encoded.html
View File

@ -13,7 +13,7 @@
<a href="HtmlEncode[[/]]">Default Controller</a>
</div>
<div>
<a href="HtmlEncode[[/Product/Index#fragment]]">Product Index Fragment</a>
<a href="HtmlEncode[[/HtmlGeneration_Product#fragment]]">Product Index Fragment</a>
</div>
<div>
<a href="HtmlEncode[[/HtmlGeneration_Product/Submit#fragment]]">Product Submit Fragment</a>
@ -39,32 +39,32 @@
</a>
</div>
<div>
<a href="HtmlEncode[[/Customer/Customer#fragment]]">Customer Area Customer Index</a>
<a href="HtmlEncode[[/Customer/HtmlGeneration_Customer#fragment]]">Customer Area Customer Index</a>
</div>
<div>
<a href="/Order/List">Href Order List</a>
</div>
<div>
<a href="HtmlEncode[[/NonExistentController]]">Non-existent Controller</a>
<a href="">Non-existent Controller</a>
</div>
<div>
<a href="HtmlEncode[[/NonExistentController#fragment]]">
<a href="">
Non-existent Controller Fragment
</a>
</div>
<div>
<a href="HtmlEncode[[/Order/NonExistentAction]]">Non-existent Action</a>
<a href="">Non-existent Action</a>
</div>
<div>
<a id="Id" href="HtmlEncode[[http://somewhere/]]">Some Where</a>
</div>
<div>
<a href="HtmlEncode[[unknown://localhost/NoControll#fragment]]">
<a href="">
Unknown Protocol Non-existent Controller Fragment
</a>
</div>
<div>
<a href="HtmlEncode[[/Product/Submit?area=NonExistentArea&id=1#fragment]]">Product Route Non-existent Area Parameter</a>
<a href="">Product Route Non-existent Area Parameter</a>
</div>
<div>
<a href="">Non-existent Area</a>

14
test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Index.html
View File

@ -13,7 +13,7 @@
<a href="/">Default Controller</a>
</div>
<div>
<a href="/Product/Index#fragment">Product Index Fragment</a>
<a href="/HtmlGeneration_Product#fragment">Product Index Fragment</a>
</div>
<div>
<a href="/HtmlGeneration_Product/Submit#fragment">Product Submit Fragment</a>
@ -39,32 +39,32 @@
</a>
</div>
<div>
<a href="/Customer/Customer#fragment">Customer Area Customer Index</a>
<a href="/Customer/HtmlGeneration_Customer#fragment">Customer Area Customer Index</a>
</div>
<div>
<a href="/Order/List">Href Order List</a>
</div>
<div>
<a href="/NonExistentController">Non-existent Controller</a>
<a href="">Non-existent Controller</a>
</div>
<div>
<a href="/NonExistentController#fragment">
<a href="">
Non-existent Controller Fragment
</a>
</div>
<div>
<a href="/Order/NonExistentAction">Non-existent Action</a>
<a href="">Non-existent Action</a>
</div>
<div>
<a id="Id" href="http://somewhere/">Some Where</a>
</div>
<div>
<a href="unknown://localhost/NoControll#fragment">
<a href="">
Unknown Protocol Non-existent Controller Fragment
</a>
</div>
<div>
<a href="/Product/Submit?area=NonExistentArea&amp;id=1#fragment">Product Route Non-existent Area Parameter</a>
<a href="">Product Route Non-existent Area Parameter</a>
</div>
<div>
<a href="">Non-existent Area</a>

73
test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Index21Compat.html Normal file
View File

@ -0,0 +1,73 @@
<html>
<body>
<div>
<a title="&lt;the title>" href="/HtmlGeneration_Product">Product Index</a>
</div>
<div>
<a title='"the" title' href="/HtmlGeneration_Product/List">Product List</a>
</div>
<div>
<a id="HtmlGenerationWebSite_Index">HtmlGenerationWebSite Index</a>
</div>
<div>
<a href="/">Default Controller</a>
</div>
<div>
<a href="/HtmlGeneration_Product#fragment">Product Index Fragment</a>
</div>
<div>
<a href="/HtmlGeneration_Product/Submit#fragment">Product Submit Fragment</a>
</div>
<div>
<a id="HtmlGenerationWebSite_IndexFragment" href="/#fragment">
HtmlGenerationWebSite Index Fragment
</a>
</div>
<div>
<a href="ftp://localhost/#fragment">
FTP HtmlGenerationWebSite Index Fragment
</a>
</div>
<div>
<a href="unkonwn://localhost/HtmlGeneration_Product/List">
Unknown Protocol Product List
</a>
</div>
<div>
<a id="HtmlGenerationWebSite_IndexProtocol" href="/">
Empty Protocol HtmlGenerationWebSite Index
</a>
</div>
<div>
<a href="/Customer/HtmlGeneration_Customer#fragment">Customer Area Customer Index</a>
</div>
<div>
<a href="/Order/List">Href Order List</a>
</div>
<div>
<a href="/NonExistentController">Non-existent Controller</a>
</div>
<div>
<a href="/NonExistentController#fragment">
Non-existent Controller Fragment
</a>
</div>
<div>
<a href="/Order/NonExistentAction">Non-existent Action</a>
</div>
<div>
<a id="Id" href="http://somewhere/">Some Where</a>
</div>
<div>
<a href="unknown://localhost/NoControll#fragment">
Unknown Protocol Non-existent Controller Fragment
</a>
</div>
<div>
<a href="/Product/Submit?area=NonExistentArea&amp;id=1#fragment">Product Route Non-existent Area Parameter</a>
</div>
<div>
<a href="">Non-existent Area</a>
</div>
</body>
</html>

4
test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.About.html
View File

@ -12,8 +12,8 @@
<body>
<h1 style="font-family: cursive;">ASP.NET vNext - About</h1>
<p>| <a href="/" style="background-color: gray;color: white;border-radius: 3px;border: 1px solid black;padding: 3px;font-family: cursive;">My Home</a>
| <a href="/home/about" style="background-color: gray;color: white;border-radius: 3px;border: 1px solid black;padding: 3px;font-family: cursive;">My About</a>
| <a href="/home/help" style="background-color: gray;color: white;border-radius: 3px;border: 1px solid black;padding: 3px;font-family: cursive;">My Help</a> |</p>
| <a href="/Home/About" style="background-color: gray;color: white;border-radius: 3px;border: 1px solid black;padding: 3px;font-family: cursive;">My About</a>
| <a href="/Home/Help" style="background-color: gray;color: white;border-radius: 3px;border: 1px solid black;padding: 3px;font-family: cursive;">My Help</a> |</p>
<div>

4
test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.Help.html
View File

@ -12,8 +12,8 @@
<body>
<h1 style="font-family: cursive;">ASP.NET vNext - Help</h1>
<p>| <a href="/" style="background-color: gray;color: white;border-radius: 3px;border: 1px solid black;padding: 3px;font-family: cursive;">My Home</a>
| <a href="/home/about" style="background-color: gray;color: white;border-radius: 3px;border: 1px solid black;padding: 3px;font-family: cursive;">My About</a>
| <a href="/home/help" style="background-color: gray;color: white;border-radius: 3px;border: 1px solid black;padding: 3px;font-family: cursive;">My Help</a> |</p>
| <a href="/Home/About" style="background-color: gray;color: white;border-radius: 3px;border: 1px solid black;padding: 3px;font-family: cursive;">My About</a>
| <a href="/Home/Help" style="background-color: gray;color: white;border-radius: 3px;border: 1px solid black;padding: 3px;font-family: cursive;">My Help</a> |</p>
<div>

4
test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.Index.html
View File

@ -19,8 +19,8 @@
<body>
<h1 style="font-family: cursive;">ASP.NET vNext - Home Page</h1>
<p>| <a href="/" style="background-color: gray;color: white;border-radius: 3px;border: 1px solid black;padding: 3px;font-family: cursive;">My Home</a>
| <a href="/home/about" style="background-color: gray;color: white;border-radius: 3px;border: 1px solid black;padding: 3px;font-family: cursive;">My About</a>
| <a href="/home/help" style="background-color: gray;color: white;border-radius: 3px;border: 1px solid black;padding: 3px;font-family: cursive;">My Help</a> |</p>
| <a href="/Home/About" style="background-color: gray;color: white;border-radius: 3px;border: 1px solid black;padding: 3px;font-family: cursive;">My About</a>
| <a href="/Home/Help" style="background-color: gray;color: white;border-radius: 3px;border: 1px solid black;padding: 3px;font-family: cursive;">My Help</a> |</p>
<div>

4
test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.ViewComponentTagHelpers.html
View File

@ -12,8 +12,8 @@
<body>
<h1 style="font-family: cursive;">ASP.NET vNext - </h1>
<p>| <a href="/" style="background-color: gray;color: white;border-radius: 3px;border: 1px solid black;padding: 3px;font-family: cursive;">My Home</a>
| <a href="/home/about" style="background-color: gray;color: white;border-radius: 3px;border: 1px solid black;padding: 3px;font-family: cursive;">My About</a>
| <a href="/home/help" style="background-color: gray;color: white;border-radius: 3px;border: 1px solid black;padding: 3px;font-family: cursive;">My Help</a> |</p>
| <a href="/Home/About" style="background-color: gray;color: white;border-radius: 3px;border: 1px solid black;padding: 3px;font-family: cursive;">My About</a>
| <a href="/Home/Help" style="background-color: gray;color: white;border-radius: 3px;border: 1px solid black;padding: 3px;font-family: cursive;">My Help</a> |</p>
<div>
<div>Items: </div>

18
test/WebSites/ApiExplorerWebSite/ActionDescriptorChangeProvider.cs
View File

@ -9,20 +9,22 @@ namespace ApiExplorerWebSite
{
public class ActionDescriptorChangeProvider : IActionDescriptorChangeProvider
{
private ActionDescriptorChangeProvider()
public ActionDescriptorChangeProvider(WellKnownChangeToken changeToken)
{
ChangeToken = changeToken;
}
public static ActionDescriptorChangeProvider Instance { get; } = new ActionDescriptorChangeProvider();
public CancellationTokenSource TokenSource { get; private set; }
public bool HasChanged { get; set; }
public WellKnownChangeToken ChangeToken { get; }
public IChangeToken GetChangeToken()
{
TokenSource = new CancellationTokenSource();
return new CancellationChangeToken(TokenSource.Token);
if (ChangeToken.TokenSource.IsCancellationRequested)
{
var changeTokenSource = new CancellationTokenSource();
return new CancellationChangeToken(changeTokenSource.Token);
}
return new CancellationChangeToken(ChangeToken.TokenSource.Token);
}
}
}

35
test/WebSites/ApiExplorerWebSite/ApiExplorerRouteChangeConvention.cs Normal file
View File

@ -0,0 +1,35 @@
// 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;
using System.Linq;
using Microsoft.AspNetCore.Mvc.ApplicationModels;
namespace ApiExplorerWebSite
{
public class ApiExplorerRouteChangeConvention : Attribute, IActionModelConvention
{
public ApiExplorerRouteChangeConvention(WellKnownChangeToken changeToken)
{
ChangeToken = changeToken;
}
public WellKnownChangeToken ChangeToken { get; }
public void Apply(ActionModel action)
{
if (action.Attributes.OfType<ReloadAttribute>().Any() && ChangeToken.TokenSource.IsCancellationRequested)
{
action.ActionName = "NewIndex";
action.Selectors.Clear();
action.Selectors.Add(new SelectorModel
{
AttributeRouteModel = new AttributeRouteModel
{
Template = "NewIndex"
}
});
}
}
}
}

28
test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerReloadableController.cs
View File

@ -1,45 +1,23 @@
// 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;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.ApplicationModels;
namespace ApiExplorerWebSite
{
[Route("ApiExplorerReload")]
public class ApiExplorerReloadableController : Controller
{
[ApiExplorerRouteChangeConvention]
[Route("Index")]
[Reload]
public string Index() => "Hello world";
[Route("Reload")]
[PassThru]
public IActionResult Reload()
public IActionResult Reload([FromServices] WellKnownChangeToken changeToken)
{
ActionDescriptorChangeProvider.Instance.HasChanged = true;
ActionDescriptorChangeProvider.Instance.TokenSource.Cancel();
changeToken.TokenSource.Cancel();
return Ok();
}
public class ApiExplorerRouteChangeConventionAttribute : Attribute, IActionModelConvention
{
public void Apply(ActionModel action)
{
if (ActionDescriptorChangeProvider.Instance.HasChanged)
{
action.ActionName = "NewIndex";
action.Selectors.Clear();
action.Selectors.Add(new SelectorModel
{
AttributeRouteModel = new AttributeRouteModel
{
Template = "NewIndex"
}
});
}
}
}
}
}

8
test/WebSites/ApiExplorerWebSite/ReloadAttribute.cs Normal file
View File

@ -0,0 +1,8 @@
using System;
namespace ApiExplorerWebSite
{
public class ReloadAttribute : Attribute
{
}
}

11
test/WebSites/ApiExplorerWebSite/Startup.cs
View File

@ -6,6 +6,7 @@ using System.Linq;
using ApiExplorerWebSite.Controllers;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Formatters;
using Microsoft.AspNetCore.Mvc.Infrastructure;
using Microsoft.Extensions.DependencyInjection;
@ -19,6 +20,8 @@ namespace ApiExplorerWebSite
public void ConfigureServices(IServiceCollection services)
{
services.AddTransient<ILoggerFactory, LoggerFactory>();
var wellKnownChangeToken = new WellKnownChangeToken();
services.AddMvc(options =>
{
options.Filters.AddService(typeof(ApiExplorerDataFilter));
@ -28,17 +31,19 @@ namespace ApiExplorerWebSite
typeof(ApiExplorerVisbilityDisabledByConventionController)));
options.Conventions.Add(new ApiExplorerInboundOutboundConvention(
typeof(ApiExplorerInboundOutBoundController)));
options.Conventions.Add(new ApiExplorerRouteChangeConvention(wellKnownChangeToken));
var jsonOutputFormatter = options.OutputFormatters.OfType<JsonOutputFormatter>().First();
options.OutputFormatters.Clear();
options.OutputFormatters.Add(jsonOutputFormatter);
options.OutputFormatters.Add(new XmlDataContractSerializerOutputFormatter());
});
})
.SetCompatibilityVersion(CompatibilityVersion.Latest);
services.AddSingleton<ApiExplorerDataFilter>();
services.AddSingleton<IActionDescriptorChangeProvider>(ActionDescriptorChangeProvider.Instance);
services.AddSingleton(ActionDescriptorChangeProvider.Instance);
services.AddSingleton<IActionDescriptorChangeProvider, ActionDescriptorChangeProvider>();
services.AddSingleton(wellKnownChangeToken);
}
public void Configure(IApplicationBuilder app)

12
test/WebSites/ApiExplorerWebSite/WellKnownChangeToken.cs Normal file
View File

@ -0,0 +1,12 @@
// 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.Threading;
namespace ApiExplorerWebSite
{
public class WellKnownChangeToken
{
public CancellationTokenSource TokenSource { get; } = new CancellationTokenSource();
}
}

4
test/WebSites/ApplicationModelWebSite/Startup.cs
View File

@ -4,6 +4,7 @@
using System.IO;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.DependencyInjection;
namespace ApplicationModelWebSite
@ -20,7 +21,8 @@ namespace ApplicationModelWebSite
options.Conventions.Add(new FromHeaderConvention());
options.Conventions.Add(new MultipleAreasControllerConvention());
options.Conventions.Add(new CloneActionConvention());
});
})
.SetCompatibilityVersion(CompatibilityVersion.Latest);
}
public void Configure(IApplicationBuilder app)

4
test/WebSites/BasicWebSite/StartupRequestLimitSize.cs
View File

@ -5,6 +5,7 @@ using System;
using System.IO;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Http.Features;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.DependencyInjection;
namespace BasicWebSite
@ -13,7 +14,8 @@ namespace BasicWebSite
{
public void ConfigureServices(IServiceCollection services)
{
services.AddMvc();
services.AddMvc()
.SetCompatibilityVersion(CompatibilityVersion.Latest);
services.ConfigureBaseWebSiteAuthPolicies();
}

4
test/WebSites/BasicWebSite/StartupWithCookieTempDataProviderAndCookieConsent.cs
View File

@ -2,6 +2,7 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.DependencyInjection;
namespace BasicWebSite
@ -10,7 +11,8 @@ namespace BasicWebSite
{
public void ConfigureServices(IServiceCollection services)
{
services.AddMvc();
services.AddMvc()
.SetCompatibilityVersion(CompatibilityVersion.Latest);
services.Configure<CookiePolicyOptions>(o =>
{

4
test/WebSites/BasicWebSite/StartupWithSessionTempDataProvider.cs
View File

@ -2,6 +2,7 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.DependencyInjection;
namespace BasicWebSite
@ -13,7 +14,8 @@ namespace BasicWebSite
// CookieTempDataProvider is the default ITempDataProvider, so we must override it with session.
services
.AddMvc()
.AddSessionStateTempDataProvider();
.AddSessionStateTempDataProvider()
.SetCompatibilityVersion(CompatibilityVersion.Latest);
services.AddSession();
services.ConfigureBaseWebSiteAuthPolicies();

5
test/WebSites/ControllersFromServicesWebSite/Startup.cs
View File

@ -11,7 +11,7 @@ using ControllersFromServicesWebSite.Components;
using ControllersFromServicesWebSite.TagHelpers;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.ApplicationParts;
using Microsoft.Extensions.DependencyInjection;
@ -36,7 +36,8 @@ namespace ControllersFromServicesWebSite
})
.AddControllersAsServices()
.AddViewComponentsAsServices()
.AddTagHelpersAsServices();
.AddTagHelpersAsServices()
.SetCompatibilityVersion(CompatibilityVersion.Latest);
services.AddTransient<QueryValueService>();
services.AddTransient<ValueService>();

6
test/WebSites/CorsWebSite/Startup.cs
View File

@ -1,10 +1,9 @@
// 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.IO;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Cors.Infrastructure;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.DependencyInjection;
namespace CorsWebSite
@ -13,7 +12,8 @@ namespace CorsWebSite
{
public void ConfigureServices(IServiceCollection services)
{
services.AddMvc();
services.AddMvc()
.SetCompatibilityVersion(CompatibilityVersion.Latest);
services.Configure<CorsOptions>(options =>
{
options.AddPolicy(

8
test/WebSites/CorsWebSite/StartupWithEndpointRouting.cs → test/WebSites/CorsWebSite/StartupWith21Compat.cs
View File

@ -1,19 +1,19 @@
// 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.IO;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Cors.Infrastructure;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.DependencyInjection;
namespace CorsWebSite
{
public class StartupWithEndpointRouting
public class StartupWith21Compat
{
public void ConfigureServices(IServiceCollection services)
{
services.AddMvc(options => options.EnableEndpointRouting = true);
services.AddMvc()
.SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
services.Configure<CorsOptions>(options =>
{
options.AddPolicy(

4
test/WebSites/ErrorPageMiddlewareWebSite/Startup.cs
View File

@ -4,6 +4,7 @@
using System.IO;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.DependencyInjection;
namespace ErrorPageMiddlewareWebSite
@ -13,7 +14,8 @@ namespace ErrorPageMiddlewareWebSite
// Set up application services
public void ConfigureServices(IServiceCollection services)
{
services.AddMvc();
services.AddMvc()
.SetCompatibilityVersion(CompatibilityVersion.Latest);
}
public void Configure(IApplicationBuilder app)

4
test/WebSites/FilesWebSite/Startup.cs
View File

@ -4,6 +4,7 @@
using System.IO;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.DependencyInjection;
namespace FilesWebSite
@ -13,7 +14,8 @@ namespace FilesWebSite
// Set up application services
public void ConfigureServices(IServiceCollection services)
{
services.AddMvc();
services.AddMvc()
.SetCompatibilityVersion(CompatibilityVersion.Latest);
}
public void Configure(IApplicationBuilder app)

5
test/WebSites/HtmlGenerationWebSite/Startup.cs
View File

@ -4,6 +4,7 @@
using System.IO;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.TagHelpers;
using Microsoft.Extensions.DependencyInjection;
@ -16,7 +17,9 @@ namespace HtmlGenerationWebSite
{
// Add MVC services to the services container. Change default FormTagHelper.AntiForgery to false. Usually
// null which is interpreted as true unless element includes an action attribute.
services.AddMvc().InitializeTagHelper<FormTagHelper>((helper, _) => helper.Antiforgery = false);
services.AddMvc()
.InitializeTagHelper<FormTagHelper>((helper, _) => helper.Antiforgery = false)
.SetCompatibilityVersion(CompatibilityVersion.Latest);
services.AddSingleton(typeof(ISignalTokenProviderService<>), typeof(SignalTokenProviderService<>));
services.AddSingleton<ProductsService>();

55
test/WebSites/HtmlGenerationWebSite/StartupWith21CompatibilityBehavior.cs Normal file
View File

@ -0,0 +1,55 @@
// 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.IO;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.TagHelpers;
using Microsoft.Extensions.DependencyInjection;
namespace HtmlGenerationWebSite
{
public class StartupWith21CompatibilityBehavior
{
// Set up application services
public void ConfigureServices(IServiceCollection services)
{
// Add MVC services to the services container. Change default FormTagHelper.AntiForgery to false. Usually
// null which is interpreted as true unless element includes an action attribute.
services.AddMvc()
.InitializeTagHelper<FormTagHelper>((helper, _) => helper.Antiforgery = false)
.SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
services.AddSingleton(typeof(ISignalTokenProviderService<>), typeof(SignalTokenProviderService<>));
services.AddSingleton<ProductsService>();
}
public void Configure(IApplicationBuilder app)
{
app.UseStaticFiles();
app.UseMvc(routes =>
{
routes.MapRoute(
name: "areaRoute",
template: "{area:exists}/{controller}/{action}/{id?}",
defaults: new { action = "Index" });
routes.MapRoute(
name: "productRoute",
template: "Product/{action}",
defaults: new { controller = "Product" });
routes.MapRoute(
name: "default",
template: "{controller}/{action}/{id?}",
defaults: new { controller = "HtmlGeneration_Home", action = "Index" });
});
}
public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory())
.UseStartup<Startup>()
.UseKestrel()
.UseIISIntegration();
}
}

1
test/WebSites/HtmlGenerationWebSite/StartupWithCultureReplace.cs
View File

@ -5,7 +5,6 @@ using System.Globalization;
using System.IO;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Localization;
using Microsoft.Extensions.DependencyInjection;
namespace HtmlGenerationWebSite

4
test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Index.cshtml
View File

@ -19,7 +19,7 @@
<a asp-action="Index">Default Controller</a>
</div>
<div>
<a asp-fragment="fragment" asp-controller="Product">Product Index Fragment</a>
<a asp-fragment="fragment" asp-controller="HtmlGeneration_Product">Product Index Fragment</a>
</div>
<div>
<a asp-controller="HtmlGeneration_Product" asp-action="Submit" asp-fragment="fragment">Product Submit Fragment</a>
@ -46,7 +46,7 @@
</div>
<div>
<a asp-route="areaRoute" asp-route-area="Customer"
asp-route-controller="Customer"
asp-route-controller="HtmlGeneration_Customer"
asp-route-action="Index"
asp-fragment="fragment">Customer Area Customer Index</a>
</div>

4
test/WebSites/RazorBuildWebSite/Startup.cs
View File

@ -4,6 +4,7 @@
using System.IO;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.DependencyInjection;
namespace RazorBuildWebSite
@ -12,7 +13,8 @@ namespace RazorBuildWebSite
{
public void ConfigureServices(IServiceCollection services)
{
services.AddMvc();
services.AddMvc()
.SetCompatibilityVersion(CompatibilityVersion.Latest);
}
public void Configure(IApplicationBuilder app)

4
test/WebSites/RazorPagesWebSite/Startup.cs
View File

@ -4,6 +4,7 @@
using System.Globalization;
using Microsoft.AspNetCore.Authentication.Cookies;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.DependencyInjection;
using RazorPagesWebSite.Conventions;
@ -25,7 +26,8 @@ namespace RazorPagesWebSite
options.Conventions.AddPageRoute("/Pages/NotTheRoot", string.Empty);
options.Conventions.Add(new CustomModelTypeConvention());
})
.WithRazorPagesAtContentRoot();
.WithRazorPagesAtContentRoot()
.SetCompatibilityVersion(CompatibilityVersion.Latest);
}
public void Configure(IApplicationBuilder app)

4
test/WebSites/RazorPagesWebSite/StartupWithBasePath.cs
View File

@ -3,6 +3,7 @@
using Microsoft.AspNetCore.Authentication.Cookies;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.DependencyInjection;
using RazorPagesWebSite.Conventions;
@ -24,7 +25,8 @@ namespace RazorPagesWebSite
options.Conventions.AuthorizeAreaFolder("Accounts", "/RequiresAuth");
options.Conventions.AllowAnonymousToAreaPage("Accounts", "/RequiresAuth/AllowAnonymous");
options.Conventions.Add(new CustomModelTypeConvention());
});
})
.SetCompatibilityVersion(CompatibilityVersion.Latest);
}
public void Configure(IApplicationBuilder app)

2
test/WebSites/RazorWebSite/Controllers/EmbeddedViewsController.cs
View File

@ -7,6 +7,8 @@ namespace RazorWebSite.Controllers
{
public class EmbeddedViewsController : Controller
{
public IActionResult Index() => null;
public IActionResult LookupByName() => View("Index");
public IActionResult LookupByPath() => View("/Views/EmbeddedViews/Index.cshtml");

4
test/WebSites/RazorWebSite/Startup.cs
View File

@ -6,6 +6,7 @@ using System.Globalization;
using System.Reflection;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Localization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Razor;
using Microsoft.AspNetCore.Razor.TagHelpers;
using Microsoft.Extensions.DependencyInjection;
@ -41,7 +42,8 @@ namespace RazorWebSite
options.HtmlHelperOptions.ValidationMessageElement = "validationMessageElement";
options.HtmlHelperOptions.ValidationSummaryMessageElement = "validationSummaryElement";
})
.AddMvcLocalization(LanguageViewLocationExpanderFormat.SubFolder);
.AddMvcLocalization(LanguageViewLocationExpanderFormat.SubFolder)
.SetCompatibilityVersion(CompatibilityVersion.Latest);
services.AddTransient<InjectedHelper>();
services.AddTransient<TaskReturningService>();

5
test/WebSites/RazorWebSite/StartupDataAnnotations.cs
View File

@ -6,7 +6,6 @@ using System.Globalization;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Localization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Infrastructure;
using Microsoft.Extensions.DependencyInjection;
namespace RazorWebSite
@ -25,8 +24,8 @@ namespace RazorWebSite
{
options.DataAnnotationLocalizerProvider =
(modelType, stringLocalizerFactory) => stringLocalizerFactory.Create(typeof(SingleType));
});
services.Configure<MvcCompatibilityOptions>(options => options.CompatibilityVersion = CompatibilityVersion.Latest);
})
.SetCompatibilityVersion(CompatibilityVersion.Latest);
}
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.

12
test/WebSites/RoutingWebSite/Startup.cs
View File

@ -1,9 +1,8 @@
// 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.IO;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Infrastructure;
using Microsoft.Extensions.DependencyInjection;
@ -14,7 +13,8 @@ namespace RoutingWebSite
// Set up application services
public void ConfigureServices(IServiceCollection services)
{
services.AddMvc();
services.AddMvc()
.SetCompatibilityVersion(CompatibilityVersion.Latest);
services.AddScoped<TestResponseGenerator>();
services.AddSingleton<IActionContextAccessor, ActionContextAccessor>();
@ -29,8 +29,7 @@ namespace RoutingWebSite
"adminRoute",
"{area:exists}/{controller}/{action}",
new { controller = "Home", action = "Index" },
new { area = "Travel" }
);
new { area = "Travel" });
routes.MapRoute(
"ActionAsMethod",
@ -43,5 +42,4 @@ namespace RoutingWebSite
});
}
}
}
}

5
test/WebSites/RoutingWebSite/StartupWithEndpointRouting.cs → test/WebSites/RoutingWebSite/StartupWith21Compat.cs
View File

@ -2,18 +2,19 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Infrastructure;
using Microsoft.Extensions.DependencyInjection;
namespace RoutingWebSite
{
public class StartupWithEndpointRouting
public class StartupWith21Compat
{
// Set up application services
public void ConfigureServices(IServiceCollection services)
{
services.AddMvc()
.AddMvcOptions(options => options.EnableEndpointRouting = true);
.SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
services.AddScoped<TestResponseGenerator>();
services.AddSingleton<IActionContextAccessor, ActionContextAccessor>();

4
test/WebSites/SecurityWebSite/Startup.cs
View File

@ -4,6 +4,7 @@
using Microsoft.AspNetCore.Authentication.Cookies;
using Microsoft.AspNetCore.Authorization.Policy;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.DependencyInjection;
namespace SecurityWebSite
@ -14,7 +15,8 @@ namespace SecurityWebSite
public void ConfigureServices(IServiceCollection services)
{
// Add framework services.
services.AddMvc();
services.AddMvc()
.SetCompatibilityVersion(CompatibilityVersion.Latest);
services.AddAntiforgery();
services.AddAuthentication(CookieAuthenticationDefaults.AuthenticationScheme).AddCookie(options =>
{

41
test/WebSites/SecurityWebSite/StartupWith20CompatAndGlobalDenyAnonymousFilter.cs Normal file
View File

@ -0,0 +1,41 @@
// 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 Microsoft.AspNetCore.Authentication.Cookies;
using Microsoft.AspNetCore.Authorization.Policy;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Authorization;
using Microsoft.Extensions.DependencyInjection;
namespace SecurityWebSite
{
public class StartupWith20CompatAndGlobalDenyAnonymousFilter
{
public void ConfigureServices(IServiceCollection services)
{
services
.AddAuthentication(CookieAuthenticationDefaults.AuthenticationScheme)
.AddCookie(options =>
{
options.LoginPath = "/Home/Login";
options.LogoutPath = "/Home/Logout";
}).AddCookie("Cookie2");
services.AddMvc(o =>
{
o.Filters.Add(new AuthorizeFilter());
})
.SetCompatibilityVersion(CompatibilityVersion.Version_2_0);
services.AddScoped<IPolicyEvaluator, CountingPolicyEvaluator>();
}
public void Configure(IApplicationBuilder app)
{
app.UseAuthentication();
app.UseMvcWithDefaultRoute();
}
}
}

4
test/WebSites/SecurityWebSite/StartupWithGlobalDenyAnonymousFilter.cs
View File

@ -4,6 +4,7 @@
using Microsoft.AspNetCore.Authentication.Cookies;
using Microsoft.AspNetCore.Authorization.Policy;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Authorization;
using Microsoft.Extensions.DependencyInjection;
@ -24,7 +25,8 @@ namespace SecurityWebSite
services.AddMvc(o =>
{
o.Filters.Add(new AuthorizeFilter());
});
})
.SetCompatibilityVersion(CompatibilityVersion.Latest);
services.AddScoped<IPolicyEvaluator, CountingPolicyEvaluator>();
}

6
test/WebSites/SimpleWebSite/Startup.cs
View File

@ -2,11 +2,10 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System.IO;
using System.Text.Encodings.Web;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.WebEncoders.Testing;
using Microsoft.Net.Http.Headers;
using Newtonsoft.Json;
@ -21,7 +20,8 @@ namespace SimpleWebSite
.AddMvcCore()
.AddAuthorization()
.AddFormatterMappings(m => m.SetMediaTypeMappingForFormat("js", new MediaTypeHeaderValue("application/json")))
.AddJsonFormatters(j => j.Formatting = Formatting.Indented);
.AddJsonFormatters(j => j.Formatting = Formatting.Indented)
.SetCompatibilityVersion(CompatibilityVersion.Latest);
}
public void Configure(IApplicationBuilder app)

4
test/WebSites/TagHelpersWebSite/Startup.cs
View File

@ -4,6 +4,7 @@
using System.IO;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.DependencyInjection;
namespace TagHelpersWebSite
@ -13,7 +14,8 @@ namespace TagHelpersWebSite
// Set up application services
public void ConfigureServices(IServiceCollection services)
{
services.AddMvc();
services.AddMvc()
.SetCompatibilityVersion(CompatibilityVersion.Latest);
}
public void Configure(IApplicationBuilder app)

6
test/WebSites/VersioningWebSite/Startup.cs
View File

@ -1,9 +1,8 @@
// 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.IO;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Infrastructure;
using Microsoft.Extensions.DependencyInjection;
@ -14,7 +13,8 @@ namespace VersioningWebSite
public void ConfigureServices(IServiceCollection services)
{
// Add MVC services to the services container
services.AddMvc();
services.AddMvc()
.SetCompatibilityVersion(CompatibilityVersion.Latest);
services.AddScoped<TestResponseGenerator>();
services.AddSingleton<IActionContextAccessor, ActionContextAccessor>();

7
test/WebSites/VersioningWebSite/StartupWithEndpointRouting.cs → test/WebSites/VersioningWebSite/StartupWith21Compat.cs
View File

@ -1,21 +1,20 @@
// 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.IO;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Infrastructure;
using Microsoft.Extensions.DependencyInjection;
namespace VersioningWebSite
{
public class StartupWithEndpointRouting
public class StartupWith21Compat
{
public void ConfigureServices(IServiceCollection services)
{
// Add MVC services to the services container
services.AddMvc()
.AddMvcOptions(options => options.EnableEndpointRouting = true);
.SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
services.AddScoped<TestResponseGenerator>();
services.AddSingleton<IActionContextAccessor, ActionContextAccessor>();

6
test/WebSites/WebApiCompatShimWebSite/Startup.cs
View File

@ -4,6 +4,7 @@
using System.IO;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.DependencyInjection;
namespace WebApiCompatShimWebSite
@ -13,7 +14,10 @@ namespace WebApiCompatShimWebSite
public void ConfigureServices(IServiceCollection services)
{
// Add MVC services to the services container
services.AddMvc().AddWebApiConventions();
services.AddMvc()
.AddWebApiConventions()
.SetCompatibilityVersion(CompatibilityVersion.Latest)
.AddMvcOptions(options => options.EnableEndpointRouting = false);
}
public void Configure(IApplicationBuilder app)

3
test/WebSites/XmlFormattersWebSite/Startup.cs
View File

@ -17,7 +17,8 @@ namespace XmlFormattersWebSite
public void ConfigureServices(IServiceCollection services)
{
// Add MVC services to the services container
services.AddMvc();
services.AddMvc()
.SetCompatibilityVersion(CompatibilityVersion.Latest);
services.Configure<MvcOptions>(options =>
{