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

Switching to generations TFMs

This commit is contained in:
Pranav K 2015-10-22 01:19:46 -07:00
parent 8a2694dd46
commit 91aeec95e9
48 changed files with 341 additions and 292 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,8 +28,8 @@
} }
}, },
"frameworks": { "frameworks": {
"dnx451": { }, "net451": {},
"dnxcore50": { "dotnet5.4": {
"dependencies": { "dependencies": {
"Microsoft.CSharp": "4.0.1-beta-*", "Microsoft.CSharp": "4.0.1-beta-*",
"System.ComponentModel.TypeConverter": "4.0.1-beta-*", "System.ComponentModel.TypeConverter": "4.0.1-beta-*",
@ -38,4 +38,4 @@
} }
} }
} }
} }

38
src/Microsoft.AspNet.Mvc.ApiExplorer/project.json
View File

@ -1,20 +1,26 @@
{ {
"description": "Contains API explorer functionality for ASP.NET MVC for discovering metadata such as the list of controllers and actions, and their URLs and allowed HTTP methods.", "description": "Contains API explorer functionality for ASP.NET MVC for discovering metadata such as the list of controllers and actions, and their URLs and allowed HTTP methods.",
"version": "6.0.0-*", "version": "6.0.0-*",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git://github.com/aspnet/mvc" "url": "git://github.com/aspnet/mvc"
},
"compilationOptions": {
"warningsAsErrors": true
},
"dependencies": {
"Microsoft.AspNet.Mvc.Core": "6.0.0-*",
"Microsoft.Extensions.PropertyHelper.Sources": {
"version": "1.0.0-*",
"type": "build"
}, },
"compilationOptions": { "Microsoft.Extensions.ClosedGenericMatcher.Sources": {
"warningsAsErrors": true "version": "1.0.0-*",
}, "type": "build"
"dependencies": {
"Microsoft.AspNet.Mvc.Core": "6.0.0-*",
"Microsoft.Extensions.PropertyHelper.Sources": { "version": "1.0.0-*", "type": "build" },
"Microsoft.Extensions.ClosedGenericMatcher.Sources": { "version": "1.0.0-*", "type": "build" }
},
"frameworks": {
"dnx451": { },
"dnxcore50": { }
} }
},
"frameworks": {
"net451": {},
"dotnet5.4": {}
}
} }

4
src/Microsoft.AspNet.Mvc.Core/Infrastructure/ActionBindingContextAccessor.cs
View File

