huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update aspnet50/aspnetcore50 => dnx451/dnxcore50.

This commit is contained in:
N. Taylor Mullen 2015-03-08 12:52:24 -07:00
parent c483b846e4
commit e829ba7646
149 changed files with 394 additions and 394 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
samples/MvcSample.Web/Monitoring/MonitoringMiddlware.cs
View File

@ -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. // 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;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;

4
samples/MvcSample.Web/Monitoring/MonitoringModule.cs
View File

@ -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. // 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;
using System.Collections.Concurrent; using System.Collections.Concurrent;
using Autofac; using Autofac;

6
samples/MvcSample.Web/Startup.cs
View File

@ -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. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System; using System;
@ -13,7 +13,7 @@ using Microsoft.Framework.DependencyInjection;
using MvcSample.Web.Filters; using MvcSample.Web.Filters;
using MvcSample.Web.Services; using MvcSample.Web.Services;
#if ASPNET50 #if DNX451
using Autofac; using Autofac;
using Microsoft.Framework.DependencyInjection.Autofac; using Microsoft.Framework.DependencyInjection.Autofac;
#endif #endif
@ -27,7 +27,7 @@ namespace MvcSample.Web
app.UseStatusCodePages(); app.UseStatusCodePages();
app.UseFileServer(); app.UseFileServer();
#if ASPNET50 #if DNX451
// Set up configuration sources. // Set up configuration sources.
var configuration = new Configuration() var configuration = new Configuration()
.AddJsonFile("config.json") .AddJsonFile("config.json")

8
samples/MvcSample.Web/project.json
View File

@ -1,4 +1,4 @@
{ {
"commands": { "commands": {
"web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:5001", "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" "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-*" } "Microsoft.Framework.NotNullAttribute.Internal": { "type": "build", "version": "1.0.0-*" }
}, },
"frameworks": { "frameworks": {
"aspnet50": { "dnx451": {
"dependencies": { "dependencies": {
"Microsoft.Framework.DependencyInjection.Autofac": "1.0.0-*", "Microsoft.Framework.DependencyInjection.Autofac": "1.0.0-*",
"Microsoft.Framework.ConfigurationModel.Json": "1.0.0-*" "Microsoft.Framework.ConfigurationModel.Json": "1.0.0-*"
} }
}, },
"aspnetcore50": { "dnxcore50": {
"dependencies": { } "dependencies": { }
} }
}, },
@ -42,4 +42,4 @@
"**.vspscc" "**.vspscc"
], ],
"webroot": "wwwroot" "webroot": "wwwroot"
} }

4
samples/TagHelperSample.Web/project.json
View File

@ -19,8 +19,8 @@
"Microsoft.Framework.PropertyHelper.Internal": { "version": "1.0.0-*", "type": "build" } "Microsoft.Framework.PropertyHelper.Internal": { "version": "1.0.0-*", "type": "build" }
}, },
"frameworks": { "frameworks": {
"aspnet50": { }, "dnx451": { },
"aspnetcore50": { } "dnxcore50": { }
}, },
"webroot": "wwwroot" "webroot": "wwwroot"
} }

8
src/Microsoft.AspNet.Mvc.Common/TypeExtensions.cs
View File

