From 2e6e5307f6d62e3bf936d93529c200cb767f094c Mon Sep 17 00:00:00 2001 From: David Fowler Date: Thu, 28 Aug 2014 22:14:10 -0700 Subject: [PATCH] Updated to use the new target framework in project.json --- samples/MvcSample.Web/project.json | 4 ++-- src/Microsoft.AspNet.Mvc.Common/project.json | 4 ++-- .../ReflectedActionDescriptorProvider.cs | 2 +- src/Microsoft.AspNet.Mvc.Core/project.json | 2 +- src/Microsoft.AspNet.Mvc.HeaderValueAbstractions/project.json | 4 ++-- src/Microsoft.AspNet.Mvc.ModelBinding/project.json | 2 +- src/Microsoft.AspNet.Mvc.Razor.Host/project.json | 2 +- src/Microsoft.AspNet.Mvc.Razor/project.json | 2 +- src/Microsoft.AspNet.Mvc/project.json | 4 ++-- test/Microsoft.AspNet.Mvc.Core.Test/project.json | 2 +- test/Microsoft.AspNet.Mvc.FunctionalTests/project.json | 4 ++-- .../project.json | 2 +- test/Microsoft.AspNet.Mvc.ModelBinding.Test/project.json | 2 +- test/Microsoft.AspNet.Mvc.Razor.Host.Test/project.json | 2 +- test/Microsoft.AspNet.Mvc.Razor.Test/project.json | 2 +- test/Microsoft.AspNet.Mvc.Test/project.json | 2 +- test/WebSites/ActivatorWebSite/project.json | 4 ++-- test/WebSites/AddServicesWebSite/project.json | 4 ++-- test/WebSites/AntiForgeryWebSite/project.json | 4 ++-- test/WebSites/AutofacWebSite/project.json | 2 +- test/WebSites/BasicWebSite/project.json | 4 ++-- test/WebSites/CompositeViewEngine/project.json | 4 ++-- test/WebSites/ConnegWebSite/project.json | 4 ++-- test/WebSites/FormatterWebSite/project.json | 4 ++-- test/WebSites/InlineConstraintsWebSite/project.json | 4 ++-- .../Microsoft.AspNet.Mvc.TestConfiguration/project.json | 4 ++-- test/WebSites/ModelBindingWebSite/project.json | 4 ++-- test/WebSites/RazorWebSite/Project.json | 4 ++-- test/WebSites/RoutingWebSite/project.json | 4 ++-- test/WebSites/ValueProvidersSite/project.json | 4 ++-- 30 files changed, 48 insertions(+), 48 deletions(-) diff --git a/samples/MvcSample.Web/project.json b/samples/MvcSample.Web/project.json index f1a2f3a7b..583f258a4 100644 --- a/samples/MvcSample.Web/project.json +++ b/samples/MvcSample.Web/project.json @@ -1,4 +1,4 @@ -{ +{ "compilationOptions": { "warningsAsErrors": true }, @@ -27,7 +27,7 @@ "Autofac": "3.3.0" } }, - "k10": { + "aspnetcore50": { "dependencies": { "System.ComponentModel": "4.0.0.0", "System.Console": "4.0.0.0", diff --git a/src/Microsoft.AspNet.Mvc.Common/project.json b/src/Microsoft.AspNet.Mvc.Common/project.json index 7c0c83f40..1eae4c231 100644 --- a/src/Microsoft.AspNet.Mvc.Common/project.json +++ b/src/Microsoft.AspNet.Mvc.Common/project.json @@ -1,4 +1,4 @@ -{ +{ "version": "6.0.0-*", "shared": "*.cs", "dependencies": { @@ -9,7 +9,7 @@ }, "frameworks": { "net45": {}, - "k10": { + "aspnetcore50": { "dependencies": { "System.Text.Encoding.Extensions": "4.0.10.0" } diff --git a/src/Microsoft.AspNet.Mvc.Core/ReflectedActionDescriptorProvider.cs b/src/Microsoft.AspNet.Mvc.Core/ReflectedActionDescriptorProvider.cs index 0090626a5..526d2ad2a 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ReflectedActionDescriptorProvider.cs +++ b/src/Microsoft.AspNet.Mvc.Core/ReflectedActionDescriptorProvider.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; using System.Linq; -#if K10 +#if ASPNETCORE50 using System.Reflection; #endif using Microsoft.AspNet.Mvc.Core; diff --git a/src/Microsoft.AspNet.Mvc.Core/project.json b/src/Microsoft.AspNet.Mvc.Core/project.json index 2655d5cde..292de2382 100644 --- a/src/Microsoft.AspNet.Mvc.Core/project.json +++ b/src/Microsoft.AspNet.Mvc.Core/project.json @@ -24,7 +24,7 @@ "System.Xml": "" } }, - "k10": { + "aspnetcore50": { "dependencies": { "Microsoft.CSharp": "4.0.0.0", "System.Collections": "4.0.10.0", diff --git a/src/Microsoft.AspNet.Mvc.HeaderValueAbstractions/project.json b/src/Microsoft.AspNet.Mvc.HeaderValueAbstractions/project.json index 710b4d10b..6539a34f2 100644 --- a/src/Microsoft.AspNet.Mvc.HeaderValueAbstractions/project.json +++ b/src/Microsoft.AspNet.Mvc.HeaderValueAbstractions/project.json @@ -3,7 +3,7 @@ "dependencies": {}, "frameworks": { "net45": {}, - "k10": { + "aspnetcore50": { "dependencies": { "System.Collections": "4.0.10.0", "System.Diagnostics.Debug": "4.0.10.0", @@ -13,4 +13,4 @@ } } } -} \ No newline at end of file +} diff --git a/src/Microsoft.AspNet.Mvc.ModelBinding/project.json b/src/Microsoft.AspNet.Mvc.ModelBinding/project.json index cabb1feba..0bab805a8 100644 --- a/src/Microsoft.AspNet.Mvc.ModelBinding/project.json +++ b/src/Microsoft.AspNet.Mvc.ModelBinding/project.json @@ -19,7 +19,7 @@ "System.Runtime.Serialization": "" } }, - "k10": { + "aspnetcore50": { "dependencies": { "System.Collections": "4.0.10.0", "System.Collections.Concurrent": "4.0.0.0", diff --git a/src/Microsoft.AspNet.Mvc.Razor.Host/project.json b/src/Microsoft.AspNet.Mvc.Razor.Host/project.json index 7961146f7..4a226d967 100644 --- a/src/Microsoft.AspNet.Mvc.Razor.Host/project.json +++ b/src/Microsoft.AspNet.Mvc.Razor.Host/project.json @@ -18,7 +18,7 @@ "System.Xml.Linq": "" } }, - "k10": { + "aspnetcore50": { "dependencies": { "System.Collections": "4.0.10.0", "System.Collections.Concurrent": "4.0.0.0", diff --git a/src/Microsoft.AspNet.Mvc.Razor/project.json b/src/Microsoft.AspNet.Mvc.Razor/project.json index 8a37e104c..82e381a38 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/project.json +++ b/src/Microsoft.AspNet.Mvc.Razor/project.json @@ -25,7 +25,7 @@ "System.Xml.Linq": "" } }, - "k10": { + "aspnetcore50": { "dependencies": { "System.Collections": "4.0.10.0", "System.Collections.Concurrent": "4.0.0.0", diff --git a/src/Microsoft.AspNet.Mvc/project.json b/src/Microsoft.AspNet.Mvc/project.json index 8eda38825..60cffff5b 100644 --- a/src/Microsoft.AspNet.Mvc/project.json +++ b/src/Microsoft.AspNet.Mvc/project.json @@ -1,4 +1,4 @@ -{ +{ "version": "6.0.0-*", "compilationOptions": { "warningsAsErrors": true @@ -19,7 +19,7 @@ }, "frameworks": { "net45": {}, - "k10": { + "aspnetcore50": { "dependencies": { "System.Diagnostics.Debug": "4.0.10.0", "System.Linq": "4.0.0.0", diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/project.json b/test/Microsoft.AspNet.Mvc.Core.Test/project.json index d5d27f9f2..554730052 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/project.json +++ b/test/Microsoft.AspNet.Mvc.Core.Test/project.json @@ -1,4 +1,4 @@ -{ +{ "compilationOptions": { "warningsAsErrors": true }, diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/project.json b/test/Microsoft.AspNet.Mvc.FunctionalTests/project.json index 52c6c4f7b..7cdc926bb 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/project.json +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/project.json @@ -1,4 +1,4 @@ -{ +{ "compilationOptions": { "warningsAsErrors": true }, @@ -35,6 +35,6 @@ "AutofacWebSite": "" } }, - "k10": { } + "aspnetcore50": { } } } diff --git a/test/Microsoft.AspNet.Mvc.HeaderValueAbstractions.Test/project.json b/test/Microsoft.AspNet.Mvc.HeaderValueAbstractions.Test/project.json index 5b8e9aaba..df505dc94 100644 --- a/test/Microsoft.AspNet.Mvc.HeaderValueAbstractions.Test/project.json +++ b/test/Microsoft.AspNet.Mvc.HeaderValueAbstractions.Test/project.json @@ -15,4 +15,4 @@ } } } -} \ No newline at end of file +} diff --git a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/project.json b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/project.json index 2aaab60a2..decb24434 100644 --- a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/project.json +++ b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/project.json @@ -27,7 +27,7 @@ "System.Runtime.Serialization": "" } }, - "k10" : { + "aspnetcore50" : { "dependencies": { "System.Collections": "4.0.10.0", "System.ComponentModel": "4.0.0.0", diff --git a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/project.json b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/project.json index 95907e438..8201a1bb2 100644 --- a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/project.json +++ b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/project.json @@ -1,4 +1,4 @@ -{ +{ "compilationOptions": { "warningsAsErrors": false }, diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/project.json b/test/Microsoft.AspNet.Mvc.Razor.Test/project.json index 63f3a5ffe..ae8858958 100644 --- a/test/Microsoft.AspNet.Mvc.Razor.Test/project.json +++ b/test/Microsoft.AspNet.Mvc.Razor.Test/project.json @@ -1,4 +1,4 @@ -{ +{ "compilationOptions": { "warningsAsErrors": false }, diff --git a/test/Microsoft.AspNet.Mvc.Test/project.json b/test/Microsoft.AspNet.Mvc.Test/project.json index 10f5663a7..3630ac9e3 100644 --- a/test/Microsoft.AspNet.Mvc.Test/project.json +++ b/test/Microsoft.AspNet.Mvc.Test/project.json @@ -1,4 +1,4 @@ -{ +{ "compilationOptions": { "warningsAsErrors": true }, diff --git a/test/WebSites/ActivatorWebSite/project.json b/test/WebSites/ActivatorWebSite/project.json index a6de3a4d4..c9a371827 100644 --- a/test/WebSites/ActivatorWebSite/project.json +++ b/test/WebSites/ActivatorWebSite/project.json @@ -1,4 +1,4 @@ -{ +{ "dependencies": { "Microsoft.AspNet.Mvc": "", "Microsoft.AspNet.Server.IIS": "1.0.0-*", @@ -6,6 +6,6 @@ }, "frameworks": { "net45": { }, - "k10": { } + "aspnetcore50": { } } } diff --git a/test/WebSites/AddServicesWebSite/project.json b/test/WebSites/AddServicesWebSite/project.json index 81cb7a4e8..766a2e4e4 100644 --- a/test/WebSites/AddServicesWebSite/project.json +++ b/test/WebSites/AddServicesWebSite/project.json @@ -1,10 +1,10 @@ -{ +{ "dependencies": { "Microsoft.AspNet.Mvc": "", "Microsoft.AspNet.Mvc.TestConfiguration": "" }, "frameworks": { "net45": { }, - "k10": { } + "aspnetcore50": { } } } diff --git a/test/WebSites/AntiForgeryWebSite/project.json b/test/WebSites/AntiForgeryWebSite/project.json index d3b6d14ea..f3e9978e9 100644 --- a/test/WebSites/AntiForgeryWebSite/project.json +++ b/test/WebSites/AntiForgeryWebSite/project.json @@ -1,4 +1,4 @@ -{ +{ "dependencies": { "Microsoft.AspNet.Mvc": "", "Microsoft.AspNet.Mvc.TestConfiguration": "", @@ -8,6 +8,6 @@ }, "frameworks": { "net45": { }, - "k10": { } + "aspnetcore50": { } } } diff --git a/test/WebSites/AutofacWebSite/project.json b/test/WebSites/AutofacWebSite/project.json index 7b19247d8..ef196f596 100644 --- a/test/WebSites/AutofacWebSite/project.json +++ b/test/WebSites/AutofacWebSite/project.json @@ -1,4 +1,4 @@ -{ +{ "dependencies": { "Microsoft.AspNet.Server.IIS": "1.0.0-*", "Microsoft.AspNet.Mvc": "", diff --git a/test/WebSites/BasicWebSite/project.json b/test/WebSites/BasicWebSite/project.json index ea4397efb..a1d5f6657 100644 --- a/test/WebSites/BasicWebSite/project.json +++ b/test/WebSites/BasicWebSite/project.json @@ -1,4 +1,4 @@ -{ +{ "dependencies": { "Microsoft.AspNet.Mvc": "", "Microsoft.AspNet.Server.IIS": "1.0.0-*", @@ -7,6 +7,6 @@ }, "frameworks": { "net45": { }, - "k10": { } + "aspnetcore50": { } } } diff --git a/test/WebSites/CompositeViewEngine/project.json b/test/WebSites/CompositeViewEngine/project.json index ea4397efb..a1d5f6657 100644 --- a/test/WebSites/CompositeViewEngine/project.json +++ b/test/WebSites/CompositeViewEngine/project.json @@ -1,4 +1,4 @@ -{ +{ "dependencies": { "Microsoft.AspNet.Mvc": "", "Microsoft.AspNet.Server.IIS": "1.0.0-*", @@ -7,6 +7,6 @@ }, "frameworks": { "net45": { }, - "k10": { } + "aspnetcore50": { } } } diff --git a/test/WebSites/ConnegWebSite/project.json b/test/WebSites/ConnegWebSite/project.json index a6de3a4d4..c9a371827 100644 --- a/test/WebSites/ConnegWebSite/project.json +++ b/test/WebSites/ConnegWebSite/project.json @@ -1,4 +1,4 @@ -{ +{ "dependencies": { "Microsoft.AspNet.Mvc": "", "Microsoft.AspNet.Server.IIS": "1.0.0-*", @@ -6,6 +6,6 @@ }, "frameworks": { "net45": { }, - "k10": { } + "aspnetcore50": { } } } diff --git a/test/WebSites/FormatterWebSite/project.json b/test/WebSites/FormatterWebSite/project.json index 7c0d0637e..36a977ac7 100644 --- a/test/WebSites/FormatterWebSite/project.json +++ b/test/WebSites/FormatterWebSite/project.json @@ -1,10 +1,10 @@ -{ +{ "dependencies": { "Microsoft.AspNet.Mvc": "", "Microsoft.AspNet.Mvc.TestConfiguration": "" }, "configurations": { "net45": { }, - "k10": { } + "aspnetcore50": { } } } diff --git a/test/WebSites/InlineConstraintsWebSite/project.json b/test/WebSites/InlineConstraintsWebSite/project.json index b1312b51d..1e96edaef 100644 --- a/test/WebSites/InlineConstraintsWebSite/project.json +++ b/test/WebSites/InlineConstraintsWebSite/project.json @@ -1,4 +1,4 @@ -{ +{ "dependencies": { "Microsoft.AspNet.Mvc": "", "Microsoft.AspNet.Server.IIS": "1.0.0-*", @@ -7,6 +7,6 @@ }, "frameworks": { "net45": { }, - "k10": { } + "aspnetcore50": { } } } diff --git a/test/WebSites/Microsoft.AspNet.Mvc.TestConfiguration/project.json b/test/WebSites/Microsoft.AspNet.Mvc.TestConfiguration/project.json index bb3c6cf99..7c680029e 100644 --- a/test/WebSites/Microsoft.AspNet.Mvc.TestConfiguration/project.json +++ b/test/WebSites/Microsoft.AspNet.Mvc.TestConfiguration/project.json @@ -1,4 +1,4 @@ -{ +{ "dependencies": { "Microsoft.AspNet.Http": "1.0.0-*", "Microsoft.Framework.ConfigurationModel": "1.0.0-*", @@ -6,6 +6,6 @@ }, "frameworks" : { "net45" : { }, - "k10" : { } + "aspnetcore50" : { } } } diff --git a/test/WebSites/ModelBindingWebSite/project.json b/test/WebSites/ModelBindingWebSite/project.json index 7c0d0637e..36a977ac7 100644 --- a/test/WebSites/ModelBindingWebSite/project.json +++ b/test/WebSites/ModelBindingWebSite/project.json @@ -1,10 +1,10 @@ -{ +{ "dependencies": { "Microsoft.AspNet.Mvc": "", "Microsoft.AspNet.Mvc.TestConfiguration": "" }, "configurations": { "net45": { }, - "k10": { } + "aspnetcore50": { } } } diff --git a/test/WebSites/RazorWebSite/Project.json b/test/WebSites/RazorWebSite/Project.json index a6de3a4d4..c9a371827 100644 --- a/test/WebSites/RazorWebSite/Project.json +++ b/test/WebSites/RazorWebSite/Project.json @@ -1,4 +1,4 @@ -{ +{ "dependencies": { "Microsoft.AspNet.Mvc": "", "Microsoft.AspNet.Server.IIS": "1.0.0-*", @@ -6,6 +6,6 @@ }, "frameworks": { "net45": { }, - "k10": { } + "aspnetcore50": { } } } diff --git a/test/WebSites/RoutingWebSite/project.json b/test/WebSites/RoutingWebSite/project.json index 9313f3f56..04d069632 100644 --- a/test/WebSites/RoutingWebSite/project.json +++ b/test/WebSites/RoutingWebSite/project.json @@ -1,4 +1,4 @@ -{ +{ "dependencies": { "Microsoft.AspNet.Mvc": "", "Microsoft.AspNet.Mvc.TestConfiguration": "", @@ -6,6 +6,6 @@ }, "frameworks": { "net45": { }, - "k10": { } + "aspnetcore50": { } } } diff --git a/test/WebSites/ValueProvidersSite/project.json b/test/WebSites/ValueProvidersSite/project.json index 8c1ff28de..a452066a7 100644 --- a/test/WebSites/ValueProvidersSite/project.json +++ b/test/WebSites/ValueProvidersSite/project.json @@ -1,4 +1,4 @@ -{ +{ "dependencies": { "Microsoft.AspNet.Mvc": "", "Microsoft.AspNet.Server.IIS": "1.0.0-*", @@ -7,6 +7,6 @@ }, "configurations": { "net45": { }, - "k10": { } + "aspnetcore50": { } } }