@ -1,7 +1,7 @@
// Copyright (c) .NET Foundation. All rights reserved. // Copyright (c) .NET Foundation. 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 DNX451 #if NET451
using System.Runtime.Remoting; using System.Runtime.Remoting;
using System.Runtime.Remoting.Messaging; using System.Runtime.Remoting.Messaging;
#else #else
@ -12,7 +12,7 @@ namespace Microsoft.AspNet.Mvc.Infrastructure
{ {
public class ActionBindingContextAccessor : IActionBindingContextAccessor public class ActionBindingContextAccessor : IActionBindingContextAccessor
{ {
#if DNX451 #if NET451
private static string Key = typeof(ActionBindingContext).FullName; private static string Key = typeof(ActionBindingContext).FullName;
public ActionBindingContext ActionBindingContext public ActionBindingContext ActionBindingContext

4
src/Microsoft.AspNet.Mvc.Core/Infrastructure/ActionContextAccessor.cs
View File

@ -1,7 +1,7 @@
// Copyright (c) .NET Foundation. All rights reserved. // Copyright (c) .NET Foundation. 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 DNX451 #if NET451
using System.Runtime.Remoting; using System.Runtime.Remoting;
using System.Runtime.Remoting.Messaging; using System.Runtime.Remoting.Messaging;
#else #else
@ -12,7 +12,7 @@ namespace Microsoft.AspNet.Mvc.Infrastructure
{ {
public class ActionContextAccessor : IActionContextAccessor public class ActionContextAccessor : IActionContextAccessor
{ {
#if DNX451 #if NET451
private static string Key = typeof(ActionContext).FullName; private static string Key = typeof(ActionContext).FullName;
public ActionContext ActionContext public ActionContext ActionContext

6
src/Microsoft.AspNet.Mvc.Core/Infrastructure/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 DNX451 #if NET451
using System.Runtime.Serialization; using System.Runtime.Serialization;
#endif #endif
@ -11,7 +11,7 @@ namespace Microsoft.AspNet.Mvc.Infrastructure
/// <summary> /// <summary>
/// An exception which indicates multiple matches in action selection. /// An exception which indicates multiple matches in action selection.
/// </summary> /// </summary>
#if DNX451 #if NET451
[Serializable] [Serializable]
#endif #endif
public class AmbiguousActionException : InvalidOperationException public class AmbiguousActionException : InvalidOperationException
@ -21,7 +21,7 @@ namespace Microsoft.AspNet.Mvc.Infrastructure
{ {
} }
#if DNX451 #if NET451
protected AmbiguousActionException(SerializationInfo info, StreamingContext context) protected AmbiguousActionException(SerializationInfo info, StreamingContext context)
: base(info, context) : base(info, context)
{ {

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

@ -107,7 +107,7 @@ namespace Microsoft.AspNet.Mvc.Internal
{ {
return _innerStream.ReadAsync(buffer, offset, count, cancellationToken); return _innerStream.ReadAsync(buffer, offset, count, cancellationToken);
} }
#if DNX451 #if NET451
/// <inheritdoc /> /// <inheritdoc />
public override IAsyncResult BeginRead( public override IAsyncResult BeginRead(
byte[] buffer, byte[] buffer,
@ -166,7 +166,7 @@ namespace Microsoft.AspNet.Mvc.Internal
{ {
return _innerStream.WriteAsync(buffer, offset, count, cancellationToken); return _innerStream.WriteAsync(buffer, offset, count, cancellationToken);
} }
#if DNX451 #if NET451
/// <inheritdoc /> /// <inheritdoc />
public override IAsyncResult BeginWrite( public override IAsyncResult BeginWrite(
byte[] buffer, byte[] buffer,
@ -189,7 +189,7 @@ namespace Microsoft.AspNet.Mvc.Internal
{ {
_innerStream.WriteByte(value); _innerStream.WriteByte(value);
} }
#if DNX451 #if NET451
/// <inheritdoc /> /// <inheritdoc />
public override void Close() public override void Close()
{ {

6
src/Microsoft.AspNet.Mvc.Core/Internal/TaskCache.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) .NET Foundation. All rights reserved. // Copyright (c) .NET Foundation. 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.Threading.Tasks; using System.Threading.Tasks;
@ -7,7 +7,7 @@ namespace Microsoft.AspNet.Mvc.Internal
{ {
public static class TaskCache public static class TaskCache
{ {
#if DNX451 #if NET451
static readonly Task _completedTask = Task.FromResult(0); static readonly Task _completedTask = Task.FromResult(0);
#endif #endif
@ -17,7 +17,7 @@ namespace Microsoft.AspNet.Mvc.Internal
{ {
get get
{ {
#if DNX451 #if NET451
return _completedTask; return _completedTask;
#else #else
return Task.CompletedTask; return Task.CompletedTask;

2
src/Microsoft.AspNet.Mvc.Core/ModelBinding/CollectionModelBinder.cs
View File

@ -7,7 +7,7 @@ using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Globalization; using System.Globalization;
using System.Linq; using System.Linq;
#if DNXCORE50 #if DOTNET5_4
using System.Reflection; using System.Reflection;
#endif #endif
using System.Threading.Tasks; using System.Threading.Tasks;

2
src/Microsoft.AspNet.Mvc.Core/ModelBinding/DictionaryModelBinder.cs
View File

@ -5,7 +5,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Linq; using System.Linq;
#if DNXCORE50 #if DOTNET5_4
using System.Reflection; using System.Reflection;
#endif #endif
using System.Threading.Tasks; using System.Threading.Tasks;

2
src/Microsoft.AspNet.Mvc.Core/ModelBinding/FormFileModelBinder.cs
View File

@ -5,7 +5,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Linq; using System.Linq;
#if DNXCORE50 #if DOTNET5_4
using System.Reflection; using System.Reflection;
#endif #endif
using System.Threading.Tasks; using System.Threading.Tasks;

2
src/Microsoft.AspNet.Mvc.Core/ModelBinding/GenericModelBinder.cs
View File

@ -4,7 +4,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
#if DNXCORE50 #if DOTNET5_4
using System.Reflection; using System.Reflection;
#endif #endif
using System.Threading.Tasks; using System.Threading.Tasks;

2
src/Microsoft.AspNet.Mvc.Core/ModelBinding/HeaderModelBinder.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.Collections.Generic; using System.Collections.Generic;
#if DNXCORE50 #if DOTNET5_4
using System.Reflection; using System.Reflection;
#endif #endif
using System.Threading.Tasks; using System.Threading.Tasks;

2
src/Microsoft.AspNet.Mvc.Core/ModelBinding/Metadata/DefaultModelMetadata.cs
View File

@ -7,7 +7,7 @@ using System.Collections.Generic;
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using System.Diagnostics; using System.Diagnostics;
using System.Linq; using System.Linq;
#if DNXCORE50 #if DOTNET5_4
using System.Reflection; using System.Reflection;
#endif #endif
using Microsoft.Extensions.Internal; using Microsoft.Extensions.Internal;

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

@ -3,7 +3,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
#if DNX451 #if NET451
using System.ComponentModel; using System.ComponentModel;
#endif #endif
using System.Diagnostics; using System.Diagnostics;
@ -174,7 +174,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 DNX451 #if NET451
throw new InvalidEnumArgumentException( throw new InvalidEnumArgumentException(
nameof(item), nameof(item),
(int)constraint.KeyHandling, (int)constraint.KeyHandling,

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

@ -35,15 +35,15 @@
"System.Diagnostics.DiagnosticSource": "4.0.0-beta-*" "System.Diagnostics.DiagnosticSource": "4.0.0-beta-*"
}, },
"frameworks": { "frameworks": {
"dnx451": { "net451": {
"frameworkAssemblies": { "frameworkAssemblies": {
"System.Runtime": "" "System.Runtime": ""
} }
}, },
"dnxcore50": { "dotnet5.4": {
"dependencies": { "dependencies": {
"System.Text.Encoding": "4.0.11-*" "System.Text.Encoding": "4.0.11-*"
} }
} }
} }
} }

39
src/Microsoft.AspNet.Mvc.Cors/project.json
View File

@ -1,20 +1,19 @@
{ {
"description": "CORS features for the core MVC runtime", "description": "CORS features for the core MVC runtime",
"version": "6.0.0-*", "version": "6.0.0-*",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git://github.com/aspnet/mvc" "url": "git://github.com/aspnet/mvc"
}, },
"compilationOptions": { "compilationOptions": {
"warningsAsErrors": true "warningsAsErrors": true
}, },
"dependencies": { "dependencies": {
"Microsoft.AspNet.Cors": "6.0.0-*", "Microsoft.AspNet.Cors": "6.0.0-*",
"Microsoft.AspNet.Mvc.Core": "6.0.0-*" "Microsoft.AspNet.Mvc.Core": "6.0.0-*"
}, },
"frameworks": {
"frameworks": { "net451": {},
"dnx451": { }, "dotnet5.4": {}
"dnxcore50": { } }
} }
}

55
src/Microsoft.AspNet.Mvc.DataAnnotations/project.json
View File

@ -1,30 +1,35 @@
{ {
"description": "Metadata and Validation using System.ComponentModel.DataAnnotations for the MVC runtime", "description": "Metadata and Validation using System.ComponentModel.DataAnnotations for the MVC runtime",
"version": "6.0.0-*", "version": "6.0.0-*",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git://github.com/aspnet/mvc" "url": "git://github.com/aspnet/mvc"
},
"compilationOptions": {
"warningsAsErrors": true
},
"dependencies": {
"Microsoft.AspNet.Mvc.Core": "6.0.0-*",
"Microsoft.Extensions.ClosedGenericMatcher.Sources": {
"version": "1.0.0-*",
"type": "build"
}, },
"compilationOptions": { "Microsoft.Extensions.CopyOnWriteDictionary.Sources": {
"warningsAsErrors": true "version": "1.0.0-*",
"type": "build"
}, },
"dependencies": { "Microsoft.Extensions.Localization": "1.0.0-*"
"Microsoft.AspNet.Mvc.Core": "6.0.0-*", },
"Microsoft.Extensions.ClosedGenericMatcher.Sources": { "version": "1.0.0-*", "type": "build" }, "frameworks": {
"Microsoft.Extensions.CopyOnWriteDictionary.Sources": { "version": "1.0.0-*", "type": "build" }, "net451": {
"Microsoft.Extensions.Localization": "1.0.0-*" "frameworkAssemblies": {
"System.ComponentModel.DataAnnotations": ""
}
}, },
"dotnet5.4": {
"frameworks": { "dependencies": {
"dnx451": { "System.ComponentModel.Annotations": "4.0.11-beta-*"
"frameworkAssemblies": { }
"System.ComponentModel.DataAnnotations": ""
}
},
"dnxcore50": {
"dependencies": {
"System.ComponentModel.Annotations": "4.0.11-beta-*"
}
}
} }
} }
}

45
src/Microsoft.AspNet.Mvc.Formatters.Json/project.json
View File

@ -1,25 +1,24 @@
{ {
"description": "JSON input and output for the MVC runtime", "description": "JSON input and output for the MVC runtime",
"version": "6.0.0-*", "version": "6.0.0-*",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git://github.com/aspnet/mvc" "url": "git://github.com/aspnet/mvc"
},
"compilationOptions": {
"warningsAsErrors": true
},
"dependencies": {
"Microsoft.AspNet.JsonPatch": "1.0.0-*",
"Microsoft.AspNet.Mvc.Core": "6.0.0-*",
"Microsoft.Extensions.ClosedGenericMatcher.Sources": {
"version": "1.0.0-*",
"type": "build"
}, },
"compilationOptions": { "Newtonsoft.Json": "6.0.6"
"warningsAsErrors": true },
}, "frameworks": {
"dependencies": { "net451": {},
"Microsoft.AspNet.JsonPatch": "1.0.0-*", "dotnet5.4": {}
"Microsoft.AspNet.Mvc.Core": "6.0.0-*", }
"Microsoft.Extensions.ClosedGenericMatcher.Sources": { }
"version": "1.0.0-*",
"type": "build"
},
"Newtonsoft.Json": "6.0.6"
},
"frameworks": {
"dnx451": { },
"dnxcore50": { }
}
}

4
src/Microsoft.AspNet.Mvc.Formatters.Xml/Internal/FormattingUtilities.cs
View File

@ -1,7 +1,7 @@
// Copyright (c) .NET Foundation. All rights reserved. // Copyright (c) .NET Foundation. 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 DNX451 #if NET451
using System.Runtime.Serialization; using System.Runtime.Serialization;
#endif #endif
using System.Xml; using System.Xml;
@ -15,7 +15,7 @@ namespace Microsoft.AspNet.Mvc.Formatters.Xml.Internal
{ {
public static readonly int DefaultMaxDepth = 32; public static readonly int DefaultMaxDepth = 32;
#if DNX451 #if NET451
public static readonly XsdDataContractExporter XsdDataContractExporter = new XsdDataContractExporter(); public static readonly XsdDataContractExporter XsdDataContractExporter = new XsdDataContractExporter();
#endif #endif

2
src/Microsoft.AspNet.Mvc.Formatters.Xml/XmlDataContractSerializerOutputFormatter.cs
View File

@ -132,7 +132,7 @@ namespace Microsoft.AspNet.Mvc.Formatters
try try
{ {
#if DNX451 #if NET451
// 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

60
src/Microsoft.AspNet.Mvc.Formatters.Xml/project.json
View File

@ -1,30 +1,36 @@
{ {
"description": "Contains DataContractSerializer and XmlSerializer based input and output formatters", "description": "Contains DataContractSerializer and XmlSerializer based input and output formatters",
"version": "6.0.0-*", "version": "6.0.0-*",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git://github.com/aspnet/mvc" "url": "git://github.com/aspnet/mvc"
},
"compilationOptions": {
"warningsAsErrors": true
},
"dependencies": {
"Microsoft.AspNet.Mvc.Core": "6.0.0-*",
"Microsoft.Extensions.ClosedGenericMatcher.Sources": {
"version": "1.0.0-*",
"type": "build"
}, },
"compilationOptions": { "Microsoft.Extensions.PropertyHelper.Sources": {
"warningsAsErrors": true "version": "1.0.0-*",
}, "type": "build"
"dependencies": {
"Microsoft.AspNet.Mvc.Core": "6.0.0-*",
"Microsoft.Extensions.ClosedGenericMatcher.Sources": { "version": "1.0.0-*", "type": "build" },
"Microsoft.Extensions.PropertyHelper.Sources": { "version": "1.0.0-*", "type": "build" }
},
"frameworks": {
"dnx451": {
"frameworkAssemblies": {
"System.Runtime.Serialization": "",
"System.Xml": ""
}
},
"dnxcore50": {
"dependencies": {
"System.Runtime.Serialization.Xml": "4.0.11-beta-*",
"System.Xml.XmlSerializer": "4.0.11-beta-*"
}
}
} }
} },
"frameworks": {
"net451": {
"frameworkAssemblies": {
"System.Runtime.Serialization": "",
"System.Xml": ""
}
},
"dotnet5.4": {
"dependencies": {
"System.Runtime.Serialization.Xml": "4.0.11-beta-*",
"System.Xml.XmlSerializer": "4.0.11-beta-*"
}
}
}
}

56
src/Microsoft.AspNet.Mvc.Localization/project.json
View File

@ -1,30 +1,30 @@
{ {
"description": "Features that enable globalization & localization of MVC applications.", "description": "Features that enable globalization & localization of MVC applications.",
"version": "6.0.0-*", "version": "6.0.0-*",
"compilationOptions": { "compilationOptions": {
"warningsAsErrors": true "warningsAsErrors": true
}, },
"dependencies": { "dependencies": {
"Microsoft.AspNet.Localization": "1.0.0-*", "Microsoft.AspNet.Localization": "1.0.0-*",
"Microsoft.AspNet.Mvc.Razor": "6.0.0-*", "Microsoft.AspNet.Mvc.Razor": "6.0.0-*",
"Microsoft.Extensions.DependencyInjection": "1.0.0-*", "Microsoft.Extensions.DependencyInjection": "1.0.0-*",
"Microsoft.Extensions.Localization": "1.0.0-*", "Microsoft.Extensions.Localization": "1.0.0-*",
"Microsoft.Extensions.PropertyHelper.Sources": { "Microsoft.Extensions.PropertyHelper.Sources": {
"version": "1.0.0-*", "version": "1.0.0-*",
"type": "build" "type": "build"
}
},
"frameworks": {
"dnx451": { },
"dnxcore50": { }
},
"exclude": [
"wwwroot",
"node_modules",
"bower_components"
],
"repository": {
"type": "git",
"url": "https://github.com/aspnet/mvc"
} }
} },
"frameworks": {
"net451": {},
"dotnet5.4": {}
},
"exclude": [
"wwwroot",
"node_modules",
"bower_components"
],
"repository": {
"type": "git",
"url": "https://github.com/aspnet/mvc"
}
}

4
src/Microsoft.AspNet.Mvc.Razor.Host/MvcRazorHost.cs
View File

@ -5,7 +5,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
#if NET45 #if NET451
using Microsoft.AspNet.FileProviders; using Microsoft.AspNet.FileProviders;
#endif #endif
using Microsoft.AspNet.Mvc.Razor.Directives; using Microsoft.AspNet.Mvc.Razor.Directives;
@ -124,7 +124,7 @@ namespace Microsoft.AspNet.Mvc.Razor
} }
} }
#if NET45 #if NET451
/// <summary> /// <summary>
/// Initializes a new instance of <see cref="MvcRazorHost"/> with the specified <paramref name="root"/>. /// Initializes a new instance of <see cref="MvcRazorHost"/> with the specified <paramref name="root"/>.
/// </summary> /// </summary>

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

@ -12,16 +12,18 @@
"Microsoft.AspNet.FileProviders.Physical": "1.0.0-*", "Microsoft.AspNet.FileProviders.Physical": "1.0.0-*",
"Microsoft.AspNet.Razor.Runtime": "4.0.0-*", "Microsoft.AspNet.Razor.Runtime": "4.0.0-*",
"Microsoft.Extensions.Caching.Memory": "1.0.0-*", "Microsoft.Extensions.Caching.Memory": "1.0.0-*",
"Microsoft.Extensions.PropertyHelper.Sources": { "version": "1.0.0-*", "type": "build" } "Microsoft.Extensions.PropertyHelper.Sources": {
"version": "1.0.0-*",
"type": "build"
}
}, },
"frameworks": { "frameworks": {
"net45": { }, "net451": {
"dnx451": {
"dependencies": { "dependencies": {
"Microsoft.Dnx.Runtime.Abstractions": "1.0.0-*" "Microsoft.Dnx.Runtime.Abstractions": "1.0.0-*"
} }
}, },
"dnxcore50": { "dotnet5.4": {
"dependencies": { "dependencies": {
"Microsoft.Dnx.Runtime.Abstractions": "1.0.0-*", "Microsoft.Dnx.Runtime.Abstractions": "1.0.0-*",
"System.Collections.Concurrent": "4.0.11-beta-*", "System.Collections.Concurrent": "4.0.11-beta-*",
@ -36,4 +38,4 @@
"node_modules", "node_modules",
"bower_components" "bower_components"
] ]
} }

2
src/Microsoft.AspNet.Mvc.Razor/LanguageViewLocationExpander.cs
View File

@ -51,7 +51,7 @@ namespace Microsoft.AspNet.Mvc.Razor
} }
// Using CurrentUICulture so it loads the locale specific resources for the views. // Using CurrentUICulture so it loads the locale specific resources for the views.
#if DNX451 #if NET451
context.Values[ValueKey] = Thread.CurrentThread.CurrentUICulture.Name; context.Values[ValueKey] = Thread.CurrentThread.CurrentUICulture.Name;
#else #else
context.Values[ValueKey] = CultureInfo.CurrentUICulture.Name; context.Values[ValueKey] = CultureInfo.CurrentUICulture.Name;

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

@ -11,16 +11,25 @@
"dependencies": { "dependencies": {
"Microsoft.AspNet.Mvc.Razor.Host": "6.0.0-*", "Microsoft.AspNet.Mvc.Razor.Host": "6.0.0-*",
"Microsoft.AspNet.Mvc.ViewFeatures": "6.0.0-*", "Microsoft.AspNet.Mvc.ViewFeatures": "6.0.0-*",
"Microsoft.AspNet.Razor.Runtime.Precompilation": "4.0.0-*", "Microsoft.AspNet.Razor.Runtime.Precompilation": "4.0.0-*",
"Microsoft.AspNet.PageExecutionInstrumentation.Interfaces": "1.0.0-*", "Microsoft.AspNet.PageExecutionInstrumentation.Interfaces": "1.0.0-*",
"Microsoft.Extensions.HashCodeCombiner.Sources": { "version": "1.0.0-*", "type": "build" }, "Microsoft.Extensions.HashCodeCombiner.Sources": {
"Microsoft.Extensions.PropertyActivator.Sources": { "version": "1.0.0-*", "type": "build" }, "version": "1.0.0-*",
"Microsoft.Extensions.PropertyHelper.Sources": { "version": "1.0.0-*", "type": "build" }, "type": "build"
},
"Microsoft.Extensions.PropertyActivator.Sources": {
"version": "1.0.0-*",
"type": "build"
},
"Microsoft.Extensions.PropertyHelper.Sources": {
"version": "1.0.0-*",
"type": "build"
},
"Microsoft.Dnx.Compilation.CSharp.Common": "1.0.0-*", "Microsoft.Dnx.Compilation.CSharp.Common": "1.0.0-*",
"Microsoft.Dnx.Compilation.CSharp.Abstractions": "1.0.0-*" "Microsoft.Dnx.Compilation.CSharp.Abstractions": "1.0.0-*"
}, },
"frameworks": { "frameworks": {
"dnx451": { "net451": {
"frameworkAssemblies": { "frameworkAssemblies": {
"System.Collections": "", "System.Collections": "",
"System.IO": "", "System.IO": "",
@ -29,7 +38,7 @@
"System.Threading.Tasks": "" "System.Threading.Tasks": ""
} }
}, },
"dnxcore50": { "dotnet5.4": {
"dependencies": { "dependencies": {
"System.Text.Encoding": "4.0.11-*", "System.Text.Encoding": "4.0.11-*",
"System.Threading.Tasks.Parallel": "4.0.1-beta-*" "System.Threading.Tasks.Parallel": "4.0.1-beta-*"
@ -41,4 +50,4 @@
"node_modules", "node_modules",
"bower_components" "bower_components"
] ]
} }

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

@ -12,12 +12,18 @@
"Microsoft.AspNet.Mvc.Razor": "6.0.0-*", "Microsoft.AspNet.Mvc.Razor": "6.0.0-*",
"Microsoft.Extensions.Caching.Memory": "1.0.0-*", "Microsoft.Extensions.Caching.Memory": "1.0.0-*",
"Microsoft.Extensions.FileSystemGlobbing": "1.0.0-*", "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-*",
"Microsoft.Extensions.Logging.Abstractions": { "version": "1.0.0-*", "type": "build" }, "Microsoft.Extensions.Logging.Abstractions": {
"Microsoft.Extensions.PropertyHelper.Sources": { "version": "1.0.0-*", "type": "build" } "version": "1.0.0-*",
"type": "build"
},
"Microsoft.Extensions.PropertyHelper.Sources": {
"version": "1.0.0-*",
"type": "build"
}
}, },
"frameworks": { "frameworks": {
"dnx451": { }, "net451": {},
"dnxcore50": { "dotnet5.4": {
"dependencies": { "dependencies": {
"System.Security.Cryptography.Algorithms": "4.0.0-beta-*" "System.Security.Cryptography.Algorithms": "4.0.0-beta-*"
} }
@ -28,4 +34,4 @@
"node_modules", "node_modules",
"bower_components" "bower_components"
] ]
} }

2
src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/ViewComponentMethodSelector.cs
View File

@ -80,7 +80,7 @@ namespace Microsoft.AspNet.Mvc.ViewComponents
} }
} }
#if DNX451 #if NET451
return componentType.AsType().GetMethod( return componentType.AsType().GetMethod(
methodName, methodName,
BindingFlags.Public | BindingFlags.Instance, BindingFlags.Public | BindingFlags.Instance,

2
src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/ViewDataDictionary.cs
View File

@ -5,7 +5,7 @@ using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization; using System.Globalization;
#if DNXCORE50 #if DOTNET5_4
using System.Reflection; using System.Reflection;
#endif #endif
using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.ModelBinding;

62
src/Microsoft.AspNet.Mvc.ViewFeatures/project.json
View File

@ -1,29 +1,43 @@
{ {
"description": "View Rendering features for the MVC runtime", "description": "View Rendering features for the MVC runtime",
"version": "6.0.0-*", "version": "6.0.0-*",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git://github.com/aspnet/mvc" "url": "git://github.com/aspnet/mvc"
},
"compilationOptions": {
"warningsAsErrors": true
},
"dependencies": {
"Microsoft.AspNet.Antiforgery": "1.0.0-*",
"Microsoft.AspNet.Diagnostics.Abstractions": "1.0.0-*",
"Microsoft.AspNet.Html.Abstractions": "1.0.0-*",
"Microsoft.AspNet.Mvc.Core": "6.0.0-*",
"Microsoft.AspNet.Mvc.DataAnnotations": "6.0.0-*",
"Microsoft.AspNet.Mvc.Formatters.Json": "6.0.0-*",
"Microsoft.Extensions.BufferedHtmlContent.Sources": {
"version": "1.0.0-*",
"type": "build"
}, },
"compilationOptions": { "Microsoft.Extensions.ClosedGenericMatcher.Sources": {
"warningsAsErrors": true "version": "1.0.0-*",
"type": "build"
}, },
"dependencies": { "Microsoft.Extensions.CopyOnWriteDictionary.Sources": {
"Microsoft.AspNet.Antiforgery": "1.0.0-*", "version": "1.0.0-*",
"Microsoft.AspNet.Diagnostics.Abstractions": "1.0.0-*", "type": "build"
"Microsoft.AspNet.Html.Abstractions": "1.0.0-*",
"Microsoft.AspNet.Mvc.Core": "6.0.0-*",
"Microsoft.AspNet.Mvc.DataAnnotations": "6.0.0-*",
"Microsoft.AspNet.Mvc.Formatters.Json": "6.0.0-*",
"Microsoft.Extensions.BufferedHtmlContent.Sources": { "version": "1.0.0-*", "type": "build" },
"Microsoft.Extensions.ClosedGenericMatcher.Sources": { "version": "1.0.0-*", "type": "build" },
"Microsoft.Extensions.CopyOnWriteDictionary.Sources": { "version": "1.0.0-*", "type": "build" },
"Microsoft.Extensions.PropertyActivator.Sources": { "version": "1.0.0-*", "type": "build" },
"Microsoft.Extensions.PropertyHelper.Sources": { "version": "1.0.0-*", "type": "build" }
}, },
"Microsoft.Extensions.PropertyActivator.Sources": {
"frameworks": { "version": "1.0.0-*",
"dnx451": { }, "type": "build"
"dnxcore50": { } },
"Microsoft.Extensions.PropertyHelper.Sources": {
"version": "1.0.0-*",
"type": "build"
} }
} },
"frameworks": {
"net451": {},
"dotnet5.4": {}
}
}

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

@ -1,7 +1,7 @@
// Copyright (c) .NET Foundation. All rights reserved. // Copyright (c) .NET Foundation. 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 DNXCORE50 #if DOTNET5_4
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using System.Diagnostics; using System.Diagnostics;

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

@ -1,7 +1,7 @@
// Copyright (c) .NET Foundation. All rights reserved. // Copyright (c) .NET Foundation. 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 DNXCORE50 #if DOTNET5_4
using System.Collections.Generic; using System.Collections.Generic;
using System.Net.Http.Headers; using System.Net.Http.Headers;

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

@ -1,7 +1,7 @@
// Copyright (c) .NET Foundation. All rights reserved. // Copyright (c) .NET Foundation. 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 DNXCORE50 #if DOTNET5_4
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.ObjectModel; using System.Collections.ObjectModel;

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

@ -1,7 +1,7 @@
// Copyright (c) .NET Foundation. All rights reserved. // Copyright (c) .NET Foundation. 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 DNXCORE50 #if DOTNET5_4
using Microsoft.AspNet.WebUtilities; using Microsoft.AspNet.WebUtilities;
using System.Collections; using System.Collections;

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

@ -1,7 +1,7 @@
// Copyright (c) .NET Foundation. All rights reserved. // Copyright (c) .NET Foundation. 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 DNXCORE50 #if DOTNET5_4
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization; using System.Globalization;

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

@ -1,7 +1,7 @@
// Copyright (c) .NET Foundation. All rights reserved. // Copyright (c) .NET Foundation. 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 DNXCORE50 #if DOTNET5_4
using System.Collections.Generic; using System.Collections.Generic;
using System.Net.Http.Headers; using System.Net.Http.Headers;

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

@ -1,7 +1,7 @@
// Copyright (c) .NET Foundation. All rights reserved. // Copyright (c) .NET Foundation. 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 DNXCORE50 #if DOTNET5_4
using System.Collections.Generic; using System.Collections.Generic;

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

@ -1,7 +1,7 @@
// Copyright (c) .NET Foundation. All rights reserved. // Copyright (c) .NET Foundation. 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 DNXCORE50 #if DOTNET5_4
using System.Net.Http.Headers; using System.Net.Http.Headers;

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

@ -1,7 +1,7 @@
// Copyright (c) .NET Foundation. All rights reserved. // Copyright (c) .NET Foundation. 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 DNXCORE50 #if DOTNET5_4
using System.Net.Http.Headers; using System.Net.Http.Headers;

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

@ -1,7 +1,7 @@
// Copyright (c) .NET Foundation. All rights reserved. // Copyright (c) .NET Foundation. 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 DNXCORE50 #if DOTNET5_4
namespace System.Net.Http.Formatting namespace System.Net.Http.Formatting
{ {

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

@ -1,7 +1,7 @@
// Copyright (c) .NET Foundation. All rights reserved. // Copyright (c) .NET Foundation. 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 DNXCORE50 #if DOTNET5_4
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;

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

@ -1,7 +1,7 @@
// Copyright (c) .NET Foundation. All rights reserved. // Copyright (c) .NET Foundation. 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 DNXCORE50 #if DOTNET5_4
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;

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

@ -1,7 +1,7 @@
// Copyright (c) .NET Foundation. All rights reserved. // Copyright (c) .NET Foundation. 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 DNXCORE50 #if DOTNET5_4
using System.Diagnostics; using System.Diagnostics;
using System.Net.Http.Headers; using System.Net.Http.Headers;

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

@ -1,7 +1,7 @@
// Copyright (c) .NET Foundation. All rights reserved. // Copyright (c) .NET Foundation. 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 DNXCORE50 #if DOTNET5_4
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;

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

@ -19,7 +19,7 @@ namespace System.Net.Http
/// </summary> /// </summary>
public static class HttpRequestMessageExtensions public static class HttpRequestMessageExtensions
{ {
#if !DNXCORE50 #if !DOTNET5_4
/// <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

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

@ -18,20 +18,20 @@
"type": "build" "type": "build"
} }
}, },
"frameworks": { "frameworks": {
"dnx451": { "net451": {
"frameworkAssemblies": { "frameworkAssemblies": {
"System.Net.Http": "", "System.Net.Http": "",
"System.Xml": "", "System.Xml": "",
"System.Runtime.Serialization": "" "System.Runtime.Serialization": ""
} }
}, },
"dnxcore50": { "dotnet5.4": {
"dependencies": { "dependencies": {
"System.Net.Http": "4.0.1-beta-*", "System.Net.Http": "4.0.1-beta-*",
"System.Xml.XmlSerializer": "4.0.11-beta-*", "System.Xml.XmlSerializer": "4.0.11-beta-*",
"System.Runtime.Serialization.Xml": "4.0.11-beta-*" "System.Runtime.Serialization.Xml": "4.0.11-beta-*"
} }
}
} }
} }
}

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

@ -1,27 +1,30 @@
{ {
"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-*",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git://github.com/aspnet/mvc" "url": "git://github.com/aspnet/mvc"
}, },
"compilationOptions": { "compilationOptions": {
"warningsAsErrors": true "warningsAsErrors": true
}, },
"dependencies": { "dependencies": {
"Microsoft.AspNet.Mvc.ApiExplorer": "6.0.0-*", "Microsoft.AspNet.Mvc.ApiExplorer": "6.0.0-*",
"Microsoft.AspNet.Mvc.Cors": "6.0.0-*", "Microsoft.AspNet.Mvc.Cors": "6.0.0-*",
"Microsoft.AspNet.Mvc.DataAnnotations": "6.0.0-*", "Microsoft.AspNet.Mvc.DataAnnotations": "6.0.0-*",
"Microsoft.AspNet.Mvc.Formatters.Json": "6.0.0-*", "Microsoft.AspNet.Mvc.Formatters.Json": "6.0.0-*",
"Microsoft.AspNet.Mvc.Localization": "6.0.0-*", "Microsoft.AspNet.Mvc.Localization": "6.0.0-*",
"Microsoft.AspNet.Mvc.Razor": "6.0.0-*", "Microsoft.AspNet.Mvc.Razor": "6.0.0-*",
"Microsoft.AspNet.Mvc.ViewFeatures": "6.0.0-*", "Microsoft.AspNet.Mvc.ViewFeatures": "6.0.0-*",
"Microsoft.Extensions.Caching.Memory": "1.0.0-*", "Microsoft.Extensions.Caching.Memory": "1.0.0-*",
"Microsoft.Extensions.DependencyInjection": "1.0.0-*", "Microsoft.Extensions.DependencyInjection": "1.0.0-*",
"Microsoft.Extensions.PropertyHelper.Sources": { "version": "1.0.0-*", "type": "build" } "Microsoft.Extensions.PropertyHelper.Sources": {
}, "version": "1.0.0-*",
"frameworks": { "type": "build"
"dnx451": {},
"dnxcore50": {}
} }
} },
"frameworks": {
"net451": {},
"dotnet5.4": {}
}
}

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

@ -1,20 +1,20 @@
{ {
"description": "Abstractions for page instrumentation.", "description": "Abstractions for page instrumentation.",
"version": "1.0.0-*", "version": "1.0.0-*",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git://github.com/aspnet/mvc" "url": "git://github.com/aspnet/mvc"
}, },
"compilationOptions": { "compilationOptions": {
"warningsAsErrors": true "warningsAsErrors": true
}, },
"frameworks": { "frameworks": {
"dnx451": { }, "net451": {},
"dnxcore50": { "dotnet5.4": {
"dependencies": { "dependencies": {
"System.IO": "4.0.11-beta-*", "System.IO": "4.0.11-beta-*",
"System.Resources.ResourceManager": "4.0.1-beta-*" "System.Resources.ResourceManager": "4.0.1-beta-*"
} }
}
} }
} }
}