Correct case of web site folder and project names

- work around aspnet/DNX#1361 and inconsistent dev boxes (from previous fix attempts)
 - had inconsistent case in test/WebSites and test/WebSites/ConnegWebSite
- ConnegWebsite -> ContentNegotiationWebSite
- RazorInstrumentationWebsite -> RazorPageExecutionInstrumentationWebSite
- RazorViewEngineOptionsWebsite -> RazorEmbeddedViewsWebSite

nits:
- sort dependencies in functional test project.json
- correct a few readme.md files
This commit is contained in:
Doug Bunting 2015-03-10 07:50:52 -07:00
parent a4e01bfe35
commit e7ee4278a5
56 changed files with 76 additions and 73 deletions

View File

@ -60,7 +60,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
global.json = global.json
EndProjectSection
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ConnegWebsite", "test\WebSites\ConnegWebSite\ConnegWebsite.kproj", "{C6E5AFFA-890A-448F-8DE3-878B1D3C9FC7}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ContentNegotiationWebSite", "test\WebSites\ContentNegotiationWebSite\ContentNegotiationWebSite.kproj", "{C6E5AFFA-890A-448F-8DE3-878B1D3C9FC7}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AntiForgeryWebSite", "test\WebSites\AntiForgeryWebSite\AntiForgeryWebSite.kproj", "{A353B17E-A940-4CE8-8BF9-179E24A9041F}"
EndProject
@ -78,7 +78,7 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "TagHelpersWebSite", "test\W
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "FilesWebSite", "test\WebSites\FilesWebSite\FilesWebSite.kproj", "{0EF9860B-10D7-452F-B0F4-A405B88BEBB3}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RazorInstrumentationWebSite", "test\WebSites\RazorInstrumentationWebSite\RazorInstrumentationWebSite.kproj", "{2B2B9876-903C-4065-8D62-2EE832BBA106}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RazorPageExecutionInstrumentationWebSite", "test\WebSites\RazorPageExecutionInstrumentationWebSite\RazorPageExecutionInstrumentationWebSite.kproj", "{2B2B9876-903C-4065-8D62-2EE832BBA106}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ApplicationModelWebSite", "test\WebSites\ApplicationModelWebSite\ApplicationModelWebSite.kproj", "{CAE52CB7-0FAC-4B5B-8251-B0FF837DB657}"
EndProject
@ -100,7 +100,7 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "PrecompilationWebSite", "te
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RequestServicesWebSite", "test\WebSites\RequestServicesWebSite\RequestServicesWebSite.kproj", "{F12E9CF0-4958-40C6-A6CD-759185157F84}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RazorViewEngineOptionsWebsite", "test\WebSites\RazorViewEngineOptionsWebsite\RazorViewEngineOptionsWebsite.kproj", "{B18ADE62-35DE-4A06-8E1D-EDD6245F7F4D}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RazorEmbeddedViewsWebSite", "test\WebSites\RazorEmbeddedViewsWebSite\RazorEmbeddedViewsWebSite.kproj", "{B18ADE62-35DE-4A06-8E1D-EDD6245F7F4D}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "CompositeViewEngineWebSite", "test\WebSites\CompositeViewEngineWebSite\CompositeViewEngineWebSite.kproj", "{A853B2BA-4449-4908-A416-5A3C027FC22B}"
EndProject

View File

