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

Transition to Netstandard. 

- dotnet5.X => netstandard1.y (where y = x-1).
- DNXCore50 => netstandardapp1.5.
- Applied the same changes to ifdefs.
This commit is contained in:
N. Taylor Mullen 2016-02-26 11:11:16 -08:00
parent 12f33de92c
commit 33d1aea8ea
104 changed files with 430 additions and 210 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
samples/ActionConstraintSample.Web/project.json
View File

@ -12,9 +12,12 @@
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*" "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*"
}, },
"frameworks": { "frameworks": {
"net451": { }, "net451": {},
"dnxcore50": { "netstandardapp1.5": {
"imports": "portable-net451+win8", "imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-*" "NETStandard.Library": "1.0.0-*"
} }

7
samples/CustomRouteSample.Web/project.json
View File

@ -13,8 +13,11 @@
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": {},
"dnxcore50": { "netstandardapp1.5": {
"imports": "portable-net451+win8", "imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-*" "NETStandard.Library": "1.0.0-*"
} }

7
samples/EmbeddedViewSample.Web/project.json
View File

@ -15,8 +15,11 @@
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": {},
"dnxcore50": { "netstandardapp1.5": {
"imports": "portable-net451+win8", "imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-*" "NETStandard.Library": "1.0.0-*"
} }

7
samples/FormatFilterSample.Web/project.json
View File

@ -14,8 +14,11 @@
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": {},
"dnxcore50": { "netstandardapp1.5": {
"imports": "portable-net451+win8", "imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-*" "NETStandard.Library": "1.0.0-*"
} }

7
samples/InlineConstraintSample.Web/project.json
View File

@ -13,8 +13,11 @@
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": {},
"dnxcore50": { "netstandardapp1.5": {
"imports": "portable-net451+win8", "imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-*" "NETStandard.Library": "1.0.0-*"
} }

7
samples/JsonPatchSample.Web/project.json
View File

@ -13,8 +13,11 @@
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": {},
"dnxcore50": { "netstandardapp1.5": {
"imports": "portable-net451+win8", "imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-*" "NETStandard.Library": "1.0.0-*"
} }

7
samples/LocalizationSample.Web/project.json
View File

@ -13,8 +13,11 @@
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": {},
"dnxcore50": { "netstandardapp1.5": {
"imports": "portable-net451+win8", "imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-*" "NETStandard.Library": "1.0.0-*"
} }

7
samples/MvcSandbox/project.json
View File

@ -27,8 +27,11 @@
} }
}, },
"net451": { }, "net451": { },
"dnxcore50": { "netstandardapp1.5": {
"imports": "portable-net451+win8", "imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-*" "NETStandard.Library": "1.0.0-*"
} }

7
samples/MvcSubAreaSample.Web/project.json
View File

@ -16,8 +16,11 @@
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": {},
"dnxcore50": { "netstandardapp1.5": {
"imports": "portable-net451+win8", "imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-*" "NETStandard.Library": "1.0.0-*"
} }

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

@ -21,8 +21,11 @@
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": {},
"dnxcore50": { "netstandardapp1.5": {
"imports": "portable-net451+win8", "imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-*" "NETStandard.Library": "1.0.0-*"
} }

7
samples/UrlHelperSample.Web/project.json
View File

@ -12,8 +12,11 @@
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": {},
"dnxcore50": { "netstandardapp1.5": {
"imports": "portable-net451+win8", "imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-*" "NETStandard.Library": "1.0.0-*"
} }

11
src/Microsoft.AspNetCore.Mvc.Abstractions/project.json
View File

@ -8,7 +8,9 @@
"compilationOptions": { "compilationOptions": {
"warningsAsErrors": true, "warningsAsErrors": true,
"keyFile": "../../tools/Key.snk", "keyFile": "../../tools/Key.snk",
"nowarn": [ "CS1591" ], "nowarn": [
"CS1591"
],
"xmlDoc": true "xmlDoc": true
}, },
"dependencies": { "dependencies": {
@ -33,13 +35,16 @@
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": {},
"dotnet5.4": { "netstandard1.3": {
"dependencies": { "dependencies": {
"Microsoft.CSharp": "4.0.1-*", "Microsoft.CSharp": "4.0.1-*",
"System.ComponentModel.TypeConverter": "4.0.1-*", "System.ComponentModel.TypeConverter": "4.0.1-*",
"System.Reflection.Extensions": "4.0.1-*", "System.Reflection.Extensions": "4.0.1-*",
"System.Text.Encoding.Extensions": "4.0.11-*" "System.Text.Encoding.Extensions": "4.0.11-*"
} },
"imports": [
"dotnet5.4"
]
} }
} }
} }

11
src/Microsoft.AspNetCore.Mvc.ApiExplorer/project.json
View File

@ -8,7 +8,9 @@
"compilationOptions": { "compilationOptions": {
"warningsAsErrors": true, "warningsAsErrors": true,
"keyFile": "../../tools/Key.snk", "keyFile": "../../tools/Key.snk",
"nowarn": [ "CS1591" ], "nowarn": [
"CS1591"
],
"xmlDoc": true "xmlDoc": true
}, },
"dependencies": { "dependencies": {
@ -24,8 +26,11 @@
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": {},
"dotnet5.4": { "netstandard1.3": {
"imports": "portable-net451+win8" "imports": [
"dotnet5.4",
"portable-net451+win8"
]
} }
} }
} }

2
src/Microsoft.AspNetCore.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 DOTNET5_4 #if NETSTANDARD1_3
using System.Reflection; using System.Reflection;
#endif #endif
using System.Threading.Tasks; using System.Threading.Tasks;

2
src/Microsoft.AspNetCore.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 DOTNET5_4 #if NETSTANDARD1_3
using System.Reflection; using System.Reflection;
#endif #endif
using System.Threading.Tasks; using System.Threading.Tasks;

2
src/Microsoft.AspNetCore.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 DOTNET5_4 #if NETSTANDARD1_3
using System.Reflection; using System.Reflection;
#endif #endif
using System.Threading.Tasks; using System.Threading.Tasks;

2
src/Microsoft.AspNetCore.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 DOTNET5_4 #if NETSTANDARD1_3
using System.Reflection; using System.Reflection;
#endif #endif
using System.Threading.Tasks; using System.Threading.Tasks;

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

11
src/Microsoft.AspNetCore.Mvc.Core/project.json
View File