@ -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. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System; using System;
@ -11,8 +11,8 @@ namespace Microsoft.AspNet.Mvc
internal static class TypeExtensions internal static class TypeExtensions
{ {
// NOTE: Do not make #105 worse! Do not add new extension methods that conflict w/ .NET 4.5 methods. The // 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). // exising NETFX_CORE || DNXCORE50 methods should go away (soon).
#if NETFX_CORE || ASPNETCORE50 #if NETFX_CORE || DNXCORE50
private static bool EqualTo([NotNull] this Type[] t1, [NotNull] Type[] t2) private static bool EqualTo([NotNull] this Type[] t1, [NotNull] Type[] t2)
{ {
if (t1.Length != t2.Length) if (t1.Length != t2.Length)
@ -54,7 +54,7 @@ namespace Microsoft.AspNet.Mvc
queryType.GetInterfaces().FirstOrDefault(matchesInterface); queryType.GetInterfaces().FirstOrDefault(matchesInterface);
} }
#if NETFX_CORE || ASPNETCORE50 #if NETFX_CORE || DNXCORE50
public static Type[] GetGenericArguments([NotNull] this Type type) public static Type[] GetGenericArguments([NotNull] this Type type)
{ {
return type.GetTypeInfo().GenericTypeArguments; return type.GetTypeInfo().GenericTypeArguments;

6
src/Microsoft.AspNet.Mvc.Common/project.json
View File

@ -1,12 +1,12 @@
{ {
"version": "6.0.0-*", "version": "6.0.0-*",
"shared": "*.cs", "shared": "*.cs",
"dependencies": { "dependencies": {
}, },
"frameworks": { "frameworks": {
"net45": { }, "net45": { },
"aspnet50": { }, "dnx451": { },
"aspnetcore50": { "dnxcore50": {
"dependencies": { "dependencies": {
"System.ComponentModel.TypeConverter": "4.0.0-beta-*", "System.ComponentModel.TypeConverter": "4.0.0-beta-*",
"System.Reflection.Extensions": "4.0.0-beta-*", "System.Reflection.Extensions": "4.0.0-beta-*",

8
src/Microsoft.AspNet.Mvc.Core/AmbiguousActionException.cs
View File

@ -2,7 +2,7 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System; using System;
#if ASPNET50 #if DNX451
using System.Runtime.Serialization; using System.Runtime.Serialization;
#endif #endif
@ -11,7 +11,7 @@ namespace Microsoft.AspNet.Mvc
/// <summary> /// <summary>
/// An exception which indicates multiple matches in action selection. /// An exception which indicates multiple matches in action selection.
/// </summary> /// </summary>
#if ASPNET50 #if DNX451
[Serializable] [Serializable]
#endif #endif
public class AmbiguousActionException : InvalidOperationException public class AmbiguousActionException : InvalidOperationException
@ -21,11 +21,11 @@ namespace Microsoft.AspNet.Mvc
{ {
} }
#if ASPNET50 #if DNX451
protected AmbiguousActionException(SerializationInfo info, StreamingContext context) protected AmbiguousActionException(SerializationInfo info, StreamingContext context)
: base(info, context) : base(info, context)
{ {
} }
#endif #endif
} }
} }

10
src/Microsoft.AspNet.Mvc.Core/Internal/NonDisposableStream.cs
View File

@ -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. // 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;
#endif #endif
using System.IO; using System.IO;
@ -105,7 +105,7 @@ namespace Microsoft.AspNet.Mvc.Internal
{ {
return _innerStream.ReadAsync(buffer, offset, count, cancellationToken); return _innerStream.ReadAsync(buffer, offset, count, cancellationToken);
} }
#if ASPNET50 #if DNX451
/// <inheritdoc /> /// <inheritdoc />
public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, public override IAsyncResult BeginRead(byte[] buffer, int offset, int count,
AsyncCallback callback, object state) AsyncCallback callback, object state)
@ -160,7 +160,7 @@ namespace Microsoft.AspNet.Mvc.Internal
{ {
return _innerStream.WriteAsync(buffer, offset, count, cancellationToken); return _innerStream.WriteAsync(buffer, offset, count, cancellationToken);
} }
#if ASPNET50 #if DNX451
/// <inheritdoc /> /// <inheritdoc />
public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count,
AsyncCallback callback, object state) AsyncCallback callback, object state)
@ -179,7 +179,7 @@ namespace Microsoft.AspNet.Mvc.Internal
{ {
_innerStream.WriteByte(value); _innerStream.WriteByte(value);
} }
#if ASPNET50 #if DNX451
/// <inheritdoc /> /// <inheritdoc />
public override void Close() public override void Close()
{ {

6
src/Microsoft.AspNet.Mvc.Core/Logging/AssemblyValues.cs
View File

@ -15,7 +15,7 @@ namespace Microsoft.AspNet.Mvc.Logging
public AssemblyValues([NotNull] Assembly inner) public AssemblyValues([NotNull] Assembly inner)
{ {
AssemblyName = inner.FullName; AssemblyName = inner.FullName;
#if ASPNET50 #if DNX451
Location = inner.Location; Location = inner.Location;
#endif #endif
IsDynamic = inner.IsDynamic; IsDynamic = inner.IsDynamic;
@ -26,7 +26,7 @@ namespace Microsoft.AspNet.Mvc.Logging
/// </summary> /// </summary>
public string AssemblyName { get; } public string AssemblyName { get; }
#if ASPNET50 #if DNX451
/// <summary> /// <summary>
/// The location of the assembly. See <see cref="Assembly.Location"/>. /// The location of the assembly. See <see cref="Assembly.Location"/>.
/// </summary> /// </summary>
@ -43,4 +43,4 @@ namespace Microsoft.AspNet.Mvc.Logging
return LogFormatter.FormatLogValues(this); return LogFormatter.FormatLogValues(this);
} }
} }
} }

6
src/Microsoft.AspNet.Mvc.Core/Routing/ActionSelectionDecisionTree.cs
View File

@ -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. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
#if ASPNET50 #if DNX451
using System.ComponentModel; using System.ComponentModel;
#endif #endif
using System.Diagnostics; using System.Diagnostics;
@ -168,7 +168,7 @@ namespace Microsoft.AspNet.Mvc.Routing
{ {
// We'd already have failed before getting here. The RouteDataActionConstraint constructor // We'd already have failed before getting here. The RouteDataActionConstraint constructor
// would throw. // would throw.
#if ASPNET50 #if DNX451
throw new InvalidEnumArgumentException( throw new InvalidEnumArgumentException(
"item", "item",
(int)constraint.KeyHandling, (int)constraint.KeyHandling,

6
src/Microsoft.AspNet.Mvc.Core/project.json
View File

@ -1,4 +1,4 @@
{ {
"description": "The core runtime components of ASP.NET MVC.", "description": "The core runtime components of ASP.NET MVC.",
"version": "6.0.0-*", "version": "6.0.0-*",
"compilationOptions": { "compilationOptions": {
@ -24,8 +24,8 @@
"Microsoft.Framework.WebEncoders": "1.0.0-*" "Microsoft.Framework.WebEncoders": "1.0.0-*"
}, },
"frameworks": { "frameworks": {
"aspnet50": {}, "dnx451": {},
"aspnetcore50": { "dnxcore50": {
"dependencies": { "dependencies": {
"Microsoft.CSharp": "4.0.0-beta-*" "Microsoft.CSharp": "4.0.0-beta-*"
} }

6
src/Microsoft.AspNet.Mvc.ModelBinding/project.json
View File

@ -1,4 +1,4 @@
{ {
"description": "The ASP.NET MVC model binding components for binding data from a request to an object model.", "description": "The ASP.NET MVC model binding components for binding data from a request to an object model.",
"version": "6.0.0-*", "version": "6.0.0-*",
"compilationOptions": { "compilationOptions": {
@ -16,13 +16,13 @@
"Newtonsoft.Json": "6.0.6" "Newtonsoft.Json": "6.0.6"
}, },
"frameworks": { "frameworks": {
"aspnet50": { "dnx451": {
"frameworkAssemblies": { "frameworkAssemblies": {
"System.ComponentModel.DataAnnotations": "", "System.ComponentModel.DataAnnotations": "",
"System.Runtime.Serialization": "" "System.Runtime.Serialization": ""
} }
}, },
"aspnetcore50": { "dnxcore50": {
"dependencies": { "dependencies": {
"System.Collections.Concurrent": "4.0.10-beta-*", "System.Collections.Concurrent": "4.0.10-beta-*",
"System.ComponentModel.Annotations": "4.0.10-beta-*", "System.ComponentModel.Annotations": "4.0.10-beta-*",

6
src/Microsoft.AspNet.Mvc.Razor.Host/project.json
View File

@ -1,4 +1,4 @@
{ {
"description": "Design time hosting infrastructure for the ASP.NET MVC Razor view engine.", "description": "Design time hosting infrastructure for the ASP.NET MVC Razor view engine.",
"version": "6.0.0-*", "version": "6.0.0-*",
"compilationOptions": { "compilationOptions": {
@ -14,12 +14,12 @@
}, },
"frameworks": { "frameworks": {
"net45": {}, "net45": {},
"aspnet50": { "dnx451": {
"dependencies": { "dependencies": {
"Microsoft.Framework.Runtime.Interfaces": "1.0.0-*" "Microsoft.Framework.Runtime.Interfaces": "1.0.0-*"
} }
}, },
"aspnetcore50": { "dnxcore50": {
"dependencies": { "dependencies": {
"System.Collections.Concurrent": "4.0.10-beta-*", "System.Collections.Concurrent": "4.0.10-beta-*",
"Microsoft.Framework.Runtime.Interfaces": "1.0.0-*" "Microsoft.Framework.Runtime.Interfaces": "1.0.0-*"

6
src/Microsoft.AspNet.Mvc.Razor/project.json
View File

@ -1,4 +1,4 @@
{ {
"description": "The Razor view engine for ASP.NET MVC.", "description": "The Razor view engine for ASP.NET MVC.",
"version": "6.0.0-*", "version": "6.0.0-*",
"compilationOptions": { "compilationOptions": {
@ -17,7 +17,7 @@
"Microsoft.Framework.Runtime.Roslyn.Interfaces": "1.0.0-*" "Microsoft.Framework.Runtime.Roslyn.Interfaces": "1.0.0-*"
}, },
"frameworks": { "frameworks": {
"aspnet50": { "dnx451": {
"frameworkAssemblies": { "frameworkAssemblies": {
"System.Collections": "", "System.Collections": "",
"System.IO": "", "System.IO": "",
@ -26,7 +26,7 @@
"System.Threading.Tasks": "" "System.Threading.Tasks": ""
} }
}, },
"aspnetcore50": { "dnxcore50": {
"dependencies": { "dependencies": {
"System.Threading.Tasks.Parallel": "4.0.0-beta-*" "System.Threading.Tasks.Parallel": "4.0.0-beta-*"
} }

8
src/Microsoft.AspNet.Mvc.TagHelpers/project.json
View File

@ -1,4 +1,4 @@
{ {
"description": "Contains a default set of Tag Helpers for building ASP.NET MVC applications.", "description": "Contains a default set of Tag Helpers for building ASP.NET MVC applications.",
"version": "6.0.0-*", "version": "6.0.0-*",
"compilationOptions": { "compilationOptions": {
@ -15,7 +15,7 @@
"System.Security.Cryptography.Hashing.Algorithms": "4.0.0-beta-*" "System.Security.Cryptography.Hashing.Algorithms": "4.0.0-beta-*"
}, },
"frameworks": { "frameworks": {
"aspnet50": { }, "dnx451": { },
"aspnetcore50": { } "dnxcore50": { }
} }
} }

4
src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/CollectionExtensions.cs
View File

@ -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. // 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.Collections.ObjectModel;
using System.Diagnostics; using System.Diagnostics;
@ -293,4 +293,4 @@ namespace System.Collections.Generic
} }
} }
} }
#endif #endif

2
src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/ContentNegotiationResult.cs
View File

@ -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. // 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 Microsoft.AspNet.Mvc;
using System.Collections.Generic; using System.Collections.Generic;

4
src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/DefaultContentNegotiator.cs
View File

@ -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. // 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.Generic;
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
@ -491,4 +491,4 @@ namespace System.Net.Http.Formatting
} }
} }
} }
#endif #endif

4
src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/FormDataCollection.cs
View File

@ -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. // 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 Microsoft.AspNet.WebUtilities;
using System; using System;
@ -43,4 +43,4 @@ namespace System.Net.Http.Formatting
} }
} }
#endif #endif

4
src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/FormattingUtilities.cs
View File

@ -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. // 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.Generic;
using System.Globalization; using System.Globalization;
@ -241,4 +241,4 @@ namespace System.Net.Http
} }
} }
} }
#endif #endif

2
src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/IContentNegotiator.cs
View File

@ -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. // 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.Generic;
using System.Net.Http.Headers; using System.Net.Http.Headers;

4
src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/ListWrapperCollection.cs
View File

@ -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. // 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.Generic;
@ -31,4 +31,4 @@ namespace System.Collections.ObjectModel
} }
} }
} }
#endif #endif

4
src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeConstants.cs
View File

@ -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. // 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; using System.Net.Http.Headers;
@ -109,4 +109,4 @@ namespace System.Net.Http.Formatting
} }
} }
} }
#endif #endif

4
src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeFormatterMatch.cs
View File

@ -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. // 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; using System.Net.Http.Headers;
@ -57,4 +57,4 @@ namespace System.Net.Http.Formatting
public MediaTypeFormatterMatchRanking Ranking { get; private set; } public MediaTypeFormatterMatchRanking Ranking { get; private set; }
} }
} }
#endif #endif

