diff --git a/Mvc.NoFun.sln b/Mvc.NoFun.sln index 22e6217da4..965e414066 100644 --- a/Mvc.NoFun.sln +++ b/Mvc.NoFun.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.22808.1 +VisualStudioVersion = 14.0.23017.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{DAAE4C74-D06F-4874-A166-33305D2643CE}" EndProject @@ -44,10 +44,6 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "TagHelperSample.Web", "samp EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Mvc.TagHelpers.Test", "test\Microsoft.AspNet.Mvc.TagHelpers.Test\Microsoft.AspNet.Mvc.TagHelpers.Test.xproj", "{860119ED-3DB1-424D-8D0A-30132A8A7D96}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Mvc.Xml", "src\Microsoft.AspNet.Mvc.Xml\Microsoft.AspNet.Mvc.Xml.xproj", "{9C632DF0-DC06-410B-95AE-B5423702E84F}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Mvc.Xml.Test", "test\Microsoft.AspNet.Mvc.Xml.Test\Microsoft.AspNet.Mvc.Xml.Test.xproj", "{22019146-BDFA-442E-8C8E-345FB9644578}" -EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.PageExecutionInstrumentation.Interfaces", "src\Microsoft.AspNet.PageExecutionInstrumentation.Interfaces\Microsoft.AspNet.PageExecutionInstrumentation.Interfaces.xproj", "{4DA2D7C1-A7B6-4C01-B57D-89E6EA4609DE}" EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Mvc.TestCommon", "test\Microsoft.AspNet.Mvc.TestCommon\Microsoft.AspNet.Mvc.TestCommon.xproj", "{F504357E-C2E1-4818-BA5C-9A2EAC25FEE5}" @@ -66,12 +62,28 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Mvc.ApiExp EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Mvc.ApiExplorer.Test", "test\Microsoft.AspNet.Mvc.ApiExplorer.Test\Microsoft.AspNet.Mvc.ApiExplorer.Test.xproj", "{4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Mvc.Extensions", "src\Microsoft.AspNet.Mvc.Extensions\Microsoft.AspNet.Mvc.Extensions.xproj", "{B2CA101A-87E6-4DD2-9BB2-28DA68EF1A94}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Mvc.Extensions.Test", "test\Microsoft.AspNet.Mvc.Extensions.Test\Microsoft.AspNet.Mvc.Extensions.Test.xproj", "{5DF6EFA5-865E-450B-BF83-DE9CE88EB77C}" -EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MvcMinimalSample.Web", "samples\MvcMinimalSample.Web\MvcMinimalSample.Web.xproj", "{F21E225B-190B-4DAA-8B0A-05986D231F56}" EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Mvc.ViewFeatures", "src\Microsoft.AspNet.Mvc.ViewFeatures\Microsoft.AspNet.Mvc.ViewFeatures.xproj", "{3F8B8FC1-9FE4-4788-8991-367113E8D7AD}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Mvc.ViewFeatures.Test", "test\Microsoft.AspNet.Mvc.ViewFeatures.Test\Microsoft.AspNet.Mvc.ViewFeatures.Test.xproj", "{60873DFA-97B9-419E-BAA3-940FC9B07085}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Mvc.Formatters.Json", "src\Microsoft.AspNet.Mvc.Formatters.Json\Microsoft.AspNet.Mvc.Formatters.Json.xproj", "{3FC8D9D6-9352-43A3-8E81-422F270085B7}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Mvc.Formatters.Json.Test", "test\Microsoft.AspNet.Mvc.Formatters.Json.Test\Microsoft.AspNet.Mvc.Formatters.Json.Test.xproj", "{493780DA-E696-40FF-BD12-4A5C5736F292}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Mvc.Formatters.Xml", "src\Microsoft.AspNet.Mvc.Formatters.Xml\Microsoft.AspNet.Mvc.Formatters.Xml.xproj", "{42C81540-CD47-4C68-A7A3-2A93B9C3B210}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Mvc.Formatters.Xml.Test", "test\Microsoft.AspNet.Mvc.Formatters.Xml.Test\Microsoft.AspNet.Mvc.Formatters.Xml.Test.xproj", "{22019146-BDFA-442E-8C8E-345FB9644578}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Mvc.Cors", "src\Microsoft.AspNet.Mvc.Cors\Microsoft.AspNet.Mvc.Cors.xproj", "{9A07EEA2-942E-4969-9D41-799B6E2D1FF5}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Mvc.DataAnnotations", "src\Microsoft.AspNet.Mvc.DataAnnotations\Microsoft.AspNet.Mvc.DataAnnotations.xproj", "{2DD786CA-7AF7-437A-B499-801A589B9A1C}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Mvc.Cors.Test", "test\Microsoft.AspNet.Mvc.Cors.Test\Microsoft.AspNet.Mvc.Cors.Test.xproj", "{6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Mvc.DataAnnotations.Test", "test\Microsoft.AspNet.Mvc.DataAnnotations.Test\Microsoft.AspNet.Mvc.DataAnnotations.Test.xproj", "{827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -240,30 +252,6 @@ Global {860119ED-3DB1-424D-8D0A-30132A8A7D96}.Release|Mixed Platforms.Build.0 = Release|Any CPU {860119ED-3DB1-424D-8D0A-30132A8A7D96}.Release|x86.ActiveCfg = Release|Any CPU {860119ED-3DB1-424D-8D0A-30132A8A7D96}.Release|x86.Build.0 = Release|Any CPU - {9C632DF0-DC06-410B-95AE-B5423702E84F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9C632DF0-DC06-410B-95AE-B5423702E84F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9C632DF0-DC06-410B-95AE-B5423702E84F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {9C632DF0-DC06-410B-95AE-B5423702E84F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {9C632DF0-DC06-410B-95AE-B5423702E84F}.Debug|x86.ActiveCfg = Debug|Any CPU - {9C632DF0-DC06-410B-95AE-B5423702E84F}.Debug|x86.Build.0 = Debug|Any CPU - {9C632DF0-DC06-410B-95AE-B5423702E84F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9C632DF0-DC06-410B-95AE-B5423702E84F}.Release|Any CPU.Build.0 = Release|Any CPU - {9C632DF0-DC06-410B-95AE-B5423702E84F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {9C632DF0-DC06-410B-95AE-B5423702E84F}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {9C632DF0-DC06-410B-95AE-B5423702E84F}.Release|x86.ActiveCfg = Release|Any CPU - {9C632DF0-DC06-410B-95AE-B5423702E84F}.Release|x86.Build.0 = Release|Any CPU - {22019146-BDFA-442E-8C8E-345FB9644578}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {22019146-BDFA-442E-8C8E-345FB9644578}.Debug|Any CPU.Build.0 = Debug|Any CPU - {22019146-BDFA-442E-8C8E-345FB9644578}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {22019146-BDFA-442E-8C8E-345FB9644578}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {22019146-BDFA-442E-8C8E-345FB9644578}.Debug|x86.ActiveCfg = Debug|Any CPU - {22019146-BDFA-442E-8C8E-345FB9644578}.Debug|x86.Build.0 = Debug|Any CPU - {22019146-BDFA-442E-8C8E-345FB9644578}.Release|Any CPU.ActiveCfg = Release|Any CPU - {22019146-BDFA-442E-8C8E-345FB9644578}.Release|Any CPU.Build.0 = Release|Any CPU - {22019146-BDFA-442E-8C8E-345FB9644578}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {22019146-BDFA-442E-8C8E-345FB9644578}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {22019146-BDFA-442E-8C8E-345FB9644578}.Release|x86.ActiveCfg = Release|Any CPU - {22019146-BDFA-442E-8C8E-345FB9644578}.Release|x86.Build.0 = Release|Any CPU {4DA2D7C1-A7B6-4C01-B57D-89E6EA4609DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4DA2D7C1-A7B6-4C01-B57D-89E6EA4609DE}.Debug|Any CPU.Build.0 = Debug|Any CPU {4DA2D7C1-A7B6-4C01-B57D-89E6EA4609DE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU @@ -371,30 +359,6 @@ Global {4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Release|Mixed Platforms.Build.0 = Release|Any CPU {4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Release|x86.ActiveCfg = Release|Any CPU {4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6}.Release|x86.Build.0 = Release|Any CPU - {B2CA101A-87E6-4DD2-9BB2-28DA68EF1A94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B2CA101A-87E6-4DD2-9BB2-28DA68EF1A94}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B2CA101A-87E6-4DD2-9BB2-28DA68EF1A94}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {B2CA101A-87E6-4DD2-9BB2-28DA68EF1A94}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {B2CA101A-87E6-4DD2-9BB2-28DA68EF1A94}.Debug|x86.ActiveCfg = Debug|Any CPU - {B2CA101A-87E6-4DD2-9BB2-28DA68EF1A94}.Debug|x86.Build.0 = Debug|Any CPU - {B2CA101A-87E6-4DD2-9BB2-28DA68EF1A94}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B2CA101A-87E6-4DD2-9BB2-28DA68EF1A94}.Release|Any CPU.Build.0 = Release|Any CPU - {B2CA101A-87E6-4DD2-9BB2-28DA68EF1A94}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {B2CA101A-87E6-4DD2-9BB2-28DA68EF1A94}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {B2CA101A-87E6-4DD2-9BB2-28DA68EF1A94}.Release|x86.ActiveCfg = Release|Any CPU - {B2CA101A-87E6-4DD2-9BB2-28DA68EF1A94}.Release|x86.Build.0 = Release|Any CPU - {5DF6EFA5-865E-450B-BF83-DE9CE88EB77C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5DF6EFA5-865E-450B-BF83-DE9CE88EB77C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5DF6EFA5-865E-450B-BF83-DE9CE88EB77C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {5DF6EFA5-865E-450B-BF83-DE9CE88EB77C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {5DF6EFA5-865E-450B-BF83-DE9CE88EB77C}.Debug|x86.ActiveCfg = Debug|Any CPU - {5DF6EFA5-865E-450B-BF83-DE9CE88EB77C}.Debug|x86.Build.0 = Debug|Any CPU - {5DF6EFA5-865E-450B-BF83-DE9CE88EB77C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5DF6EFA5-865E-450B-BF83-DE9CE88EB77C}.Release|Any CPU.Build.0 = Release|Any CPU - {5DF6EFA5-865E-450B-BF83-DE9CE88EB77C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {5DF6EFA5-865E-450B-BF83-DE9CE88EB77C}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {5DF6EFA5-865E-450B-BF83-DE9CE88EB77C}.Release|x86.ActiveCfg = Release|Any CPU - {5DF6EFA5-865E-450B-BF83-DE9CE88EB77C}.Release|x86.Build.0 = Release|Any CPU {F21E225B-190B-4DAA-8B0A-05986D231F56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F21E225B-190B-4DAA-8B0A-05986D231F56}.Debug|Any CPU.Build.0 = Debug|Any CPU {F21E225B-190B-4DAA-8B0A-05986D231F56}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU @@ -407,6 +371,126 @@ Global {F21E225B-190B-4DAA-8B0A-05986D231F56}.Release|Mixed Platforms.Build.0 = Release|Any CPU {F21E225B-190B-4DAA-8B0A-05986D231F56}.Release|x86.ActiveCfg = Release|Any CPU {F21E225B-190B-4DAA-8B0A-05986D231F56}.Release|x86.Build.0 = Release|Any CPU + {3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Debug|x86.ActiveCfg = Debug|Any CPU + {3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Debug|x86.Build.0 = Debug|Any CPU + {3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Release|Any CPU.Build.0 = Release|Any CPU + {3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Release|x86.ActiveCfg = Release|Any CPU + {3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Release|x86.Build.0 = Release|Any CPU + {60873DFA-97B9-419E-BAA3-940FC9B07085}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {60873DFA-97B9-419E-BAA3-940FC9B07085}.Debug|Any CPU.Build.0 = Debug|Any CPU + {60873DFA-97B9-419E-BAA3-940FC9B07085}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {60873DFA-97B9-419E-BAA3-940FC9B07085}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {60873DFA-97B9-419E-BAA3-940FC9B07085}.Debug|x86.ActiveCfg = Debug|Any CPU + {60873DFA-97B9-419E-BAA3-940FC9B07085}.Debug|x86.Build.0 = Debug|Any CPU + {60873DFA-97B9-419E-BAA3-940FC9B07085}.Release|Any CPU.ActiveCfg = Release|Any CPU + {60873DFA-97B9-419E-BAA3-940FC9B07085}.Release|Any CPU.Build.0 = Release|Any CPU + {60873DFA-97B9-419E-BAA3-940FC9B07085}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {60873DFA-97B9-419E-BAA3-940FC9B07085}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {60873DFA-97B9-419E-BAA3-940FC9B07085}.Release|x86.ActiveCfg = Release|Any CPU + {60873DFA-97B9-419E-BAA3-940FC9B07085}.Release|x86.Build.0 = Release|Any CPU + {3FC8D9D6-9352-43A3-8E81-422F270085B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3FC8D9D6-9352-43A3-8E81-422F270085B7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3FC8D9D6-9352-43A3-8E81-422F270085B7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {3FC8D9D6-9352-43A3-8E81-422F270085B7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {3FC8D9D6-9352-43A3-8E81-422F270085B7}.Debug|x86.ActiveCfg = Debug|Any CPU + {3FC8D9D6-9352-43A3-8E81-422F270085B7}.Debug|x86.Build.0 = Debug|Any CPU + {3FC8D9D6-9352-43A3-8E81-422F270085B7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3FC8D9D6-9352-43A3-8E81-422F270085B7}.Release|Any CPU.Build.0 = Release|Any CPU + {3FC8D9D6-9352-43A3-8E81-422F270085B7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {3FC8D9D6-9352-43A3-8E81-422F270085B7}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {3FC8D9D6-9352-43A3-8E81-422F270085B7}.Release|x86.ActiveCfg = Release|Any CPU + {3FC8D9D6-9352-43A3-8E81-422F270085B7}.Release|x86.Build.0 = Release|Any CPU + {493780DA-E696-40FF-BD12-4A5C5736F292}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {493780DA-E696-40FF-BD12-4A5C5736F292}.Debug|Any CPU.Build.0 = Debug|Any CPU + {493780DA-E696-40FF-BD12-4A5C5736F292}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {493780DA-E696-40FF-BD12-4A5C5736F292}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {493780DA-E696-40FF-BD12-4A5C5736F292}.Debug|x86.ActiveCfg = Debug|Any CPU + {493780DA-E696-40FF-BD12-4A5C5736F292}.Debug|x86.Build.0 = Debug|Any CPU + {493780DA-E696-40FF-BD12-4A5C5736F292}.Release|Any CPU.ActiveCfg = Release|Any CPU + {493780DA-E696-40FF-BD12-4A5C5736F292}.Release|Any CPU.Build.0 = Release|Any CPU + {493780DA-E696-40FF-BD12-4A5C5736F292}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {493780DA-E696-40FF-BD12-4A5C5736F292}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {493780DA-E696-40FF-BD12-4A5C5736F292}.Release|x86.ActiveCfg = Release|Any CPU + {493780DA-E696-40FF-BD12-4A5C5736F292}.Release|x86.Build.0 = Release|Any CPU + {42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Debug|Any CPU.Build.0 = Debug|Any CPU + {42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Debug|x86.ActiveCfg = Debug|Any CPU + {42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Debug|x86.Build.0 = Debug|Any CPU + {42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Release|Any CPU.ActiveCfg = Release|Any CPU + {42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Release|Any CPU.Build.0 = Release|Any CPU + {42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Release|x86.ActiveCfg = Release|Any CPU + {42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Release|x86.Build.0 = Release|Any CPU + {22019146-BDFA-442E-8C8E-345FB9644578}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {22019146-BDFA-442E-8C8E-345FB9644578}.Debug|Any CPU.Build.0 = Debug|Any CPU + {22019146-BDFA-442E-8C8E-345FB9644578}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {22019146-BDFA-442E-8C8E-345FB9644578}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {22019146-BDFA-442E-8C8E-345FB9644578}.Debug|x86.ActiveCfg = Debug|Any CPU + {22019146-BDFA-442E-8C8E-345FB9644578}.Debug|x86.Build.0 = Debug|Any CPU + {22019146-BDFA-442E-8C8E-345FB9644578}.Release|Any CPU.ActiveCfg = Release|Any CPU + {22019146-BDFA-442E-8C8E-345FB9644578}.Release|Any CPU.Build.0 = Release|Any CPU + {22019146-BDFA-442E-8C8E-345FB9644578}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {22019146-BDFA-442E-8C8E-345FB9644578}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {22019146-BDFA-442E-8C8E-345FB9644578}.Release|x86.ActiveCfg = Release|Any CPU + {22019146-BDFA-442E-8C8E-345FB9644578}.Release|x86.Build.0 = Release|Any CPU + {9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Debug|x86.ActiveCfg = Debug|Any CPU + {9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Debug|x86.Build.0 = Debug|Any CPU + {9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Release|Any CPU.Build.0 = Release|Any CPU + {9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Release|x86.ActiveCfg = Release|Any CPU + {9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Release|x86.Build.0 = Release|Any CPU + {2DD786CA-7AF7-437A-B499-801A589B9A1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2DD786CA-7AF7-437A-B499-801A589B9A1C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2DD786CA-7AF7-437A-B499-801A589B9A1C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {2DD786CA-7AF7-437A-B499-801A589B9A1C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {2DD786CA-7AF7-437A-B499-801A589B9A1C}.Debug|x86.ActiveCfg = Debug|Any CPU + {2DD786CA-7AF7-437A-B499-801A589B9A1C}.Debug|x86.Build.0 = Debug|Any CPU + {2DD786CA-7AF7-437A-B499-801A589B9A1C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2DD786CA-7AF7-437A-B499-801A589B9A1C}.Release|Any CPU.Build.0 = Release|Any CPU + {2DD786CA-7AF7-437A-B499-801A589B9A1C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {2DD786CA-7AF7-437A-B499-801A589B9A1C}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {2DD786CA-7AF7-437A-B499-801A589B9A1C}.Release|x86.ActiveCfg = Release|Any CPU + {2DD786CA-7AF7-437A-B499-801A589B9A1C}.Release|x86.Build.0 = Release|Any CPU + {6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Debug|x86.ActiveCfg = Debug|Any CPU + {6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Debug|x86.Build.0 = Debug|Any CPU + {6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Release|Any CPU.Build.0 = Release|Any CPU + {6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Release|x86.ActiveCfg = Release|Any CPU + {6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Release|x86.Build.0 = Release|Any CPU + {827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Debug|x86.ActiveCfg = Debug|Any CPU + {827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Debug|x86.Build.0 = Debug|Any CPU + {827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Release|Any CPU.Build.0 = Release|Any CPU + {827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Release|x86.ActiveCfg = Release|Any CPU + {827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -427,8 +511,6 @@ Global {B2347320-308E-4D2B-AEC8-005DFA68B0C9} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E} {2223120F-D675-40DA-8CD8-11DC14A0B2C7} = {DAAE4C74-D06F-4874-A166-33305D2643CE} {860119ED-3DB1-424D-8D0A-30132A8A7D96} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} - {9C632DF0-DC06-410B-95AE-B5423702E84F} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E} - {22019146-BDFA-442E-8C8E-345FB9644578} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} {4DA2D7C1-A7B6-4C01-B57D-89E6EA4609DE} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E} {F504357E-C2E1-4818-BA5C-9A2EAC25FEE5} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} {81C20848-E063-4E12-AC40-0B55A532C16C} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} @@ -438,8 +520,16 @@ Global {DA000953-7532-4DF5-8DB9-8143DF98D999} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} {A2B72833-5D70-4C42-AE85-E0319926FB8A} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E} {4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} - {B2CA101A-87E6-4DD2-9BB2-28DA68EF1A94} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E} - {5DF6EFA5-865E-450B-BF83-DE9CE88EB77C} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} {F21E225B-190B-4DAA-8B0A-05986D231F56} = {DAAE4C74-D06F-4874-A166-33305D2643CE} + {3F8B8FC1-9FE4-4788-8991-367113E8D7AD} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E} + {60873DFA-97B9-419E-BAA3-940FC9B07085} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} + {3FC8D9D6-9352-43A3-8E81-422F270085B7} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E} + {493780DA-E696-40FF-BD12-4A5C5736F292} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} + {42C81540-CD47-4C68-A7A3-2A93B9C3B210} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E} + {22019146-BDFA-442E-8C8E-345FB9644578} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} + {9A07EEA2-942E-4969-9D41-799B6E2D1FF5} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E} + {2DD786CA-7AF7-437A-B499-801A589B9A1C} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E} + {6BB4C20B-24C0-45D6-9E4C-C2620959BDD5} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} + {827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} EndGlobalSection EndGlobal diff --git a/Mvc.sln b/Mvc.sln index 0f0b325194..e2ac80d036 100644 --- a/Mvc.sln +++ b/Mvc.sln @@ -104,8 +104,6 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ActionResultsWebSite", "tes EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "LoggingWebSite", "test\WebSites\LoggingWebSite\LoggingWebSite.xproj", "{0AD78AB5-D67C-49BC-81B1-0C51BFA82B5E}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Mvc.Xml", "src\Microsoft.AspNet.Mvc.Xml\Microsoft.AspNet.Mvc.Xml.xproj", "{9C632DF0-DC06-410B-95AE-B5423702E84F}" -EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ErrorPageMiddlewareWebSite", "test\WebSites\ErrorPageMiddlewareWebSite\ErrorPageMiddlewareWebSite.xproj", "{AD545A5B-2BA5-4314-88AC-FC2ACF2CC718}" EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ActionConstraintsWebSite", "test\WebSites\ActionConstraintsWebSite\ActionConstraintsWebSite.xproj", "{AF210F69-9D31-43AF-AC3A-CD366E252218}" @@ -118,8 +116,6 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "XmlFormattersWebSite", "tes EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ValidationWebSite", "test\WebSites\ValidationWebSite\ValidationWebSite.xproj", "{87AB84B2-22C1-43C6-BB8A-1D327B446FB0}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Mvc.Xml.Test", "test\Microsoft.AspNet.Mvc.Xml.Test\Microsoft.AspNet.Mvc.Xml.Test.xproj", "{22019146-BDFA-442E-8C8E-345FB9644578}" -EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "FormatFilterWebSite", "test\WebSites\FormatFilterWebSite\FormatFilterWebSite.xproj", "{AC9BE567-540E-4C70-90C2-AAF021307A80}" EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ControllersFromServicesWebSite", "test\WebSites\ControllersFromServicesWebSite\ControllersFromServicesWebSite.xproj", "{983741B2-4424-4ED1-9B03-7675A67230C8}" @@ -164,14 +160,30 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Mvc.Abstra EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "LocalizationWebSite", "test\WebSites\LocalizationWebSite\LocalizationWebSite.xproj", "{FCFE6024-2720-49B4-8257-9DBC6114F0F1}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Mvc.Extensions", "src\Microsoft.AspNet.Mvc.Extensions\Microsoft.AspNet.Mvc.Extensions.xproj", "{B2CA101A-87E6-4DD2-9BB2-28DA68EF1A94}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Mvc.Extensions.Test", "test\Microsoft.AspNet.Mvc.Extensions.Test\Microsoft.AspNet.Mvc.Extensions.Test.xproj", "{5DF6EFA5-865E-450B-BF83-DE9CE88EB77C}" -EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AntiforgeryTokenWebSite", "test\WebSites\AntiforgeryTokenWebSite\AntiforgeryTokenWebSite.xproj", "{A353B17E-A940-4CE8-8BF9-179E24A9041F}" EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MvcMinimalSample.Web", "samples\MvcMinimalSample.Web\MvcMinimalSample.Web.xproj", "{F21E225B-190B-4DAA-8B0A-05986D231F56}" EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Mvc.ViewFeatures", "src\Microsoft.AspNet.Mvc.ViewFeatures\Microsoft.AspNet.Mvc.ViewFeatures.xproj", "{3F8B8FC1-9FE4-4788-8991-367113E8D7AD}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Mvc.Formatters.Json", "src\Microsoft.AspNet.Mvc.Formatters.Json\Microsoft.AspNet.Mvc.Formatters.Json.xproj", "{3FC8D9D6-9352-43A3-8E81-422F270085B7}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Mvc.Formatters.Xml", "src\Microsoft.AspNet.Mvc.Formatters.Xml\Microsoft.AspNet.Mvc.Formatters.Xml.xproj", "{42C81540-CD47-4C68-A7A3-2A93B9C3B210}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Mvc.Formatters.Json.Test", "test\Microsoft.AspNet.Mvc.Formatters.Json.Test\Microsoft.AspNet.Mvc.Formatters.Json.Test.xproj", "{493780DA-E696-40FF-BD12-4A5C5736F292}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Mvc.Formatters.Xml.Test", "test\Microsoft.AspNet.Mvc.Formatters.Xml.Test\Microsoft.AspNet.Mvc.Formatters.Xml.Test.xproj", "{22019146-BDFA-442E-8C8E-345FB9644578}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Mvc.Cors", "src\Microsoft.AspNet.Mvc.Cors\Microsoft.AspNet.Mvc.Cors.xproj", "{9A07EEA2-942E-4969-9D41-799B6E2D1FF5}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Mvc.DataAnnotations", "src\Microsoft.AspNet.Mvc.DataAnnotations\Microsoft.AspNet.Mvc.DataAnnotations.xproj", "{2DD786CA-7AF7-437A-B499-801A589B9A1C}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Mvc.Cors.Test", "test\Microsoft.AspNet.Mvc.Cors.Test\Microsoft.AspNet.Mvc.Cors.Test.xproj", "{6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Mvc.DataAnnotations.Test", "test\Microsoft.AspNet.Mvc.DataAnnotations.Test\Microsoft.AspNet.Mvc.DataAnnotations.Test.xproj", "{827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Mvc.ViewFeatures.Test", "test\Microsoft.AspNet.Mvc.ViewFeatures.Test\Microsoft.AspNet.Mvc.ViewFeatures.Test.xproj", "{60873DFA-97B9-419E-BAA3-940FC9B07085}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -634,18 +646,6 @@ Global {0AD78AB5-D67C-49BC-81B1-0C51BFA82B5E}.Release|Mixed Platforms.Build.0 = Release|Any CPU {0AD78AB5-D67C-49BC-81B1-0C51BFA82B5E}.Release|x86.ActiveCfg = Release|Any CPU {0AD78AB5-D67C-49BC-81B1-0C51BFA82B5E}.Release|x86.Build.0 = Release|Any CPU - {9C632DF0-DC06-410B-95AE-B5423702E84F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9C632DF0-DC06-410B-95AE-B5423702E84F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9C632DF0-DC06-410B-95AE-B5423702E84F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {9C632DF0-DC06-410B-95AE-B5423702E84F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {9C632DF0-DC06-410B-95AE-B5423702E84F}.Debug|x86.ActiveCfg = Debug|Any CPU - {9C632DF0-DC06-410B-95AE-B5423702E84F}.Debug|x86.Build.0 = Debug|Any CPU - {9C632DF0-DC06-410B-95AE-B5423702E84F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9C632DF0-DC06-410B-95AE-B5423702E84F}.Release|Any CPU.Build.0 = Release|Any CPU - {9C632DF0-DC06-410B-95AE-B5423702E84F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {9C632DF0-DC06-410B-95AE-B5423702E84F}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {9C632DF0-DC06-410B-95AE-B5423702E84F}.Release|x86.ActiveCfg = Release|Any CPU - {9C632DF0-DC06-410B-95AE-B5423702E84F}.Release|x86.Build.0 = Release|Any CPU {AD545A5B-2BA5-4314-88AC-FC2ACF2CC718}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {AD545A5B-2BA5-4314-88AC-FC2ACF2CC718}.Debug|Any CPU.Build.0 = Debug|Any CPU {AD545A5B-2BA5-4314-88AC-FC2ACF2CC718}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU @@ -718,18 +718,6 @@ Global {87AB84B2-22C1-43C6-BB8A-1D327B446FB0}.Release|Mixed Platforms.Build.0 = Release|Any CPU {87AB84B2-22C1-43C6-BB8A-1D327B446FB0}.Release|x86.ActiveCfg = Release|Any CPU {87AB84B2-22C1-43C6-BB8A-1D327B446FB0}.Release|x86.Build.0 = Release|Any CPU - {22019146-BDFA-442E-8C8E-345FB9644578}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {22019146-BDFA-442E-8C8E-345FB9644578}.Debug|Any CPU.Build.0 = Debug|Any CPU - {22019146-BDFA-442E-8C8E-345FB9644578}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {22019146-BDFA-442E-8C8E-345FB9644578}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {22019146-BDFA-442E-8C8E-345FB9644578}.Debug|x86.ActiveCfg = Debug|Any CPU - {22019146-BDFA-442E-8C8E-345FB9644578}.Debug|x86.Build.0 = Debug|Any CPU - {22019146-BDFA-442E-8C8E-345FB9644578}.Release|Any CPU.ActiveCfg = Release|Any CPU - {22019146-BDFA-442E-8C8E-345FB9644578}.Release|Any CPU.Build.0 = Release|Any CPU - {22019146-BDFA-442E-8C8E-345FB9644578}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {22019146-BDFA-442E-8C8E-345FB9644578}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {22019146-BDFA-442E-8C8E-345FB9644578}.Release|x86.ActiveCfg = Release|Any CPU - {22019146-BDFA-442E-8C8E-345FB9644578}.Release|x86.Build.0 = Release|Any CPU {AC9BE567-540E-4C70-90C2-AAF021307A80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {AC9BE567-540E-4C70-90C2-AAF021307A80}.Debug|Any CPU.Build.0 = Debug|Any CPU {AC9BE567-540E-4C70-90C2-AAF021307A80}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU @@ -994,30 +982,6 @@ Global {FCFE6024-2720-49B4-8257-9DBC6114F0F1}.Release|Mixed Platforms.Build.0 = Release|Any CPU {FCFE6024-2720-49B4-8257-9DBC6114F0F1}.Release|x86.ActiveCfg = Release|Any CPU {FCFE6024-2720-49B4-8257-9DBC6114F0F1}.Release|x86.Build.0 = Release|Any CPU - {B2CA101A-87E6-4DD2-9BB2-28DA68EF1A94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B2CA101A-87E6-4DD2-9BB2-28DA68EF1A94}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B2CA101A-87E6-4DD2-9BB2-28DA68EF1A94}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {B2CA101A-87E6-4DD2-9BB2-28DA68EF1A94}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {B2CA101A-87E6-4DD2-9BB2-28DA68EF1A94}.Debug|x86.ActiveCfg = Debug|Any CPU - {B2CA101A-87E6-4DD2-9BB2-28DA68EF1A94}.Debug|x86.Build.0 = Debug|Any CPU - {B2CA101A-87E6-4DD2-9BB2-28DA68EF1A94}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B2CA101A-87E6-4DD2-9BB2-28DA68EF1A94}.Release|Any CPU.Build.0 = Release|Any CPU - {B2CA101A-87E6-4DD2-9BB2-28DA68EF1A94}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {B2CA101A-87E6-4DD2-9BB2-28DA68EF1A94}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {B2CA101A-87E6-4DD2-9BB2-28DA68EF1A94}.Release|x86.ActiveCfg = Release|Any CPU - {B2CA101A-87E6-4DD2-9BB2-28DA68EF1A94}.Release|x86.Build.0 = Release|Any CPU - {5DF6EFA5-865E-450B-BF83-DE9CE88EB77C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5DF6EFA5-865E-450B-BF83-DE9CE88EB77C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5DF6EFA5-865E-450B-BF83-DE9CE88EB77C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {5DF6EFA5-865E-450B-BF83-DE9CE88EB77C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {5DF6EFA5-865E-450B-BF83-DE9CE88EB77C}.Debug|x86.ActiveCfg = Debug|Any CPU - {5DF6EFA5-865E-450B-BF83-DE9CE88EB77C}.Debug|x86.Build.0 = Debug|Any CPU - {5DF6EFA5-865E-450B-BF83-DE9CE88EB77C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5DF6EFA5-865E-450B-BF83-DE9CE88EB77C}.Release|Any CPU.Build.0 = Release|Any CPU - {5DF6EFA5-865E-450B-BF83-DE9CE88EB77C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {5DF6EFA5-865E-450B-BF83-DE9CE88EB77C}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {5DF6EFA5-865E-450B-BF83-DE9CE88EB77C}.Release|x86.ActiveCfg = Release|Any CPU - {5DF6EFA5-865E-450B-BF83-DE9CE88EB77C}.Release|x86.Build.0 = Release|Any CPU {A353B17E-A940-4CE8-8BF9-179E24A9041F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A353B17E-A940-4CE8-8BF9-179E24A9041F}.Debug|Any CPU.Build.0 = Debug|Any CPU {A353B17E-A940-4CE8-8BF9-179E24A9041F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU @@ -1042,6 +1006,126 @@ Global {F21E225B-190B-4DAA-8B0A-05986D231F56}.Release|Mixed Platforms.Build.0 = Release|Any CPU {F21E225B-190B-4DAA-8B0A-05986D231F56}.Release|x86.ActiveCfg = Release|Any CPU {F21E225B-190B-4DAA-8B0A-05986D231F56}.Release|x86.Build.0 = Release|Any CPU + {3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Debug|x86.ActiveCfg = Debug|Any CPU + {3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Debug|x86.Build.0 = Debug|Any CPU + {3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Release|Any CPU.Build.0 = Release|Any CPU + {3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Release|x86.ActiveCfg = Release|Any CPU + {3F8B8FC1-9FE4-4788-8991-367113E8D7AD}.Release|x86.Build.0 = Release|Any CPU + {3FC8D9D6-9352-43A3-8E81-422F270085B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3FC8D9D6-9352-43A3-8E81-422F270085B7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3FC8D9D6-9352-43A3-8E81-422F270085B7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {3FC8D9D6-9352-43A3-8E81-422F270085B7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {3FC8D9D6-9352-43A3-8E81-422F270085B7}.Debug|x86.ActiveCfg = Debug|Any CPU + {3FC8D9D6-9352-43A3-8E81-422F270085B7}.Debug|x86.Build.0 = Debug|Any CPU + {3FC8D9D6-9352-43A3-8E81-422F270085B7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3FC8D9D6-9352-43A3-8E81-422F270085B7}.Release|Any CPU.Build.0 = Release|Any CPU + {3FC8D9D6-9352-43A3-8E81-422F270085B7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {3FC8D9D6-9352-43A3-8E81-422F270085B7}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {3FC8D9D6-9352-43A3-8E81-422F270085B7}.Release|x86.ActiveCfg = Release|Any CPU + {3FC8D9D6-9352-43A3-8E81-422F270085B7}.Release|x86.Build.0 = Release|Any CPU + {42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Debug|Any CPU.Build.0 = Debug|Any CPU + {42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Debug|x86.ActiveCfg = Debug|Any CPU + {42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Debug|x86.Build.0 = Debug|Any CPU + {42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Release|Any CPU.ActiveCfg = Release|Any CPU + {42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Release|Any CPU.Build.0 = Release|Any CPU + {42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Release|x86.ActiveCfg = Release|Any CPU + {42C81540-CD47-4C68-A7A3-2A93B9C3B210}.Release|x86.Build.0 = Release|Any CPU + {493780DA-E696-40FF-BD12-4A5C5736F292}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {493780DA-E696-40FF-BD12-4A5C5736F292}.Debug|Any CPU.Build.0 = Debug|Any CPU + {493780DA-E696-40FF-BD12-4A5C5736F292}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {493780DA-E696-40FF-BD12-4A5C5736F292}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {493780DA-E696-40FF-BD12-4A5C5736F292}.Debug|x86.ActiveCfg = Debug|Any CPU + {493780DA-E696-40FF-BD12-4A5C5736F292}.Debug|x86.Build.0 = Debug|Any CPU + {493780DA-E696-40FF-BD12-4A5C5736F292}.Release|Any CPU.ActiveCfg = Release|Any CPU + {493780DA-E696-40FF-BD12-4A5C5736F292}.Release|Any CPU.Build.0 = Release|Any CPU + {493780DA-E696-40FF-BD12-4A5C5736F292}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {493780DA-E696-40FF-BD12-4A5C5736F292}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {493780DA-E696-40FF-BD12-4A5C5736F292}.Release|x86.ActiveCfg = Release|Any CPU + {493780DA-E696-40FF-BD12-4A5C5736F292}.Release|x86.Build.0 = Release|Any CPU + {22019146-BDFA-442E-8C8E-345FB9644578}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {22019146-BDFA-442E-8C8E-345FB9644578}.Debug|Any CPU.Build.0 = Debug|Any CPU + {22019146-BDFA-442E-8C8E-345FB9644578}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {22019146-BDFA-442E-8C8E-345FB9644578}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {22019146-BDFA-442E-8C8E-345FB9644578}.Debug|x86.ActiveCfg = Debug|Any CPU + {22019146-BDFA-442E-8C8E-345FB9644578}.Debug|x86.Build.0 = Debug|Any CPU + {22019146-BDFA-442E-8C8E-345FB9644578}.Release|Any CPU.ActiveCfg = Release|Any CPU + {22019146-BDFA-442E-8C8E-345FB9644578}.Release|Any CPU.Build.0 = Release|Any CPU + {22019146-BDFA-442E-8C8E-345FB9644578}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {22019146-BDFA-442E-8C8E-345FB9644578}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {22019146-BDFA-442E-8C8E-345FB9644578}.Release|x86.ActiveCfg = Release|Any CPU + {22019146-BDFA-442E-8C8E-345FB9644578}.Release|x86.Build.0 = Release|Any CPU + {9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Debug|x86.ActiveCfg = Debug|Any CPU + {9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Debug|x86.Build.0 = Debug|Any CPU + {9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Release|Any CPU.Build.0 = Release|Any CPU + {9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Release|x86.ActiveCfg = Release|Any CPU + {9A07EEA2-942E-4969-9D41-799B6E2D1FF5}.Release|x86.Build.0 = Release|Any CPU + {2DD786CA-7AF7-437A-B499-801A589B9A1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2DD786CA-7AF7-437A-B499-801A589B9A1C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2DD786CA-7AF7-437A-B499-801A589B9A1C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {2DD786CA-7AF7-437A-B499-801A589B9A1C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {2DD786CA-7AF7-437A-B499-801A589B9A1C}.Debug|x86.ActiveCfg = Debug|Any CPU + {2DD786CA-7AF7-437A-B499-801A589B9A1C}.Debug|x86.Build.0 = Debug|Any CPU + {2DD786CA-7AF7-437A-B499-801A589B9A1C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2DD786CA-7AF7-437A-B499-801A589B9A1C}.Release|Any CPU.Build.0 = Release|Any CPU + {2DD786CA-7AF7-437A-B499-801A589B9A1C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {2DD786CA-7AF7-437A-B499-801A589B9A1C}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {2DD786CA-7AF7-437A-B499-801A589B9A1C}.Release|x86.ActiveCfg = Release|Any CPU + {2DD786CA-7AF7-437A-B499-801A589B9A1C}.Release|x86.Build.0 = Release|Any CPU + {6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Debug|x86.ActiveCfg = Debug|Any CPU + {6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Debug|x86.Build.0 = Debug|Any CPU + {6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Release|Any CPU.Build.0 = Release|Any CPU + {6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Release|x86.ActiveCfg = Release|Any CPU + {6BB4C20B-24C0-45D6-9E4C-C2620959BDD5}.Release|x86.Build.0 = Release|Any CPU + {827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Debug|x86.ActiveCfg = Debug|Any CPU + {827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Debug|x86.Build.0 = Debug|Any CPU + {827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Release|Any CPU.Build.0 = Release|Any CPU + {827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Release|x86.ActiveCfg = Release|Any CPU + {827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B}.Release|x86.Build.0 = Release|Any CPU + {60873DFA-97B9-419E-BAA3-940FC9B07085}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {60873DFA-97B9-419E-BAA3-940FC9B07085}.Debug|Any CPU.Build.0 = Debug|Any CPU + {60873DFA-97B9-419E-BAA3-940FC9B07085}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {60873DFA-97B9-419E-BAA3-940FC9B07085}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {60873DFA-97B9-419E-BAA3-940FC9B07085}.Debug|x86.ActiveCfg = Debug|Any CPU + {60873DFA-97B9-419E-BAA3-940FC9B07085}.Debug|x86.Build.0 = Debug|Any CPU + {60873DFA-97B9-419E-BAA3-940FC9B07085}.Release|Any CPU.ActiveCfg = Release|Any CPU + {60873DFA-97B9-419E-BAA3-940FC9B07085}.Release|Any CPU.Build.0 = Release|Any CPU + {60873DFA-97B9-419E-BAA3-940FC9B07085}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {60873DFA-97B9-419E-BAA3-940FC9B07085}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {60873DFA-97B9-419E-BAA3-940FC9B07085}.Release|x86.ActiveCfg = Release|Any CPU + {60873DFA-97B9-419E-BAA3-940FC9B07085}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1092,14 +1176,12 @@ Global {920F8A0E-6F7D-4BBE-84FF-840B89099BE6} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C} {0A6BB4C0-48D3-4E7F-952B-B8917345E075} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C} {0AD78AB5-D67C-49BC-81B1-0C51BFA82B5E} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C} - {9C632DF0-DC06-410B-95AE-B5423702E84F} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E} {AD545A5B-2BA5-4314-88AC-FC2ACF2CC718} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C} {AF210F69-9D31-43AF-AC3A-CD366E252218} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C} {364EC3C6-C9DB-45E0-A0F2-1EE61E4B429B} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C} {BDEEBE09-C0C4-433C-B0B8-8478C9776996} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C} {C3123A70-41C4-4122-AD1C-D35DF8958DD7} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C} {87AB84B2-22C1-43C6-BB8A-1D327B446FB0} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C} - {22019146-BDFA-442E-8C8E-345FB9644578} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} {AC9BE567-540E-4C70-90C2-AAF021307A80} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C} {983741B2-4424-4ED1-9B03-7675A67230C8} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C} {551DC89E-2A13-4CF2-83D7-1ADD802443D5} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C} @@ -1122,9 +1204,17 @@ Global {4C2AD8AB-8AC0-46C4-80C6-C5577C7255F6} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} {DA000953-7532-4DF5-8DB9-8143DF98D999} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} {FCFE6024-2720-49B4-8257-9DBC6114F0F1} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C} - {B2CA101A-87E6-4DD2-9BB2-28DA68EF1A94} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E} - {5DF6EFA5-865E-450B-BF83-DE9CE88EB77C} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} {A353B17E-A940-4CE8-8BF9-179E24A9041F} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C} {F21E225B-190B-4DAA-8B0A-05986D231F56} = {DAAE4C74-D06F-4874-A166-33305D2643CE} + {3F8B8FC1-9FE4-4788-8991-367113E8D7AD} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E} + {3FC8D9D6-9352-43A3-8E81-422F270085B7} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E} + {42C81540-CD47-4C68-A7A3-2A93B9C3B210} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E} + {493780DA-E696-40FF-BD12-4A5C5736F292} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} + {22019146-BDFA-442E-8C8E-345FB9644578} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} + {9A07EEA2-942E-4969-9D41-799B6E2D1FF5} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E} + {2DD786CA-7AF7-437A-B499-801A589B9A1C} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E} + {6BB4C20B-24C0-45D6-9E4C-C2620959BDD5} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} + {827DBBCB-F3A9-4BAD-8262-4BD43E28EB3B} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} + {60873DFA-97B9-419E-BAA3-940FC9B07085} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} EndGlobalSection EndGlobal diff --git a/samples/MvcSample.Web/project.json b/samples/MvcSample.Web/project.json index 4da7f577a7..6bdd9da4bb 100644 --- a/samples/MvcSample.Web/project.json +++ b/samples/MvcSample.Web/project.json @@ -11,7 +11,7 @@ "Microsoft.AspNet.Diagnostics": "1.0.0-*", "Microsoft.AspNet.Localization": "1.0.0-*", "Microsoft.AspNet.Mvc": "6.0.0-*", - "Microsoft.AspNet.Mvc.Xml": "6.0.0-*", + "Microsoft.AspNet.Mvc.Formatters.Xml": "6.0.0-*", "Microsoft.AspNet.Mvc.WebApiCompatShim": "6.0.0-*", "Microsoft.AspNet.Server.IIS": "1.0.0-*", "Microsoft.AspNet.Server.WebListener": "1.0.0-*", diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ActionFilterAttribute.cs b/src/Microsoft.AspNet.Mvc.Core/ActionFilterAttribute.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/ActionFilterAttribute.cs rename to src/Microsoft.AspNet.Mvc.Core/ActionFilterAttribute.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ActionMethodSelectorAttribute.cs b/src/Microsoft.AspNet.Mvc.Core/ActionMethodSelectorAttribute.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/ActionMethodSelectorAttribute.cs rename to src/Microsoft.AspNet.Mvc.Core/ActionMethodSelectorAttribute.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/AllowAnonymousAttribute.cs b/src/Microsoft.AspNet.Mvc.Core/AllowAnonymousAttribute.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/AllowAnonymousAttribute.cs rename to src/Microsoft.AspNet.Mvc.Core/AllowAnonymousAttribute.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Authorization/AuthorizationApplicationModelProvider.cs b/src/Microsoft.AspNet.Mvc.Core/Authorization/AuthorizationApplicationModelProvider.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Authorization/AuthorizationApplicationModelProvider.cs rename to src/Microsoft.AspNet.Mvc.Core/Authorization/AuthorizationApplicationModelProvider.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Authorization/AuthorizeFilter.cs b/src/Microsoft.AspNet.Mvc.Core/Authorization/AuthorizeFilter.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Authorization/AuthorizeFilter.cs rename to src/Microsoft.AspNet.Mvc.Core/Authorization/AuthorizeFilter.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Authorization/IAllowAnonymous.cs b/src/Microsoft.AspNet.Mvc.Core/Authorization/IAllowAnonymous.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Authorization/IAllowAnonymous.cs rename to src/Microsoft.AspNet.Mvc.Core/Authorization/IAllowAnonymous.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/AuthorizationFilterAttribute.cs b/src/Microsoft.AspNet.Mvc.Core/AuthorizationFilterAttribute.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/AuthorizationFilterAttribute.cs rename to src/Microsoft.AspNet.Mvc.Core/AuthorizationFilterAttribute.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/BadRequestObjectResult.cs b/src/Microsoft.AspNet.Mvc.Core/BadRequestObjectResult.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/BadRequestObjectResult.cs rename to src/Microsoft.AspNet.Mvc.Core/BadRequestObjectResult.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/BadRequestResult.cs b/src/Microsoft.AspNet.Mvc.Core/BadRequestResult.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/BadRequestResult.cs rename to src/Microsoft.AspNet.Mvc.Core/BadRequestResult.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/CacheProfile.cs b/src/Microsoft.AspNet.Mvc.Core/CacheProfile.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/CacheProfile.cs rename to src/Microsoft.AspNet.Mvc.Core/CacheProfile.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ChallengeResult.cs b/src/Microsoft.AspNet.Mvc.Core/ChallengeResult.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/ChallengeResult.cs rename to src/Microsoft.AspNet.Mvc.Core/ChallengeResult.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Consumes/ConsumesAttribute.cs b/src/Microsoft.AspNet.Mvc.Core/ConsumesAttribute.cs similarity index 99% rename from src/Microsoft.AspNet.Mvc.Extensions/Consumes/ConsumesAttribute.cs rename to src/Microsoft.AspNet.Mvc.Core/ConsumesAttribute.cs index 811d6c295f..a0a651ed7f 100644 --- a/src/Microsoft.AspNet.Mvc.Extensions/Consumes/ConsumesAttribute.cs +++ b/src/Microsoft.AspNet.Mvc.Core/ConsumesAttribute.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; using System.Linq; -using Microsoft.AspNet.Mvc.Extensions; +using Microsoft.AspNet.Mvc.Core; using Microsoft.Framework.Internal; using Microsoft.Net.Http.Headers; diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ContentResult.cs b/src/Microsoft.AspNet.Mvc.Core/ContentResult.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/ContentResult.cs rename to src/Microsoft.AspNet.Mvc.Core/ContentResult.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/CreatedAtActionResult.cs b/src/Microsoft.AspNet.Mvc.Core/CreatedAtActionResult.cs similarity index 98% rename from src/Microsoft.AspNet.Mvc.Extensions/CreatedAtActionResult.cs rename to src/Microsoft.AspNet.Mvc.Core/CreatedAtActionResult.cs index e006b1e398..f645ee5921 100644 --- a/src/Microsoft.AspNet.Mvc.Extensions/CreatedAtActionResult.cs +++ b/src/Microsoft.AspNet.Mvc.Core/CreatedAtActionResult.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; -using Microsoft.AspNet.Mvc.Extensions; +using Microsoft.AspNet.Mvc.Core; using Microsoft.AspNet.WebUtilities; using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.Internal; diff --git a/src/Microsoft.AspNet.Mvc.Extensions/CreatedAtRouteResult.cs b/src/Microsoft.AspNet.Mvc.Core/CreatedAtRouteResult.cs similarity index 98% rename from src/Microsoft.AspNet.Mvc.Extensions/CreatedAtRouteResult.cs rename to src/Microsoft.AspNet.Mvc.Core/CreatedAtRouteResult.cs index 5f7f4258d6..2c013e773f 100644 --- a/src/Microsoft.AspNet.Mvc.Extensions/CreatedAtRouteResult.cs +++ b/src/Microsoft.AspNet.Mvc.Core/CreatedAtRouteResult.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; -using Microsoft.AspNet.Mvc.Extensions; +using Microsoft.AspNet.Mvc.Core; using Microsoft.AspNet.WebUtilities; using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.Internal; diff --git a/src/Microsoft.AspNet.Mvc.Extensions/CreatedResult.cs b/src/Microsoft.AspNet.Mvc.Core/CreatedResult.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/CreatedResult.cs rename to src/Microsoft.AspNet.Mvc.Core/CreatedResult.cs diff --git a/src/Microsoft.AspNet.Mvc.Core/DefaultAssemblyProvider.cs b/src/Microsoft.AspNet.Mvc.Core/DefaultAssemblyProvider.cs index 650b61339d..3f47123d3a 100644 --- a/src/Microsoft.AspNet.Mvc.Core/DefaultAssemblyProvider.cs +++ b/src/Microsoft.AspNet.Mvc.Core/DefaultAssemblyProvider.cs @@ -33,11 +33,14 @@ namespace Microsoft.AspNet.Mvc "Microsoft.AspNet.Mvc.Abstractions", "Microsoft.AspNet.Mvc.ApiExplorer", "Microsoft.AspNet.Mvc.Core", - "Microsoft.AspNet.Mvc.Extensions", + "Microsoft.AspNet.Mvc.Cors", + "Microsoft.AspNet.Mvc.DataAnnotations", + "Microsoft.AspNet.Mvc.Formatters.Json", + "Microsoft.AspNet.Mvc.Formatters.Xml", "Microsoft.AspNet.Mvc.Razor", "Microsoft.AspNet.Mvc.Razor.Host", "Microsoft.AspNet.Mvc.TagHelpers", - "Microsoft.AspNet.Mvc.Xml", + "Microsoft.AspNet.Mvc.ViewFeatures", "Microsoft.AspNet.PageExecutionInstrumentation.Interfaces", }; diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ExceptionFilterAttribute.cs b/src/Microsoft.AspNet.Mvc.Core/ExceptionFilterAttribute.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/ExceptionFilterAttribute.cs rename to src/Microsoft.AspNet.Mvc.Core/ExceptionFilterAttribute.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/FileContentResult.cs b/src/Microsoft.AspNet.Mvc.Core/FileContentResult.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/FileContentResult.cs rename to src/Microsoft.AspNet.Mvc.Core/FileContentResult.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/FilePathResult.cs b/src/Microsoft.AspNet.Mvc.Core/FilePathResult.cs similarity index 99% rename from src/Microsoft.AspNet.Mvc.Extensions/FilePathResult.cs rename to src/Microsoft.AspNet.Mvc.Core/FilePathResult.cs index 2d0edd7415..f3bddc4855 100644 --- a/src/Microsoft.AspNet.Mvc.Extensions/FilePathResult.cs +++ b/src/Microsoft.AspNet.Mvc.Core/FilePathResult.cs @@ -9,7 +9,7 @@ using Microsoft.AspNet.FileProviders; using Microsoft.AspNet.Hosting; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Features; -using Microsoft.AspNet.Mvc.Extensions; +using Microsoft.AspNet.Mvc.Core; using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.Internal; using Microsoft.Net.Http.Headers; diff --git a/src/Microsoft.AspNet.Mvc.Extensions/FileResult.cs b/src/Microsoft.AspNet.Mvc.Core/FileResult.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/FileResult.cs rename to src/Microsoft.AspNet.Mvc.Core/FileResult.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/FileStreamResult.cs b/src/Microsoft.AspNet.Mvc.Core/FileStreamResult.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/FileStreamResult.cs rename to src/Microsoft.AspNet.Mvc.Core/FileStreamResult.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/FixedSetAssemblyProvider.cs b/src/Microsoft.AspNet.Mvc.Core/FixedSetAssemblyProvider.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/FixedSetAssemblyProvider.cs rename to src/Microsoft.AspNet.Mvc.Core/FixedSetAssemblyProvider.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/FixedSetControllerTypeProvider.cs b/src/Microsoft.AspNet.Mvc.Core/FixedSetControllerTypeProvider.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/FixedSetControllerTypeProvider.cs rename to src/Microsoft.AspNet.Mvc.Core/FixedSetControllerTypeProvider.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Filters/FormatFilter.cs b/src/Microsoft.AspNet.Mvc.Core/FormatFilter.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Filters/FormatFilter.cs rename to src/Microsoft.AspNet.Mvc.Core/FormatFilter.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Filters/FormatFilterAttribute.cs b/src/Microsoft.AspNet.Mvc.Core/FormatFilterAttribute.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Filters/FormatFilterAttribute.cs rename to src/Microsoft.AspNet.Mvc.Core/FormatFilterAttribute.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/FormatterMappings.cs b/src/Microsoft.AspNet.Mvc.Core/FormatterMappings.cs similarity index 98% rename from src/Microsoft.AspNet.Mvc.Extensions/FormatterMappings.cs rename to src/Microsoft.AspNet.Mvc.Core/FormatterMappings.cs index 02e530ae4c..f0924268cb 100644 --- a/src/Microsoft.AspNet.Mvc.Extensions/FormatterMappings.cs +++ b/src/Microsoft.AspNet.Mvc.Core/FormatterMappings.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; -using Microsoft.AspNet.Mvc.Extensions; +using Microsoft.AspNet.Mvc.Core; using Microsoft.Framework.Internal; using Microsoft.Net.Http.Headers; diff --git a/src/Microsoft.AspNet.Mvc.Extensions/HttpNotFoundObjectResult.cs b/src/Microsoft.AspNet.Mvc.Core/HttpNotFoundObjectResult.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/HttpNotFoundObjectResult.cs rename to src/Microsoft.AspNet.Mvc.Core/HttpNotFoundObjectResult.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/HttpNotFoundResult.cs b/src/Microsoft.AspNet.Mvc.Core/HttpNotFoundResult.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/HttpNotFoundResult.cs rename to src/Microsoft.AspNet.Mvc.Core/HttpNotFoundResult.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/HttpStatusCodeResult.cs b/src/Microsoft.AspNet.Mvc.Core/HttpStatusCodeResult.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/HttpStatusCodeResult.cs rename to src/Microsoft.AspNet.Mvc.Core/HttpStatusCodeResult.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/HttpUnauthorizedResult.cs b/src/Microsoft.AspNet.Mvc.Core/HttpUnauthorizedResult.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/HttpUnauthorizedResult.cs rename to src/Microsoft.AspNet.Mvc.Core/HttpUnauthorizedResult.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Consumes/IConsumesActionConstraint.cs b/src/Microsoft.AspNet.Mvc.Core/IConsumesActionConstraint.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Consumes/IConsumesActionConstraint.cs rename to src/Microsoft.AspNet.Mvc.Core/IConsumesActionConstraint.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Filters/IFormatFilter.cs b/src/Microsoft.AspNet.Mvc.Core/IFormatFilter.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Filters/IFormatFilter.cs rename to src/Microsoft.AspNet.Mvc.Core/IFormatFilter.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Filters/IResponseCacheFilter.cs b/src/Microsoft.AspNet.Mvc.Core/IResponseCacheFilter.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Filters/IResponseCacheFilter.cs rename to src/Microsoft.AspNet.Mvc.Core/IResponseCacheFilter.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ModelBinding/Validation/CompositeClientModelValidatorProvider.cs b/src/Microsoft.AspNet.Mvc.Core/ModelBinding/Validation/CompositeClientModelValidatorProvider.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/ModelBinding/Validation/CompositeClientModelValidatorProvider.cs rename to src/Microsoft.AspNet.Mvc.Core/ModelBinding/Validation/CompositeClientModelValidatorProvider.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/MvcCacheOptions.cs b/src/Microsoft.AspNet.Mvc.Core/MvcCacheOptions.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/MvcCacheOptions.cs rename to src/Microsoft.AspNet.Mvc.Core/MvcCacheOptions.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/MvcFormatterMappingOptions.cs b/src/Microsoft.AspNet.Mvc.Core/MvcFormatterMappingOptions.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/MvcFormatterMappingOptions.cs rename to src/Microsoft.AspNet.Mvc.Core/MvcFormatterMappingOptions.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/NoContentResult.cs b/src/Microsoft.AspNet.Mvc.Core/NoContentResult.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/NoContentResult.cs rename to src/Microsoft.AspNet.Mvc.Core/NoContentResult.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Filters/ProducesAttribute.cs b/src/Microsoft.AspNet.Mvc.Core/ProducesAttribute.cs similarity index 98% rename from src/Microsoft.AspNet.Mvc.Extensions/Filters/ProducesAttribute.cs rename to src/Microsoft.AspNet.Mvc.Core/ProducesAttribute.cs index 9c54e2924b..bd82f9e6c5 100644 --- a/src/Microsoft.AspNet.Mvc.Extensions/Filters/ProducesAttribute.cs +++ b/src/Microsoft.AspNet.Mvc.Core/ProducesAttribute.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; using System.Linq; using Microsoft.AspNet.Mvc.ApiExplorer; -using Microsoft.AspNet.Mvc.Extensions; +using Microsoft.AspNet.Mvc.Core; using Microsoft.Framework.Internal; using Microsoft.Net.Http.Headers; diff --git a/src/Microsoft.AspNet.Mvc.Core/Properties/Resources.Designer.cs b/src/Microsoft.AspNet.Mvc.Core/Properties/Resources.Designer.cs index 5d5e703579..ca87ea3fb5 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Properties/Resources.Designer.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Properties/Resources.Designer.cs @@ -74,182 +74,6 @@ namespace Microsoft.AspNet.Mvc.Core return string.Format(CultureInfo.CurrentCulture, GetString("ActionExecutor_UnexpectedTaskInstance"), p0, p1); } - /// - /// A claim of type '{0}' was not present on the provided ClaimsIdentity. - /// - internal static string ClaimUidExtractor_ClaimNotPresent - { - get { return GetString("ClaimUidExtractor_ClaimNotPresent"); } - } - - /// - /// A claim of type '{0}' was not present on the provided ClaimsIdentity. - /// - internal static string FormatClaimUidExtractor_ClaimNotPresent(object p0) - { - return string.Format(CultureInfo.CurrentCulture, GetString("ClaimUidExtractor_ClaimNotPresent"), p0); - } - - /// - /// The class ReflectedActionFilterEndPoint only supports ReflectedActionDescriptors. - /// - internal static string ReflectedActionFilterEndPoint_UnexpectedActionDescriptor - { - get { return GetString("ReflectedActionFilterEndPoint_UnexpectedActionDescriptor"); } - } - - /// - /// The class ReflectedActionFilterEndPoint only supports ReflectedActionDescriptors. - /// - internal static string FormatReflectedActionFilterEndPoint_UnexpectedActionDescriptor() - { - return GetString("ReflectedActionFilterEndPoint_UnexpectedActionDescriptor"); - } - - /// - /// The view component name '{0}' matched multiple types:{1}{2} - /// - internal static string ViewComponent_AmbiguousTypeMatch - { - get { return GetString("ViewComponent_AmbiguousTypeMatch"); } - } - - /// - /// The view component name '{0}' matched multiple types:{1}{2} - /// - internal static string FormatViewComponent_AmbiguousTypeMatch(object p0, object p1, object p2) - { - return string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_AmbiguousTypeMatch"), p0, p1, p2); - } - - /// - /// The async view component method '{0}' should be declared to return Task<T>. - /// - internal static string ViewComponent_AsyncMethod_ShouldReturnTask - { - get { return GetString("ViewComponent_AsyncMethod_ShouldReturnTask"); } - } - - /// - /// The async view component method '{0}' should be declared to return Task<T>. - /// - internal static string FormatViewComponent_AsyncMethod_ShouldReturnTask(object p0) - { - return string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_AsyncMethod_ShouldReturnTask"), p0); - } - - /// - /// A view component must return a non-null value. - /// - internal static string ViewComponent_MustReturnValue - { - get { return GetString("ViewComponent_MustReturnValue"); } - } - - /// - /// A view component must return a non-null value. - /// - internal static string FormatViewComponent_MustReturnValue() - { - return GetString("ViewComponent_MustReturnValue"); - } - - /// - /// The view component method '{0}' should be declared to return a value. - /// - internal static string ViewComponent_SyncMethod_ShouldReturnValue - { - get { return GetString("ViewComponent_SyncMethod_ShouldReturnValue"); } - } - - /// - /// The view component method '{0}' should be declared to return a value. - /// - internal static string FormatViewComponent_SyncMethod_ShouldReturnValue(object p0) - { - return string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_SyncMethod_ShouldReturnValue"), p0); - } - - /// - /// A view component named '{0}' could not be found. - /// - internal static string ViewComponent_CannotFindComponent - { - get { return GetString("ViewComponent_CannotFindComponent"); } - } - - /// - /// A view component named '{0}' could not be found. - /// - internal static string FormatViewComponent_CannotFindComponent(object p0) - { - return string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_CannotFindComponent"), p0); - } - - /// - /// An invoker could not be created for the view component '{0}'. - /// - internal static string ViewComponent_IViewComponentFactory_ReturnedNull - { - get { return GetString("ViewComponent_IViewComponentFactory_ReturnedNull"); } - } - - /// - /// An invoker could not be created for the view component '{0}'. - /// - internal static string FormatViewComponent_IViewComponentFactory_ReturnedNull(object p0) - { - return string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_IViewComponentFactory_ReturnedNull"), p0); - } - - /// - /// Could not find an '{0}' method matching the parameters. - /// - internal static string ViewComponent_CannotFindMethod - { - get { return GetString("ViewComponent_CannotFindMethod"); } - } - - /// - /// Could not find an '{0}' method matching the parameters. - /// - internal static string FormatViewComponent_CannotFindMethod(object p0) - { - return string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_CannotFindMethod"), p0); - } - - /// - /// Could not find an '{0}' or '{1}' method matching the parameters. - /// - internal static string ViewComponent_CannotFindMethod_WithFallback - { - get { return GetString("ViewComponent_CannotFindMethod_WithFallback"); } - } - - /// - /// Could not find an '{0}' or '{1}' method matching the parameters. - /// - internal static string FormatViewComponent_CannotFindMethod_WithFallback(object p0, object p1) - { - return string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_CannotFindMethod_WithFallback"), p0, p1); - } - - /// - /// View components only support returning {0}, {1} or {2}. - /// - internal static string ViewComponent_InvalidReturnValue - { - get { return GetString("ViewComponent_InvalidReturnValue"); } - } - - /// - /// View components only support returning {0}, {1} or {2}. - /// - internal static string FormatViewComponent_InvalidReturnValue(object p0, object p1, object p2) - { - return string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_InvalidReturnValue"), p0, p1, p2); - } - /// /// Replacing the action context is not supported. /// @@ -378,22 +202,6 @@ namespace Microsoft.AspNet.Mvc.Core return string.Format(CultureInfo.CurrentCulture, GetString("ArgumentPropertyUnexpectedType"), p0, p1, p2); } - /// - /// The partial view '{0}' was not found or no view engine supports the searched locations. The following locations were searched:{1} - /// - internal static string Common_PartialViewNotFound - { - get { return GetString("Common_PartialViewNotFound"); } - } - - /// - /// The partial view '{0}' was not found or no view engine supports the searched locations. The following locations were searched:{1} - /// - internal static string FormatCommon_PartialViewNotFound(object p0, object p1) - { - return string.Format(CultureInfo.CurrentCulture, GetString("Common_PartialViewNotFound"), p0, p1); - } - /// /// The value '{0}' is invalid. /// @@ -410,86 +218,6 @@ namespace Microsoft.AspNet.Mvc.Core return string.Format(CultureInfo.CurrentCulture, GetString("Common_ValueNotValidForProperty"), p0); } - /// - /// False - /// - internal static string Common_TriState_False - { - get { return GetString("Common_TriState_False"); } - } - - /// - /// False - /// - internal static string FormatCommon_TriState_False() - { - return GetString("Common_TriState_False"); - } - - /// - /// Not Set - /// - internal static string Common_TriState_NotSet - { - get { return GetString("Common_TriState_NotSet"); } - } - - /// - /// Not Set - /// - internal static string FormatCommon_TriState_NotSet() - { - return GetString("Common_TriState_NotSet"); - } - - /// - /// True - /// - internal static string Common_TriState_True - { - get { return GetString("Common_TriState_True"); } - } - - /// - /// True - /// - internal static string FormatCommon_TriState_True() - { - return GetString("Common_TriState_True"); - } - - /// - /// ViewData value must not be null. - /// - internal static string DynamicViewData_ViewDataNull - { - get { return GetString("DynamicViewData_ViewDataNull"); } - } - - /// - /// ViewData value must not be null. - /// - internal static string FormatDynamicViewData_ViewDataNull() - { - return GetString("DynamicViewData_ViewDataNull"); - } - - /// - /// The expression compiler was unable to evaluate the indexer expression '{0}' because it references the model parameter '{1}' which is unavailable. - /// - internal static string ExpressionHelper_InvalidIndexerExpression - { - get { return GetString("ExpressionHelper_InvalidIndexerExpression"); } - } - - /// - /// The expression compiler was unable to evaluate the indexer expression '{0}' because it references the model parameter '{1}' which is unavailable. - /// - internal static string FormatExpressionHelper_InvalidIndexerExpression(object p0, object p1) - { - return string.Format(CultureInfo.CurrentCulture, GetString("ExpressionHelper_InvalidIndexerExpression"), p0, p1); - } - /// /// The passed expression of expression node type '{0}' is invalid. Only simple member access expressions for model properties are supported. /// @@ -506,182 +234,6 @@ namespace Microsoft.AspNet.Mvc.Core return string.Format(CultureInfo.CurrentCulture, GetString("Invalid_IncludePropertyExpression"), p0); } - /// - /// The IModelMetadataProvider was unable to provide metadata for expression '{0}'. - /// - internal static string HtmlHelper_NullModelMetadata - { - get { return GetString("HtmlHelper_NullModelMetadata"); } - } - - /// - /// The IModelMetadataProvider was unable to provide metadata for expression '{0}'. - /// - internal static string FormatHtmlHelper_NullModelMetadata(object p0) - { - return string.Format(CultureInfo.CurrentCulture, GetString("HtmlHelper_NullModelMetadata"), p0); - } - - /// - /// Must call 'Contextualize' method before using this HtmlHelper instance. - /// - internal static string HtmlHelper_NotContextualized - { - get { return GetString("HtmlHelper_NotContextualized"); } - } - - /// - /// Must call 'Contextualize' method before using this HtmlHelper instance. - /// - internal static string FormatHtmlHelper_NotContextualized() - { - return GetString("HtmlHelper_NotContextualized"); - } - - /// - /// There is no ViewData item of type '{0}' that has the key '{1}'. - /// - internal static string HtmlHelper_MissingSelectData - { - get { return GetString("HtmlHelper_MissingSelectData"); } - } - - /// - /// There is no ViewData item of type '{0}' that has the key '{1}'. - /// - internal static string FormatHtmlHelper_MissingSelectData(object p0, object p1) - { - return string.Format(CultureInfo.CurrentCulture, GetString("HtmlHelper_MissingSelectData"), p0, p1); - } - - /// - /// The parameter '{0}' must evaluate to an IEnumerable when multiple selection is allowed. - /// - internal static string HtmlHelper_SelectExpressionNotEnumerable - { - get { return GetString("HtmlHelper_SelectExpressionNotEnumerable"); } - } - - /// - /// The parameter '{0}' must evaluate to an IEnumerable when multiple selection is allowed. - /// - internal static string FormatHtmlHelper_SelectExpressionNotEnumerable(object p0) - { - return string.Format(CultureInfo.CurrentCulture, GetString("HtmlHelper_SelectExpressionNotEnumerable"), p0); - } - - /// - /// The type '{0}' is not supported. Type must be an {1} that does not have an associated {2}. - /// - internal static string HtmlHelper_TypeNotSupported_ForGetEnumSelectList - { - get { return GetString("HtmlHelper_TypeNotSupported_ForGetEnumSelectList"); } - } - - /// - /// The type '{0}' is not supported. Type must be an {1} that does not have an associated {2}. - /// - internal static string FormatHtmlHelper_TypeNotSupported_ForGetEnumSelectList(object p0, object p1, object p2) - { - return string.Format(CultureInfo.CurrentCulture, GetString("HtmlHelper_TypeNotSupported_ForGetEnumSelectList"), p0, p1, p2); - } - - /// - /// The ViewData item that has the key '{0}' is of type '{1}' but must be of type '{2}'. - /// - internal static string HtmlHelper_WrongSelectDataType - { - get { return GetString("HtmlHelper_WrongSelectDataType"); } - } - - /// - /// The ViewData item that has the key '{0}' is of type '{1}' but must be of type '{2}'. - /// - internal static string FormatHtmlHelper_WrongSelectDataType(object p0, object p1, object p2) - { - return string.Format(CultureInfo.CurrentCulture, GetString("HtmlHelper_WrongSelectDataType"), p0, p1, p2); - } - - /// - /// The '{0}' template was used with an object of type '{1}', which does not implement '{2}'. - /// - internal static string Templates_TypeMustImplementIEnumerable - { - get { return GetString("Templates_TypeMustImplementIEnumerable"); } - } - - /// - /// The '{0}' template was used with an object of type '{1}', which does not implement '{2}'. - /// - internal static string FormatTemplates_TypeMustImplementIEnumerable(object p0, object p1, object p2) - { - return string.Format(CultureInfo.CurrentCulture, GetString("Templates_TypeMustImplementIEnumerable"), p0, p1, p2); - } - - /// - /// Templates can be used only with field access, property access, single-dimension array index, or single-parameter custom indexer expressions. - /// - internal static string TemplateHelpers_TemplateLimitations - { - get { return GetString("TemplateHelpers_TemplateLimitations"); } - } - - /// - /// Templates can be used only with field access, property access, single-dimension array index, or single-parameter custom indexer expressions. - /// - internal static string FormatTemplateHelpers_TemplateLimitations() - { - return GetString("TemplateHelpers_TemplateLimitations"); - } - - /// - /// Unable to locate an appropriate template for type {0}. - /// - internal static string TemplateHelpers_NoTemplate - { - get { return GetString("TemplateHelpers_NoTemplate"); } - } - - /// - /// Unable to locate an appropriate template for type {0}. - /// - internal static string FormatTemplateHelpers_NoTemplate(object p0) - { - return string.Format(CultureInfo.CurrentCulture, GetString("TemplateHelpers_NoTemplate"), p0); - } - - /// - /// The model item passed is null, but this ViewDataDictionary instance requires a non-null model item of type '{0}'. - /// - internal static string ViewData_ModelCannotBeNull - { - get { return GetString("ViewData_ModelCannotBeNull"); } - } - - /// - /// The model item passed is null, but this ViewDataDictionary instance requires a non-null model item of type '{0}'. - /// - internal static string FormatViewData_ModelCannotBeNull(object p0) - { - return string.Format(CultureInfo.CurrentCulture, GetString("ViewData_ModelCannotBeNull"), p0); - } - - /// - /// The model item passed into the ViewDataDictionary is of type '{0}', but this ViewDataDictionary instance requires a model item of type '{1}'. - /// - internal static string ViewData_WrongTModelType - { - get { return GetString("ViewData_WrongTModelType"); } - } - - /// - /// The model item passed into the ViewDataDictionary is of type '{0}', but this ViewDataDictionary instance requires a model item of type '{1}'. - /// - internal static string FormatViewData_WrongTModelType(object p0, object p1) - { - return string.Format(CultureInfo.CurrentCulture, GetString("ViewData_WrongTModelType"), p0, p1); - } - /// /// No route matches the supplied values. /// @@ -730,38 +282,6 @@ namespace Microsoft.AspNet.Mvc.Core return string.Format(CultureInfo.CurrentCulture, GetString("AsyncResultFilter_InvalidShortCircuit"), p0, p1, p2, p3); } - /// - /// The partial view '{0}' was not found. The following locations were searched:{1} - /// - internal static string ViewEngine_PartialViewNotFound - { - get { return GetString("ViewEngine_PartialViewNotFound"); } - } - - /// - /// The partial view '{0}' was not found. The following locations were searched:{1} - /// - internal static string FormatViewEngine_PartialViewNotFound(object p0, object p1) - { - return string.Format(CultureInfo.CurrentCulture, GetString("ViewEngine_PartialViewNotFound"), p0, p1); - } - - /// - /// The view '{0}' was not found. The following locations were searched:{1}. - /// - internal static string ViewEngine_ViewNotFound - { - get { return GetString("ViewEngine_ViewNotFound"); } - } - - /// - /// The view '{0}' was not found. The following locations were searched:{1}. - /// - internal static string FormatViewEngine_ViewNotFound(object p0, object p1) - { - return string.Format(CultureInfo.CurrentCulture, GetString("ViewEngine_ViewNotFound"), p0, p1); - } - /// /// Unable to locate an implementation of IAuthorizationService. /// @@ -794,22 +314,6 @@ namespace Microsoft.AspNet.Mvc.Core return GetString("AuthorizeAttribute_OnAuthorizationNotImplemented"); } - /// - /// The value must be greater than or equal to zero. - /// - internal static string HtmlHelper_TextAreaParameterOutOfRange - { - get { return GetString("HtmlHelper_TextAreaParameterOutOfRange"); } - } - - /// - /// The value must be greater than or equal to zero. - /// - internal static string FormatHtmlHelper_TextAreaParameterOutOfRange() - { - return GetString("HtmlHelper_TextAreaParameterOutOfRange"); - } - /// /// The type provided to '{0}' must implement '{1}'. /// @@ -826,86 +330,6 @@ namespace Microsoft.AspNet.Mvc.Core return string.Format(CultureInfo.CurrentCulture, GetString("FilterFactoryAttribute_TypeMustImplementIFilter"), p0, p1); } - /// - /// Validation parameter names in unobtrusive client validation rules cannot be empty. Client rule type: {0} - /// - internal static string UnobtrusiveJavascript_ValidationParameterCannotBeEmpty - { - get { return GetString("UnobtrusiveJavascript_ValidationParameterCannotBeEmpty"); } - } - - /// - /// Validation parameter names in unobtrusive client validation rules cannot be empty. Client rule type: {0} - /// - internal static string FormatUnobtrusiveJavascript_ValidationParameterCannotBeEmpty(object p0) - { - return string.Format(CultureInfo.CurrentCulture, GetString("UnobtrusiveJavascript_ValidationParameterCannotBeEmpty"), p0); - } - - /// - /// Validation parameter names in unobtrusive client validation rules must start with a lowercase letter and consist of only lowercase letters or digits. Validation parameter name: {0}, client rule type: {1} - /// - internal static string UnobtrusiveJavascript_ValidationParameterMustBeLegal - { - get { return GetString("UnobtrusiveJavascript_ValidationParameterMustBeLegal"); } - } - - /// - /// Validation parameter names in unobtrusive client validation rules must start with a lowercase letter and consist of only lowercase letters or digits. Validation parameter name: {0}, client rule type: {1} - /// - internal static string FormatUnobtrusiveJavascript_ValidationParameterMustBeLegal(object p0, object p1) - { - return string.Format(CultureInfo.CurrentCulture, GetString("UnobtrusiveJavascript_ValidationParameterMustBeLegal"), p0, p1); - } - - /// - /// Validation type names in unobtrusive client validation rules cannot be empty. Client rule type: {0} - /// - internal static string UnobtrusiveJavascript_ValidationTypeCannotBeEmpty - { - get { return GetString("UnobtrusiveJavascript_ValidationTypeCannotBeEmpty"); } - } - - /// - /// Validation type names in unobtrusive client validation rules cannot be empty. Client rule type: {0} - /// - internal static string FormatUnobtrusiveJavascript_ValidationTypeCannotBeEmpty(object p0) - { - return string.Format(CultureInfo.CurrentCulture, GetString("UnobtrusiveJavascript_ValidationTypeCannotBeEmpty"), p0); - } - - /// - /// Validation type names in unobtrusive client validation rules must consist of only lowercase letters. Invalid name: "{0}", client rule type: {1} - /// - internal static string UnobtrusiveJavascript_ValidationTypeMustBeLegal - { - get { return GetString("UnobtrusiveJavascript_ValidationTypeMustBeLegal"); } - } - - /// - /// Validation type names in unobtrusive client validation rules must consist of only lowercase letters. Invalid name: "{0}", client rule type: {1} - /// - internal static string FormatUnobtrusiveJavascript_ValidationTypeMustBeLegal(object p0, object p1) - { - return string.Format(CultureInfo.CurrentCulture, GetString("UnobtrusiveJavascript_ValidationTypeMustBeLegal"), p0, p1); - } - - /// - /// Validation type names in unobtrusive client validation rules must be unique. The following validation type was seen more than once: {0} - /// - internal static string UnobtrusiveJavascript_ValidationTypeMustBeUnique - { - get { return GetString("UnobtrusiveJavascript_ValidationTypeMustBeUnique"); } - } - - /// - /// Validation type names in unobtrusive client validation rules must be unique. The following validation type was seen more than once: {0} - /// - internal static string FormatUnobtrusiveJavascript_ValidationTypeMustBeUnique(object p0) - { - return string.Format(CultureInfo.CurrentCulture, GetString("UnobtrusiveJavascript_ValidationTypeMustBeUnique"), p0); - } - /// /// Cannot return null from an action method with a return type of '{0}'. /// @@ -1242,54 +666,6 @@ namespace Microsoft.AspNet.Mvc.Core return string.Format(CultureInfo.CurrentCulture, GetString("AttributeRoute_AggregateErrorMessage_ErrorNumber"), p0, p1, p2); } - /// - /// Could not find a replacement for view expansion token '{0}'. - /// - internal static string TemplatedViewLocationExpander_NoReplacementToken - { - get { return GetString("TemplatedViewLocationExpander_NoReplacementToken"); } - } - - /// - /// Could not find a replacement for view expansion token '{0}'. - /// - internal static string FormatTemplatedViewLocationExpander_NoReplacementToken(object p0) - { - return string.Format(CultureInfo.CurrentCulture, GetString("TemplatedViewLocationExpander_NoReplacementToken"), p0); - } - - /// - /// {0} must be executed before {1} can be invoked. - /// - internal static string TemplatedExpander_PopulateValuesMustBeInvokedFirst - { - get { return GetString("TemplatedExpander_PopulateValuesMustBeInvokedFirst"); } - } - - /// - /// {0} must be executed before {1} can be invoked. - /// - internal static string FormatTemplatedExpander_PopulateValuesMustBeInvokedFirst(object p0, object p1) - { - return string.Format(CultureInfo.CurrentCulture, GetString("TemplatedExpander_PopulateValuesMustBeInvokedFirst"), p0, p1); - } - - /// - /// The result of value factory cannot be null. - /// - internal static string TemplatedExpander_ValueFactoryCannotReturnNull - { - get { return GetString("TemplatedExpander_ValueFactoryCannotReturnNull"); } - } - - /// - /// The result of value factory cannot be null. - /// - internal static string FormatTemplatedExpander_ValueFactoryCannotReturnNull() - { - return GetString("TemplatedExpander_ValueFactoryCannotReturnNull"); - } - /// /// A method '{0}' must not define attribute routed actions and non attribute routed actions at the same time:{1}{2}{1}{1}Use 'AcceptVerbsAttribute' to create a single route that allows multiple HTTP verbs and defines a route, or set a route template in all attributes that constrain HTTP verbs. /// @@ -1370,22 +746,6 @@ namespace Microsoft.AspNet.Mvc.Core return string.Format(CultureInfo.CurrentCulture, GetString("FileResult_InvalidPath"), p0); } - /// - /// Type: '{0}' - Name: '{1}' - /// - internal static string ViewComponent_AmbiguousTypeMatch_Item - { - get { return GetString("ViewComponent_AmbiguousTypeMatch_Item"); } - } - - /// - /// Type: '{0}' - Name: '{1}' - /// - internal static string FormatViewComponent_AmbiguousTypeMatch_Item(object p0, object p1) - { - return string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_AmbiguousTypeMatch_Item"), p0, p1); - } - /// /// The input was not valid. /// @@ -1498,38 +858,6 @@ namespace Microsoft.AspNet.Mvc.Core return string.Format(CultureInfo.CurrentCulture, GetString("ControllerFactory_PropertyCannotBeActivated"), p0, p1); } - /// - /// No URL for remote validation could be found. - /// - internal static string RemoteAttribute_NoUrlFound - { - get { return GetString("RemoteAttribute_NoUrlFound"); } - } - - /// - /// No URL for remote validation could be found. - /// - internal static string FormatRemoteAttribute_NoUrlFound() - { - return GetString("RemoteAttribute_NoUrlFound"); - } - - /// - /// '{0}' is invalid. - /// - internal static string RemoteAttribute_RemoteValidationFailed - { - get { return GetString("RemoteAttribute_RemoteValidationFailed"); } - } - - /// - /// '{0}' is invalid. - /// - internal static string FormatRemoteAttribute_RemoteValidationFailed(object p0) - { - return string.Format(CultureInfo.CurrentCulture, GetString("RemoteAttribute_RemoteValidationFailed"), p0); - } - /// /// The '{0}' cache profile is not defined. /// diff --git a/src/Microsoft.AspNet.Mvc.Extensions/RedirectResult.cs b/src/Microsoft.AspNet.Mvc.Core/RedirectResult.cs similarity index 98% rename from src/Microsoft.AspNet.Mvc.Extensions/RedirectResult.cs rename to src/Microsoft.AspNet.Mvc.Core/RedirectResult.cs index 4cf7a6b3c7..a5c0e667c3 100644 --- a/src/Microsoft.AspNet.Mvc.Extensions/RedirectResult.cs +++ b/src/Microsoft.AspNet.Mvc.Core/RedirectResult.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNet.Mvc.Extensions; +using Microsoft.AspNet.Mvc.Core; using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.Internal; diff --git a/src/Microsoft.AspNet.Mvc.Extensions/RedirectToActionResult.cs b/src/Microsoft.AspNet.Mvc.Core/RedirectToActionResult.cs similarity index 98% rename from src/Microsoft.AspNet.Mvc.Extensions/RedirectToActionResult.cs rename to src/Microsoft.AspNet.Mvc.Core/RedirectToActionResult.cs index 8711cf5383..8f8e84a2ec 100644 --- a/src/Microsoft.AspNet.Mvc.Extensions/RedirectToActionResult.cs +++ b/src/Microsoft.AspNet.Mvc.Core/RedirectToActionResult.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; -using Microsoft.AspNet.Mvc.Extensions; +using Microsoft.AspNet.Mvc.Core; using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.Internal; diff --git a/src/Microsoft.AspNet.Mvc.Extensions/RedirectToRouteResult.cs b/src/Microsoft.AspNet.Mvc.Core/RedirectToRouteResult.cs similarity index 98% rename from src/Microsoft.AspNet.Mvc.Extensions/RedirectToRouteResult.cs rename to src/Microsoft.AspNet.Mvc.Core/RedirectToRouteResult.cs index ee0f0c0eaf..d7c5639964 100644 --- a/src/Microsoft.AspNet.Mvc.Extensions/RedirectToRouteResult.cs +++ b/src/Microsoft.AspNet.Mvc.Core/RedirectToRouteResult.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; -using Microsoft.AspNet.Mvc.Extensions; +using Microsoft.AspNet.Mvc.Core; using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.Internal; diff --git a/src/Microsoft.AspNet.Mvc.Extensions/RequireHttpsAttribute.cs b/src/Microsoft.AspNet.Mvc.Core/RequireHttpsAttribute.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/RequireHttpsAttribute.cs rename to src/Microsoft.AspNet.Mvc.Core/RequireHttpsAttribute.cs diff --git a/src/Microsoft.AspNet.Mvc.Core/Resources.resx b/src/Microsoft.AspNet.Mvc.Core/Resources.resx index bf9e674308..c5cbbd164c 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Resources.resx +++ b/src/Microsoft.AspNet.Mvc.Core/Resources.resx @@ -129,40 +129,6 @@ The method '{0}' on type '{1}' returned a Task instance even though it is not an asynchronous method. - - A claim of type '{0}' was not present on the provided ClaimsIdentity. - - - The class ReflectedActionFilterEndPoint only supports ReflectedActionDescriptors. - - - The view component name '{0}' matched multiple types:{1}{2} - {1} is the newline character - - - The async view component method '{0}' should be declared to return Task<T>. - - - A view component must return a non-null value. - - - The view component method '{0}' should be declared to return a value. - - - A view component named '{0}' could not be found. - - - An invoker could not be created for the view component '{0}'. - - - Could not find an '{0}' method matching the parameters. - - - Could not find an '{0}' or '{1}' method matching the parameters. - - - View components only support returning {0}, {1} or {2}. - Replacing the action context is not supported. @@ -187,63 +153,12 @@ Property '{0}' is of type '{1}', but this method requires a value of type '{2}'. - - The partial view '{0}' was not found or no view engine supports the searched locations. The following locations were searched:{1} - The value '{0}' is invalid. - - False - - - Not Set - - - True - - - ViewData value must not be null. - - - The expression compiler was unable to evaluate the indexer expression '{0}' because it references the model parameter '{1}' which is unavailable. - The passed expression of expression node type '{0}' is invalid. Only simple member access expressions for model properties are supported. - - The IModelMetadataProvider was unable to provide metadata for expression '{0}'. - - - Must call 'Contextualize' method before using this HtmlHelper instance. - - - There is no ViewData item of type '{0}' that has the key '{1}'. - - - The parameter '{0}' must evaluate to an IEnumerable when multiple selection is allowed. - - - The type '{0}' is not supported. Type must be an {1} that does not have an associated {2}. - - - The ViewData item that has the key '{0}' is of type '{1}' but must be of type '{2}'. - - - The '{0}' template was used with an object of type '{1}', which does not implement '{2}'. - - - Templates can be used only with field access, property access, single-dimension array index, or single-parameter custom indexer expressions. - - - Unable to locate an appropriate template for type {0}. - - - The model item passed is null, but this ViewDataDictionary instance requires a non-null model item of type '{0}'. - - - The model item passed into the ViewDataDictionary is of type '{0}', but this ViewDataDictionary instance requires a model item of type '{1}'. - No route matches the supplied values. @@ -253,39 +168,15 @@ If an {0} cancels execution by setting the {1} property of {2} to 'true', then it cannot call the next filter by invoking {3}. - - The partial view '{0}' was not found. The following locations were searched:{1} - - - The view '{0}' was not found. The following locations were searched:{1}. - Unable to locate an implementation of IAuthorizationService. OnAuthorization is not implemented by this filter, use OnAuthorizationAsync instead. - - The value must be greater than or equal to zero. - The type provided to '{0}' must implement '{1}'. - - Validation parameter names in unobtrusive client validation rules cannot be empty. Client rule type: {0} - - - Validation parameter names in unobtrusive client validation rules must start with a lowercase letter and consist of only lowercase letters or digits. Validation parameter name: {0}, client rule type: {1} - - - Validation type names in unobtrusive client validation rules cannot be empty. Client rule type: {0} - - - Validation type names in unobtrusive client validation rules must consist of only lowercase letters. Invalid name: "{0}", client rule type: {1} - - - Validation type names in unobtrusive client validation rules must be unique. The following validation type was seen more than once: {0} - Cannot return null from an action method with a return type of '{0}'. @@ -355,15 +246,6 @@ Error {0}:{1}{2} {0} is the error number, {1} is Environment.NewLine {2} is the error message - - Could not find a replacement for view expansion token '{0}'. - - - {0} must be executed before {1} can be invoked. - - - The result of value factory cannot be null. - A method '{0}' must not define attribute routed actions and non attribute routed actions at the same time:{1}{2}{1}{1}Use 'AcceptVerbsAttribute' to create a single route that allows multiple HTTP verbs and defines a route, or set a route template in all attributes that constrain HTTP verbs. {0} is the MethodInfo.FullName, {1} is Environment.NewLine, {2} is the formatted list of actions defined by that method info. @@ -382,9 +264,6 @@ Could not find file: {0} {0} is the value for the provided path - - Type: '{0}' - Name: '{1}' - The input was not valid. @@ -406,12 +285,6 @@ The property '{0}' on controller '{1}' cannot be activated. - - No URL for remote validation could be found. - - - '{0}' is invalid. - The '{0}' cache profile is not defined. diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Filters/ResponseCacheAttribute.cs b/src/Microsoft.AspNet.Mvc.Core/ResponseCacheAttribute.cs similarity index 99% rename from src/Microsoft.AspNet.Mvc.Extensions/Filters/ResponseCacheAttribute.cs rename to src/Microsoft.AspNet.Mvc.Core/ResponseCacheAttribute.cs index cd090b109c..633bef7a13 100644 --- a/src/Microsoft.AspNet.Mvc.Extensions/Filters/ResponseCacheAttribute.cs +++ b/src/Microsoft.AspNet.Mvc.Core/ResponseCacheAttribute.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNet.Mvc.Extensions; +using Microsoft.AspNet.Mvc.Core; using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.Internal; using Microsoft.Framework.OptionsModel; diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Filters/ResponseCacheFilter.cs b/src/Microsoft.AspNet.Mvc.Core/ResponseCacheFilter.cs similarity index 99% rename from src/Microsoft.AspNet.Mvc.Extensions/Filters/ResponseCacheFilter.cs rename to src/Microsoft.AspNet.Mvc.Core/ResponseCacheFilter.cs index eb09f0cf45..ebe249a72b 100644 --- a/src/Microsoft.AspNet.Mvc.Extensions/Filters/ResponseCacheFilter.cs +++ b/src/Microsoft.AspNet.Mvc.Core/ResponseCacheFilter.cs @@ -4,7 +4,7 @@ using System; using System.Globalization; using System.Linq; -using Microsoft.AspNet.Mvc.Extensions; +using Microsoft.AspNet.Mvc.Core; using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Mvc diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ResponseCacheLocation.cs b/src/Microsoft.AspNet.Mvc.Core/ResponseCacheLocation.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/ResponseCacheLocation.cs rename to src/Microsoft.AspNet.Mvc.Core/ResponseCacheLocation.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Filters/ResultFilterAttribute.cs b/src/Microsoft.AspNet.Mvc.Core/ResultFilterAttribute.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Filters/ResultFilterAttribute.cs rename to src/Microsoft.AspNet.Mvc.Core/ResultFilterAttribute.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/SerializableError.cs b/src/Microsoft.AspNet.Mvc.Core/SerializableError.cs similarity index 97% rename from src/Microsoft.AspNet.Mvc.Extensions/SerializableError.cs rename to src/Microsoft.AspNet.Mvc.Core/SerializableError.cs index fcde2312f6..78f52f3049 100644 --- a/src/Microsoft.AspNet.Mvc.Extensions/SerializableError.cs +++ b/src/Microsoft.AspNet.Mvc.Core/SerializableError.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; using System.Linq; -using Microsoft.AspNet.Mvc.Extensions; +using Microsoft.AspNet.Mvc.Core; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.Framework.Internal; diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ServiceBasedControllerActivator.cs b/src/Microsoft.AspNet.Mvc.Core/ServiceBasedControllerActivator.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/ServiceBasedControllerActivator.cs rename to src/Microsoft.AspNet.Mvc.Core/ServiceBasedControllerActivator.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/UnsupportedMediaTypeResult.cs b/src/Microsoft.AspNet.Mvc.Core/UnsupportedMediaTypeResult.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/UnsupportedMediaTypeResult.cs rename to src/Microsoft.AspNet.Mvc.Core/UnsupportedMediaTypeResult.cs diff --git a/src/Microsoft.AspNet.Mvc.Core/project.json b/src/Microsoft.AspNet.Mvc.Core/project.json index 0d86b9b682..f7bded03cb 100644 --- a/src/Microsoft.AspNet.Mvc.Core/project.json +++ b/src/Microsoft.AspNet.Mvc.Core/project.json @@ -9,6 +9,9 @@ "warningsAsErrors": true }, "dependencies": { + "Microsoft.AspNet.Authentication": "1.0.0-*", + "Microsoft.AspNet.Authorization": "1.0.0-*", + "Microsoft.AspNet.FileProviders.Abstractions": "1.0.0-*", "Microsoft.AspNet.Hosting.Abstractions": "1.0.0-*", "Microsoft.AspNet.Http": "1.0.0-*", "Microsoft.AspNet.Mvc.Abstractions": "6.0.0-*", diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Cors/CorsApplicationModelProvider.cs b/src/Microsoft.AspNet.Mvc.Cors/CorsApplicationModelProvider.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Cors/CorsApplicationModelProvider.cs rename to src/Microsoft.AspNet.Mvc.Cors/CorsApplicationModelProvider.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Cors/CorsAuthorizationFilter.cs b/src/Microsoft.AspNet.Mvc.Cors/CorsAuthorizationFilter.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Cors/CorsAuthorizationFilter.cs rename to src/Microsoft.AspNet.Mvc.Cors/CorsAuthorizationFilter.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Cors/CorsAuthorizationFilterFactory.cs b/src/Microsoft.AspNet.Mvc.Cors/CorsAuthorizationFilterFactory.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Cors/CorsAuthorizationFilterFactory.cs rename to src/Microsoft.AspNet.Mvc.Cors/CorsAuthorizationFilterFactory.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Cors/DisableCorsAuthorizationFilter.cs b/src/Microsoft.AspNet.Mvc.Cors/DisableCorsAuthorizationFilter.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Cors/DisableCorsAuthorizationFilter.cs rename to src/Microsoft.AspNet.Mvc.Cors/DisableCorsAuthorizationFilter.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Microsoft.AspNet.Mvc.Extensions.xproj b/src/Microsoft.AspNet.Mvc.Cors/Microsoft.AspNet.Mvc.Cors.xproj similarity index 88% rename from src/Microsoft.AspNet.Mvc.Extensions/Microsoft.AspNet.Mvc.Extensions.xproj rename to src/Microsoft.AspNet.Mvc.Cors/Microsoft.AspNet.Mvc.Cors.xproj index d4e3794423..d1c77803e9 100644 --- a/src/Microsoft.AspNet.Mvc.Extensions/Microsoft.AspNet.Mvc.Extensions.xproj +++ b/src/Microsoft.AspNet.Mvc.Cors/Microsoft.AspNet.Mvc.Cors.xproj @@ -4,13 +4,15 @@ 14.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + - b2ca101a-87e6-4dd2-9bb2-28da68ef1a94 - Microsoft.AspNet.Mvc.Extensions + 9a07eea2-942e-4969-9d41-799b6e2d1ff5 + Microsoft.AspNet.Mvc.Cors ..\..\artifacts\obj\$(MSBuildProjectName) ..\..\artifacts\bin\$(MSBuildProjectName)\ + 2.0 diff --git a/src/Microsoft.AspNet.Mvc.Cors/Properties/AssemblyInfo.cs b/src/Microsoft.AspNet.Mvc.Cors/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000..94ca1cb48c --- /dev/null +++ b/src/Microsoft.AspNet.Mvc.Cors/Properties/AssemblyInfo.cs @@ -0,0 +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.Reflection; +using System.Runtime.CompilerServices; + +[assembly: AssemblyMetadata("Serviceable", "True")] +[assembly: InternalsVisibleTo("Microsoft.AspNet.Mvc.Cors.Test")] \ No newline at end of file diff --git a/src/Microsoft.AspNet.Mvc.Cors/project.json b/src/Microsoft.AspNet.Mvc.Cors/project.json new file mode 100644 index 0000000000..5cb810e5be --- /dev/null +++ b/src/Microsoft.AspNet.Mvc.Cors/project.json @@ -0,0 +1,24 @@ +{ + "description": "CORS features for the core MVC runtime", + "version": "6.0.0-*", + "repository": { + "type": "git", + "url": "git://github.com/aspnet/mvc" + }, + "compilationOptions": { + "warningsAsErrors": true + }, + "dependencies": { + "Microsoft.AspNet.Cors.Core": "1.0.0-*", + "Microsoft.AspNet.Mvc.Core": "6.0.0-*", + "Microsoft.Framework.NotNullAttribute.Sources": { + "version": "1.0.0-*", + "type": "build" + } + }, + + "frameworks": { + "dnx451": { }, + "dnxcore50": { } + } +} diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ModelBinding/Validation/CompareAttributeAdapter.cs b/src/Microsoft.AspNet.Mvc.DataAnnotations/CompareAttributeAdapter.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/ModelBinding/Validation/CompareAttributeAdapter.cs rename to src/Microsoft.AspNet.Mvc.DataAnnotations/CompareAttributeAdapter.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ModelBinding/Validation/DataAnnotationsClientModelValidatorOfTAttribute.cs b/src/Microsoft.AspNet.Mvc.DataAnnotations/DataAnnotationsClientModelValidatorOfTAttribute.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/ModelBinding/Validation/DataAnnotationsClientModelValidatorOfTAttribute.cs rename to src/Microsoft.AspNet.Mvc.DataAnnotations/DataAnnotationsClientModelValidatorOfTAttribute.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ModelBinding/Validation/DataAnnotationsClientModelValidatorProvider.cs b/src/Microsoft.AspNet.Mvc.DataAnnotations/DataAnnotationsClientModelValidatorProvider.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/ModelBinding/Validation/DataAnnotationsClientModelValidatorProvider.cs rename to src/Microsoft.AspNet.Mvc.DataAnnotations/DataAnnotationsClientModelValidatorProvider.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ModelBinding/Metadata/DataAnnotationsMetadataProvider.cs b/src/Microsoft.AspNet.Mvc.DataAnnotations/DataAnnotationsMetadataProvider.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/ModelBinding/Metadata/DataAnnotationsMetadataProvider.cs rename to src/Microsoft.AspNet.Mvc.DataAnnotations/DataAnnotationsMetadataProvider.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ModelBinding/Validation/DataAnnotationsModelValidator.cs b/src/Microsoft.AspNet.Mvc.DataAnnotations/DataAnnotationsModelValidator.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/ModelBinding/Validation/DataAnnotationsModelValidator.cs rename to src/Microsoft.AspNet.Mvc.DataAnnotations/DataAnnotationsModelValidator.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ModelBinding/Validation/DataAnnotationsModelValidatorProvider.cs b/src/Microsoft.AspNet.Mvc.DataAnnotations/DataAnnotationsModelValidatorProvider.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/ModelBinding/Validation/DataAnnotationsModelValidatorProvider.cs rename to src/Microsoft.AspNet.Mvc.DataAnnotations/DataAnnotationsModelValidatorProvider.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ModelBinding/Validation/DataTypeAttributeAdapter.cs b/src/Microsoft.AspNet.Mvc.DataAnnotations/DataTypeAttributeAdapter.cs similarity index 96% rename from src/Microsoft.AspNet.Mvc.Extensions/ModelBinding/Validation/DataTypeAttributeAdapter.cs rename to src/Microsoft.AspNet.Mvc.DataAnnotations/DataTypeAttributeAdapter.cs index 58c1dd0f80..72309d7dda 100644 --- a/src/Microsoft.AspNet.Mvc.Extensions/ModelBinding/Validation/DataTypeAttributeAdapter.cs +++ b/src/Microsoft.AspNet.Mvc.DataAnnotations/DataTypeAttributeAdapter.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -using Microsoft.AspNet.Mvc.Extensions; +using Microsoft.AspNet.Mvc.DataAnnotations; using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Mvc.ModelBinding.Validation diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ModelBinding/Validation/DefaultClientModelValidatorProvider.cs b/src/Microsoft.AspNet.Mvc.DataAnnotations/DefaultClientModelValidatorProvider.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/ModelBinding/Validation/DefaultClientModelValidatorProvider.cs rename to src/Microsoft.AspNet.Mvc.DataAnnotations/DefaultClientModelValidatorProvider.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/HiddenInputAttribute.cs b/src/Microsoft.AspNet.Mvc.DataAnnotations/HiddenInputAttribute.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/HiddenInputAttribute.cs rename to src/Microsoft.AspNet.Mvc.DataAnnotations/HiddenInputAttribute.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ModelBinding/Validation/MaxLengthAttributeAdapter.cs b/src/Microsoft.AspNet.Mvc.DataAnnotations/MaxLengthAttributeAdapter.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/ModelBinding/Validation/MaxLengthAttributeAdapter.cs rename to src/Microsoft.AspNet.Mvc.DataAnnotations/MaxLengthAttributeAdapter.cs diff --git a/src/Microsoft.AspNet.Mvc.DataAnnotations/Microsoft.AspNet.Mvc.DataAnnotations.xproj b/src/Microsoft.AspNet.Mvc.DataAnnotations/Microsoft.AspNet.Mvc.DataAnnotations.xproj new file mode 100644 index 0000000000..90d3ff3e43 --- /dev/null +++ b/src/Microsoft.AspNet.Mvc.DataAnnotations/Microsoft.AspNet.Mvc.DataAnnotations.xproj @@ -0,0 +1,20 @@ + + + + 14.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + + 2dd786ca-7af7-437a-b499-801a589b9a1c + Microsoft.AspNet.Mvc.DataAnnotations + ..\..\artifacts\obj\$(MSBuildProjectName) + ..\..\artifacts\bin\$(MSBuildProjectName)\ + + + + 2.0 + + + diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ModelBinding/Validation/MinLengthAttributeAdapter.cs b/src/Microsoft.AspNet.Mvc.DataAnnotations/MinLengthAttributeAdapter.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/ModelBinding/Validation/MinLengthAttributeAdapter.cs rename to src/Microsoft.AspNet.Mvc.DataAnnotations/MinLengthAttributeAdapter.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ModelBinding/Validation/ModelClientValidationEqualToRule.cs b/src/Microsoft.AspNet.Mvc.DataAnnotations/ModelClientValidationEqualToRule.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/ModelBinding/Validation/ModelClientValidationEqualToRule.cs rename to src/Microsoft.AspNet.Mvc.DataAnnotations/ModelClientValidationEqualToRule.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ModelBinding/Validation/ModelClientValidationMaxLengthRule.cs b/src/Microsoft.AspNet.Mvc.DataAnnotations/ModelClientValidationMaxLengthRule.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/ModelBinding/Validation/ModelClientValidationMaxLengthRule.cs rename to src/Microsoft.AspNet.Mvc.DataAnnotations/ModelClientValidationMaxLengthRule.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ModelBinding/Validation/ModelClientValidationMinLengthRule.cs b/src/Microsoft.AspNet.Mvc.DataAnnotations/ModelClientValidationMinLengthRule.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/ModelBinding/Validation/ModelClientValidationMinLengthRule.cs rename to src/Microsoft.AspNet.Mvc.DataAnnotations/ModelClientValidationMinLengthRule.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ModelBinding/Validation/ModelClientValidationRangeRule.cs b/src/Microsoft.AspNet.Mvc.DataAnnotations/ModelClientValidationRangeRule.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/ModelBinding/Validation/ModelClientValidationRangeRule.cs rename to src/Microsoft.AspNet.Mvc.DataAnnotations/ModelClientValidationRangeRule.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ModelBinding/Validation/ModelClientValidationRegexRule.cs b/src/Microsoft.AspNet.Mvc.DataAnnotations/ModelClientValidationRegexRule.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/ModelBinding/Validation/ModelClientValidationRegexRule.cs rename to src/Microsoft.AspNet.Mvc.DataAnnotations/ModelClientValidationRegexRule.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ModelBinding/Validation/ModelClientValidationRequiredRule.cs b/src/Microsoft.AspNet.Mvc.DataAnnotations/ModelClientValidationRequiredRule.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/ModelBinding/Validation/ModelClientValidationRequiredRule.cs rename to src/Microsoft.AspNet.Mvc.DataAnnotations/ModelClientValidationRequiredRule.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ModelBinding/Validation/ModelClientValidationStringLengthRule.cs b/src/Microsoft.AspNet.Mvc.DataAnnotations/ModelClientValidationStringLengthRule.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/ModelBinding/Validation/ModelClientValidationStringLengthRule.cs rename to src/Microsoft.AspNet.Mvc.DataAnnotations/ModelClientValidationStringLengthRule.cs diff --git a/src/Microsoft.AspNet.Mvc.DataAnnotations/Properties/AssemblyInfo.cs b/src/Microsoft.AspNet.Mvc.DataAnnotations/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000..84b3354e9a --- /dev/null +++ b/src/Microsoft.AspNet.Mvc.DataAnnotations/Properties/AssemblyInfo.cs @@ -0,0 +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.Reflection; +using System.Runtime.CompilerServices; + +[assembly: AssemblyMetadata("Serviceable", "True")] +[assembly: InternalsVisibleTo("Microsoft.AspNet.Mvc.DataAnnotations.Test")] \ No newline at end of file diff --git a/src/Microsoft.AspNet.Mvc.DataAnnotations/Properties/Resources.Designer.cs b/src/Microsoft.AspNet.Mvc.DataAnnotations/Properties/Resources.Designer.cs new file mode 100644 index 0000000000..45cfd42e94 --- /dev/null +++ b/src/Microsoft.AspNet.Mvc.DataAnnotations/Properties/Resources.Designer.cs @@ -0,0 +1,62 @@ +// +namespace Microsoft.AspNet.Mvc.DataAnnotations +{ + using System.Globalization; + using System.Reflection; + using System.Resources; + + internal static class Resources + { + private static readonly ResourceManager _resourceManager + = new ResourceManager("Microsoft.AspNet.Mvc.DataAnnotations.Resources", typeof(Resources).GetTypeInfo().Assembly); + + /// + /// The model object inside the metadata claimed to be compatible with '{0}', but was actually '{1}'. + /// + internal static string ValidatableObjectAdapter_IncompatibleType + { + get { return GetString("ValidatableObjectAdapter_IncompatibleType"); } + } + + /// + /// The model object inside the metadata claimed to be compatible with '{0}', but was actually '{1}'. + /// + internal static string FormatValidatableObjectAdapter_IncompatibleType(object p0, object p1) + { + return string.Format(CultureInfo.CurrentCulture, GetString("ValidatableObjectAdapter_IncompatibleType"), p0, p1); + } + + /// + /// Value cannot be null or empty. + /// + internal static string ArgumentCannotBeNullOrEmpty + { + get { return GetString("ArgumentCannotBeNullOrEmpty"); } + } + + /// + /// Value cannot be null or empty. + /// + internal static string FormatArgumentCannotBeNullOrEmpty() + { + return GetString("ArgumentCannotBeNullOrEmpty"); + } + + private static string GetString(string name, params string[] formatterNames) + { + var value = _resourceManager.GetString(name); + + System.Diagnostics.Debug.Assert(value != null); + + if (formatterNames != null) + { + for (var i = 0; i < formatterNames.Length; i++) + { + value = value.Replace("{" + formatterNames[i] + "}", "{" + i + "}"); + } + } + + return value; + } + } +} diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ModelBinding/Validation/RangeAttributeAdapter.cs b/src/Microsoft.AspNet.Mvc.DataAnnotations/RangeAttributeAdapter.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/ModelBinding/Validation/RangeAttributeAdapter.cs rename to src/Microsoft.AspNet.Mvc.DataAnnotations/RangeAttributeAdapter.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ModelBinding/Validation/RegularExpressionAttributeAdapter.cs b/src/Microsoft.AspNet.Mvc.DataAnnotations/RegularExpressionAttributeAdapter.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/ModelBinding/Validation/RegularExpressionAttributeAdapter.cs rename to src/Microsoft.AspNet.Mvc.DataAnnotations/RegularExpressionAttributeAdapter.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ModelBinding/Validation/RequiredAttributeAdapter.cs b/src/Microsoft.AspNet.Mvc.DataAnnotations/RequiredAttributeAdapter.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/ModelBinding/Validation/RequiredAttributeAdapter.cs rename to src/Microsoft.AspNet.Mvc.DataAnnotations/RequiredAttributeAdapter.cs diff --git a/src/Microsoft.AspNet.Mvc.DataAnnotations/Resources.resx b/src/Microsoft.AspNet.Mvc.DataAnnotations/Resources.resx new file mode 100644 index 0000000000..ec59448ff3 --- /dev/null +++ b/src/Microsoft.AspNet.Mvc.DataAnnotations/Resources.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + The model object inside the metadata claimed to be compatible with '{0}', but was actually '{1}'. + + + Value cannot be null or empty. + + \ No newline at end of file diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ModelBinding/Validation/StringLengthAttributeAdapter.cs b/src/Microsoft.AspNet.Mvc.DataAnnotations/StringLengthAttributeAdapter.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/ModelBinding/Validation/StringLengthAttributeAdapter.cs rename to src/Microsoft.AspNet.Mvc.DataAnnotations/StringLengthAttributeAdapter.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ModelBinding/Validation/ValidatableObjectAdapter.cs b/src/Microsoft.AspNet.Mvc.DataAnnotations/ValidatableObjectAdapter.cs similarity index 97% rename from src/Microsoft.AspNet.Mvc.Extensions/ModelBinding/Validation/ValidatableObjectAdapter.cs rename to src/Microsoft.AspNet.Mvc.DataAnnotations/ValidatableObjectAdapter.cs index 7a58e41bb3..5be1a1b959 100644 --- a/src/Microsoft.AspNet.Mvc.Extensions/ModelBinding/Validation/ValidatableObjectAdapter.cs +++ b/src/Microsoft.AspNet.Mvc.DataAnnotations/ValidatableObjectAdapter.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; -using Microsoft.AspNet.Mvc.Extensions; +using Microsoft.AspNet.Mvc.DataAnnotations; namespace Microsoft.AspNet.Mvc.ModelBinding.Validation { diff --git a/src/Microsoft.AspNet.Mvc.DataAnnotations/project.json b/src/Microsoft.AspNet.Mvc.DataAnnotations/project.json new file mode 100644 index 0000000000..20a6d0f7de --- /dev/null +++ b/src/Microsoft.AspNet.Mvc.DataAnnotations/project.json @@ -0,0 +1,31 @@ +{ + "description": "Metadata and Validation using System.ComponentModel.DataAnnotations for the MVC runtime", + "version": "6.0.0-*", + "repository": { + "type": "git", + "url": "git://github.com/aspnet/mvc" + }, + "compilationOptions": { + "warningsAsErrors": true + }, + "dependencies": { + "Microsoft.AspNet.Mvc.Core": "6.0.0-*", + "Microsoft.Framework.BufferEntryCollection.Sources": { "version": "1.0.0-*", "type": "build" }, + "Microsoft.Framework.ClosedGenericMatcher.Sources": { "version": "1.0.0-*", "type": "build" }, + "Microsoft.Framework.CopyOnWriteDictionary.Sources": { "version": "1.0.0-*", "type": "build" }, + "Microsoft.Framework.NotNullAttribute.Sources": { "version": "1.0.0-*", "type": "build" } + }, + + "frameworks": { + "dnx451": { + "frameworkAssemblies": { + "System.ComponentModel.DataAnnotations": "" + } + }, + "dnxcore50": { + "dependencies": { + "System.ComponentModel.Annotations": "4.0.10-beta-*" + } + } + } +} diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Properties/Resources.Designer.cs b/src/Microsoft.AspNet.Mvc.Extensions/Properties/Resources.Designer.cs deleted file mode 100644 index 790ddba09b..0000000000 --- a/src/Microsoft.AspNet.Mvc.Extensions/Properties/Resources.Designer.cs +++ /dev/null @@ -1,1838 +0,0 @@ -// -namespace Microsoft.AspNet.Mvc.Extensions -{ - using System.Globalization; - using System.Reflection; - using System.Resources; - - internal static class Resources - { - private static readonly ResourceManager _resourceManager - = new ResourceManager("Microsoft.AspNet.Mvc.Extensions.Resources", typeof(Resources).GetTypeInfo().Assembly); - - /// - /// The argument '{0}' is invalid. Media types which match all types or match all subtypes are not supported. - /// - internal static string MatchAllContentTypeIsNotAllowed - { - get { return GetString("MatchAllContentTypeIsNotAllowed"); } - } - - /// - /// The argument '{0}' is invalid. Media types which match all types or match all subtypes are not supported. - /// - internal static string FormatMatchAllContentTypeIsNotAllowed(object p0) - { - return string.Format(CultureInfo.CurrentCulture, GetString("MatchAllContentTypeIsNotAllowed"), p0); - } - - /// - /// The content-type '{0}' added in the '{1}' property is invalid. Media types which match all types or match all subtypes are not supported. - /// - internal static string ObjectResult_MatchAllContentType - { - get { return GetString("ObjectResult_MatchAllContentType"); } - } - - /// - /// The content-type '{0}' added in the '{1}' property is invalid. Media types which match all types or match all subtypes are not supported. - /// - internal static string FormatObjectResult_MatchAllContentType(object p0, object p1) - { - return string.Format(CultureInfo.CurrentCulture, GetString("ObjectResult_MatchAllContentType"), p0, p1); - } - - /// - /// The method '{0}' on type '{1}' returned an instance of '{2}'. Make sure to call Unwrap on the returned value to avoid unobserved faulted Task. - /// - internal static string ActionExecutor_WrappedTaskInstance - { - get { return GetString("ActionExecutor_WrappedTaskInstance"); } - } - - /// - /// The method '{0}' on type '{1}' returned an instance of '{2}'. Make sure to call Unwrap on the returned value to avoid unobserved faulted Task. - /// - internal static string FormatActionExecutor_WrappedTaskInstance(object p0, object p1, object p2) - { - return string.Format(CultureInfo.CurrentCulture, GetString("ActionExecutor_WrappedTaskInstance"), p0, p1, p2); - } - - /// - /// The method '{0}' on type '{1}' returned a Task instance even though it is not an asynchronous method. - /// - internal static string ActionExecutor_UnexpectedTaskInstance - { - get { return GetString("ActionExecutor_UnexpectedTaskInstance"); } - } - - /// - /// The method '{0}' on type '{1}' returned a Task instance even though it is not an asynchronous method. - /// - internal static string FormatActionExecutor_UnexpectedTaskInstance(object p0, object p1) - { - return string.Format(CultureInfo.CurrentCulture, GetString("ActionExecutor_UnexpectedTaskInstance"), p0, p1); - } - - /// - /// A claim of type '{0}' was not present on the provided ClaimsIdentity. - /// - internal static string ClaimUidExtractor_ClaimNotPresent - { - get { return GetString("ClaimUidExtractor_ClaimNotPresent"); } - } - - /// - /// A claim of type '{0}' was not present on the provided ClaimsIdentity. - /// - internal static string FormatClaimUidExtractor_ClaimNotPresent(object p0) - { - return string.Format(CultureInfo.CurrentCulture, GetString("ClaimUidExtractor_ClaimNotPresent"), p0); - } - - /// - /// The class ReflectedActionFilterEndPoint only supports ReflectedActionDescriptors. - /// - internal static string ReflectedActionFilterEndPoint_UnexpectedActionDescriptor - { - get { return GetString("ReflectedActionFilterEndPoint_UnexpectedActionDescriptor"); } - } - - /// - /// The class ReflectedActionFilterEndPoint only supports ReflectedActionDescriptors. - /// - internal static string FormatReflectedActionFilterEndPoint_UnexpectedActionDescriptor() - { - return GetString("ReflectedActionFilterEndPoint_UnexpectedActionDescriptor"); - } - - /// - /// The view component name '{0}' matched multiple types:{1}{2} - /// - internal static string ViewComponent_AmbiguousTypeMatch - { - get { return GetString("ViewComponent_AmbiguousTypeMatch"); } - } - - /// - /// The view component name '{0}' matched multiple types:{1}{2} - /// - internal static string FormatViewComponent_AmbiguousTypeMatch(object p0, object p1, object p2) - { - return string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_AmbiguousTypeMatch"), p0, p1, p2); - } - - /// - /// The async view component method '{0}' should be declared to return Task<T>. - /// - internal static string ViewComponent_AsyncMethod_ShouldReturnTask - { - get { return GetString("ViewComponent_AsyncMethod_ShouldReturnTask"); } - } - - /// - /// The async view component method '{0}' should be declared to return Task<T>. - /// - internal static string FormatViewComponent_AsyncMethod_ShouldReturnTask(object p0) - { - return string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_AsyncMethod_ShouldReturnTask"), p0); - } - - /// - /// A view component must return a non-null value. - /// - internal static string ViewComponent_MustReturnValue - { - get { return GetString("ViewComponent_MustReturnValue"); } - } - - /// - /// A view component must return a non-null value. - /// - internal static string FormatViewComponent_MustReturnValue() - { - return GetString("ViewComponent_MustReturnValue"); - } - - /// - /// The view component method '{0}' should be declared to return a value. - /// - internal static string ViewComponent_SyncMethod_ShouldReturnValue - { - get { return GetString("ViewComponent_SyncMethod_ShouldReturnValue"); } - } - - /// - /// The view component method '{0}' should be declared to return a value. - /// - internal static string FormatViewComponent_SyncMethod_ShouldReturnValue(object p0) - { - return string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_SyncMethod_ShouldReturnValue"), p0); - } - - /// - /// A view component named '{0}' could not be found. - /// - internal static string ViewComponent_CannotFindComponent - { - get { return GetString("ViewComponent_CannotFindComponent"); } - } - - /// - /// A view component named '{0}' could not be found. - /// - internal static string FormatViewComponent_CannotFindComponent(object p0) - { - return string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_CannotFindComponent"), p0); - } - - /// - /// An invoker could not be created for the view component '{0}'. - /// - internal static string ViewComponent_IViewComponentFactory_ReturnedNull - { - get { return GetString("ViewComponent_IViewComponentFactory_ReturnedNull"); } - } - - /// - /// An invoker could not be created for the view component '{0}'. - /// - internal static string FormatViewComponent_IViewComponentFactory_ReturnedNull(object p0) - { - return string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_IViewComponentFactory_ReturnedNull"), p0); - } - - /// - /// Could not find an '{0}' method matching the parameters. - /// - internal static string ViewComponent_CannotFindMethod - { - get { return GetString("ViewComponent_CannotFindMethod"); } - } - - /// - /// Could not find an '{0}' method matching the parameters. - /// - internal static string FormatViewComponent_CannotFindMethod(object p0) - { - return string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_CannotFindMethod"), p0); - } - - /// - /// Could not find an '{0}' or '{1}' method matching the parameters. - /// - internal static string ViewComponent_CannotFindMethod_WithFallback - { - get { return GetString("ViewComponent_CannotFindMethod_WithFallback"); } - } - - /// - /// Could not find an '{0}' or '{1}' method matching the parameters. - /// - internal static string FormatViewComponent_CannotFindMethod_WithFallback(object p0, object p1) - { - return string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_CannotFindMethod_WithFallback"), p0, p1); - } - - /// - /// View components only support returning {0}, {1} or {2}. - /// - internal static string ViewComponent_InvalidReturnValue - { - get { return GetString("ViewComponent_InvalidReturnValue"); } - } - - /// - /// View components only support returning {0}, {1} or {2}. - /// - internal static string FormatViewComponent_InvalidReturnValue(object p0, object p1, object p2) - { - return string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_InvalidReturnValue"), p0, p1, p2); - } - - /// - /// Replacing the action context is not supported. - /// - internal static string ActionContextAccessor_SetValueNotSupported - { - get { return GetString("ActionContextAccessor_SetValueNotSupported"); } - } - - /// - /// Replacing the action context is not supported. - /// - internal static string FormatActionContextAccessor_SetValueNotSupported() - { - return GetString("ActionContextAccessor_SetValueNotSupported"); - } - - /// - /// An action invoker could not be created for action '{0}'. - /// - internal static string ActionInvokerFactory_CouldNotCreateInvoker - { - get { return GetString("ActionInvokerFactory_CouldNotCreateInvoker"); } - } - - /// - /// An action invoker could not be created for action '{0}'. - /// - internal static string FormatActionInvokerFactory_CouldNotCreateInvoker(object p0) - { - return string.Format(CultureInfo.CurrentCulture, GetString("ActionInvokerFactory_CouldNotCreateInvoker"), p0); - } - - /// - /// The action descriptor must be of type '{0}'. - /// - internal static string ActionDescriptorMustBeBasedOnControllerAction - { - get { return GetString("ActionDescriptorMustBeBasedOnControllerAction"); } - } - - /// - /// The action descriptor must be of type '{0}'. - /// - internal static string FormatActionDescriptorMustBeBasedOnControllerAction(object p0) - { - return string.Format(CultureInfo.CurrentCulture, GetString("ActionDescriptorMustBeBasedOnControllerAction"), p0); - } - - /// - /// Value cannot be null or empty. - /// - internal static string ArgumentCannotBeNullOrEmpty - { - get { return GetString("ArgumentCannotBeNullOrEmpty"); } - } - - /// - /// Value cannot be null or empty. - /// - internal static string FormatArgumentCannotBeNullOrEmpty() - { - return GetString("ArgumentCannotBeNullOrEmpty"); - } - - /// - /// The '{0}' property of '{1}' must not be null. - /// - internal static string PropertyOfTypeCannotBeNull - { - get { return GetString("PropertyOfTypeCannotBeNull"); } - } - - /// - /// The '{0}' property of '{1}' must not be null. - /// - internal static string FormatPropertyOfTypeCannotBeNull(object p0, object p1) - { - return string.Format(CultureInfo.CurrentCulture, GetString("PropertyOfTypeCannotBeNull"), p0, p1); - } - - /// - /// The '{0}' method of type '{1}' cannot return a null value. - /// - internal static string TypeMethodMustReturnNotNullValue - { - get { return GetString("TypeMethodMustReturnNotNullValue"); } - } - - /// - /// The '{0}' method of type '{1}' cannot return a null value. - /// - internal static string FormatTypeMethodMustReturnNotNullValue(object p0, object p1) - { - return string.Format(CultureInfo.CurrentCulture, GetString("TypeMethodMustReturnNotNullValue"), p0, p1); - } - - /// - /// The supplied route values are ambiguous and can select multiple sets of actions. - /// - internal static string ActionSelector_GetCandidateActionsIsAmbiguous - { - get { return GetString("ActionSelector_GetCandidateActionsIsAmbiguous"); } - } - - /// - /// The supplied route values are ambiguous and can select multiple sets of actions. - /// - internal static string FormatActionSelector_GetCandidateActionsIsAmbiguous() - { - return GetString("ActionSelector_GetCandidateActionsIsAmbiguous"); - } - - /// - /// Property '{0}' is of type '{1}', but this method requires a value of type '{2}'. - /// - internal static string ArgumentPropertyUnexpectedType - { - get { return GetString("ArgumentPropertyUnexpectedType"); } - } - - /// - /// Property '{0}' is of type '{1}', but this method requires a value of type '{2}'. - /// - internal static string FormatArgumentPropertyUnexpectedType(object p0, object p1, object p2) - { - return string.Format(CultureInfo.CurrentCulture, GetString("ArgumentPropertyUnexpectedType"), p0, p1, p2); - } - - /// - /// The partial view '{0}' was not found or no view engine supports the searched locations. The following locations were searched:{1} - /// - internal static string Common_PartialViewNotFound - { - get { return GetString("Common_PartialViewNotFound"); } - } - - /// - /// The partial view '{0}' was not found or no view engine supports the searched locations. The following locations were searched:{1} - /// - internal static string FormatCommon_PartialViewNotFound(object p0, object p1) - { - return string.Format(CultureInfo.CurrentCulture, GetString("Common_PartialViewNotFound"), p0, p1); - } - - /// - /// The value '{0}' is invalid. - /// - internal static string Common_ValueNotValidForProperty - { - get { return GetString("Common_ValueNotValidForProperty"); } - } - - /// - /// The value '{0}' is invalid. - /// - internal static string FormatCommon_ValueNotValidForProperty(object p0) - { - return string.Format(CultureInfo.CurrentCulture, GetString("Common_ValueNotValidForProperty"), p0); - } - - /// - /// False - /// - internal static string Common_TriState_False - { - get { return GetString("Common_TriState_False"); } - } - - /// - /// False - /// - internal static string FormatCommon_TriState_False() - { - return GetString("Common_TriState_False"); - } - - /// - /// Not Set - /// - internal static string Common_TriState_NotSet - { - get { return GetString("Common_TriState_NotSet"); } - } - - /// - /// Not Set - /// - internal static string FormatCommon_TriState_NotSet() - { - return GetString("Common_TriState_NotSet"); - } - - /// - /// True - /// - internal static string Common_TriState_True - { - get { return GetString("Common_TriState_True"); } - } - - /// - /// True - /// - internal static string FormatCommon_TriState_True() - { - return GetString("Common_TriState_True"); - } - - /// - /// ViewData value must not be null. - /// - internal static string DynamicViewData_ViewDataNull - { - get { return GetString("DynamicViewData_ViewDataNull"); } - } - - /// - /// ViewData value must not be null. - /// - internal static string FormatDynamicViewData_ViewDataNull() - { - return GetString("DynamicViewData_ViewDataNull"); - } - - /// - /// The expression compiler was unable to evaluate the indexer expression '{0}' because it references the model parameter '{1}' which is unavailable. - /// - internal static string ExpressionHelper_InvalidIndexerExpression - { - get { return GetString("ExpressionHelper_InvalidIndexerExpression"); } - } - - /// - /// The expression compiler was unable to evaluate the indexer expression '{0}' because it references the model parameter '{1}' which is unavailable. - /// - internal static string FormatExpressionHelper_InvalidIndexerExpression(object p0, object p1) - { - return string.Format(CultureInfo.CurrentCulture, GetString("ExpressionHelper_InvalidIndexerExpression"), p0, p1); - } - - /// - /// The passed expression of expression node type '{0}' is invalid. Only simple member access expressions for model properties are supported. - /// - internal static string Invalid_IncludePropertyExpression - { - get { return GetString("Invalid_IncludePropertyExpression"); } - } - - /// - /// The passed expression of expression node type '{0}' is invalid. Only simple member access expressions for model properties are supported. - /// - internal static string FormatInvalid_IncludePropertyExpression(object p0) - { - return string.Format(CultureInfo.CurrentCulture, GetString("Invalid_IncludePropertyExpression"), p0); - } - - /// - /// The IModelMetadataProvider was unable to provide metadata for expression '{0}'. - /// - internal static string HtmlHelper_NullModelMetadata - { - get { return GetString("HtmlHelper_NullModelMetadata"); } - } - - /// - /// The IModelMetadataProvider was unable to provide metadata for expression '{0}'. - /// - internal static string FormatHtmlHelper_NullModelMetadata(object p0) - { - return string.Format(CultureInfo.CurrentCulture, GetString("HtmlHelper_NullModelMetadata"), p0); - } - - /// - /// Must call 'Contextualize' method before using this HtmlHelper instance. - /// - internal static string HtmlHelper_NotContextualized - { - get { return GetString("HtmlHelper_NotContextualized"); } - } - - /// - /// Must call 'Contextualize' method before using this HtmlHelper instance. - /// - internal static string FormatHtmlHelper_NotContextualized() - { - return GetString("HtmlHelper_NotContextualized"); - } - - /// - /// There is no ViewData item of type '{0}' that has the key '{1}'. - /// - internal static string HtmlHelper_MissingSelectData - { - get { return GetString("HtmlHelper_MissingSelectData"); } - } - - /// - /// There is no ViewData item of type '{0}' that has the key '{1}'. - /// - internal static string FormatHtmlHelper_MissingSelectData(object p0, object p1) - { - return string.Format(CultureInfo.CurrentCulture, GetString("HtmlHelper_MissingSelectData"), p0, p1); - } - - /// - /// The parameter '{0}' must evaluate to an IEnumerable when multiple selection is allowed. - /// - internal static string HtmlHelper_SelectExpressionNotEnumerable - { - get { return GetString("HtmlHelper_SelectExpressionNotEnumerable"); } - } - - /// - /// The parameter '{0}' must evaluate to an IEnumerable when multiple selection is allowed. - /// - internal static string FormatHtmlHelper_SelectExpressionNotEnumerable(object p0) - { - return string.Format(CultureInfo.CurrentCulture, GetString("HtmlHelper_SelectExpressionNotEnumerable"), p0); - } - - /// - /// The type '{0}' is not supported. Type must be an {1} that does not have an associated {2}. - /// - internal static string HtmlHelper_TypeNotSupported_ForGetEnumSelectList - { - get { return GetString("HtmlHelper_TypeNotSupported_ForGetEnumSelectList"); } - } - - /// - /// The type '{0}' is not supported. Type must be an {1} that does not have an associated {2}. - /// - internal static string FormatHtmlHelper_TypeNotSupported_ForGetEnumSelectList(object p0, object p1, object p2) - { - return string.Format(CultureInfo.CurrentCulture, GetString("HtmlHelper_TypeNotSupported_ForGetEnumSelectList"), p0, p1, p2); - } - - /// - /// The ViewData item that has the key '{0}' is of type '{1}' but must be of type '{2}'. - /// - internal static string HtmlHelper_WrongSelectDataType - { - get { return GetString("HtmlHelper_WrongSelectDataType"); } - } - - /// - /// The ViewData item that has the key '{0}' is of type '{1}' but must be of type '{2}'. - /// - internal static string FormatHtmlHelper_WrongSelectDataType(object p0, object p1, object p2) - { - return string.Format(CultureInfo.CurrentCulture, GetString("HtmlHelper_WrongSelectDataType"), p0, p1, p2); - } - - /// - /// The '{0}' template was used with an object of type '{1}', which does not implement '{2}'. - /// - internal static string Templates_TypeMustImplementIEnumerable - { - get { return GetString("Templates_TypeMustImplementIEnumerable"); } - } - - /// - /// The '{0}' template was used with an object of type '{1}', which does not implement '{2}'. - /// - internal static string FormatTemplates_TypeMustImplementIEnumerable(object p0, object p1, object p2) - { - return string.Format(CultureInfo.CurrentCulture, GetString("Templates_TypeMustImplementIEnumerable"), p0, p1, p2); - } - - /// - /// Templates can be used only with field access, property access, single-dimension array index, or single-parameter custom indexer expressions. - /// - internal static string TemplateHelpers_TemplateLimitations - { - get { return GetString("TemplateHelpers_TemplateLimitations"); } - } - - /// - /// Templates can be used only with field access, property access, single-dimension array index, or single-parameter custom indexer expressions. - /// - internal static string FormatTemplateHelpers_TemplateLimitations() - { - return GetString("TemplateHelpers_TemplateLimitations"); - } - - /// - /// Unable to locate an appropriate template for type {0}. - /// - internal static string TemplateHelpers_NoTemplate - { - get { return GetString("TemplateHelpers_NoTemplate"); } - } - - /// - /// Unable to locate an appropriate template for type {0}. - /// - internal static string FormatTemplateHelpers_NoTemplate(object p0) - { - return string.Format(CultureInfo.CurrentCulture, GetString("TemplateHelpers_NoTemplate"), p0); - } - - /// - /// The model item passed is null, but this ViewDataDictionary instance requires a non-null model item of type '{0}'. - /// - internal static string ViewData_ModelCannotBeNull - { - get { return GetString("ViewData_ModelCannotBeNull"); } - } - - /// - /// The model item passed is null, but this ViewDataDictionary instance requires a non-null model item of type '{0}'. - /// - internal static string FormatViewData_ModelCannotBeNull(object p0) - { - return string.Format(CultureInfo.CurrentCulture, GetString("ViewData_ModelCannotBeNull"), p0); - } - - /// - /// The model item passed into the ViewDataDictionary is of type '{0}', but this ViewDataDictionary instance requires a model item of type '{1}'. - /// - internal static string ViewData_WrongTModelType - { - get { return GetString("ViewData_WrongTModelType"); } - } - - /// - /// The model item passed into the ViewDataDictionary is of type '{0}', but this ViewDataDictionary instance requires a model item of type '{1}'. - /// - internal static string FormatViewData_WrongTModelType(object p0, object p1) - { - return string.Format(CultureInfo.CurrentCulture, GetString("ViewData_WrongTModelType"), p0, p1); - } - - /// - /// No route matches the supplied values. - /// - internal static string NoRoutesMatched - { - get { return GetString("NoRoutesMatched"); } - } - - /// - /// No route matches the supplied values. - /// - internal static string FormatNoRoutesMatched() - { - return GetString("NoRoutesMatched"); - } - - /// - /// If an {0} provides a result value by setting the {1} property of {2} to a non-null value, then it cannot call the next filter by invoking {3}. - /// - internal static string AsyncActionFilter_InvalidShortCircuit - { - get { return GetString("AsyncActionFilter_InvalidShortCircuit"); } - } - - /// - /// If an {0} provides a result value by setting the {1} property of {2} to a non-null value, then it cannot call the next filter by invoking {3}. - /// - internal static string FormatAsyncActionFilter_InvalidShortCircuit(object p0, object p1, object p2, object p3) - { - return string.Format(CultureInfo.CurrentCulture, GetString("AsyncActionFilter_InvalidShortCircuit"), p0, p1, p2, p3); - } - - /// - /// If an {0} cancels execution by setting the {1} property of {2} to 'true', then it cannot call the next filter by invoking {3}. - /// - internal static string AsyncResultFilter_InvalidShortCircuit - { - get { return GetString("AsyncResultFilter_InvalidShortCircuit"); } - } - - /// - /// If an {0} cancels execution by setting the {1} property of {2} to 'true', then it cannot call the next filter by invoking {3}. - /// - internal static string FormatAsyncResultFilter_InvalidShortCircuit(object p0, object p1, object p2, object p3) - { - return string.Format(CultureInfo.CurrentCulture, GetString("AsyncResultFilter_InvalidShortCircuit"), p0, p1, p2, p3); - } - - /// - /// The partial view '{0}' was not found. The following locations were searched:{1} - /// - internal static string ViewEngine_PartialViewNotFound - { - get { return GetString("ViewEngine_PartialViewNotFound"); } - } - - /// - /// The partial view '{0}' was not found. The following locations were searched:{1} - /// - internal static string FormatViewEngine_PartialViewNotFound(object p0, object p1) - { - return string.Format(CultureInfo.CurrentCulture, GetString("ViewEngine_PartialViewNotFound"), p0, p1); - } - - /// - /// The view '{0}' was not found. The following locations were searched:{1}. - /// - internal static string ViewEngine_ViewNotFound - { - get { return GetString("ViewEngine_ViewNotFound"); } - } - - /// - /// The view '{0}' was not found. The following locations were searched:{1}. - /// - internal static string FormatViewEngine_ViewNotFound(object p0, object p1) - { - return string.Format(CultureInfo.CurrentCulture, GetString("ViewEngine_ViewNotFound"), p0, p1); - } - - /// - /// Unable to locate an implementation of IAuthorizationService. - /// - internal static string AuthorizeAttribute_AuthorizationServiceMustBeDefined - { - get { return GetString("AuthorizeAttribute_AuthorizationServiceMustBeDefined"); } - } - - /// - /// Unable to locate an implementation of IAuthorizationService. - /// - internal static string FormatAuthorizeAttribute_AuthorizationServiceMustBeDefined() - { - return GetString("AuthorizeAttribute_AuthorizationServiceMustBeDefined"); - } - - /// - /// OnAuthorization is not implemented by this filter, use OnAuthorizationAsync instead. - /// - internal static string AuthorizeAttribute_OnAuthorizationNotImplemented - { - get { return GetString("AuthorizeAttribute_OnAuthorizationNotImplemented"); } - } - - /// - /// OnAuthorization is not implemented by this filter, use OnAuthorizationAsync instead. - /// - internal static string FormatAuthorizeAttribute_OnAuthorizationNotImplemented() - { - return GetString("AuthorizeAttribute_OnAuthorizationNotImplemented"); - } - - /// - /// The value must be greater than or equal to zero. - /// - internal static string HtmlHelper_TextAreaParameterOutOfRange - { - get { return GetString("HtmlHelper_TextAreaParameterOutOfRange"); } - } - - /// - /// The value must be greater than or equal to zero. - /// - internal static string FormatHtmlHelper_TextAreaParameterOutOfRange() - { - return GetString("HtmlHelper_TextAreaParameterOutOfRange"); - } - - /// - /// The type provided to '{0}' must implement '{1}'. - /// - internal static string FilterFactoryAttribute_TypeMustImplementIFilter - { - get { return GetString("FilterFactoryAttribute_TypeMustImplementIFilter"); } - } - - /// - /// The type provided to '{0}' must implement '{1}'. - /// - internal static string FormatFilterFactoryAttribute_TypeMustImplementIFilter(object p0, object p1) - { - return string.Format(CultureInfo.CurrentCulture, GetString("FilterFactoryAttribute_TypeMustImplementIFilter"), p0, p1); - } - - /// - /// Validation parameter names in unobtrusive client validation rules cannot be empty. Client rule type: {0} - /// - internal static string UnobtrusiveJavascript_ValidationParameterCannotBeEmpty - { - get { return GetString("UnobtrusiveJavascript_ValidationParameterCannotBeEmpty"); } - } - - /// - /// Validation parameter names in unobtrusive client validation rules cannot be empty. Client rule type: {0} - /// - internal static string FormatUnobtrusiveJavascript_ValidationParameterCannotBeEmpty(object p0) - { - return string.Format(CultureInfo.CurrentCulture, GetString("UnobtrusiveJavascript_ValidationParameterCannotBeEmpty"), p0); - } - - /// - /// Validation parameter names in unobtrusive client validation rules must start with a lowercase letter and consist of only lowercase letters or digits. Validation parameter name: {0}, client rule type: {1} - /// - internal static string UnobtrusiveJavascript_ValidationParameterMustBeLegal - { - get { return GetString("UnobtrusiveJavascript_ValidationParameterMustBeLegal"); } - } - - /// - /// Validation parameter names in unobtrusive client validation rules must start with a lowercase letter and consist of only lowercase letters or digits. Validation parameter name: {0}, client rule type: {1} - /// - internal static string FormatUnobtrusiveJavascript_ValidationParameterMustBeLegal(object p0, object p1) - { - return string.Format(CultureInfo.CurrentCulture, GetString("UnobtrusiveJavascript_ValidationParameterMustBeLegal"), p0, p1); - } - - /// - /// Validation type names in unobtrusive client validation rules cannot be empty. Client rule type: {0} - /// - internal static string UnobtrusiveJavascript_ValidationTypeCannotBeEmpty - { - get { return GetString("UnobtrusiveJavascript_ValidationTypeCannotBeEmpty"); } - } - - /// - /// Validation type names in unobtrusive client validation rules cannot be empty. Client rule type: {0} - /// - internal static string FormatUnobtrusiveJavascript_ValidationTypeCannotBeEmpty(object p0) - { - return string.Format(CultureInfo.CurrentCulture, GetString("UnobtrusiveJavascript_ValidationTypeCannotBeEmpty"), p0); - } - - /// - /// Validation type names in unobtrusive client validation rules must consist of only lowercase letters. Invalid name: "{0}", client rule type: {1} - /// - internal static string UnobtrusiveJavascript_ValidationTypeMustBeLegal - { - get { return GetString("UnobtrusiveJavascript_ValidationTypeMustBeLegal"); } - } - - /// - /// Validation type names in unobtrusive client validation rules must consist of only lowercase letters. Invalid name: "{0}", client rule type: {1} - /// - internal static string FormatUnobtrusiveJavascript_ValidationTypeMustBeLegal(object p0, object p1) - { - return string.Format(CultureInfo.CurrentCulture, GetString("UnobtrusiveJavascript_ValidationTypeMustBeLegal"), p0, p1); - } - - /// - /// Validation type names in unobtrusive client validation rules must be unique. The following validation type was seen more than once: {0} - /// - internal static string UnobtrusiveJavascript_ValidationTypeMustBeUnique - { - get { return GetString("UnobtrusiveJavascript_ValidationTypeMustBeUnique"); } - } - - /// - /// Validation type names in unobtrusive client validation rules must be unique. The following validation type was seen more than once: {0} - /// - internal static string FormatUnobtrusiveJavascript_ValidationTypeMustBeUnique(object p0) - { - return string.Format(CultureInfo.CurrentCulture, GetString("UnobtrusiveJavascript_ValidationTypeMustBeUnique"), p0); - } - - /// - /// Cannot return null from an action method with a return type of '{0}'. - /// - internal static string ActionResult_ActionReturnValueCannotBeNull - { - get { return GetString("ActionResult_ActionReturnValueCannotBeNull"); } - } - - /// - /// Cannot return null from an action method with a return type of '{0}'. - /// - internal static string FormatActionResult_ActionReturnValueCannotBeNull(object p0) - { - return string.Format(CultureInfo.CurrentCulture, GetString("ActionResult_ActionReturnValueCannotBeNull"), p0); - } - - /// - /// The type '{0}' must derive from '{1}'. - /// - internal static string TypeMustDeriveFromType - { - get { return GetString("TypeMustDeriveFromType"); } - } - - /// - /// The type '{0}' must derive from '{1}'. - /// - internal static string FormatTypeMustDeriveFromType(object p0, object p1) - { - return string.Format(CultureInfo.CurrentCulture, GetString("TypeMustDeriveFromType"), p0, p1); - } - - /// - /// No encoding found for output formatter '{0}'. There must be at least one supported encoding registered in order for the output formatter to write content. - /// - internal static string OutputFormatterNoEncoding - { - get { return GetString("OutputFormatterNoEncoding"); } - } - - /// - /// No encoding found for output formatter '{0}'. There must be at least one supported encoding registered in order for the output formatter to write content. - /// - internal static string FormatOutputFormatterNoEncoding(object p0) - { - return string.Format(CultureInfo.CurrentCulture, GetString("OutputFormatterNoEncoding"), p0); - } - - /// - /// No encoding found for input formatter '{0}'. There must be at least one supported encoding registered in order for the formatter to read content. - /// - internal static string InputFormatterNoEncoding - { - get { return GetString("InputFormatterNoEncoding"); } - } - - /// - /// No encoding found for input formatter '{0}'. There must be at least one supported encoding registered in order for the formatter to read content. - /// - internal static string FormatInputFormatterNoEncoding(object p0) - { - return string.Format(CultureInfo.CurrentCulture, GetString("InputFormatterNoEncoding"), p0); - } - - /// - /// Unsupported content type '{0}'. - /// - internal static string UnsupportedContentType - { - get { return GetString("UnsupportedContentType"); } - } - - /// - /// Unsupported content type '{0}'. - /// - internal static string FormatUnsupportedContentType(object p0) - { - return string.Format(CultureInfo.CurrentCulture, GetString("UnsupportedContentType"), p0); - } - - /// - /// No supported media type registered for output formatter '{0}'. There must be at least one supported media type registered in order for the output formatter to write content. - /// - internal static string OutputFormatterNoMediaType - { - get { return GetString("OutputFormatterNoMediaType"); } - } - - /// - /// No supported media type registered for output formatter '{0}'. There must be at least one supported media type registered in order for the output formatter to write content. - /// - internal static string FormatOutputFormatterNoMediaType(object p0) - { - return string.Format(CultureInfo.CurrentCulture, GetString("OutputFormatterNoMediaType"), p0); - } - - /// - /// The following errors occurred with attribute routing information:{0}{0}{1} - /// - internal static string AttributeRoute_AggregateErrorMessage - { - get { return GetString("AttributeRoute_AggregateErrorMessage"); } - } - - /// - /// The following errors occurred with attribute routing information:{0}{0}{1} - /// - internal static string FormatAttributeRoute_AggregateErrorMessage(object p0, object p1) - { - return string.Format(CultureInfo.CurrentCulture, GetString("AttributeRoute_AggregateErrorMessage"), p0, p1); - } - - /// - /// The attribute route '{0}' cannot contain a parameter named '{{{1}}}'. Use '[{1}]' in the route template to insert the value '{2}'. - /// - internal static string AttributeRoute_CannotContainParameter - { - get { return GetString("AttributeRoute_CannotContainParameter"); } - } - - /// - /// The attribute route '{0}' cannot contain a parameter named '{{{1}}}'. Use '[{1}]' in the route template to insert the value '{2}'. - /// - internal static string FormatAttributeRoute_CannotContainParameter(object p0, object p1, object p2) - { - return string.Format(CultureInfo.CurrentCulture, GetString("AttributeRoute_CannotContainParameter"), p0, p1, p2); - } - - /// - /// For action: '{0}'{1}Error: {2} - /// - internal static string AttributeRoute_IndividualErrorMessage - { - get { return GetString("AttributeRoute_IndividualErrorMessage"); } - } - - /// - /// For action: '{0}'{1}Error: {2} - /// - internal static string FormatAttributeRoute_IndividualErrorMessage(object p0, object p1, object p2) - { - return string.Format(CultureInfo.CurrentCulture, GetString("AttributeRoute_IndividualErrorMessage"), p0, p1, p2); - } - - /// - /// An empty replacement token ('[]') is not allowed. - /// - internal static string AttributeRoute_TokenReplacement_EmptyTokenNotAllowed - { - get { return GetString("AttributeRoute_TokenReplacement_EmptyTokenNotAllowed"); } - } - - /// - /// An empty replacement token ('[]') is not allowed. - /// - internal static string FormatAttributeRoute_TokenReplacement_EmptyTokenNotAllowed() - { - return GetString("AttributeRoute_TokenReplacement_EmptyTokenNotAllowed"); - } - - /// - /// Token delimiters ('[', ']') are imbalanced. - /// - internal static string AttributeRoute_TokenReplacement_ImbalancedSquareBrackets - { - get { return GetString("AttributeRoute_TokenReplacement_ImbalancedSquareBrackets"); } - } - - /// - /// Token delimiters ('[', ']') are imbalanced. - /// - internal static string FormatAttributeRoute_TokenReplacement_ImbalancedSquareBrackets() - { - return GetString("AttributeRoute_TokenReplacement_ImbalancedSquareBrackets"); - } - - /// - /// The route template '{0}' has invalid syntax. {1} - /// - internal static string AttributeRoute_TokenReplacement_InvalidSyntax - { - get { return GetString("AttributeRoute_TokenReplacement_InvalidSyntax"); } - } - - /// - /// The route template '{0}' has invalid syntax. {1} - /// - internal static string FormatAttributeRoute_TokenReplacement_InvalidSyntax(object p0, object p1) - { - return string.Format(CultureInfo.CurrentCulture, GetString("AttributeRoute_TokenReplacement_InvalidSyntax"), p0, p1); - } - - /// - /// While processing template '{0}', a replacement value for the token '{1}' could not be found. Available tokens: '{2}'. - /// - internal static string AttributeRoute_TokenReplacement_ReplacementValueNotFound - { - get { return GetString("AttributeRoute_TokenReplacement_ReplacementValueNotFound"); } - } - - /// - /// While processing template '{0}', a replacement value for the token '{1}' could not be found. Available tokens: '{2}'. - /// - internal static string FormatAttributeRoute_TokenReplacement_ReplacementValueNotFound(object p0, object p1, object p2) - { - return string.Format(CultureInfo.CurrentCulture, GetString("AttributeRoute_TokenReplacement_ReplacementValueNotFound"), p0, p1, p2); - } - - /// - /// A replacement token is not closed. - /// - internal static string AttributeRoute_TokenReplacement_UnclosedToken - { - get { return GetString("AttributeRoute_TokenReplacement_UnclosedToken"); } - } - - /// - /// A replacement token is not closed. - /// - internal static string FormatAttributeRoute_TokenReplacement_UnclosedToken() - { - return GetString("AttributeRoute_TokenReplacement_UnclosedToken"); - } - - /// - /// An unescaped '[' token is not allowed inside of a replacement token. Use '[[' to escape. - /// - internal static string AttributeRoute_TokenReplacement_UnescapedBraceInToken - { - get { return GetString("AttributeRoute_TokenReplacement_UnescapedBraceInToken"); } - } - - /// - /// An unescaped '[' token is not allowed inside of a replacement token. Use '[[' to escape. - /// - internal static string FormatAttributeRoute_TokenReplacement_UnescapedBraceInToken() - { - return GetString("AttributeRoute_TokenReplacement_UnescapedBraceInToken"); - } - - /// - /// The value must be either '{0}' or '{1}'. - /// - internal static string RouteConstraintAttribute_InvalidKeyHandlingValue - { - get { return GetString("RouteConstraintAttribute_InvalidKeyHandlingValue"); } - } - - /// - /// The value must be either '{0}' or '{1}'. - /// - internal static string FormatRouteConstraintAttribute_InvalidKeyHandlingValue(object p0, object p1) - { - return string.Format(CultureInfo.CurrentCulture, GetString("RouteConstraintAttribute_InvalidKeyHandlingValue"), p0, p1); - } - - /// - /// Unable to find the required services. Please add all the required services by calling '{0}' inside the call to '{1}' or '{2}' in the application startup code. - /// - internal static string UnableToFindServices - { - get { return GetString("UnableToFindServices"); } - } - - /// - /// Unable to find the required services. Please add all the required services by calling '{0}' inside the call to '{1}' or '{2}' in the application startup code. - /// - internal static string FormatUnableToFindServices(object p0, object p1, object p2) - { - return string.Format(CultureInfo.CurrentCulture, GetString("UnableToFindServices"), p0, p1, p2); - } - - /// - /// Two or more routes named '{0}' have different templates. - /// - internal static string AttributeRoute_DifferentLinkGenerationEntries_SameName - { - get { return GetString("AttributeRoute_DifferentLinkGenerationEntries_SameName"); } - } - - /// - /// Two or more routes named '{0}' have different templates. - /// - internal static string FormatAttributeRoute_DifferentLinkGenerationEntries_SameName(object p0) - { - return string.Format(CultureInfo.CurrentCulture, GetString("AttributeRoute_DifferentLinkGenerationEntries_SameName"), p0); - } - - /// - /// Action: '{0}' - Template: '{1}' - /// - internal static string AttributeRoute_DuplicateNames_Item - { - get { return GetString("AttributeRoute_DuplicateNames_Item"); } - } - - /// - /// Action: '{0}' - Template: '{1}' - /// - internal static string FormatAttributeRoute_DuplicateNames_Item(object p0, object p1) - { - return string.Format(CultureInfo.CurrentCulture, GetString("AttributeRoute_DuplicateNames_Item"), p0, p1); - } - - /// - /// Attribute routes with the same name '{0}' must have the same template:{1}{2} - /// - internal static string AttributeRoute_DuplicateNames - { - get { return GetString("AttributeRoute_DuplicateNames"); } - } - - /// - /// Attribute routes with the same name '{0}' must have the same template:{1}{2} - /// - internal static string FormatAttributeRoute_DuplicateNames(object p0, object p1, object p2) - { - return string.Format(CultureInfo.CurrentCulture, GetString("AttributeRoute_DuplicateNames"), p0, p1, p2); - } - - /// - /// Error {0}:{1}{2} - /// - internal static string AttributeRoute_AggregateErrorMessage_ErrorNumber - { - get { return GetString("AttributeRoute_AggregateErrorMessage_ErrorNumber"); } - } - - /// - /// Error {0}:{1}{2} - /// - internal static string FormatAttributeRoute_AggregateErrorMessage_ErrorNumber(object p0, object p1, object p2) - { - return string.Format(CultureInfo.CurrentCulture, GetString("AttributeRoute_AggregateErrorMessage_ErrorNumber"), p0, p1, p2); - } - - /// - /// Could not find a replacement for view expansion token '{0}'. - /// - internal static string TemplatedViewLocationExpander_NoReplacementToken - { - get { return GetString("TemplatedViewLocationExpander_NoReplacementToken"); } - } - - /// - /// Could not find a replacement for view expansion token '{0}'. - /// - internal static string FormatTemplatedViewLocationExpander_NoReplacementToken(object p0) - { - return string.Format(CultureInfo.CurrentCulture, GetString("TemplatedViewLocationExpander_NoReplacementToken"), p0); - } - - /// - /// {0} must be executed before {1} can be invoked. - /// - internal static string TemplatedExpander_PopulateValuesMustBeInvokedFirst - { - get { return GetString("TemplatedExpander_PopulateValuesMustBeInvokedFirst"); } - } - - /// - /// {0} must be executed before {1} can be invoked. - /// - internal static string FormatTemplatedExpander_PopulateValuesMustBeInvokedFirst(object p0, object p1) - { - return string.Format(CultureInfo.CurrentCulture, GetString("TemplatedExpander_PopulateValuesMustBeInvokedFirst"), p0, p1); - } - - /// - /// The result of value factory cannot be null. - /// - internal static string TemplatedExpander_ValueFactoryCannotReturnNull - { - get { return GetString("TemplatedExpander_ValueFactoryCannotReturnNull"); } - } - - /// - /// The result of value factory cannot be null. - /// - internal static string FormatTemplatedExpander_ValueFactoryCannotReturnNull() - { - return GetString("TemplatedExpander_ValueFactoryCannotReturnNull"); - } - - /// - /// A method '{0}' must not define attribute routed actions and non attribute routed actions at the same time:{1}{2}{1}{1}Use 'AcceptVerbsAttribute' to create a single route that allows multiple HTTP verbs and defines a route, or set a route template in all attributes that constrain HTTP verbs. - /// - internal static string AttributeRoute_MixedAttributeAndConventionallyRoutedActions_ForMethod - { - get { return GetString("AttributeRoute_MixedAttributeAndConventionallyRoutedActions_ForMethod"); } - } - - /// - /// A method '{0}' must not define attribute routed actions and non attribute routed actions at the same time:{1}{2}{1}{1}Use 'AcceptVerbsAttribute' to create a single route that allows multiple HTTP verbs and defines a route, or set a route template in all attributes that constrain HTTP verbs. - /// - internal static string FormatAttributeRoute_MixedAttributeAndConventionallyRoutedActions_ForMethod(object p0, object p1, object p2) - { - return string.Format(CultureInfo.CurrentCulture, GetString("AttributeRoute_MixedAttributeAndConventionallyRoutedActions_ForMethod"), p0, p1, p2); - } - - /// - /// Action: '{0}' - Route Template: '{1}' - HTTP Verbs: '{2}' - /// - internal static string AttributeRoute_MixedAttributeAndConventionallyRoutedActions_ForMethod_Item - { - get { return GetString("AttributeRoute_MixedAttributeAndConventionallyRoutedActions_ForMethod_Item"); } - } - - /// - /// Action: '{0}' - Route Template: '{1}' - HTTP Verbs: '{2}' - /// - internal static string FormatAttributeRoute_MixedAttributeAndConventionallyRoutedActions_ForMethod_Item(object p0, object p1, object p2) - { - return string.Format(CultureInfo.CurrentCulture, GetString("AttributeRoute_MixedAttributeAndConventionallyRoutedActions_ForMethod_Item"), p0, p1, p2); - } - - /// - /// (none) - /// - internal static string AttributeRoute_NullTemplateRepresentation - { - get { return GetString("AttributeRoute_NullTemplateRepresentation"); } - } - - /// - /// (none) - /// - internal static string FormatAttributeRoute_NullTemplateRepresentation() - { - return GetString("AttributeRoute_NullTemplateRepresentation"); - } - - /// - /// Multiple actions matched. The following actions matched route data and had all constraints satisfied:{0}{0}{1} - /// - internal static string DefaultActionSelector_AmbiguousActions - { - get { return GetString("DefaultActionSelector_AmbiguousActions"); } - } - - /// - /// Multiple actions matched. The following actions matched route data and had all constraints satisfied:{0}{0}{1} - /// - internal static string FormatDefaultActionSelector_AmbiguousActions(object p0, object p1) - { - return string.Format(CultureInfo.CurrentCulture, GetString("DefaultActionSelector_AmbiguousActions"), p0, p1); - } - - /// - /// Could not find file: {0} - /// - internal static string FileResult_InvalidPath - { - get { return GetString("FileResult_InvalidPath"); } - } - - /// - /// Could not find file: {0} - /// - internal static string FormatFileResult_InvalidPath(object p0) - { - return string.Format(CultureInfo.CurrentCulture, GetString("FileResult_InvalidPath"), p0); - } - - /// - /// Type: '{0}' - Name: '{1}' - /// - internal static string ViewComponent_AmbiguousTypeMatch_Item - { - get { return GetString("ViewComponent_AmbiguousTypeMatch_Item"); } - } - - /// - /// Type: '{0}' - Name: '{1}' - /// - internal static string FormatViewComponent_AmbiguousTypeMatch_Item(object p0, object p1) - { - return string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_AmbiguousTypeMatch_Item"), p0, p1); - } - - /// - /// The input was not valid. - /// - internal static string SerializableError_DefaultError - { - get { return GetString("SerializableError_DefaultError"); } - } - - /// - /// The input was not valid. - /// - internal static string FormatSerializableError_DefaultError() - { - return GetString("SerializableError_DefaultError"); - } - - /// - /// If an {0} provides a result value by setting the {1} property of {2} to a non-null value, then it cannot call the next filter by invoking {3}. - /// - internal static string AsyncResourceFilter_InvalidShortCircuit - { - get { return GetString("AsyncResourceFilter_InvalidShortCircuit"); } - } - - /// - /// If an {0} provides a result value by setting the {1} property of {2} to a non-null value, then it cannot call the next filter by invoking {3}. - /// - internal static string FormatAsyncResourceFilter_InvalidShortCircuit(object p0, object p1, object p2, object p3) - { - return string.Format(CultureInfo.CurrentCulture, GetString("AsyncResourceFilter_InvalidShortCircuit"), p0, p1, p2, p3); - } - - /// - /// If the '{0}' property is not set to true, '{1}' property must be specified. - /// - internal static string ResponseCache_SpecifyDuration - { - get { return GetString("ResponseCache_SpecifyDuration"); } - } - - /// - /// If the '{0}' property is not set to true, '{1}' property must be specified. - /// - internal static string FormatResponseCache_SpecifyDuration(object p0, object p1) - { - return string.Format(CultureInfo.CurrentCulture, GetString("ResponseCache_SpecifyDuration"), p0, p1); - } - - /// - /// The action '{0}' has ApiExplorer enabled, but is using conventional routing. Only actions which use attribute routing support ApiExplorer. - /// - internal static string ApiExplorer_UnsupportedAction - { - get { return GetString("ApiExplorer_UnsupportedAction"); } - } - - /// - /// The action '{0}' has ApiExplorer enabled, but is using conventional routing. Only actions which use attribute routing support ApiExplorer. - /// - internal static string FormatApiExplorer_UnsupportedAction(object p0) - { - return string.Format(CultureInfo.CurrentCulture, GetString("ApiExplorer_UnsupportedAction"), p0); - } - - /// - /// The media type "{0}" is not valid. MediaTypes containing wildcards (*) are not allowed in formatter mappings. - /// - internal static string FormatterMappings_NotValidMediaType - { - get { return GetString("FormatterMappings_NotValidMediaType"); } - } - - /// - /// The media type "{0}" is not valid. MediaTypes containing wildcards (*) are not allowed in formatter mappings. - /// - internal static string FormatFormatterMappings_NotValidMediaType(object p0) - { - return string.Format(CultureInfo.CurrentCulture, GetString("FormatterMappings_NotValidMediaType"), p0); - } - - /// - /// The format provided is invalid '{0}'. A format must be a non-empty file-extension, optionally prefixed with a '.' character. - /// - internal static string Format_NotValid - { - get { return GetString("Format_NotValid"); } - } - - /// - /// The format provided is invalid '{0}'. A format must be a non-empty file-extension, optionally prefixed with a '.' character. - /// - internal static string FormatFormat_NotValid(object p0) - { - return string.Format(CultureInfo.CurrentCulture, GetString("Format_NotValid"), p0); - } - - /// - /// The property '{0}' on controller '{1}' cannot be activated. - /// - internal static string ControllerFactory_PropertyCannotBeActivated - { - get { return GetString("ControllerFactory_PropertyCannotBeActivated"); } - } - - /// - /// The property '{0}' on controller '{1}' cannot be activated. - /// - internal static string FormatControllerFactory_PropertyCannotBeActivated(object p0, object p1) - { - return string.Format(CultureInfo.CurrentCulture, GetString("ControllerFactory_PropertyCannotBeActivated"), p0, p1); - } - - /// - /// No URL for remote validation could be found. - /// - internal static string RemoteAttribute_NoUrlFound - { - get { return GetString("RemoteAttribute_NoUrlFound"); } - } - - /// - /// No URL for remote validation could be found. - /// - internal static string FormatRemoteAttribute_NoUrlFound() - { - return GetString("RemoteAttribute_NoUrlFound"); - } - - /// - /// '{0}' is invalid. - /// - internal static string RemoteAttribute_RemoteValidationFailed - { - get { return GetString("RemoteAttribute_RemoteValidationFailed"); } - } - - /// - /// '{0}' is invalid. - /// - internal static string FormatRemoteAttribute_RemoteValidationFailed(object p0) - { - return string.Format(CultureInfo.CurrentCulture, GetString("RemoteAttribute_RemoteValidationFailed"), p0); - } - - /// - /// The '{0}' cache profile is not defined. - /// - internal static string CacheProfileNotFound - { - get { return GetString("CacheProfileNotFound"); } - } - - /// - /// The '{0}' cache profile is not defined. - /// - internal static string FormatCacheProfileNotFound(object p0) - { - return string.Format(CultureInfo.CurrentCulture, GetString("CacheProfileNotFound"), p0); - } - - /// - /// The model's runtime type '{0}' is not assignable to the type '{1}'. - /// - internal static string ModelType_WrongType - { - get { return GetString("ModelType_WrongType"); } - } - - /// - /// The model's runtime type '{0}' is not assignable to the type '{1}'. - /// - internal static string FormatModelType_WrongType(object p0, object p1) - { - return string.Format(CultureInfo.CurrentCulture, GetString("ModelType_WrongType"), p0, p1); - } - - /// - /// The '{0}' cannot serialize an object of type '{1}' to session state. - /// - internal static string TempData_CannotSerializeToSession - { - get { return GetString("TempData_CannotSerializeToSession"); } - } - - /// - /// The '{0}' cannot serialize an object of type '{1}' to session state. - /// - internal static string FormatTempData_CannotSerializeToSession(object p0, object p1) - { - return string.Format(CultureInfo.CurrentCulture, GetString("TempData_CannotSerializeToSession"), p0, p1); - } - - /// - /// Cannot deserialize {0} of type '{1}'. - /// - internal static string TempData_CannotDeserializeToken - { - get { return GetString("TempData_CannotDeserializeToken"); } - } - - /// - /// Cannot deserialize {0} of type '{1}'. - /// - internal static string FormatTempData_CannotDeserializeToken(object p0, object p1) - { - return string.Format(CultureInfo.CurrentCulture, GetString("TempData_CannotDeserializeToken"), p0, p1); - } - - /// - /// The '{0}' cannot serialize a dictionary with a key of type '{1}' to session state. - /// - internal static string TempData_CannotSerializeDictionary - { - get { return GetString("TempData_CannotSerializeDictionary"); } - } - - /// - /// The '{0}' cannot serialize a dictionary with a key of type '{1}' to session state. - /// - internal static string FormatTempData_CannotSerializeDictionary(object p0, object p1) - { - return string.Format(CultureInfo.CurrentCulture, GetString("TempData_CannotSerializeDictionary"), p0, p1); - } - - /// - /// The type '{0}' cannot be activated by '{1}' because it is either a value type, an interface, an abstract class or an open generic type. - /// - internal static string ValueInterfaceAbstractOrOpenGenericTypesCannotBeActivated - { - get { return GetString("ValueInterfaceAbstractOrOpenGenericTypesCannotBeActivated"); } - } - - /// - /// The type '{0}' cannot be activated by '{1}' because it is either a value type, an interface, an abstract class or an open generic type. - /// - internal static string FormatValueInterfaceAbstractOrOpenGenericTypesCannotBeActivated(object p0, object p1) - { - return string.Format(CultureInfo.CurrentCulture, GetString("ValueInterfaceAbstractOrOpenGenericTypesCannotBeActivated"), p0, p1); - } - - /// - /// The type '{0}' must implement '{1}' to be used as a model binder. - /// - internal static string BinderType_MustBeIModelBinder - { - get { return GetString("BinderType_MustBeIModelBinder"); } - } - - /// - /// The type '{0}' must implement '{1}' to be used as a model binder. - /// - internal static string FormatBinderType_MustBeIModelBinder(object p0, object p1) - { - return string.Format(CultureInfo.CurrentCulture, GetString("BinderType_MustBeIModelBinder"), p0, p1); - } - - /// - /// The provided binding source '{0}' is a composite. '{1}' requires that the source must represent a single type of input. - /// - internal static string BindingSource_CannotBeComposite - { - get { return GetString("BindingSource_CannotBeComposite"); } - } - - /// - /// The provided binding source '{0}' is a composite. '{1}' requires that the source must represent a single type of input. - /// - internal static string FormatBindingSource_CannotBeComposite(object p0, object p1) - { - return string.Format(CultureInfo.CurrentCulture, GetString("BindingSource_CannotBeComposite"), p0, p1); - } - - /// - /// The provided binding source '{0}' is a greedy data source. '{1}' does not support greedy data sources. - /// - internal static string BindingSource_CannotBeGreedy - { - get { return GetString("BindingSource_CannotBeGreedy"); } - } - - /// - /// The provided binding source '{0}' is a greedy data source. '{1}' does not support greedy data sources. - /// - internal static string FormatBindingSource_CannotBeGreedy(object p0, object p1) - { - return string.Format(CultureInfo.CurrentCulture, GetString("BindingSource_CannotBeGreedy"), p0, p1); - } - - /// - /// The provided binding source '{0}' is not a request-based binding source. '{1}' requires that the source must represent data from an HTTP request. - /// - internal static string BindingSource_MustBeFromRequest - { - get { return GetString("BindingSource_MustBeFromRequest"); } - } - - /// - /// The provided binding source '{0}' is not a request-based binding source. '{1}' requires that the source must represent data from an HTTP request. - /// - internal static string FormatBindingSource_MustBeFromRequest(object p0, object p1) - { - return string.Format(CultureInfo.CurrentCulture, GetString("BindingSource_MustBeFromRequest"), p0, p1); - } - - /// - /// The provided binding source '{0}' is not a greedy data source. '{1}' only supports greedy data sources. - /// - internal static string BindingSource_MustBeGreedy - { - get { return GetString("BindingSource_MustBeGreedy"); } - } - - /// - /// The provided binding source '{0}' is not a greedy data source. '{1}' only supports greedy data sources. - /// - internal static string FormatBindingSource_MustBeGreedy(object p0, object p1) - { - return string.Format(CultureInfo.CurrentCulture, GetString("BindingSource_MustBeGreedy"), p0, p1); - } - - /// - /// The property {0}.{1} could not be found. - /// - internal static string Common_PropertyNotFound - { - get { return GetString("Common_PropertyNotFound"); } - } - - /// - /// The property {0}.{1} could not be found. - /// - internal static string FormatCommon_PropertyNotFound(object p0, object p1) - { - return string.Format(CultureInfo.CurrentCulture, GetString("Common_PropertyNotFound"), p0, p1); - } - - /// - /// A value is required. - /// - internal static string KeyValuePair_BothKeyAndValueMustBePresent - { - get { return GetString("KeyValuePair_BothKeyAndValueMustBePresent"); } - } - - /// - /// A value is required. - /// - internal static string FormatKeyValuePair_BothKeyAndValueMustBePresent() - { - return GetString("KeyValuePair_BothKeyAndValueMustBePresent"); - } - - /// - /// The '{0}' property is required. - /// - internal static string ModelBinding_MissingRequiredMember - { - get { return GetString("ModelBinding_MissingRequiredMember"); } - } - - /// - /// The '{0}' property is required. - /// - internal static string FormatModelBinding_MissingRequiredMember(object p0) - { - return string.Format(CultureInfo.CurrentCulture, GetString("ModelBinding_MissingRequiredMember"), p0); - } - - /// - /// A value is required. - /// - internal static string ModelBinding_ValueRequired - { - get { return GetString("ModelBinding_ValueRequired"); } - } - - /// - /// A value is required. - /// - internal static string FormatModelBinding_ValueRequired() - { - return GetString("ModelBinding_ValueRequired"); - } - - /// - /// More than one parameter and/or property is bound to the HTTP request's content. - /// - internal static string MultipleBodyParametersOrPropertiesAreNotAllowed - { - get { return GetString("MultipleBodyParametersOrPropertiesAreNotAllowed"); } - } - - /// - /// More than one parameter and/or property is bound to the HTTP request's content. - /// - internal static string FormatMultipleBodyParametersOrPropertiesAreNotAllowed() - { - return GetString("MultipleBodyParametersOrPropertiesAreNotAllowed"); - } - - /// - /// The type '{0}' does not implement the interface '{1}'. - /// - internal static string PropertyBindingPredicateProvider_WrongType - { - get { return GetString("PropertyBindingPredicateProvider_WrongType"); } - } - - /// - /// The type '{0}' does not implement the interface '{1}'. - /// - internal static string FormatPropertyBindingPredicateProvider_WrongType(object p0, object p1) - { - return string.Format(CultureInfo.CurrentCulture, GetString("PropertyBindingPredicateProvider_WrongType"), p0, p1); - } - - /// - /// The model object inside the metadata claimed to be compatible with '{0}', but was actually '{1}'. - /// - internal static string ValidatableObjectAdapter_IncompatibleType - { - get { return GetString("ValidatableObjectAdapter_IncompatibleType"); } - } - - /// - /// The model object inside the metadata claimed to be compatible with '{0}', but was actually '{1}'. - /// - internal static string FormatValidatableObjectAdapter_IncompatibleType(object p0, object p1) - { - return string.Format(CultureInfo.CurrentCulture, GetString("ValidatableObjectAdapter_IncompatibleType"), p0, p1); - } - - private static string GetString(string name, params string[] formatterNames) - { - var value = _resourceManager.GetString(name); - - System.Diagnostics.Debug.Assert(value != null); - - if (formatterNames != null) - { - for (var i = 0; i < formatterNames.Length; i++) - { - value = value.Replace("{" + formatterNames[i] + "}", "{" + i + "}"); - } - } - - return value; - } - } -} diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Formatters/MediaTypeHeaderValues.cs b/src/Microsoft.AspNet.Mvc.Formatters.Json/Internal/MediaTypeHeaderValues.cs similarity index 94% rename from src/Microsoft.AspNet.Mvc.Extensions/Formatters/MediaTypeHeaderValues.cs rename to src/Microsoft.AspNet.Mvc.Formatters.Json/Internal/MediaTypeHeaderValues.cs index 11b159bc6a..bf96481b61 100644 --- a/src/Microsoft.AspNet.Mvc.Extensions/Formatters/MediaTypeHeaderValues.cs +++ b/src/Microsoft.AspNet.Mvc.Formatters.Json/Internal/MediaTypeHeaderValues.cs @@ -3,7 +3,7 @@ using Microsoft.Net.Http.Headers; -namespace Microsoft.AspNet.Mvc +namespace Microsoft.AspNet.Mvc.Internal { internal class MediaTypeHeaderValues { diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Internal/SerializerSettingsProvider.cs b/src/Microsoft.AspNet.Mvc.Formatters.Json/Internal/SerializerSettingsProvider.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Internal/SerializerSettingsProvider.cs rename to src/Microsoft.AspNet.Mvc.Formatters.Json/Internal/SerializerSettingsProvider.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Formatters/JsonInputFormatter.cs b/src/Microsoft.AspNet.Mvc.Formatters.Json/JsonInputFormatter.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Formatters/JsonInputFormatter.cs rename to src/Microsoft.AspNet.Mvc.Formatters.Json/JsonInputFormatter.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Formatters/JsonOutputFormatter.cs b/src/Microsoft.AspNet.Mvc.Formatters.Json/JsonOutputFormatter.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Formatters/JsonOutputFormatter.cs rename to src/Microsoft.AspNet.Mvc.Formatters.Json/JsonOutputFormatter.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Formatters/JsonPatchInputFormatter.cs b/src/Microsoft.AspNet.Mvc.Formatters.Json/JsonPatchInputFormatter.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Formatters/JsonPatchInputFormatter.cs rename to src/Microsoft.AspNet.Mvc.Formatters.Json/JsonPatchInputFormatter.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/JsonResult.cs b/src/Microsoft.AspNet.Mvc.Formatters.Json/JsonResult.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/JsonResult.cs rename to src/Microsoft.AspNet.Mvc.Formatters.Json/JsonResult.cs diff --git a/src/Microsoft.AspNet.Mvc.Formatters.Json/Microsoft.AspNet.Mvc.Formatters.Json.xproj b/src/Microsoft.AspNet.Mvc.Formatters.Json/Microsoft.AspNet.Mvc.Formatters.Json.xproj new file mode 100644 index 0000000000..3d2eb0d608 --- /dev/null +++ b/src/Microsoft.AspNet.Mvc.Formatters.Json/Microsoft.AspNet.Mvc.Formatters.Json.xproj @@ -0,0 +1,20 @@ + + + + 14.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + + 3fc8d9d6-9352-43a3-8e81-422f270085b7 + Microsoft.AspNet.Mvc.Formatters.Json + ..\..\artifacts\obj\$(MSBuildProjectName) + ..\..\artifacts\bin\$(MSBuildProjectName)\ + + + + 2.0 + + + diff --git a/src/Microsoft.AspNet.Mvc.Extensions/MvcJsonOptions.cs b/src/Microsoft.AspNet.Mvc.Formatters.Json/MvcJsonOptions.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/MvcJsonOptions.cs rename to src/Microsoft.AspNet.Mvc.Formatters.Json/MvcJsonOptions.cs diff --git a/src/Microsoft.AspNet.Mvc.Formatters.Json/project.json b/src/Microsoft.AspNet.Mvc.Formatters.Json/project.json new file mode 100644 index 0000000000..f97d8e821c --- /dev/null +++ b/src/Microsoft.AspNet.Mvc.Formatters.Json/project.json @@ -0,0 +1,29 @@ +{ + "description": "JSON input and output for the MVC runtime", + "version": "6.0.0-*", + "repository": { + "type": "git", + "url": "git://github.com/aspnet/mvc" + }, + "compilationOptions": { + "warningsAsErrors": true + }, + "dependencies": { + "Microsoft.AspNet.JsonPatch": "1.0.0-*", + "Microsoft.AspNet.Mvc.Core": "6.0.0-*", + "Microsoft.Framework.ClosedGenericMatcher.Sources": { + "version": "1.0.0-*", + "type": "build" + }, + "Microsoft.Framework.NotNullAttribute.Sources": { + "version": "1.0.0-*", + "type": "build" + }, + "Newtonsoft.Json": "6.0.6" + }, + + "frameworks": { + "dnx451": { }, + "dnxcore50": { } + } +} diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ModelBinding/Metadata/DataMemberRequiredBindingMetadataProvider.cs b/src/Microsoft.AspNet.Mvc.Formatters.Xml/DataMemberRequiredBindingMetadataProvider.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/ModelBinding/Metadata/DataMemberRequiredBindingMetadataProvider.cs rename to src/Microsoft.AspNet.Mvc.Formatters.Xml/DataMemberRequiredBindingMetadataProvider.cs diff --git a/src/Microsoft.AspNet.Mvc.Xml/DelegatingEnumerable.cs b/src/Microsoft.AspNet.Mvc.Formatters.Xml/DelegatingEnumerable.cs similarity index 98% rename from src/Microsoft.AspNet.Mvc.Xml/DelegatingEnumerable.cs rename to src/Microsoft.AspNet.Mvc.Formatters.Xml/DelegatingEnumerable.cs index 2ed4c42d7a..5b94782d23 100644 --- a/src/Microsoft.AspNet.Mvc.Xml/DelegatingEnumerable.cs +++ b/src/Microsoft.AspNet.Mvc.Formatters.Xml/DelegatingEnumerable.cs @@ -7,7 +7,7 @@ using System.Collections.Generic; using System.Linq; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc.Xml +namespace Microsoft.AspNet.Mvc.Formatters.Xml { /// /// Serializes types by delegating them through a concrete implementation. diff --git a/src/Microsoft.AspNet.Mvc.Xml/DelegatingEnumerator.cs b/src/Microsoft.AspNet.Mvc.Formatters.Xml/DelegatingEnumerator.cs similarity index 98% rename from src/Microsoft.AspNet.Mvc.Xml/DelegatingEnumerator.cs rename to src/Microsoft.AspNet.Mvc.Formatters.Xml/DelegatingEnumerator.cs index 5c5d77b273..c3470aaf7c 100644 --- a/src/Microsoft.AspNet.Mvc.Xml/DelegatingEnumerator.cs +++ b/src/Microsoft.AspNet.Mvc.Formatters.Xml/DelegatingEnumerator.cs @@ -6,7 +6,7 @@ using System.Collections; using System.Collections.Generic; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc.Xml +namespace Microsoft.AspNet.Mvc.Formatters.Xml { /// /// Delegates enumeration of elements to the original enumerator and wraps the items diff --git a/src/Microsoft.AspNet.Mvc.Xml/EnumerableWrapperProvider.cs b/src/Microsoft.AspNet.Mvc.Formatters.Xml/EnumerableWrapperProvider.cs similarity index 98% rename from src/Microsoft.AspNet.Mvc.Xml/EnumerableWrapperProvider.cs rename to src/Microsoft.AspNet.Mvc.Formatters.Xml/EnumerableWrapperProvider.cs index 8072be86a7..b38d2ca301 100644 --- a/src/Microsoft.AspNet.Mvc.Xml/EnumerableWrapperProvider.cs +++ b/src/Microsoft.AspNet.Mvc.Formatters.Xml/EnumerableWrapperProvider.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Reflection; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc.Xml +namespace Microsoft.AspNet.Mvc.Formatters.Xml { /// /// Provides a for interface types which implement diff --git a/src/Microsoft.AspNet.Mvc.Xml/EnumerableWrapperProviderFactory.cs b/src/Microsoft.AspNet.Mvc.Formatters.Xml/EnumerableWrapperProviderFactory.cs similarity index 98% rename from src/Microsoft.AspNet.Mvc.Xml/EnumerableWrapperProviderFactory.cs rename to src/Microsoft.AspNet.Mvc.Formatters.Xml/EnumerableWrapperProviderFactory.cs index 1cf23bfe7c..7965756c58 100644 --- a/src/Microsoft.AspNet.Mvc.Xml/EnumerableWrapperProviderFactory.cs +++ b/src/Microsoft.AspNet.Mvc.Formatters.Xml/EnumerableWrapperProviderFactory.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using System.Reflection; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc.Xml +namespace Microsoft.AspNet.Mvc.Formatters.Xml { /// /// Creates an for interface types implementing the diff --git a/src/Microsoft.AspNet.Mvc.Xml/FormattingUtilities.cs b/src/Microsoft.AspNet.Mvc.Formatters.Xml/FormattingUtilities.cs similarity index 97% rename from src/Microsoft.AspNet.Mvc.Xml/FormattingUtilities.cs rename to src/Microsoft.AspNet.Mvc.Formatters.Xml/FormattingUtilities.cs index 7ed55f55e0..40cd76e1ab 100644 --- a/src/Microsoft.AspNet.Mvc.Xml/FormattingUtilities.cs +++ b/src/Microsoft.AspNet.Mvc.Formatters.Xml/FormattingUtilities.cs @@ -6,7 +6,7 @@ using System.Runtime.Serialization; #endif using System.Xml; -namespace Microsoft.AspNet.Mvc.Xml +namespace Microsoft.AspNet.Mvc.Formatters.Xml { /// /// Contains methods which are used by Xml input formatters. diff --git a/src/Microsoft.AspNet.Mvc.Xml/IUnwrappable.cs b/src/Microsoft.AspNet.Mvc.Formatters.Xml/IUnwrappable.cs similarity index 92% rename from src/Microsoft.AspNet.Mvc.Xml/IUnwrappable.cs rename to src/Microsoft.AspNet.Mvc.Formatters.Xml/IUnwrappable.cs index b753cf37de..e937421454 100644 --- a/src/Microsoft.AspNet.Mvc.Xml/IUnwrappable.cs +++ b/src/Microsoft.AspNet.Mvc.Formatters.Xml/IUnwrappable.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNet.Mvc.Xml +namespace Microsoft.AspNet.Mvc.Formatters.Xml { /// /// Defines an interface for objects to be un-wrappable after deserialization. diff --git a/src/Microsoft.AspNet.Mvc.Xml/IWrapperProvider.cs b/src/Microsoft.AspNet.Mvc.Formatters.Xml/IWrapperProvider.cs similarity index 94% rename from src/Microsoft.AspNet.Mvc.Xml/IWrapperProvider.cs rename to src/Microsoft.AspNet.Mvc.Formatters.Xml/IWrapperProvider.cs index b3931282b4..9f25fa5bcb 100644 --- a/src/Microsoft.AspNet.Mvc.Xml/IWrapperProvider.cs +++ b/src/Microsoft.AspNet.Mvc.Formatters.Xml/IWrapperProvider.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNet.Mvc.Xml +namespace Microsoft.AspNet.Mvc.Formatters.Xml { /// /// Defines an interface for wrapping objects for serialization or deserialization into xml. diff --git a/src/Microsoft.AspNet.Mvc.Xml/IWrapperProviderFactory.cs b/src/Microsoft.AspNet.Mvc.Formatters.Xml/IWrapperProviderFactory.cs similarity index 94% rename from src/Microsoft.AspNet.Mvc.Xml/IWrapperProviderFactory.cs rename to src/Microsoft.AspNet.Mvc.Formatters.Xml/IWrapperProviderFactory.cs index 58cca3059b..b5efe9d62c 100644 --- a/src/Microsoft.AspNet.Mvc.Xml/IWrapperProviderFactory.cs +++ b/src/Microsoft.AspNet.Mvc.Formatters.Xml/IWrapperProviderFactory.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; -namespace Microsoft.AspNet.Mvc.Xml +namespace Microsoft.AspNet.Mvc.Formatters.Xml { /// /// Create a given a . diff --git a/src/Microsoft.AspNet.Mvc.Xml/MediaTypeHeaderValues.cs b/src/Microsoft.AspNet.Mvc.Formatters.Xml/MediaTypeHeaderValues.cs similarity index 92% rename from src/Microsoft.AspNet.Mvc.Xml/MediaTypeHeaderValues.cs rename to src/Microsoft.AspNet.Mvc.Formatters.Xml/MediaTypeHeaderValues.cs index b922599f6e..1ec742f1f1 100644 --- a/src/Microsoft.AspNet.Mvc.Xml/MediaTypeHeaderValues.cs +++ b/src/Microsoft.AspNet.Mvc.Formatters.Xml/MediaTypeHeaderValues.cs @@ -3,7 +3,7 @@ using Microsoft.Net.Http.Headers; -namespace Microsoft.AspNet.Mvc.Xml +namespace Microsoft.AspNet.Mvc.Formatters.Xml { internal static class MediaTypeHeaderValues { diff --git a/src/Microsoft.AspNet.Mvc.Xml/Microsoft.AspNet.Mvc.Xml.xproj b/src/Microsoft.AspNet.Mvc.Formatters.Xml/Microsoft.AspNet.Mvc.Formatters.Xml.xproj similarity index 93% rename from src/Microsoft.AspNet.Mvc.Xml/Microsoft.AspNet.Mvc.Xml.xproj rename to src/Microsoft.AspNet.Mvc.Formatters.Xml/Microsoft.AspNet.Mvc.Formatters.Xml.xproj index b6b1ab53bd..19b11d538d 100644 --- a/src/Microsoft.AspNet.Mvc.Xml/Microsoft.AspNet.Mvc.Xml.xproj +++ b/src/Microsoft.AspNet.Mvc.Formatters.Xml/Microsoft.AspNet.Mvc.Formatters.Xml.xproj @@ -6,7 +6,7 @@ - 9c632df0-dc06-410b-95ae-b5423702e84f + 42c81540-cd47-4c68-a7a3-2a93b9c3b210 ..\..\artifacts\obj\$(MSBuildProjectName) ..\..\artifacts\bin\$(MSBuildProjectName)\ diff --git a/src/Microsoft.AspNet.Mvc.Xml/MvcOptionsExtensions.cs b/src/Microsoft.AspNet.Mvc.Formatters.Xml/MvcOptionsExtensions.cs similarity index 70% rename from src/Microsoft.AspNet.Mvc.Xml/MvcOptionsExtensions.cs rename to src/Microsoft.AspNet.Mvc.Formatters.Xml/MvcOptionsExtensions.cs index fbc9f8314c..f34cf1efdc 100644 --- a/src/Microsoft.AspNet.Mvc.Xml/MvcOptionsExtensions.cs +++ b/src/Microsoft.AspNet.Mvc.Formatters.Xml/MvcOptionsExtensions.cs @@ -1,7 +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 Microsoft.AspNet.Mvc.Xml; +using System.Xml.Linq; +using Microsoft.AspNet.Mvc.Formatters.Xml; +using Microsoft.AspNet.Mvc.ModelBinding.Metadata; using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Mvc @@ -16,9 +18,13 @@ namespace Microsoft.AspNet.Mvc /// The MvcOptions public static void AddXmlDataContractSerializerFormatter([NotNull] this MvcOptions options) { - options.OutputFormatters.Add(new XmlDataContractSerializerOutputFormatter()); + options.ModelMetadataDetailsProviders.Add(new DataMemberRequiredBindingMetadataProvider()); + options.OutputFormatters.Add(new XmlDataContractSerializerOutputFormatter()); options.InputFormatters.Add(new XmlDataContractSerializerInputFormatter()); + + options.ValidationExcludeFilters.Add(typeof(XObject)); + options.ValidationExcludeFilters.Add(typeFullName: "System.Xml.XmlNode"); } } } \ No newline at end of file diff --git a/src/Microsoft.AspNet.Mvc.Xml/Properties/AssemblyInfo.cs b/src/Microsoft.AspNet.Mvc.Formatters.Xml/Properties/AssemblyInfo.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Xml/Properties/AssemblyInfo.cs rename to src/Microsoft.AspNet.Mvc.Formatters.Xml/Properties/AssemblyInfo.cs diff --git a/src/Microsoft.AspNet.Mvc.Xml/Properties/Resources.Designer.cs b/src/Microsoft.AspNet.Mvc.Formatters.Xml/Properties/Resources.Designer.cs similarity index 94% rename from src/Microsoft.AspNet.Mvc.Xml/Properties/Resources.Designer.cs rename to src/Microsoft.AspNet.Mvc.Formatters.Xml/Properties/Resources.Designer.cs index 4e5d80a54e..c7d552c922 100644 --- a/src/Microsoft.AspNet.Mvc.Xml/Properties/Resources.Designer.cs +++ b/src/Microsoft.AspNet.Mvc.Formatters.Xml/Properties/Resources.Designer.cs @@ -1,5 +1,5 @@ // -namespace Microsoft.AspNet.Mvc.Xml +namespace Microsoft.AspNet.Mvc.Formatters.Xml { using System.Globalization; using System.Reflection; @@ -8,7 +8,7 @@ namespace Microsoft.AspNet.Mvc.Xml internal static class Resources { private static readonly ResourceManager _resourceManager - = new ResourceManager("Microsoft.AspNet.Mvc.Xml.Resources", typeof(Resources).GetTypeInfo().Assembly); + = new ResourceManager("Microsoft.AspNet.Mvc.Formatters.Xml.Resources", typeof(Resources).GetTypeInfo().Assembly); /// /// The type must be an interface and must be or derive from '{0}'. diff --git a/src/Microsoft.AspNet.Mvc.Xml/Resources.resx b/src/Microsoft.AspNet.Mvc.Formatters.Xml/Resources.resx similarity index 100% rename from src/Microsoft.AspNet.Mvc.Xml/Resources.resx rename to src/Microsoft.AspNet.Mvc.Formatters.Xml/Resources.resx diff --git a/src/Microsoft.AspNet.Mvc.Xml/SerializableErrorWrapper.cs b/src/Microsoft.AspNet.Mvc.Formatters.Xml/SerializableErrorWrapper.cs similarity index 98% rename from src/Microsoft.AspNet.Mvc.Xml/SerializableErrorWrapper.cs rename to src/Microsoft.AspNet.Mvc.Formatters.Xml/SerializableErrorWrapper.cs index aaaf4009fc..af43dff3aa 100644 --- a/src/Microsoft.AspNet.Mvc.Xml/SerializableErrorWrapper.cs +++ b/src/Microsoft.AspNet.Mvc.Formatters.Xml/SerializableErrorWrapper.cs @@ -7,7 +7,7 @@ using System.Xml.Schema; using System.Xml.Serialization; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc.Xml +namespace Microsoft.AspNet.Mvc.Formatters.Xml { /// /// Wrapper class for to enable it to be serialized by the xml formatters. diff --git a/src/Microsoft.AspNet.Mvc.Xml/SerializableErrorWrapperProvider.cs b/src/Microsoft.AspNet.Mvc.Formatters.Xml/SerializableErrorWrapperProvider.cs similarity index 96% rename from src/Microsoft.AspNet.Mvc.Xml/SerializableErrorWrapperProvider.cs rename to src/Microsoft.AspNet.Mvc.Formatters.Xml/SerializableErrorWrapperProvider.cs index 5a116593d4..e9a66b05ee 100644 --- a/src/Microsoft.AspNet.Mvc.Xml/SerializableErrorWrapperProvider.cs +++ b/src/Microsoft.AspNet.Mvc.Formatters.Xml/SerializableErrorWrapperProvider.cs @@ -5,7 +5,7 @@ using System; using Microsoft.AspNet.Mvc; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc.Xml +namespace Microsoft.AspNet.Mvc.Formatters.Xml { /// /// Wraps the object of type . diff --git a/src/Microsoft.AspNet.Mvc.Xml/SerializableErrorWrapperProviderFactory.cs b/src/Microsoft.AspNet.Mvc.Formatters.Xml/SerializableErrorWrapperProviderFactory.cs similarity index 96% rename from src/Microsoft.AspNet.Mvc.Xml/SerializableErrorWrapperProviderFactory.cs rename to src/Microsoft.AspNet.Mvc.Formatters.Xml/SerializableErrorWrapperProviderFactory.cs index bc10f5bd60..ab1589c07b 100644 --- a/src/Microsoft.AspNet.Mvc.Xml/SerializableErrorWrapperProviderFactory.cs +++ b/src/Microsoft.AspNet.Mvc.Formatters.Xml/SerializableErrorWrapperProviderFactory.cs @@ -3,7 +3,7 @@ using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc.Xml +namespace Microsoft.AspNet.Mvc.Formatters.Xml { /// /// Creates an for the type . diff --git a/src/Microsoft.AspNet.Mvc.Xml/WrapperProviderContext.cs b/src/Microsoft.AspNet.Mvc.Formatters.Xml/WrapperProviderContext.cs similarity index 96% rename from src/Microsoft.AspNet.Mvc.Xml/WrapperProviderContext.cs rename to src/Microsoft.AspNet.Mvc.Formatters.Xml/WrapperProviderContext.cs index db464715bd..fa8fec8640 100644 --- a/src/Microsoft.AspNet.Mvc.Xml/WrapperProviderContext.cs +++ b/src/Microsoft.AspNet.Mvc.Formatters.Xml/WrapperProviderContext.cs @@ -4,7 +4,7 @@ using System; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc.Xml +namespace Microsoft.AspNet.Mvc.Formatters.Xml { /// /// The context used by an to wrap or un-wrap types. diff --git a/src/Microsoft.AspNet.Mvc.Xml/WrapperProviderFactoriesExtensions.cs b/src/Microsoft.AspNet.Mvc.Formatters.Xml/WrapperProviderFactoriesExtensions.cs similarity index 97% rename from src/Microsoft.AspNet.Mvc.Xml/WrapperProviderFactoriesExtensions.cs rename to src/Microsoft.AspNet.Mvc.Formatters.Xml/WrapperProviderFactoriesExtensions.cs index b1b0595753..e9ead0ed29 100644 --- a/src/Microsoft.AspNet.Mvc.Xml/WrapperProviderFactoriesExtensions.cs +++ b/src/Microsoft.AspNet.Mvc.Formatters.Xml/WrapperProviderFactoriesExtensions.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc.Xml +namespace Microsoft.AspNet.Mvc.Formatters.Xml { /// /// Extension methods for . diff --git a/src/Microsoft.AspNet.Mvc.Xml/XmlDataContractSerializerInputFormatter.cs b/src/Microsoft.AspNet.Mvc.Formatters.Xml/XmlDataContractSerializerInputFormatter.cs similarity index 99% rename from src/Microsoft.AspNet.Mvc.Xml/XmlDataContractSerializerInputFormatter.cs rename to src/Microsoft.AspNet.Mvc.Formatters.Xml/XmlDataContractSerializerInputFormatter.cs index c999d3e076..2015cc7c77 100644 --- a/src/Microsoft.AspNet.Mvc.Xml/XmlDataContractSerializerInputFormatter.cs +++ b/src/Microsoft.AspNet.Mvc.Formatters.Xml/XmlDataContractSerializerInputFormatter.cs @@ -13,7 +13,7 @@ using Microsoft.AspNet.Mvc.Internal; using Microsoft.Framework.Internal; using Microsoft.Net.Http.Headers; -namespace Microsoft.AspNet.Mvc.Xml +namespace Microsoft.AspNet.Mvc.Formatters.Xml { /// /// This class handles deserialization of input XML data diff --git a/src/Microsoft.AspNet.Mvc.Xml/XmlDataContractSerializerOutputFormatter.cs b/src/Microsoft.AspNet.Mvc.Formatters.Xml/XmlDataContractSerializerOutputFormatter.cs similarity index 99% rename from src/Microsoft.AspNet.Mvc.Xml/XmlDataContractSerializerOutputFormatter.cs rename to src/Microsoft.AspNet.Mvc.Formatters.Xml/XmlDataContractSerializerOutputFormatter.cs index 670bbb602c..55d9ec0e1e 100644 --- a/src/Microsoft.AspNet.Mvc.Xml/XmlDataContractSerializerOutputFormatter.cs +++ b/src/Microsoft.AspNet.Mvc.Formatters.Xml/XmlDataContractSerializerOutputFormatter.cs @@ -12,7 +12,7 @@ using System.Xml; using Microsoft.Framework.Internal; using Microsoft.Net.Http.Headers; -namespace Microsoft.AspNet.Mvc.Xml +namespace Microsoft.AspNet.Mvc.Formatters.Xml { /// /// This class handles serialization of objects diff --git a/src/Microsoft.AspNet.Mvc.Xml/XmlSerializerInputFormatter.cs b/src/Microsoft.AspNet.Mvc.Formatters.Xml/XmlSerializerInputFormatter.cs similarity index 99% rename from src/Microsoft.AspNet.Mvc.Xml/XmlSerializerInputFormatter.cs rename to src/Microsoft.AspNet.Mvc.Formatters.Xml/XmlSerializerInputFormatter.cs index d85735f65a..7c629cfed1 100644 --- a/src/Microsoft.AspNet.Mvc.Xml/XmlSerializerInputFormatter.cs +++ b/src/Microsoft.AspNet.Mvc.Formatters.Xml/XmlSerializerInputFormatter.cs @@ -13,7 +13,7 @@ using Microsoft.AspNet.Mvc.Internal; using Microsoft.Framework.Internal; using Microsoft.Net.Http.Headers; -namespace Microsoft.AspNet.Mvc.Xml +namespace Microsoft.AspNet.Mvc.Formatters.Xml { /// /// This class handles deserialization of input XML data diff --git a/src/Microsoft.AspNet.Mvc.Xml/XmlSerializerOutputFormatter.cs b/src/Microsoft.AspNet.Mvc.Formatters.Xml/XmlSerializerOutputFormatter.cs similarity index 99% rename from src/Microsoft.AspNet.Mvc.Xml/XmlSerializerOutputFormatter.cs rename to src/Microsoft.AspNet.Mvc.Formatters.Xml/XmlSerializerOutputFormatter.cs index bf207aa4ab..9d7ce304a5 100644 --- a/src/Microsoft.AspNet.Mvc.Xml/XmlSerializerOutputFormatter.cs +++ b/src/Microsoft.AspNet.Mvc.Formatters.Xml/XmlSerializerOutputFormatter.cs @@ -12,7 +12,7 @@ using System.Xml.Serialization; using Microsoft.Framework.Internal; using Microsoft.Net.Http.Headers; -namespace Microsoft.AspNet.Mvc.Xml +namespace Microsoft.AspNet.Mvc.Formatters.Xml { /// /// This class handles serialization of objects diff --git a/src/Microsoft.AspNet.Mvc.Xml/project.json b/src/Microsoft.AspNet.Mvc.Formatters.Xml/project.json similarity index 94% rename from src/Microsoft.AspNet.Mvc.Xml/project.json rename to src/Microsoft.AspNet.Mvc.Formatters.Xml/project.json index b4f4a0b5db..5b81462105 100644 --- a/src/Microsoft.AspNet.Mvc.Xml/project.json +++ b/src/Microsoft.AspNet.Mvc.Formatters.Xml/project.json @@ -9,7 +9,7 @@ "warningsAsErrors": true }, "dependencies": { - "Microsoft.AspNet.Mvc.Extensions": "6.0.0-*", + "Microsoft.AspNet.Mvc.Core": "6.0.0-*", "Microsoft.Framework.ClosedGenericMatcher.Sources": { "version": "1.0.0-*", "type": "build" }, "Microsoft.Framework.NotNullAttribute.Sources": { "version": "1.0.0-*", "type": "build" }, "Microsoft.Framework.PropertyHelper.Sources": { "version": "1.0.0-*", "type": "build" } diff --git a/src/Microsoft.AspNet.Mvc.Razor/project.json b/src/Microsoft.AspNet.Mvc.Razor/project.json index ea085b15a8..1f648065aa 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/project.json +++ b/src/Microsoft.AspNet.Mvc.Razor/project.json @@ -9,8 +9,8 @@ "warningsAsErrors": false }, "dependencies": { - "Microsoft.AspNet.Mvc.Extensions": "6.0.0-*", "Microsoft.AspNet.Mvc.Razor.Host": "6.0.0-*", + "Microsoft.AspNet.Mvc.ViewFeatures": "6.0.0-*", "Microsoft.AspNet.PageExecutionInstrumentation.Interfaces": "1.0.0-*", "Microsoft.Framework.NotNullAttribute.Sources": { "version": "1.0.0-*", "type": "build" }, "Microsoft.Framework.PropertyActivator.Sources": { "version": "1.0.0-*", "type": "build" }, diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Controller.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Controller.cs similarity index 99% rename from src/Microsoft.AspNet.Mvc.Extensions/Controller.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Controller.cs index 83da9d9754..81c5c296f3 100644 --- a/src/Microsoft.AspNet.Mvc.Extensions/Controller.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/Controller.cs @@ -8,10 +8,10 @@ using System.Security.Claims; using System.Text; using System.Threading.Tasks; using Microsoft.AspNet.Http; -using Microsoft.AspNet.Mvc.Extensions; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.ModelBinding.Validation; using Microsoft.AspNet.Mvc.Rendering; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.AspNet.Routing; using Microsoft.Framework.Internal; using Microsoft.Net.Http.Headers; diff --git a/src/Microsoft.AspNet.Mvc.Extensions/FormContext.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/FormContext.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/FormContext.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/FormContext.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Internal/ModelClientValidationRemoteRule.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Internal/ModelClientValidationRemoteRule.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Internal/ModelClientValidationRemoteRule.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Internal/ModelClientValidationRemoteRule.cs diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Microsoft.AspNet.Mvc.ViewFeatures.xproj b/src/Microsoft.AspNet.Mvc.ViewFeatures/Microsoft.AspNet.Mvc.ViewFeatures.xproj new file mode 100644 index 0000000000..312800d3e9 --- /dev/null +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/Microsoft.AspNet.Mvc.ViewFeatures.xproj @@ -0,0 +1,20 @@ + + + + 14.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + + 3f8b8fc1-9fe4-4788-8991-367113e8d7ad + Microsoft.AspNet.Mvc.ViewFeatures + ..\..\artifacts\obj\$(MSBuildProjectName) + ..\..\artifacts\bin\$(MSBuildProjectName)\ + + + + 2.0 + + + diff --git a/src/Microsoft.AspNet.Mvc.Extensions/MvcViewOptions.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/MvcViewOptions.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/MvcViewOptions.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/MvcViewOptions.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/PartialViewResult.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/PartialViewResult.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/PartialViewResult.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/PartialViewResult.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Properties/AssemblyInfo.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Properties/AssemblyInfo.cs similarity index 76% rename from src/Microsoft.AspNet.Mvc.Extensions/Properties/AssemblyInfo.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Properties/AssemblyInfo.cs index 29a0c259be..64e4af4593 100644 --- a/src/Microsoft.AspNet.Mvc.Extensions/Properties/AssemblyInfo.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/Properties/AssemblyInfo.cs @@ -4,9 +4,9 @@ using System.Reflection; using System.Runtime.CompilerServices; -[assembly: InternalsVisibleTo("Microsoft.AspNet.Mvc.Extensions.Test")] +[assembly: InternalsVisibleTo("Microsoft.AspNet.Mvc.ViewFeatures.Test")] [assembly: InternalsVisibleTo("Microsoft.AspNet.Mvc.Razor.Test")] [assembly: InternalsVisibleTo("Microsoft.AspNet.Mvc.TagHelpers.Test")] -[assembly: InternalsVisibleTo("Microsoft.AspNet.Mvc.Xml.Test")] +[assembly: InternalsVisibleTo("Microsoft.AspNet.Mvc.Formatters.Xml.Test")] [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")] [assembly: AssemblyMetadata("Serviceable", "True")] diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Properties/Resources.Designer.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Properties/Resources.Designer.cs new file mode 100644 index 0000000000..7b8b93dd4d --- /dev/null +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/Properties/Resources.Designer.cs @@ -0,0 +1,782 @@ +// +namespace Microsoft.AspNet.Mvc.ViewFeatures +{ + using System.Globalization; + using System.Reflection; + using System.Resources; + + internal static class Resources + { + private static readonly ResourceManager _resourceManager + = new ResourceManager("Microsoft.AspNet.Mvc.ViewFeatures.Resources", typeof(Resources).GetTypeInfo().Assembly); + + /// + /// The view component name '{0}' matched multiple types:{1}{2} + /// + internal static string ViewComponent_AmbiguousTypeMatch + { + get { return GetString("ViewComponent_AmbiguousTypeMatch"); } + } + + /// + /// The view component name '{0}' matched multiple types:{1}{2} + /// + internal static string FormatViewComponent_AmbiguousTypeMatch(object p0, object p1, object p2) + { + return string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_AmbiguousTypeMatch"), p0, p1, p2); + } + + /// + /// The async view component method '{0}' should be declared to return Task<T>. + /// + internal static string ViewComponent_AsyncMethod_ShouldReturnTask + { + get { return GetString("ViewComponent_AsyncMethod_ShouldReturnTask"); } + } + + /// + /// The async view component method '{0}' should be declared to return Task<T>. + /// + internal static string FormatViewComponent_AsyncMethod_ShouldReturnTask(object p0) + { + return string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_AsyncMethod_ShouldReturnTask"), p0); + } + + /// + /// A view component must return a non-null value. + /// + internal static string ViewComponent_MustReturnValue + { + get { return GetString("ViewComponent_MustReturnValue"); } + } + + /// + /// A view component must return a non-null value. + /// + internal static string FormatViewComponent_MustReturnValue() + { + return GetString("ViewComponent_MustReturnValue"); + } + + /// + /// The view component method '{0}' should be declared to return a value. + /// + internal static string ViewComponent_SyncMethod_ShouldReturnValue + { + get { return GetString("ViewComponent_SyncMethod_ShouldReturnValue"); } + } + + /// + /// The view component method '{0}' should be declared to return a value. + /// + internal static string FormatViewComponent_SyncMethod_ShouldReturnValue(object p0) + { + return string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_SyncMethod_ShouldReturnValue"), p0); + } + + /// + /// A view component named '{0}' could not be found. + /// + internal static string ViewComponent_CannotFindComponent + { + get { return GetString("ViewComponent_CannotFindComponent"); } + } + + /// + /// A view component named '{0}' could not be found. + /// + internal static string FormatViewComponent_CannotFindComponent(object p0) + { + return string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_CannotFindComponent"), p0); + } + + /// + /// An invoker could not be created for the view component '{0}'. + /// + internal static string ViewComponent_IViewComponentFactory_ReturnedNull + { + get { return GetString("ViewComponent_IViewComponentFactory_ReturnedNull"); } + } + + /// + /// An invoker could not be created for the view component '{0}'. + /// + internal static string FormatViewComponent_IViewComponentFactory_ReturnedNull(object p0) + { + return string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_IViewComponentFactory_ReturnedNull"), p0); + } + + /// + /// Could not find an '{0}' method matching the parameters. + /// + internal static string ViewComponent_CannotFindMethod + { + get { return GetString("ViewComponent_CannotFindMethod"); } + } + + /// + /// Could not find an '{0}' method matching the parameters. + /// + internal static string FormatViewComponent_CannotFindMethod(object p0) + { + return string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_CannotFindMethod"), p0); + } + + /// + /// Could not find an '{0}' or '{1}' method matching the parameters. + /// + internal static string ViewComponent_CannotFindMethod_WithFallback + { + get { return GetString("ViewComponent_CannotFindMethod_WithFallback"); } + } + + /// + /// Could not find an '{0}' or '{1}' method matching the parameters. + /// + internal static string FormatViewComponent_CannotFindMethod_WithFallback(object p0, object p1) + { + return string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_CannotFindMethod_WithFallback"), p0, p1); + } + + /// + /// View components only support returning {0}, {1} or {2}. + /// + internal static string ViewComponent_InvalidReturnValue + { + get { return GetString("ViewComponent_InvalidReturnValue"); } + } + + /// + /// View components only support returning {0}, {1} or {2}. + /// + internal static string FormatViewComponent_InvalidReturnValue(object p0, object p1, object p2) + { + return string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_InvalidReturnValue"), p0, p1, p2); + } + + /// + /// Value cannot be null or empty. + /// + internal static string ArgumentCannotBeNullOrEmpty + { + get { return GetString("ArgumentCannotBeNullOrEmpty"); } + } + + /// + /// Value cannot be null or empty. + /// + internal static string FormatArgumentCannotBeNullOrEmpty() + { + return GetString("ArgumentCannotBeNullOrEmpty"); + } + + /// + /// The '{0}' property of '{1}' must not be null. + /// + internal static string PropertyOfTypeCannotBeNull + { + get { return GetString("PropertyOfTypeCannotBeNull"); } + } + + /// + /// The '{0}' property of '{1}' must not be null. + /// + internal static string FormatPropertyOfTypeCannotBeNull(object p0, object p1) + { + return string.Format(CultureInfo.CurrentCulture, GetString("PropertyOfTypeCannotBeNull"), p0, p1); + } + + /// + /// The '{0}' method of type '{1}' cannot return a null value. + /// + internal static string TypeMethodMustReturnNotNullValue + { + get { return GetString("TypeMethodMustReturnNotNullValue"); } + } + + /// + /// The '{0}' method of type '{1}' cannot return a null value. + /// + internal static string FormatTypeMethodMustReturnNotNullValue(object p0, object p1) + { + return string.Format(CultureInfo.CurrentCulture, GetString("TypeMethodMustReturnNotNullValue"), p0, p1); + } + + /// + /// Property '{0}' is of type '{1}', but this method requires a value of type '{2}'. + /// + internal static string ArgumentPropertyUnexpectedType + { + get { return GetString("ArgumentPropertyUnexpectedType"); } + } + + /// + /// Property '{0}' is of type '{1}', but this method requires a value of type '{2}'. + /// + internal static string FormatArgumentPropertyUnexpectedType(object p0, object p1, object p2) + { + return string.Format(CultureInfo.CurrentCulture, GetString("ArgumentPropertyUnexpectedType"), p0, p1, p2); + } + + /// + /// The partial view '{0}' was not found or no view engine supports the searched locations. The following locations were searched:{1} + /// + internal static string Common_PartialViewNotFound + { + get { return GetString("Common_PartialViewNotFound"); } + } + + /// + /// The partial view '{0}' was not found or no view engine supports the searched locations. The following locations were searched:{1} + /// + internal static string FormatCommon_PartialViewNotFound(object p0, object p1) + { + return string.Format(CultureInfo.CurrentCulture, GetString("Common_PartialViewNotFound"), p0, p1); + } + + /// + /// False + /// + internal static string Common_TriState_False + { + get { return GetString("Common_TriState_False"); } + } + + /// + /// False + /// + internal static string FormatCommon_TriState_False() + { + return GetString("Common_TriState_False"); + } + + /// + /// Not Set + /// + internal static string Common_TriState_NotSet + { + get { return GetString("Common_TriState_NotSet"); } + } + + /// + /// Not Set + /// + internal static string FormatCommon_TriState_NotSet() + { + return GetString("Common_TriState_NotSet"); + } + + /// + /// True + /// + internal static string Common_TriState_True + { + get { return GetString("Common_TriState_True"); } + } + + /// + /// True + /// + internal static string FormatCommon_TriState_True() + { + return GetString("Common_TriState_True"); + } + + /// + /// ViewData value must not be null. + /// + internal static string DynamicViewData_ViewDataNull + { + get { return GetString("DynamicViewData_ViewDataNull"); } + } + + /// + /// ViewData value must not be null. + /// + internal static string FormatDynamicViewData_ViewDataNull() + { + return GetString("DynamicViewData_ViewDataNull"); + } + + /// + /// The expression compiler was unable to evaluate the indexer expression '{0}' because it references the model parameter '{1}' which is unavailable. + /// + internal static string ExpressionHelper_InvalidIndexerExpression + { + get { return GetString("ExpressionHelper_InvalidIndexerExpression"); } + } + + /// + /// The expression compiler was unable to evaluate the indexer expression '{0}' because it references the model parameter '{1}' which is unavailable. + /// + internal static string FormatExpressionHelper_InvalidIndexerExpression(object p0, object p1) + { + return string.Format(CultureInfo.CurrentCulture, GetString("ExpressionHelper_InvalidIndexerExpression"), p0, p1); + } + + /// + /// The IModelMetadataProvider was unable to provide metadata for expression '{0}'. + /// + internal static string HtmlHelper_NullModelMetadata + { + get { return GetString("HtmlHelper_NullModelMetadata"); } + } + + /// + /// The IModelMetadataProvider was unable to provide metadata for expression '{0}'. + /// + internal static string FormatHtmlHelper_NullModelMetadata(object p0) + { + return string.Format(CultureInfo.CurrentCulture, GetString("HtmlHelper_NullModelMetadata"), p0); + } + + /// + /// Must call 'Contextualize' method before using this HtmlHelper instance. + /// + internal static string HtmlHelper_NotContextualized + { + get { return GetString("HtmlHelper_NotContextualized"); } + } + + /// + /// Must call 'Contextualize' method before using this HtmlHelper instance. + /// + internal static string FormatHtmlHelper_NotContextualized() + { + return GetString("HtmlHelper_NotContextualized"); + } + + /// + /// There is no ViewData item of type '{0}' that has the key '{1}'. + /// + internal static string HtmlHelper_MissingSelectData + { + get { return GetString("HtmlHelper_MissingSelectData"); } + } + + /// + /// There is no ViewData item of type '{0}' that has the key '{1}'. + /// + internal static string FormatHtmlHelper_MissingSelectData(object p0, object p1) + { + return string.Format(CultureInfo.CurrentCulture, GetString("HtmlHelper_MissingSelectData"), p0, p1); + } + + /// + /// The parameter '{0}' must evaluate to an IEnumerable when multiple selection is allowed. + /// + internal static string HtmlHelper_SelectExpressionNotEnumerable + { + get { return GetString("HtmlHelper_SelectExpressionNotEnumerable"); } + } + + /// + /// The parameter '{0}' must evaluate to an IEnumerable when multiple selection is allowed. + /// + internal static string FormatHtmlHelper_SelectExpressionNotEnumerable(object p0) + { + return string.Format(CultureInfo.CurrentCulture, GetString("HtmlHelper_SelectExpressionNotEnumerable"), p0); + } + + /// + /// The type '{0}' is not supported. Type must be an {1} that does not have an associated {2}. + /// + internal static string HtmlHelper_TypeNotSupported_ForGetEnumSelectList + { + get { return GetString("HtmlHelper_TypeNotSupported_ForGetEnumSelectList"); } + } + + /// + /// The type '{0}' is not supported. Type must be an {1} that does not have an associated {2}. + /// + internal static string FormatHtmlHelper_TypeNotSupported_ForGetEnumSelectList(object p0, object p1, object p2) + { + return string.Format(CultureInfo.CurrentCulture, GetString("HtmlHelper_TypeNotSupported_ForGetEnumSelectList"), p0, p1, p2); + } + + /// + /// The ViewData item that has the key '{0}' is of type '{1}' but must be of type '{2}'. + /// + internal static string HtmlHelper_WrongSelectDataType + { + get { return GetString("HtmlHelper_WrongSelectDataType"); } + } + + /// + /// The ViewData item that has the key '{0}' is of type '{1}' but must be of type '{2}'. + /// + internal static string FormatHtmlHelper_WrongSelectDataType(object p0, object p1, object p2) + { + return string.Format(CultureInfo.CurrentCulture, GetString("HtmlHelper_WrongSelectDataType"), p0, p1, p2); + } + + /// + /// The '{0}' template was used with an object of type '{1}', which does not implement '{2}'. + /// + internal static string Templates_TypeMustImplementIEnumerable + { + get { return GetString("Templates_TypeMustImplementIEnumerable"); } + } + + /// + /// The '{0}' template was used with an object of type '{1}', which does not implement '{2}'. + /// + internal static string FormatTemplates_TypeMustImplementIEnumerable(object p0, object p1, object p2) + { + return string.Format(CultureInfo.CurrentCulture, GetString("Templates_TypeMustImplementIEnumerable"), p0, p1, p2); + } + + /// + /// Templates can be used only with field access, property access, single-dimension array index, or single-parameter custom indexer expressions. + /// + internal static string TemplateHelpers_TemplateLimitations + { + get { return GetString("TemplateHelpers_TemplateLimitations"); } + } + + /// + /// Templates can be used only with field access, property access, single-dimension array index, or single-parameter custom indexer expressions. + /// + internal static string FormatTemplateHelpers_TemplateLimitations() + { + return GetString("TemplateHelpers_TemplateLimitations"); + } + + /// + /// Unable to locate an appropriate template for type {0}. + /// + internal static string TemplateHelpers_NoTemplate + { + get { return GetString("TemplateHelpers_NoTemplate"); } + } + + /// + /// Unable to locate an appropriate template for type {0}. + /// + internal static string FormatTemplateHelpers_NoTemplate(object p0) + { + return string.Format(CultureInfo.CurrentCulture, GetString("TemplateHelpers_NoTemplate"), p0); + } + + /// + /// The model item passed is null, but this ViewDataDictionary instance requires a non-null model item of type '{0}'. + /// + internal static string ViewData_ModelCannotBeNull + { + get { return GetString("ViewData_ModelCannotBeNull"); } + } + + /// + /// The model item passed is null, but this ViewDataDictionary instance requires a non-null model item of type '{0}'. + /// + internal static string FormatViewData_ModelCannotBeNull(object p0) + { + return string.Format(CultureInfo.CurrentCulture, GetString("ViewData_ModelCannotBeNull"), p0); + } + + /// + /// The model item passed into the ViewDataDictionary is of type '{0}', but this ViewDataDictionary instance requires a model item of type '{1}'. + /// + internal static string ViewData_WrongTModelType + { + get { return GetString("ViewData_WrongTModelType"); } + } + + /// + /// The model item passed into the ViewDataDictionary is of type '{0}', but this ViewDataDictionary instance requires a model item of type '{1}'. + /// + internal static string FormatViewData_WrongTModelType(object p0, object p1) + { + return string.Format(CultureInfo.CurrentCulture, GetString("ViewData_WrongTModelType"), p0, p1); + } + + /// + /// The partial view '{0}' was not found. The following locations were searched:{1} + /// + internal static string ViewEngine_PartialViewNotFound + { + get { return GetString("ViewEngine_PartialViewNotFound"); } + } + + /// + /// The partial view '{0}' was not found. The following locations were searched:{1} + /// + internal static string FormatViewEngine_PartialViewNotFound(object p0, object p1) + { + return string.Format(CultureInfo.CurrentCulture, GetString("ViewEngine_PartialViewNotFound"), p0, p1); + } + + /// + /// The view '{0}' was not found. The following locations were searched:{1}. + /// + internal static string ViewEngine_ViewNotFound + { + get { return GetString("ViewEngine_ViewNotFound"); } + } + + /// + /// The view '{0}' was not found. The following locations were searched:{1}. + /// + internal static string FormatViewEngine_ViewNotFound(object p0, object p1) + { + return string.Format(CultureInfo.CurrentCulture, GetString("ViewEngine_ViewNotFound"), p0, p1); + } + + /// + /// The value must be greater than or equal to zero. + /// + internal static string HtmlHelper_TextAreaParameterOutOfRange + { + get { return GetString("HtmlHelper_TextAreaParameterOutOfRange"); } + } + + /// + /// The value must be greater than or equal to zero. + /// + internal static string FormatHtmlHelper_TextAreaParameterOutOfRange() + { + return GetString("HtmlHelper_TextAreaParameterOutOfRange"); + } + + /// + /// Validation parameter names in unobtrusive client validation rules cannot be empty. Client rule type: {0} + /// + internal static string UnobtrusiveJavascript_ValidationParameterCannotBeEmpty + { + get { return GetString("UnobtrusiveJavascript_ValidationParameterCannotBeEmpty"); } + } + + /// + /// Validation parameter names in unobtrusive client validation rules cannot be empty. Client rule type: {0} + /// + internal static string FormatUnobtrusiveJavascript_ValidationParameterCannotBeEmpty(object p0) + { + return string.Format(CultureInfo.CurrentCulture, GetString("UnobtrusiveJavascript_ValidationParameterCannotBeEmpty"), p0); + } + + /// + /// Validation parameter names in unobtrusive client validation rules must start with a lowercase letter and consist of only lowercase letters or digits. Validation parameter name: {0}, client rule type: {1} + /// + internal static string UnobtrusiveJavascript_ValidationParameterMustBeLegal + { + get { return GetString("UnobtrusiveJavascript_ValidationParameterMustBeLegal"); } + } + + /// + /// Validation parameter names in unobtrusive client validation rules must start with a lowercase letter and consist of only lowercase letters or digits. Validation parameter name: {0}, client rule type: {1} + /// + internal static string FormatUnobtrusiveJavascript_ValidationParameterMustBeLegal(object p0, object p1) + { + return string.Format(CultureInfo.CurrentCulture, GetString("UnobtrusiveJavascript_ValidationParameterMustBeLegal"), p0, p1); + } + + /// + /// Validation type names in unobtrusive client validation rules cannot be empty. Client rule type: {0} + /// + internal static string UnobtrusiveJavascript_ValidationTypeCannotBeEmpty + { + get { return GetString("UnobtrusiveJavascript_ValidationTypeCannotBeEmpty"); } + } + + /// + /// Validation type names in unobtrusive client validation rules cannot be empty. Client rule type: {0} + /// + internal static string FormatUnobtrusiveJavascript_ValidationTypeCannotBeEmpty(object p0) + { + return string.Format(CultureInfo.CurrentCulture, GetString("UnobtrusiveJavascript_ValidationTypeCannotBeEmpty"), p0); + } + + /// + /// Validation type names in unobtrusive client validation rules must consist of only lowercase letters. Invalid name: "{0}", client rule type: {1} + /// + internal static string UnobtrusiveJavascript_ValidationTypeMustBeLegal + { + get { return GetString("UnobtrusiveJavascript_ValidationTypeMustBeLegal"); } + } + + /// + /// Validation type names in unobtrusive client validation rules must consist of only lowercase letters. Invalid name: "{0}", client rule type: {1} + /// + internal static string FormatUnobtrusiveJavascript_ValidationTypeMustBeLegal(object p0, object p1) + { + return string.Format(CultureInfo.CurrentCulture, GetString("UnobtrusiveJavascript_ValidationTypeMustBeLegal"), p0, p1); + } + + /// + /// Validation type names in unobtrusive client validation rules must be unique. The following validation type was seen more than once: {0} + /// + internal static string UnobtrusiveJavascript_ValidationTypeMustBeUnique + { + get { return GetString("UnobtrusiveJavascript_ValidationTypeMustBeUnique"); } + } + + /// + /// Validation type names in unobtrusive client validation rules must be unique. The following validation type was seen more than once: {0} + /// + internal static string FormatUnobtrusiveJavascript_ValidationTypeMustBeUnique(object p0) + { + return string.Format(CultureInfo.CurrentCulture, GetString("UnobtrusiveJavascript_ValidationTypeMustBeUnique"), p0); + } + + /// + /// The type '{0}' must derive from '{1}'. + /// + internal static string TypeMustDeriveFromType + { + get { return GetString("TypeMustDeriveFromType"); } + } + + /// + /// The type '{0}' must derive from '{1}'. + /// + internal static string FormatTypeMustDeriveFromType(object p0, object p1) + { + return string.Format(CultureInfo.CurrentCulture, GetString("TypeMustDeriveFromType"), p0, p1); + } + + /// + /// Could not find a replacement for view expansion token '{0}'. + /// + internal static string TemplatedViewLocationExpander_NoReplacementToken + { + get { return GetString("TemplatedViewLocationExpander_NoReplacementToken"); } + } + + /// + /// Could not find a replacement for view expansion token '{0}'. + /// + internal static string FormatTemplatedViewLocationExpander_NoReplacementToken(object p0) + { + return string.Format(CultureInfo.CurrentCulture, GetString("TemplatedViewLocationExpander_NoReplacementToken"), p0); + } + + /// + /// {0} must be executed before {1} can be invoked. + /// + internal static string TemplatedExpander_PopulateValuesMustBeInvokedFirst + { + get { return GetString("TemplatedExpander_PopulateValuesMustBeInvokedFirst"); } + } + + /// + /// {0} must be executed before {1} can be invoked. + /// + internal static string FormatTemplatedExpander_PopulateValuesMustBeInvokedFirst(object p0, object p1) + { + return string.Format(CultureInfo.CurrentCulture, GetString("TemplatedExpander_PopulateValuesMustBeInvokedFirst"), p0, p1); + } + + /// + /// The result of value factory cannot be null. + /// + internal static string TemplatedExpander_ValueFactoryCannotReturnNull + { + get { return GetString("TemplatedExpander_ValueFactoryCannotReturnNull"); } + } + + /// + /// The result of value factory cannot be null. + /// + internal static string FormatTemplatedExpander_ValueFactoryCannotReturnNull() + { + return GetString("TemplatedExpander_ValueFactoryCannotReturnNull"); + } + + /// + /// Type: '{0}' - Name: '{1}' + /// + internal static string ViewComponent_AmbiguousTypeMatch_Item + { + get { return GetString("ViewComponent_AmbiguousTypeMatch_Item"); } + } + + /// + /// Type: '{0}' - Name: '{1}' + /// + internal static string FormatViewComponent_AmbiguousTypeMatch_Item(object p0, object p1) + { + return string.Format(CultureInfo.CurrentCulture, GetString("ViewComponent_AmbiguousTypeMatch_Item"), p0, p1); + } + + /// + /// The property {0}.{1} could not be found. + /// + internal static string Common_PropertyNotFound + { + get { return GetString("Common_PropertyNotFound"); } + } + + /// + /// The property {0}.{1} could not be found. + /// + internal static string FormatCommon_PropertyNotFound(object p0, object p1) + { + return string.Format(CultureInfo.CurrentCulture, GetString("Common_PropertyNotFound"), p0, p1); + } + + /// + /// The value '{0}' is invalid. + /// + internal static string Common_ValueNotValidForProperty + { + get { return GetString("Common_ValueNotValidForProperty"); } + } + + /// + /// The value '{0}' is invalid. + /// + internal static string FormatCommon_ValueNotValidForProperty(object p0) + { + return string.Format(CultureInfo.CurrentCulture, GetString("Common_ValueNotValidForProperty"), p0); + } + + /// + /// No URL for remote validation could be found. + /// + internal static string RemoteAttribute_NoUrlFound + { + get { return GetString("RemoteAttribute_NoUrlFound"); } + } + + /// + /// No URL for remote validation could be found. + /// + internal static string FormatRemoteAttribute_NoUrlFound() + { + return GetString("RemoteAttribute_NoUrlFound"); + } + + /// + /// '{0}' is invalid. + /// + internal static string RemoteAttribute_RemoteValidationFailed + { + get { return GetString("RemoteAttribute_RemoteValidationFailed"); } + } + + /// + /// '{0}' is invalid. + /// + internal static string FormatRemoteAttribute_RemoteValidationFailed(object p0) + { + return string.Format(CultureInfo.CurrentCulture, GetString("RemoteAttribute_RemoteValidationFailed"), p0); + } + + private static string GetString(string name, params string[] formatterNames) + { + var value = _resourceManager.GetString(name); + + System.Diagnostics.Debug.Assert(value != null); + + if (formatterNames != null) + { + for (var i = 0; i < formatterNames.Length; i++) + { + value = value.Replace("{" + formatterNames[i] + "}", "{" + i + "}"); + } + } + + return value; + } + } +} diff --git a/src/Microsoft.AspNet.Mvc.Extensions/RemoteAttribute.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/RemoteAttribute.cs similarity index 99% rename from src/Microsoft.AspNet.Mvc.Extensions/RemoteAttribute.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/RemoteAttribute.cs index 229cb3522f..0121205903 100644 --- a/src/Microsoft.AspNet.Mvc.Extensions/RemoteAttribute.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/RemoteAttribute.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Globalization; using System.Linq; -using Microsoft.AspNet.Mvc.Extensions; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.AspNet.Mvc.Internal; using Microsoft.AspNet.Mvc.ModelBinding.Validation; using Microsoft.AspNet.Routing; diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/DynamicViewData.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/DynamicViewData.cs similarity index 97% rename from src/Microsoft.AspNet.Mvc.Extensions/Rendering/DynamicViewData.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/DynamicViewData.cs index 5769a1d916..69a2114e37 100644 --- a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/DynamicViewData.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/DynamicViewData.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; using System.Dynamic; -using Microsoft.AspNet.Mvc.Extensions; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Mvc.Rendering diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/Expressions/CachedExpressionCompiler.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Expressions/CachedExpressionCompiler.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Rendering/Expressions/CachedExpressionCompiler.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Expressions/CachedExpressionCompiler.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/Expressions/ExpressionHelper.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Expressions/ExpressionHelper.cs similarity index 99% rename from src/Microsoft.AspNet.Mvc.Extensions/Rendering/Expressions/ExpressionHelper.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Expressions/ExpressionHelper.cs index 28f98cc4fe..c0f6e699be 100644 --- a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/Expressions/ExpressionHelper.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Expressions/ExpressionHelper.cs @@ -7,7 +7,7 @@ using System.Globalization; using System.Linq; using System.Linq.Expressions; using System.Reflection; -using Microsoft.AspNet.Mvc.Extensions; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Mvc.Rendering.Expressions diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/Expressions/ExpressionMetadataProvider.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Expressions/ExpressionMetadataProvider.cs similarity index 99% rename from src/Microsoft.AspNet.Mvc.Extensions/Rendering/Expressions/ExpressionMetadataProvider.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Expressions/ExpressionMetadataProvider.cs index ca70ed5cb9..7fb31d3e58 100644 --- a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/Expressions/ExpressionMetadataProvider.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Expressions/ExpressionMetadataProvider.cs @@ -5,8 +5,8 @@ using System; using System.Globalization; using System.Linq.Expressions; using System.Reflection; -using Microsoft.AspNet.Mvc.Extensions; using Microsoft.AspNet.Mvc.ModelBinding; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Mvc.Rendering.Expressions diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/Expressions/TryGetValueDelegate.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Expressions/TryGetValueDelegate.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Rendering/Expressions/TryGetValueDelegate.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Expressions/TryGetValueDelegate.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/Expressions/TryGetValueProvider.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Expressions/TryGetValueProvider.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Rendering/Expressions/TryGetValueProvider.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Expressions/TryGetValueProvider.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/Expressions/ViewDataEvaluator.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Expressions/ViewDataEvaluator.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Rendering/Expressions/ViewDataEvaluator.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Expressions/ViewDataEvaluator.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/Expressions/ViewDataInfo.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Expressions/ViewDataInfo.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Rendering/Expressions/ViewDataInfo.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Expressions/ViewDataInfo.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/FormMethod.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/FormMethod.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Rendering/FormMethod.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/FormMethod.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/Html/DefaultDisplayTemplates.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Html/DefaultDisplayTemplates.cs similarity index 99% rename from src/Microsoft.AspNet.Mvc.Extensions/Rendering/Html/DefaultDisplayTemplates.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Html/DefaultDisplayTemplates.cs index 799c547d4a..7c16f0f8b1 100644 --- a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/Html/DefaultDisplayTemplates.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Html/DefaultDisplayTemplates.cs @@ -7,11 +7,10 @@ using System.Collections.Generic; using System.Diagnostics; using System.Globalization; using System.Text; -using Microsoft.AspNet.Mvc.Extensions; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.Rendering.Internal; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.Framework.DependencyInjection; -using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Mvc.Rendering { diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/Html/DefaultEditorTemplates.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Html/DefaultEditorTemplates.cs similarity index 99% rename from src/Microsoft.AspNet.Mvc.Extensions/Rendering/Html/DefaultEditorTemplates.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Html/DefaultEditorTemplates.cs index 0056471392..b75db3a130 100644 --- a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/Html/DefaultEditorTemplates.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Html/DefaultEditorTemplates.cs @@ -7,9 +7,9 @@ using System.Collections.Generic; using System.Diagnostics; using System.Globalization; using System.Text; -using Microsoft.AspNet.Mvc.Extensions; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.Rendering.Internal; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.Internal; diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/Html/DefaultHtmlGenerator.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Html/DefaultHtmlGenerator.cs similarity index 99% rename from src/Microsoft.AspNet.Mvc.Extensions/Rendering/Html/DefaultHtmlGenerator.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Html/DefaultHtmlGenerator.cs index 9306902a24..ea816588e8 100644 --- a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/Html/DefaultHtmlGenerator.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Html/DefaultHtmlGenerator.cs @@ -10,10 +10,10 @@ using System.Linq; using System.Reflection; using System.Text; using Microsoft.AspNet.Antiforgery; -using Microsoft.AspNet.Mvc.Extensions; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.ModelBinding.Validation; using Microsoft.AspNet.Mvc.Rendering.Expressions; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.Framework.Internal; using Microsoft.Framework.OptionsModel; using Microsoft.Framework.WebEncoders; diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/Html/HtmlHelper.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Html/HtmlHelper.cs similarity index 99% rename from src/Microsoft.AspNet.Mvc.Extensions/Rendering/Html/HtmlHelper.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Html/HtmlHelper.cs index 00624c36e0..fa1381eb40 100644 --- a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/Html/HtmlHelper.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Html/HtmlHelper.cs @@ -7,11 +7,11 @@ using System.IO; using System.Linq; using System.Text; using System.Threading.Tasks; -using Microsoft.AspNet.Mvc.Extensions; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.ModelBinding.Validation; using Microsoft.AspNet.Mvc.Rendering.Expressions; using Microsoft.AspNet.Mvc.Rendering.Internal; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.Framework.Internal; using Microsoft.Framework.WebEncoders; diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/Html/HtmlHelperOfT.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Html/HtmlHelperOfT.cs similarity index 99% rename from src/Microsoft.AspNet.Mvc.Extensions/Rendering/Html/HtmlHelperOfT.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Html/HtmlHelperOfT.cs index 028e917b14..942135ab99 100644 --- a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/Html/HtmlHelperOfT.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Html/HtmlHelperOfT.cs @@ -4,9 +4,9 @@ using System; using System.Collections.Generic; using System.Linq.Expressions; -using Microsoft.AspNet.Mvc.Extensions; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.Rendering.Expressions; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.Framework.Internal; using Microsoft.Framework.WebEncoders; diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/Html/IHtmlGenerator.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Html/IHtmlGenerator.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Rendering/Html/IHtmlGenerator.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Html/IHtmlGenerator.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/Html/InputType.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Html/InputType.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Rendering/Html/InputType.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Html/InputType.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/Html/TagBuilder.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Html/TagBuilder.cs similarity index 99% rename from src/Microsoft.AspNet.Mvc.Extensions/Rendering/Html/TagBuilder.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Html/TagBuilder.cs index 718793d523..d81660c0e4 100644 --- a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/Html/TagBuilder.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Html/TagBuilder.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Globalization; using System.IO; using System.Text; -using Microsoft.AspNet.Mvc.Extensions; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.Framework.Internal; using Microsoft.Framework.WebEncoders; diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/Html/TagRenderMode.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Html/TagRenderMode.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Rendering/Html/TagRenderMode.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Html/TagRenderMode.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/Html/ValidationHelpers.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Html/ValidationHelpers.cs similarity index 98% rename from src/Microsoft.AspNet.Mvc.Extensions/Rendering/Html/ValidationHelpers.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Html/ValidationHelpers.cs index b2d5286abb..5e2cd58f85 100644 --- a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/Html/ValidationHelpers.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Html/ValidationHelpers.cs @@ -4,8 +4,8 @@ using System; using System.Collections.Generic; using System.Linq; -using Microsoft.AspNet.Mvc.Extensions; using Microsoft.AspNet.Mvc.ModelBinding; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Mvc.Rendering diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/Html5DateRenderingMode.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Html5DateRenderingMode.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Rendering/Html5DateRenderingMode.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Html5DateRenderingMode.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/HtmlAttributePropertyHelper.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlAttributePropertyHelper.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Rendering/HtmlAttributePropertyHelper.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlAttributePropertyHelper.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/HtmlHelperDisplayExtensions.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperDisplayExtensions.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Rendering/HtmlHelperDisplayExtensions.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperDisplayExtensions.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/HtmlHelperDisplayNameExtensions.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperDisplayNameExtensions.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Rendering/HtmlHelperDisplayNameExtensions.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperDisplayNameExtensions.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/HtmlHelperEditorExtensions.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperEditorExtensions.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Rendering/HtmlHelperEditorExtensions.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperEditorExtensions.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/HtmlHelperFormExtensions.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperFormExtensions.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Rendering/HtmlHelperFormExtensions.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperFormExtensions.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/HtmlHelperInputExtensions.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperInputExtensions.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Rendering/HtmlHelperInputExtensions.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperInputExtensions.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/HtmlHelperLabelExtensions.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperLabelExtensions.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Rendering/HtmlHelperLabelExtensions.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperLabelExtensions.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/HtmlHelperLinkExtensions.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperLinkExtensions.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Rendering/HtmlHelperLinkExtensions.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperLinkExtensions.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/HtmlHelperNameExtensions.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperNameExtensions.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Rendering/HtmlHelperNameExtensions.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperNameExtensions.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/HtmlHelperOptions.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperOptions.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Rendering/HtmlHelperOptions.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperOptions.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/HtmlHelperPartialExtensions.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperPartialExtensions.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Rendering/HtmlHelperPartialExtensions.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperPartialExtensions.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/HtmlHelperSelectExtensions.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperSelectExtensions.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Rendering/HtmlHelperSelectExtensions.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperSelectExtensions.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/HtmlHelperValidationExtensions.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperValidationExtensions.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Rendering/HtmlHelperValidationExtensions.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperValidationExtensions.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/HtmlHelperValueExtensions.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperValueExtensions.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Rendering/HtmlHelperValueExtensions.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperValueExtensions.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/HtmlString.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlString.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Rendering/HtmlString.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlString.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/ICanHasViewContext.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/ICanHasViewContext.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Rendering/ICanHasViewContext.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/ICanHasViewContext.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/IHtmlHelper.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/IHtmlHelper.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Rendering/IHtmlHelper.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/IHtmlHelper.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/IHtmlHelperOfT.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/IHtmlHelperOfT.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Rendering/IHtmlHelperOfT.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/IHtmlHelperOfT.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/IJsonHelper.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/IJsonHelper.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Rendering/IJsonHelper.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/IJsonHelper.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/Internal/TemplateBuilder.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Internal/TemplateBuilder.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Rendering/Internal/TemplateBuilder.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Internal/TemplateBuilder.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/Internal/TemplateRenderer.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Internal/TemplateRenderer.cs similarity index 99% rename from src/Microsoft.AspNet.Mvc.Extensions/Rendering/Internal/TemplateRenderer.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Internal/TemplateRenderer.cs index cc1b08876c..f6b60a87e8 100644 --- a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/Internal/TemplateRenderer.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Internal/TemplateRenderer.cs @@ -9,8 +9,8 @@ using System.IO; using System.Linq; using System.Reflection; using Microsoft.AspNet.Http; -using Microsoft.AspNet.Mvc.Extensions; using Microsoft.AspNet.Mvc.ModelBinding; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.Internal; diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/JsonHelper.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/JsonHelper.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Rendering/JsonHelper.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/JsonHelper.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/ModelExpression.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/ModelExpression.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Rendering/ModelExpression.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/ModelExpression.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/MultiSelectList.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/MultiSelectList.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Rendering/MultiSelectList.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/MultiSelectList.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/MvcForm.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/MvcForm.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Rendering/MvcForm.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/MvcForm.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/SelectList.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/SelectList.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Rendering/SelectList.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/SelectList.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/SelectListGroup.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/SelectListGroup.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Rendering/SelectListGroup.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/SelectListGroup.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/SelectListItem.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/SelectListItem.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Rendering/SelectListItem.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/SelectListItem.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/StringCollectionTextWriter.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/StringCollectionTextWriter.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Rendering/StringCollectionTextWriter.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/StringCollectionTextWriter.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/UnobtrusiveValidationAttributesGenerator.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/UnobtrusiveValidationAttributesGenerator.cs similarity index 98% rename from src/Microsoft.AspNet.Mvc.Extensions/Rendering/UnobtrusiveValidationAttributesGenerator.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/UnobtrusiveValidationAttributesGenerator.cs index 3666786a73..7580021fa2 100644 --- a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/UnobtrusiveValidationAttributesGenerator.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/UnobtrusiveValidationAttributesGenerator.cs @@ -4,8 +4,8 @@ using System; using System.Collections.Generic; using System.Linq; -using Microsoft.AspNet.Mvc.Extensions; using Microsoft.AspNet.Mvc.ModelBinding.Validation; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Mvc.Rendering diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/ViewEngine/CompositeViewEngine.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/ViewEngine/CompositeViewEngine.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Rendering/ViewEngine/CompositeViewEngine.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/ViewEngine/CompositeViewEngine.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/ViewEngine/ICompositeViewEngine.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/ViewEngine/ICompositeViewEngine.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Rendering/ViewEngine/ICompositeViewEngine.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/ViewEngine/ICompositeViewEngine.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/ViewEngine/IView.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/ViewEngine/IView.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Rendering/ViewEngine/IView.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/ViewEngine/IView.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/ViewEngine/IViewEngine.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/ViewEngine/IViewEngine.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Rendering/ViewEngine/IViewEngine.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/ViewEngine/IViewEngine.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/ViewEngine/ViewEngineResult.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/ViewEngine/ViewEngineResult.cs similarity index 97% rename from src/Microsoft.AspNet.Mvc.Extensions/Rendering/ViewEngine/ViewEngineResult.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/ViewEngine/ViewEngineResult.cs index eead6366e7..796a8d314e 100644 --- a/src/Microsoft.AspNet.Mvc.Extensions/Rendering/ViewEngine/ViewEngineResult.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/ViewEngine/ViewEngineResult.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; -using Microsoft.AspNet.Mvc.Extensions; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Mvc.Rendering diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Resources.resx b/src/Microsoft.AspNet.Mvc.ViewFeatures/Resources.resx similarity index 50% rename from src/Microsoft.AspNet.Mvc.Extensions/Resources.resx rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Resources.resx index 796f9aba62..0c6b0b1f67 100644 --- a/src/Microsoft.AspNet.Mvc.Extensions/Resources.resx +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/Resources.resx @@ -117,24 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - The argument '{0}' is invalid. Media types which match all types or match all subtypes are not supported. - - - The content-type '{0}' added in the '{1}' property is invalid. Media types which match all types or match all subtypes are not supported. - - - The method '{0}' on type '{1}' returned an instance of '{2}'. Make sure to call Unwrap on the returned value to avoid unobserved faulted Task. - - - The method '{0}' on type '{1}' returned a Task instance even though it is not an asynchronous method. - - - A claim of type '{0}' was not present on the provided ClaimsIdentity. - - - The class ReflectedActionFilterEndPoint only supports ReflectedActionDescriptors. - The view component name '{0}' matched multiple types:{1}{2} {1} is the newline character @@ -163,15 +145,6 @@ View components only support returning {0}, {1} or {2}. - - Replacing the action context is not supported. - - - An action invoker could not be created for action '{0}'. - - - The action descriptor must be of type '{0}'. - Value cannot be null or empty. @@ -181,18 +154,12 @@ The '{0}' method of type '{1}' cannot return a null value. - - The supplied route values are ambiguous and can select multiple sets of actions. - Property '{0}' is of type '{1}', but this method requires a value of type '{2}'. The partial view '{0}' was not found or no view engine supports the searched locations. The following locations were searched:{1} - - The value '{0}' is invalid. - False @@ -208,9 +175,6 @@ The expression compiler was unable to evaluate the indexer expression '{0}' because it references the model parameter '{1}' which is unavailable. - - The passed expression of expression node type '{0}' is invalid. Only simple member access expressions for model properties are supported. - The IModelMetadataProvider was unable to provide metadata for expression '{0}'. @@ -244,33 +208,15 @@ The model item passed into the ViewDataDictionary is of type '{0}', but this ViewDataDictionary instance requires a model item of type '{1}'. - - No route matches the supplied values. - - - If an {0} provides a result value by setting the {1} property of {2} to a non-null value, then it cannot call the next filter by invoking {3}. - - - If an {0} cancels execution by setting the {1} property of {2} to 'true', then it cannot call the next filter by invoking {3}. - The partial view '{0}' was not found. The following locations were searched:{1} The view '{0}' was not found. The following locations were searched:{1}. - - Unable to locate an implementation of IAuthorizationService. - - - OnAuthorization is not implemented by this filter, use OnAuthorizationAsync instead. - The value must be greater than or equal to zero. - - The type provided to '{0}' must implement '{1}'. - Validation parameter names in unobtrusive client validation rules cannot be empty. Client rule type: {0} @@ -286,75 +232,9 @@ Validation type names in unobtrusive client validation rules must be unique. The following validation type was seen more than once: {0} - - Cannot return null from an action method with a return type of '{0}'. - The type '{0}' must derive from '{1}'. - - No encoding found for output formatter '{0}'. There must be at least one supported encoding registered in order for the output formatter to write content. - - - No encoding found for input formatter '{0}'. There must be at least one supported encoding registered in order for the formatter to read content. - - - Unsupported content type '{0}'. - - - No supported media type registered for output formatter '{0}'. There must be at least one supported media type registered in order for the output formatter to write content. - - - The following errors occurred with attribute routing information:{0}{0}{1} - {0} is the newline. {1} is the formatted list of errors using AttributeRoute_IndividualErrorMessage - - - The attribute route '{0}' cannot contain a parameter named '{{{1}}}'. Use '[{1}]' in the route template to insert the value '{2}'. - - - For action: '{0}'{1}Error: {2} - {1} is the newline. - - - An empty replacement token ('[]') is not allowed. - - - Token delimiters ('[', ']') are imbalanced. - - - The route template '{0}' has invalid syntax. {1} - {1} is the specific error message. - - - While processing template '{0}', a replacement value for the token '{1}' could not be found. Available tokens: '{2}'. - - - A replacement token is not closed. - - - An unescaped '[' token is not allowed inside of a replacement token. Use '[[' to escape. - - - The value must be either '{0}' or '{1}'. - - - Unable to find the required services. Please add all the required services by calling '{0}' inside the call to '{1}' or '{2}' in the application startup code. - - - Two or more routes named '{0}' have different templates. - - - Action: '{0}' - Template: '{1}' - Formats an action descriptor display name and it's associated template. - - - Attribute routes with the same name '{0}' must have the same template:{1}{2} - {0} is the name of the attribute route, {1} is the newline, {2} is the list of errors formatted using ActionDescriptor_WithNamedAttributeRouteAndDifferentTemplate - - - Error {0}:{1}{2} - {0} is the error number, {1} is Environment.NewLine {2} is the error message - Could not find a replacement for view expansion token '{0}'. @@ -364,47 +244,14 @@ The result of value factory cannot be null. - - A method '{0}' must not define attribute routed actions and non attribute routed actions at the same time:{1}{2}{1}{1}Use 'AcceptVerbsAttribute' to create a single route that allows multiple HTTP verbs and defines a route, or set a route template in all attributes that constrain HTTP verbs. - {0} is the MethodInfo.FullName, {1} is Environment.NewLine, {2} is the formatted list of actions defined by that method info. - - - Action: '{0}' - Route Template: '{1}' - HTTP Verbs: '{2}' - - - (none) - - - Multiple actions matched. The following actions matched route data and had all constraints satisfied:{0}{0}{1} - 0 is the newline - 1 is a newline separate list of action display names - - - Could not find file: {0} - {0} is the value for the provided path - Type: '{0}' - Name: '{1}' - - The input was not valid. + + The property {0}.{1} could not be found. - - If an {0} provides a result value by setting the {1} property of {2} to a non-null value, then it cannot call the next filter by invoking {3}. - - - If the '{0}' property is not set to true, '{1}' property must be specified. - - - The action '{0}' has ApiExplorer enabled, but is using conventional routing. Only actions which use attribute routing support ApiExplorer. - - - The media type "{0}" is not valid. MediaTypes containing wildcards (*) are not allowed in formatter mappings. - - - The format provided is invalid '{0}'. A format must be a non-empty file-extension, optionally prefixed with a '.' character. - - - The property '{0}' on controller '{1}' cannot be activated. + + The value '{0}' is invalid. No URL for remote validation could be found. @@ -412,58 +259,4 @@ '{0}' is invalid. - - The '{0}' cache profile is not defined. - - - The model's runtime type '{0}' is not assignable to the type '{1}'. - - - The '{0}' cannot serialize an object of type '{1}' to session state. - - - Cannot deserialize {0} of type '{1}'. - - - The '{0}' cannot serialize a dictionary with a key of type '{1}' to session state. - - - The type '{0}' cannot be activated by '{1}' because it is either a value type, an interface, an abstract class or an open generic type. - - - The type '{0}' must implement '{1}' to be used as a model binder. - - - The provided binding source '{0}' is a composite. '{1}' requires that the source must represent a single type of input. - - - The provided binding source '{0}' is a greedy data source. '{1}' does not support greedy data sources. - - - The provided binding source '{0}' is not a request-based binding source. '{1}' requires that the source must represent data from an HTTP request. - - - The provided binding source '{0}' is not a greedy data source. '{1}' only supports greedy data sources. - - - The property {0}.{1} could not be found. - - - A value is required. - - - The '{0}' property is required. - - - A value is required. - - - More than one parameter and/or property is bound to the HTTP request's content. - - - The type '{0}' does not implement the interface '{1}'. - - - The model object inside the metadata claimed to be compatible with '{0}', but was actually '{1}'. - \ No newline at end of file diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Filters/SkipStatusCodePagesAttribute.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/SkipStatusCodePagesAttribute.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Filters/SkipStatusCodePagesAttribute.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/SkipStatusCodePagesAttribute.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/TemplateInfo.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/TemplateInfo.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/TemplateInfo.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/TemplateInfo.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Filters/ValidateAntiForgeryTokenAttribute.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ValidateAntiForgeryTokenAttribute.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Filters/ValidateAntiForgeryTokenAttribute.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ValidateAntiForgeryTokenAttribute.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/Filters/ValidateAntiforgeryTokenAuthorizationFilter.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ValidateAntiforgeryTokenAuthorizationFilter.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/Filters/ValidateAntiforgeryTokenAuthorizationFilter.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ValidateAntiforgeryTokenAuthorizationFilter.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ViewComponents/ContentViewComponentResult.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/ContentViewComponentResult.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/ViewComponents/ContentViewComponentResult.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/ContentViewComponentResult.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ViewComponents/DefaultViewComponentActivator.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentActivator.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/ViewComponents/DefaultViewComponentActivator.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentActivator.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ViewComponents/DefaultViewComponentDescriptorCollectionProvider.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentDescriptorCollectionProvider.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/ViewComponents/DefaultViewComponentDescriptorCollectionProvider.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentDescriptorCollectionProvider.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ViewComponents/DefaultViewComponentDescriptorProvider.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentDescriptorProvider.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/ViewComponents/DefaultViewComponentDescriptorProvider.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentDescriptorProvider.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ViewComponents/DefaultViewComponentHelper.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentHelper.cs similarity index 98% rename from src/Microsoft.AspNet.Mvc.Extensions/ViewComponents/DefaultViewComponentHelper.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentHelper.cs index 79986ecbac..8837d53f88 100644 --- a/src/Microsoft.AspNet.Mvc.Extensions/ViewComponents/DefaultViewComponentHelper.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentHelper.cs @@ -3,10 +3,9 @@ using System; using System.IO; -using System.Reflection; using System.Threading.Tasks; -using Microsoft.AspNet.Mvc.Extensions; using Microsoft.AspNet.Mvc.Rendering; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Mvc.ViewComponents diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ViewComponents/DefaultViewComponentInvoker.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentInvoker.cs similarity index 99% rename from src/Microsoft.AspNet.Mvc.Extensions/ViewComponents/DefaultViewComponentInvoker.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentInvoker.cs index afb1a59fd1..8fd61362fb 100644 --- a/src/Microsoft.AspNet.Mvc.Extensions/ViewComponents/DefaultViewComponentInvoker.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentInvoker.cs @@ -5,8 +5,8 @@ using System; using System.Reflection; using System.Runtime.ExceptionServices; using System.Threading.Tasks; -using Microsoft.AspNet.Mvc.Extensions; using Microsoft.AspNet.Mvc.Rendering; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Mvc.ViewComponents diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ViewComponents/DefaultViewComponentInvokerFactory.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentInvokerFactory.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/ViewComponents/DefaultViewComponentInvokerFactory.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentInvokerFactory.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ViewComponents/DefaultViewComponentSelector.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentSelector.cs similarity index 98% rename from src/Microsoft.AspNet.Mvc.Extensions/ViewComponents/DefaultViewComponentSelector.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentSelector.cs index a59109146f..994ae493ce 100644 --- a/src/Microsoft.AspNet.Mvc.Extensions/ViewComponents/DefaultViewComponentSelector.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentSelector.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; using System.Linq; -using Microsoft.AspNet.Mvc.Extensions; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Mvc.ViewComponents diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ViewComponents/IViewComponentActivator.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/IViewComponentActivator.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/ViewComponents/IViewComponentActivator.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/IViewComponentActivator.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ViewComponents/IViewComponentDescriptorCollectionProvider.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/IViewComponentDescriptorCollectionProvider.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/ViewComponents/IViewComponentDescriptorCollectionProvider.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/IViewComponentDescriptorCollectionProvider.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ViewComponents/IViewComponentDescriptorProvider.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/IViewComponentDescriptorProvider.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/ViewComponents/IViewComponentDescriptorProvider.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/IViewComponentDescriptorProvider.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ViewComponents/IViewComponentHelper.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/IViewComponentHelper.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/ViewComponents/IViewComponentHelper.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/IViewComponentHelper.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ViewComponents/IViewComponentInvoker.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/IViewComponentInvoker.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/ViewComponents/IViewComponentInvoker.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/IViewComponentInvoker.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ViewComponents/IViewComponentInvokerFactory.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/IViewComponentInvokerFactory.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/ViewComponents/IViewComponentInvokerFactory.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/IViewComponentInvokerFactory.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ViewComponents/IViewComponentResult.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/IViewComponentResult.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/ViewComponents/IViewComponentResult.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/IViewComponentResult.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ViewComponents/IViewComponentSelector.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/IViewComponentSelector.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/ViewComponents/IViewComponentSelector.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/IViewComponentSelector.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ViewComponents/JsonViewComponentResult.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/JsonViewComponentResult.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/ViewComponents/JsonViewComponentResult.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/JsonViewComponentResult.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ViewComponents/ViewComponent.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/ViewComponent.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/ViewComponents/ViewComponent.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/ViewComponent.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ViewComponents/ViewComponentAttribute.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/ViewComponentAttribute.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/ViewComponents/ViewComponentAttribute.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/ViewComponentAttribute.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ViewComponents/ViewComponentContext.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/ViewComponentContext.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/ViewComponents/ViewComponentContext.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/ViewComponentContext.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ViewComponents/ViewComponentContextAttribute.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/ViewComponentContextAttribute.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/ViewComponents/ViewComponentContextAttribute.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/ViewComponentContextAttribute.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ViewComponents/ViewComponentConventions.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/ViewComponentConventions.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/ViewComponents/ViewComponentConventions.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/ViewComponentConventions.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ViewComponents/ViewComponentDescriptor.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/ViewComponentDescriptor.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/ViewComponents/ViewComponentDescriptor.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/ViewComponentDescriptor.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ViewComponents/ViewComponentDescriptorCollection.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/ViewComponentDescriptorCollection.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/ViewComponents/ViewComponentDescriptorCollection.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/ViewComponentDescriptorCollection.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ViewComponents/ViewComponentHelperExtensions.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/ViewComponentHelperExtensions.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/ViewComponents/ViewComponentHelperExtensions.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/ViewComponentHelperExtensions.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ViewComponents/ViewComponentMethodSelector.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/ViewComponentMethodSelector.cs similarity index 98% rename from src/Microsoft.AspNet.Mvc.Extensions/ViewComponents/ViewComponentMethodSelector.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/ViewComponentMethodSelector.cs index 64acd8d0ac..8f6498844a 100644 --- a/src/Microsoft.AspNet.Mvc.Extensions/ViewComponents/ViewComponentMethodSelector.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/ViewComponentMethodSelector.cs @@ -5,7 +5,7 @@ using System; using System.Linq.Expressions; using System.Reflection; using System.Threading.Tasks; -using Microsoft.AspNet.Mvc.Extensions; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Mvc.ViewComponents diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ViewComponents/ViewViewComponentResult.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/ViewViewComponentResult.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/ViewComponents/ViewViewComponentResult.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/ViewViewComponentResult.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ViewContext.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewContext.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/ViewContext.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewContext.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ViewContextAttribute.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewContextAttribute.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/ViewContextAttribute.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewContextAttribute.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ViewDataDictionary.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewDataDictionary.cs similarity index 99% rename from src/Microsoft.AspNet.Mvc.Extensions/ViewDataDictionary.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewDataDictionary.cs index 7a2158a4b3..c746d56b61 100644 --- a/src/Microsoft.AspNet.Mvc.Extensions/ViewDataDictionary.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewDataDictionary.cs @@ -6,9 +6,9 @@ using System.Collections; using System.Collections.Generic; using System.Globalization; using System.Reflection; -using Microsoft.AspNet.Mvc.Extensions; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.Rendering.Expressions; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Mvc diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ViewDataDictionaryAttribute.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewDataDictionaryAttribute.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/ViewDataDictionaryAttribute.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewDataDictionaryAttribute.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ViewDataDictionaryControllerPropertyActivator.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewDataDictionaryControllerPropertyActivator.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/ViewDataDictionaryControllerPropertyActivator.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewDataDictionaryControllerPropertyActivator.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ViewDataDictionaryOfT.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewDataDictionaryOfT.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/ViewDataDictionaryOfT.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewDataDictionaryOfT.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ViewEngineDescriptor.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewEngineDescriptor.cs similarity index 97% rename from src/Microsoft.AspNet.Mvc.Extensions/ViewEngineDescriptor.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewEngineDescriptor.cs index 6a898ca9c5..5d78e60164 100644 --- a/src/Microsoft.AspNet.Mvc.Extensions/ViewEngineDescriptor.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewEngineDescriptor.cs @@ -3,8 +3,8 @@ using System; using System.Reflection; -using Microsoft.AspNet.Mvc.Extensions; using Microsoft.AspNet.Mvc.Rendering; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Mvc diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ViewEngineDescriptorExtensions.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewEngineDescriptorExtensions.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/ViewEngineDescriptorExtensions.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewEngineDescriptorExtensions.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ViewExecutor.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewExecutor.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/ViewExecutor.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewExecutor.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/ViewResult.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewResult.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Extensions/ViewResult.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewResult.cs diff --git a/src/Microsoft.AspNet.Mvc.Extensions/project.json b/src/Microsoft.AspNet.Mvc.ViewFeatures/project.json similarity index 63% rename from src/Microsoft.AspNet.Mvc.Extensions/project.json rename to src/Microsoft.AspNet.Mvc.ViewFeatures/project.json index c88c9b5cad..8e65e238c7 100644 --- a/src/Microsoft.AspNet.Mvc.Extensions/project.json +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/project.json @@ -1,5 +1,5 @@ { - "description": "Extensions to the core MVC runtime", + "description": "View Rendering features for the MVC runtime", "version": "6.0.0-*", "repository": { "type": "git", @@ -10,35 +10,26 @@ }, "dependencies": { "Microsoft.AspNet.Antiforgery": "1.0.0-*", - "Microsoft.AspNet.Authentication": "1.0.0-*", - "Microsoft.AspNet.Authorization": "1.0.0-*", - "Microsoft.AspNet.Cors.Core": "1.0.0-*", - "Microsoft.AspNet.DataProtection": "1.0.0-*", "Microsoft.AspNet.Diagnostics.Abstractions": "1.0.0-*", - "Microsoft.AspNet.FileProviders.Abstractions": "1.0.0-*", - "Microsoft.AspNet.JsonPatch": "1.0.0-*", "Microsoft.AspNet.Mvc.Core": "6.0.0-*", + "Microsoft.AspNet.Mvc.Formatters.Json": "6.0.0-*", "Microsoft.Framework.BufferEntryCollection.Sources": { "version": "1.0.0-*", "type": "build" }, "Microsoft.Framework.ClosedGenericMatcher.Sources": { "version": "1.0.0-*", "type": "build" }, "Microsoft.Framework.CopyOnWriteDictionary.Sources": { "version": "1.0.0-*", "type": "build" }, "Microsoft.Framework.NotNullAttribute.Sources": { "version": "1.0.0-*", "type": "build" }, "Microsoft.Framework.PropertyActivator.Sources": { "version": "1.0.0-*", "type": "build" }, - "Microsoft.Framework.PropertyHelper.Sources": { "version": "1.0.0-*", "type": "build" }, - "Newtonsoft.Json": "6.0.6" + "Microsoft.Framework.PropertyHelper.Sources": { "version": "1.0.0-*", "type": "build" } }, "frameworks": { "dnx451": { "frameworkAssemblies": { - "System.ComponentModel.DataAnnotations": "", - "System.Runtime.Serialization": "" + "System.ComponentModel.DataAnnotations": "" } }, "dnxcore50": { "dependencies": { - "System.ComponentModel.Annotations": "4.0.10-beta-*", - "System.Runtime.Serialization.Primitives": "4.0.10-beta-*", - "Microsoft.CSharp": "4.0.0-beta-*" + "System.ComponentModel.Annotations": "4.0.10-beta-*" } } } diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/project.json b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/project.json index 0405490bef..bda07e3a40 100644 --- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/project.json +++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/project.json @@ -9,7 +9,8 @@ "warningsAsErrors": false }, "dependencies": { - "Microsoft.AspNet.Mvc.Extensions": "6.0.0-*", + "Microsoft.AspNet.Mvc.Core": "6.0.0-*", + "Microsoft.AspNet.Mvc.Formatters.Json": "6.0.0-*", "Microsoft.AspNet.WebApi.Client": "5.2.2", "Microsoft.Framework.PropertyHelper.Sources": { "version": "1.0.0-*", "type": "build" }, "Microsoft.Framework.NotNullAttribute.Sources": { "version": "1.0.0-*", "type": "build" } diff --git a/src/Microsoft.AspNet.Mvc/MvcOptionsSetup.cs b/src/Microsoft.AspNet.Mvc/MvcOptionsSetup.cs index 67fb93912c..8730f2af33 100644 --- a/src/Microsoft.AspNet.Mvc/MvcOptionsSetup.cs +++ b/src/Microsoft.AspNet.Mvc/MvcOptionsSetup.cs @@ -23,13 +23,10 @@ namespace Microsoft.AspNet.Mvc public static void ConfigureMvc(MvcOptions options) { options.ModelMetadataDetailsProviders.Add(new DataAnnotationsMetadataProvider()); - options.ModelMetadataDetailsProviders.Add(new DataMemberRequiredBindingMetadataProvider()); - options.ModelValidatorProviders.Add(new DataAnnotationsModelValidatorProvider()); - options.ValidationExcludeFilters.Add(typeof(XObject)); options.ValidationExcludeFilters.Add(typeof(JToken)); - options.ValidationExcludeFilters.Add(typeFullName: "System.Xml.XmlNode"); + } } } \ No newline at end of file diff --git a/src/Microsoft.AspNet.Mvc/project.json b/src/Microsoft.AspNet.Mvc/project.json index f9159d39f0..a90afbe8d3 100644 --- a/src/Microsoft.AspNet.Mvc/project.json +++ b/src/Microsoft.AspNet.Mvc/project.json @@ -9,11 +9,12 @@ "warningsAsErrors": true }, "dependencies": { - "Microsoft.AspNet.Authorization": "1.0.0-*", - "Microsoft.AspNet.Cors.Core": "1.0.0-*", "Microsoft.AspNet.Mvc.ApiExplorer": "6.0.0-*", - "Microsoft.AspNet.Mvc.Extensions": "6.0.0-*", + "Microsoft.AspNet.Mvc.Cors": "6.0.0-*", + "Microsoft.AspNet.Mvc.DataAnnotations": "6.0.0-*", + "Microsoft.AspNet.Mvc.Formatters.Json": "6.0.0-*", "Microsoft.AspNet.Mvc.Razor": "6.0.0-*", + "Microsoft.AspNet.Mvc.ViewFeatures": "6.0.0-*", "Microsoft.Framework.Caching.Memory": "1.0.0-*", "Microsoft.Framework.DependencyInjection": "1.0.0-*", "Microsoft.Framework.PropertyHelper.Sources": { "version": "1.0.0-*", "type": "build" }, diff --git a/test/Microsoft.AspNet.Mvc.ApiExplorer.Test/project.json b/test/Microsoft.AspNet.Mvc.ApiExplorer.Test/project.json index f881939122..4bbf7d2763 100644 --- a/test/Microsoft.AspNet.Mvc.ApiExplorer.Test/project.json +++ b/test/Microsoft.AspNet.Mvc.ApiExplorer.Test/project.json @@ -5,7 +5,7 @@ "dependencies": { "Microsoft.AspNet.Mvc" : "6.0.0-*", "Microsoft.AspNet.Mvc.TestCommon": { "version": "6.0.0-*", "type": "build" }, - "Microsoft.AspNet.Mvc.Xml": "6.0.0-*", + "Microsoft.AspNet.Mvc.Formatters.Xml": "6.0.0-*", "Microsoft.AspNet.Testing": "1.0.0-*", "Microsoft.Framework.Logging.Testing": "1.0.0-*", "Moq": "4.2.1312.1622", diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ActionFilterAttributeTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ActionFilterAttributeTests.cs new file mode 100644 index 0000000000..de6e8f1c37 --- /dev/null +++ b/test/Microsoft.AspNet.Mvc.Core.Test/ActionFilterAttributeTests.cs @@ -0,0 +1,44 @@ +// 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. + +#if DNX451 +using System.Threading.Tasks; +using Moq; +using Xunit; + +namespace Microsoft.AspNet.Mvc.Test +{ + public class ActionFilterAttributeTests + { + [Fact] + public async Task ActionFilterAttribute_ActionFilter_SettingResult_ShortCircuits() + { + await CommonFilterTest.ActionFilter_SettingResult_ShortCircuits(new Mock()); + } + + [Fact] + public async Task ActionAttributeFilter_ActionFilter_Calls_OnActionExecuted() + { + await CommonFilterTest.ActionFilter_Calls_OnActionExecuted(new Mock()); + } + + [Fact] + public async Task ActionAttributeFilter_ResultFilter_Calls_OnResultExecuted() + { + await CommonFilterTest.ResultFilter_Calls_OnResultExecuted(new Mock()); + } + + [Fact] + public async Task ActionFilterAttribute_ResultFilter_SettingResult_DoesNotShortCircuit() + { + await CommonFilterTest.ResultFilter_SettingResult_DoesNotShortCircuit(new Mock()); + } + + [Fact] + public async Task ActionFilterAttribute_ResultFilter_SettingCancel_ShortCircuits() + { + await CommonFilterTest.ResultFilter_SettingCancel_ShortCircuits(new Mock()); + } + } +} +#endif diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/Authorization/AuthorizationApplicationModelProviderTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Authorization/AuthorizationApplicationModelProviderTest.cs similarity index 88% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/Authorization/AuthorizationApplicationModelProviderTest.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/Authorization/AuthorizationApplicationModelProviderTest.cs index 1b457f9d91..025948104c 100644 --- a/test/Microsoft.AspNet.Mvc.Extensions.Test/Authorization/AuthorizationApplicationModelProviderTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Authorization/AuthorizationApplicationModelProviderTest.cs @@ -1,17 +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; -using System.Collections.Generic; using System.Linq; using System.Reflection; -using System.Threading.Tasks; using Microsoft.AspNet.Authorization; -using Microsoft.AspNet.Cors.Core; -using Microsoft.AspNet.Mvc.Filters; -using Microsoft.AspNet.Mvc.ModelBinding; -using Microsoft.Framework.Internal; -using Microsoft.Framework.OptionsModel; using Xunit; namespace Microsoft.AspNet.Mvc.ApplicationModels @@ -22,7 +14,7 @@ namespace Microsoft.AspNet.Mvc.ApplicationModels public void CreateControllerModel_AuthorizeAttributeAddsAuthorizeFilter() { // Arrange - var provider = new AuthorizationApplicationModelProvider(new MockAuthorizationOptionsAccessor()); + var provider = new AuthorizationApplicationModelProvider(new TestOptionsManager()); var defaultProvider = new DefaultApplicationModelProvider(new MockMvcOptionsAccessor()); var context = new ApplicationModelProviderContext(new[] { typeof(AccountController).GetTypeInfo() }); @@ -40,7 +32,7 @@ namespace Microsoft.AspNet.Mvc.ApplicationModels public void BuildActionModels_BaseAuthorizeFiltersAreStillValidWhenOverriden() { // Arrange - var options = new MockAuthorizationOptionsAccessor(); + var options = new TestOptionsManager(); options.Options.AddPolicy("Base", policy => policy.RequireClaim("Basic").RequireClaim("Basic2")); options.Options.AddPolicy("Derived", policy => policy.RequireClaim("Derived")); diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/Authorization/AuthorizeFilterTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Authorization/AuthorizeFilterTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/Authorization/AuthorizeFilterTest.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/Authorization/AuthorizeFilterTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/BadRequestObjectResultTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/BadRequestObjectResultTests.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/BadRequestObjectResultTests.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/BadRequestObjectResultTests.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/BadRequestResultTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/BadRequestResultTests.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/BadRequestResultTests.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/BadRequestResultTests.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/ChallengeResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ChallengeResultTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/ChallengeResultTest.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/ChallengeResultTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/ConsumesAttributeTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ConsumesAttributeTests.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/ConsumesAttributeTests.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/ConsumesAttributeTests.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/ContentResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ContentResultTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/ContentResultTest.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/ContentResultTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/CreatedAtActionResultTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/CreatedAtActionResultTests.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/CreatedAtActionResultTests.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/CreatedAtActionResultTests.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/CreatedAtRouteResultTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/CreatedAtRouteResultTests.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/CreatedAtRouteResultTests.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/CreatedAtRouteResultTests.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/CreatedResultTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/CreatedResultTests.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/CreatedResultTests.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/CreatedResultTests.cs diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/DefaultAssemblyProviderTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/DefaultAssemblyProviderTests.cs index 4fd131dc44..96b968732a 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/DefaultAssemblyProviderTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/DefaultAssemblyProviderTests.cs @@ -233,7 +233,6 @@ namespace Microsoft.AspNet.Mvc.Core var exceptionalAssebmlies = new string[] { "Microsoft.AspNet.Mvc.WebApiCompatShim", - "Microsoft.AspNet.Mvc.Common" }; var mvcAssemblies = assemblies @@ -244,7 +243,7 @@ namespace Microsoft.AspNet.Mvc.Core // The following assemblies are not reachable from Microsoft.AspNet.Mvc mvcAssemblies.Add("Microsoft.AspNet.Mvc.TagHelpers"); - mvcAssemblies.Add("Microsoft.AspNet.Mvc.Xml"); + mvcAssemblies.Add("Microsoft.AspNet.Mvc.Formatters.Xml"); mvcAssemblies.Add("Microsoft.AspNet.PageExecutionInstrumentation.Interfaces"); return mvcAssemblies; diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/EmptyResultTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/EmptyResultTests.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/EmptyResultTests.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/EmptyResultTests.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/FilePathResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/FilePathResultTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/FilePathResultTest.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/FilePathResultTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/FileResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/FileResultTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/FileResultTest.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/FileResultTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/FileStreamResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/FileStreamResultTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/FileStreamResultTest.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/FileStreamResultTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/FormatFilterTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/FormatFilterTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/FormatFilterTest.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/FormatFilterTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/FormatterMappingsTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/FormatterMappingsTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/FormatterMappingsTest.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/FormatterMappingsTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/HttpNotFoundObjectResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/HttpNotFoundObjectResultTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/HttpNotFoundObjectResultTest.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/HttpNotFoundObjectResultTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/HttpNotFoundResultTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/HttpNotFoundResultTests.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/HttpNotFoundResultTests.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/HttpNotFoundResultTests.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/HttpStatusCodeResultTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/HttpStatusCodeResultTests.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/HttpStatusCodeResultTests.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/HttpStatusCodeResultTests.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/HttpUnauthorizedResultTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/HttpUnauthorizedResultTests.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/HttpUnauthorizedResultTests.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/HttpUnauthorizedResultTests.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/MvcCacheOptionsTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/MvcCacheOptionsTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/MvcCacheOptionsTest.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/MvcCacheOptionsTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ObjectResultTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ObjectResultTests.cs index e5ded90190..f02745375e 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ObjectResultTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/ObjectResultTests.cs @@ -9,7 +9,7 @@ using System.Text; using System.Threading.Tasks; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.Xml; +using Microsoft.AspNet.Mvc.Formatters.Xml; using Microsoft.AspNet.Routing; using Microsoft.AspNet.Testing.xunit; using Microsoft.AspNet.WebUtilities; diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/ProducesAttributeTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ProducesAttributeTests.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/ProducesAttributeTests.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/ProducesAttributeTests.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/RedirectResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/RedirectResultTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/RedirectResultTest.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/RedirectResultTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/RedirectToActionResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/RedirectToActionResultTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/RedirectToActionResultTest.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/RedirectToActionResultTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/RedirectToRouteResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/RedirectToRouteResultTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/RedirectToRouteResultTest.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/RedirectToRouteResultTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/RequireHttpsAttributeTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/RequireHttpsAttributeTests.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/RequireHttpsAttributeTests.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/RequireHttpsAttributeTests.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/ResponseCacheAttributeTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ResponseCacheAttributeTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/ResponseCacheAttributeTest.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/ResponseCacheAttributeTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/ResponseCacheFilterTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ResponseCacheFilterTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/ResponseCacheFilterTest.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/ResponseCacheFilterTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/ResultFilterAttributeTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ResultFilterAttributeTest.cs similarity index 79% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/ResultFilterAttributeTest.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/ResultFilterAttributeTest.cs index 79df4aaeec..3a773c0cc4 100644 --- a/test/Microsoft.AspNet.Mvc.Extensions.Test/ResultFilterAttributeTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/ResultFilterAttributeTest.cs @@ -15,21 +15,21 @@ namespace Microsoft.AspNet.Mvc.Test [Fact] public async Task ResultFilterAttribute_ResultFilter_Calls_OnResultExecuted() { - await ActionFilterAttributeTests.ResultFilter_Calls_OnResultExecuted( + await CommonFilterTest.ResultFilter_Calls_OnResultExecuted( new Mock()); } [Fact] public async Task ResultFilterAttribute_ResultFilter_SettingResult_DoesNotShortCircuit() { - await ActionFilterAttributeTests.ResultFilter_SettingResult_DoesNotShortCircuit( + await CommonFilterTest.ResultFilter_SettingResult_DoesNotShortCircuit( new Mock()); } [Fact] public async Task ResultFilterAttribute_ResultFilter_SettingCancel_ShortCircuits() { - await ActionFilterAttributeTests.ResultFilter_SettingCancel_ShortCircuits( + await CommonFilterTest.ResultFilter_SettingCancel_ShortCircuits( new Mock()); } } diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/SerializableErrorTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/SerializableErrorTests.cs similarity index 95% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/SerializableErrorTests.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/SerializableErrorTests.cs index b922f81450..04011aa9dc 100644 --- a/test/Microsoft.AspNet.Mvc.Extensions.Test/SerializableErrorTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/SerializableErrorTests.cs @@ -2,12 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Globalization; -using System.IO; -using System.Runtime.Serialization; -using System.Text; -using System.Xml; using Microsoft.AspNet.Mvc.ModelBinding; -using Microsoft.AspNet.Mvc.Xml; using Xunit; namespace Microsoft.AspNet.Mvc diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/ServiceBasedControllerActivatorTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ServiceBasedControllerActivatorTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/ServiceBasedControllerActivatorTest.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/ServiceBasedControllerActivatorTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/TestFiles/FilePathResultTestFile.txt b/test/Microsoft.AspNet.Mvc.Core.Test/TestFiles/FilePathResultTestFile.txt similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/TestFiles/FilePathResultTestFile.txt rename to test/Microsoft.AspNet.Mvc.Core.Test/TestFiles/FilePathResultTestFile.txt diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/TestFiles/FilePathResultTestFile_ASCII.txt b/test/Microsoft.AspNet.Mvc.Core.Test/TestFiles/FilePathResultTestFile_ASCII.txt similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/TestFiles/FilePathResultTestFile_ASCII.txt rename to test/Microsoft.AspNet.Mvc.Core.Test/TestFiles/FilePathResultTestFile_ASCII.txt diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/TestFiles/SubFolder/SubFolderTestFile.txt b/test/Microsoft.AspNet.Mvc.Core.Test/TestFiles/SubFolder/SubFolderTestFile.txt similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/TestFiles/SubFolder/SubFolderTestFile.txt rename to test/Microsoft.AspNet.Mvc.Core.Test/TestFiles/SubFolder/SubFolderTestFile.txt diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/project.json b/test/Microsoft.AspNet.Mvc.Core.Test/project.json index 7eb71173aa..0dcf9ad00c 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/project.json +++ b/test/Microsoft.AspNet.Mvc.Core.Test/project.json @@ -1,22 +1,27 @@ { - "compilationOptions": { - "warningsAsErrors": "true" - }, - "dependencies": { - "Microsoft.AspNet.Mvc" : "6.0.0-*", - "Microsoft.AspNet.Mvc.TestCommon": { "version": "6.0.0-*", "type": "build" }, - "Microsoft.AspNet.Mvc.Xml": "6.0.0-*", - "Microsoft.AspNet.Testing": "1.0.0-*", - "Microsoft.Framework.DependencyInjection": "1.0.0-*", - "Microsoft.Framework.Logging.Testing": "1.0.0-*", - "Microsoft.Framework.WebEncoders.Testing": "1.0.0-*", - "Moq": "4.2.1312.1622", - "xunit.runner.aspnet": "2.0.0-aspnet-*" - }, - "commands": { - "test": "xunit.runner.aspnet" - }, - "frameworks": { - "dnx451": { } - } + "compilationOptions": { + "warningsAsErrors": "true" + }, + "dependencies": { + "Microsoft.AspNet.Mvc": "6.0.0-*", + "Microsoft.AspNet.Mvc.TestCommon": { + "version": "6.0.0-*", + "type": "build" + }, + "Microsoft.AspNet.Mvc.Formatters.Xml": "6.0.0-*", + "Microsoft.AspNet.Testing": "1.0.0-*", + "Microsoft.Framework.DependencyInjection": "1.0.0-*", + "Microsoft.Framework.Logging.Testing": "1.0.0-*", + "Microsoft.Framework.WebEncoders.Testing": "1.0.0-*", + "Moq": "4.2.1312.1622", + "xunit.runner.aspnet": "2.0.0-aspnet-*" + }, + "commands": { + "test": "xunit.runner.aspnet" + }, + "frameworks": { + "dnx451": { + "compilationOptions": { "define": ["MOCK_SUPPORT"] } + } + } } diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/Cors/CorsApplicationModelProviderTest.cs b/test/Microsoft.AspNet.Mvc.Cors.Test/CorsApplicationModelProviderTest.cs similarity index 91% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/Cors/CorsApplicationModelProviderTest.cs rename to test/Microsoft.AspNet.Mvc.Cors.Test/CorsApplicationModelProviderTest.cs index bd3964fe6c..6e7e2942ee 100644 --- a/test/Microsoft.AspNet.Mvc.Extensions.Test/Cors/CorsApplicationModelProviderTest.cs +++ b/test/Microsoft.AspNet.Mvc.Cors.Test/CorsApplicationModelProviderTest.cs @@ -1,16 +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; -using System.Collections.Generic; using System.Linq; using System.Reflection; -using System.Threading.Tasks; using Microsoft.AspNet.Cors.Core; -using Microsoft.AspNet.Mvc.Filters; -using Microsoft.AspNet.Mvc.ModelBinding; -using Microsoft.Framework.Internal; -using Microsoft.Framework.OptionsModel; using Xunit; namespace Microsoft.AspNet.Mvc.ApplicationModels @@ -23,7 +16,7 @@ namespace Microsoft.AspNet.Mvc.ApplicationModels { // Arrange var corsProvider = new CorsApplicationModelProvider(); - var defaultProvider = new DefaultApplicationModelProvider(new MockMvcOptionsAccessor()); + var defaultProvider = new DefaultApplicationModelProvider(new TestOptionsManager()); var context = new ApplicationModelProviderContext(new [] { typeof(CorsController).GetTypeInfo() }); defaultProvider.OnProvidersExecuting(context); @@ -41,7 +34,7 @@ namespace Microsoft.AspNet.Mvc.ApplicationModels { // Arrange var corsProvider = new CorsApplicationModelProvider(); - var defaultProvider = new DefaultApplicationModelProvider(new MockMvcOptionsAccessor()); + var defaultProvider = new DefaultApplicationModelProvider(new TestOptionsManager()); var context = new ApplicationModelProviderContext(new[] { typeof(DisableCorsController).GetTypeInfo() }); defaultProvider.OnProvidersExecuting(context); @@ -59,7 +52,7 @@ namespace Microsoft.AspNet.Mvc.ApplicationModels { // Arrange var corsProvider = new CorsApplicationModelProvider(); - var defaultProvider = new DefaultApplicationModelProvider(new MockMvcOptionsAccessor()); + var defaultProvider = new DefaultApplicationModelProvider(new TestOptionsManager()); var context = new ApplicationModelProviderContext(new[] { typeof(EnableCorsController).GetTypeInfo() }); defaultProvider.OnProvidersExecuting(context); @@ -78,7 +71,7 @@ namespace Microsoft.AspNet.Mvc.ApplicationModels { // Arrange var corsProvider = new CorsApplicationModelProvider(); - var defaultProvider = new DefaultApplicationModelProvider(new MockMvcOptionsAccessor()); + var defaultProvider = new DefaultApplicationModelProvider(new TestOptionsManager()); var context = new ApplicationModelProviderContext(new[] { typeof(DisableCorsActionController).GetTypeInfo() }); defaultProvider.OnProvidersExecuting(context); diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/Cors/CorsAuthorizationFilterTest.cs b/test/Microsoft.AspNet.Mvc.Cors.Test/CorsAuthorizationFilterTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/Cors/CorsAuthorizationFilterTest.cs rename to test/Microsoft.AspNet.Mvc.Cors.Test/CorsAuthorizationFilterTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Cors.Test/Microsoft.AspNet.Mvc.Cors.Test.xproj b/test/Microsoft.AspNet.Mvc.Cors.Test/Microsoft.AspNet.Mvc.Cors.Test.xproj new file mode 100644 index 0000000000..dd0fca44b7 --- /dev/null +++ b/test/Microsoft.AspNet.Mvc.Cors.Test/Microsoft.AspNet.Mvc.Cors.Test.xproj @@ -0,0 +1,21 @@ + + + + 14.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + 6bb4c20b-24c0-45d6-9e4c-c2620959bdd5 + Microsoft.AspNet.Mvc.Cors.Test + ..\..\artifacts\obj\$(MSBuildProjectName) + ..\..\artifacts\bin\$(MSBuildProjectName)\ + + + 2.0 + + + + + + \ No newline at end of file diff --git a/test/Microsoft.AspNet.Mvc.Cors.Test/project.json b/test/Microsoft.AspNet.Mvc.Cors.Test/project.json new file mode 100644 index 0000000000..111358249f --- /dev/null +++ b/test/Microsoft.AspNet.Mvc.Cors.Test/project.json @@ -0,0 +1,22 @@ +{ + "compilationOptions": { + "warningsAsErrors": "true" + }, + "dependencies": { + "Microsoft.AspNet.Mvc": "6.0.0-*", + "Microsoft.AspNet.Mvc.Formatters.Xml" : "6.0.0-*", + "Microsoft.AspNet.Mvc.TestCommon": { "version": "6.0.0-*", "type": "build" }, + "Microsoft.AspNet.Testing": "1.0.0-*", + "Microsoft.Framework.DependencyInjection": "1.0.0-*", + "Microsoft.Framework.Logging.Testing": "1.0.0-*", + "Microsoft.Framework.WebEncoders.Testing": "1.0.0-*", + "Moq": "4.2.1312.1622", + "xunit.runner.aspnet": "2.0.0-aspnet-*" + }, + "commands": { + "test": "xunit.runner.aspnet" + }, + "frameworks": { + "dnx451": { } + } +} diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/ModelBinding/Validation/CompareAttributeAdapterTest.cs b/test/Microsoft.AspNet.Mvc.DataAnnotations.Test/CompareAttributeAdapterTest.cs similarity index 98% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/ModelBinding/Validation/CompareAttributeAdapterTest.cs rename to test/Microsoft.AspNet.Mvc.DataAnnotations.Test/CompareAttributeAdapterTest.cs index c33d836551..254123a47e 100644 --- a/test/Microsoft.AspNet.Mvc.Extensions.Test/ModelBinding/Validation/CompareAttributeAdapterTest.cs +++ b/test/Microsoft.AspNet.Mvc.DataAnnotations.Test/CompareAttributeAdapterTest.cs @@ -100,7 +100,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation var attribute = new CompareAttribute("OtherProperty") { ErrorMessageResourceName = "CompareAttributeTestResource", - ErrorMessageResourceType = typeof(Extensions.Test.Resources), + ErrorMessageResourceType = typeof(DataAnnotations.Test.Resources), }; var serviceCollection = new ServiceCollection(); var requestServices = serviceCollection.BuildServiceProvider(); diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/ModelBinding/Validation/DataAnnotationsClientModelValidatorProviderTest.cs b/test/Microsoft.AspNet.Mvc.DataAnnotations.Test/DataAnnotationsClientModelValidatorProviderTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/ModelBinding/Validation/DataAnnotationsClientModelValidatorProviderTest.cs rename to test/Microsoft.AspNet.Mvc.DataAnnotations.Test/DataAnnotationsClientModelValidatorProviderTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/ModelBinding/Metadata/DataAnnotationsMetadataProviderTest.cs b/test/Microsoft.AspNet.Mvc.DataAnnotations.Test/DataAnnotationsMetadataProviderTest.cs similarity index 99% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/ModelBinding/Metadata/DataAnnotationsMetadataProviderTest.cs rename to test/Microsoft.AspNet.Mvc.DataAnnotations.Test/DataAnnotationsMetadataProviderTest.cs index 1e2ca5c69e..3c9b3d57dd 100644 --- a/test/Microsoft.AspNet.Mvc.Extensions.Test/ModelBinding/Metadata/DataAnnotationsMetadataProviderTest.cs +++ b/test/Microsoft.AspNet.Mvc.DataAnnotations.Test/DataAnnotationsMetadataProviderTest.cs @@ -163,7 +163,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Metadata Name = nameof(Test.Resources.DisplayAttribute_Name), ResourceType = typeof(Test.Resources), #else - Name = nameof(Extensions.Test.Resources.DisplayAttribute_Name), + Name = nameof(DataAnnotations.Test.Resources.DisplayAttribute_Name), ResourceType = typeof(TestResources), #endif }; @@ -192,7 +192,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Metadata Description = nameof(Test.Resources.DisplayAttribute_Description), ResourceType = typeof(Test.Resources), #else - Description = nameof(Extensions.Test.Resources.DisplayAttribute_Description), + Description = nameof(DataAnnotations.Test.Resources.DisplayAttribute_Description), ResourceType = typeof(TestResources), #endif }; diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/ModelBinding/Validation/DataAnnotationsModelValidatorProviderTest.cs b/test/Microsoft.AspNet.Mvc.DataAnnotations.Test/DataAnnotationsModelValidatorProviderTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/ModelBinding/Validation/DataAnnotationsModelValidatorProviderTest.cs rename to test/Microsoft.AspNet.Mvc.DataAnnotations.Test/DataAnnotationsModelValidatorProviderTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/ModelBinding/Validation/DataAnnotationsModelValidatorTest.cs b/test/Microsoft.AspNet.Mvc.DataAnnotations.Test/DataAnnotationsModelValidatorTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/ModelBinding/Validation/DataAnnotationsModelValidatorTest.cs rename to test/Microsoft.AspNet.Mvc.DataAnnotations.Test/DataAnnotationsModelValidatorTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/ModelBinding/Metadata/DataMemberRequiredBindingMetadataProviderTest.cs b/test/Microsoft.AspNet.Mvc.DataAnnotations.Test/DataMemberRequiredBindingMetadataProviderTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/ModelBinding/Metadata/DataMemberRequiredBindingMetadataProviderTest.cs rename to test/Microsoft.AspNet.Mvc.DataAnnotations.Test/DataMemberRequiredBindingMetadataProviderTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/ModelBinding/Validation/DefaultModelClientValidatorProviderTest.cs b/test/Microsoft.AspNet.Mvc.DataAnnotations.Test/DefaultModelClientValidatorProviderTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/ModelBinding/Validation/DefaultModelClientValidatorProviderTest.cs rename to test/Microsoft.AspNet.Mvc.DataAnnotations.Test/DefaultModelClientValidatorProviderTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/ModelBinding/Validation/MaxLengthAttributeAdapterTest.cs b/test/Microsoft.AspNet.Mvc.DataAnnotations.Test/MaxLengthAttributeAdapterTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/ModelBinding/Validation/MaxLengthAttributeAdapterTest.cs rename to test/Microsoft.AspNet.Mvc.DataAnnotations.Test/MaxLengthAttributeAdapterTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/Microsoft.AspNet.Mvc.Extensions.Test.xproj b/test/Microsoft.AspNet.Mvc.DataAnnotations.Test/Microsoft.AspNet.Mvc.DataAnnotations.Test.xproj similarity index 88% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/Microsoft.AspNet.Mvc.Extensions.Test.xproj rename to test/Microsoft.AspNet.Mvc.DataAnnotations.Test/Microsoft.AspNet.Mvc.DataAnnotations.Test.xproj index 5e257fd31f..331ae0400c 100644 --- a/test/Microsoft.AspNet.Mvc.Extensions.Test/Microsoft.AspNet.Mvc.Extensions.Test.xproj +++ b/test/Microsoft.AspNet.Mvc.DataAnnotations.Test/Microsoft.AspNet.Mvc.DataAnnotations.Test.xproj @@ -6,8 +6,8 @@ - 5df6efa5-865e-450b-bf83-de9ce88eb77c - Microsoft.AspNet.Mvc.Extensions.Test + 827dbbcb-f3a9-4bad-8262-4bd43e28eb3b + Microsoft.AspNet.Mvc.DataAnnotations ..\..\artifacts\obj\$(MSBuildProjectName) ..\..\artifacts\bin\$(MSBuildProjectName)\ diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/ModelBinding/Validation/MinLengthAttributeAdapterTest.cs b/test/Microsoft.AspNet.Mvc.DataAnnotations.Test/MinLengthAttributeAdapterTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/ModelBinding/Validation/MinLengthAttributeAdapterTest.cs rename to test/Microsoft.AspNet.Mvc.DataAnnotations.Test/MinLengthAttributeAdapterTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/ModelBinding/Metadata/ModelMetadataProviderTest.cs b/test/Microsoft.AspNet.Mvc.DataAnnotations.Test/ModelMetadataProviderTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/ModelBinding/Metadata/ModelMetadataProviderTest.cs rename to test/Microsoft.AspNet.Mvc.DataAnnotations.Test/ModelMetadataProviderTest.cs diff --git a/test/Microsoft.AspNet.Mvc.DataAnnotations.Test/Properties/Resources.Designer.cs b/test/Microsoft.AspNet.Mvc.DataAnnotations.Test/Properties/Resources.Designer.cs new file mode 100644 index 0000000000..f57ee867cb --- /dev/null +++ b/test/Microsoft.AspNet.Mvc.DataAnnotations.Test/Properties/Resources.Designer.cs @@ -0,0 +1,78 @@ +// +namespace Microsoft.AspNet.Mvc.DataAnnotations.Test +{ + using System.Globalization; + using System.Reflection; + using System.Resources; + + internal static class Resources + { + private static readonly ResourceManager _resourceManager + = new ResourceManager("Microsoft.AspNet.Mvc.DataAnnotations.Test.Resources", typeof(Resources).GetTypeInfo().Assembly); + + /// + /// Comparing {0} to {1}. + /// + internal static string CompareAttributeTestResource + { + get { return GetString("CompareAttributeTestResource"); } + } + + /// + /// Comparing {0} to {1}. + /// + internal static string FormatCompareAttributeTestResource(object p0, object p1) + { + return string.Format(CultureInfo.CurrentCulture, GetString("CompareAttributeTestResource"), p0, p1); + } + + /// + /// description from resources + /// + internal static string DisplayAttribute_Description + { + get { return GetString("DisplayAttribute_Description"); } + } + + /// + /// description from resources + /// + internal static string FormatDisplayAttribute_Description() + { + return GetString("DisplayAttribute_Description"); + } + + /// + /// name from resources + /// + internal static string DisplayAttribute_Name + { + get { return GetString("DisplayAttribute_Name"); } + } + + /// + /// name from resources + /// + internal static string FormatDisplayAttribute_Name() + { + return GetString("DisplayAttribute_Name"); + } + + private static string GetString(string name, params string[] formatterNames) + { + var value = _resourceManager.GetString(name); + + System.Diagnostics.Debug.Assert(value != null); + + if (formatterNames != null) + { + for (var i = 0; i < formatterNames.Length; i++) + { + value = value.Replace("{" + formatterNames[i] + "}", "{" + i + "}"); + } + } + + return value; + } + } +} diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/ModelBinding/Validation/RangeAttributeAdapterTest.cs b/test/Microsoft.AspNet.Mvc.DataAnnotations.Test/RangeAttributeAdapterTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/ModelBinding/Validation/RangeAttributeAdapterTest.cs rename to test/Microsoft.AspNet.Mvc.DataAnnotations.Test/RangeAttributeAdapterTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/ModelBinding/Validation/RequiredAttributeAdapterTest.cs b/test/Microsoft.AspNet.Mvc.DataAnnotations.Test/RequiredAttributeAdapterTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/ModelBinding/Validation/RequiredAttributeAdapterTest.cs rename to test/Microsoft.AspNet.Mvc.DataAnnotations.Test/RequiredAttributeAdapterTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/Resources.resx b/test/Microsoft.AspNet.Mvc.DataAnnotations.Test/Resources.resx similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/Resources.resx rename to test/Microsoft.AspNet.Mvc.DataAnnotations.Test/Resources.resx diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/ModelBinding/Validation/StringLengthAttributeAdapterTest.cs b/test/Microsoft.AspNet.Mvc.DataAnnotations.Test/StringLengthAttributeAdapterTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/ModelBinding/Validation/StringLengthAttributeAdapterTest.cs rename to test/Microsoft.AspNet.Mvc.DataAnnotations.Test/StringLengthAttributeAdapterTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/ModelBinding/Metadata/TestModelNameProvider.cs b/test/Microsoft.AspNet.Mvc.DataAnnotations.Test/TestModelNameProvider.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/ModelBinding/Metadata/TestModelNameProvider.cs rename to test/Microsoft.AspNet.Mvc.DataAnnotations.Test/TestModelNameProvider.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/ModelBinding/TestResources.cs b/test/Microsoft.AspNet.Mvc.DataAnnotations.Test/TestResources.cs similarity index 95% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/ModelBinding/TestResources.cs rename to test/Microsoft.AspNet.Mvc.DataAnnotations.Test/TestResources.cs index f9ecd81456..6675c715da 100644 --- a/test/Microsoft.AspNet.Mvc.Extensions.Test/ModelBinding/TestResources.cs +++ b/test/Microsoft.AspNet.Mvc.DataAnnotations.Test/TestResources.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Threading; -using Microsoft.AspNet.Mvc.Extensions.Test; +using Microsoft.AspNet.Mvc.DataAnnotations.Test; namespace Microsoft.AspNet.Mvc.ModelBinding { diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/project.json b/test/Microsoft.AspNet.Mvc.DataAnnotations.Test/project.json similarity index 91% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/project.json rename to test/Microsoft.AspNet.Mvc.DataAnnotations.Test/project.json index eab5145214..6a11856c08 100644 --- a/test/Microsoft.AspNet.Mvc.Extensions.Test/project.json +++ b/test/Microsoft.AspNet.Mvc.DataAnnotations.Test/project.json @@ -4,8 +4,8 @@ }, "dependencies": { "Microsoft.AspNet.Mvc": "6.0.0-*", + "Microsoft.AspNet.Mvc.Formatters.Xml": "6.0.0-*", "Microsoft.AspNet.Mvc.TestCommon": { "version": "6.0.0-*", "type": "build" }, - "Microsoft.AspNet.Mvc.Xml": "6.0.0-*", "Microsoft.AspNet.Testing": "1.0.0-*", "Microsoft.Framework.DependencyInjection": "1.0.0-*", "Microsoft.Framework.Logging.Testing": "1.0.0-*", diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/MockAuthorizationOptionsAccessor.cs b/test/Microsoft.AspNet.Mvc.Extensions.Test/MockAuthorizationOptionsAccessor.cs deleted file mode 100644 index b17c0902a5..0000000000 --- a/test/Microsoft.AspNet.Mvc.Extensions.Test/MockAuthorizationOptionsAccessor.cs +++ /dev/null @@ -1,17 +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 Microsoft.Framework.OptionsModel; - -namespace Microsoft.AspNet.Authorization -{ - public class MockAuthorizationOptionsAccessor : IOptions - { - public AuthorizationOptions Options { get; } = new AuthorizationOptions(); - - public AuthorizationOptions GetNamedOptions(string name) - { - return Options; - } - } -} \ No newline at end of file diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/MockMvcOptionsAccessor.cs b/test/Microsoft.AspNet.Mvc.Extensions.Test/MockMvcOptionsAccessor.cs deleted file mode 100644 index 7242656e6e..0000000000 --- a/test/Microsoft.AspNet.Mvc.Extensions.Test/MockMvcOptionsAccessor.cs +++ /dev/null @@ -1,22 +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 Microsoft.Framework.OptionsModel; - -namespace Microsoft.AspNet.Mvc -{ - public class MockMvcOptionsAccessor : IOptions - { - public MockMvcOptionsAccessor() - { - Options = new MvcOptions(); - } - - public MvcOptions Options { get; private set; } - - public MvcOptions GetNamedOptions(string name) - { - return Options; - } - } -} \ No newline at end of file diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/JsonInputFormatterTest.cs b/test/Microsoft.AspNet.Mvc.Formatters.Json.Test/JsonInputFormatterTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/JsonInputFormatterTest.cs rename to test/Microsoft.AspNet.Mvc.Formatters.Json.Test/JsonInputFormatterTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/JsonOutputFormatterTests.cs b/test/Microsoft.AspNet.Mvc.Formatters.Json.Test/JsonOutputFormatterTests.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/JsonOutputFormatterTests.cs rename to test/Microsoft.AspNet.Mvc.Formatters.Json.Test/JsonOutputFormatterTests.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/JsonPatchInputFormatterTest.cs b/test/Microsoft.AspNet.Mvc.Formatters.Json.Test/JsonPatchInputFormatterTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/JsonPatchInputFormatterTest.cs rename to test/Microsoft.AspNet.Mvc.Formatters.Json.Test/JsonPatchInputFormatterTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/JsonResultTest.cs b/test/Microsoft.AspNet.Mvc.Formatters.Json.Test/JsonResultTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/JsonResultTest.cs rename to test/Microsoft.AspNet.Mvc.Formatters.Json.Test/JsonResultTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Formatters.Json.Test/Microsoft.AspNet.Mvc.Formatters.Json.Test.xproj b/test/Microsoft.AspNet.Mvc.Formatters.Json.Test/Microsoft.AspNet.Mvc.Formatters.Json.Test.xproj new file mode 100644 index 0000000000..d7d5a1192c --- /dev/null +++ b/test/Microsoft.AspNet.Mvc.Formatters.Json.Test/Microsoft.AspNet.Mvc.Formatters.Json.Test.xproj @@ -0,0 +1,21 @@ + + + + 14.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + 493780da-e696-40ff-bd12-4a5c5736f292 + Microsoft.AspNet.Mvc.Formatters.Json.Test + ..\..\artifacts\obj\$(MSBuildProjectName) + ..\..\artifacts\bin\$(MSBuildProjectName)\ + + + 2.0 + + + + + + \ No newline at end of file diff --git a/test/Microsoft.AspNet.Mvc.Formatters.Json.Test/project.json b/test/Microsoft.AspNet.Mvc.Formatters.Json.Test/project.json new file mode 100644 index 0000000000..6a11856c08 --- /dev/null +++ b/test/Microsoft.AspNet.Mvc.Formatters.Json.Test/project.json @@ -0,0 +1,22 @@ +{ + "compilationOptions": { + "warningsAsErrors": "true" + }, + "dependencies": { + "Microsoft.AspNet.Mvc": "6.0.0-*", + "Microsoft.AspNet.Mvc.Formatters.Xml": "6.0.0-*", + "Microsoft.AspNet.Mvc.TestCommon": { "version": "6.0.0-*", "type": "build" }, + "Microsoft.AspNet.Testing": "1.0.0-*", + "Microsoft.Framework.DependencyInjection": "1.0.0-*", + "Microsoft.Framework.Logging.Testing": "1.0.0-*", + "Microsoft.Framework.WebEncoders.Testing": "1.0.0-*", + "Moq": "4.2.1312.1622", + "xunit.runner.aspnet": "2.0.0-aspnet-*" + }, + "commands": { + "test": "xunit.runner.aspnet" + }, + "frameworks": { + "dnx451": { } + } +} diff --git a/test/Microsoft.AspNet.Mvc.Xml.Test/DelegatingEnumerableTest.cs b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/DelegatingEnumerableTest.cs similarity index 98% rename from test/Microsoft.AspNet.Mvc.Xml.Test/DelegatingEnumerableTest.cs rename to test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/DelegatingEnumerableTest.cs index 524458c34d..7d2c58c6ff 100644 --- a/test/Microsoft.AspNet.Mvc.Xml.Test/DelegatingEnumerableTest.cs +++ b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/DelegatingEnumerableTest.cs @@ -7,7 +7,7 @@ using System.Collections.Generic; using Moq; using Xunit; -namespace Microsoft.AspNet.Mvc.Xml +namespace Microsoft.AspNet.Mvc.Formatters.Xml { public class DelegatingEnumerableTest { diff --git a/test/Microsoft.AspNet.Mvc.Xml.Test/DelegatingEnumeratorTest.cs b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/DelegatingEnumeratorTest.cs similarity index 98% rename from test/Microsoft.AspNet.Mvc.Xml.Test/DelegatingEnumeratorTest.cs rename to test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/DelegatingEnumeratorTest.cs index 2b7065e491..7eec2a57fb 100644 --- a/test/Microsoft.AspNet.Mvc.Xml.Test/DelegatingEnumeratorTest.cs +++ b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/DelegatingEnumeratorTest.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using Moq; using Xunit; -namespace Microsoft.AspNet.Mvc.Xml +namespace Microsoft.AspNet.Mvc.Formatters.Xml { public class DelegatingEnumeratorTest { diff --git a/test/Microsoft.AspNet.Mvc.Xml.Test/EnumerableWrapperProviderFactoryTest.cs b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/EnumerableWrapperProviderFactoryTest.cs similarity index 99% rename from test/Microsoft.AspNet.Mvc.Xml.Test/EnumerableWrapperProviderFactoryTest.cs rename to test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/EnumerableWrapperProviderFactoryTest.cs index aa72339d89..1d8e173e85 100644 --- a/test/Microsoft.AspNet.Mvc.Xml.Test/EnumerableWrapperProviderFactoryTest.cs +++ b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/EnumerableWrapperProviderFactoryTest.cs @@ -7,7 +7,7 @@ using System.Collections.Generic; using Microsoft.AspNet.Mvc; using Xunit; -namespace Microsoft.AspNet.Mvc.Xml +namespace Microsoft.AspNet.Mvc.Formatters.Xml { public class EnumerableWrapperProviderFactoryTest { diff --git a/test/Microsoft.AspNet.Mvc.Xml.Test/EnumerableWrapperProviderTest.cs b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/EnumerableWrapperProviderTest.cs similarity index 98% rename from test/Microsoft.AspNet.Mvc.Xml.Test/EnumerableWrapperProviderTest.cs rename to test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/EnumerableWrapperProviderTest.cs index 69b6e9aa65..c3e3a1ea5b 100644 --- a/test/Microsoft.AspNet.Mvc.Xml.Test/EnumerableWrapperProviderTest.cs +++ b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/EnumerableWrapperProviderTest.cs @@ -8,7 +8,7 @@ using System.Collections.ObjectModel; using Microsoft.AspNet.Mvc; using Xunit; -namespace Microsoft.AspNet.Mvc.Xml +namespace Microsoft.AspNet.Mvc.Formatters.Xml { public class EnumerableWrapperProviderTest { diff --git a/test/Microsoft.AspNet.Mvc.Xml.Test/FlushReportingStream.cs b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/FlushReportingStream.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Xml.Test/FlushReportingStream.cs rename to test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/FlushReportingStream.cs diff --git a/test/Microsoft.AspNet.Mvc.Xml.Test/Microsoft.AspNet.Mvc.Xml.Test.xproj b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/Microsoft.AspNet.Mvc.Formatters.Xml.Test.xproj similarity index 100% rename from test/Microsoft.AspNet.Mvc.Xml.Test/Microsoft.AspNet.Mvc.Xml.Test.xproj rename to test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/Microsoft.AspNet.Mvc.Formatters.Xml.Test.xproj diff --git a/test/Microsoft.AspNet.Mvc.Xml.Test/Models/Person.cs b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/Models/Person.cs similarity index 86% rename from test/Microsoft.AspNet.Mvc.Xml.Test/Models/Person.cs rename to test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/Models/Person.cs index d8b09d1c89..6afbd47e3f 100644 --- a/test/Microsoft.AspNet.Mvc.Xml.Test/Models/Person.cs +++ b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/Models/Person.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNet.Mvc.Xml +namespace Microsoft.AspNet.Mvc.Formatters.Xml { public class Person { diff --git a/test/Microsoft.AspNet.Mvc.Xml.Test/Models/PersonList.cs b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/Models/PersonList.cs similarity index 83% rename from test/Microsoft.AspNet.Mvc.Xml.Test/Models/PersonList.cs rename to test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/Models/PersonList.cs index a70738b685..3a8e080ffd 100644 --- a/test/Microsoft.AspNet.Mvc.Xml.Test/Models/PersonList.cs +++ b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/Models/PersonList.cs @@ -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; using System.Collections.Generic; -namespace Microsoft.AspNet.Mvc.Xml +namespace Microsoft.AspNet.Mvc.Formatters.Xml { public class PersonList : List { diff --git a/test/Microsoft.AspNet.Mvc.Xml.Test/PersonWrapper.cs b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/PersonWrapper.cs similarity index 94% rename from test/Microsoft.AspNet.Mvc.Xml.Test/PersonWrapper.cs rename to test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/PersonWrapper.cs index 9414c7d765..c67ea68f5f 100644 --- a/test/Microsoft.AspNet.Mvc.Xml.Test/PersonWrapper.cs +++ b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/PersonWrapper.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNet.Mvc.Xml +namespace Microsoft.AspNet.Mvc.Formatters.Xml { public class PersonWrapper : IUnwrappable { diff --git a/test/Microsoft.AspNet.Mvc.Xml.Test/PersonWrapperProvider.cs b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/PersonWrapperProvider.cs similarity index 93% rename from test/Microsoft.AspNet.Mvc.Xml.Test/PersonWrapperProvider.cs rename to test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/PersonWrapperProvider.cs index 0fcb2b241f..257a3a9a0e 100644 --- a/test/Microsoft.AspNet.Mvc.Xml.Test/PersonWrapperProvider.cs +++ b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/PersonWrapperProvider.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNet.Mvc.Xml +namespace Microsoft.AspNet.Mvc.Formatters.Xml { public class PersonWrapperProvider : IWrapperProvider { diff --git a/test/Microsoft.AspNet.Mvc.Xml.Test/PersonWrapperProviderFactory.cs b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/PersonWrapperProviderFactory.cs similarity index 91% rename from test/Microsoft.AspNet.Mvc.Xml.Test/PersonWrapperProviderFactory.cs rename to test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/PersonWrapperProviderFactory.cs index a7d4973cf5..f4fc6c6f18 100644 --- a/test/Microsoft.AspNet.Mvc.Xml.Test/PersonWrapperProviderFactory.cs +++ b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/PersonWrapperProviderFactory.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNet.Mvc.Xml +namespace Microsoft.AspNet.Mvc.Formatters.Xml { public class PersonWrapperProviderFactory : IWrapperProviderFactory { diff --git a/test/Microsoft.AspNet.Mvc.Xml.Test/SerializableErrorWrapperProviderTest.cs b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/SerializableErrorWrapperProviderTest.cs similarity index 97% rename from test/Microsoft.AspNet.Mvc.Xml.Test/SerializableErrorWrapperProviderTest.cs rename to test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/SerializableErrorWrapperProviderTest.cs index badcb801c5..623d07e4ad 100644 --- a/test/Microsoft.AspNet.Mvc.Xml.Test/SerializableErrorWrapperProviderTest.cs +++ b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/SerializableErrorWrapperProviderTest.cs @@ -5,7 +5,7 @@ using System; using Xunit; using Microsoft.AspNet.Mvc; -namespace Microsoft.AspNet.Mvc.Xml +namespace Microsoft.AspNet.Mvc.Formatters.Xml { public class SerializableErrorWrapperProviderTest { diff --git a/test/Microsoft.AspNet.Mvc.Xml.Test/SerializableErrorWrapperTests.cs b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/SerializableErrorWrapperTests.cs similarity index 98% rename from test/Microsoft.AspNet.Mvc.Xml.Test/SerializableErrorWrapperTests.cs rename to test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/SerializableErrorWrapperTests.cs index 9385b05679..aa266921ec 100644 --- a/test/Microsoft.AspNet.Mvc.Xml.Test/SerializableErrorWrapperTests.cs +++ b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/SerializableErrorWrapperTests.cs @@ -1,13 +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.Globalization; using System.IO; using System.Runtime.Serialization; using System.Text; using System.Xml; using Microsoft.AspNet.Mvc.ModelBinding; -using Microsoft.AspNet.Mvc.Xml; +using Microsoft.AspNet.Mvc.Formatters.Xml; using Microsoft.AspNet.Testing; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.Xml.Test/SerializableWrapperProviderFactoryTest.cs b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/SerializableWrapperProviderFactoryTest.cs similarity index 96% rename from test/Microsoft.AspNet.Mvc.Xml.Test/SerializableWrapperProviderFactoryTest.cs rename to test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/SerializableWrapperProviderFactoryTest.cs index 1e86c3c72a..724dcd8047 100644 --- a/test/Microsoft.AspNet.Mvc.Xml.Test/SerializableWrapperProviderFactoryTest.cs +++ b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/SerializableWrapperProviderFactoryTest.cs @@ -4,7 +4,7 @@ using System; using Xunit; -namespace Microsoft.AspNet.Mvc.Xml +namespace Microsoft.AspNet.Mvc.Formatters.Xml { public class SerializableWrapperProviderFactoryTest { diff --git a/test/Microsoft.AspNet.Mvc.Xml.Test/XmlAssert.cs b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/XmlAssert.cs similarity index 98% rename from test/Microsoft.AspNet.Mvc.Xml.Test/XmlAssert.cs rename to test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/XmlAssert.cs index b9094fff17..a3307140bc 100644 --- a/test/Microsoft.AspNet.Mvc.Xml.Test/XmlAssert.cs +++ b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/XmlAssert.cs @@ -10,7 +10,7 @@ using System.Xml.Linq; using Xunit; using Xunit.Sdk; -namespace Microsoft.AspNet.Mvc.Xml +namespace Microsoft.AspNet.Mvc.Formatters.Xml { /// /// Xunit assertions related to Xml content. diff --git a/test/Microsoft.AspNet.Mvc.Xml.Test/XmlAssertTest.cs b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/XmlAssertTest.cs similarity index 99% rename from test/Microsoft.AspNet.Mvc.Xml.Test/XmlAssertTest.cs rename to test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/XmlAssertTest.cs index be1482fda0..476146971c 100644 --- a/test/Microsoft.AspNet.Mvc.Xml.Test/XmlAssertTest.cs +++ b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/XmlAssertTest.cs @@ -7,7 +7,7 @@ using Microsoft.AspNet.Testing.xunit; using Xunit; using Xunit.Sdk; -namespace Microsoft.AspNet.Mvc.Xml +namespace Microsoft.AspNet.Mvc.Formatters.Xml { public class XmlAssertTest { diff --git a/test/Microsoft.AspNet.Mvc.Xml.Test/XmlDataContractSerializerInputFormatterTest.cs b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/XmlDataContractSerializerInputFormatterTest.cs similarity index 99% rename from test/Microsoft.AspNet.Mvc.Xml.Test/XmlDataContractSerializerInputFormatterTest.cs rename to test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/XmlDataContractSerializerInputFormatterTest.cs index e85ecb8a6b..bfa2c42208 100644 --- a/test/Microsoft.AspNet.Mvc.Xml.Test/XmlDataContractSerializerInputFormatterTest.cs +++ b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/XmlDataContractSerializerInputFormatterTest.cs @@ -17,7 +17,7 @@ using Microsoft.AspNet.Testing.xunit; using Moq; using Xunit; -namespace Microsoft.AspNet.Mvc.Xml +namespace Microsoft.AspNet.Mvc.Formatters.Xml { public class XmlDataContractSerializerInputFormatterTest { diff --git a/test/Microsoft.AspNet.Mvc.Xml.Test/XmlDataContractSerializerOutputFormatterTest.cs b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/XmlDataContractSerializerOutputFormatterTest.cs similarity index 99% rename from test/Microsoft.AspNet.Mvc.Xml.Test/XmlDataContractSerializerOutputFormatterTest.cs rename to test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/XmlDataContractSerializerOutputFormatterTest.cs index 51b901a6af..9a4dff1ce6 100644 --- a/test/Microsoft.AspNet.Mvc.Xml.Test/XmlDataContractSerializerOutputFormatterTest.cs +++ b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/XmlDataContractSerializerOutputFormatterTest.cs @@ -16,7 +16,7 @@ using Microsoft.Net.Http.Headers; using Moq; using Xunit; -namespace Microsoft.AspNet.Mvc.Xml +namespace Microsoft.AspNet.Mvc.Formatters.Xml { public class XmlDataContractSerializerOutputFormatterTest { diff --git a/test/Microsoft.AspNet.Mvc.Xml.Test/XmlSerializerInputFormatterTest.cs b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/XmlSerializerInputFormatterTest.cs similarity index 99% rename from test/Microsoft.AspNet.Mvc.Xml.Test/XmlSerializerInputFormatterTest.cs rename to test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/XmlSerializerInputFormatterTest.cs index 33d0a36689..236857b49e 100644 --- a/test/Microsoft.AspNet.Mvc.Xml.Test/XmlSerializerInputFormatterTest.cs +++ b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/XmlSerializerInputFormatterTest.cs @@ -12,12 +12,12 @@ using System.Xml; using System.Xml.Serialization; using Microsoft.AspNet.Http; using Microsoft.AspNet.Mvc.ModelBinding; -using Microsoft.AspNet.Mvc.Xml; +using Microsoft.AspNet.Mvc.Formatters.Xml; using Microsoft.AspNet.Testing; using Moq; using Xunit; -namespace Microsoft.AspNet.Mvc.Xml +namespace Microsoft.AspNet.Mvc.Formatters.Xml { public class XmlSerializerInputFormatterTest { diff --git a/test/Microsoft.AspNet.Mvc.Xml.Test/XmlSerializerOutputFormatterTest.cs b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/XmlSerializerOutputFormatterTest.cs similarity index 99% rename from test/Microsoft.AspNet.Mvc.Xml.Test/XmlSerializerOutputFormatterTest.cs rename to test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/XmlSerializerOutputFormatterTest.cs index 07500d95e0..873ad1da0a 100644 --- a/test/Microsoft.AspNet.Mvc.Xml.Test/XmlSerializerOutputFormatterTest.cs +++ b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/XmlSerializerOutputFormatterTest.cs @@ -14,7 +14,7 @@ using Microsoft.Net.Http.Headers; using Moq; using Xunit; -namespace Microsoft.AspNet.Mvc.Xml +namespace Microsoft.AspNet.Mvc.Formatters.Xml { public class XmlSerializerOutputFormatterTest { diff --git a/test/Microsoft.AspNet.Mvc.Xml.Test/project.json b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/project.json similarity index 86% rename from test/Microsoft.AspNet.Mvc.Xml.Test/project.json rename to test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/project.json index 30a27d8c3a..59224daa4b 100644 --- a/test/Microsoft.AspNet.Mvc.Xml.Test/project.json +++ b/test/Microsoft.AspNet.Mvc.Formatters.Xml.Test/project.json @@ -4,7 +4,7 @@ }, "dependencies": { "Microsoft.AspNet.Mvc" : "6.0.0-*", - "Microsoft.AspNet.Mvc.Xml" : "6.0.0-*", + "Microsoft.AspNet.Mvc.Formatters.Xml" : "6.0.0-*", "Microsoft.AspNet.Testing": "1.0.0-*", "Moq": "4.2.1312.1622", "xunit.runner.aspnet": "2.0.0-aspnet-*" diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/ApiExplorerTest.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/ApiExplorerTest.cs index d1e0183fe9..cf178ef80c 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/ApiExplorerTest.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/ApiExplorerTest.cs @@ -7,7 +7,7 @@ using System.Net.Http; using System.Threading.Tasks; using Microsoft.AspNet.Builder; using Microsoft.AspNet.Mvc.ModelBinding; -using Microsoft.AspNet.Mvc.Xml; +using Microsoft.AspNet.Mvc.Formatters.Xml; using Microsoft.AspNet.Testing.xunit; using Microsoft.Framework.DependencyInjection; using Newtonsoft.Json; @@ -650,7 +650,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests [ConditionalTheory] // Mono issue - https://github.com/aspnet/External/issues/18 [FrameworkSkipCondition(RuntimeFrameworks.Mono)] - [InlineData("Controller", "text/xml", "Microsoft.AspNet.Mvc.Xml.XmlDataContractSerializerOutputFormatter")] + [InlineData("Controller", "text/xml", "Microsoft.AspNet.Mvc.Formatters.Xml.XmlDataContractSerializerOutputFormatter")] [InlineData("Action", "application/json", "Microsoft.AspNet.Mvc.JsonOutputFormatter")] public async Task ApiExplorer_ResponseContentType_OverrideOnAction( string action, diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/ContentNegotiationTest.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/ContentNegotiationTest.cs index 5d50f0070d..f81d13a1a1 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/ContentNegotiationTest.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/ContentNegotiationTest.cs @@ -9,7 +9,7 @@ using System.Text; using System.Threading.Tasks; using ContentNegotiationWebSite; using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Mvc.Xml; +using Microsoft.AspNet.Mvc.Formatters.Xml; using Microsoft.AspNet.Testing.xunit; using Microsoft.Framework.DependencyInjection; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/FiltersTest.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/FiltersTest.cs index bcbbc8131c..b24c1e3949 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/FiltersTest.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/FiltersTest.cs @@ -8,7 +8,7 @@ using System.Net.Http; using System.Text; using System.Threading.Tasks; using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Mvc.Xml; +using Microsoft.AspNet.Mvc.Formatters.Xml; using Microsoft.AspNet.Testing.xunit; using Microsoft.Framework.DependencyInjection; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/MvcSampleTests.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/MvcSampleTests.cs index e970578fa0..798b8e0646 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/MvcSampleTests.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/MvcSampleTests.cs @@ -9,7 +9,7 @@ using System.Net.Http.Headers; using System.Text; using System.Threading.Tasks; using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Mvc.Xml; +using Microsoft.AspNet.Mvc.Formatters.Xml; using Microsoft.AspNet.Testing.xunit; using Microsoft.Framework.DependencyInjection; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/RespectBrowserAcceptHeaderTests.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/RespectBrowserAcceptHeaderTests.cs index 7e5ef1f5e8..07879fd4a0 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/RespectBrowserAcceptHeaderTests.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/RespectBrowserAcceptHeaderTests.cs @@ -7,7 +7,7 @@ using System.Net.Http; using System.Text; using System.Threading.Tasks; using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Mvc.Xml; +using Microsoft.AspNet.Mvc.Formatters.Xml; using Microsoft.AspNet.Testing.xunit; using Microsoft.Framework.DependencyInjection; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/SerializableErrorTests.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/SerializableErrorTests.cs index 6bc15adad7..ffe953e76c 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/SerializableErrorTests.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/SerializableErrorTests.cs @@ -8,7 +8,7 @@ using System.Net.Http.Headers; using System.Text; using System.Threading.Tasks; using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Mvc.Xml; +using Microsoft.AspNet.Mvc.Formatters.Xml; using Microsoft.AspNet.Testing; using Microsoft.AspNet.Testing.xunit; using Microsoft.Framework.DependencyInjection; diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/XmlDataContractSerializerFormattersWrappingTest.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/XmlDataContractSerializerFormattersWrappingTest.cs index 0864fd85b8..1d43afeb4f 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/XmlDataContractSerializerFormattersWrappingTest.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/XmlDataContractSerializerFormattersWrappingTest.cs @@ -7,7 +7,7 @@ using System.Net.Http; using System.Net.Http.Headers; using System.Threading.Tasks; using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Mvc.Xml; +using Microsoft.AspNet.Mvc.Formatters.Xml; using Microsoft.AspNet.Testing.xunit; using Microsoft.Framework.DependencyInjection; using Xunit; @@ -210,7 +210,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests Assert.Equal(HttpStatusCode.OK, response.StatusCode); var result = await response.Content.ReadAsStringAsync(); XmlAssert.Equal("" + + " xmlns=\"http://schemas.datacontract.org/2004/07/Microsoft.AspNet.Mvc.Formatters.Xml\">" + "key1-errorkey2-error" + "key1-errorkey2-error" + "", diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/XmlOutputFormatterTests.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/XmlOutputFormatterTests.cs index 80d4ac04af..576d906e6f 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/XmlOutputFormatterTests.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/XmlOutputFormatterTests.cs @@ -8,7 +8,7 @@ using System.Net.Http.Headers; using System.Threading.Tasks; using FormatterWebSite; using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Mvc.Xml; +using Microsoft.AspNet.Mvc.Formatters.Xml; using Microsoft.AspNet.Testing.xunit; using Microsoft.Framework.DependencyInjection; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/XmlSerializerFormattersWrappingTest.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/XmlSerializerFormattersWrappingTest.cs index e4fab1bdb8..6d6b38dad9 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/XmlSerializerFormattersWrappingTest.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/XmlSerializerFormattersWrappingTest.cs @@ -7,7 +7,7 @@ using System.Net.Http; using System.Net.Http.Headers; using System.Threading.Tasks; using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Mvc.Xml; +using Microsoft.AspNet.Mvc.Formatters.Xml; using Microsoft.Framework.DependencyInjection; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/project.json b/test/Microsoft.AspNet.Mvc.FunctionalTests/project.json index 4c96a7a628..52d792fcee 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/project.json +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/project.json @@ -1,6 +1,6 @@ { "compile": [ - "../Microsoft.AspNet.Mvc.Xml.Test/XmlAssert.cs" + "../Microsoft.AspNet.Mvc.Formatters.Xml.Test/XmlAssert.cs" ], "compilationOptions": { "define": [ "__RemoveThisBitTo__GENERATE_BASELINES" ], @@ -37,7 +37,7 @@ "Microsoft.AspNet.Mvc": "6.0.0-*", "Microsoft.AspNet.Mvc.TestCommon": { "version": "6.0.0-*", "type": "build" }, "Microsoft.AspNet.Mvc.TestConfiguration": "1.0.0", - "Microsoft.AspNet.Mvc.Xml": "6.0.0-*", + "Microsoft.AspNet.Mvc.Formatters.Xml": "6.0.0-*", "Microsoft.AspNet.TestHost": "1.0.0-*", "Microsoft.AspNet.WebUtilities": "1.0.0-*", "Microsoft.Framework.Configuration.Json": "1.0.0-*", diff --git a/test/Microsoft.AspNet.Mvc.IntegrationTests/project.json b/test/Microsoft.AspNet.Mvc.IntegrationTests/project.json index ab1b654f09..085a00719d 100644 --- a/test/Microsoft.AspNet.Mvc.IntegrationTests/project.json +++ b/test/Microsoft.AspNet.Mvc.IntegrationTests/project.json @@ -4,6 +4,7 @@ }, "dependencies": { "Microsoft.AspNet.Mvc": "6.0.0-*", + "Microsoft.AspNet.Mvc.Formatters.Xml": "6.0.0-*", "Microsoft.AspNet.Mvc.TestCommon": { "version": "6.0.0-*", "type": "build" }, "Microsoft.AspNet.Testing": "1.0.0-*", "Moq": "4.2.1312.1622", diff --git a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/project.json b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/project.json index a501b2d5e7..8c63f56156 100644 --- a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/project.json +++ b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/project.json @@ -2,8 +2,10 @@ "resource": "TestFiles/**", "dependencies": { "Microsoft.AspNet.Mvc.Core": "6.0.0-*", - "Microsoft.AspNet.Mvc.Extensions": "6.0.0-*", + "Microsoft.AspNet.Mvc.DataAnnotations": "6.0.0-*", + "Microsoft.AspNet.Mvc.Formatters.Xml": "6.0.0-*", "Microsoft.AspNet.Mvc.Razor.Host": "6.0.0-*", + "Microsoft.AspNet.Mvc.ViewFeatures": "6.0.0-*", "Microsoft.AspNet.Mvc.TestCommon": { "version": "6.0.0-*", "type": "build" }, "Microsoft.AspNet.Testing": "1.0.0-*", "xunit.runner.aspnet": "2.0.0-aspnet-*" diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/project.json b/test/Microsoft.AspNet.Mvc.Razor.Test/project.json index efde14a744..76c45889bf 100644 --- a/test/Microsoft.AspNet.Mvc.Razor.Test/project.json +++ b/test/Microsoft.AspNet.Mvc.Razor.Test/project.json @@ -1,38 +1,43 @@ { - "compile": [ - "../Microsoft.AspNet.Mvc.Razor.Host.Test/TestFileProvider.cs", - "../Microsoft.AspNet.Mvc.Razor.Host.Test/TestFileInfo.cs", - "../Microsoft.AspNet.Mvc.Razor.Host.Test/TestFileTrigger.cs" - ], - "dependencies": { - "Microsoft.AspNet.Mvc.Razor": "6.0.0-*", - "Microsoft.AspNet.Mvc.TestCommon": { "version": "6.0.0-*", "type": "build" }, - "Microsoft.AspNet.Testing": "1.0.0-*", - "Microsoft.Framework.DependencyInjection": "1.0.0-*", - "Microsoft.Framework.WebEncoders.Testing": "1.0.0-*", - "Microsoft.Framework.Runtime": "1.0.0-*", - "xunit.runner.aspnet": "2.0.0-aspnet-*" - }, - "commands": { - "test": "xunit.runner.aspnet" - }, - "frameworks": { - "dnx451": { - "dependencies": { - "Moq": "4.2.1312.1622" - } - } - }, - "exclude": [ - "wwwroot", - "node_modules", - "bower_components" - ], - "packExclude": [ - "node_modules", - "bower_components", - "**.kproj", - "**.user", - "**.vspscc" - ] + "compile": [ + "../Microsoft.AspNet.Mvc.Razor.Host.Test/TestFileProvider.cs", + "../Microsoft.AspNet.Mvc.Razor.Host.Test/TestFileInfo.cs", + "../Microsoft.AspNet.Mvc.Razor.Host.Test/TestFileTrigger.cs" + ], + "dependencies": { + "Microsoft.AspNet.Mvc.DataAnnotations": "6.0.0-*", + "Microsoft.AspNet.Mvc.Formatters.Xml": "6.0.0-*", + "Microsoft.AspNet.Mvc.Razor": "6.0.0-*", + "Microsoft.AspNet.Mvc.TestCommon": { + "version": "6.0.0-*", + "type": "build" + }, + "Microsoft.AspNet.Testing": "1.0.0-*", + "Microsoft.Framework.DependencyInjection": "1.0.0-*", + "Microsoft.Framework.WebEncoders.Testing": "1.0.0-*", + "Microsoft.Framework.Runtime": "1.0.0-*", + "xunit.runner.aspnet": "2.0.0-aspnet-*" + }, + "commands": { + "test": "xunit.runner.aspnet" + }, + "frameworks": { + "dnx451": { + "dependencies": { + "Moq": "4.2.1312.1622" + } + } + }, + "exclude": [ + "wwwroot", + "node_modules", + "bower_components" + ], + "packExclude": [ + "node_modules", + "bower_components", + "**.kproj", + "**.user", + "**.vspscc" + ] } diff --git a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/project.json b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/project.json index ac8a7433a7..f3265e5568 100644 --- a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/project.json +++ b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/project.json @@ -1,12 +1,17 @@ { - "dependencies": { - "Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-*", - "Microsoft.AspNet.Mvc.TestCommon": { "version": "6.0.0-*", "type": "build" }, - "Microsoft.AspNet.Testing": "1.0.0-*", - "Microsoft.Framework.Logging.Abstractions": "1.0.0-*", - "Microsoft.Framework.WebEncoders.Testing": "1.0.0-*", - "xunit.runner.aspnet": "2.0.0-aspnet-*" - }, + "dependencies": { + "Microsoft.AspNet.Mvc.DataAnnotations": "6.0.0-*", + "Microsoft.AspNet.Mvc.Formatters.Xml": "6.0.0-*", + "Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-*", + "Microsoft.AspNet.Mvc.TestCommon": { + "version": "6.0.0-*", + "type": "build" + }, + "Microsoft.AspNet.Testing": "1.0.0-*", + "Microsoft.Framework.Logging.Abstractions": "1.0.0-*", + "Microsoft.Framework.WebEncoders.Testing": "1.0.0-*", + "xunit.runner.aspnet": "2.0.0-aspnet-*" + }, "commands": { "test": "xunit.runner.aspnet" }, diff --git a/test/Microsoft.AspNet.Mvc.Test/MvcOptionsSetupTest.cs b/test/Microsoft.AspNet.Mvc.Test/MvcOptionsSetupTest.cs index a8301cc0af..4f4ef40676 100644 --- a/test/Microsoft.AspNet.Mvc.Test/MvcOptionsSetupTest.cs +++ b/test/Microsoft.AspNet.Mvc.Test/MvcOptionsSetupTest.cs @@ -183,6 +183,7 @@ namespace Microsoft.AspNet.Mvc // Act setup1.Configure(mvcOptions); setup2.Configure(mvcOptions); + mvcOptions.AddXmlDataContractSerializerFormatter(); // Assert Assert.Equal(8, mvcOptions.ValidationExcludeFilters.Count); @@ -213,16 +214,16 @@ namespace Microsoft.AspNet.Mvc = Assert.IsType(mvcOptions.ValidationExcludeFilters[i++]); Assert.Equal(formCollectionFilter.ExcludedType, typeof(Http.IFormCollection)); + Assert.IsType(typeof(DefaultTypeBasedExcludeFilter), mvcOptions.ValidationExcludeFilters[i]); + var jTokenFilter + = Assert.IsType(mvcOptions.ValidationExcludeFilters[i++]); + Assert.Equal(jTokenFilter.ExcludedType, typeof(JToken)); + Assert.IsType(typeof(DefaultTypeBasedExcludeFilter), mvcOptions.ValidationExcludeFilters[i]); var xObjectFilter = Assert.IsType(mvcOptions.ValidationExcludeFilters[i++]); Assert.Equal(xObjectFilter.ExcludedType, typeof(XObject)); - Assert.IsType(typeof(DefaultTypeBasedExcludeFilter), mvcOptions.ValidationExcludeFilters[i]); - var jTokenFilter - = Assert.IsType(mvcOptions.ValidationExcludeFilters[i++]); - Assert.Equal(jTokenFilter.ExcludedType, typeof(JToken)); - Assert.IsType(typeof(DefaultTypeNameBasedExcludeFilter), mvcOptions.ValidationExcludeFilters[i]); var xmlNodeFilter = Assert.IsType(mvcOptions.ValidationExcludeFilters[i++]); diff --git a/test/Microsoft.AspNet.Mvc.Test/project.json b/test/Microsoft.AspNet.Mvc.Test/project.json index a6bb68e124..3b3519496f 100644 --- a/test/Microsoft.AspNet.Mvc.Test/project.json +++ b/test/Microsoft.AspNet.Mvc.Test/project.json @@ -3,7 +3,8 @@ "warningsAsErrors": "true" }, "dependencies": { - "Microsoft.AspNet.Mvc" : "6.0.0-*", + "Microsoft.AspNet.Mvc": "6.0.0-*", + "Microsoft.AspNet.Mvc.Formatters.Xml": "6.0.0-*", "xunit.runner.aspnet": "2.0.0-aspnet-*" }, "commands": { diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/ActionFilterAttributeTests.cs b/test/Microsoft.AspNet.Mvc.TestCommon/CommonFilterTest.cs similarity index 89% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/ActionFilterAttributeTests.cs rename to test/Microsoft.AspNet.Mvc.TestCommon/CommonFilterTest.cs index e4f9fed123..cff4e4d502 100644 --- a/test/Microsoft.AspNet.Mvc.Extensions.Test/ActionFilterAttributeTests.cs +++ b/test/Microsoft.AspNet.Mvc.TestCommon/CommonFilterTest.cs @@ -1,7 +1,7 @@ // 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. -#if DNX451 +#if MOCK_SUPPORT using System.Collections.Generic; using System.Threading.Tasks; using Microsoft.AspNet.Http; @@ -11,20 +11,8 @@ using Xunit; namespace Microsoft.AspNet.Mvc.Test { - public class ActionFilterAttributeTests + public class CommonFilterTest { - [Fact] - public async Task ActionFilterAttribute_ActionFilter_SettingResult_ShortCircuits() - { - await ActionFilter_SettingResult_ShortCircuits(new Mock()); - } - - [Fact] - public async Task ActionAttributeFilter_ActionFilter_Calls_OnActionExecuted() - { - await ActionFilter_Calls_OnActionExecuted(new Mock()); - } - // This is used as a 'common' test method for ActionFilterAttribute and Controller public static async Task ActionFilter_Calls_OnActionExecuted(Mock mock) { @@ -94,24 +82,6 @@ namespace Microsoft.AspNet.Mvc.Test .Verify(f => f.OnActionExecuted(It.IsAny()), Times.Never()); } - [Fact] - public async Task ActionAttributeFilter_ResultFilter_Calls_OnResultExecuted() - { - await ResultFilter_Calls_OnResultExecuted(new Mock()); - } - - [Fact] - public async Task ActionFilterAttribute_ResultFilter_SettingResult_DoesNotShortCircuit() - { - await ResultFilter_SettingResult_DoesNotShortCircuit(new Mock()); - } - - [Fact] - public async Task ActionFilterAttribute_ResultFilter_SettingCancel_ShortCircuits() - { - await ResultFilter_SettingCancel_ShortCircuits(new Mock()); - } - // This is used as a 'common' test method for ActionFilterAttribute and ResultFilterAttribute public static async Task ResultFilter_Calls_OnResultExecuted(Mock mock) { diff --git a/test/Microsoft.AspNet.Mvc.TestCommon/TestOptionsManager.cs b/test/Microsoft.AspNet.Mvc.TestCommon/TestOptionsManager.cs new file mode 100644 index 0000000000..13b259d95a --- /dev/null +++ b/test/Microsoft.AspNet.Mvc.TestCommon/TestOptionsManager.cs @@ -0,0 +1,17 @@ +// 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.Linq; +using Microsoft.Framework.OptionsModel; + +namespace Microsoft.AspNet.Mvc +{ + public class TestOptionsManager : OptionsManager + where T : class, new() + { + public TestOptionsManager() + : base(Enumerable.Empty>()) + { + } + } +} diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/ControllerTests.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ControllerTest.cs similarity index 99% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/ControllerTests.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ControllerTest.cs index 80ab851346..0519b93597 100644 --- a/test/Microsoft.AspNet.Mvc.Extensions.Test/ControllerTests.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ControllerTest.cs @@ -24,7 +24,7 @@ using Xunit; namespace Microsoft.AspNet.Mvc.Test { - public class ControllerTests + public class ControllerTest { public static IEnumerable PublicNormalMethodsFromController { @@ -1134,7 +1134,7 @@ namespace Microsoft.AspNet.Mvc.Test public async Task Controller_ActionFilter_SettingResult_ShortCircuits() { // Arrange, Act & Assert - await ActionFilterAttributeTests.ActionFilter_SettingResult_ShortCircuits( + await CommonFilterTest.ActionFilter_SettingResult_ShortCircuits( new Mock()); } @@ -1142,7 +1142,7 @@ namespace Microsoft.AspNet.Mvc.Test public async Task Controller_ActionFilter_Calls_OnActionExecuted() { // Arrange, Act & Assert - await ActionFilterAttributeTests.ActionFilter_Calls_OnActionExecuted( + await CommonFilterTest.ActionFilter_Calls_OnActionExecuted( new Mock()); } diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/ControllerUnitTestabilityTests.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ControllerUnitTestabilityTests.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/ControllerUnitTestabilityTests.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ControllerUnitTestabilityTests.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/FileContentResultTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/FileContentResultTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/FileContentResultTest.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/FileContentResultTest.cs diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Microsoft.AspNet.Mvc.ViewFeatures.Test.xproj b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Microsoft.AspNet.Mvc.ViewFeatures.Test.xproj new file mode 100644 index 0000000000..7ab71f99a9 --- /dev/null +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Microsoft.AspNet.Mvc.ViewFeatures.Test.xproj @@ -0,0 +1,21 @@ + + + + 14.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + 60873dfa-97b9-419e-baa3-940fc9b07085 + Microsoft.AspNet.Mvc.ViewFeatures.Test + ..\..\artifacts\obj\$(MSBuildProjectName) + ..\..\artifacts\bin\$(MSBuildProjectName)\ + + + 2.0 + + + + + + \ No newline at end of file diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/MockMvcViewOptionsAccessor.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/MockMvcViewOptionsAccessor.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/MockMvcViewOptionsAccessor.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/MockMvcViewOptionsAccessor.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/PartialViewResultTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/PartialViewResultTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/PartialViewResultTest.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/PartialViewResultTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/Properties/AssemblyInfo.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Properties/AssemblyInfo.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/Properties/AssemblyInfo.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Properties/AssemblyInfo.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/Properties/Resources.Designer.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Properties/Resources.Designer.cs similarity index 92% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/Properties/Resources.Designer.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Properties/Resources.Designer.cs index a76e8b66b9..b3b8473a11 100644 --- a/test/Microsoft.AspNet.Mvc.Extensions.Test/Properties/Resources.Designer.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Properties/Resources.Designer.cs @@ -1,5 +1,5 @@ // -namespace Microsoft.AspNet.Mvc.Extensions.Test +namespace Microsoft.AspNet.Mvc.ViewFeatures.Test { using System.Globalization; using System.Reflection; @@ -8,7 +8,7 @@ namespace Microsoft.AspNet.Mvc.Extensions.Test internal static class Resources { private static readonly ResourceManager _resourceManager - = new ResourceManager("Microsoft.AspNet.Mvc.Extensions.Test.Resources", typeof(Resources).GetTypeInfo().Assembly); + = new ResourceManager("Microsoft.AspNet.Mvc.ViewFeatures.Test.Resources", typeof(Resources).GetTypeInfo().Assembly); /// /// Comparing {0} to {1}. diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/RemoteAttributeTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/RemoteAttributeTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/RemoteAttributeTest.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/RemoteAttributeTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/Rendering/DefaultDisplayTemplatesTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/DefaultDisplayTemplatesTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/Rendering/DefaultDisplayTemplatesTest.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/DefaultDisplayTemplatesTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/Rendering/DefaultEditorTemplatesTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/DefaultEditorTemplatesTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/Rendering/DefaultEditorTemplatesTest.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/DefaultEditorTemplatesTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/Rendering/DefaultHtmlGeneratorTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/DefaultHtmlGeneratorTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/Rendering/DefaultHtmlGeneratorTest.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/DefaultHtmlGeneratorTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/Rendering/DefaultTemplatesUtilities.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/DefaultTemplatesUtilities.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/Rendering/DefaultTemplatesUtilities.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/DefaultTemplatesUtilities.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/Rendering/Expression/ExpressionMetadataProviderTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/Expression/ExpressionMetadataProviderTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/Rendering/Expression/ExpressionMetadataProviderTest.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/Expression/ExpressionMetadataProviderTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/Rendering/HtmlAttributePropertyHelperTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlAttributePropertyHelperTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/Rendering/HtmlAttributePropertyHelperTest.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlAttributePropertyHelperTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/Rendering/HtmlHelperCheckboxTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperCheckboxTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/Rendering/HtmlHelperCheckboxTest.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperCheckboxTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/Rendering/HtmlHelperDisplayNameExtensionsTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperDisplayNameExtensionsTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/Rendering/HtmlHelperDisplayNameExtensionsTest.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperDisplayNameExtensionsTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/Rendering/HtmlHelperDisplayTextTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperDisplayTextTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/Rendering/HtmlHelperDisplayTextTest.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperDisplayTextTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/Rendering/HtmlHelperFormExtensionsTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperFormExtensionsTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/Rendering/HtmlHelperFormExtensionsTest.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperFormExtensionsTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/Rendering/HtmlHelperFormTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperFormTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/Rendering/HtmlHelperFormTest.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperFormTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/Rendering/HtmlHelperHiddenTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperHiddenTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/Rendering/HtmlHelperHiddenTest.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperHiddenTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/Rendering/HtmlHelperLabelExtensionsTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperLabelExtensionsTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/Rendering/HtmlHelperLabelExtensionsTest.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperLabelExtensionsTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/Rendering/HtmlHelperLinkGenerationTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperLinkGenerationTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/Rendering/HtmlHelperLinkGenerationTest.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperLinkGenerationTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/Rendering/HtmlHelperNameExtensionsTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperNameExtensionsTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/Rendering/HtmlHelperNameExtensionsTest.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperNameExtensionsTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/Rendering/HtmlHelperPartialExtensionsTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperPartialExtensionsTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/Rendering/HtmlHelperPartialExtensionsTest.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperPartialExtensionsTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/Rendering/HtmlHelperPasswordTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperPasswordTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/Rendering/HtmlHelperPasswordTest.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperPasswordTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/Rendering/HtmlHelperSelectTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperSelectTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/Rendering/HtmlHelperSelectTest.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperSelectTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/Rendering/HtmlHelperTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/Rendering/HtmlHelperTest.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/Rendering/HtmlHelperValidationSummaryTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperValidationSummaryTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/Rendering/HtmlHelperValidationSummaryTest.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperValidationSummaryTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/Rendering/HtmlHelperValueTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperValueTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/Rendering/HtmlHelperValueTest.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperValueTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/Rendering/StringCollectionTextWriterTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/StringCollectionTextWriterTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/Rendering/StringCollectionTextWriterTest.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/StringCollectionTextWriterTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/Rendering/TagBuilderTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/TagBuilderTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/Rendering/TagBuilderTest.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/TagBuilderTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/Rendering/TemplateRendererTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/TemplateRendererTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/Rendering/TemplateRendererTest.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/TemplateRendererTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/Rendering/TestResources.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/TestResources.cs similarity index 91% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/Rendering/TestResources.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/TestResources.cs index 9243302c95..8d7a556c7f 100644 --- a/test/Microsoft.AspNet.Mvc.Extensions.Test/Rendering/TestResources.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/TestResources.cs @@ -1,7 +1,7 @@ // 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.AspNet.Mvc.Extensions.Test; +using Microsoft.AspNet.Mvc.ViewFeatures.Test; namespace Microsoft.AspNet.Mvc { diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/Rendering/ViewContextTests.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/ViewContextTests.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/Rendering/ViewContextTests.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/ViewContextTests.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/Rendering/ViewDataOfTTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/ViewDataOfTTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/Rendering/ViewDataOfTTest.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/ViewDataOfTTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/Rendering/ViewEngine/CompositeViewEngineTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/ViewEngine/CompositeViewEngineTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/Rendering/ViewEngine/CompositeViewEngineTest.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/ViewEngine/CompositeViewEngineTest.cs diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Resources.resx b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Resources.resx new file mode 100644 index 0000000000..9ddc5418f7 --- /dev/null +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Resources.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Comparing {0} to {1}. + + + description from resources + + + name from resources + + \ No newline at end of file diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/SkipStatusCodePagesAttributeTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/SkipStatusCodePagesAttributeTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/SkipStatusCodePagesAttributeTest.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/SkipStatusCodePagesAttributeTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/ViewComponentTests.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponentTests.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/ViewComponentTests.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponentTests.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/ViewComponents/ContentViewComponentResultTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/ContentViewComponentResultTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/ViewComponents/ContentViewComponentResultTest.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/ContentViewComponentResultTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/ViewComponents/DefaultViewComponentActivatorTests.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentActivatorTests.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/ViewComponents/DefaultViewComponentActivatorTests.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentActivatorTests.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/ViewComponents/DefaultViewComponentDescriptorProviderTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentDescriptorProviderTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/ViewComponents/DefaultViewComponentDescriptorProviderTest.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentDescriptorProviderTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/ViewComponents/DefaultViewComponentSelectorTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentSelectorTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/ViewComponents/DefaultViewComponentSelectorTest.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentSelectorTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/ViewComponents/JsonViewComponentResultTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/JsonViewComponentResultTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/ViewComponents/JsonViewComponentResultTest.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/JsonViewComponentResultTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/ViewComponents/ViewComponentConventionsTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/ViewComponentConventionsTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/ViewComponents/ViewComponentConventionsTest.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/ViewComponentConventionsTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/ViewComponents/ViewViewComponentResultTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/ViewViewComponentResultTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/ViewComponents/ViewViewComponentResultTest.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/ViewViewComponentResultTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/ViewDataDictionaryOfTModelTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewDataDictionaryOfTModelTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/ViewDataDictionaryOfTModelTest.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewDataDictionaryOfTModelTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/ViewDataDictionaryTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewDataDictionaryTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/ViewDataDictionaryTest.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewDataDictionaryTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/ViewEngineDescriptorExtensionsTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewEngineDescriptorExtensionsTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/ViewEngineDescriptorExtensionsTest.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewEngineDescriptorExtensionsTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/ViewEngineDescriptorTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewEngineDescriptorTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/ViewEngineDescriptorTest.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewEngineDescriptorTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/ViewExecutorTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewExecutorTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/ViewExecutorTest.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewExecutorTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Extensions.Test/ViewResultTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewResultTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Extensions.Test/ViewResultTest.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewResultTest.cs diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/project.json b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/project.json new file mode 100644 index 0000000000..4fdc0e3ff2 --- /dev/null +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/project.json @@ -0,0 +1,24 @@ +{ + "compilationOptions": { + "warningsAsErrors": "true" + }, + "dependencies": { + "Microsoft.AspNet.Mvc": "6.0.0-*", + "Microsoft.AspNet.Mvc.Formatters.Xml": "6.0.0-*", + "Microsoft.AspNet.Mvc.TestCommon": { "version": "6.0.0-*", "type": "build" }, + "Microsoft.AspNet.Testing": "1.0.0-*", + "Microsoft.Framework.DependencyInjection": "1.0.0-*", + "Microsoft.Framework.Logging.Testing": "1.0.0-*", + "Microsoft.Framework.WebEncoders.Testing": "1.0.0-*", + "Moq": "4.2.1312.1622", + "xunit.runner.aspnet": "2.0.0-aspnet-*" + }, + "commands": { + "test": "xunit.runner.aspnet" + }, + "frameworks": { + "dnx451": { + "compilationOptions": { "define": ["MOCK_SUPPORT"] } + } + } +} diff --git a/test/WebSites/ActionConstraintsWebSite/project.json b/test/WebSites/ActionConstraintsWebSite/project.json index 836f80c93a..c36c6087ed 100644 --- a/test/WebSites/ActionConstraintsWebSite/project.json +++ b/test/WebSites/ActionConstraintsWebSite/project.json @@ -6,7 +6,7 @@ "dependencies": { "Kestrel": "1.0.0-*", "Microsoft.AspNet.Mvc": "6.0.0-*", - "Microsoft.AspNet.Mvc.Xml": "6.0.0-*", + "Microsoft.AspNet.Mvc.Formatters.Xml": "6.0.0-*", "Microsoft.AspNet.Mvc.TestConfiguration": "1.0.0", "Microsoft.AspNet.Server.IIS": "1.0.0-*", "Microsoft.AspNet.Server.WebListener": "1.0.0-*", diff --git a/test/WebSites/ActionResultsWebSite/Controllers/XmlSerializerController.cs b/test/WebSites/ActionResultsWebSite/Controllers/XmlSerializerController.cs index 1f572c26d8..c9f16cc6ca 100644 --- a/test/WebSites/ActionResultsWebSite/Controllers/XmlSerializerController.cs +++ b/test/WebSites/ActionResultsWebSite/Controllers/XmlSerializerController.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.Xml; +using Microsoft.AspNet.Mvc.Formatters.Xml; namespace ActionResultsWebSite { diff --git a/test/WebSites/ActionResultsWebSite/project.json b/test/WebSites/ActionResultsWebSite/project.json index 836f80c93a..c36c6087ed 100644 --- a/test/WebSites/ActionResultsWebSite/project.json +++ b/test/WebSites/ActionResultsWebSite/project.json @@ -6,7 +6,7 @@ "dependencies": { "Kestrel": "1.0.0-*", "Microsoft.AspNet.Mvc": "6.0.0-*", - "Microsoft.AspNet.Mvc.Xml": "6.0.0-*", + "Microsoft.AspNet.Mvc.Formatters.Xml": "6.0.0-*", "Microsoft.AspNet.Mvc.TestConfiguration": "1.0.0", "Microsoft.AspNet.Server.IIS": "1.0.0-*", "Microsoft.AspNet.Server.WebListener": "1.0.0-*", diff --git a/test/WebSites/ApiExplorerWebSite/Startup.cs b/test/WebSites/ApiExplorerWebSite/Startup.cs index 6b890618c7..52fd2f529a 100644 --- a/test/WebSites/ApiExplorerWebSite/Startup.cs +++ b/test/WebSites/ApiExplorerWebSite/Startup.cs @@ -3,7 +3,7 @@ using Microsoft.AspNet.Builder; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.Xml; +using Microsoft.AspNet.Mvc.Formatters.Xml; using Microsoft.Framework.DependencyInjection; namespace ApiExplorerWebSite diff --git a/test/WebSites/ApiExplorerWebSite/project.json b/test/WebSites/ApiExplorerWebSite/project.json index 836f80c93a..c36c6087ed 100644 --- a/test/WebSites/ApiExplorerWebSite/project.json +++ b/test/WebSites/ApiExplorerWebSite/project.json @@ -6,7 +6,7 @@ "dependencies": { "Kestrel": "1.0.0-*", "Microsoft.AspNet.Mvc": "6.0.0-*", - "Microsoft.AspNet.Mvc.Xml": "6.0.0-*", + "Microsoft.AspNet.Mvc.Formatters.Xml": "6.0.0-*", "Microsoft.AspNet.Mvc.TestConfiguration": "1.0.0", "Microsoft.AspNet.Server.IIS": "1.0.0-*", "Microsoft.AspNet.Server.WebListener": "1.0.0-*", diff --git a/test/WebSites/ContentNegotiationWebSite/project.json b/test/WebSites/ContentNegotiationWebSite/project.json index 836f80c93a..c36c6087ed 100644 --- a/test/WebSites/ContentNegotiationWebSite/project.json +++ b/test/WebSites/ContentNegotiationWebSite/project.json @@ -6,7 +6,7 @@ "dependencies": { "Kestrel": "1.0.0-*", "Microsoft.AspNet.Mvc": "6.0.0-*", - "Microsoft.AspNet.Mvc.Xml": "6.0.0-*", + "Microsoft.AspNet.Mvc.Formatters.Xml": "6.0.0-*", "Microsoft.AspNet.Mvc.TestConfiguration": "1.0.0", "Microsoft.AspNet.Server.IIS": "1.0.0-*", "Microsoft.AspNet.Server.WebListener": "1.0.0-*", diff --git a/test/WebSites/CorsMiddlewareWebSite/project.json b/test/WebSites/CorsMiddlewareWebSite/project.json index e9345b24f0..a8266f177e 100644 --- a/test/WebSites/CorsMiddlewareWebSite/project.json +++ b/test/WebSites/CorsMiddlewareWebSite/project.json @@ -7,7 +7,7 @@ "Kestrel": "1.0.0-*", "Microsoft.AspNet.Cors": "1.0.0-*", "Microsoft.AspNet.Mvc": "6.0.0-*", - "Microsoft.AspNet.Mvc.Xml": "6.0.0-*", + "Microsoft.AspNet.Mvc.Formatters.Xml": "6.0.0-*", "Microsoft.AspNet.Mvc.TestConfiguration": "1.0.0", "Microsoft.AspNet.Server.IIS": "1.0.0-*", "Microsoft.AspNet.Server.WebListener": "1.0.0-*", diff --git a/test/WebSites/CorsWebSite/project.json b/test/WebSites/CorsWebSite/project.json index 615bd80180..9a414d42f5 100644 --- a/test/WebSites/CorsWebSite/project.json +++ b/test/WebSites/CorsWebSite/project.json @@ -7,7 +7,7 @@ "Kestrel": "1.0.0-*", "Microsoft.AspNet.Cors.Core": "1.0.0-*", "Microsoft.AspNet.Mvc": "6.0.0-*", - "Microsoft.AspNet.Mvc.Xml": "6.0.0-*", + "Microsoft.AspNet.Mvc.Formatters.Xml": "6.0.0-*", "Microsoft.AspNet.Mvc.TestConfiguration": "1.0.0", "Microsoft.AspNet.Server.IIS": "1.0.0-*", "Microsoft.AspNet.Server.WebListener": "1.0.0-*", diff --git a/test/WebSites/FiltersWebSite/Filters/ModifyResultsFilterAttribute.cs b/test/WebSites/FiltersWebSite/Filters/ModifyResultsFilterAttribute.cs index dd86a43c03..bdd34a26b3 100644 --- a/test/WebSites/FiltersWebSite/Filters/ModifyResultsFilterAttribute.cs +++ b/test/WebSites/FiltersWebSite/Filters/ModifyResultsFilterAttribute.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.Xml; +using Microsoft.AspNet.Mvc.Formatters.Xml; namespace FiltersWebSite { diff --git a/test/WebSites/FiltersWebSite/Filters/SerializationActionFilterAttribute.cs b/test/WebSites/FiltersWebSite/Filters/SerializationActionFilterAttribute.cs index 12ced4243a..6a3fb304e3 100644 --- a/test/WebSites/FiltersWebSite/Filters/SerializationActionFilterAttribute.cs +++ b/test/WebSites/FiltersWebSite/Filters/SerializationActionFilterAttribute.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.Xml; +using Microsoft.AspNet.Mvc.Formatters.Xml; namespace FiltersWebSite { diff --git a/test/WebSites/FiltersWebSite/project.json b/test/WebSites/FiltersWebSite/project.json index 836f80c93a..c36c6087ed 100644 --- a/test/WebSites/FiltersWebSite/project.json +++ b/test/WebSites/FiltersWebSite/project.json @@ -6,7 +6,7 @@ "dependencies": { "Kestrel": "1.0.0-*", "Microsoft.AspNet.Mvc": "6.0.0-*", - "Microsoft.AspNet.Mvc.Xml": "6.0.0-*", + "Microsoft.AspNet.Mvc.Formatters.Xml": "6.0.0-*", "Microsoft.AspNet.Mvc.TestConfiguration": "1.0.0", "Microsoft.AspNet.Server.IIS": "1.0.0-*", "Microsoft.AspNet.Server.WebListener": "1.0.0-*", diff --git a/test/WebSites/FormatterWebSite/Controllers/DataContractSerializerController.cs b/test/WebSites/FormatterWebSite/Controllers/DataContractSerializerController.cs index 2b960d26fa..55808e656c 100644 --- a/test/WebSites/FormatterWebSite/Controllers/DataContractSerializerController.cs +++ b/test/WebSites/FormatterWebSite/Controllers/DataContractSerializerController.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.Xml; +using Microsoft.AspNet.Mvc.Formatters.Xml; namespace FormatterWebSite { diff --git a/test/WebSites/FormatterWebSite/Controllers/XmlSerializerController.cs b/test/WebSites/FormatterWebSite/Controllers/XmlSerializerController.cs index 24212ed8d4..3a84a42bfe 100644 --- a/test/WebSites/FormatterWebSite/Controllers/XmlSerializerController.cs +++ b/test/WebSites/FormatterWebSite/Controllers/XmlSerializerController.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.Xml; +using Microsoft.AspNet.Mvc.Formatters.Xml; namespace FormatterWebSite { diff --git a/test/WebSites/FormatterWebSite/project.json b/test/WebSites/FormatterWebSite/project.json index 02308acbfb..c13d799204 100644 --- a/test/WebSites/FormatterWebSite/project.json +++ b/test/WebSites/FormatterWebSite/project.json @@ -6,7 +6,7 @@ "dependencies": { "Kestrel": "1.0.0-*", "Microsoft.AspNet.Mvc": "6.0.0-*", - "Microsoft.AspNet.Mvc.Xml": "6.0.0-*", + "Microsoft.AspNet.Mvc.Formatters.Xml": "6.0.0-*", "Microsoft.AspNet.Mvc.TestConfiguration": "1.0.0", "Microsoft.AspNet.Server.IIS": "1.0.0-*", "Microsoft.AspNet.Server.WebListener": "1.0.0-*", diff --git a/test/WebSites/ModelBindingWebSite/project.json b/test/WebSites/ModelBindingWebSite/project.json index 836f80c93a..c36c6087ed 100644 --- a/test/WebSites/ModelBindingWebSite/project.json +++ b/test/WebSites/ModelBindingWebSite/project.json @@ -6,7 +6,7 @@ "dependencies": { "Kestrel": "1.0.0-*", "Microsoft.AspNet.Mvc": "6.0.0-*", - "Microsoft.AspNet.Mvc.Xml": "6.0.0-*", + "Microsoft.AspNet.Mvc.Formatters.Xml": "6.0.0-*", "Microsoft.AspNet.Mvc.TestConfiguration": "1.0.0", "Microsoft.AspNet.Server.IIS": "1.0.0-*", "Microsoft.AspNet.Server.WebListener": "1.0.0-*", diff --git a/test/WebSites/XmlFormattersWebSite/PersonWrapper.cs b/test/WebSites/XmlFormattersWebSite/PersonWrapper.cs index 908d96aa86..34d9a02b8e 100644 --- a/test/WebSites/XmlFormattersWebSite/PersonWrapper.cs +++ b/test/WebSites/XmlFormattersWebSite/PersonWrapper.cs @@ -3,7 +3,7 @@ using System; using XmlFormattersWebSite.Models; -using Microsoft.AspNet.Mvc.Xml; +using Microsoft.AspNet.Mvc.Formatters.Xml; namespace XmlFormattersWebSite { diff --git a/test/WebSites/XmlFormattersWebSite/PersonWrapperProvider.cs b/test/WebSites/XmlFormattersWebSite/PersonWrapperProvider.cs index 96387399a6..8f288f738f 100644 --- a/test/WebSites/XmlFormattersWebSite/PersonWrapperProvider.cs +++ b/test/WebSites/XmlFormattersWebSite/PersonWrapperProvider.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNet.Mvc.Xml; +using Microsoft.AspNet.Mvc.Formatters.Xml; using XmlFormattersWebSite.Models; namespace XmlFormattersWebSite diff --git a/test/WebSites/XmlFormattersWebSite/PersonWrapperProviderFactory.cs b/test/WebSites/XmlFormattersWebSite/PersonWrapperProviderFactory.cs index 7e1a7f421f..878ddfe57e 100644 --- a/test/WebSites/XmlFormattersWebSite/PersonWrapperProviderFactory.cs +++ b/test/WebSites/XmlFormattersWebSite/PersonWrapperProviderFactory.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNet.Mvc.Xml; +using Microsoft.AspNet.Mvc.Formatters.Xml; using XmlFormattersWebSite.Models; namespace XmlFormattersWebSite diff --git a/test/WebSites/XmlFormattersWebSite/Startup.cs b/test/WebSites/XmlFormattersWebSite/Startup.cs index 2db33f5574..2196d53c4c 100644 --- a/test/WebSites/XmlFormattersWebSite/Startup.cs +++ b/test/WebSites/XmlFormattersWebSite/Startup.cs @@ -3,7 +3,7 @@ using Microsoft.AspNet.Builder; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.Xml; +using Microsoft.AspNet.Mvc.Formatters.Xml; using Microsoft.AspNet.Routing; using Microsoft.Framework.DependencyInjection; using Microsoft.Net.Http.Headers; diff --git a/test/WebSites/XmlFormattersWebSite/project.json b/test/WebSites/XmlFormattersWebSite/project.json index 495f2cba30..7cbd23aadb 100644 --- a/test/WebSites/XmlFormattersWebSite/project.json +++ b/test/WebSites/XmlFormattersWebSite/project.json @@ -6,7 +6,7 @@ "dependencies": { "Kestrel": "1.0.0-*", "Microsoft.AspNet.Mvc": "6.0.0-*", - "Microsoft.AspNet.Mvc.Xml": "6.0.0-*", + "Microsoft.AspNet.Mvc.Formatters.Xml": "6.0.0-*", "Microsoft.AspNet.Mvc.TestConfiguration": "1.0.0", "Microsoft.AspNet.Server.IIS": "1.0.0-*", "Microsoft.AspNet.Server.WebListener": "1.0.0-*",