diff --git a/samples/MvcSample.Web/Monitoring/MonitoringMiddlware.cs b/samples/MvcSample.Web/Monitoring/MonitoringMiddlware.cs
index da3bbfeaa1..936ccf7ddf 100644
--- a/samples/MvcSample.Web/Monitoring/MonitoringMiddlware.cs
+++ b/samples/MvcSample.Web/Monitoring/MonitoringMiddlware.cs
@@ -1,4 +1,4 @@
-#if NET45
+#if ASPNET50
using System;
using System.Collections.Generic;
using System.Linq;
@@ -105,4 +105,4 @@ namespace MvcSample.Web
}
}
}
-#endif
\ No newline at end of file
+#endif
diff --git a/samples/MvcSample.Web/Monitoring/MonitoringModule.cs b/samples/MvcSample.Web/Monitoring/MonitoringModule.cs
index dffaa1b503..f742a4c03c 100644
--- a/samples/MvcSample.Web/Monitoring/MonitoringModule.cs
+++ b/samples/MvcSample.Web/Monitoring/MonitoringModule.cs
@@ -1,4 +1,4 @@
-#if NET45
+#if ASPNET50
using System;
using System.Collections.Concurrent;
using Autofac;
@@ -74,4 +74,4 @@ namespace MvcSample.Web
}
}
}
-#endif
\ No newline at end of file
+#endif
diff --git a/samples/MvcSample.Web/Startup.cs b/samples/MvcSample.Web/Startup.cs
index 0e7e17a55a..ea107cac99 100644
--- a/samples/MvcSample.Web/Startup.cs
+++ b/samples/MvcSample.Web/Startup.cs
@@ -6,7 +6,7 @@ using Microsoft.Framework.DependencyInjection;
using MvcSample.Web.Filters;
using MvcSample.Web.Services;
-#if NET45
+#if ASPNET50
using Autofac;
using Microsoft.Framework.DependencyInjection.Autofac;
using Microsoft.Framework.OptionsModel;
@@ -19,7 +19,7 @@ namespace MvcSample.Web
public void Configure(IBuilder app)
{
app.UseFileServer();
-#if NET45
+#if ASPNET50
var configuration = new Configuration()
.AddJsonFile(@"App_Data\config.json")
.AddEnvironmentVariables();
diff --git a/samples/MvcSample.Web/project.json b/samples/MvcSample.Web/project.json
index 583f258a4b..5c7d99d75a 100644
--- a/samples/MvcSample.Web/project.json
+++ b/samples/MvcSample.Web/project.json
@@ -19,7 +19,7 @@
},
"commands": { "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:5001" },
"frameworks": {
- "net45": {
+ "aspnet50": {
"dependencies": {
"System.ComponentModel.DataAnnotations": "",
"Microsoft.Framework.DependencyInjection.Autofac": "1.0.0-*",
diff --git a/src/Microsoft.AspNet.Mvc.Common/project.json b/src/Microsoft.AspNet.Mvc.Common/project.json
index 1eae4c2313..118fd4788b 100644
--- a/src/Microsoft.AspNet.Mvc.Common/project.json
+++ b/src/Microsoft.AspNet.Mvc.Common/project.json
@@ -8,7 +8,7 @@
"System.Runtime" : "4.0.20.0"
},
"frameworks": {
- "net45": {},
+ "aspnet50": {},
"aspnetcore50": {
"dependencies": {
"System.Text.Encoding.Extensions": "4.0.10.0"
diff --git a/src/Microsoft.AspNet.Mvc.Core/ActionResults/NoContentResult.cs b/src/Microsoft.AspNet.Mvc.Core/ActionResults/NoContentResult.cs
index de58b13837..95eef22d0e 100644
--- a/src/Microsoft.AspNet.Mvc.Core/ActionResults/NoContentResult.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ActionResults/NoContentResult.cs
@@ -11,7 +11,7 @@ namespace Microsoft.AspNet.Mvc
{
var response = context.HttpContext.Response;
-#if NET45
+#if ASPNET50
response.StatusCode = (int)HttpStatusCode.NoContent;
#else
response.StatusCode = 204;
diff --git a/src/Microsoft.AspNet.Mvc.Core/Formatters/DelegatingStream.cs b/src/Microsoft.AspNet.Mvc.Core/Formatters/DelegatingStream.cs
index 46ae6154e8..b911aab3a7 100644
--- a/src/Microsoft.AspNet.Mvc.Core/Formatters/DelegatingStream.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Formatters/DelegatingStream.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
@@ -102,7 +102,7 @@ namespace Microsoft.AspNet.Mvc
{
return _innerStream.ReadAsync(buffer, offset, count, cancellationToken);
}
-#if NET45
+#if ASPNET50
///
public override IAsyncResult BeginRead(byte[] buffer, int offset, int count,
AsyncCallback callback, object state)
@@ -157,7 +157,7 @@ namespace Microsoft.AspNet.Mvc
{
return _innerStream.WriteAsync(buffer, offset, count, cancellationToken);
}
-#if NET45
+#if ASPNET50
///
public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count,
AsyncCallback callback, object state)
@@ -176,7 +176,7 @@ namespace Microsoft.AspNet.Mvc
{
_innerStream.WriteByte(value);
}
-#if NET45
+#if ASPNET50
///
public override void Close()
{
diff --git a/src/Microsoft.AspNet.Mvc.Core/Formatters/FormattingUtilities.cs b/src/Microsoft.AspNet.Mvc.Core/Formatters/FormattingUtilities.cs
index 5d96c4d1b2..a1310a9425 100644
--- a/src/Microsoft.AspNet.Mvc.Core/Formatters/FormattingUtilities.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Formatters/FormattingUtilities.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
@@ -14,7 +14,7 @@ namespace Microsoft.AspNet.Mvc
{
public static readonly int DefaultMaxDepth = 32;
-#if NET45
+#if ASPNET50
public static readonly XsdDataContractExporter XsdDataContractExporter = new XsdDataContractExporter();
#endif
@@ -24,7 +24,7 @@ namespace Microsoft.AspNet.Mvc
/// XmlReaderQuotas with default values
public static XmlDictionaryReaderQuotas GetDefaultXmlReaderQuotas()
{
-#if NET45
+#if ASPNET50
return new XmlDictionaryReaderQuotas()
{
MaxArrayLength = Int32.MaxValue,
@@ -38,4 +38,4 @@ namespace Microsoft.AspNet.Mvc
#endif
}
}
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.AspNet.Mvc.Core/Formatters/XmlDataContractSerializerOutputFormatter.cs b/src/Microsoft.AspNet.Mvc.Core/Formatters/XmlDataContractSerializerOutputFormatter.cs
index 0ee3ea2cde..786e83ad36 100644
--- a/src/Microsoft.AspNet.Mvc.Core/Formatters/XmlDataContractSerializerOutputFormatter.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Formatters/XmlDataContractSerializerOutputFormatter.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
@@ -42,7 +42,7 @@ namespace Microsoft.AspNet.Mvc
DataContractSerializer serializer = null;
try
{
-#if NET45
+#if ASPNET50
// Verify that type is a valid data contract by forcing the serializer to try to create a data contract
FormattingUtilities.XsdDataContractExporter.GetRootElementName(type);
#endif
@@ -76,4 +76,4 @@ namespace Microsoft.AspNet.Mvc
return Task.FromResult(true);
}
}
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.AspNet.Mvc.Core/RouteDataActionConstraint.cs b/src/Microsoft.AspNet.Mvc.Core/RouteDataActionConstraint.cs
index 7f5d099fa3..c7e5c618f6 100644
--- a/src/Microsoft.AspNet.Mvc.Core/RouteDataActionConstraint.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/RouteDataActionConstraint.cs
@@ -49,7 +49,7 @@ namespace Microsoft.AspNet.Mvc
KeyHandling = keyHandling;
break;
default:
-#if NET45
+#if ASPNET50
throw new InvalidEnumArgumentException("keyHandling", (int)keyHandling, typeof (RouteKeyHandling));
#else
throw new ArgumentOutOfRangeException("keyHandling");
diff --git a/src/Microsoft.AspNet.Mvc.Core/Routing/ActionSelectorDecisionTree.cs b/src/Microsoft.AspNet.Mvc.Core/Routing/ActionSelectorDecisionTree.cs
index 867fd7f347..0b360bfd6c 100644
--- a/src/Microsoft.AspNet.Mvc.Core/Routing/ActionSelectorDecisionTree.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Routing/ActionSelectorDecisionTree.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
@@ -166,7 +166,7 @@ namespace Microsoft.AspNet.Mvc.Routing
{
// We'd already have failed before getting here. The RouteDataActionConstraint constructor
// would throw.
-#if NET45
+#if ASPNET50
throw new InvalidEnumArgumentException(
"item",
(int)constraint.KeyHandling,
@@ -184,4 +184,4 @@ namespace Microsoft.AspNet.Mvc.Routing
}
}
}
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.AspNet.Mvc.Core/project.json b/src/Microsoft.AspNet.Mvc.Core/project.json
index 292de23825..302feb756b 100644
--- a/src/Microsoft.AspNet.Mvc.Core/project.json
+++ b/src/Microsoft.AspNet.Mvc.Core/project.json
@@ -19,7 +19,7 @@
"Newtonsoft.Json": "5.0.8"
},
"frameworks": {
- "net45": {
+ "aspnet50": {
"dependencies": {
"System.Xml": ""
}
diff --git a/src/Microsoft.AspNet.Mvc.HeaderValueAbstractions/project.json b/src/Microsoft.AspNet.Mvc.HeaderValueAbstractions/project.json
index 6539a34f26..427d925566 100644
--- a/src/Microsoft.AspNet.Mvc.HeaderValueAbstractions/project.json
+++ b/src/Microsoft.AspNet.Mvc.HeaderValueAbstractions/project.json
@@ -2,7 +2,7 @@
"version": "1.0.0-*",
"dependencies": {},
"frameworks": {
- "net45": {},
+ "aspnet50": {},
"aspnetcore50": {
"dependencies": {
"System.Collections": "4.0.10.0",
diff --git a/src/Microsoft.AspNet.Mvc.ModelBinding/project.json b/src/Microsoft.AspNet.Mvc.ModelBinding/project.json
index 0bab805a8c..3ecc44aad7 100644
--- a/src/Microsoft.AspNet.Mvc.ModelBinding/project.json
+++ b/src/Microsoft.AspNet.Mvc.ModelBinding/project.json
@@ -12,7 +12,7 @@
"Newtonsoft.Json": "5.0.8"
},
"frameworks": {
- "net45": {
+ "aspnet50": {
"dependencies": {
"System.Xml": "",
"System.ComponentModel.DataAnnotations": "",
diff --git a/src/Microsoft.AspNet.Mvc.Razor.Host/project.json b/src/Microsoft.AspNet.Mvc.Razor.Host/project.json
index 4a226d9673..376323a86f 100644
--- a/src/Microsoft.AspNet.Mvc.Razor.Host/project.json
+++ b/src/Microsoft.AspNet.Mvc.Razor.Host/project.json
@@ -10,7 +10,7 @@
"Microsoft.Framework.Runtime.Interfaces": "1.0.0-*"
},
"frameworks": {
- "net45": {
+ "aspnet50": {
"dependencies": {
"System.Collections": "",
"System.Runtime": "",
diff --git a/src/Microsoft.AspNet.Mvc.Razor/project.json b/src/Microsoft.AspNet.Mvc.Razor/project.json
index 82e381a38c..a4d0ce4e35 100644
--- a/src/Microsoft.AspNet.Mvc.Razor/project.json
+++ b/src/Microsoft.AspNet.Mvc.Razor/project.json
@@ -16,7 +16,7 @@
"Microsoft.Framework.Runtime.Interfaces": "1.0.0-*"
},
"frameworks": {
- "net45": {
+ "aspnet50": {
"dependencies": {
"System.Collections": "",
"System.Runtime": "",
diff --git a/src/Microsoft.AspNet.Mvc/project.json b/src/Microsoft.AspNet.Mvc/project.json
index 60cffff5b4..14ca93704f 100644
--- a/src/Microsoft.AspNet.Mvc/project.json
+++ b/src/Microsoft.AspNet.Mvc/project.json
@@ -18,7 +18,7 @@
"Microsoft.Framework.DependencyInjection" : "1.0.0-*"
},
"frameworks": {
- "net45": {},
+ "aspnet50": {},
"aspnetcore50": {
"dependencies": {
"System.Diagnostics.Debug": "4.0.10.0",
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ActionAttributeTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ActionAttributeTests.cs
index 7b72b435e1..540e45fa0b 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/ActionAttributeTests.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/ActionAttributeTests.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-#if NET45
+#if ASPNET50
using System;
using System.Collections.Generic;
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ControllerTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ControllerTests.cs
index ea232abea7..76d1ba72ce 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/ControllerTests.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/ControllerTests.cs
@@ -9,7 +9,7 @@ using System.Text;
using Microsoft.AspNet.Mvc.ModelBinding;
using Microsoft.AspNet.Routing;
using Microsoft.AspNet.Testing;
-#if NET45
+#if ASPNET50
using Moq;
#endif
using Xunit;
@@ -542,7 +542,7 @@ namespace Microsoft.AspNet.Mvc.Test
// These tests share code with the ActionFilterAttribute tests because the various filter
// implementations need to behave the same way.
-#if NET45
+#if ASPNET50
[Fact]
public async Task Controller_ActionFilter_SettingResult_ShortCircuits()
{
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/DefaultActionDiscoveryConventionsActionSelectionTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/DefaultActionDiscoveryConventionsActionSelectionTests.cs
index 9ca5e78431..f853b9b446 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/DefaultActionDiscoveryConventionsActionSelectionTests.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/DefaultActionDiscoveryConventionsActionSelectionTests.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-#if NET45
+#if ASPNET50
using System;
using System.Collections.Generic;
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/DefaultControllerActivatorTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/DefaultControllerActivatorTest.cs
index 3f1d310dca..5090ecf08e 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/DefaultControllerActivatorTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/DefaultControllerActivatorTest.cs
@@ -1,7 +1,7 @@
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-#if NET45
+#if ASPNET50
using System;
using Microsoft.AspNet.Http;
using Microsoft.AspNet.Mvc.ModelBinding;
@@ -148,4 +148,4 @@ namespace Microsoft.AspNet.Mvc.Core.Test
}
}
}
-#endif
\ No newline at end of file
+#endif
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/DefaultViewComponentActivatorTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/DefaultViewComponentActivatorTests.cs
index 5669943186..df5613a144 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/DefaultViewComponentActivatorTests.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/DefaultViewComponentActivatorTests.cs
@@ -1,7 +1,7 @@
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-#if NET45
+#if ASPNET50
using System;
using System.IO;
using System.Threading.Tasks;
@@ -140,4 +140,4 @@ namespace Microsoft.AspNet.Mvc
}
}
}
-#endif
\ No newline at end of file
+#endif
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Filters/ActionFilterAttributeTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Filters/ActionFilterAttributeTests.cs
index fe213fe1b9..93ab2fbc2d 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/Filters/ActionFilterAttributeTests.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/Filters/ActionFilterAttributeTests.cs
@@ -1,7 +1,7 @@
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-#if NET45
+#if ASPNET50
using System.Collections.Generic;
using System.Threading.Tasks;
using Microsoft.AspNet.Http;
@@ -265,4 +265,4 @@ namespace Microsoft.AspNet.Mvc.Test
}
}
}
-#endif
\ No newline at end of file
+#endif
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Filters/ResultFilterAttributeTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Filters/ResultFilterAttributeTest.cs
index 7581379c5c..42b85437cf 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/Filters/ResultFilterAttributeTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/Filters/ResultFilterAttributeTest.cs
@@ -1,7 +1,7 @@
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-#if NET45
+#if ASPNET50
using System.Threading.Tasks;
using Moq;
using Xunit;
@@ -34,4 +34,4 @@ namespace Microsoft.AspNet.Mvc.Test
}
}
}
-#endif
\ No newline at end of file
+#endif
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Formatters/DelegatingStreamTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Formatters/DelegatingStreamTests.cs
index d3abd30fb3..716359adb8 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/Formatters/DelegatingStreamTests.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/Formatters/DelegatingStreamTests.cs
@@ -1,7 +1,7 @@
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-#if NET45
+#if ASPNET50
using System.IO;
using System.Threading;
using System.Threading.Tasks;
@@ -88,4 +88,4 @@ namespace Microsoft.AspNet.Mvc
}
}
}
-#endif
\ No newline at end of file
+#endif
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Formatters/JsonInputFormatterTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Formatters/JsonInputFormatterTest.cs
index 15adbd64f7..d60e520487 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/Formatters/JsonInputFormatterTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/Formatters/JsonInputFormatterTest.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-#if NET45
+#if ASPNET50
using System;
using System.Collections.Generic;
using System.IO;
@@ -175,4 +175,4 @@ namespace Microsoft.AspNet.Mvc
}
}
}
-#endif
\ No newline at end of file
+#endif
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Formatters/XmlDataContractSerializerInputFormatterTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Formatters/XmlDataContractSerializerInputFormatterTests.cs
index 3094083fbe..6be33f0c4e 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/Formatters/XmlDataContractSerializerInputFormatterTests.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/Formatters/XmlDataContractSerializerInputFormatterTests.cs
@@ -1,7 +1,7 @@
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-#if NET45
+#if ASPNET50
using System;
using System.IO;
using System.Linq;
@@ -349,4 +349,4 @@ namespace Microsoft.AspNet.Mvc
}
}
}
-#endif
\ No newline at end of file
+#endif
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Formatters/XmlSerializerInputFormatterTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Formatters/XmlSerializerInputFormatterTests.cs
index 1ce7128da5..03ce946bcd 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/Formatters/XmlSerializerInputFormatterTests.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/Formatters/XmlSerializerInputFormatterTests.cs
@@ -1,7 +1,7 @@
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-#if NET45
+#if ASPNET50
using System;
using System.IO;
using System.Linq;
@@ -355,4 +355,4 @@ namespace Microsoft.AspNet.Mvc
}
}
}
-#endif
\ No newline at end of file
+#endif
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/KnownRouteValueConstraintTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/KnownRouteValueConstraintTests.cs
index f8f200b77e..b21a79a8b9 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/KnownRouteValueConstraintTests.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/KnownRouteValueConstraintTests.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-#if NET45
+#if ASPNET50
using System;
using System.Collections.Generic;
using Microsoft.AspNet.Http;
@@ -195,4 +195,4 @@ namespace Microsoft.AspNet.Routing.Tests
}
}
}
-#endif
\ No newline at end of file
+#endif
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/OptionDescriptors/OutputFormatterDescriptorExtensionTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/OptionDescriptors/OutputFormatterDescriptorExtensionTest.cs
index 0f95d1a384..534cd2d88a 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/OptionDescriptors/OutputFormatterDescriptorExtensionTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/OptionDescriptors/OutputFormatterDescriptorExtensionTest.cs
@@ -1,7 +1,7 @@
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-#if NET45
+#if ASPNET50
using System;
using System.Collections.Generic;
using Microsoft.AspNet.Mvc.OptionDescriptors;
@@ -71,4 +71,4 @@ namespace Microsoft.AspNet.Mvc.Core.Test
}
}
}
-#endif
\ No newline at end of file
+#endif
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ParameterBinding/ModelBindingHelperTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ParameterBinding/ModelBindingHelperTest.cs
index 4dab8b4934..ff3e76a4cb 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/ParameterBinding/ModelBindingHelperTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/ParameterBinding/ModelBindingHelperTest.cs
@@ -1,7 +1,7 @@
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-#if NET45
+#if ASPNET50
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
@@ -135,4 +135,4 @@ namespace Microsoft.AspNet.Mvc.Core.Test
}
}
}
-#endif
\ No newline at end of file
+#endif
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Routing/AttributeRoutePrecedenceTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Routing/AttributeRoutePrecedenceTests.cs
index ba97ea4d4f..b87c491d1e 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/Routing/AttributeRoutePrecedenceTests.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/Routing/AttributeRoutePrecedenceTests.cs
@@ -1,7 +1,7 @@
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-#if NET45
+#if ASPNET50
using Microsoft.AspNet.Routing;
using Microsoft.AspNet.Routing.Template;
using Microsoft.Framework.OptionsModel;
@@ -72,4 +72,4 @@ namespace Microsoft.AspNet.Mvc.Routing
}
}
}
-#endif
\ No newline at end of file
+#endif
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Routing/AttributeRoutingTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Routing/AttributeRoutingTest.cs
index 3169f4139a..bfb67f3674 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/Routing/AttributeRoutingTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/Routing/AttributeRoutingTest.cs
@@ -1,7 +1,7 @@
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-#if NET45
+#if ASPNET50
using Microsoft.AspNet.Routing;
using Microsoft.Framework.OptionsModel;
using Moq;
@@ -183,4 +183,4 @@ namespace Microsoft.AspNet.Mvc.Routing
}
}
}
-#endif
\ No newline at end of file
+#endif
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/project.json b/test/Microsoft.AspNet.Mvc.Core.Test/project.json
index 5547300527..4cff9a3d9c 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/project.json
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/project.json
@@ -21,6 +21,6 @@
"test": "Xunit.KRunner"
},
"frameworks": {
- "net45": { }
+ "aspnet50": { }
}
}
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/DependencyResolverTests.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/DependencyResolverTests.cs
index f92b18cf1d..14616416da 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/DependencyResolverTests.cs
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/DependencyResolverTests.cs
@@ -1,4 +1,4 @@
-#if NET45
+#if ASPNET50
using System;
using System.Net.Http;
using System.Threading.Tasks;
@@ -36,4 +36,4 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
}
}
}
-#endif
\ No newline at end of file
+#endif
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/project.json b/test/Microsoft.AspNet.Mvc.FunctionalTests/project.json
index 7cdc926bb6..3798a68b7e 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/project.json
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/project.json
@@ -30,7 +30,7 @@
"test": "Xunit.KRunner"
},
"frameworks": {
- "net45": {
+ "aspnet50": {
"dependencies": {
"AutofacWebSite": ""
}
diff --git a/test/Microsoft.AspNet.Mvc.HeaderValueAbstractions.Test/project.json b/test/Microsoft.AspNet.Mvc.HeaderValueAbstractions.Test/project.json
index df505dc947..14342b8387 100644
--- a/test/Microsoft.AspNet.Mvc.HeaderValueAbstractions.Test/project.json
+++ b/test/Microsoft.AspNet.Mvc.HeaderValueAbstractions.Test/project.json
@@ -9,7 +9,7 @@
"test": "Xunit.KRunner"
},
"configurations": {
- "net45": {
+ "aspnet50": {
"dependencies": {
"System.Runtime": "4.0.20.0"
}
diff --git a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/ArrayModelBinderTest.cs b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/ArrayModelBinderTest.cs
index 5575388686..00f834a2ea 100644
--- a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/ArrayModelBinderTest.cs
+++ b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/ArrayModelBinderTest.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-#if NET45
+#if ASPNET50
using System.Threading.Tasks;
using Moq;
using Xunit;
diff --git a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/ByteArrayModelBinderTests.cs b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/ByteArrayModelBinderTests.cs
index ddad1ae23f..b21f90daf6 100644
--- a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/ByteArrayModelBinderTests.cs
+++ b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/ByteArrayModelBinderTests.cs
@@ -1,7 +1,7 @@
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-#if NET45
+#if ASPNET50
using System;
using System.Linq;
using System.Threading.Tasks;
@@ -125,4 +125,4 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Test
}
}
}
-#endif
\ No newline at end of file
+#endif
diff --git a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/CollectionModelBinderTest.cs b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/CollectionModelBinderTest.cs
index 7d9171f567..0204c32d8c 100644
--- a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/CollectionModelBinderTest.cs
+++ b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/CollectionModelBinderTest.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Threading.Tasks;
-#if NET45
+#if ASPNET50
using Moq;
#endif
using Xunit;
@@ -14,7 +14,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Test
{
public class CollectionModelBinderTest
{
-#if NET45
+#if ASPNET50
[Fact]
public async Task BindComplexCollectionFromIndexes_FiniteIndexes()
{
@@ -124,7 +124,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Test
Assert.Null(boundCollection);
}
-#if NET45
+#if ASPNET50
[Fact]
public async Task BindSimpleCollection_SubBindingSucceeds()
{
diff --git a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/CompositeModelBinderTest.cs b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/CompositeModelBinderTest.cs
index 12c7391853..cfe67de69b 100644
--- a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/CompositeModelBinderTest.cs
+++ b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/CompositeModelBinderTest.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-#if NET45
+#if ASPNET50
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
diff --git a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/DictionaryModelBinderTest.cs b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/DictionaryModelBinderTest.cs
index 33fd410eac..4f5dc4baa6 100644
--- a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/DictionaryModelBinderTest.cs
+++ b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/DictionaryModelBinderTest.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-#if NET45
+#if ASPNET50
using System.Collections.Generic;
using System.Threading.Tasks;
using Moq;
diff --git a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/KeyValuePairModelBinderTest.cs b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/KeyValuePairModelBinderTest.cs
index bac2f61e38..8b22383e96 100644
--- a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/KeyValuePairModelBinderTest.cs
+++ b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/KeyValuePairModelBinderTest.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-#if NET45
+#if ASPNET50
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
diff --git a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/MutableObjectModelBinderTest.cs b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/MutableObjectModelBinderTest.cs
index ecc84b9fa8..f3325a16ec 100644
--- a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/MutableObjectModelBinderTest.cs
+++ b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/MutableObjectModelBinderTest.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-#if NET45
+#if ASPNET50
using System;
using System.Collections.Generic;
using System.ComponentModel;
@@ -962,4 +962,4 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
}
}
}
-#endif
\ No newline at end of file
+#endif
diff --git a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Metadata/AssociatedMetadataProviderTest.cs b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Metadata/AssociatedMetadataProviderTest.cs
index cf578aba05..aa494526e2 100644
--- a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Metadata/AssociatedMetadataProviderTest.cs
+++ b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Metadata/AssociatedMetadataProviderTest.cs
@@ -183,7 +183,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
// GetMetadataForType
-#if NET45 // No ReadOnlyAttribute in K
+#if ASPNET50 // No ReadOnlyAttribute in K
[Fact]
public void GetMetadataForTypeIncludesAttributesOnType()
{
@@ -235,7 +235,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
public string Value { get; set; }
}
-#if NET45 // No [ReadOnly] in K
+#if ASPNET50 // No [ReadOnly] in K
[ReadOnly(true)]
private class TypeModel
{
diff --git a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Metadata/ModelMetadataTest.cs b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Metadata/ModelMetadataTest.cs
index 09a9caebac..385ff00ac6 100644
--- a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Metadata/ModelMetadataTest.cs
+++ b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Metadata/ModelMetadataTest.cs
@@ -4,7 +4,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
-#if NET45
+#if ASPNET50
using Moq;
#endif
using Xunit;
@@ -41,7 +41,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
}
}
-#if NET45
+#if ASPNET50
// Constructor
[Fact]
@@ -90,7 +90,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
{
}
-#if NET45
+#if ASPNET50
[Theory]
[InlineData(typeof(string))]
[InlineData(typeof(Nullable))]
@@ -331,7 +331,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
Assert.Equal("displayName", result);
}
-#if NET45
+#if ASPNET50
[Fact]
public void ReturnsPropertyNameWhenSetAndDisplayNameIsNull()
{
diff --git a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Validation/AssociatedValidatorProviderTest.cs b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Validation/AssociatedValidatorProviderTest.cs
index db0648a789..cc66964b31 100644
--- a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Validation/AssociatedValidatorProviderTest.cs
+++ b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Validation/AssociatedValidatorProviderTest.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-#if NET45
+#if ASPNET50
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
diff --git a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Validation/CompositeModelValidatorProviderTest.cs b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Validation/CompositeModelValidatorProviderTest.cs
index 3987c8496f..789e2410e0 100644
--- a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Validation/CompositeModelValidatorProviderTest.cs
+++ b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Validation/CompositeModelValidatorProviderTest.cs
@@ -1,7 +1,7 @@
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-#if NET45
+#if ASPNET50
using Moq;
using Xunit;
@@ -38,4 +38,4 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Test
}
}
}
-#endif
\ No newline at end of file
+#endif
diff --git a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Validation/DataAnnotationsModelValidatorProviderTest.cs b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Validation/DataAnnotationsModelValidatorProviderTest.cs
index 4f5e4b80c0..9b9ee73ec9 100644
--- a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Validation/DataAnnotationsModelValidatorProviderTest.cs
+++ b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Validation/DataAnnotationsModelValidatorProviderTest.cs
@@ -5,7 +5,7 @@ using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
-#if NET45
+#if ASPNET50
using Moq;
#endif
using Xunit;
@@ -16,7 +16,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
{
private readonly DataAnnotationsModelMetadataProvider _metadataProvider = new DataAnnotationsModelMetadataProvider();
-#if NET45
+#if ASPNET50
[Fact]
public void GetValidators_ReturnsValidatorForIValidatableObject()
{
@@ -164,7 +164,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
// Default IValidatableObject adapter factory
-#if NET45
+#if ASPNET50
[Fact]
public void IValidatableObjectGetsAValidator()
{
diff --git a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Validation/DataAnnotationsModelValidatorTest.cs b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Validation/DataAnnotationsModelValidatorTest.cs
index a637a0ba63..32b94660b9 100644
--- a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Validation/DataAnnotationsModelValidatorTest.cs
+++ b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Validation/DataAnnotationsModelValidatorTest.cs
@@ -4,7 +4,7 @@
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
-#if NET45
+#if ASPNET50
using Moq;
using Moq.Protected;
#endif
@@ -49,7 +49,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
}
}
-#if NET45
+#if ASPNET50
[Theory]
[MemberData(nameof(ValidateSetsMemberNamePropertyDataSet))]
public void ValidateSetsMemberNamePropertyOfValidationContextForProperties(ModelMetadata metadata,
@@ -222,4 +222,4 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
public string Name { get; set; }
}
}
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Validation/ModelValidationNodeTest.cs b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Validation/ModelValidationNodeTest.cs
index 4bf1fdeb3c..e3b9b06d7c 100644
--- a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Validation/ModelValidationNodeTest.cs
+++ b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Validation/ModelValidationNodeTest.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-#if NET45
+#if ASPNET50
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
@@ -350,4 +350,4 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
}
}
}
-#endif
\ No newline at end of file
+#endif
diff --git a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/ValueProviders/FormValueProviderFactoryTests.cs b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/ValueProviders/FormValueProviderFactoryTests.cs
index ff7d61dd23..3bea4e4df1 100644
--- a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/ValueProviders/FormValueProviderFactoryTests.cs
+++ b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/ValueProviders/FormValueProviderFactoryTests.cs
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-#if NET45
+#if ASPNET50
using System.Collections.Generic;
using System.Globalization;
using System.Threading.Tasks;
diff --git a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/ValueProviders/QueryStringValueProviderFactoryTest.cs b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/ValueProviders/QueryStringValueProviderFactoryTest.cs
index 41f0c4b21d..c842211752 100644
--- a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/ValueProviders/QueryStringValueProviderFactoryTest.cs
+++ b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/ValueProviders/QueryStringValueProviderFactoryTest.cs
@@ -4,7 +4,7 @@
using System.Collections.Generic;
using System.Globalization;
using Microsoft.AspNet.Http;
-#if NET45
+#if ASPNET50
using Moq;
#endif
using Xunit;
@@ -17,7 +17,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Test
{
private readonly QueryStringValueProviderFactory _factory = new QueryStringValueProviderFactory();
-#if NET45
+#if ASPNET50
[Fact]
public void GetValueProvider_ReturnsQueryStringValueProviderInstaceWithInvariantCulture()
{
diff --git a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/project.json b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/project.json
index decb244340..f684e7b006 100644
--- a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/project.json
+++ b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/project.json
@@ -19,7 +19,7 @@
"test": "Xunit.KRunner"
},
"frameworks": {
- "net45": {
+ "aspnet50": {
"dependencies": {
"System.ComponentModel.DataAnnotations": "",
"System.Reflection": "",
diff --git a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/project.json b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/project.json
index 8201a1bb2a..3182d95d8f 100644
--- a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/project.json
+++ b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/project.json
@@ -12,7 +12,7 @@
"test": "Xunit.KRunner"
},
"frameworks": {
- "net45": {
+ "aspnet50": {
"dependencies": {
"Moq": "4.2.1312.1622"
}
diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/project.json b/test/Microsoft.AspNet.Mvc.Razor.Test/project.json
index ae88589581..b7863727db 100644
--- a/test/Microsoft.AspNet.Mvc.Razor.Test/project.json
+++ b/test/Microsoft.AspNet.Mvc.Razor.Test/project.json
@@ -16,7 +16,7 @@
"test": "Xunit.KRunner"
},
"frameworks": {
- "net45": {
+ "aspnet50": {
"dependencies": {
"Moq": "4.2.1312.1622",
"System.Reflection": ""
diff --git a/test/Microsoft.AspNet.Mvc.Test/project.json b/test/Microsoft.AspNet.Mvc.Test/project.json
index 3630ac9e30..7465342348 100644
--- a/test/Microsoft.AspNet.Mvc.Test/project.json
+++ b/test/Microsoft.AspNet.Mvc.Test/project.json
@@ -10,6 +10,6 @@
"test": "Xunit.KRunner"
},
"frameworks": {
- "net45": { }
+ "aspnet50": { }
}
}
diff --git a/test/WebSites/ActivatorWebSite/project.json b/test/WebSites/ActivatorWebSite/project.json
index c9a3718277..2112409be8 100644
--- a/test/WebSites/ActivatorWebSite/project.json
+++ b/test/WebSites/ActivatorWebSite/project.json
@@ -5,7 +5,7 @@
"Microsoft.AspNet.Mvc.TestConfiguration": ""
},
"frameworks": {
- "net45": { },
+ "aspnet50": { },
"aspnetcore50": { }
}
}
diff --git a/test/WebSites/AddServicesWebSite/project.json b/test/WebSites/AddServicesWebSite/project.json
index 766a2e4e46..5b97b2fdf4 100644
--- a/test/WebSites/AddServicesWebSite/project.json
+++ b/test/WebSites/AddServicesWebSite/project.json
@@ -4,7 +4,7 @@
"Microsoft.AspNet.Mvc.TestConfiguration": ""
},
"frameworks": {
- "net45": { },
+ "aspnet50": { },
"aspnetcore50": { }
}
}
diff --git a/test/WebSites/AntiForgeryWebSite/project.json b/test/WebSites/AntiForgeryWebSite/project.json
index f3e9978e95..af24674e19 100644
--- a/test/WebSites/AntiForgeryWebSite/project.json
+++ b/test/WebSites/AntiForgeryWebSite/project.json
@@ -7,7 +7,7 @@
"Microsoft.AspNet.Security.Cookies": "1.0.0-*"
},
"frameworks": {
- "net45": { },
+ "aspnet50": { },
"aspnetcore50": { }
}
}
diff --git a/test/WebSites/AutofacWebSite/project.json b/test/WebSites/AutofacWebSite/project.json
index ef196f5963..0e66863a89 100644
--- a/test/WebSites/AutofacWebSite/project.json
+++ b/test/WebSites/AutofacWebSite/project.json
@@ -6,6 +6,6 @@
"Autofac": "3.3.0"
},
"frameworks" : {
- "net45" : { }
+ "aspnet50" : { }
}
}
diff --git a/test/WebSites/BasicWebSite/project.json b/test/WebSites/BasicWebSite/project.json
index a1d5f66577..d74190e567 100644
--- a/test/WebSites/BasicWebSite/project.json
+++ b/test/WebSites/BasicWebSite/project.json
@@ -6,7 +6,7 @@
"Microsoft.Framework.ConfigurationModel": ""
},
"frameworks": {
- "net45": { },
+ "aspnet50": { },
"aspnetcore50": { }
}
}
diff --git a/test/WebSites/CompositeViewEngine/project.json b/test/WebSites/CompositeViewEngine/project.json
index a1d5f66577..d74190e567 100644
--- a/test/WebSites/CompositeViewEngine/project.json
+++ b/test/WebSites/CompositeViewEngine/project.json
@@ -6,7 +6,7 @@
"Microsoft.Framework.ConfigurationModel": ""
},
"frameworks": {
- "net45": { },
+ "aspnet50": { },
"aspnetcore50": { }
}
}
diff --git a/test/WebSites/ConnegWebSite/project.json b/test/WebSites/ConnegWebSite/project.json
index c9a3718277..2112409be8 100644
--- a/test/WebSites/ConnegWebSite/project.json
+++ b/test/WebSites/ConnegWebSite/project.json
@@ -5,7 +5,7 @@
"Microsoft.AspNet.Mvc.TestConfiguration": ""
},
"frameworks": {
- "net45": { },
+ "aspnet50": { },
"aspnetcore50": { }
}
}
diff --git a/test/WebSites/FormatterWebSite/project.json b/test/WebSites/FormatterWebSite/project.json
index 36a977ac7e..9ab0d45e17 100644
--- a/test/WebSites/FormatterWebSite/project.json
+++ b/test/WebSites/FormatterWebSite/project.json
@@ -4,7 +4,7 @@
"Microsoft.AspNet.Mvc.TestConfiguration": ""
},
"configurations": {
- "net45": { },
+ "aspnet50": { },
"aspnetcore50": { }
}
}
diff --git a/test/WebSites/InlineConstraintsWebSite/project.json b/test/WebSites/InlineConstraintsWebSite/project.json
index 1e96edaef8..44f173869a 100644
--- a/test/WebSites/InlineConstraintsWebSite/project.json
+++ b/test/WebSites/InlineConstraintsWebSite/project.json
@@ -6,7 +6,7 @@
"Microsoft.Framework.ConfigurationModel.Json": "1.0.0-*"
},
"frameworks": {
- "net45": { },
+ "aspnet50": { },
"aspnetcore50": { }
}
}
diff --git a/test/WebSites/Microsoft.AspNet.Mvc.TestConfiguration/project.json b/test/WebSites/Microsoft.AspNet.Mvc.TestConfiguration/project.json
index 7c680029e6..9548933b64 100644
--- a/test/WebSites/Microsoft.AspNet.Mvc.TestConfiguration/project.json
+++ b/test/WebSites/Microsoft.AspNet.Mvc.TestConfiguration/project.json
@@ -5,7 +5,7 @@
"Microsoft.Framework.DependencyInjection": "1.0.0-*"
},
"frameworks" : {
- "net45" : { },
+ "aspnet50" : { },
"aspnetcore50" : { }
}
}
diff --git a/test/WebSites/ModelBindingWebSite/project.json b/test/WebSites/ModelBindingWebSite/project.json
index 36a977ac7e..9ab0d45e17 100644
--- a/test/WebSites/ModelBindingWebSite/project.json
+++ b/test/WebSites/ModelBindingWebSite/project.json
@@ -4,7 +4,7 @@
"Microsoft.AspNet.Mvc.TestConfiguration": ""
},
"configurations": {
- "net45": { },
+ "aspnet50": { },
"aspnetcore50": { }
}
}
diff --git a/test/WebSites/RazorWebSite/Project.json b/test/WebSites/RazorWebSite/Project.json
index c9a3718277..2112409be8 100644
--- a/test/WebSites/RazorWebSite/Project.json
+++ b/test/WebSites/RazorWebSite/Project.json
@@ -5,7 +5,7 @@
"Microsoft.AspNet.Mvc.TestConfiguration": ""
},
"frameworks": {
- "net45": { },
+ "aspnet50": { },
"aspnetcore50": { }
}
}
diff --git a/test/WebSites/RoutingWebSite/project.json b/test/WebSites/RoutingWebSite/project.json
index 04d0696327..e126080b82 100644
--- a/test/WebSites/RoutingWebSite/project.json
+++ b/test/WebSites/RoutingWebSite/project.json
@@ -5,7 +5,7 @@
"Microsoft.AspNet.Server.IIS": "1.0.0-*"
},
"frameworks": {
- "net45": { },
+ "aspnet50": { },
"aspnetcore50": { }
}
}
diff --git a/test/WebSites/ValueProvidersSite/project.json b/test/WebSites/ValueProvidersSite/project.json
index a452066a7d..20d4c772e4 100644
--- a/test/WebSites/ValueProvidersSite/project.json
+++ b/test/WebSites/ValueProvidersSite/project.json
@@ -6,7 +6,7 @@
"Microsoft.Framework.ConfigurationModel": ""
},
"configurations": {
- "net45": { },
+ "aspnet50": { },
"aspnetcore50": { }
}
}