4
src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeFormatterMatchRanking.cs
View File

@ -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. // 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 namespace System.Net.Http.Formatting
{ {
@ -45,4 +45,4 @@ namespace System.Net.Http.Formatting
MatchOnRequestMediaType, MatchOnRequestMediaType,
} }
} }
#endif #endif

4
src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeHeaderValueExtensions.cs
View File

@ -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. // 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.Generic;
using System.Diagnostics; using System.Diagnostics;
@ -118,4 +118,4 @@ namespace System.Net.Http.Formatting
} }
} }
} }
#endif #endif

4
src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeWithQualityHeaderComparer.cs
View File

@ -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. // 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.Generic;
using System.Diagnostics; using System.Diagnostics;
@ -112,4 +112,4 @@ namespace System.Net.Http.Formatting
} }
} }
} }
#endif #endif

4
src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/ParsedMediaTypeHeaderValue.cs
View File

@ -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. // 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.Diagnostics;
using System.Net.Http.Headers; using System.Net.Http.Headers;
@ -88,4 +88,4 @@ namespace System.Net.Http.Formatting
} }
} }
} }
#endif #endif

4
src/Microsoft.AspNet.Mvc.WebApiCompatShim/ContentNegotiator/StringWithQualityHeaderValueComparer.cs
View File

@ -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. // 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.Generic;
using System.Diagnostics; using System.Diagnostics;
@ -74,4 +74,4 @@ namespace System.Net.Http.Formatting
} }
} }
} }
#endif #endif

4
src/Microsoft.AspNet.Mvc.WebApiCompatShim/HttpRequestMessage/HttpRequestMessageExtensions.cs
View File

@ -21,7 +21,7 @@ namespace System.Net.Http
/// </summary> /// </summary>
public static class HttpRequestMessageExtensions public static class HttpRequestMessageExtensions
{ {
#if !ASPNETCORE50 #if !DNXCORE50
/// <summary> /// <summary>
/// Helper method for creating an <see cref="HttpResponseMessage"/> message with a "416 (Requested Range Not /// Helper method for creating an <see cref="HttpResponseMessage"/> message with a "416 (Requested Range Not
@ -422,4 +422,4 @@ namespace System.Net.Http
} }
} }
} }
} }

6
src/Microsoft.AspNet.Mvc.WebApiCompatShim/project.json
View File

@ -13,14 +13,14 @@
"Microsoft.Framework.NotNullAttribute.Internal": { "version": "1.0.0-*", "type": "build" } "Microsoft.Framework.NotNullAttribute.Internal": { "version": "1.0.0-*", "type": "build" }
}, },
"frameworks": { "frameworks": {
"aspnet50": { "dnx451": {
"frameworkAssemblies": { "frameworkAssemblies": {
"System.Net.Http": "", "System.Net.Http": "",
"System.Xml": "", "System.Xml": "",
"System.Runtime.Serialization": "" "System.Runtime.Serialization": ""
} }
}, },
"aspnetcore50": { "dnxcore50": {
"dependencies": { "dependencies": {
"System.Net.Http": "4.0.0-beta-*", "System.Net.Http": "4.0.0-beta-*",
"System.Xml.XmlSerializer": "4.0.10-beta-*", "System.Xml.XmlSerializer": "4.0.10-beta-*",
@ -28,4 +28,4 @@
} }
} }
} }
} }

6
src/Microsoft.AspNet.Mvc.Xml/FormattingUtilities.cs
View File

