diff --git a/samples/MvcSample.Web/Monitoring/MonitoringMiddlware.cs b/samples/MvcSample.Web/Monitoring/MonitoringMiddlware.cs index 2812ac1c38..86439d8ebf 100644 --- a/samples/MvcSample.Web/Monitoring/MonitoringMiddlware.cs +++ b/samples/MvcSample.Web/Monitoring/MonitoringMiddlware.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 ASPNET50 +#if DNX451 using System; using System.Collections.Generic; using System.Linq; diff --git a/samples/MvcSample.Web/Monitoring/MonitoringModule.cs b/samples/MvcSample.Web/Monitoring/MonitoringModule.cs index 68bb050c1d..ab35c0cd19 100644 --- a/samples/MvcSample.Web/Monitoring/MonitoringModule.cs +++ b/samples/MvcSample.Web/Monitoring/MonitoringModule.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 ASPNET50 +#if DNX451 using System; using System.Collections.Concurrent; using Autofac; diff --git a/samples/MvcSample.Web/Startup.cs b/samples/MvcSample.Web/Startup.cs index 8a3bdbb032..0fe1ae37e6 100644 --- a/samples/MvcSample.Web/Startup.cs +++ b/samples/MvcSample.Web/Startup.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; @@ -13,7 +13,7 @@ using Microsoft.Framework.DependencyInjection; using MvcSample.Web.Filters; using MvcSample.Web.Services; -#if ASPNET50 +#if DNX451 using Autofac; using Microsoft.Framework.DependencyInjection.Autofac; #endif @@ -27,7 +27,7 @@ namespace MvcSample.Web app.UseStatusCodePages(); app.UseFileServer(); -#if ASPNET50 +#if DNX451 // Set up configuration sources. var configuration = new Configuration() .AddJsonFile("config.json") diff --git a/samples/MvcSample.Web/project.json b/samples/MvcSample.Web/project.json index f3979d12a6..b2213762bb 100644 --- a/samples/MvcSample.Web/project.json +++ b/samples/MvcSample.Web/project.json @@ -1,4 +1,4 @@ -{ +{ "commands": { "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:5001", "kestrel": "Microsoft.AspNet.Hosting --server Kestrel --server.urls http://localhost:5000" @@ -19,13 +19,13 @@ "Microsoft.Framework.NotNullAttribute.Internal": { "type": "build", "version": "1.0.0-*" } }, "frameworks": { - "aspnet50": { + "dnx451": { "dependencies": { "Microsoft.Framework.DependencyInjection.Autofac": "1.0.0-*", "Microsoft.Framework.ConfigurationModel.Json": "1.0.0-*" } }, - "aspnetcore50": { + "dnxcore50": { "dependencies": { } } }, @@ -42,4 +42,4 @@ "**.vspscc" ], "webroot": "wwwroot" -} \ No newline at end of file +} diff --git a/samples/TagHelperSample.Web/project.json b/samples/TagHelperSample.Web/project.json index 34866e528e..e231e90bb5 100644 --- a/samples/TagHelperSample.Web/project.json +++ b/samples/TagHelperSample.Web/project.json @@ -19,8 +19,8 @@ "Microsoft.Framework.PropertyHelper.Internal": { "version": "1.0.0-*", "type": "build" } }, "frameworks": { - "aspnet50": { }, - "aspnetcore50": { } + "dnx451": { }, + "dnxcore50": { } }, "webroot": "wwwroot" } diff --git a/src/Microsoft.AspNet.Mvc.Common/TypeExtensions.cs b/src/Microsoft.AspNet.Mvc.Common/TypeExtensions.cs index 24908ce28a..680dccaae1 100644 --- a/src/Microsoft.AspNet.Mvc.Common/TypeExtensions.cs +++ b/src/Microsoft.AspNet.Mvc.Common/TypeExtensions.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; @@ -11,8 +11,8 @@ namespace Microsoft.AspNet.Mvc internal static class TypeExtensions { // NOTE: Do not make #105 worse! Do not add new extension methods that conflict w/ .NET 4.5 methods. The - // exising NETFX_CORE || ASPNETCORE50 methods should go away (soon). -#if NETFX_CORE || ASPNETCORE50 + // exising NETFX_CORE || DNXCORE50 methods should go away (soon). +#if NETFX_CORE || DNXCORE50 private static bool EqualTo([NotNull] this Type[] t1, [NotNull] Type[] t2) { if (t1.Length != t2.Length) @@ -54,7 +54,7 @@ namespace Microsoft.AspNet.Mvc queryType.GetInterfaces().FirstOrDefault(matchesInterface); } -#if NETFX_CORE || ASPNETCORE50 +#if NETFX_CORE || DNXCORE50 public static Type[] GetGenericArguments([NotNull] this Type type) { return type.GetTypeInfo().GenericTypeArguments; diff --git a/src/Microsoft.AspNet.Mvc.Common/project.json b/src/Microsoft.AspNet.Mvc.Common/project.json index f3c6da30fc..30bd3db19b 100644 --- a/src/Microsoft.AspNet.Mvc.Common/project.json +++ b/src/Microsoft.AspNet.Mvc.Common/project.json @@ -1,12 +1,12 @@ -{ +{ "version": "6.0.0-*", "shared": "*.cs", "dependencies": { }, "frameworks": { "net45": { }, - "aspnet50": { }, - "aspnetcore50": { + "dnx451": { }, + "dnxcore50": { "dependencies": { "System.ComponentModel.TypeConverter": "4.0.0-beta-*", "System.Reflection.Extensions": "4.0.0-beta-*", diff --git a/src/Microsoft.AspNet.Mvc.Core/AmbiguousActionException.cs b/src/Microsoft.AspNet.Mvc.Core/AmbiguousActionException.cs index df59e59671..6577144f5f 100644 --- a/src/Microsoft.AspNet.Mvc.Core/AmbiguousActionException.cs +++ b/src/Microsoft.AspNet.Mvc.Core/AmbiguousActionException.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; -#if ASPNET50 +#if DNX451 using System.Runtime.Serialization; #endif @@ -11,7 +11,7 @@ namespace Microsoft.AspNet.Mvc /// /// An exception which indicates multiple matches in action selection. /// -#if ASPNET50 +#if DNX451 [Serializable] #endif public class AmbiguousActionException : InvalidOperationException @@ -21,11 +21,11 @@ namespace Microsoft.AspNet.Mvc { } -#if ASPNET50 +#if DNX451 protected AmbiguousActionException(SerializationInfo info, StreamingContext context) : base(info, context) { } #endif } -} \ No newline at end of file +} diff --git a/src/Microsoft.AspNet.Mvc.Core/Internal/NonDisposableStream.cs b/src/Microsoft.AspNet.Mvc.Core/Internal/NonDisposableStream.cs index 8f7d56571c..0f1eaf4561 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Internal/NonDisposableStream.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Internal/NonDisposableStream.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 ASPNET50 +#if DNX451 using System; #endif using System.IO; @@ -105,7 +105,7 @@ namespace Microsoft.AspNet.Mvc.Internal { return _innerStream.ReadAsync(buffer, offset, count, cancellationToken); } -#if ASPNET50 +#if DNX451 /// public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state) @@ -160,7 +160,7 @@ namespace Microsoft.AspNet.Mvc.Internal { return _innerStream.WriteAsync(buffer, offset, count, cancellationToken); } -#if ASPNET50 +#if DNX451 /// public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state) @@ -179,7 +179,7 @@ namespace Microsoft.AspNet.Mvc.Internal { _innerStream.WriteByte(value); } -#if ASPNET50 +#if DNX451 /// public override void Close() { diff --git a/src/Microsoft.AspNet.Mvc.Core/Logging/AssemblyValues.cs b/src/Microsoft.AspNet.Mvc.Core/Logging/AssemblyValues.cs index 932b961570..9c3a4318e1 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Logging/AssemblyValues.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Logging/AssemblyValues.cs @@ -15,7 +15,7 @@ namespace Microsoft.AspNet.Mvc.Logging public AssemblyValues([NotNull] Assembly inner) { AssemblyName = inner.FullName; -#if ASPNET50 +#if DNX451 Location = inner.Location; #endif IsDynamic = inner.IsDynamic; @@ -26,7 +26,7 @@ namespace Microsoft.AspNet.Mvc.Logging /// public string AssemblyName { get; } -#if ASPNET50 +#if DNX451 /// /// The location of the assembly. See . /// @@ -43,4 +43,4 @@ namespace Microsoft.AspNet.Mvc.Logging return LogFormatter.FormatLogValues(this); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.AspNet.Mvc.Core/Routing/ActionSelectionDecisionTree.cs b/src/Microsoft.AspNet.Mvc.Core/Routing/ActionSelectionDecisionTree.cs index 6084065a6f..3dca6704b0 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Routing/ActionSelectionDecisionTree.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Routing/ActionSelectionDecisionTree.cs @@ -1,9 +1,9 @@ -// 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; using System.Collections.Generic; -#if ASPNET50 +#if DNX451 using System.ComponentModel; #endif using System.Diagnostics; @@ -168,7 +168,7 @@ namespace Microsoft.AspNet.Mvc.Routing { // We'd already have failed before getting here. The RouteDataActionConstraint constructor // would throw. -#if ASPNET50 +#if DNX451 throw new InvalidEnumArgumentException( "item", (int)constraint.KeyHandling, diff --git a/src/Microsoft.AspNet.Mvc.Core/project.json b/src/Microsoft.AspNet.Mvc.Core/project.json index db7eb1d073..212544ca7d 100644 --- a/src/Microsoft.AspNet.Mvc.Core/project.json +++ b/src/Microsoft.AspNet.Mvc.Core/project.json @@ -1,4 +1,4 @@ -{ +{ "description": "The core runtime components of ASP.NET MVC.", "version": "6.0.0-*", "compilationOptions": { @@ -24,8 +24,8 @@ "Microsoft.Framework.WebEncoders": "1.0.0-*" }, "frameworks": { - "aspnet50": {}, - "aspnetcore50": { + "dnx451": {}, + "dnxcore50": { "dependencies": { "Microsoft.CSharp": "4.0.0-beta-*" } diff --git a/src/Microsoft.AspNet.Mvc.ModelBinding/project.json b/src/Microsoft.AspNet.Mvc.ModelBinding/project.json index 6f00c3dfde..cd80cf7ca1 100644 --- a/src/Microsoft.AspNet.Mvc.ModelBinding/project.json +++ b/src/Microsoft.AspNet.Mvc.ModelBinding/project.json @@ -1,4 +1,4 @@ -{ +{ "description": "The ASP.NET MVC model binding components for binding data from a request to an object model.", "version": "6.0.0-*", "compilationOptions": { @@ -16,13 +16,13 @@ "Newtonsoft.Json": "6.0.6" }, "frameworks": { - "aspnet50": { + "dnx451": { "frameworkAssemblies": { "System.ComponentModel.DataAnnotations": "", "System.Runtime.Serialization": "" } }, - "aspnetcore50": { + "dnxcore50": { "dependencies": { "System.Collections.Concurrent": "4.0.10-beta-*", "System.ComponentModel.Annotations": "4.0.10-beta-*", diff --git a/src/Microsoft.AspNet.Mvc.Razor.Host/project.json b/src/Microsoft.AspNet.Mvc.Razor.Host/project.json index ffe04077bb..c7175d3639 100644 --- a/src/Microsoft.AspNet.Mvc.Razor.Host/project.json +++ b/src/Microsoft.AspNet.Mvc.Razor.Host/project.json @@ -1,4 +1,4 @@ -{ +{ "description": "Design time hosting infrastructure for the ASP.NET MVC Razor view engine.", "version": "6.0.0-*", "compilationOptions": { @@ -14,12 +14,12 @@ }, "frameworks": { "net45": {}, - "aspnet50": { + "dnx451": { "dependencies": { "Microsoft.Framework.Runtime.Interfaces": "1.0.0-*" } }, - "aspnetcore50": { + "dnxcore50": { "dependencies": { "System.Collections.Concurrent": "4.0.10-beta-*", "Microsoft.Framework.Runtime.Interfaces": "1.0.0-*" diff --git a/src/Microsoft.AspNet.Mvc.Razor/project.json b/src/Microsoft.AspNet.Mvc.Razor/project.json index 2b7ffd2071..ae584e04c7 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/project.json +++ b/src/Microsoft.AspNet.Mvc.Razor/project.json @@ -1,4 +1,4 @@ -{ +{ "description": "The Razor view engine for ASP.NET MVC.", "version": "6.0.0-*", "compilationOptions": { @@ -17,7 +17,7 @@ "Microsoft.Framework.Runtime.Roslyn.Interfaces": "1.0.0-*" }, "frameworks": { - "aspnet50": { + "dnx451": { "frameworkAssemblies": { "System.Collections": "", "System.IO": "", @@ -26,7 +26,7 @@ "System.Threading.Tasks": "" } }, - "aspnetcore50": { + "dnxcore50": { "dependencies": { "System.Threading.Tasks.Parallel": "4.0.0-beta-*" } diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/project.json b/src/Microsoft.AspNet.Mvc.TagHelpers/project.json index 306ffc3695..da8ccdc2c9 100644 --- a/src/Microsoft.AspNet.Mvc.TagHelpers/project.json +++ b/src/Microsoft.AspNet.Mvc.TagHelpers/project.json @@ -1,4 +1,4 @@ -{ +{ "description": "Contains a default set of Tag Helpers for building ASP.NET MVC applications.", "version": "6.0.0-*", "compilationOptions": { @@ -15,7 +15,7 @@ "System.Security.Cryptography.Hashing.Algorithms": "4.0.0-beta-*" }, "frameworks": { - "aspnet50": { }, - "aspnetcore50": { } + "dnx451": { }, + "dnxcore50": { } } -} \ No newline at end of file +} diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/CollectionExtensions.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/CollectionExtensions.cs index eb3b0ca83e..04b1517b4b 100644 --- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/CollectionExtensions.cs +++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/CollectionExtensions.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 ASPNETCORE50 +#if DNXCORE50 using System.Collections.ObjectModel; using System.Diagnostics; @@ -293,4 +293,4 @@ namespace System.Collections.Generic } } } -#endif \ No newline at end of file +#endif diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/ContentNegotiationResult.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/ContentNegotiationResult.cs index 996f1faf08..bcca5fe520 100644 --- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/ContentNegotiationResult.cs +++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/ContentNegotiationResult.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 ASPNETCORE50 +#if DNXCORE50 using Microsoft.AspNet.Mvc; using System.Collections.Generic; diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/DefaultContentNegotiator.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/DefaultContentNegotiator.cs index b31536939e..526f4e0c69 100644 --- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/DefaultContentNegotiator.cs +++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/DefaultContentNegotiator.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 ASPNETCORE50 +#if DNXCORE50 using System.Collections.Generic; using System.Collections.ObjectModel; @@ -491,4 +491,4 @@ namespace System.Net.Http.Formatting } } } -#endif \ No newline at end of file +#endif diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/FormDataCollection.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/FormDataCollection.cs index e47e012654..49016b1ee5 100644 --- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/FormDataCollection.cs +++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/FormDataCollection.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 ASPNETCORE50 +#if DNXCORE50 using Microsoft.AspNet.WebUtilities; using System; @@ -43,4 +43,4 @@ namespace System.Net.Http.Formatting } } -#endif \ No newline at end of file +#endif diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/FormattingUtilities.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/FormattingUtilities.cs index e7b1381c10..1ffbfe5e9c 100644 --- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/FormattingUtilities.cs +++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/FormattingUtilities.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 ASPNETCORE50 +#if DNXCORE50 using System.Collections.Generic; using System.Globalization; @@ -241,4 +241,4 @@ namespace System.Net.Http } } } -#endif \ No newline at end of file +#endif diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/IContentNegotiator.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/IContentNegotiator.cs index 05c37ce25e..7daaf112bb 100644 --- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/IContentNegotiator.cs +++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/IContentNegotiator.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 ASPNETCORE50 +#if DNXCORE50 using System.Collections.Generic; using System.Net.Http.Headers; diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/ListWrapperCollection.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/ListWrapperCollection.cs index aed400241c..1d862196c9 100644 --- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/ListWrapperCollection.cs +++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/ListWrapperCollection.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 ASPNETCORE50 +#if DNXCORE50 using System.Collections.Generic; @@ -31,4 +31,4 @@ namespace System.Collections.ObjectModel } } } -#endif \ No newline at end of file +#endif diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeConstants.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeConstants.cs index 82532aecdc..8a23f9a495 100644 --- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeConstants.cs +++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeConstants.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 ASPNETCORE50 +#if DNXCORE50 using System.Net.Http.Headers; @@ -109,4 +109,4 @@ namespace System.Net.Http.Formatting } } } -#endif \ No newline at end of file +#endif diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeFormatterMatch.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeFormatterMatch.cs index bd68a8dc9e..77e54ab1ca 100644 --- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeFormatterMatch.cs +++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeFormatterMatch.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 ASPNETCORE50 +#if DNXCORE50 using System.Net.Http.Headers; @@ -57,4 +57,4 @@ namespace System.Net.Http.Formatting public MediaTypeFormatterMatchRanking Ranking { get; private set; } } } -#endif \ No newline at end of file +#endif diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeFormatterMatchRanking.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeFormatterMatchRanking.cs index a5b42f4a3f..5a7c20f86a 100644 --- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeFormatterMatchRanking.cs +++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeFormatterMatchRanking.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 ASPNETCORE50 +#if DNXCORE50 namespace System.Net.Http.Formatting { @@ -45,4 +45,4 @@ namespace System.Net.Http.Formatting MatchOnRequestMediaType, } } -#endif \ No newline at end of file +#endif diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeHeaderValueExtensions.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeHeaderValueExtensions.cs index 440900046e..49670ca16d 100644 --- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeHeaderValueExtensions.cs +++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeHeaderValueExtensions.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 ASPNETCORE50 +#if DNXCORE50 using System.Collections.Generic; using System.Diagnostics; @@ -118,4 +118,4 @@ namespace System.Net.Http.Formatting } } } -#endif \ No newline at end of file +#endif diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeWithQualityHeaderComparer.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeWithQualityHeaderComparer.cs index 01bafaf31d..4abaab5f07 100644 --- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeWithQualityHeaderComparer.cs +++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeWithQualityHeaderComparer.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 ASPNETCORE50 +#if DNXCORE50 using System.Collections.Generic; using System.Diagnostics; @@ -112,4 +112,4 @@ namespace System.Net.Http.Formatting } } } -#endif \ No newline at end of file +#endif diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/ParsedMediaTypeHeaderValue.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/ParsedMediaTypeHeaderValue.cs index 19d9b51724..1b25ae4e02 100644 --- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/ParsedMediaTypeHeaderValue.cs +++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/ParsedMediaTypeHeaderValue.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 ASPNETCORE50 +#if DNXCORE50 using System.Diagnostics; using System.Net.Http.Headers; @@ -88,4 +88,4 @@ namespace System.Net.Http.Formatting } } } -#endif \ No newline at end of file +#endif diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/StringWithQualityHeaderValueComparer.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/StringWithQualityHeaderValueComparer.cs index 9551bc2132..a1563b52eb 100644 --- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/StringWithQualityHeaderValueComparer.cs +++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/StringWithQualityHeaderValueComparer.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 ASPNETCORE50 +#if DNXCORE50 using System.Collections.Generic; using System.Diagnostics; @@ -74,4 +74,4 @@ namespace System.Net.Http.Formatting } } } -#endif \ No newline at end of file +#endif diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/HttpRequestMessage/HttpRequestMessageExtensions.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/HttpRequestMessage/HttpRequestMessageExtensions.cs index 9558cefc49..6e330bed04 100644 --- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/HttpRequestMessage/HttpRequestMessageExtensions.cs +++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/HttpRequestMessage/HttpRequestMessageExtensions.cs @@ -21,7 +21,7 @@ namespace System.Net.Http /// public static class HttpRequestMessageExtensions { -#if !ASPNETCORE50 +#if !DNXCORE50 /// /// Helper method for creating an message with a "416 (Requested Range Not @@ -422,4 +422,4 @@ namespace System.Net.Http } } } -} \ No newline at end of file +} diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/project.json b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/project.json index ba75510145..f31228e080 100644 --- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/project.json +++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/project.json @@ -13,14 +13,14 @@ "Microsoft.Framework.NotNullAttribute.Internal": { "version": "1.0.0-*", "type": "build" } }, "frameworks": { - "aspnet50": { + "dnx451": { "frameworkAssemblies": { "System.Net.Http": "", "System.Xml": "", "System.Runtime.Serialization": "" } }, - "aspnetcore50": { + "dnxcore50": { "dependencies": { "System.Net.Http": "4.0.0-beta-*", "System.Xml.XmlSerializer": "4.0.10-beta-*", @@ -28,4 +28,4 @@ } } } -} \ No newline at end of file +} diff --git a/src/Microsoft.AspNet.Mvc.Xml/FormattingUtilities.cs b/src/Microsoft.AspNet.Mvc.Xml/FormattingUtilities.cs index 998147e096..c18af90f0c 100644 --- a/src/Microsoft.AspNet.Mvc.Xml/FormattingUtilities.cs +++ b/src/Microsoft.AspNet.Mvc.Xml/FormattingUtilities.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 ASPNET50 +#if DNX451 using System.Runtime.Serialization; #endif using System.Xml; @@ -15,7 +15,7 @@ namespace Microsoft.AspNet.Mvc.Xml { public static readonly int DefaultMaxDepth = 32; -#if ASPNET50 +#if DNX451 public static readonly XsdDataContractExporter XsdDataContractExporter = new XsdDataContractExporter(); #endif diff --git a/src/Microsoft.AspNet.Mvc.Xml/XmlDataContractSerializerOutputFormatter.cs b/src/Microsoft.AspNet.Mvc.Xml/XmlDataContractSerializerOutputFormatter.cs index a3b2a7ed18..3eb083d643 100644 --- a/src/Microsoft.AspNet.Mvc.Xml/XmlDataContractSerializerOutputFormatter.cs +++ b/src/Microsoft.AspNet.Mvc.Xml/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; @@ -135,7 +135,7 @@ namespace Microsoft.AspNet.Mvc.Xml { try { -#if ASPNET50 +#if DNX451 // Verify that type is a valid data contract by forcing the serializer to try to create a data contract FormattingUtilities.XsdDataContractExporter.GetRootElementName(type); #endif diff --git a/src/Microsoft.AspNet.Mvc.Xml/project.json b/src/Microsoft.AspNet.Mvc.Xml/project.json index 9fdbccb532..b35835c971 100644 --- a/src/Microsoft.AspNet.Mvc.Xml/project.json +++ b/src/Microsoft.AspNet.Mvc.Xml/project.json @@ -11,17 +11,17 @@ "Microsoft.Framework.NotNullAttribute.Internal": { "version": "1.0.0-*", "type": "build" } }, "frameworks": { - "aspnet50": { + "dnx451": { "frameworkAssemblies": { "System.Xml": "", "System.Runtime.Serialization": "" } }, - "aspnetcore50": { + "dnxcore50": { "dependencies": { "System.Runtime.Serialization.Xml": "4.0.10-beta-*", "System.Xml.XmlSerializer": "4.0.10-beta-*" } } } -} \ No newline at end of file +} diff --git a/src/Microsoft.AspNet.Mvc/project.json b/src/Microsoft.AspNet.Mvc/project.json index 1fa510f5a9..ae203055ef 100644 --- a/src/Microsoft.AspNet.Mvc/project.json +++ b/src/Microsoft.AspNet.Mvc/project.json @@ -1,4 +1,4 @@ -{ +{ "description": "ASP.NET MVC is a web framework that gives you a powerful, patterns-based way to build dynamic websites and Web APIs. ASP.NET MVC enables a clean separation of concerns and gives you full control over markup.", "version": "6.0.0-*", "compilationOptions": { @@ -13,7 +13,7 @@ "Microsoft.Framework.NotNullAttribute.Internal": { "version": "1.0.0-*", "type": "build" } }, "frameworks": { - "aspnet50": {}, - "aspnetcore50": {} + "dnx451": {}, + "dnxcore50": {} } } diff --git a/src/Microsoft.AspNet.PageExecutionInstrumentation.Interfaces/project.json b/src/Microsoft.AspNet.PageExecutionInstrumentation.Interfaces/project.json index cc5c4934d0..a5adbe525b 100644 --- a/src/Microsoft.AspNet.PageExecutionInstrumentation.Interfaces/project.json +++ b/src/Microsoft.AspNet.PageExecutionInstrumentation.Interfaces/project.json @@ -1,12 +1,12 @@ -{ +{ "description": "Abstractions for page instrumentation.", "version": "1.0.0-*", "compilationOptions": { "warningsAsErrors": true }, "frameworks": { - "aspnet50": { }, - "aspnetcore50": { + "dnx451": { }, + "dnxcore50": { "dependencies": { "System.IO": "4.0.10-beta-*" } diff --git a/test/Microsoft.AspNet.Mvc.Common.Test/project.json b/test/Microsoft.AspNet.Mvc.Common.Test/project.json index 3b468c3094..b5b9f84ab1 100644 --- a/test/Microsoft.AspNet.Mvc.Common.Test/project.json +++ b/test/Microsoft.AspNet.Mvc.Common.Test/project.json @@ -15,11 +15,11 @@ "test": "xunit.runner.kre" }, "frameworks": { - "aspnet50": { + "dnx451": { "dependencies": { "Moq": "4.2.1312.1622" } }, - "aspnetcore50": { } + "dnxcore50": { } } } diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ControllerTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ControllerTests.cs index 9ef9fab232..5bcaa9d82c 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ControllerTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/ControllerTests.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 @@ using Microsoft.AspNet.Routing; using Microsoft.AspNet.Testing; using Microsoft.AspNet.WebUtilities; using Microsoft.AspNet.Http.Core; -#if ASPNET50 +#if DNX451 using Moq; #endif using Xunit; @@ -911,7 +911,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 ASPNET50 +#if DNX451 [Fact] public async Task Controller_ActionFilter_SettingResult_ShortCircuits() { diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/DefaultViewComponentActivatorTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/DefaultViewComponentActivatorTests.cs index d8447b0fc1..3ec8c06df9 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 ASPNET50 +#if DNX451 using System; using System.IO; using System.Threading.Tasks; diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Filters/ActionFilterAttributeTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Filters/ActionFilterAttributeTests.cs index b450b7d8b4..1abbafb18a 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 ASPNET50 +#if DNX451 using System.Collections.Generic; using System.Threading.Tasks; using Microsoft.AspNet.Http; diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Filters/FormatFilterTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Filters/FormatFilterTest.cs index cd623b04d8..51ad320cbf 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Filters/FormatFilterTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Filters/FormatFilterTest.cs @@ -11,7 +11,7 @@ using Microsoft.Framework.OptionsModel; using Microsoft.Net.Http.Headers; using Xunit; -#if ASPNET50 +#if DNX451 using Moq; using System.Net; #endif @@ -27,7 +27,7 @@ namespace Microsoft.AspNet.Mvc RouteAndQueryData } -#if ASPNET50 +#if DNX451 [Theory] [InlineData("json", FormatSource.RouteData, "application/json")] [InlineData("json", FormatSource.QueryData, "application/json")] @@ -411,4 +411,4 @@ namespace Microsoft.AspNet.Mvc } #endif } -} \ No newline at end of file +} diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Filters/ProducesAttributeTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Filters/ProducesAttributeTests.cs index 5fa9d9c948..445f6cae15 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Filters/ProducesAttributeTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Filters/ProducesAttributeTests.cs @@ -9,7 +9,7 @@ using Microsoft.AspNet.Routing; using Microsoft.Net.Http.Headers; using Xunit; -#if ASPNET50 +#if DNX451 using Moq; #endif @@ -191,4 +191,4 @@ namespace Microsoft.AspNet.Mvc.Test public string Name { get; set; } } } -} \ No newline at end of file +} diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Filters/ResultFilterAttributeTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Filters/ResultFilterAttributeTest.cs index 42b85437cf..7f1de438fa 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 ASPNET50 +#if DNX451 using System.Threading.Tasks; using Moq; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Formatters/JsonInputFormatterTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Formatters/JsonInputFormatterTest.cs index 2f5d5e17ba..c8a79ba95b 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. +// 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 ASPNET50 +#if DNX451 using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Formatters/NonDisposableStreamTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Formatters/NonDisposableStreamTest.cs index 8a63dc275d..082df4eafc 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Formatters/NonDisposableStreamTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Formatters/NonDisposableStreamTest.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 ASPNET50 +#if DNX451 using System.IO; using System.Threading.Tasks; using Microsoft.AspNet.Mvc.Core; diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/KnownRouteValueConstraintTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/KnownRouteValueConstraintTests.cs index 56a056fc2e..7eb4ddf48f 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. +// 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 ASPNET50 +#if DNX451 using System; using System.Collections.Generic; using Microsoft.AspNet.Http; diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ParameterBinding/ModelBindingHelperTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ParameterBinding/ModelBindingHelperTest.cs index 73eaee6117..d08091a7d1 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 ASPNET50 +#if DNX451 using System; using System.Collections; using System.Collections.Generic; diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Routing/AttributeRoutePrecedenceTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Routing/AttributeRoutePrecedenceTests.cs index ca319a2914..e3cfa201fd 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 ASPNET50 +#if DNX451 using Microsoft.AspNet.Routing; using Microsoft.AspNet.Routing.Template; using Microsoft.Framework.OptionsModel; diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Routing/AttributeRouteTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Routing/AttributeRouteTest.cs index 6501db9369..064baa94eb 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Routing/AttributeRouteTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Routing/AttributeRouteTest.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 ASPNET50 +#if DNX451 using System; using System.Collections.Generic; using System.Threading.Tasks; diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Routing/AttributeRoutingTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Routing/AttributeRoutingTest.cs index 2d1122d9fe..5b12a570c8 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 ASPNET50 +#if DNX451 using System; using System.Collections.Generic; using System.Threading.Tasks; diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/project.json b/test/Microsoft.AspNet.Mvc.Core.Test/project.json index ee49e13e66..0926bab5e5 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" }, @@ -13,6 +13,6 @@ "test": "xunit.runner.kre" }, "frameworks": { - "aspnet50": { } + "dnx451": { } } } diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/CompilationOptionsTests.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/CompilationOptionsTests.cs index ed5f3f1a32..d0a107341f 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/CompilationOptionsTests.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/CompilationOptionsTests.cs @@ -22,16 +22,16 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests public async Task CompilationOptions_AreUsedByViewsAndPartials() { // Arrange -#if ASPNET50 +#if DNX451 var expected = -@"This method is running from ASPNET50 +@"This method is running from DNX451 -This method is only defined in ASPNET50"; -#elif ASPNETCORE50 +This method is only defined in DNX451"; +#elif DNXCORE50 var expected = -@"This method is running from ASPNETCORE50 +@"This method is running from DNXCORE50 -This method is only defined in ASPNETCORE50"; +This method is only defined in DNXCORE50"; #endif var server = TestServer.Create(_provider, _app); var client = server.CreateClient(); @@ -43,4 +43,4 @@ This method is only defined in ASPNETCORE50"; Assert.Equal(expected, body.Trim()); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/DependencyResolverTests.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/DependencyResolverTests.cs index 6543101b8b..9470d62db8 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/DependencyResolverTests.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/DependencyResolverTests.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 ASPNET50 +#if DNX451 using System; using System.Net.Http; using System.Threading.Tasks; diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/Logging/LoggingActionSelectionTest.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/Logging/LoggingActionSelectionTest.cs index 23140ecc3d..ff19ee4217 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/Logging/LoggingActionSelectionTest.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/Logging/LoggingActionSelectionTest.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 ASPNET50 // Since Json.net serialization fails in CoreCLR +#if DNX451 // Since Json.net serialization fails in CoreCLR using System; using System.Collections.Generic; using System.Linq; @@ -98,4 +98,4 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests } } -#endif \ No newline at end of file +#endif diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/Logging/LoggingStartupTest.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/Logging/LoggingStartupTest.cs index 9d9e13528b..0fda855a6d 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/Logging/LoggingStartupTest.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/Logging/LoggingStartupTest.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 ASPNET50 // Since Json.net serialization fails in CoreCLR +#if DNX451 // Since Json.net serialization fails in CoreCLR using System; using System.Collections.Generic; using System.Linq; @@ -101,4 +101,4 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests } } } -#endif \ No newline at end of file +#endif diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/ModelBindingTest.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/ModelBindingTest.cs index 2d4f4f385e..d334f2812d 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/ModelBindingTest.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/ModelBindingTest.cs @@ -1230,7 +1230,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests Assert.Equal(trackingId, actual.LastUpdatedTrackingId); } -#if ASPNET50 +#if DNX451 [Fact] public async Task UpdateVehicle_WithXml_BindsBodyServicesAndHeaders() { @@ -2073,4 +2073,4 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests return JsonConvert.DeserializeObject(await response.Content.ReadAsStringAsync()); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/PrecompilationTest.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/PrecompilationTest.cs index 75201cccf5..41c948f4af 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/PrecompilationTest.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/PrecompilationTest.cs @@ -161,12 +161,12 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests { // Arrange var assemblyNamePrefix = GetAssemblyNamePrefix(); -#if ASPNET50 +#if DNX451 var expected = -@"Value set inside ASPNET50 " + assemblyNamePrefix; -#elif ASPNETCORE50 +@"Value set inside DNX451 " + assemblyNamePrefix; +#elif DNXCORE50 var expected = -@"Value set inside ASPNETCORE50 " + assemblyNamePrefix; +@"Value set inside DNXCORE50 " + assemblyNamePrefix; #endif var server = TestServer.Create(_services, _app); @@ -299,4 +299,4 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests } } -} \ No newline at end of file +} diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/SerializableErrorTests.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/SerializableErrorTests.cs index 6d6d6170a3..ec2a387946 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/SerializableErrorTests.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/SerializableErrorTests.cs @@ -20,7 +20,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests private readonly Action _app = new XmlFormattersWebSite.Startup().Configure; [Theory] -#if !ASPNETCORE50 +#if !DNXCORE50 [InlineData("application/xml-xmlser")] #endif [InlineData("application/xml-dcs")] @@ -45,7 +45,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests } [Theory] -#if !ASPNETCORE50 +#if !DNXCORE50 [InlineData("application/xml-xmlser")] #endif [InlineData("application/xml-dcs")] @@ -97,4 +97,4 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests XmlAssert.Equal(expected, responseData); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/WebApiCompatShimBasicTest.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/WebApiCompatShimBasicTest.cs index 181faded56..fc33fda938 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/WebApiCompatShimBasicTest.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/WebApiCompatShimBasicTest.cs @@ -58,7 +58,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests content); } -#if !ASPNETCORE50 +#if !DNXCORE50 [Fact] public async Task Options_SetsDefaultFormatters() diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/XmlSerializerFormattersWrappingTest.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/XmlSerializerFormattersWrappingTest.cs index f96be90395..7ef52a7cf1 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/XmlSerializerFormattersWrappingTest.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/XmlSerializerFormattersWrappingTest.cs @@ -178,7 +178,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests result); } -#if !ASPNETCORE50 +#if !DNXCORE50 [Fact] public async Task CanWrite_IEnumerableOf_SerializableErrors() { @@ -202,4 +202,4 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests } #endif } -} \ No newline at end of file +} diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/project.json b/test/Microsoft.AspNet.Mvc.FunctionalTests/project.json index d4658367df..b6bc3d52d5 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/project.json +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/project.json @@ -1,4 +1,4 @@ -{ +{ "code": [ "**/*.cs", "../Microsoft.AspNet.Mvc.Xml.Test/XmlAssert.cs" @@ -61,7 +61,7 @@ "test": "xunit.runner.kre" }, "frameworks": { - "aspnet50": { + "dnx451": { "dependencies": { "AutofacWebSite": "1.0.0" } diff --git a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/BindAttributeTest.cs b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/BindAttributeTest.cs index 51a21f90b7..f33d52d6e6 100644 --- a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/BindAttributeTest.cs +++ b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/BindAttributeTest.cs @@ -1,10 +1,10 @@ -// 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; using Microsoft.AspNet.Http.Core; using Microsoft.Framework.DependencyInjection; -#if ASPNET50 +#if DNX451 using Moq; #endif using Xunit; @@ -59,7 +59,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding Assert.Equal(isIncluded, predicate(context, property)); } -#if ASPNET50 +#if DNX451 [Theory] [InlineData("UserName", true)] [InlineData("Username", false)] diff --git a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/ArrayModelBinderTest.cs b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/ArrayModelBinderTest.cs index d9ffd21d4b..182b4c0303 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. +// 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 ASPNET50 +#if DNX451 using System.Threading.Tasks; using Moq; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/BinderTypeBasedModelBinderModelBinderTest.cs b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/BinderTypeBasedModelBinderModelBinderTest.cs index c0c9daf9dc..638bc2eb25 100644 --- a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/BinderTypeBasedModelBinderModelBinderTest.cs +++ b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/BinderTypeBasedModelBinderModelBinderTest.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 ASPNET50 +#if DNX451 using System; using System.Collections.Generic; using System.Threading.Tasks; diff --git a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/ByteArrayModelBinderTests.cs b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/ByteArrayModelBinderTests.cs index dc3df64879..8709d6d0a3 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 ASPNET50 +#if DNX451 using System; using System.Linq; using System.Threading.Tasks; diff --git a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/CollectionModelBinderTest.cs b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/CollectionModelBinderTest.cs index 7cea3eda1a..49a0943989 100644 --- a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/CollectionModelBinderTest.cs +++ b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/CollectionModelBinderTest.cs @@ -1,13 +1,13 @@ -// 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 ASPNET50 +#if DNX451 using System.Collections.Generic; using System.Globalization; using System.Linq; #endif using System.Threading.Tasks; -#if ASPNET50 +#if DNX451 using Moq; #endif using Xunit; @@ -16,7 +16,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Test { public class CollectionModelBinderTest { -#if ASPNET50 +#if DNX451 [Fact] public async Task BindComplexCollectionFromIndexes_FiniteIndexes() { @@ -132,7 +132,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Test Assert.Null(boundCollection); } -#if ASPNET50 +#if DNX451 [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 bd9076fee4..43a96d1612 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. +// 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 ASPNET50 +#if DNX451 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 b9d74255a7..e6aee0d8c7 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. +// 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 ASPNET50 +#if DNX451 using System.Collections.Generic; using System.Threading.Tasks; using Moq; diff --git a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/FormCollectionModelBinderTest.cs b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/FormCollectionModelBinderTest.cs index e684f1118f..845576f3b8 100644 --- a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/FormCollectionModelBinderTest.cs +++ b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/FormCollectionModelBinderTest.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 ASPNET50 +#if DNX451 using System; using System.Collections; @@ -145,4 +145,4 @@ namespace Microsoft.AspNet.Mvc.ModelBinding } } -#endif \ No newline at end of file +#endif diff --git a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/FormFileModelBinderTest.cs b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/FormFileModelBinderTest.cs index 4c2bada99a..0198b69275 100644 --- a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/FormFileModelBinderTest.cs +++ b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/FormFileModelBinderTest.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 ASPNET50 +#if DNX451 using System; using System.Collections.Generic; @@ -201,4 +201,4 @@ namespace Microsoft.AspNet.Mvc.ModelBinding } } -#endif \ No newline at end of file +#endif diff --git a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/KeyValuePairModelBinderTest.cs b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/KeyValuePairModelBinderTest.cs index 17a8b69384..f03272a129 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. +// 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 ASPNET50 +#if DNX451 using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; diff --git a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/MutableObjectModelBinderTest.cs b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/MutableObjectModelBinderTest.cs index 085219d750..aae83fb56b 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. +// 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 ASPNET50 +#if DNX451 using System; using System.Collections.Generic; using System.ComponentModel; diff --git a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Metadata/DefaultModelMetadataTest.cs b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Metadata/DefaultModelMetadataTest.cs index 3193ce5cce..801316c31f 100644 --- a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Metadata/DefaultModelMetadataTest.cs +++ b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Metadata/DefaultModelMetadataTest.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; using System.Linq; using System.Reflection; -#if !ASPNETCORE50 +#if !DNXCORE50 using Moq; #endif using Xunit; @@ -169,7 +169,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Metadata Assert.True(isRequired); } -#if !ASPNETCORE50 +#if !DNXCORE50 [Fact] public void PropertiesProperty_CallsProvider() { @@ -435,4 +435,4 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Metadata { } } -} \ No newline at end of file +} diff --git a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Validation/AssociatedValidatorProviderTest.cs b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Validation/AssociatedValidatorProviderTest.cs index c4941318a8..35a9d52fcc 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. +// 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 ASPNET50 +#if DNX451 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 5faeb26bae..4132b0194f 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 ASPNET50 +#if DNX451 using Moq; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Validation/DataAnnotationsModelValidatorProviderTest.cs b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Validation/DataAnnotationsModelValidatorProviderTest.cs index 3c1ddaa2e6..344dec6052 100644 --- a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Validation/DataAnnotationsModelValidatorProviderTest.cs +++ b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Validation/DataAnnotationsModelValidatorProviderTest.cs @@ -1,11 +1,11 @@ -// 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; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; -#if ASPNET50 +#if DNX451 using Moq; #endif using Xunit; @@ -16,7 +16,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding { private readonly IModelMetadataProvider _metadataProvider = TestModelMetadataProvider.CreateDefaultProvider(); -#if ASPNET50 +#if DNX451 [Fact] public void GetValidators_ReturnsValidatorForIValidatableObject() { @@ -163,7 +163,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding // Default IValidatableObject adapter factory -#if ASPNET50 +#if DNX451 [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 c38fffb97b..61b8bd1508 100644 --- a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Validation/DataAnnotationsModelValidatorTest.cs +++ b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Validation/DataAnnotationsModelValidatorTest.cs @@ -1,14 +1,14 @@ -// 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; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -#if ASPNET50 +#if DNX451 using System.Linq; #endif using Microsoft.Framework.DependencyInjection; -#if ASPNET50 +#if DNX451 using Moq; using Moq.Protected; #endif @@ -51,7 +51,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding } } -#if ASPNET50 +#if DNX451 [Theory] [MemberData(nameof(ValidateSetsMemberNamePropertyDataSet))] public void ValidateSetsMemberNamePropertyOfValidationContextForProperties( diff --git a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Validation/DefaultObjectValidatorTests.cs b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Validation/DefaultObjectValidatorTests.cs index bd3acaf8cc..3715fe3337 100644 --- a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Validation/DefaultObjectValidatorTests.cs +++ b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Validation/DefaultObjectValidatorTests.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 ASPNET50 +#if DNX451 using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; @@ -665,4 +665,4 @@ namespace Microsoft.AspNet.Mvc.ModelBinding } } } -#endif \ No newline at end of file +#endif diff --git a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/ValueProviders/CompositeValueProviderTests.cs b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/ValueProviders/CompositeValueProviderTests.cs index a01133fc9e..2012e0e89a 100644 --- a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/ValueProviders/CompositeValueProviderTests.cs +++ b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/ValueProviders/CompositeValueProviderTests.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 ASPNET50 +#if DNX451 using System; using System.Collections.Generic; @@ -127,4 +127,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 164ee849bc..437ab03ba8 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. +// 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 ASPNET50 +#if DNX451 using System; using System.Collections.Generic; using System.Globalization; diff --git a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/ValueProviders/QueryStringValueProviderFactoryTest.cs b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/ValueProviders/QueryStringValueProviderFactoryTest.cs index a40693d0c0..a06a3038d9 100644 --- a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/ValueProviders/QueryStringValueProviderFactoryTest.cs +++ b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/ValueProviders/QueryStringValueProviderFactoryTest.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 ASPNET50 +#if DNX451 using System; using System.Collections.Generic; using System.Globalization; @@ -16,7 +16,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Test { private readonly QueryStringValueProviderFactory _factory = new QueryStringValueProviderFactory(); -#if ASPNET50 +#if DNX451 [Fact] public void GetValueProvider_ReturnsQueryStringValueProviderInstanceWithInvariantCulture() { diff --git a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/project.json b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/project.json index f92fc47452..ffff365566 100644 --- a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/project.json +++ b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/project.json @@ -1,4 +1,4 @@ -{ +{ "compilationOptions": { "warningsAsErrors": "true" }, @@ -13,7 +13,7 @@ "test": "xunit.runner.kre" }, "frameworks": { - "aspnet50": { }, - "aspnetcore50": { } + "dnx451": { }, + "dnxcore50": { } } } diff --git a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/project.json b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/project.json index ee6ce65e51..ad961f2576 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 @@ -{ +{ "resources": "TestFiles/**", "dependencies": { "Microsoft.AspNet.Mvc.Razor.Host": "6.0.0-*", @@ -9,7 +9,7 @@ "test": "xunit.runner.kre" }, "frameworks": { - "aspnet50": { + "dnx451": { "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 e24804ba00..ac92311f10 100644 --- a/test/Microsoft.AspNet.Mvc.Razor.Test/project.json +++ b/test/Microsoft.AspNet.Mvc.Razor.Test/project.json @@ -1,4 +1,4 @@ -{ +{ "code": [ "**/*.cs", "../Microsoft.AspNet.Mvc.Razor.Host.Test/TestFileProvider.cs", @@ -14,7 +14,7 @@ "test": "xunit.runner.kre" }, "frameworks": { - "aspnet50": { + "dnx451": { "dependencies": { "Moq": "4.2.1312.1622" } diff --git a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/project.json b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/project.json index 607a654a0b..aa87311bcc 100644 --- a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/project.json +++ b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/project.json @@ -1,4 +1,4 @@ -{ +{ "dependencies": { "Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-*", "Microsoft.AspNet.Testing": "1.0.0-*", @@ -9,10 +9,10 @@ "test": "xunit.runner.kre" }, "frameworks": { - "aspnet50": { + "dnx451": { "dependencies": { "Moq": "4.2.1312.1622" } } } -} \ No newline at end of file +} diff --git a/test/Microsoft.AspNet.Mvc.Test/project.json b/test/Microsoft.AspNet.Mvc.Test/project.json index 0f116b9359..0d4178bffd 100644 --- a/test/Microsoft.AspNet.Mvc.Test/project.json +++ b/test/Microsoft.AspNet.Mvc.Test/project.json @@ -1,4 +1,4 @@ -{ +{ "compilationOptions": { "warningsAsErrors": "true" }, @@ -10,7 +10,7 @@ "test": "xunit.runner.kre" }, "frameworks": { - "aspnet50": { + "dnx451": { "dependencies": { "Moq": "4.2.1312.1622" } diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/BadRequestErrorMessageResultTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/BadRequestErrorMessageResultTest.cs index e82ea51cce..c24dd53f7f 100644 --- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/BadRequestErrorMessageResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/BadRequestErrorMessageResultTest.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 ASPNET50 +#if DNX451 using System.Collections.Generic; using System.IO; using System.Threading.Tasks; @@ -86,4 +86,4 @@ namespace System.Web.Http } } } -#endif \ No newline at end of file +#endif diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/ExceptionResultTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/ExceptionResultTest.cs index 76b55d295c..10fa7aafa2 100644 --- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/ExceptionResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/ExceptionResultTest.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 ASPNET50 +#if DNX451 using System.Collections.Generic; using System.IO; using System.Threading.Tasks; @@ -86,4 +86,4 @@ namespace System.Web.Http } } } -#endif \ No newline at end of file +#endif diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/InvalidModelStateResultTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/InvalidModelStateResultTest.cs index 8ba25a911d..849d76e9b5 100644 --- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/InvalidModelStateResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/InvalidModelStateResultTest.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 ASPNET50 +#if DNX451 using System.Collections.Generic; using System.IO; using System.Threading.Tasks; @@ -99,4 +99,4 @@ namespace System.Web.Http } } } -#endif \ No newline at end of file +#endif diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/NegotiatedContentResultTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/NegotiatedContentResultTest.cs index b57226aa0e..c0e4cc21f1 100644 --- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/NegotiatedContentResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/NegotiatedContentResultTest.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 ASPNET50 +#if DNX451 using System.Collections.Generic; using System.IO; using System.Net; @@ -94,4 +94,4 @@ namespace System.Web.Http }; } } -#endif \ No newline at end of file +#endif diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/OkNegotiatedContentResultTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/OkNegotiatedContentResultTest.cs index 3f3dddfa31..a01dac91b8 100644 --- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/OkNegotiatedContentResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/OkNegotiatedContentResultTest.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 ASPNET50 +#if DNX451 using System.Collections.Generic; using System.IO; using System.Threading.Tasks; @@ -68,4 +68,4 @@ namespace System.Web.Http }; } } -#endif \ No newline at end of file +#endif diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ApiControllerActionDiscoveryTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ApiControllerActionDiscoveryTest.cs index 0d8e6369f1..42059eb0d9 100644 --- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ApiControllerActionDiscoveryTest.cs +++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ApiControllerActionDiscoveryTest.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 !ASPNETCORE50 +#if !DNXCORE50 using System.Collections.Generic; using System.Linq; @@ -506,4 +506,4 @@ namespace System.Web.Http.TestControllers } } } -#endif \ No newline at end of file +#endif diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/DefaultContentNegotiatorTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/DefaultContentNegotiatorTest.cs index 4283e95c25..4a8093cbd2 100644 --- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/DefaultContentNegotiatorTest.cs +++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/DefaultContentNegotiatorTest.cs @@ -148,7 +148,7 @@ namespace System.Net.Http.Formatting { get { -#if !ASPNETCORE50 +#if !DNXCORE50 // Only mapping and accept makes sense with q != 1.0 MediaTypeFormatterMatch matchMapping10 = CreateMatch(1.0, MediaTypeFormatterMatchRanking.MatchOnRequestWithMediaTypeMapping); MediaTypeFormatterMatch matchMapping05 = CreateMatch(0.5, MediaTypeFormatterMatchRanking.MatchOnRequestWithMediaTypeMapping); @@ -175,7 +175,7 @@ namespace System.Net.Http.Formatting { new List() { matchType10, matchRequest10, matchAcceptAllRange10 }, matchAcceptAllRange10 }, { new List() { matchType10, matchRequest10, matchAcceptAllRange10, matchAcceptSubTypeRange10 }, matchAcceptSubTypeRange10 }, { new List() { matchType10, matchRequest10, matchAcceptAllRange10, matchAcceptSubTypeRange10, matchAccept10 }, matchAccept10 }, -#if !ASPNETCORE50 +#if !DNXCORE50 { new List() { matchType10, matchRequest10, matchAcceptAllRange10, matchAcceptSubTypeRange10, matchAccept10, matchMapping10 }, matchMapping10 }, #endif { new List() { matchAccept05, matchAccept10 }, matchAccept10 }, @@ -186,7 +186,7 @@ namespace System.Net.Http.Formatting { new List() { matchAcceptAllRange05, matchAcceptAllRange10 }, matchAcceptAllRange10 }, { new List() { matchAcceptAllRange10, matchAcceptAllRange05 }, matchAcceptAllRange10 }, -#if !ASPNETCORE50 +#if !DNXCORE50 { new List() { matchMapping05, matchMapping10 }, matchMapping10 }, { new List() { matchMapping10, matchMapping05 }, matchMapping10 }, @@ -250,7 +250,7 @@ namespace System.Net.Http.Formatting Assert.Null(result); } -#if !ASPNETCORE50 +#if !DNXCORE50 [Fact] public void Negotiate_MediaTypeMappingTakesPrecedenceOverAcceptHeader() @@ -358,7 +358,7 @@ namespace System.Net.Http.Formatting Assert.IsType(result.Formatter); } -#if !ASPNETCORE50 +#if !DNXCORE50 [Fact] public void Negotiate_RespectsFormatterOrdering_ForXhrRequestThatDoesNotSpecifyAcceptHeaders() @@ -455,7 +455,7 @@ namespace System.Net.Http.Formatting } } -#if !ASPNETCORE50 +#if !DNXCORE50 [Fact] public void MatchMediaTypeMapping_ReturnsMatch() @@ -807,7 +807,7 @@ namespace System.Net.Http.Formatting } } -#if !ASPNETCORE50 +#if !DNXCORE50 private class MyMediaTypeMapping : MediaTypeMapping { diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/HttpErrorTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/HttpErrorTest.cs index cb351d0a83..25092dfe46 100644 --- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/HttpErrorTest.cs +++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/HttpErrorTest.cs @@ -109,7 +109,7 @@ namespace System.Web.Http.Dispatcher Assert.DoesNotContain("OH NO", modelStateError["[2].Name"] as IEnumerable); } -#if !ASPNETCORE50 +#if !DNXCORE50 [Fact] public void HttpError_Roundtrips_WithJsonFormatter() diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/HttpRequestMessage/HttpRequestMessageExtensionsTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/HttpRequestMessage/HttpRequestMessageExtensionsTest.cs index 5c538ab298..ba64558215 100644 --- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/HttpRequestMessage/HttpRequestMessageExtensionsTest.cs +++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/HttpRequestMessage/HttpRequestMessageExtensionsTest.cs @@ -8,7 +8,7 @@ using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Core; using Microsoft.AspNet.Mvc.WebApiCompatShim; using Microsoft.Framework.OptionsModel; -#if !ASPNETCORE50 +#if !DNXCORE50 using Moq; #endif using Xunit; @@ -46,7 +46,7 @@ namespace System.Net.Http ex.Message); } -#if !ASPNETCORE50 +#if !DNXCORE50 [Fact] public void CreateResponse_DoingConneg_OnlyContent_RetrievesContentNegotiatorFromServices() diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/HttpResponseExceptionActionFilterTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/HttpResponseExceptionActionFilterTest.cs index d8452740c7..5f54433e20 100644 --- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/HttpResponseExceptionActionFilterTest.cs +++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/HttpResponseExceptionActionFilterTest.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 !ASPNETCORE50 +#if !DNXCORE50 using System.Collections.Generic; using System.Net; using System.Net.Http; @@ -27,7 +27,7 @@ namespace Microsoft.AspNet.Mvc.WebApiCompatShim Assert.Equal(expectedFilterOrder, filter.Order); } -#if !ASPNETCORE50 +#if !DNXCORE50 [Fact] public void OnActionExecuting_IsNoOp() @@ -89,4 +89,4 @@ namespace Microsoft.AspNet.Mvc.WebApiCompatShim #endif } -} \ No newline at end of file +} diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/HttpResponseMessageOutputFormatterTests.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/HttpResponseMessageOutputFormatterTests.cs index f76cbd008b..ee500a275a 100644 --- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/HttpResponseMessageOutputFormatterTests.cs +++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/HttpResponseMessageOutputFormatterTests.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 !ASPNETCORE50 +#if !DNXCORE50 using System; using System.IO; @@ -148,4 +148,4 @@ namespace Microsoft.AspNet.Mvc.WebApiCompatShimTest } } } -#endif \ No newline at end of file +#endif diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/Mocks/MockContentNegotiator.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/Mocks/MockContentNegotiator.cs index a959c59e75..666b39a08d 100644 --- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/Mocks/MockContentNegotiator.cs +++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/Mocks/MockContentNegotiator.cs @@ -34,7 +34,7 @@ namespace System.Net.Http.Formatting.Mocks return base.SelectResponseCharacterEncoding(request, formatter); } -#if !ASPNETCORE50 +#if !DNXCORE50 public new MediaTypeFormatterMatch MatchMediaTypeMapping(HttpRequestMessage request, MediaTypeFormatter formatter) { diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/Mocks/MockMediaTypeMapping.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/Mocks/MockMediaTypeMapping.cs index 7fde707f3e..13de2e0b25 100644 --- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/Mocks/MockMediaTypeMapping.cs +++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/Mocks/MockMediaTypeMapping.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 !ASPNETCORE50 +#if !DNXCORE50 using System.Net.Http.Headers; namespace System.Net.Http.Formatting.Mocks @@ -34,4 +34,4 @@ namespace System.Net.Http.Formatting.Mocks } } } -#endif \ No newline at end of file +#endif diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/project.json b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/project.json index 9aaf8cc023..dfbedd30cf 100644 --- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/project.json +++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/project.json @@ -12,7 +12,7 @@ "test": "xunit.runner.kre" }, "frameworks": { - "aspnet50": {}, - "aspnetcore50": {} + "dnx451": {}, + "dnxcore50": {} } } diff --git a/test/Microsoft.AspNet.Mvc.Xml.Test/XmlSerializerInputFormatterTest.cs b/test/Microsoft.AspNet.Mvc.Xml.Test/XmlSerializerInputFormatterTest.cs index b495b0e7cc..cb103062bd 100644 --- a/test/Microsoft.AspNet.Mvc.Xml.Test/XmlSerializerInputFormatterTest.cs +++ b/test/Microsoft.AspNet.Mvc.Xml.Test/XmlSerializerInputFormatterTest.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 ASPNET50 +#if DNX451 using System; using System.Collections.Generic; using System.IO; diff --git a/test/Microsoft.AspNet.Mvc.Xml.Test/project.json b/test/Microsoft.AspNet.Mvc.Xml.Test/project.json index 7c927e5db4..0926bab5e5 100644 --- a/test/Microsoft.AspNet.Mvc.Xml.Test/project.json +++ b/test/Microsoft.AspNet.Mvc.Xml.Test/project.json @@ -13,6 +13,6 @@ "test": "xunit.runner.kre" }, "frameworks": { - "aspnet50": { } + "dnx451": { } } } diff --git a/test/WebSites/ActionConstraintsWebSite/project.json b/test/WebSites/ActionConstraintsWebSite/project.json index 0b043ea88d..a5bd2f6f72 100644 --- a/test/WebSites/ActionConstraintsWebSite/project.json +++ b/test/WebSites/ActionConstraintsWebSite/project.json @@ -13,8 +13,8 @@ "Microsoft.AspNet.StaticFiles": "1.0.0-*" }, "frameworks": { - "aspnet50": { }, - "aspnetcore50": { } + "dnx451": { }, + "dnxcore50": { } }, "webroot": "wwwroot" -} \ No newline at end of file +} diff --git a/test/WebSites/ActionResultsWebSite/project.json b/test/WebSites/ActionResultsWebSite/project.json index 0b043ea88d..a5bd2f6f72 100644 --- a/test/WebSites/ActionResultsWebSite/project.json +++ b/test/WebSites/ActionResultsWebSite/project.json @@ -13,8 +13,8 @@ "Microsoft.AspNet.StaticFiles": "1.0.0-*" }, "frameworks": { - "aspnet50": { }, - "aspnetcore50": { } + "dnx451": { }, + "dnxcore50": { } }, "webroot": "wwwroot" -} \ No newline at end of file +} diff --git a/test/WebSites/ActivatorWebSite/project.json b/test/WebSites/ActivatorWebSite/project.json index c582a1382f..a08db9734c 100644 --- a/test/WebSites/ActivatorWebSite/project.json +++ b/test/WebSites/ActivatorWebSite/project.json @@ -1,4 +1,4 @@ -{ +{ "commands": { "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:5001", "kestrel": "Microsoft.AspNet.Hosting --server Kestrel --server.urls http://localhost:5000" @@ -12,8 +12,8 @@ "Microsoft.AspNet.StaticFiles": "1.0.0-*" }, "frameworks": { - "aspnet50": { }, - "aspnetcore50": { } + "dnx451": { }, + "dnxcore50": { } }, "webroot": "wwwroot" } diff --git a/test/WebSites/AddServicesWebSite/project.json b/test/WebSites/AddServicesWebSite/project.json index c582a1382f..a08db9734c 100644 --- a/test/WebSites/AddServicesWebSite/project.json +++ b/test/WebSites/AddServicesWebSite/project.json @@ -1,4 +1,4 @@ -{ +{ "commands": { "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:5001", "kestrel": "Microsoft.AspNet.Hosting --server Kestrel --server.urls http://localhost:5000" @@ -12,8 +12,8 @@ "Microsoft.AspNet.StaticFiles": "1.0.0-*" }, "frameworks": { - "aspnet50": { }, - "aspnetcore50": { } + "dnx451": { }, + "dnxcore50": { } }, "webroot": "wwwroot" } diff --git a/test/WebSites/AntiForgeryWebSite/project.json b/test/WebSites/AntiForgeryWebSite/project.json index c582a1382f..a08db9734c 100644 --- a/test/WebSites/AntiForgeryWebSite/project.json +++ b/test/WebSites/AntiForgeryWebSite/project.json @@ -1,4 +1,4 @@ -{ +{ "commands": { "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:5001", "kestrel": "Microsoft.AspNet.Hosting --server Kestrel --server.urls http://localhost:5000" @@ -12,8 +12,8 @@ "Microsoft.AspNet.StaticFiles": "1.0.0-*" }, "frameworks": { - "aspnet50": { }, - "aspnetcore50": { } + "dnx451": { }, + "dnxcore50": { } }, "webroot": "wwwroot" } diff --git a/test/WebSites/ApiExplorerWebSite/project.json b/test/WebSites/ApiExplorerWebSite/project.json index 1469d1a1be..a5bd2f6f72 100644 --- a/test/WebSites/ApiExplorerWebSite/project.json +++ b/test/WebSites/ApiExplorerWebSite/project.json @@ -1,4 +1,4 @@ -{ +{ "commands": { "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:5001", "kestrel": "Microsoft.AspNet.Hosting --server Kestrel --server.urls http://localhost:5000" @@ -13,8 +13,8 @@ "Microsoft.AspNet.StaticFiles": "1.0.0-*" }, "frameworks": { - "aspnet50": { }, - "aspnetcore50": { } + "dnx451": { }, + "dnxcore50": { } }, "webroot": "wwwroot" -} \ No newline at end of file +} diff --git a/test/WebSites/ApplicationModelWebSite/project.json b/test/WebSites/ApplicationModelWebSite/project.json index c582a1382f..a08db9734c 100644 --- a/test/WebSites/ApplicationModelWebSite/project.json +++ b/test/WebSites/ApplicationModelWebSite/project.json @@ -1,4 +1,4 @@ -{ +{ "commands": { "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:5001", "kestrel": "Microsoft.AspNet.Hosting --server Kestrel --server.urls http://localhost:5000" @@ -12,8 +12,8 @@ "Microsoft.AspNet.StaticFiles": "1.0.0-*" }, "frameworks": { - "aspnet50": { }, - "aspnetcore50": { } + "dnx451": { }, + "dnxcore50": { } }, "webroot": "wwwroot" } diff --git a/test/WebSites/AutofacWebSite/project.json b/test/WebSites/AutofacWebSite/project.json index 5dca4f019b..fb9973b05b 100644 --- a/test/WebSites/AutofacWebSite/project.json +++ b/test/WebSites/AutofacWebSite/project.json @@ -1,4 +1,4 @@ -{ +{ "commands": { "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:5001", "kestrel": "Microsoft.AspNet.Hosting --server Kestrel --server.urls http://localhost:5000" @@ -14,7 +14,7 @@ "Microsoft.AspNet.StaticFiles": "1.0.0-*" }, "frameworks": { - "aspnet50": { } + "dnx451": { } }, "webroot": "wwwroot" } diff --git a/test/WebSites/BasicWebSite/project.json b/test/WebSites/BasicWebSite/project.json index c582a1382f..a08db9734c 100644 --- a/test/WebSites/BasicWebSite/project.json +++ b/test/WebSites/BasicWebSite/project.json @@ -1,4 +1,4 @@ -{ +{ "commands": { "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:5001", "kestrel": "Microsoft.AspNet.Hosting --server Kestrel --server.urls http://localhost:5000" @@ -12,8 +12,8 @@ "Microsoft.AspNet.StaticFiles": "1.0.0-*" }, "frameworks": { - "aspnet50": { }, - "aspnetcore50": { } + "dnx451": { }, + "dnxcore50": { } }, "webroot": "wwwroot" } diff --git a/test/WebSites/BestEffortLinkGenerationWebSite/project.json b/test/WebSites/BestEffortLinkGenerationWebSite/project.json index c582a1382f..a08db9734c 100644 --- a/test/WebSites/BestEffortLinkGenerationWebSite/project.json +++ b/test/WebSites/BestEffortLinkGenerationWebSite/project.json @@ -1,4 +1,4 @@ -{ +{ "commands": { "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:5001", "kestrel": "Microsoft.AspNet.Hosting --server Kestrel --server.urls http://localhost:5000" @@ -12,8 +12,8 @@ "Microsoft.AspNet.StaticFiles": "1.0.0-*" }, "frameworks": { - "aspnet50": { }, - "aspnetcore50": { } + "dnx451": { }, + "dnxcore50": { } }, "webroot": "wwwroot" } diff --git a/test/WebSites/CompositeViewEngineWebSite/project.json b/test/WebSites/CompositeViewEngineWebSite/project.json index c582a1382f..a08db9734c 100644 --- a/test/WebSites/CompositeViewEngineWebSite/project.json +++ b/test/WebSites/CompositeViewEngineWebSite/project.json @@ -1,4 +1,4 @@ -{ +{ "commands": { "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:5001", "kestrel": "Microsoft.AspNet.Hosting --server Kestrel --server.urls http://localhost:5000" @@ -12,8 +12,8 @@ "Microsoft.AspNet.StaticFiles": "1.0.0-*" }, "frameworks": { - "aspnet50": { }, - "aspnetcore50": { } + "dnx451": { }, + "dnxcore50": { } }, "webroot": "wwwroot" } diff --git a/test/WebSites/ConnegWebSite/project.json b/test/WebSites/ConnegWebSite/project.json index 1066442200..a5bd2f6f72 100644 --- a/test/WebSites/ConnegWebSite/project.json +++ b/test/WebSites/ConnegWebSite/project.json @@ -1,4 +1,4 @@ -{ +{ "commands": { "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:5001", "kestrel": "Microsoft.AspNet.Hosting --server Kestrel --server.urls http://localhost:5000" @@ -13,8 +13,8 @@ "Microsoft.AspNet.StaticFiles": "1.0.0-*" }, "frameworks": { - "aspnet50": { }, - "aspnetcore50": { } + "dnx451": { }, + "dnxcore50": { } }, "webroot": "wwwroot" } diff --git a/test/WebSites/ControllerDiscoveryConventionsWebSite/project.json b/test/WebSites/ControllerDiscoveryConventionsWebSite/project.json index 6ab014eca2..2be7790753 100644 --- a/test/WebSites/ControllerDiscoveryConventionsWebSite/project.json +++ b/test/WebSites/ControllerDiscoveryConventionsWebSite/project.json @@ -14,8 +14,8 @@ "Microsoft.AspNet.StaticFiles": "1.0.0-*" }, "frameworks": { - "aspnet50": {}, - "aspnetcore50": { } + "dnx451": {}, + "dnxcore50": { } }, "webroot": "wwwroot" -} \ No newline at end of file +} diff --git a/test/WebSites/ControllersFromServicesClassLibrary/project.json b/test/WebSites/ControllersFromServicesClassLibrary/project.json index 3370f49d0e..76148f4b62 100644 --- a/test/WebSites/ControllersFromServicesClassLibrary/project.json +++ b/test/WebSites/ControllersFromServicesClassLibrary/project.json @@ -3,7 +3,7 @@ "Microsoft.AspNet.Mvc": "6.0.0-*" }, "frameworks": { - "aspnet50": { }, - "aspnetcore50": { } + "dnx451": { }, + "dnxcore50": { } } -} \ No newline at end of file +} diff --git a/test/WebSites/ControllersFromServicesWebSite/Startup.cs b/test/WebSites/ControllersFromServicesWebSite/Startup.cs index 95fb0b8c80..0d9d63b8af 100644 --- a/test/WebSites/ControllersFromServicesWebSite/Startup.cs +++ b/test/WebSites/ControllersFromServicesWebSite/Startup.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; @@ -7,7 +7,7 @@ using Microsoft.AspNet.Builder; using Microsoft.Framework.DependencyInjection; using ControllersFromServicesClassLibrary; -#if ASPNET50 +#if DNX451 using Autofac; using Microsoft.Framework.DependencyInjection.Autofac; #endif @@ -31,7 +31,7 @@ namespace ControllersFromServicesWebSite services.AddTransient(); -#if ASPNET50 +#if DNX451 // Create the autofac container var builder = new ContainerBuilder(); @@ -51,4 +51,4 @@ namespace ControllersFromServicesWebSite }); } } -} \ No newline at end of file +} diff --git a/test/WebSites/ControllersFromServicesWebSite/project.json b/test/WebSites/ControllersFromServicesWebSite/project.json index 5026f392c7..72ad9723c9 100644 --- a/test/WebSites/ControllersFromServicesWebSite/project.json +++ b/test/WebSites/ControllersFromServicesWebSite/project.json @@ -13,12 +13,12 @@ "Microsoft.AspNet.StaticFiles": "1.0.0-*" }, "frameworks": { - "aspnet50": { + "dnx451": { "dependencies": { "Microsoft.Framework.DependencyInjection.Autofac": "1.0.0-*" } }, - "aspnetcore50": { } + "dnxcore50": { } }, "webroot": "wwwroot" -} \ No newline at end of file +} diff --git a/test/WebSites/CustomRouteWebSite/project.json b/test/WebSites/CustomRouteWebSite/project.json index 01696e38f0..a08db9734c 100644 --- a/test/WebSites/CustomRouteWebSite/project.json +++ b/test/WebSites/CustomRouteWebSite/project.json @@ -12,8 +12,8 @@ "Microsoft.AspNet.StaticFiles": "1.0.0-*" }, "frameworks": { - "aspnet50": { }, - "aspnetcore50": { } + "dnx451": { }, + "dnxcore50": { } }, "webroot": "wwwroot" } diff --git a/test/WebSites/ErrorPageMiddlewareWebSite/project.json b/test/WebSites/ErrorPageMiddlewareWebSite/project.json index e9d3fb720a..8283174251 100644 --- a/test/WebSites/ErrorPageMiddlewareWebSite/project.json +++ b/test/WebSites/ErrorPageMiddlewareWebSite/project.json @@ -1,4 +1,4 @@ -{ +{ "commands": { "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:5001", "kestrel": "Microsoft.AspNet.Hosting --server Kestrel --server.urls http://localhost:5000" @@ -13,8 +13,8 @@ "Microsoft.AspNet.StaticFiles": "1.0.0-*" }, "frameworks": { - "aspnet50": { }, - "aspnetcore50": { } + "dnx451": { }, + "dnxcore50": { } }, "webroot": "wwwroot" } diff --git a/test/WebSites/FilesWebSite/project.json b/test/WebSites/FilesWebSite/project.json index 8e0ef4a67b..a1aaecf37d 100644 --- a/test/WebSites/FilesWebSite/project.json +++ b/test/WebSites/FilesWebSite/project.json @@ -1,4 +1,4 @@ -{ +{ "commands": { "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:5001", "kestrel": "Microsoft.AspNet.Hosting --server Kestrel --server.urls http://localhost:5000" @@ -12,8 +12,8 @@ "Microsoft.AspNet.StaticFiles": "1.0.0-*" }, "frameworks": { - "aspnet50": { }, - "aspnetcore50": { } + "dnx451": { }, + "dnxcore50": { } }, "webroot": "." } diff --git a/test/WebSites/FiltersWebSite/project.json b/test/WebSites/FiltersWebSite/project.json index 1066442200..a5bd2f6f72 100644 --- a/test/WebSites/FiltersWebSite/project.json +++ b/test/WebSites/FiltersWebSite/project.json @@ -1,4 +1,4 @@ -{ +{ "commands": { "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:5001", "kestrel": "Microsoft.AspNet.Hosting --server Kestrel --server.urls http://localhost:5000" @@ -13,8 +13,8 @@ "Microsoft.AspNet.StaticFiles": "1.0.0-*" }, "frameworks": { - "aspnet50": { }, - "aspnetcore50": { } + "dnx451": { }, + "dnxcore50": { } }, "webroot": "wwwroot" } diff --git a/test/WebSites/FormatFilterWebSite/project.json b/test/WebSites/FormatFilterWebSite/project.json index 464f3bbc61..a08db9734c 100644 --- a/test/WebSites/FormatFilterWebSite/project.json +++ b/test/WebSites/FormatFilterWebSite/project.json @@ -12,8 +12,8 @@ "Microsoft.AspNet.StaticFiles": "1.0.0-*" }, "frameworks": { - "aspnet50": { }, - "aspnetcore50": { } + "dnx451": { }, + "dnxcore50": { } }, "webroot": "wwwroot" -} \ No newline at end of file +} diff --git a/test/WebSites/FormatterWebSite/project.json b/test/WebSites/FormatterWebSite/project.json index ad6eff5138..4cc3323121 100644 --- a/test/WebSites/FormatterWebSite/project.json +++ b/test/WebSites/FormatterWebSite/project.json @@ -1,4 +1,4 @@ -{ +{ "commands": { "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:5001", "kestrel": "Microsoft.AspNet.Hosting --server Kestrel --server.urls http://localhost:5000" @@ -13,8 +13,8 @@ "Microsoft.AspNet.StaticFiles": "1.0.0-*" }, "frameworks": { - "aspnet50": { }, - "aspnetcore50": { + "dnx451": { }, + "dnxcore50": { } }, "webroot": "wwwroot" diff --git a/test/WebSites/InlineConstraintsWebSite/project.json b/test/WebSites/InlineConstraintsWebSite/project.json index c582a1382f..a08db9734c 100644 --- a/test/WebSites/InlineConstraintsWebSite/project.json +++ b/test/WebSites/InlineConstraintsWebSite/project.json @@ -1,4 +1,4 @@ -{ +{ "commands": { "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:5001", "kestrel": "Microsoft.AspNet.Hosting --server Kestrel --server.urls http://localhost:5000" @@ -12,8 +12,8 @@ "Microsoft.AspNet.StaticFiles": "1.0.0-*" }, "frameworks": { - "aspnet50": { }, - "aspnetcore50": { } + "dnx451": { }, + "dnxcore50": { } }, "webroot": "wwwroot" } diff --git a/test/WebSites/LoggingWebSite/project.json b/test/WebSites/LoggingWebSite/project.json index 895e88892b..2029a470cb 100644 --- a/test/WebSites/LoggingWebSite/project.json +++ b/test/WebSites/LoggingWebSite/project.json @@ -22,7 +22,7 @@ "Microsoft.AspNet.Diagnostics.Elm": "1.0.0-*" }, "frameworks": { - "aspnet50": { }, - "aspnetcore50": { } + "dnx451": { }, + "dnxcore50": { } } } diff --git a/test/WebSites/LowercaseUrlsWebSite/project.json b/test/WebSites/LowercaseUrlsWebSite/project.json index 01696e38f0..a08db9734c 100644 --- a/test/WebSites/LowercaseUrlsWebSite/project.json +++ b/test/WebSites/LowercaseUrlsWebSite/project.json @@ -12,8 +12,8 @@ "Microsoft.AspNet.StaticFiles": "1.0.0-*" }, "frameworks": { - "aspnet50": { }, - "aspnetcore50": { } + "dnx451": { }, + "dnxcore50": { } }, "webroot": "wwwroot" } diff --git a/test/WebSites/Microsoft.AspNet.Mvc.TestConfiguration/project.json b/test/WebSites/Microsoft.AspNet.Mvc.TestConfiguration/project.json index 8e45e11408..d193bfc345 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.AspNet.Http.Extensions": "1.0.0-*", @@ -7,7 +7,7 @@ "Microsoft.Framework.DependencyInjection": "1.0.0-*" }, "frameworks": { - "aspnet50": { }, - "aspnetcore50": { } + "dnx451": { }, + "dnxcore50": { } } } diff --git a/test/WebSites/ModelBindingWebSite/project.json b/test/WebSites/ModelBindingWebSite/project.json index 1066442200..a5bd2f6f72 100644 --- a/test/WebSites/ModelBindingWebSite/project.json +++ b/test/WebSites/ModelBindingWebSite/project.json @@ -1,4 +1,4 @@ -{ +{ "commands": { "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:5001", "kestrel": "Microsoft.AspNet.Hosting --server Kestrel --server.urls http://localhost:5000" @@ -13,8 +13,8 @@ "Microsoft.AspNet.StaticFiles": "1.0.0-*" }, "frameworks": { - "aspnet50": { }, - "aspnetcore50": { } + "dnx451": { }, + "dnxcore50": { } }, "webroot": "wwwroot" } diff --git a/test/WebSites/MvcTagHelpersWebSite/project.json b/test/WebSites/MvcTagHelpersWebSite/project.json index b4ad0d50c8..312885b78e 100644 --- a/test/WebSites/MvcTagHelpersWebSite/project.json +++ b/test/WebSites/MvcTagHelpersWebSite/project.json @@ -1,4 +1,4 @@ -{ +{ "commands": { "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:5001", "kestrel": "Microsoft.AspNet.Hosting --server Kestrel --server.urls http://localhost:5000" @@ -12,8 +12,8 @@ "Microsoft.AspNet.Server.WebListener": "1.0.0-*" }, "frameworks": { - "aspnet50": { }, - "aspnetcore50": { } + "dnx451": { }, + "dnxcore50": { } }, "webroot": "wwwroot" -} \ No newline at end of file +} diff --git a/test/WebSites/PrecompilationWebSite/project.json b/test/WebSites/PrecompilationWebSite/project.json index 6880a1dcd7..200410d6a8 100644 --- a/test/WebSites/PrecompilationWebSite/project.json +++ b/test/WebSites/PrecompilationWebSite/project.json @@ -15,12 +15,12 @@ "Microsoft.Framework.PropertyHelper.Internal": { "version": "1.0.0-*", "type": "build" } }, "frameworks": { - "aspnet50": { + "dnx451": { "compilationOptions": { "define": [ "CUSTOM_ASPNET50_DEFINE" ] } }, - "aspnetcore50": { + "dnxcore50": { "compilationOptions": { "define": [ "CUSTOM_ASPNETCORE50_DEFINE" ] } diff --git a/test/WebSites/RazorCompilerCacheWebSite/project.json b/test/WebSites/RazorCompilerCacheWebSite/project.json index c582a1382f..a08db9734c 100644 --- a/test/WebSites/RazorCompilerCacheWebSite/project.json +++ b/test/WebSites/RazorCompilerCacheWebSite/project.json @@ -1,4 +1,4 @@ -{ +{ "commands": { "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:5001", "kestrel": "Microsoft.AspNet.Hosting --server Kestrel --server.urls http://localhost:5000" @@ -12,8 +12,8 @@ "Microsoft.AspNet.StaticFiles": "1.0.0-*" }, "frameworks": { - "aspnet50": { }, - "aspnetcore50": { } + "dnx451": { }, + "dnxcore50": { } }, "webroot": "wwwroot" } diff --git a/test/WebSites/RazorInstrumentationWebsite/project.json b/test/WebSites/RazorInstrumentationWebsite/project.json index c582a1382f..a08db9734c 100644 --- a/test/WebSites/RazorInstrumentationWebsite/project.json +++ b/test/WebSites/RazorInstrumentationWebsite/project.json @@ -1,4 +1,4 @@ -{ +{ "commands": { "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:5001", "kestrel": "Microsoft.AspNet.Hosting --server Kestrel --server.urls http://localhost:5000" @@ -12,8 +12,8 @@ "Microsoft.AspNet.StaticFiles": "1.0.0-*" }, "frameworks": { - "aspnet50": { }, - "aspnetcore50": { } + "dnx451": { }, + "dnxcore50": { } }, "webroot": "wwwroot" } diff --git a/test/WebSites/RazorViewEngineOptionsWebsite/project.json b/test/WebSites/RazorViewEngineOptionsWebsite/project.json index 441a3fba60..2c0605afab 100644 --- a/test/WebSites/RazorViewEngineOptionsWebsite/project.json +++ b/test/WebSites/RazorViewEngineOptionsWebsite/project.json @@ -1,4 +1,4 @@ -{ +{ "commands": { "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:5001", "kestrel": "Microsoft.AspNet.Hosting --server Kestrel --server.urls http://localhost:5000" @@ -13,8 +13,8 @@ "Microsoft.AspNet.StaticFiles": "1.0.0-*" }, "frameworks": { - "aspnet50": { }, - "aspnetcore50": { } + "dnx451": { }, + "dnxcore50": { } }, "webroot": "wwwroot" } diff --git a/test/WebSites/RazorWebSite/Services/FrameworkSpecificHelper.cs b/test/WebSites/RazorWebSite/Services/FrameworkSpecificHelper.cs index 5c8cbf01f8..ef98c820d6 100644 --- a/test/WebSites/RazorWebSite/Services/FrameworkSpecificHelper.cs +++ b/test/WebSites/RazorWebSite/Services/FrameworkSpecificHelper.cs @@ -7,25 +7,25 @@ namespace RazorWebSite { public string ExecuteOperation() { -#if ASPNET50 - return "This method is running from ASPNET50"; -#elif ASPNETCORE50 - return "This method is running from ASPNETCORE50"; +#if DNX451 + return "This method is running from DNX451"; +#elif DNXCORE50 + return "This method is running from DNXCORE50"; #endif } -#if ASPNET50_CUSTOM_DEFINE +#if DNX451_CUSTOM_DEFINE public string ExecuteAspNet50Operation() { - return "This method is only defined in ASPNET50"; + return "This method is only defined in DNX451"; } #endif -#if ASPNETCORE50_CUSTOM_DEFINE +#if DNXCORE50_CUSTOM_DEFINE public string ExecuteAspNetCore50Operation() { - return "This method is only defined in ASPNETCORE50"; + return "This method is only defined in DNXCORE50"; } #endif } -} \ No newline at end of file +} diff --git a/test/WebSites/RazorWebSite/project.json b/test/WebSites/RazorWebSite/project.json index 25816ad6c7..1f7ba6151b 100644 --- a/test/WebSites/RazorWebSite/project.json +++ b/test/WebSites/RazorWebSite/project.json @@ -1,4 +1,4 @@ -{ +{ "commands": { "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:5001", "kestrel": "Microsoft.AspNet.Hosting --server Kestrel --server.urls http://localhost:5000" @@ -12,12 +12,12 @@ "Microsoft.AspNet.StaticFiles": "1.0.0-*" }, "frameworks": { - "aspnet50": { + "dnx451": { "compilationOptions": { "define": [ "ASPNET50_CUSTOM_DEFINE" ] } }, - "aspnetcore50": { + "dnxcore50": { "compilationOptions": { "define": [ "ASPNETCORE50_CUSTOM_DEFINE" ] } diff --git a/test/WebSites/RequestServicesWebSite/project.json b/test/WebSites/RequestServicesWebSite/project.json index f13fd03388..8504a42906 100644 --- a/test/WebSites/RequestServicesWebSite/project.json +++ b/test/WebSites/RequestServicesWebSite/project.json @@ -14,7 +14,7 @@ "Microsoft.AspNet.StaticFiles": "1.0.0-*" }, "frameworks": { - "aspnet50": { }, - "aspnetcore50": { } + "dnx451": { }, + "dnxcore50": { } } } diff --git a/test/WebSites/ResponseCacheWebSite/project.json b/test/WebSites/ResponseCacheWebSite/project.json index 464f3bbc61..a08db9734c 100644 --- a/test/WebSites/ResponseCacheWebSite/project.json +++ b/test/WebSites/ResponseCacheWebSite/project.json @@ -12,8 +12,8 @@ "Microsoft.AspNet.StaticFiles": "1.0.0-*" }, "frameworks": { - "aspnet50": { }, - "aspnetcore50": { } + "dnx451": { }, + "dnxcore50": { } }, "webroot": "wwwroot" -} \ No newline at end of file +} diff --git a/test/WebSites/RoutingWebSite/project.json b/test/WebSites/RoutingWebSite/project.json index c582a1382f..a08db9734c 100644 --- a/test/WebSites/RoutingWebSite/project.json +++ b/test/WebSites/RoutingWebSite/project.json @@ -1,4 +1,4 @@ -{ +{ "commands": { "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:5001", "kestrel": "Microsoft.AspNet.Hosting --server Kestrel --server.urls http://localhost:5000" @@ -12,8 +12,8 @@ "Microsoft.AspNet.StaticFiles": "1.0.0-*" }, "frameworks": { - "aspnet50": { }, - "aspnetcore50": { } + "dnx451": { }, + "dnxcore50": { } }, "webroot": "wwwroot" } diff --git a/test/WebSites/TagHelpersWebSite/project.json b/test/WebSites/TagHelpersWebSite/project.json index ee2a5897fd..81f5c269ce 100644 --- a/test/WebSites/TagHelpersWebSite/project.json +++ b/test/WebSites/TagHelpersWebSite/project.json @@ -1,4 +1,4 @@ -{ +{ "commands": { "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:5001", "kestrel": "Microsoft.AspNet.Hosting --server Kestrel --server.urls http://localhost:5000" @@ -13,8 +13,8 @@ "Microsoft.AspNet.StaticFiles": "1.0.0-*" }, "frameworks": { - "aspnet50": { }, - "aspnetcore50": { } + "dnx451": { }, + "dnxcore50": { } }, "webroot": "wwwroot" -} \ No newline at end of file +} diff --git a/test/WebSites/UrlHelperWebSite/project.json b/test/WebSites/UrlHelperWebSite/project.json index c582a1382f..a08db9734c 100644 --- a/test/WebSites/UrlHelperWebSite/project.json +++ b/test/WebSites/UrlHelperWebSite/project.json @@ -1,4 +1,4 @@ -{ +{ "commands": { "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:5001", "kestrel": "Microsoft.AspNet.Hosting --server Kestrel --server.urls http://localhost:5000" @@ -12,8 +12,8 @@ "Microsoft.AspNet.StaticFiles": "1.0.0-*" }, "frameworks": { - "aspnet50": { }, - "aspnetcore50": { } + "dnx451": { }, + "dnxcore50": { } }, "webroot": "wwwroot" } diff --git a/test/WebSites/UserClassLibrary/project.json b/test/WebSites/UserClassLibrary/project.json index d75eb8c2d5..a04b00d38f 100644 --- a/test/WebSites/UserClassLibrary/project.json +++ b/test/WebSites/UserClassLibrary/project.json @@ -1,10 +1,10 @@ { "frameworks": { - "aspnet50": { }, - "aspnetcore50": { + "dnx451": { }, + "dnxcore50": { "dependencies": { "System.Runtime": "4.0.20-beta-*" } } } -} \ No newline at end of file +} diff --git a/test/WebSites/ValidationWebSite/project.json b/test/WebSites/ValidationWebSite/project.json index 3f61a9c174..8ce83bf3e5 100644 --- a/test/WebSites/ValidationWebSite/project.json +++ b/test/WebSites/ValidationWebSite/project.json @@ -1,4 +1,4 @@ -{ +{ "commands": { "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:5001", "kestrel": "Microsoft.AspNet.Hosting --server Kestrel --server.urls http://localhost:5000" @@ -12,8 +12,8 @@ "Microsoft.AspNet.StaticFiles": "1.0.0-*" }, "frameworks": { - "aspnet50": { }, - "aspnetcore50": { } + "dnx451": { }, + "dnxcore50": { } }, "exclude": [ "wwwroot", diff --git a/test/WebSites/ValueProvidersWebSite/project.json b/test/WebSites/ValueProvidersWebSite/project.json index c582a1382f..a08db9734c 100644 --- a/test/WebSites/ValueProvidersWebSite/project.json +++ b/test/WebSites/ValueProvidersWebSite/project.json @@ -1,4 +1,4 @@ -{ +{ "commands": { "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:5001", "kestrel": "Microsoft.AspNet.Hosting --server Kestrel --server.urls http://localhost:5000" @@ -12,8 +12,8 @@ "Microsoft.AspNet.StaticFiles": "1.0.0-*" }, "frameworks": { - "aspnet50": { }, - "aspnetcore50": { } + "dnx451": { }, + "dnxcore50": { } }, "webroot": "wwwroot" } diff --git a/test/WebSites/VersioningWebSite/project.json b/test/WebSites/VersioningWebSite/project.json index c582a1382f..a08db9734c 100644 --- a/test/WebSites/VersioningWebSite/project.json +++ b/test/WebSites/VersioningWebSite/project.json @@ -1,4 +1,4 @@ -{ +{ "commands": { "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:5001", "kestrel": "Microsoft.AspNet.Hosting --server Kestrel --server.urls http://localhost:5000" @@ -12,8 +12,8 @@ "Microsoft.AspNet.StaticFiles": "1.0.0-*" }, "frameworks": { - "aspnet50": { }, - "aspnetcore50": { } + "dnx451": { }, + "dnxcore50": { } }, "webroot": "wwwroot" } diff --git a/test/WebSites/ViewComponentWebSite/project.json b/test/WebSites/ViewComponentWebSite/project.json index c582a1382f..a08db9734c 100644 --- a/test/WebSites/ViewComponentWebSite/project.json +++ b/test/WebSites/ViewComponentWebSite/project.json @@ -1,4 +1,4 @@ -{ +{ "commands": { "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:5001", "kestrel": "Microsoft.AspNet.Hosting --server Kestrel --server.urls http://localhost:5000" @@ -12,8 +12,8 @@ "Microsoft.AspNet.StaticFiles": "1.0.0-*" }, "frameworks": { - "aspnet50": { }, - "aspnetcore50": { } + "dnx451": { }, + "dnxcore50": { } }, "webroot": "wwwroot" } diff --git a/test/WebSites/WebApiCompatShimWebSite/project.json b/test/WebSites/WebApiCompatShimWebSite/project.json index e374a3d0ec..da873f83ee 100644 --- a/test/WebSites/WebApiCompatShimWebSite/project.json +++ b/test/WebSites/WebApiCompatShimWebSite/project.json @@ -13,8 +13,8 @@ "Microsoft.AspNet.StaticFiles": "1.0.0-*" }, "frameworks": { - "aspnet50": { }, - "aspnetcore50": { } + "dnx451": { }, + "dnxcore50": { } }, "webroot": "wwwroot" } diff --git a/test/WebSites/XmlFormattersWebSite/project.json b/test/WebSites/XmlFormattersWebSite/project.json index e9c67fee0a..faea209ebe 100644 --- a/test/WebSites/XmlFormattersWebSite/project.json +++ b/test/WebSites/XmlFormattersWebSite/project.json @@ -1,4 +1,4 @@ -{ +{ "commands": { "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:5001", "kestrel": "Microsoft.AspNet.Hosting --server Kestrel --server.urls http://localhost:5000" @@ -13,8 +13,8 @@ "Microsoft.AspNet.StaticFiles": "1.0.0-*" }, "frameworks": { - "aspnet50": { }, - "aspnetcore50": { + "dnx451": { }, + "dnxcore50": { "dependencies": { "System.Linq.Queryable": "4.0.0-beta-*" }