@ -8,7 +8,9 @@
"compilationOptions": { "compilationOptions": {
"warningsAsErrors": true, "warningsAsErrors": true,
"keyFile": "../../tools/Key.snk", "keyFile": "../../tools/Key.snk",
"nowarn": [ "CS1591" ], "nowarn": [
"CS1591"
],
"xmlDoc": true "xmlDoc": true
}, },
"dependencies": { "dependencies": {
@ -55,8 +57,11 @@
"System.Runtime": "" "System.Runtime": ""
} }
}, },
"dotnet5.4": { "netstandard1.3": {
"imports": "portable-net451+win8", "imports": [
"dotnet5.4",
"portable-net451+win8"
],
"dependencies": { "dependencies": {
"System.Text.Encoding": "4.0.11-*" "System.Text.Encoding": "4.0.11-*"
} }

11
src/Microsoft.AspNetCore.Mvc.Cors/project.json
View File

@ -8,7 +8,9 @@
"compilationOptions": { "compilationOptions": {
"warningsAsErrors": true, "warningsAsErrors": true,
"keyFile": "../../tools/Key.snk", "keyFile": "../../tools/Key.snk",
"nowarn": [ "CS1591" ], "nowarn": [
"CS1591"
],
"xmlDoc": true "xmlDoc": true
}, },
"dependencies": { "dependencies": {
@ -17,8 +19,11 @@
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": {},
"dotnet5.4": { "netstandard1.3": {
"imports": "portable-net451+win8" "imports": [
"dotnet5.4",
"portable-net451+win8"
]
} }
} }
} }

2
src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/DataAnnotationsModelValidatorProvider.cs
View File

@ -3,7 +3,7 @@
using System; using System;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
#if DOTNET5_4 #if NETSTANDARD1_3
using System.Reflection; using System.Reflection;
#endif #endif
using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;

11
src/Microsoft.AspNetCore.Mvc.DataAnnotations/project.json
View File

@ -8,7 +8,9 @@
"compilationOptions": { "compilationOptions": {
"warningsAsErrors": true, "warningsAsErrors": true,
"keyFile": "../../tools/Key.snk", "keyFile": "../../tools/Key.snk",
"nowarn": [ "CS1591" ], "nowarn": [
"CS1591"
],
"xmlDoc": true "xmlDoc": true
}, },
"dependencies": { "dependencies": {
@ -29,8 +31,11 @@
"System.ComponentModel.DataAnnotations": "" "System.ComponentModel.DataAnnotations": ""
} }
}, },
"dotnet5.4": { "netstandard1.3": {
"imports": "portable-net451+win8", "imports": [
"dotnet5.4",
"portable-net451+win8"
],
"dependencies": { "dependencies": {
"System.ComponentModel.Annotations": "4.1.0-*" "System.ComponentModel.Annotations": "4.1.0-*"
} }

11
src/Microsoft.AspNetCore.Mvc.Formatters.Json/project.json
View File

@ -8,7 +8,9 @@
"compilationOptions": { "compilationOptions": {
"warningsAsErrors": true, "warningsAsErrors": true,
"keyFile": "../../tools/Key.snk", "keyFile": "../../tools/Key.snk",
"nowarn": [ "CS1591" ], "nowarn": [
"CS1591"
],
"xmlDoc": true "xmlDoc": true
}, },
"dependencies": { "dependencies": {
@ -21,8 +23,11 @@
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": {},
"dotnet5.4": { "netstandard1.3": {
"imports": "portable-net451+win8" "imports": [
"dotnet5.4",
"portable-net451+win8"
]
} }
} }
} }

11
src/Microsoft.AspNetCore.Mvc.Formatters.Xml/project.json
View File