@ -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. // 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; using System.Runtime.Serialization;
#endif #endif
using System.Xml; using System.Xml;
@ -15,7 +15,7 @@ namespace Microsoft.AspNet.Mvc.Xml
{ {
public static readonly int DefaultMaxDepth = 32; public static readonly int DefaultMaxDepth = 32;
#if ASPNET50 #if DNX451
public static readonly XsdDataContractExporter XsdDataContractExporter = new XsdDataContractExporter(); public static readonly XsdDataContractExporter XsdDataContractExporter = new XsdDataContractExporter();
#endif #endif

4
src/Microsoft.AspNet.Mvc.Xml/XmlDataContractSerializerOutputFormatter.cs
View File

@ -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. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System; using System;
@ -135,7 +135,7 @@ namespace Microsoft.AspNet.Mvc.Xml
{ {
try try
{ {
#if ASPNET50 #if DNX451
// Verify that type is a valid data contract by forcing the serializer to try to create a data contract // Verify that type is a valid data contract by forcing the serializer to try to create a data contract
FormattingUtilities.XsdDataContractExporter.GetRootElementName(type); FormattingUtilities.XsdDataContractExporter.GetRootElementName(type);
#endif #endif

6
src/Microsoft.AspNet.Mvc.Xml/project.json
View File

@ -11,17 +11,17 @@
"Microsoft.Framework.NotNullAttribute.Internal": { "version": "1.0.0-*", "type": "build" } "Microsoft.Framework.NotNullAttribute.Internal": { "version": "1.0.0-*", "type": "build" }
}, },
"frameworks": { "frameworks": {
"aspnet50": { "dnx451": {
"frameworkAssemblies": { "frameworkAssemblies": {
"System.Xml": "", "System.Xml": "",
"System.Runtime.Serialization": "" "System.Runtime.Serialization": ""
} }
}, },
"aspnetcore50": { "dnxcore50": {
"dependencies": { "dependencies": {
"System.Runtime.Serialization.Xml": "4.0.10-beta-*", "System.Runtime.Serialization.Xml": "4.0.10-beta-*",
"System.Xml.XmlSerializer": "4.0.10-beta-*" "System.Xml.XmlSerializer": "4.0.10-beta-*"
} }
} }
} }
} }

6
src/Microsoft.AspNet.Mvc/project.json
View File

@ -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.", "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-*", "version": "6.0.0-*",
"compilationOptions": { "compilationOptions": {
@ -13,7 +13,7 @@
"Microsoft.Framework.NotNullAttribute.Internal": { "version": "1.0.0-*", "type": "build" } "Microsoft.Framework.NotNullAttribute.Internal": { "version": "1.0.0-*", "type": "build" }
}, },
"frameworks": { "frameworks": {
"aspnet50": {}, "dnx451": {},
"aspnetcore50": {} "dnxcore50": {}
} }
} }

6
src/Microsoft.AspNet.PageExecutionInstrumentation.Interfaces/project.json
View File

@ -1,12 +1,12 @@
{ {
"description": "Abstractions for page instrumentation.", "description": "Abstractions for page instrumentation.",
"version": "1.0.0-*", "version": "1.0.0-*",
"compilationOptions": { "compilationOptions": {
"warningsAsErrors": true "warningsAsErrors": true
}, },
"frameworks": { "frameworks": {
"aspnet50": { }, "dnx451": { },
"aspnetcore50": { "dnxcore50": {
"dependencies": { "dependencies": {
"System.IO": "4.0.10-beta-*" "System.IO": "4.0.10-beta-*"
} }

4
test/Microsoft.AspNet.Mvc.Common.Test/project.json
View File

@ -15,11 +15,11 @@
"test": "xunit.runner.kre" "test": "xunit.runner.kre"
}, },
"frameworks": { "frameworks": {
"aspnet50": { "dnx451": {
"dependencies": { "dependencies": {
"Moq": "4.2.1312.1622" "Moq": "4.2.1312.1622"
} }
}, },
"aspnetcore50": { } "dnxcore50": { }
} }
} }

6
test/Microsoft.AspNet.Mvc.Core.Test/ControllerTests.cs
View File

@ -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. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System; using System;
@ -14,7 +14,7 @@ using Microsoft.AspNet.Routing;
using Microsoft.AspNet.Testing; using Microsoft.AspNet.Testing;
using Microsoft.AspNet.WebUtilities; using Microsoft.AspNet.WebUtilities;
using Microsoft.AspNet.Http.Core; using Microsoft.AspNet.Http.Core;
#if ASPNET50 #if DNX451
using Moq; using Moq;
#endif #endif
using Xunit; using Xunit;
@ -911,7 +911,7 @@ namespace Microsoft.AspNet.Mvc.Test
// These tests share code with the ActionFilterAttribute tests because the various filter // These tests share code with the ActionFilterAttribute tests because the various filter
// implementations need to behave the same way. // implementations need to behave the same way.
#if ASPNET50 #if DNX451
[Fact] [Fact]
public async Task Controller_ActionFilter_SettingResult_ShortCircuits() public async Task Controller_ActionFilter_SettingResult_ShortCircuits()
{ {

4
test/Microsoft.AspNet.Mvc.Core.Test/DefaultViewComponentActivatorTests.cs
View File

@ -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. // 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;
using System.IO; using System.IO;
using System.Threading.Tasks; using System.Threading.Tasks;

4
test/Microsoft.AspNet.Mvc.Core.Test/Filters/ActionFilterAttributeTests.cs
View File

@ -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. // 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.Collections.Generic;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNet.Http; using Microsoft.AspNet.Http;

6
test/Microsoft.AspNet.Mvc.Core.Test/Filters/FormatFilterTest.cs
View File

@ -11,7 +11,7 @@ using Microsoft.Framework.OptionsModel;
using Microsoft.Net.Http.Headers; using Microsoft.Net.Http.Headers;
using Xunit; using Xunit;
#if ASPNET50 #if DNX451
using Moq; using Moq;
using System.Net; using System.Net;
#endif #endif
@ -27,7 +27,7 @@ namespace Microsoft.AspNet.Mvc
RouteAndQueryData RouteAndQueryData
} }
#if ASPNET50 #if DNX451
[Theory] [Theory]
[InlineData("json", FormatSource.RouteData, "application/json")] [InlineData("json", FormatSource.RouteData, "application/json")]
[InlineData("json", FormatSource.QueryData, "application/json")] [InlineData("json", FormatSource.QueryData, "application/json")]
@ -411,4 +411,4 @@ namespace Microsoft.AspNet.Mvc
} }
#endif #endif
} }
} }

4
test/Microsoft.AspNet.Mvc.Core.Test/Filters/ProducesAttributeTests.cs
View File

@ -9,7 +9,7 @@ using Microsoft.AspNet.Routing;
using Microsoft.Net.Http.Headers; using Microsoft.Net.Http.Headers;
using Xunit; using Xunit;
#if ASPNET50 #if DNX451
using Moq; using Moq;
#endif #endif
@ -191,4 +191,4 @@ namespace Microsoft.AspNet.Mvc.Test
public string Name { get; set; } public string Name { get; set; }
} }
} }
} }

4
test/Microsoft.AspNet.Mvc.Core.Test/Filters/ResultFilterAttributeTest.cs
View File

@ -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. // 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 System.Threading.Tasks;
using Moq; using Moq;
using Xunit; using Xunit;

4
test/Microsoft.AspNet.Mvc.Core.Test/Formatters/JsonInputFormatterTest.cs
View File

@ -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. // 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;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;

4
test/Microsoft.AspNet.Mvc.Core.Test/Formatters/NonDisposableStreamTest.cs
View File

@ -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. // 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.IO;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNet.Mvc.Core; using Microsoft.AspNet.Mvc.Core;

4
test/Microsoft.AspNet.Mvc.Core.Test/KnownRouteValueConstraintTests.cs
View File

@ -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. // 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;
using System.Collections.Generic; using System.Collections.Generic;
using Microsoft.AspNet.Http; using Microsoft.AspNet.Http;

4
test/Microsoft.AspNet.Mvc.Core.Test/ParameterBinding/ModelBindingHelperTest.cs
View File

@ -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. // 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;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;

4
test/Microsoft.AspNet.Mvc.Core.Test/Routing/AttributeRoutePrecedenceTests.cs
View File

