diff --git a/Mvc.sln b/Mvc.sln index 45da5d60ac..d76f22b480 100644 --- a/Mvc.sln +++ b/Mvc.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.22604.0 +VisualStudioVersion = 14.0.22606.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{DAAE4C74-D06F-4874-A166-33305D2643CE}" EndProject @@ -138,6 +138,8 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ControllersFromServicesClas EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RazorCompilerCacheWebSite", "test\WebSites\RazorCompilerCacheWebSite\RazorCompilerCacheWebSite.kproj", "{42C5D417-4060-48F4-BB28-E9E179007779}" EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.PageExecutionInstrumentation", "src\Microsoft.AspNet.PageExecutionInstrumentation\Microsoft.AspNet.PageExecutionInstrumentation.kproj", "{4DA2D7C1-A7B6-4C01-B57D-89E6EA4609DE}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -736,18 +738,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 - {87AB84B2-22C1-43C6-BB8A-1D327B446FB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87AB84B2-22C1-43C6-BB8A-1D327B446FB0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87AB84B2-22C1-43C6-BB8A-1D327B446FB0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {87AB84B2-22C1-43C6-BB8A-1D327B446FB0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {87AB84B2-22C1-43C6-BB8A-1D327B446FB0}.Debug|x86.ActiveCfg = Debug|Any CPU - {87AB84B2-22C1-43C6-BB8A-1D327B446FB0}.Debug|x86.Build.0 = Debug|Any CPU - {87AB84B2-22C1-43C6-BB8A-1D327B446FB0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87AB84B2-22C1-43C6-BB8A-1D327B446FB0}.Release|Any CPU.Build.0 = Release|Any CPU - {87AB84B2-22C1-43C6-BB8A-1D327B446FB0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {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 @@ -808,6 +798,18 @@ Global {42C5D417-4060-48F4-BB28-E9E179007779}.Release|Mixed Platforms.Build.0 = Release|Any CPU {42C5D417-4060-48F4-BB28-E9E179007779}.Release|x86.ActiveCfg = Release|Any CPU {42C5D417-4060-48F4-BB28-E9E179007779}.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 + {4DA2D7C1-A7B6-4C01-B57D-89E6EA4609DE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {4DA2D7C1-A7B6-4C01-B57D-89E6EA4609DE}.Debug|x86.ActiveCfg = Debug|Any CPU + {4DA2D7C1-A7B6-4C01-B57D-89E6EA4609DE}.Debug|x86.Build.0 = Debug|Any CPU + {4DA2D7C1-A7B6-4C01-B57D-89E6EA4609DE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4DA2D7C1-A7B6-4C01-B57D-89E6EA4609DE}.Release|Any CPU.Build.0 = Release|Any CPU + {4DA2D7C1-A7B6-4C01-B57D-89E6EA4609DE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {4DA2D7C1-A7B6-4C01-B57D-89E6EA4609DE}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {4DA2D7C1-A7B6-4C01-B57D-89E6EA4609DE}.Release|x86.ActiveCfg = Release|Any CPU + {4DA2D7C1-A7B6-4C01-B57D-89E6EA4609DE}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -875,5 +877,6 @@ Global {983741B2-4424-4ED1-9B03-7675A67230C8} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C} {551DC89E-2A13-4CF2-83D7-1ADD802443D5} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C} {42C5D417-4060-48F4-BB28-E9E179007779} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C} + {4DA2D7C1-A7B6-4C01-B57D-89E6EA4609DE} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E} EndGlobalSection EndGlobal diff --git a/src/Microsoft.AspNet.Mvc.ModelBinding/Metadata/CachedModelMetadata.cs b/src/Microsoft.AspNet.Mvc.ModelBinding/Metadata/CachedModelMetadata.cs index 8ea9dbca04..fb41d9df14 100644 --- a/src/Microsoft.AspNet.Mvc.ModelBinding/Metadata/CachedModelMetadata.cs +++ b/src/Microsoft.AspNet.Mvc.ModelBinding/Metadata/CachedModelMetadata.cs @@ -434,7 +434,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding // Sealing for consistency with other properties. // ModelMetadata already caches the collection and we have no use case for a ComputeProperties() method. /// - public override ModelPropertyCollection Properties + public sealed override ModelPropertyCollection Properties { get { diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/Microsoft.AspNet.Mvc.WebApiCompatShim.kproj b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/Microsoft.AspNet.Mvc.WebApiCompatShim.kproj index 0825001b2c..1b64a7026f 100644 --- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/Microsoft.AspNet.Mvc.WebApiCompatShim.kproj +++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/Microsoft.AspNet.Mvc.WebApiCompatShim.kproj @@ -14,9 +14,4 @@ 2.0 - - - - - \ No newline at end of file diff --git a/src/Microsoft.AspNet.Mvc.Xml/Microsoft.AspNet.Mvc.Xml.kproj b/src/Microsoft.AspNet.Mvc.Xml/Microsoft.AspNet.Mvc.Xml.kproj index 8f5d8ba80c..afd48314d6 100644 --- a/src/Microsoft.AspNet.Mvc.Xml/Microsoft.AspNet.Mvc.Xml.kproj +++ b/src/Microsoft.AspNet.Mvc.Xml/Microsoft.AspNet.Mvc.Xml.kproj @@ -1,5 +1,5 @@  - + 14.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) @@ -7,18 +7,11 @@ 9c632df0-dc06-410b-95ae-b5423702e84f - - - - + ..\..\artifacts\obj\$(MSBuildProjectName) + ..\..\artifacts\bin\$(MSBuildProjectName)\ 2.0 - - - - - \ No newline at end of file diff --git a/src/Microsoft.AspNet.PageExecutionInstrumentation/Microsoft.AspNet.PageExecutionInstrumentation.kproj b/src/Microsoft.AspNet.PageExecutionInstrumentation/Microsoft.AspNet.PageExecutionInstrumentation.kproj index 18f473c9d9..ee2400e5af 100644 --- a/src/Microsoft.AspNet.PageExecutionInstrumentation/Microsoft.AspNet.PageExecutionInstrumentation.kproj +++ b/src/Microsoft.AspNet.PageExecutionInstrumentation/Microsoft.AspNet.PageExecutionInstrumentation.kproj @@ -1,5 +1,5 @@  - + 14.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) @@ -7,11 +7,8 @@ 4da2d7c1-a7b6-4c01-b57d-89e6ea4609de - - - - - + ..\..\artifacts\obj\$(MSBuildProjectName) + ..\..\artifacts\bin\$(MSBuildProjectName)\ 2.0 diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Microsoft.AspNet.Mvc.Core.Test.kproj b/test/Microsoft.AspNet.Mvc.Core.Test/Microsoft.AspNet.Mvc.Core.Test.kproj index 1225141df4..1b773ab251 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Microsoft.AspNet.Mvc.Core.Test.kproj +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Microsoft.AspNet.Mvc.Core.Test.kproj @@ -14,9 +14,4 @@ 2.0 - - - - - \ No newline at end of file diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/Microsoft.AspNet.Mvc.FunctionalTests.kproj b/test/Microsoft.AspNet.Mvc.FunctionalTests/Microsoft.AspNet.Mvc.FunctionalTests.kproj index 99b86b5642..f97db678df 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/Microsoft.AspNet.Mvc.FunctionalTests.kproj +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/Microsoft.AspNet.Mvc.FunctionalTests.kproj @@ -10,19 +10,8 @@ ..\..\artifacts\obj\$(MSBuildProjectName) ..\..\artifacts\bin\$(MSBuildProjectName)\ - - Microsoft.AspNet.Mvc.FunctionalTests - - - Microsoft.AspNet.Mvc.FunctionalTests - 2.0 - - - - - \ No newline at end of file diff --git a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Metadata/CachedDataAnnotationsModelMetadataTest.cs b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Metadata/CachedDataAnnotationsModelMetadataTest.cs index ae225ff1b2..cd069136e7 100644 --- a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Metadata/CachedDataAnnotationsModelMetadataTest.cs +++ b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Metadata/CachedDataAnnotationsModelMetadataTest.cs @@ -429,7 +429,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding } [Fact] - private void EditFormatString_DoesNotAffectDisplayFormat() + public void EditFormatString_DoesNotAffectDisplayFormat() { // Arrange var provider = new DataAnnotationsModelMetadataProvider(); @@ -448,7 +448,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding } [Fact] - private void DisplayFormatString_DoesNotAffectEditFormat() + public void DisplayFormatString_DoesNotAffectEditFormat() { // Arrange var provider = new DataAnnotationsModelMetadataProvider(); diff --git a/test/Microsoft.AspNet.Mvc.Xml.Test/Microsoft.AspNet.Mvc.Xml.Test.kproj b/test/Microsoft.AspNet.Mvc.Xml.Test/Microsoft.AspNet.Mvc.Xml.Test.kproj index 5e40fb5442..c5f1e39bbd 100644 --- a/test/Microsoft.AspNet.Mvc.Xml.Test/Microsoft.AspNet.Mvc.Xml.Test.kproj +++ b/test/Microsoft.AspNet.Mvc.Xml.Test/Microsoft.AspNet.Mvc.Xml.Test.kproj @@ -7,7 +7,6 @@ 22019146-bdfa-442e-8c8e-345fb9644578 - Microsoft.AspNet.Mvc.Xml.Test ..\..\artifacts\obj\$(MSBuildProjectName) ..\..\artifacts\bin\$(MSBuildProjectName)\ @@ -15,9 +14,4 @@ 2.0 - - - - - \ No newline at end of file diff --git a/test/WebSites/ActionConstraintsWebSite/ActionConstraintsWebSite.kproj b/test/WebSites/ActionConstraintsWebSite/ActionConstraintsWebSite.kproj index cb32117971..6dc9eaf4ae 100644 --- a/test/WebSites/ActionConstraintsWebSite/ActionConstraintsWebSite.kproj +++ b/test/WebSites/ActionConstraintsWebSite/ActionConstraintsWebSite.kproj @@ -15,9 +15,4 @@ 41642 - - - - - \ No newline at end of file diff --git a/test/WebSites/ControllersFromServicesClassLibrary/ControllersFromServicesClassLibrary.kproj b/test/WebSites/ControllersFromServicesClassLibrary/ControllersFromServicesClassLibrary.kproj index 95b3103159..c21622b9ec 100644 --- a/test/WebSites/ControllersFromServicesClassLibrary/ControllersFromServicesClassLibrary.kproj +++ b/test/WebSites/ControllersFromServicesClassLibrary/ControllersFromServicesClassLibrary.kproj @@ -1,5 +1,5 @@  - + 14.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) @@ -7,11 +7,8 @@ 551dc89e-2a13-4cf2-83d7-1add802443d5 - - - - - + ..\..\..\artifacts\obj\$(MSBuildProjectName) + ..\..\..\artifacts\bin\$(MSBuildProjectName)\ 2.0 diff --git a/test/WebSites/ControllersFromServicesWebSite/ControllersFromServicesWebSite.kproj b/test/WebSites/ControllersFromServicesWebSite/ControllersFromServicesWebSite.kproj index 0e4d50e9d2..42289344da 100644 --- a/test/WebSites/ControllersFromServicesWebSite/ControllersFromServicesWebSite.kproj +++ b/test/WebSites/ControllersFromServicesWebSite/ControllersFromServicesWebSite.kproj @@ -1,5 +1,5 @@  - + 14.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) @@ -7,10 +7,8 @@ 983741b2-4424-4ed1-9b03-7675a67230c8 - - - - + ..\..\..\artifacts\obj\$(MSBuildProjectName) + ..\..\..\artifacts\bin\$(MSBuildProjectName)\ 2.0 diff --git a/test/WebSites/CustomRouteWebSite/CustomRouteWebSite.kproj b/test/WebSites/CustomRouteWebSite/CustomRouteWebSite.kproj index fa333aa175..50fd99a6c3 100644 --- a/test/WebSites/CustomRouteWebSite/CustomRouteWebSite.kproj +++ b/test/WebSites/CustomRouteWebSite/CustomRouteWebSite.kproj @@ -7,7 +7,6 @@ 364ec3c6-c9db-45e0-a0f2-1ee61e4b429b - CustomRouteWebSite ..\..\..\artifacts\obj\$(MSBuildProjectName) ..\..\..\artifacts\bin\$(MSBuildProjectName)\ diff --git a/test/WebSites/FormatFilterWebSite/FormatFilterWebSite.kproj b/test/WebSites/FormatFilterWebSite/FormatFilterWebSite.kproj index 7cd6d33886..f6cc09d386 100644 --- a/test/WebSites/FormatFilterWebSite/FormatFilterWebSite.kproj +++ b/test/WebSites/FormatFilterWebSite/FormatFilterWebSite.kproj @@ -7,7 +7,6 @@ ac9be567-540e-4c70-90c2-aaf021307a80 - FormatFilterWebSite ..\..\..\artifacts\obj\$(MSBuildProjectName) ..\..\..\artifacts\bin\$(MSBuildProjectName)\ @@ -16,9 +15,4 @@ 51135 - - - - - \ No newline at end of file diff --git a/test/WebSites/InlineConstraintsWebSite/InlineConstraintsWebSite.kproj b/test/WebSites/InlineConstraintsWebSite/InlineConstraintsWebSite.kproj index 1ed652f5f9..ca3d780f27 100644 --- a/test/WebSites/InlineConstraintsWebSite/InlineConstraintsWebSite.kproj +++ b/test/WebSites/InlineConstraintsWebSite/InlineConstraintsWebSite.kproj @@ -3,7 +3,6 @@ 14.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - 45283 @@ -13,6 +12,7 @@ 2.0 + 45283 - + \ No newline at end of file diff --git a/test/WebSites/RazorCompilerCacheWebSite/RazorCompilerCacheWebSite.kproj b/test/WebSites/RazorCompilerCacheWebSite/RazorCompilerCacheWebSite.kproj index 120a5a7809..001015a3c4 100644 --- a/test/WebSites/RazorCompilerCacheWebSite/RazorCompilerCacheWebSite.kproj +++ b/test/WebSites/RazorCompilerCacheWebSite/RazorCompilerCacheWebSite.kproj @@ -1,5 +1,5 @@  - + 14.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) @@ -7,10 +7,8 @@ 42c5d417-4060-48f4-bb28-e9e179007779 - - - - + ..\..\..\artifacts\obj\$(MSBuildProjectName) + ..\..\..\artifacts\bin\$(MSBuildProjectName)\ 2.0 diff --git a/test/WebSites/ValidationWebSite/ValidationWebSite.kproj b/test/WebSites/ValidationWebSite/ValidationWebSite.kproj index 5aede73054..a08a0d244b 100644 --- a/test/WebSites/ValidationWebSite/ValidationWebSite.kproj +++ b/test/WebSites/ValidationWebSite/ValidationWebSite.kproj @@ -15,9 +15,4 @@ 49635 - - - - - \ No newline at end of file diff --git a/test/WebSites/XmlFormattersWebSite/XmlFormattersWebSite.kproj b/test/WebSites/XmlFormattersWebSite/XmlFormattersWebSite.kproj index 3802cbcc0f..13fec93697 100644 --- a/test/WebSites/XmlFormattersWebSite/XmlFormattersWebSite.kproj +++ b/test/WebSites/XmlFormattersWebSite/XmlFormattersWebSite.kproj @@ -1,5 +1,5 @@  - + 14.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) @@ -7,19 +7,12 @@ c3123a70-41c4-4122-ad1c-d35df8958dd7 - - - - + ..\..\..\artifacts\obj\$(MSBuildProjectName) + ..\..\..\artifacts\bin\$(MSBuildProjectName)\ 2.0 46481 - - - - - \ No newline at end of file