@ -8,7 +8,9 @@
"compilationOptions": { "compilationOptions": {
"warningsAsErrors": true, "warningsAsErrors": true,
"keyFile": "../../tools/Key.snk", "keyFile": "../../tools/Key.snk",
"nowarn": [ "CS1591" ], "nowarn": [
"CS1591"
],
"xmlDoc": true "xmlDoc": true
}, },
"dependencies": { "dependencies": {
@ -29,8 +31,11 @@
"System.Xml": "" "System.Xml": ""
} }
}, },
"dotnet5.4": { "netstandard1.3": {
"imports": "portable-net451+win8", "imports": [
"dotnet5.4",
"portable-net451+win8"
],
"dependencies": { "dependencies": {
"System.Runtime.Serialization.Xml": "4.1.0-*", "System.Runtime.Serialization.Xml": "4.1.0-*",
"System.Xml.XmlSerializer": "4.0.11-*" "System.Xml.XmlSerializer": "4.0.11-*"

2
src/Microsoft.AspNetCore.Mvc.Localization/LocalizedHtmlString.cs
View File

@ -14,7 +14,7 @@ namespace Microsoft.AspNetCore.Mvc.Localization
/// </summary> /// </summary>
public class LocalizedHtmlString : IHtmlContent public class LocalizedHtmlString : IHtmlContent
{ {
#if DOTNET5_5 #if NETSTANDARD1_4
private static readonly object[] EmptyArguments = Array.Empty<object>(); private static readonly object[] EmptyArguments = Array.Empty<object>();
#else #else
private static readonly object[] EmptyArguments = new object[0]; private static readonly object[] EmptyArguments = new object[0];

11
src/Microsoft.AspNetCore.Mvc.Localization/project.json
View File

@ -4,7 +4,9 @@
"compilationOptions": { "compilationOptions": {
"warningsAsErrors": true, "warningsAsErrors": true,
"keyFile": "../../tools/Key.snk", "keyFile": "../../tools/Key.snk",
"nowarn": [ "CS1591" ], "nowarn": [
"CS1591"
],
"xmlDoc": true "xmlDoc": true
}, },
"dependencies": { "dependencies": {
@ -19,8 +21,11 @@
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": {},
"dotnet5.6": { "netstandard1.5": {
"imports": "portable-net45+win8" "imports": [
"dotnet5.6",
"portable-net45+win8"
]
} }
}, },
"exclude": [ "exclude": [

11
src/Microsoft.AspNetCore.Mvc.Razor.Host/project.json
View File

@ -8,7 +8,9 @@
"compilationOptions": { "compilationOptions": {
"warningsAsErrors": true, "warningsAsErrors": true,
"keyFile": "../../tools/Key.snk", "keyFile": "../../tools/Key.snk",
"nowarn": [ "CS1591" ], "nowarn": [
"CS1591"
],
"xmlDoc": true "xmlDoc": true
}, },
"dependencies": { "dependencies": {
@ -26,14 +28,17 @@
"Microsoft.Extensions.PlatformAbstractions": "1.0.0-*" "Microsoft.Extensions.PlatformAbstractions": "1.0.0-*"
} }
}, },
"dotnet5.4": { "netstandard1.3": {
"dependencies": { "dependencies": {
"Microsoft.Extensions.PlatformAbstractions": "1.0.0-*", "Microsoft.Extensions.PlatformAbstractions": "1.0.0-*",
"System.Collections.Concurrent": "4.0.12-*", "System.Collections.Concurrent": "4.0.12-*",
"System.ComponentModel.TypeConverter": "4.0.1-*", "System.ComponentModel.TypeConverter": "4.0.1-*",
"System.Reflection.Extensions": "4.0.1-*", "System.Reflection.Extensions": "4.0.1-*",
"System.Text.Encoding.Extensions": "4.0.11-*" "System.Text.Encoding.Extensions": "4.0.11-*"
} },
"imports": [
"dotnet5.4"
]
} }
}, },
"exclude": [ "exclude": [

8
src/Microsoft.AspNetCore.Mvc.Razor/Internal/DefaultRoslynCompilationService.cs
View File

@ -9,7 +9,7 @@ using System.IO;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using System.Reflection.PortableExecutable; using System.Reflection.PortableExecutable;
#if DOTNET5_6 #if NETSTANDARD1_5
using System.Runtime.Loader; using System.Runtime.Loader;
#endif #endif
using System.Text; using System.Text;
@ -46,7 +46,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Internal
private readonly ILogger _logger; private readonly ILogger _logger;
private readonly DependencyContext _dependencyContext; private readonly DependencyContext _dependencyContext;
#if DOTNET5_6 #if NETSTANDARD1_5
private readonly RazorLoadContext _razorLoadContext; private readonly RazorLoadContext _razorLoadContext;
#endif #endif
@ -74,7 +74,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Internal
_compilationOptions = optionsAccessor.Value.CompilationOptions; _compilationOptions = optionsAccessor.Value.CompilationOptions;
_logger = loggerFactory.CreateLogger<DefaultRoslynCompilationService>(); _logger = loggerFactory.CreateLogger<DefaultRoslynCompilationService>();
#if DOTNET5_6 #if NETSTANDARD1_5
_razorLoadContext = new RazorLoadContext(); _razorLoadContext = new RazorLoadContext();
#endif #endif
@ -308,7 +308,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Internal
mappedLineSpan.EndLinePosition.Character + 1); mappedLineSpan.EndLinePosition.Character + 1);
} }
#if DOTNET5_6 #if NETSTANDARD1_5
private class RazorLoadContext : AssemblyLoadContext private class RazorLoadContext : AssemblyLoadContext
{ {
protected override Assembly Load(AssemblyName assemblyName) protected override Assembly Load(AssemblyName assemblyName)

11
src/Microsoft.AspNetCore.Mvc.Razor/project.json
View File

@ -8,7 +8,9 @@
"compilationOptions": { "compilationOptions": {
"warningsAsErrors": true, "warningsAsErrors": true,
"keyFile": "../../tools/Key.snk", "keyFile": "../../tools/Key.snk",
"nowarn": [ "CS1591" ], "nowarn": [
"CS1591"
],
"xmlDoc": true "xmlDoc": true
}, },
"dependencies": { "dependencies": {
@ -39,8 +41,11 @@
"System.Threading.Tasks": "" "System.Threading.Tasks": ""
} }
}, },
"dotnet5.6": { "netstandard1.5": {
"imports": "portable-net45+win8", "imports": [
"dotnet5.6",
"portable-net45+win8"
],
"dependencies": { "dependencies": {
"System.Text.Encoding": "4.0.11-*", "System.Text.Encoding": "4.0.11-*",
"System.Runtime.Loader": "4.0.0-*", "System.Runtime.Loader": "4.0.0-*",

11
src/Microsoft.AspNetCore.Mvc.TagHelpers/project.json
View File

@ -8,7 +8,9 @@
"compilationOptions": { "compilationOptions": {
"warningsAsErrors": true, "warningsAsErrors": true,
"keyFile": "../../tools/Key.snk", "keyFile": "../../tools/Key.snk",
"nowarn": [ "CS1591" ], "nowarn": [
"CS1591"
],
"xmlDoc": true "xmlDoc": true
}, },
"dependencies": { "dependencies": {
@ -31,8 +33,11 @@
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": {},
"dotnet5.6": { "netstandard1.5": {
"imports": "portable-net45+win8", "imports": [
"dotnet5.6",
"portable-net45+win8"
],
"dependencies": { "dependencies": {
"System.Security.Cryptography.Algorithms": "4.0.0-*" "System.Security.Cryptography.Algorithms": "4.0.0-*"
} }

2
src/Microsoft.AspNetCore.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 DOTNET5_4 #if NETSTANDARD1_3
using System.Reflection; using System.Reflection;
#endif #endif
using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.AspNetCore.Mvc.ModelBinding;

11
src/Microsoft.AspNetCore.Mvc.ViewFeatures/project.json
View File

@ -8,7 +8,9 @@
"compilationOptions": { "compilationOptions": {
"warningsAsErrors": true, "warningsAsErrors": true,
"keyFile": "../../tools/Key.snk", "keyFile": "../../tools/Key.snk",
"nowarn": [ "CS1591" ], "nowarn": [
"CS1591"
],
"xmlDoc": true "xmlDoc": true
}, },
"dependencies": { "dependencies": {
@ -40,8 +42,11 @@
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": {},
"dotnet5.4": { "netstandard1.3": {
"imports": "portable-net451+win8", "imports": [
"dotnet5.4",
"portable-net451+win8"
]
} }
} }
} }

2
src/Microsoft.AspNetCore.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 DOTNET5_4 #if NETSTANDARD1_3
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using System.Diagnostics; using System.Diagnostics;

2
src/Microsoft.AspNetCore.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 DOTNET5_4 #if NETSTANDARD1_3
using System.Collections.Generic; using System.Collections.Generic;
using System.Net.Http.Headers; using System.Net.Http.Headers;

2
src/Microsoft.AspNetCore.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 DOTNET5_4 #if NETSTANDARD1_3
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.ObjectModel; using System.Collections.ObjectModel;

2
src/Microsoft.AspNetCore.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 DOTNET5_4 #if NETSTANDARD1_3
using Microsoft.AspNetCore.WebUtilities; using Microsoft.AspNetCore.WebUtilities;
using System.Collections; using System.Collections;

2
src/Microsoft.AspNetCore.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 DOTNET5_4 #if NETSTANDARD1_3
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization; using System.Globalization;

2
src/Microsoft.AspNetCore.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 DOTNET5_4 #if NETSTANDARD1_3
using System.Collections.Generic; using System.Collections.Generic;
using System.Net.Http.Headers; using System.Net.Http.Headers;

2
src/Microsoft.AspNetCore.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 DOTNET5_4 #if NETSTANDARD1_3
using System.Collections.Generic; using System.Collections.Generic;

2
src/Microsoft.AspNetCore.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 DOTNET5_4 #if NETSTANDARD1_3
using System.Net.Http.Headers; using System.Net.Http.Headers;

2
src/Microsoft.AspNetCore.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 DOTNET5_4 #if NETSTANDARD1_3
using System.Net.Http.Headers; using System.Net.Http.Headers;

2
src/Microsoft.AspNetCore.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 DOTNET5_4 #if NETSTANDARD1_3
namespace System.Net.Http.Formatting namespace System.Net.Http.Formatting
{ {

2
src/Microsoft.AspNetCore.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 DOTNET5_4 #if NETSTANDARD1_3
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;

2
src/Microsoft.AspNetCore.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 DOTNET5_4 #if NETSTANDARD1_3
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;

2
src/Microsoft.AspNetCore.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 DOTNET5_4 #if NETSTANDARD1_3
using System.Diagnostics; using System.Diagnostics;
using System.Net.Http.Headers; using System.Net.Http.Headers;

2
src/Microsoft.AspNetCore.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 DOTNET5_4 #if NETSTANDARD1_3
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;

2
src/Microsoft.AspNetCore.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 !DOTNET5_4 #if !NETSTANDARD1_3
/// <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

11
src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/project.json
View File

@ -8,7 +8,9 @@
"compilationOptions": { "compilationOptions": {
"warningsAsErrors": true, "warningsAsErrors": true,
"keyFile": "../../tools/Key.snk", "keyFile": "../../tools/Key.snk",
"nowarn": [ "CS1591" ], "nowarn": [
"CS1591"
],
"xmlDoc": true "xmlDoc": true
}, },
"dependencies": { "dependencies": {
@ -29,8 +31,11 @@
"System.Xml": "" "System.Xml": ""
} }
}, },
"dotnet5.4": { "netstandard1.3": {
"imports": "portable-net451+win8", "imports": [
"dotnet5.4",
"portable-net451+win8"
],
"dependencies": { "dependencies": {
"System.Net.Http": "4.0.1-*", "System.Net.Http": "4.0.1-*",
"System.Runtime.Serialization.Xml": "4.1.0-*", "System.Runtime.Serialization.Xml": "4.1.0-*",

11
src/Microsoft.AspNetCore.Mvc/project.json
View File

@ -8,7 +8,9 @@
"compilationOptions": { "compilationOptions": {
"warningsAsErrors": true, "warningsAsErrors": true,
"keyFile": "../../tools/Key.snk", "keyFile": "../../tools/Key.snk",
"nowarn": [ "CS1591" ], "nowarn": [
"CS1591"
],
"xmlDoc": true "xmlDoc": true
}, },
"dependencies": { "dependencies": {
@ -28,8 +30,11 @@
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": {},
"dotnet5.6": { "netstandard1.5": {
"imports": "portable-net451+win8" "imports": [
"dotnet5.6",
"portable-net451+win8"
]
} }
} }
} }

7
test/Microsoft.AspNetCore.Mvc.Abstractions.Test/project.json
View File

@ -13,8 +13,11 @@
"test": "xunit.runner.aspnet" "test": "xunit.runner.aspnet"
}, },
"frameworks": { "frameworks": {
"dnxcore50": { "netstandardapp1.5": {
"imports": "portable-net451+win8", "imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": { "dependencies": {
"moq.netcore": "4.4.0-beta8", "moq.netcore": "4.4.0-beta8",
"dotnet-test-xunit": "1.0.0-dev-*" "dotnet-test-xunit": "1.0.0-dev-*"

7
test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/project.json
View File

@ -18,8 +18,11 @@
"test": "xunit.runner.aspnet" "test": "xunit.runner.aspnet"
}, },
"frameworks": { "frameworks": {
"dnxcore50": { "netstandardapp1.5": {
"imports": "portable-net451+win8", "imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": { "dependencies": {
"moq.netcore": "4.4.0-beta8", "moq.netcore": "4.4.0-beta8",
"dotnet-test-xunit": "1.0.0-dev-*" "dotnet-test-xunit": "1.0.0-dev-*"

2
test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/AttributeRoutingTest.cs
View File

@ -4,7 +4,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text.Encodings.Web; using System.Text.Encodings.Web;
#if DNXCORE50 #if NETSTANDARDAPP1_5
using System.Reflection; using System.Reflection;
#endif #endif
using System.Threading.Tasks; using System.Threading.Tasks;

2
test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/DefaultObjectValidatorTests.cs
View File

@ -5,7 +5,7 @@ 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 DNXCORE50 #if NETSTANDARDAPP1_5
using System.Reflection; using System.Reflection;
#endif #endif
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;

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

@ -9,7 +9,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal
{ {
public class NonDisposableStreamTest public class NonDisposableStreamTest
{ {
#if !DNXCORE50 #if !NETSTANDARDAPP1_5
[Fact] [Fact]
public void InnerStreamIsOpenOnClose() public void InnerStreamIsOpenOnClose()
{ {
@ -49,7 +49,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal
nonDisposableStream.Dispose(); nonDisposableStream.Dispose();
} }
#if !DNXCORE50 #if !NETSTANDARDAPP1_5
[Fact] [Fact]
public void InnerStreamIsNotFlushedOnClose() public void InnerStreamIsNotFlushedOnClose()
{ {

7
test/Microsoft.AspNetCore.Mvc.Core.Test/project.json
View File

@ -27,8 +27,11 @@
"test": "xunit.runner.aspnet" "test": "xunit.runner.aspnet"
}, },
"frameworks": { "frameworks": {
"dnxcore50": { "netstandardapp1.5": {
"imports": "portable-net451+win8", "imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": { "dependencies": {
"moq.netcore": "4.4.0-beta8", "moq.netcore": "4.4.0-beta8",
"dotnet-test-xunit": "1.0.0-dev-*" "dotnet-test-xunit": "1.0.0-dev-*"

7
test/Microsoft.AspNetCore.Mvc.Cors.Test/project.json
View File

@ -20,8 +20,11 @@
"test": "xunit.runner.aspnet" "test": "xunit.runner.aspnet"
}, },
"frameworks": { "frameworks": {
"dnxcore50": { "netstandardapp1.5": {
"imports": "portable-net451+win8", "imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": { "dependencies": {
"moq.netcore": "4.4.0-beta8", "moq.netcore": "4.4.0-beta8",
"dotnet-test-xunit": "1.0.0-dev-*" "dotnet-test-xunit": "1.0.0-dev-*"

7
test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/project.json
View File

@ -20,8 +20,11 @@
"test": "xunit.runner.aspnet" "test": "xunit.runner.aspnet"
}, },
"frameworks": { "frameworks": {
"dnxcore50": { "netstandardapp1.5": {
"imports": "portable-net451+win8", "imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": { "dependencies": {
"moq.netcore": "4.4.0-beta8", "moq.netcore": "4.4.0-beta8",
"dotnet-test-xunit": "1.0.0-dev-*" "dotnet-test-xunit": "1.0.0-dev-*"

4
test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonOutputFormatterTests.cs
View File

@ -219,14 +219,14 @@ namespace Microsoft.AspNetCore.Mvc.Formatters
{ "This is a test 激光這兩個字是甚麼意思 string written using utf-8", "utf-8", true }, { "This is a test 激光這兩個字是甚麼意思 string written using utf-8", "utf-8", true },
{ "This is a test 激光這兩個字是甚麼意思 string written using utf-16", "utf-16", true }, { "This is a test 激光這兩個字是甚麼意思 string written using utf-16", "utf-16", true },
{ "This is a test 激光這兩個字是甚麼意思 string written using utf-32", "utf-32", false }, { "This is a test 激光這兩個字是甚麼意思 string written using utf-32", "utf-32", false },
#if !DNXCORE50 #if !NETSTANDARDAPP1_5
// CoreCLR does not like shift_jis as an encoding. // CoreCLR does not like shift_jis as an encoding.
{ "This is a test 激光這兩個字是甚麼意思 string written using shift_jis", "shift_jis", false }, { "This is a test 激光這兩個字是甚麼意思 string written using shift_jis", "shift_jis", false },
#endif #endif
{ "This is a test æøå string written using iso-8859-1", "iso-8859-1", false }, { "This is a test æøå string written using iso-8859-1", "iso-8859-1", false },
}; };
#if !DNXCORE50 #if !NETSTANDARDAPP1_5
// CoreCLR does not like iso-2022-kr as an encoding. // CoreCLR does not like iso-2022-kr as an encoding.
if (!TestPlatformHelper.IsMono) if (!TestPlatformHelper.IsMono)
{ {

7
test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/project.json
View File

@ -20,8 +20,11 @@
"test": "xunit.runner.aspnet" "test": "xunit.runner.aspnet"
}, },
"frameworks": { "frameworks": {
"dnxcore50": { "netstandardapp1.5": {
"imports": "portable-net451+win8", "imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": { "dependencies": {
"moq.netcore": "4.4.0-beta8", "moq.netcore": "4.4.0-beta8",
"dotnet-test-xunit": "1.0.0-dev-*" "dotnet-test-xunit": "1.0.0-dev-*"

2
test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlDataContractSerializerOutputFormatterTest.cs
View File

@ -427,7 +427,7 @@ namespace Microsoft.AspNetCore.Mvc.Formatters.Xml
} }
} }
#if !DNXCORE50 #if !NETSTANDARDAPP1_5
// DataContractSerializer in CoreCLR does not throw if the declared type is different from the type being // DataContractSerializer in CoreCLR does not throw if the declared type is different from the type being
// serialized. // serialized.
[ConditionalFact] [ConditionalFact]

7
test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/project.json
View File

@ -19,8 +19,11 @@
"test": "xunit.runner.aspnet" "test": "xunit.runner.aspnet"
}, },
"frameworks": { "frameworks": {
"dnxcore50": { "netstandardapp1.5": {
"imports": "portable-net451+win8", "imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": { "dependencies": {
"moq.netcore": "4.4.0-beta8", "moq.netcore": "4.4.0-beta8",
"dotnet-test-xunit": "1.0.0-dev-*" "dotnet-test-xunit": "1.0.0-dev-*"

6
test/Microsoft.AspNetCore.Mvc.FunctionalTests/CompilationOptionsTests.cs
View File

@ -26,10 +26,10 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests
var expected = var expected =
@"This method is running from NET451 @"This method is running from NET451
This method is only defined in NET451"; This method is only defined in NET451";
#elif DNXCORE50 #elif NETSTANDARDAPP1_5
var expected = var expected =
@"This method is running from DNXCORE50 @"This method is running from NETSTANDARDAPP1_5
This method is only defined in DNXCORE50"; This method is only defined in NETSTANDARDAPP1_5";
#endif #endif
// Act // Act

4
test/Microsoft.AspNetCore.Mvc.FunctionalTests/ErrorPageTests.cs
View File

@ -5,7 +5,7 @@ using System.Net;
using System.Net.Http; using System.Net.Http;
using System.Net.Http.Headers; using System.Net.Http.Headers;
using System.Threading.Tasks; using System.Threading.Tasks;
#if !DNXCORE50 #if !NETSTANDARDAPP1_5
using Microsoft.AspNetCore.Testing.xunit; using Microsoft.AspNetCore.Testing.xunit;
#endif #endif
using Xunit; using Xunit;
@ -24,7 +24,7 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests
public HttpClient Client { get; } public HttpClient Client { get; }
#if DNXCORE50 #if NETSTANDARDAPP1_5
[Theory] [Theory]
#else #else
[ConditionalTheory] [ConditionalTheory]

2
test/Microsoft.AspNetCore.Mvc.FunctionalTests/MvcSampleFixture.cs
View File

@ -6,7 +6,7 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests
public class MvcSampleFixture<TStartup> : MvcTestFixture<TStartup> public class MvcSampleFixture<TStartup> : MvcTestFixture<TStartup>
{ {
public MvcSampleFixture() public MvcSampleFixture()
#if DNXCORE50 #if NETSTANDARDAPP1_5
:base("../../../../../../samples/") :base("../../../../../../samples/")
#else #else
: base("../../../../samples/") : base("../../../../samples/")

2
test/Microsoft.AspNetCore.Mvc.FunctionalTests/MvcTestFixture.cs
View File

@ -24,7 +24,7 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests
private readonly TestServer _server; private readonly TestServer _server;
public MvcTestFixture() public MvcTestFixture()
#if DNXCORE50 #if NETSTANDARDAPP1_5
: this(Path.Combine("..", "..", "..", "..", "..", "WebSites")) : this(Path.Combine("..", "..", "..", "..", "..", "WebSites"))
#else #else
: this(Path.Combine("..", "..", "..", "WebSites")) : this(Path.Combine("..", "..", "..", "WebSites"))

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

@ -62,7 +62,7 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests
{ {
typeof(JsonMediaTypeFormatter).FullName, typeof(JsonMediaTypeFormatter).FullName,
typeof(XmlMediaTypeFormatter).FullName, typeof(XmlMediaTypeFormatter).FullName,
#if !DNXCORE50 #if !NETSTANDARDAPP1_5
typeof(FormUrlEncodedMediaTypeFormatter).FullName, typeof(FormUrlEncodedMediaTypeFormatter).FullName,
#endif #endif
}; };

9
test/Microsoft.AspNetCore.Mvc.FunctionalTests/project.json
View File

@ -57,13 +57,16 @@
"test": "xunit.runner.aspnet" "test": "xunit.runner.aspnet"
}, },
"frameworks": { "frameworks": {
"dnxcore50": { "netstandardapp1.5": {
"dependencies": { "dependencies": {
"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-*",
"dotnet-test-xunit": "1.0.0-dev-*" "dotnet-test-xunit": "1.0.0-dev-*"
}, },
"imports": "portable-net451+win8" "imports": [
"dnxcore50",
"portable-net451+win8"
]
}, },
"dnx451": { "dnx451": {
"dependencies": { "dependencies": {
@ -71,7 +74,7 @@
"xunit.runner.aspnet": "2.0.0-aspnet-*" "xunit.runner.aspnet": "2.0.0-aspnet-*"
} }
}, },
"net451": { } "net451": {}
}, },
"exclude": [ "exclude": [
"wwwroot", "wwwroot",

7
test/Microsoft.AspNetCore.Mvc.IntegrationTests/project.json
View File

@ -19,8 +19,11 @@
"test": "xunit.runner.aspnet" "test": "xunit.runner.aspnet"
}, },
"frameworks": { "frameworks": {
"dnxcore50": { "netstandardapp1.5": {
"imports": "portable-net451+win8", "imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": { "dependencies": {
"moq.netcore": "4.4.0-beta8", "moq.netcore": "4.4.0-beta8",
"dotnet-test-xunit": "1.0.0-dev-*" "dotnet-test-xunit": "1.0.0-dev-*"

7
test/Microsoft.AspNetCore.Mvc.Localization.Test/project.json
View File

@ -18,8 +18,11 @@
"test": "xunit.runner.aspnet" "test": "xunit.runner.aspnet"
}, },
"frameworks": { "frameworks": {
"dnxcore50": { "netstandardapp1.5": {
"imports": "portable-net451+win8", "imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": { "dependencies": {
"moq.netcore": "4.4.0-beta8", "moq.netcore": "4.4.0-beta8",
"dotnet-test-xunit": "1.0.0-dev-*" "dotnet-test-xunit": "1.0.0-dev-*"

7
test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/project.json
View File

@ -25,8 +25,11 @@
"keyFile": "../../tools/Key.snk" "keyFile": "../../tools/Key.snk"
}, },
"frameworks": { "frameworks": {
"dnxcore50": { "netstandardapp1.5": {
"imports": "portable-net451+win8", "imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": { "dependencies": {
"moq.netcore": "4.4.0-beta8", "moq.netcore": "4.4.0-beta8",
"dotnet-test-xunit": "1.0.0-dev-*" "dotnet-test-xunit": "1.0.0-dev-*"

7
test/Microsoft.AspNetCore.Mvc.Razor.Test/project.json
View File

@ -33,8 +33,11 @@
"test": "xunit.runner.aspnet" "test": "xunit.runner.aspnet"
}, },
"frameworks": { "frameworks": {
"dnxcore50": { "netstandardapp1.5": {
"imports": "portable-net451+win8", "imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": { "dependencies": {
"moq.netcore": "4.4.0-beta8", "moq.netcore": "4.4.0-beta8",
"dotnet-test-xunit": "1.0.0-dev-*" "dotnet-test-xunit": "1.0.0-dev-*"

7
test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/project.json
View File

@ -21,8 +21,11 @@
"test": "xunit.runner.aspnet" "test": "xunit.runner.aspnet"
}, },
"frameworks": { "frameworks": {
"dnxcore50": { "netstandardapp1.5": {
"imports": "portable-net451+win8", "imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": { "dependencies": {
"moq.netcore": "4.4.0-beta8", "moq.netcore": "4.4.0-beta8",
"dotnet-test-xunit": "1.0.0-dev-*" "dotnet-test-xunit": "1.0.0-dev-*"

7
test/Microsoft.AspNetCore.Mvc.Test/project.json
View File

@ -15,8 +15,11 @@
"test": "xunit.runner.aspnet" "test": "xunit.runner.aspnet"
}, },
"frameworks": { "frameworks": {
"dnxcore50": { "netstandardapp1.5": {
"imports": "portable-net451+win8", "imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": { "dependencies": {
"moq.netcore": "4.4.0-beta8", "moq.netcore": "4.4.0-beta8",
"dotnet-test-xunit": "1.0.0-dev-*" "dotnet-test-xunit": "1.0.0-dev-*"

7
test/Microsoft.AspNetCore.Mvc.TestCommon/project.json
View File

@ -3,10 +3,13 @@
"shared": "**/*.cs", "shared": "**/*.cs",
"frameworks": { "frameworks": {
"net451": {}, "net451": {},
"dotnet5.4": { "netstandard1.3": {
"dependencies": { "dependencies": {
"System.Runtime": "4.1.0-*" "System.Runtime": "4.1.0-*"
} },
"imports": [
"dotnet5.4"
]
} }
} }
} }

7
test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.Sources/project.json
View File

@ -3,10 +3,13 @@
"shared": "**/*.cs", "shared": "**/*.cs",
"frameworks": { "frameworks": {
"net451": {}, "net451": {},
"dotnet5.4": { "netstandard1.3": {
"dependencies": { "dependencies": {
"System.Runtime": "4.1.0-*" "System.Runtime": "4.1.0-*"
} },
"imports": [
"dotnet5.4"
]
} }
} }
} }

7
test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/project.json
View File

@ -26,8 +26,11 @@
"test": "xunit.runner.aspnet" "test": "xunit.runner.aspnet"
}, },
"frameworks": { "frameworks": {
"dnxcore50": { "netstandardapp1.5": {
"imports": "portable-net451+win8", "imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": { "dependencies": {
"moq.netcore": "4.4.0-beta8", "moq.netcore": "4.4.0-beta8",
"dotnet-test-xunit": "1.0.0-dev-*" "dotnet-test-xunit": "1.0.0-dev-*"

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

@ -149,7 +149,7 @@ namespace System.Net.Http.Formatting
{ {
get get
{ {
#if !DNXCORE50 #if !NETSTANDARDAPP1_5
// 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);
@ -176,7 +176,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 !DNXCORE50 #if !NETSTANDARDAPP1_5
{ 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 },
@ -187,7 +187,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 !DNXCORE50 #if !NETSTANDARDAPP1_5
{ new List<MediaTypeFormatterMatch>() { matchMapping05, matchMapping10 }, matchMapping10 }, { new List<MediaTypeFormatterMatch>() { matchMapping05, matchMapping10 }, matchMapping10 },
{ new List<MediaTypeFormatterMatch>() { matchMapping10, matchMapping05 }, matchMapping10 }, { new List<MediaTypeFormatterMatch>() { matchMapping10, matchMapping05 }, matchMapping10 },
@ -251,7 +251,7 @@ namespace System.Net.Http.Formatting
Assert.Null(result); Assert.Null(result);
} }
#if !DNXCORE50 #if !NETSTANDARDAPP1_5
[Fact] [Fact]
public void Negotiate_MediaTypeMappingTakesPrecedenceOverAcceptHeader() public void Negotiate_MediaTypeMappingTakesPrecedenceOverAcceptHeader()
@ -359,7 +359,7 @@ namespace System.Net.Http.Formatting
Assert.IsType<JsonMediaTypeFormatter>(result.Formatter); Assert.IsType<JsonMediaTypeFormatter>(result.Formatter);
} }
#if !DNXCORE50 #if !NETSTANDARDAPP1_5
[Fact] [Fact]
public void Negotiate_RespectsFormatterOrdering_ForXhrRequestThatDoesNotSpecifyAcceptHeaders() public void Negotiate_RespectsFormatterOrdering_ForXhrRequestThatDoesNotSpecifyAcceptHeaders()
@ -458,7 +458,7 @@ namespace System.Net.Http.Formatting
} }
} }
#if !DNXCORE50 #if !NETSTANDARDAPP1_5
[Fact] [Fact]
public void MatchMediaTypeMapping_ReturnsMatch() public void MatchMediaTypeMapping_ReturnsMatch()
@ -810,7 +810,7 @@ namespace System.Net.Http.Formatting
} }
} }
#if !DNXCORE50 #if !NETSTANDARDAPP1_5
private class MyMediaTypeMapping : MediaTypeMapping private class MyMediaTypeMapping : MediaTypeMapping
{ {

2
test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/HttpRequestMessage/HttpRequestMessageExtensionsTest.cs
View File

@ -282,7 +282,7 @@ namespace System.Net.Http
Assert.Equal("bin/baz", response.Content.Headers.ContentType.MediaType); Assert.Equal("bin/baz", response.Content.Headers.ContentType.MediaType);
} }
#if !DNXCORE50 #if !NETSTANDARDAPP1_5
// API doesn't exist in CoreCLR. // API doesn't exist in CoreCLR.
[Fact] [Fact]
public void CreateErrorResponseRangeNotSatisfiable_SetsCorrectStatusCodeAndContentRangeHeader() public void CreateErrorResponseRangeNotSatisfiable_SetsCorrectStatusCodeAndContentRangeHeader()

2
test/Microsoft.AspNetCore.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 !DNXCORE50 #if !NETSTANDARDAPP1_5
public new MediaTypeFormatterMatch MatchMediaTypeMapping(HttpRequestMessage request, MediaTypeFormatter formatter) public new MediaTypeFormatterMatch MatchMediaTypeMapping(HttpRequestMessage request, MediaTypeFormatter formatter)
{ {

2
test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/Mocks/MockMediaTypeMapping.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 !NETSTANDARDAPP1_5
using System.Net.Http.Headers; using System.Net.Http.Headers;

7
test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/project.json
View File

@ -16,8 +16,11 @@
"test": "xunit.runner.aspnet" "test": "xunit.runner.aspnet"
}, },
"frameworks": { "frameworks": {
"dnxcore50": { "netstandardapp1.5": {
"imports": "portable-net451+win8", "imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": { "dependencies": {
"moq.netcore": "4.4.0-beta8", "moq.netcore": "4.4.0-beta8",
"dotnet-test-xunit": "1.0.0-dev-*" "dotnet-test-xunit": "1.0.0-dev-*"

7
test/WebSites/ApiExplorerWebSite/project.json
View File

@ -16,8 +16,11 @@
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": {},
"dnxcore50": { "netstandardapp1.5": {
"imports": "portable-net451+win8" "imports": [
"dnxcore50",
"portable-net451+win8"
]
} }
} }
} }

7
test/WebSites/ApplicationModelWebSite/project.json
View File

@ -15,8 +15,11 @@
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": {},
"dnxcore50": { "netstandardapp1.5": {
"imports": "portable-net451+win8" "imports": [
"dnxcore50",
"portable-net451+win8"
]
} }
} }
} }

7
test/WebSites/BasicWebSite/project.json
View File

@ -17,8 +17,11 @@
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": {},
"dnxcore50": { "netstandardapp1.5": {
"imports": "portable-net451+win8" "imports": [
"dnxcore50",
"portable-net451+win8"
]
} }
}, },
"exclude": [ "exclude": [

7
test/WebSites/ControllersFromServicesClassLibrary/project.json
View File

@ -5,8 +5,11 @@
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": {},
"dnxcore50": { "netstandardapp1.5": {
"imports": "portable-net451+win8" "imports": [
"dnxcore50",
"portable-net451+win8"
]
} }
} }
} }

7
test/WebSites/ControllersFromServicesWebSite/project.json
View File

@ -16,8 +16,11 @@
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": {},
"dnxcore50": { "netstandardapp1.5": {
"imports": "portable-net451+win8" "imports": [
"dnxcore50",
"portable-net451+win8"
]
} }
} }
} }

7
test/WebSites/CorsWebSite/project.json
View File

@ -17,8 +17,11 @@
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": {},
"dnxcore50": { "netstandardapp1.5": {
"imports": "portable-net451+win8" "imports": [
"dnxcore50",
"portable-net451+win8"
]
} }
} }
} }

7
test/WebSites/ErrorPageMiddlewareWebSite/project.json
View File

@ -16,8 +16,11 @@
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": {},
"dnxcore50": { "netstandardapp1.5": {
"imports": "portable-net451+win8" "imports": [
"dnxcore50",
"portable-net451+win8"
]
} }
} }
} }

7
test/WebSites/FilesWebSite/project.json
View File

@ -17,8 +17,11 @@
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": {},
"dnxcore50": { "netstandardapp1.5": {
"imports": "portable-net451+win8" "imports": [
"dnxcore50",
"portable-net451+win8"
]
} }
} }
} }

7
test/WebSites/FiltersWebSite/project.json
View File

@ -17,8 +17,11 @@
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": {},
"dnxcore50": { "netstandardapp1.5": {
"imports": "portable-net451+win8" "imports": [
"dnxcore50",
"portable-net451+win8"
]
} }
} }
} }

7
test/WebSites/FormatterWebSite/project.json
View File

@ -16,8 +16,11 @@
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": {},
"dnxcore50": { "netstandardapp1.5": {
"imports": "portable-net451+win8" "imports": [
"dnxcore50",
"portable-net451+win8"
]
} }
} }
} }

7
test/WebSites/HtmlGenerationWebSite/project.json
View File

@ -15,8 +15,11 @@
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": {},
"dnxcore50": { "netstandardapp1.5": {
"imports": "portable-net451+win8" "imports": [
"dnxcore50",
"portable-net451+win8"
]
} }
} }
} }

9
test/WebSites/Microsoft.AspNetCore.Mvc.TestConfiguration/project.json
View File

@ -8,9 +8,12 @@
"Microsoft.NETCore.Platforms": "1.0.1-*" "Microsoft.NETCore.Platforms": "1.0.1-*"
}, },
"frameworks": { "frameworks": {
"net451": { }, "net451": {},
"dnxcore50": { "netstandardapp1.5": {
"imports": "portable-net451+win8" "imports": [
"dnxcore50",
"portable-net451+win8"
]
} }
} }
} }

7
test/WebSites/RazorPageExecutionInstrumentationWebSite/project.json
View File

@ -16,8 +16,11 @@
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": {},
"dnxcore50": { "netstandardapp1.5": {
"imports": "portable-net451+win8" "imports": [
"dnxcore50",
"portable-net451+win8"
]
} }
} }
} }

10
test/WebSites/RazorWebSite/Services/FrameworkSpecificHelper.cs
View File

@ -9,8 +9,8 @@ namespace RazorWebSite
{ {
#if NET451 || DNX451 #if NET451 || DNX451
return "This method is running from NET451"; return "This method is running from NET451";
#elif DNXCORE50 #elif NETSTANDARDAPP1_5
return "This method is running from DNXCORE50"; return "This method is running from NETSTANDARDAPP1_5";
#endif #endif
} }
@ -21,10 +21,10 @@ namespace RazorWebSite
} }
#endif #endif
#if DNXCORE50_CUSTOM_DEFINE #if NETSTANDARDAPP1_5_CUSTOM_DEFINE
public string ExecuteDnxCore50Operation() public string ExecuteNetStandardApp1_5Operation()
{ {
return "This method is only defined in DNXCORE50"; return "This method is only defined in NETSTANDARDAPP1_5";
} }
#endif #endif
} }

4
test/WebSites/RazorWebSite/Views/ViewsConsumingCompilationOptions/_Partial.cshtml
View File

@ -4,8 +4,8 @@
#if NET451_CUSTOM_DEFINE #if NET451_CUSTOM_DEFINE
MyHelper.ExecuteNet451Operation(); MyHelper.ExecuteNet451Operation();
#endif #endif
#if DNXCORE50_CUSTOM_DEFINE #if NETSTANDARDAPP1_5_CUSTOM_DEFINE
MyHelper.ExecuteDnxCore50Operation(); MyHelper.ExecuteNetStandardApp1_5Operation();
#endif #endif
} }
@value @value

9
test/WebSites/RazorWebSite/project.json
View File

@ -23,13 +23,16 @@
] ]
} }
}, },
"dnxcore50": { "netstandardapp1.5": {
"compilationOptions": { "compilationOptions": {
"define": [ "define": [
"DNXCORE50_CUSTOM_DEFINE" "NETSTANDARDAPP1_5_CUSTOM_DEFINE"
] ]
}, },
"imports": "portable-net451+win8" "imports": [
"dnxcore50",
"portable-net451+win8"
]
} }
} }
} }

7
test/WebSites/RoutingWebSite/project.json
View File

@ -15,8 +15,11 @@
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": {},
"dnxcore50": { "netstandardapp1.5": {
"imports": "portable-net451+win8" "imports": [
"dnxcore50",
"portable-net451+win8"
]
} }
} }
} }

7
test/WebSites/SimpleWebSite/project.json
View File

@ -13,8 +13,11 @@
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": {},
"dnxcore50": { "netstandardapp1.5": {
"imports": "portable-net451+win8" "imports": [
"dnxcore50",
"portable-net451+win8"
]
} }
} }
} }

7
test/WebSites/TagHelpersWebSite/project.json
View File

@ -18,8 +18,11 @@
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": {},
"dnxcore50": { "netstandardapp1.5": {
"imports": "portable-net451+win8" "imports": [
"dnxcore50",
"portable-net451+win8"
]
} }
} }
} }

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