@ -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. // 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;
using Microsoft.AspNet.Routing.Template; using Microsoft.AspNet.Routing.Template;
using Microsoft.Framework.OptionsModel; using Microsoft.Framework.OptionsModel;

2
test/Microsoft.AspNet.Mvc.Core.Test/Routing/AttributeRouteTest.cs
View File

@ -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. // 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;
using System.Collections.Generic; using System.Collections.Generic;
using System.Threading.Tasks; using System.Threading.Tasks;

4
test/Microsoft.AspNet.Mvc.Core.Test/Routing/AttributeRoutingTest.cs
View File

@ -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. // 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;
using System.Collections.Generic; using System.Collections.Generic;
using System.Threading.Tasks; using System.Threading.Tasks;

4
test/Microsoft.AspNet.Mvc.Core.Test/project.json
View File

@ -1,4 +1,4 @@
{ {
"compilationOptions": { "compilationOptions": {
"warningsAsErrors": "true" "warningsAsErrors": "true"
}, },
@ -13,6 +13,6 @@
"test": "xunit.runner.kre" "test": "xunit.runner.kre"
}, },
"frameworks": { "frameworks": {
"aspnet50": { } "dnx451": { }
} }
} }

14
test/Microsoft.AspNet.Mvc.FunctionalTests/CompilationOptionsTests.cs
View File

@ -22,16 +22,16 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
public async Task CompilationOptions_AreUsedByViewsAndPartials() public async Task CompilationOptions_AreUsedByViewsAndPartials()
{ {
// Arrange // Arrange
#if ASPNET50 #if DNX451
var expected = var expected =
@"This method is running from ASPNET50 @"This method is running from DNX451
This method is only defined in ASPNET50"; This method is only defined in DNX451";
#elif ASPNETCORE50 #elif DNXCORE50
var expected = 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 #endif
var server = TestServer.Create(_provider, _app); var server = TestServer.Create(_provider, _app);
var client = server.CreateClient(); var client = server.CreateClient();
@ -43,4 +43,4 @@ This method is only defined in ASPNETCORE50";
Assert.Equal(expected, body.Trim()); Assert.Equal(expected, body.Trim());
} }
} }
} }

4
test/Microsoft.AspNet.Mvc.FunctionalTests/DependencyResolverTests.cs
View File

@ -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. // 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;
using System.Net.Http; using System.Net.Http;
using System.Threading.Tasks; using System.Threading.Tasks;

4
test/Microsoft.AspNet.Mvc.FunctionalTests/Logging/LoggingActionSelectionTest.cs
View File

@ -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. // 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;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
@ -98,4 +98,4 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
} }
} }
#endif #endif

4
test/Microsoft.AspNet.Mvc.FunctionalTests/Logging/LoggingStartupTest.cs
View File

@ -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. // 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;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
@ -101,4 +101,4 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
} }
} }
} }
#endif #endif

4
test/Microsoft.AspNet.Mvc.FunctionalTests/ModelBindingTest.cs
View File

@ -1230,7 +1230,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
Assert.Equal(trackingId, actual.LastUpdatedTrackingId); Assert.Equal(trackingId, actual.LastUpdatedTrackingId);
} }
#if ASPNET50 #if DNX451
[Fact] [Fact]
public async Task UpdateVehicle_WithXml_BindsBodyServicesAndHeaders() public async Task UpdateVehicle_WithXml_BindsBodyServicesAndHeaders()
{ {
@ -2073,4 +2073,4 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
return JsonConvert.DeserializeObject<TVal>(await response.Content.ReadAsStringAsync()); return JsonConvert.DeserializeObject<TVal>(await response.Content.ReadAsStringAsync());
} }
} }
} }

10
test/Microsoft.AspNet.Mvc.FunctionalTests/PrecompilationTest.cs
View File

@ -161,12 +161,12 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
{ {
// Arrange // Arrange
var assemblyNamePrefix = GetAssemblyNamePrefix(); var assemblyNamePrefix = GetAssemblyNamePrefix();
#if ASPNET50 #if DNX451
var expected = var expected =
@"Value set inside ASPNET50 " + assemblyNamePrefix; @"Value set inside DNX451 " + assemblyNamePrefix;
#elif ASPNETCORE50 #elif DNXCORE50
var expected = var expected =
@"Value set inside ASPNETCORE50 " + assemblyNamePrefix; @"Value set inside DNXCORE50 " + assemblyNamePrefix;
#endif #endif
var server = TestServer.Create(_services, _app); var server = TestServer.Create(_services, _app);
@ -299,4 +299,4 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
} }
} }
} }

6
test/Microsoft.AspNet.Mvc.FunctionalTests/SerializableErrorTests.cs
View File

@ -20,7 +20,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
private readonly Action<IApplicationBuilder> _app = new XmlFormattersWebSite.Startup().Configure; private readonly Action<IApplicationBuilder> _app = new XmlFormattersWebSite.Startup().Configure;
[Theory] [Theory]
#if !ASPNETCORE50 #if !DNXCORE50
[InlineData("application/xml-xmlser")] [InlineData("application/xml-xmlser")]
#endif #endif
[InlineData("application/xml-dcs")] [InlineData("application/xml-dcs")]
@ -45,7 +45,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
} }
[Theory] [Theory]
#if !ASPNETCORE50 #if !DNXCORE50
[InlineData("application/xml-xmlser")] [InlineData("application/xml-xmlser")]
#endif #endif
[InlineData("application/xml-dcs")] [InlineData("application/xml-dcs")]
@ -97,4 +97,4 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
XmlAssert.Equal(expected, responseData); XmlAssert.Equal(expected, responseData);
} }
} }
} }

2
test/Microsoft.AspNet.Mvc.FunctionalTests/WebApiCompatShimBasicTest.cs
View File

@ -58,7 +58,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
content); content);
} }
#if !ASPNETCORE50 #if !DNXCORE50
[Fact] [Fact]
public async Task Options_SetsDefaultFormatters() public async Task Options_SetsDefaultFormatters()

4
test/Microsoft.AspNet.Mvc.FunctionalTests/XmlSerializerFormattersWrappingTest.cs
View File

@ -178,7 +178,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
result); result);
} }
#if !ASPNETCORE50 #if !DNXCORE50
[Fact] [Fact]
public async Task CanWrite_IEnumerableOf_SerializableErrors() public async Task CanWrite_IEnumerableOf_SerializableErrors()
{ {
@ -202,4 +202,4 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
} }
#endif #endif
} }
} }

4
test/Microsoft.AspNet.Mvc.FunctionalTests/project.json
View File