@ -11,7 +11,7 @@ using System.Text;
using System.Threading.Tasks;
using System.Xml;
using System.Xml.Serialization;
using ConnegWebSite;
using ContentNegotiationWebSite;
using Microsoft.AspNet.Builder;
using Microsoft.AspNet.TestHost;
using Microsoft.AspNet.Mvc.Xml;
@ -19,9 +19,9 @@ using Xunit;
namespace Microsoft.AspNet.Mvc.FunctionalTests
{
public class ConnegTests
public class ContentNegotiationTest
{
private readonly IServiceProvider _provider = TestHelper.CreateServices(nameof(ConnegWebSite));
private readonly IServiceProvider _provider = TestHelper.CreateServices(nameof(ContentNegotiationWebSite));
private readonly Action<IApplicationBuilder> _app = new Startup().Configure;
[Fact]
@ -124,7 +124,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/xml"));
var expectedContentType = MediaTypeHeaderValue.Parse("application/xml;charset=utf-8");
var expectedOutput = "<User xmlns:i=\"http://www.w3.org/2001/XMLSchema-instance\" " +
"xmlns=\"http://schemas.datacontract.org/2004/07/ConnegWebSite\">" +
"xmlns=\"http://schemas.datacontract.org/2004/07/ContentNegotiationWebSite\">" +
"<Address>One Microsoft Way</Address><Name>John</Name></User>";
// Act
@ -374,7 +374,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
client.DefaultRequestHeaders.AcceptCharset.Add(new StringWithQualityHeaderValue("utf-8"));
var expectedContentType = MediaTypeHeaderValue.Parse("application/xml;charset=utf-8");
var expectedBody = @"<User xmlns:i=""http://www.w3.org/2001/XMLSchema-instance"" " +
@"xmlns=""http://schemas.datacontract.org/2004/07/ConnegWebSite""><Address>"
@"xmlns=""http://schemas.datacontract.org/2004/07/ContentNegotiationWebSite""><Address>"
+ @"One Microsoft Way</Address><Name>John</Name></User>";
for (int i = 0; i < 5; i++)

View File

@ -5,7 +5,7 @@ using System;
using System.Net;
using System.Net.Http.Headers;
using System.Threading.Tasks;
using ConnegWebSite;
using ContentNegotiationWebSite;
using Microsoft.AspNet.Builder;
using Microsoft.AspNet.TestHost;
using Xunit;
@ -14,7 +14,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
{
public class OutputFormatterTest
{
private readonly IServiceProvider _provider = TestHelper.CreateServices(nameof(ConnegWebSite));
private readonly IServiceProvider _provider = TestHelper.CreateServices(nameof(ContentNegotiationWebSite));
private readonly Action<IApplicationBuilder> _app = new Startup().Configure;
[Theory]

View File

@ -5,26 +5,26 @@ using System;
using System.Threading.Tasks;
using Microsoft.AspNet.Builder;
using Microsoft.AspNet.TestHost;
using RazorViewEngineOptionsWebsite;
using RazorEmbeddedViewsWebSite;
using Xunit;
namespace Microsoft.AspNet.Mvc.FunctionalTests
{
public class RazorViewEngineOptionsTest
public class RazorEmbeddedViewsTest
{
private readonly IServiceProvider _services = TestHelper.CreateServices(nameof(RazorViewEngineOptionsWebsite));
private readonly IServiceProvider _services = TestHelper.CreateServices(nameof(RazorEmbeddedViewsWebSite));
private readonly Action<IApplicationBuilder> _app = new Startup().Configure;
[Fact]
public async Task RazorViewEngine_UsesFileProviderOnViewEngineOptionsToLocateViews()
{
// Arrange
var expectedMessage = "Hello test-user, this is /RazorViewEngineOptions_Home";
var expectedMessage = "Hello test-user, this is /RazorEmbeddedViews_Home";
var server = TestServer.Create(_services, _app);
var client = server.CreateClient();
// Act
var response = await client.GetStringAsync("http://localhost/RazorViewEngineOptions_Home?User=test-user");
var response = await client.GetStringAsync("http://localhost/RazorEmbeddedViews_Home?User=test-user");
// Assert
Assert.Equal(expectedMessage, response);
@ -34,10 +34,10 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
public async Task RazorViewEngine_UsesFileProviderOnViewEngineOptionsToLocateAreaViews()
{
// Arrange
var expectedMessage = "Hello admin-user, this is /Restricted/RazorViewEngineOptions_Admin/Login";
var expectedMessage = "Hello admin-user, this is /Restricted/RazorEmbeddedViews_Admin/Login";
var server = TestServer.Create(_services, _app);
var client = server.CreateClient();
var target = "http://localhost/Restricted/RazorViewEngineOptions_Admin/Login?AdminUser=admin-user";
var target = "http://localhost/Restricted/RazorEmbeddedViews_Admin/Login?AdminUser=admin-user";
// Act
var response = await client.GetStringAsync(target);

View File

@ -7,14 +7,14 @@ using System.Threading.Tasks;
using Microsoft.AspNet.Builder;
using Microsoft.AspNet.TestHost;
using Microsoft.Framework.DependencyInjection;
using RazorInstrumentationWebSite;
using RazorPageExecutionInstrumentationWebSite;
using Xunit;
namespace Microsoft.AspNet.Mvc.FunctionalTests
{
public class RazorInstrumentationTests
public class RazorPageExecutionInstrumentationTest
{
private readonly IServiceProvider _services = TestHelper.CreateServices("RazorInstrumentationWebsite");
private readonly IServiceProvider _services = TestHelper.CreateServices(nameof(RazorPageExecutionInstrumentationWebSite));
private readonly Action<IApplicationBuilder> _app = new Startup().Configure;
public static IEnumerable<object[]> InstrumentationData
@ -208,7 +208,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
{
var services = new ServiceCollection();
services.AddInstance(pageExecutionContext);
return TestHelper.CreateServices("RazorInstrumentationWebsite", services);
return TestHelper.CreateServices(nameof(RazorPageExecutionInstrumentationWebSite), services);
}
}
}

View File

@ -17,7 +17,7 @@
"BasicWebSite": "1.0.0",
"BestEffortLinkGenerationWebSite": "1.0.0",
"CompositeViewEngineWebSite": "1.0.0",
"ConnegWebSite": "1.0.0",
"ContentNegotiationWebSite": "1.0.0",
"ControllerDiscoveryConventionsWebSite": "1.0.0",
"ControllersFromServicesWebSite": "1.0.0",
"CustomRouteWebSite": "1.0.0",
@ -29,16 +29,23 @@
"InlineConstraintsWebSite": "1.0.0",
"LoggingWebSite": "1.0.0",
"LowercaseUrlsWebSite": "1.0.0-*",
"Microsoft.AspNet.Mvc": "6.0.0-*",
"Microsoft.AspNet.Mvc.TestConfiguration": "1.0.0",
"Microsoft.AspNet.Mvc.Xml": "6.0.0-*",
"Microsoft.AspNet.TestHost": "1.0.0-*",
"Microsoft.AspNet.WebUtilities": "1.0.0-*",
"Microsoft.Framework.ConfigurationModel.Json": "1.0.0-*",
"ModelBindingWebSite": "1.0.0",
"MvcSample.Web": "1.0.0",
"MvcTagHelpersWebSite": "1.0.0",
"PrecompilationWebSite": "1.0.0",
"RoutingWebSite": "1.0.0",
"RazorWebSite": "1.0.0",
"RazorCompilerCacheWebSite": "1.0.0",
"RazorInstrumentationWebsite": "1.0.0",
"RazorViewEngineOptionsWebsite": "1.0.0",
"RazorEmbeddedViewsWebSite": "1.0.0",
"RazorPageExecutionInstrumentationWebSite": "1.0.0",
"RazorWebSite": "1.0.0",
"RequestServicesWebSite": "1.0.0",
"ResponseCacheWebSite": "1.0.0",
"RoutingWebSite": "1.0.0",
"TagHelperSample.Web": "1.0.0",
"TagHelpersWebSite": "1.0.0",
"UrlHelperWebSite": "1.0.0",
@ -46,15 +53,8 @@
"ValueProvidersWebSite": "1.0.0",
"VersioningWebSite": "1.0.0",
"ViewComponentWebSite": "1.0.0",
"XmlFormattersWebSite": "1.0.0",
"WebApiCompatShimWebSite": "1.0.0",
"Microsoft.AspNet.TestHost": "1.0.0-*",
"Microsoft.AspNet.Mvc": "6.0.0-*",
"Microsoft.AspNet.Mvc.Xml": "6.0.0-*",
"Microsoft.AspNet.Mvc.TestConfiguration": "1.0.0",
"Microsoft.AspNet.WebUtilities": "1.0.0-*",
"MvcTagHelpersWebSite": "1.0.0",
"Microsoft.Framework.ConfigurationModel.Json": "1.0.0-*",
"XmlFormattersWebSite": "1.0.0",
"xunit.runner.kre": "1.0.0-*"
},
"commands": {

View File

@ -3,7 +3,7 @@
using Microsoft.AspNet.Mvc;
using Microsoft.Framework.DependencyInjection;
namespace ConnegWebSite
namespace ContentNegotiationWebSite
{
public class FallbackOnTypeBasedMatchController : Controller
{

View File

@ -3,7 +3,7 @@
using Microsoft.AspNet.Mvc;
namespace ConnegWebSite
namespace ContentNegotiationWebSite
{
[Produces("application/FormatFilterController")]
public class FormatFilterController : Controller

View File

@ -3,7 +3,7 @@
using Microsoft.AspNet.Mvc;
namespace ConnegWebSite
namespace ContentNegotiationWebSite
{
public class HomeController : Controller
{

View File

@ -4,7 +4,7 @@
using Microsoft.AspNet.Mvc;
using Microsoft.Net.Http.Headers;
namespace ConnegWebSite
namespace ContentNegotiationWebSite
{
public class JsonResultController : Controller
{

View File

@ -4,7 +4,7 @@
using System.Threading.Tasks;
using Microsoft.AspNet.Mvc;
namespace ConnegWebSite
namespace ContentNegotiationWebSite
{
public class NoContentController : Controller
{

View File

@ -4,7 +4,7 @@
using System.Threading.Tasks;
using Microsoft.AspNet.Mvc;
namespace ConnegWebSite
namespace ContentNegotiationWebSite
{
public class NoContentDoNotTreatNullValueAsNoContentController : Controller
{

View File

@ -3,7 +3,7 @@
using Microsoft.AspNet.Mvc;
namespace ConnegWebSite
namespace ContentNegotiationWebSite
{
public class NoProducesContentOnClassController : ProducesContentBaseController
{

View File

@ -4,7 +4,7 @@
using Microsoft.AspNet.Mvc;
using Newtonsoft.Json;
namespace ConnegWebSite
namespace ContentNegotiationWebSite
{
public class NormalController : Controller
{

View File

@ -3,7 +3,7 @@
using Microsoft.AspNet.Mvc;
namespace ConnegWebSite
namespace ContentNegotiationWebSite
{
[Produces("application/custom_ProducesContentBaseController")]
public class ProducesContentBaseController : Controller

View File

@ -3,7 +3,7 @@
using Microsoft.AspNet.Mvc;
namespace ConnegWebSite
namespace ContentNegotiationWebSite
{
[Produces("application/custom_ProducesContentOnClassController")]
public class ProducesContentOnClassController : ProducesContentBaseController

View File

@ -1,10 +1,10 @@
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using ConnegWebSite.Models;
using ContentNegotiationWebSite.Models;
using Microsoft.AspNet.Mvc;
namespace ConnegWebSite
namespace ContentNegotiationWebSite
{
public class ProducesWithMediaTypeParametersController : Controller
{

View File

@ -4,7 +4,7 @@
using System.Threading.Tasks;
using Microsoft.AspNet.Mvc;
namespace ConnegWebSite
namespace ContentNegotiationWebSite
{
public class TextPlainController : Controller
{

View File

@ -7,7 +7,7 @@ using Microsoft.AspNet.Http;
using Microsoft.AspNet.Mvc;
using Microsoft.Net.Http.Headers;
namespace ConnegWebSite
namespace ContentNegotiationWebSite
{
public class CustomFormatter : OutputFormatter
{

View File

@ -1,7 +1,7 @@
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
namespace ConnegWebSite.Models
namespace ContentNegotiationWebSite.Models
{
public class Contact
{

View File

@ -3,7 +3,7 @@
using System.ComponentModel.DataAnnotations;
namespace ConnegWebSite
namespace ContentNegotiationWebSite
{
[DisplayColumn("Name")]
public class User

View File

@ -7,7 +7,7 @@ using Microsoft.AspNet.Http;
using Microsoft.AspNet.Mvc;
using Microsoft.Net.Http.Headers;
namespace ConnegWebSite
namespace ContentNegotiationWebSite
{
public class PlainTextFormatter : OutputFormatter
{

View File

@ -5,7 +5,7 @@ using Microsoft.AspNet.Builder;
using Microsoft.AspNet.Mvc;
using Microsoft.Framework.DependencyInjection;
namespace ConnegWebSite
namespace ContentNegotiationWebSite
{
public class Startup
{

View File

@ -6,12 +6,12 @@ using System.IO;
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
using ConnegWebSite.Models;
using ContentNegotiationWebSite.Models;
using Microsoft.AspNet.Mvc;
using Microsoft.AspNet.Mvc.Internal;
using Microsoft.Net.Http.Headers;
namespace ConnegWebSite
namespace ContentNegotiationWebSite
{
/// <summary>
/// Provides contact information of a person through VCard format.

View File

@ -6,12 +6,12 @@ using System.IO;
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
using ConnegWebSite.Models;
using ContentNegotiationWebSite.Models;
using Microsoft.AspNet.Mvc;
using Microsoft.AspNet.Mvc.Internal;
using Microsoft.Net.Http.Headers;
namespace ConnegWebSite
namespace ContentNegotiationWebSite
{
/// <summary>
/// Provides contact information of a person through VCard format.

View File

@ -1,5 +1,5 @@
ConnegWebsite
ContentNegotiationWebSite
===
This web site illustrates in depth how MVC performs output content negotiation based on the input headers and
content. It also demonstrates various options available to participate in content negotation process.
content. It also demonstrates various options available to participate in content negotiation process.

View File

@ -1,4 +1,4 @@
ConnegWebsite
FilesWebSite
===
This web site illustrates how to use `FileContentResult` via `File` method on the controller. It also demonstrates

View File

@ -3,10 +3,10 @@
using Microsoft.AspNet.Mvc;
namespace RazorViewEngineOptionsWebsite.Controllers
namespace RazorEmbeddedViewsWebSite.Controllers
{
[Area("Restricted")]
public class RazorViewEngineOptions_AdminController : Controller
public class RazorEmbeddedViews_AdminController : Controller
{
public IActionResult Login()
{

View File

@ -3,9 +3,9 @@
using Microsoft.AspNet.Mvc;
namespace RazorViewEngineOptionsWebsite
namespace RazorEmbeddedViewsWebSite
{
public class RazorViewEngineOptions_HomeController : Controller
public class RazorEmbeddedViews_HomeController : Controller
{
public IActionResult Index()
{

View File

@ -7,7 +7,7 @@ using Microsoft.AspNet.FileProviders;
using Microsoft.AspNet.Mvc.Razor;
using Microsoft.Framework.DependencyInjection;
namespace RazorViewEngineOptionsWebsite
namespace RazorEmbeddedViewsWebSite
{
public class Startup
{

View File

@ -1,4 +1,4 @@
RazorViewEngineOptionsWebSite
RazorEmbeddedViewsWebSite
===
This web site illustrates use cases for `RazorViewEngineOptions.FileProvider`.

View File

@ -3,7 +3,7 @@
using Microsoft.AspNet.Mvc;
namespace RazorInstrumentationWebSite
namespace RazorPageExecutionInstrumentationWebSite
{
public class HomeController : Controller
{

View File

@ -8,7 +8,7 @@ using Microsoft.AspNet.Http;
using Microsoft.AspNet.PageExecutionInstrumentation;
using Microsoft.Framework.DependencyInjection;
namespace RazorInstrumentationWebSite
namespace RazorPageExecutionInstrumentationWebSite
{
public class Startup
{

View File

@ -5,7 +5,7 @@ using System;
using System.Collections.Generic;
using Microsoft.AspNet.PageExecutionInstrumentation;
namespace RazorInstrumentationWebSite
namespace RazorPageExecutionInstrumentationWebSite
{
public class TestPageExecutionContext : IPageExecutionContext
{

View File

@ -4,7 +4,7 @@
using System.IO;
using Microsoft.AspNet.PageExecutionInstrumentation;
namespace RazorInstrumentationWebSite
namespace RazorPageExecutionInstrumentationWebSite
{
public class TestPageExecutionListenerFeature : IPageExecutionListenerFeature
{

View File

@ -1,4 +1,4 @@
RazorInstrumentationWebSite
RazorPageExecutionInstrumentationWebSite
===
This web site is used for functional testing of page instrumentation.

View File

@ -1 +1,4 @@
Hello, World
ResponseCacheWebSite
===
This web site illustrates how to use response caching.

View File

@ -1,4 +1,4 @@
ViewComponents
ViewComponentsWebSite
===
This web site illustrates how to use custom view components.

View File

@ -1,4 +1,4 @@
WebApiCompactShim
WebApiCompatShimWebSite
===
This web site illustrates how to configure and use WebApiCompatShim to get `Web API 2.*` like behavior. Features which