@ -1,4 +1,4 @@
{ {
"code": [ "code": [
"**/*.cs", "**/*.cs",
"../Microsoft.AspNet.Mvc.Xml.Test/XmlAssert.cs" "../Microsoft.AspNet.Mvc.Xml.Test/XmlAssert.cs"
@ -61,7 +61,7 @@
"test": "xunit.runner.kre" "test": "xunit.runner.kre"
}, },
"frameworks": { "frameworks": {
"aspnet50": { "dnx451": {
"dependencies": { "dependencies": {
"AutofacWebSite": "1.0.0" "AutofacWebSite": "1.0.0"
} }

6
test/Microsoft.AspNet.Mvc.ModelBinding.Test/BindAttributeTest.cs
View File

@ -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. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System; using System;
using Microsoft.AspNet.Http.Core; using Microsoft.AspNet.Http.Core;
using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.DependencyInjection;
#if ASPNET50 #if DNX451
using Moq; using Moq;
#endif #endif
using Xunit; using Xunit;
@ -59,7 +59,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
Assert.Equal(isIncluded, predicate(context, property)); Assert.Equal(isIncluded, predicate(context, property));
} }
#if ASPNET50 #if DNX451
[Theory] [Theory]
[InlineData("UserName", true)] [InlineData("UserName", true)]
[InlineData("Username", false)] [InlineData("Username", false)]

4
test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/ArrayModelBinderTest.cs
View File

@ -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. // 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 System.Threading.Tasks;
using Moq; using Moq;
using Xunit; using Xunit;

4
test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/BinderTypeBasedModelBinderModelBinderTest.cs
View File

@ -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. // 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;
using System.Collections.Generic; using System.Collections.Generic;
using System.Threading.Tasks; using System.Threading.Tasks;

4
test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/ByteArrayModelBinderTests.cs
View File

@ -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. // 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;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;

10
test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/CollectionModelBinderTest.cs
View File

@ -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. // 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.Collections.Generic;
using System.Globalization; using System.Globalization;
using System.Linq; using System.Linq;
#endif #endif
using System.Threading.Tasks; using System.Threading.Tasks;
#if ASPNET50 #if DNX451
using Moq; using Moq;
#endif #endif
using Xunit; using Xunit;
@ -16,7 +16,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Test
{ {
public class CollectionModelBinderTest public class CollectionModelBinderTest
{ {
#if ASPNET50 #if DNX451
[Fact] [Fact]
public async Task BindComplexCollectionFromIndexes_FiniteIndexes() public async Task BindComplexCollectionFromIndexes_FiniteIndexes()
{ {
@ -132,7 +132,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Test
Assert.Null(boundCollection); Assert.Null(boundCollection);
} }
#if ASPNET50 #if DNX451
[Fact] [Fact]
public async Task BindSimpleCollection_SubBindingSucceeds() public async Task BindSimpleCollection_SubBindingSucceeds()
{ {

4
test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/CompositeModelBinderTest.cs
View File

@ -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. // 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;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;

4
test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/DictionaryModelBinderTest.cs
View File

@ -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. // 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.Collections.Generic;
using System.Threading.Tasks; using System.Threading.Tasks;
using Moq; using Moq;

4
test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/FormCollectionModelBinderTest.cs
View File

@ -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. // 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;
using System.Collections; using System.Collections;
@ -145,4 +145,4 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
} }
} }
#endif #endif

4
test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/FormFileModelBinderTest.cs
View File

@ -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. // 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;
using System.Collections.Generic; using System.Collections.Generic;
@ -201,4 +201,4 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
} }
} }
#endif #endif

4
test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/KeyValuePairModelBinderTest.cs
View File

@ -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. // 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;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;

4
test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/MutableObjectModelBinderTest.cs
View File

@ -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. // 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;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;

6
test/Microsoft.AspNet.Mvc.ModelBinding.Test/Metadata/DefaultModelMetadataTest.cs
View File

@ -5,7 +5,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
#if !ASPNETCORE50 #if !DNXCORE50
using Moq; using Moq;
#endif #endif
using Xunit; using Xunit;
@ -169,7 +169,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Metadata
Assert.True(isRequired); Assert.True(isRequired);
} }
#if !ASPNETCORE50 #if !DNXCORE50
[Fact] [Fact]
public void PropertiesProperty_CallsProvider() public void PropertiesProperty_CallsProvider()
{ {
@ -435,4 +435,4 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Metadata
{ {
} }
} }
} }

4
test/Microsoft.AspNet.Mvc.ModelBinding.Test/Validation/AssociatedValidatorProviderTest.cs
View File

@ -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. // 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;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;

4
test/Microsoft.AspNet.Mvc.ModelBinding.Test/Validation/CompositeModelValidatorProviderTest.cs
View File

@ -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. // 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 Moq;
using Xunit; using Xunit;

8
test/Microsoft.AspNet.Mvc.ModelBinding.Test/Validation/DataAnnotationsModelValidatorProviderTest.cs
View File

@ -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. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.Linq; using System.Linq;
#if ASPNET50 #if DNX451
using Moq; using Moq;
#endif #endif
using Xunit; using Xunit;
@ -16,7 +16,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
{ {
private readonly IModelMetadataProvider _metadataProvider = TestModelMetadataProvider.CreateDefaultProvider(); private readonly IModelMetadataProvider _metadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
#if ASPNET50 #if DNX451
[Fact] [Fact]
public void GetValidators_ReturnsValidatorForIValidatableObject() public void GetValidators_ReturnsValidatorForIValidatableObject()
{ {
@ -163,7 +163,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
// Default IValidatableObject adapter factory // Default IValidatableObject adapter factory
#if ASPNET50 #if DNX451
[Fact] [Fact]
public void IValidatableObjectGetsAValidator() public void IValidatableObjectGetsAValidator()
{ {

8
test/Microsoft.AspNet.Mvc.ModelBinding.Test/Validation/DataAnnotationsModelValidatorTest.cs
View File

@ -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. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
#if ASPNET50 #if DNX451
using System.Linq; using System.Linq;
#endif #endif
using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.DependencyInjection;
#if ASPNET50 #if DNX451
using Moq; using Moq;
using Moq.Protected; using Moq.Protected;
#endif #endif
@ -51,7 +51,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
} }
} }
#if ASPNET50 #if DNX451
[Theory] [Theory]
[MemberData(nameof(ValidateSetsMemberNamePropertyDataSet))] [MemberData(nameof(ValidateSetsMemberNamePropertyDataSet))]
public void ValidateSetsMemberNamePropertyOfValidationContextForProperties( public void ValidateSetsMemberNamePropertyOfValidationContextForProperties(

4
test/Microsoft.AspNet.Mvc.ModelBinding.Test/Validation/DefaultObjectValidatorTests.cs
View File

@ -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. // 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;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
@ -665,4 +665,4 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
} }
} }
} }
#endif #endif

6
test/Microsoft.AspNet.Mvc.ModelBinding.Test/ValueProviders/CompositeValueProviderTests.cs
View File

@ -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. // 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;
using System.Collections.Generic; using System.Collections.Generic;
@ -127,4 +127,4 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
} }
} }
} }
#endif #endif

4
test/Microsoft.AspNet.Mvc.ModelBinding.Test/ValueProviders/FormValueProviderFactoryTests.cs
View File

@ -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. // 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;
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization; using System.Globalization;

6
test/Microsoft.AspNet.Mvc.ModelBinding.Test/ValueProviders/QueryStringValueProviderFactoryTest.cs
View File

@ -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. // 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;
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization; using System.Globalization;
@ -16,7 +16,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Test
{ {
private readonly QueryStringValueProviderFactory _factory = new QueryStringValueProviderFactory(); private readonly QueryStringValueProviderFactory _factory = new QueryStringValueProviderFactory();
#if ASPNET50 #if DNX451
[Fact] [Fact]
public void GetValueProvider_ReturnsQueryStringValueProviderInstanceWithInvariantCulture() public void GetValueProvider_ReturnsQueryStringValueProviderInstanceWithInvariantCulture()
{ {

6
test/Microsoft.AspNet.Mvc.ModelBinding.Test/project.json
View File

@ -1,4 +1,4 @@
{ {
"compilationOptions": { "compilationOptions": {
"warningsAsErrors": "true" "warningsAsErrors": "true"
}, },
@ -13,7 +13,7 @@
"test": "xunit.runner.kre" "test": "xunit.runner.kre"
}, },
"frameworks": { "frameworks": {
"aspnet50": { }, "dnx451": { },
"aspnetcore50": { } "dnxcore50": { }
} }
} }

4
test/Microsoft.AspNet.Mvc.Razor.Host.Test/project.json
View File

@ -1,4 +1,4 @@
{ {
"resources": "TestFiles/**", "resources": "TestFiles/**",
"dependencies": { "dependencies": {
"Microsoft.AspNet.Mvc.Razor.Host": "6.0.0-*", "Microsoft.AspNet.Mvc.Razor.Host": "6.0.0-*",
@ -9,7 +9,7 @@
"test": "xunit.runner.kre" "test": "xunit.runner.kre"
}, },
"frameworks": { "frameworks": {
"aspnet50": { "dnx451": {
"dependencies": { "dependencies": {
"Moq": "4.2.1312.1622" "Moq": "4.2.1312.1622"
} }

4
test/Microsoft.AspNet.Mvc.Razor.Test/project.json
View File

@ -1,4 +1,4 @@
{ {
"code": [ "code": [
"**/*.cs", "**/*.cs",
"../Microsoft.AspNet.Mvc.Razor.Host.Test/TestFileProvider.cs", "../Microsoft.AspNet.Mvc.Razor.Host.Test/TestFileProvider.cs",
@ -14,7 +14,7 @@
"test": "xunit.runner.kre" "test": "xunit.runner.kre"
}, },
"frameworks": { "frameworks": {
"aspnet50": { "dnx451": {
"dependencies": { "dependencies": {
"Moq": "4.2.1312.1622" "Moq": "4.2.1312.1622"
} }

6
test/Microsoft.AspNet.Mvc.TagHelpers.Test/project.json
View File

@ -1,4 +1,4 @@
{ {
"dependencies": { "dependencies": {
"Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-*", "Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-*",
"Microsoft.AspNet.Testing": "1.0.0-*", "Microsoft.AspNet.Testing": "1.0.0-*",
@ -9,10 +9,10 @@
"test": "xunit.runner.kre" "test": "xunit.runner.kre"
}, },
"frameworks": { "frameworks": {
"aspnet50": { "dnx451": {
"dependencies": { "dependencies": {
"Moq": "4.2.1312.1622" "Moq": "4.2.1312.1622"
} }
} }
} }
} }

4
test/Microsoft.AspNet.Mvc.Test/project.json
View File

@ -1,4 +1,4 @@
{ {
"compilationOptions": { "compilationOptions": {
"warningsAsErrors": "true" "warningsAsErrors": "true"
}, },
@ -10,7 +10,7 @@
"test": "xunit.runner.kre" "test": "xunit.runner.kre"
}, },
"frameworks": { "frameworks": {
"aspnet50": { "dnx451": {
"dependencies": { "dependencies": {
"Moq": "4.2.1312.1622" "Moq": "4.2.1312.1622"
} }

4
test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/BadRequestErrorMessageResultTest.cs
View File

@ -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. // 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.Collections.Generic;
using System.IO; using System.IO;
using System.Threading.Tasks; using System.Threading.Tasks;
@ -86,4 +86,4 @@ namespace System.Web.Http
} }
} }
} }
#endif #endif

4
test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/ExceptionResultTest.cs
View File

@ -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. // 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.Collections.Generic;
using System.IO; using System.IO;
using System.Threading.Tasks; using System.Threading.Tasks;
@ -86,4 +86,4 @@ namespace System.Web.Http
} }
} }
} }
#endif #endif

4
test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/InvalidModelStateResultTest.cs
View File

@ -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. // 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.Collections.Generic;
using System.IO; using System.IO;
using System.Threading.Tasks; using System.Threading.Tasks;
@ -99,4 +99,4 @@ namespace System.Web.Http
} }
} }
} }
#endif #endif

4
test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/NegotiatedContentResultTest.cs
View File

@ -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. // 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.Collections.Generic;
using System.IO; using System.IO;
using System.Net; using System.Net;
@ -94,4 +94,4 @@ namespace System.Web.Http
}; };
} }
} }
#endif #endif

4
test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/OkNegotiatedContentResultTest.cs
View File

@ -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. // 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.Collections.Generic;
using System.IO; using System.IO;
using System.Threading.Tasks; using System.Threading.Tasks;
@ -68,4 +68,4 @@ namespace System.Web.Http
}; };
} }
} }
#endif #endif

4
test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ApiControllerActionDiscoveryTest.cs
View File

@ -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. // 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.Generic;
using System.Linq; using System.Linq;
@ -506,4 +506,4 @@ namespace System.Web.Http.TestControllers
} }
} }
} }
#endif #endif

14
test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/DefaultContentNegotiatorTest.cs
View File

@ -148,7 +148,7 @@ namespace System.Net.Http.Formatting
{ {
get get
{ {
#if !ASPNETCORE50 #if !DNXCORE50
// Only mapping and accept makes sense with q != 1.0 // Only mapping and accept makes sense with q != 1.0
MediaTypeFormatterMatch matchMapping10 = CreateMatch(1.0, MediaTypeFormatterMatchRanking.MatchOnRequestWithMediaTypeMapping); MediaTypeFormatterMatch matchMapping10 = CreateMatch(1.0, MediaTypeFormatterMatchRanking.MatchOnRequestWithMediaTypeMapping);
MediaTypeFormatterMatch matchMapping05 = CreateMatch(0.5, MediaTypeFormatterMatchRanking.MatchOnRequestWithMediaTypeMapping); MediaTypeFormatterMatch matchMapping05 = CreateMatch(0.5, MediaTypeFormatterMatchRanking.MatchOnRequestWithMediaTypeMapping);
@ -175,7 +175,7 @@ namespace System.Net.Http.Formatting
{ new List<MediaTypeFormatterMatch>() { matchType10, matchRequest10, matchAcceptAllRange10 }, matchAcceptAllRange10 }, { new List<MediaTypeFormatterMatch>() { matchType10, matchRequest10, matchAcceptAllRange10 }, matchAcceptAllRange10 },
{ new List<MediaTypeFormatterMatch>() { matchType10, matchRequest10, matchAcceptAllRange10, matchAcceptSubTypeRange10 }, matchAcceptSubTypeRange10 }, { new List<MediaTypeFormatterMatch>() { matchType10, matchRequest10, matchAcceptAllRange10, matchAcceptSubTypeRange10 }, matchAcceptSubTypeRange10 },
{ new List<MediaTypeFormatterMatch>() { matchType10, matchRequest10, matchAcceptAllRange10, matchAcceptSubTypeRange10, matchAccept10 }, matchAccept10 }, { new List<MediaTypeFormatterMatch>() { matchType10, matchRequest10, matchAcceptAllRange10, matchAcceptSubTypeRange10, matchAccept10 }, matchAccept10 },
#if !ASPNETCORE50 #if !DNXCORE50
{ new List<MediaTypeFormatterMatch>() { matchType10, matchRequest10, matchAcceptAllRange10, matchAcceptSubTypeRange10, matchAccept10, matchMapping10 }, matchMapping10 }, { new List<MediaTypeFormatterMatch>() { matchType10, matchRequest10, matchAcceptAllRange10, matchAcceptSubTypeRange10, matchAccept10, matchMapping10 }, matchMapping10 },
#endif #endif
{ new List<MediaTypeFormatterMatch>() { matchAccept05, matchAccept10 }, matchAccept10 }, { new List<MediaTypeFormatterMatch>() { matchAccept05, matchAccept10 }, matchAccept10 },
@ -186,7 +186,7 @@ namespace System.Net.Http.Formatting
{ new List<MediaTypeFormatterMatch>() { matchAcceptAllRange05, matchAcceptAllRange10 }, matchAcceptAllRange10 }, { new List<MediaTypeFormatterMatch>() { matchAcceptAllRange05, matchAcceptAllRange10 }, matchAcceptAllRange10 },
{ new List<MediaTypeFormatterMatch>() { matchAcceptAllRange10, matchAcceptAllRange05 }, matchAcceptAllRange10 }, { new List<MediaTypeFormatterMatch>() { matchAcceptAllRange10, matchAcceptAllRange05 }, matchAcceptAllRange10 },
#if !ASPNETCORE50 #if !DNXCORE50
{ new List<MediaTypeFormatterMatch>() { matchMapping05, matchMapping10 }, matchMapping10 }, { new List<MediaTypeFormatterMatch>() { matchMapping05, matchMapping10 }, matchMapping10 },
{ new List<MediaTypeFormatterMatch>() { matchMapping10, matchMapping05 }, matchMapping10 }, { new List<MediaTypeFormatterMatch>() { matchMapping10, matchMapping05 }, matchMapping10 },
@ -250,7 +250,7 @@ namespace System.Net.Http.Formatting
Assert.Null(result); Assert.Null(result);
} }
#if !ASPNETCORE50 #if !DNXCORE50
[Fact] [Fact]
public void Negotiate_MediaTypeMappingTakesPrecedenceOverAcceptHeader() public void Negotiate_MediaTypeMappingTakesPrecedenceOverAcceptHeader()
@ -358,7 +358,7 @@ namespace System.Net.Http.Formatting
Assert.IsType<JsonMediaTypeFormatter>(result.Formatter); Assert.IsType<JsonMediaTypeFormatter>(result.Formatter);
} }
#if !ASPNETCORE50 #if !DNXCORE50
[Fact] [Fact]
public void Negotiate_RespectsFormatterOrdering_ForXhrRequestThatDoesNotSpecifyAcceptHeaders() public void Negotiate_RespectsFormatterOrdering_ForXhrRequestThatDoesNotSpecifyAcceptHeaders()
@ -455,7 +455,7 @@ namespace System.Net.Http.Formatting
} }
} }
#if !ASPNETCORE50 #if !DNXCORE50
[Fact] [Fact]
public void MatchMediaTypeMapping_ReturnsMatch() public void MatchMediaTypeMapping_ReturnsMatch()
@ -807,7 +807,7 @@ namespace System.Net.Http.Formatting
} }
} }
#if !ASPNETCORE50 #if !DNXCORE50
private class MyMediaTypeMapping : MediaTypeMapping private class MyMediaTypeMapping : MediaTypeMapping
{ {

2
test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/HttpErrorTest.cs
View File

@ -109,7 +109,7 @@ namespace System.Web.Http.Dispatcher
Assert.DoesNotContain("OH NO", modelStateError["[2].Name"] as IEnumerable<string>); Assert.DoesNotContain("OH NO", modelStateError["[2].Name"] as IEnumerable<string>);
} }
#if !ASPNETCORE50 #if !DNXCORE50
[Fact] [Fact]
public void HttpError_Roundtrips_WithJsonFormatter() public void HttpError_Roundtrips_WithJsonFormatter()

4
test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/HttpRequestMessage/HttpRequestMessageExtensionsTest.cs
View File

@ -8,7 +8,7 @@ using Microsoft.AspNet.Http;
using Microsoft.AspNet.Http.Core; using Microsoft.AspNet.Http.Core;
using Microsoft.AspNet.Mvc.WebApiCompatShim; using Microsoft.AspNet.Mvc.WebApiCompatShim;
using Microsoft.Framework.OptionsModel; using Microsoft.Framework.OptionsModel;
#if !ASPNETCORE50 #if !DNXCORE50
using Moq; using Moq;
#endif #endif
using Xunit; using Xunit;
@ -46,7 +46,7 @@ namespace System.Net.Http
ex.Message); ex.Message);
} }
#if !ASPNETCORE50 #if !DNXCORE50
[Fact] [Fact]
public void CreateResponse_DoingConneg_OnlyContent_RetrievesContentNegotiatorFromServices() public void CreateResponse_DoingConneg_OnlyContent_RetrievesContentNegotiatorFromServices()

6
test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/HttpResponseExceptionActionFilterTest.cs
View File

@ -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. // 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.Generic;
using System.Net; using System.Net;
using System.Net.Http; using System.Net.Http;
@ -27,7 +27,7 @@ namespace Microsoft.AspNet.Mvc.WebApiCompatShim
Assert.Equal(expectedFilterOrder, filter.Order); Assert.Equal(expectedFilterOrder, filter.Order);
} }
#if !ASPNETCORE50 #if !DNXCORE50
[Fact] [Fact]
public void OnActionExecuting_IsNoOp() public void OnActionExecuting_IsNoOp()
@ -89,4 +89,4 @@ namespace Microsoft.AspNet.Mvc.WebApiCompatShim
#endif #endif
} }
} }

4
test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/HttpResponseMessageOutputFormatterTests.cs
View File

@ -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. // 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;
using System.IO; using System.IO;
@ -148,4 +148,4 @@ namespace Microsoft.AspNet.Mvc.WebApiCompatShimTest
} }
} }
} }
#endif #endif

2
test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/Mocks/MockContentNegotiator.cs
View File

@ -34,7 +34,7 @@ namespace System.Net.Http.Formatting.Mocks
return base.SelectResponseCharacterEncoding(request, formatter); return base.SelectResponseCharacterEncoding(request, formatter);
} }
#if !ASPNETCORE50 #if !DNXCORE50
public new MediaTypeFormatterMatch MatchMediaTypeMapping(HttpRequestMessage request, MediaTypeFormatter formatter) public new MediaTypeFormatterMatch MatchMediaTypeMapping(HttpRequestMessage request, MediaTypeFormatter formatter)
{ {

4
test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/Mocks/MockMediaTypeMapping.cs
View File

@ -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. // 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; using System.Net.Http.Headers;
namespace System.Net.Http.Formatting.Mocks namespace System.Net.Http.Formatting.Mocks
@ -34,4 +34,4 @@ namespace System.Net.Http.Formatting.Mocks
} }
} }
} }
#endif #endif

Some files were not shown because too many files have changed in this diff Show More