Reacting to CoreCLR package changes

2016-03-22 14:49:43 -07:00 · 2016-03-22 14:49:43 -07:00 · 06289945d0
parent a78f77afde
commit 06289945d0
56 changed files with 48 additions and 231 deletions
--- a/samples/MvcSandbox/Startup.cs
+++ b/samples/MvcSandbox/Startup.cs
@ -14,9 +14,6 @@ namespace MvcSandbox
        public void ConfigureServices(IServiceCollection services)
        {
            services.AddMvc();
-#if DNX451
-            services.AddMvcDnx();
-#endif
        }

        // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
--- a/samples/MvcSandbox/project.json
+++ b/samples/MvcSandbox/project.json
@ -21,12 +21,6 @@
    "dotnet-razor-tooling": "1.0.0-*"
  },
  "frameworks": {
-    "dnx451": {
-      "dependencies": {
-        "Microsoft.AspNetCore.Mvc.Dnx": "1.0.0-*",
-        "System.Runtime": "4.1.0-*"
-      }
-    },
    "net451": { },
    "netstandardapp1.5": {
      "imports": [
--- a/src/Microsoft.AspNetCore.Mvc.ApiExplorer/DefaultApiDescriptionProvider.cs
+++ b/src/Microsoft.AspNetCore.Mvc.ApiExplorer/DefaultApiDescriptionProvider.cs
@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-#if NETSTANDARD1_3
+#if NETSTANDARD1_5
 using System.Reflection;
 #endif
 using System.Threading.Tasks;
--- a/src/Microsoft.AspNetCore.Mvc.ApiExplorer/project.json
+++ b/src/Microsoft.AspNetCore.Mvc.ApiExplorer/project.json
@ -26,9 +26,9 @@
  },
  "frameworks": {
    "net451": {},
-    "netstandard1.3": {
+    "netstandard1.5": {
      "imports": [
-        "dotnet5.4",
+        "dotnet5.6",
        "portable-net451+win8"
      ]
    }
--- a/src/Microsoft.AspNetCore.Mvc.Core/BindAttribute.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Core/BindAttribute.cs
@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-#if NETSTANDARD1_3
+#if NETSTANDARD1_5
 using System.Reflection;
 #endif
 using Microsoft.AspNetCore.Mvc.Core;
--- a/src/Microsoft.AspNetCore.Mvc.Core/Filters/FilterCollection.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Core/Filters/FilterCollection.cs
@ -3,7 +3,7 @@

 using System;
 using System.Collections.ObjectModel;
-#if NETSTANDARD1_3
+#if NETSTANDARD1_5
 using System.Reflection;
 #endif
 using Microsoft.AspNetCore.Mvc.Core;
--- a/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerActionInvoker.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerActionInvoker.cs
@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-#if NETSTANDARD1_3
+#if NETSTANDARD1_5
 using System.Reflection;
 #endif
 using System.Threading.Tasks;
--- a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/DictionaryModelBinder.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/DictionaryModelBinder.cs
@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-#if NETSTANDARD1_3
+#if NETSTANDARD1_5
 using System.Reflection;
 #endif
 using System.Threading.Tasks;
--- a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/FormFileModelBinder.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/FormFileModelBinder.cs
@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.Linq;
-#if NETSTANDARD1_3
+#if NETSTANDARD1_5
 using System.Reflection;
 #endif
 using System.Threading.Tasks;
--- a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/GenericModelBinder.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/GenericModelBinder.cs
@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-#if NETSTANDARD1_3
+#if NETSTANDARD1_5
 using System.Reflection;
 #endif
 using System.Threading.Tasks;
--- a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/HeaderModelBinder.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/HeaderModelBinder.cs
@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

 using System;
-#if NETSTANDARD1_3
+#if NETSTANDARD1_5
 using System.Reflection;
 #endif
 using System.Threading.Tasks;
--- a/src/Microsoft.AspNetCore.Mvc.Core/project.json
+++ b/src/Microsoft.AspNetCore.Mvc.Core/project.json
@ -52,9 +52,9 @@
  },
  "frameworks": {
    "net451": { },
-    "netstandard1.3": {
+    "netstandard1.5": {
      "imports": [
-        "dotnet5.4",
+        "dotnet5.6",
        "portable-net451+win8"
      ],
      "dependencies": {
--- a/src/Microsoft.AspNetCore.Mvc.Cors/project.json
+++ b/src/Microsoft.AspNetCore.Mvc.Cors/project.json
@ -19,9 +19,9 @@
  },
  "frameworks": {
    "net451": {},
-    "netstandard1.3": {
+    "netstandard1.5": {
      "imports": [
-        "dotnet5.4",
+        "dotnet5.6",
        "portable-net451+win8"
      ]
    }
--- a/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/DataAnnotationsModelValidatorProvider.cs
+++ b/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/DataAnnotationsModelValidatorProvider.cs
@ -3,7 +3,7 @@

 using System;
 using System.ComponentModel.DataAnnotations;
-#if NETSTANDARD1_3
+#if NETSTANDARD1_5
 using System.Reflection;
 #endif
 using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
--- a/src/Microsoft.AspNetCore.Mvc.DataAnnotations/project.json
+++ b/src/Microsoft.AspNetCore.Mvc.DataAnnotations/project.json
@ -31,9 +31,9 @@
        "System.ComponentModel.DataAnnotations": ""
      }
    },
-    "netstandard1.3": {
+    "netstandard1.5": {
      "imports": [
-        "dotnet5.4",
+        "dotnet5.6",
        "portable-net451+win8"
      ],
      "dependencies": {
--- a/src/Microsoft.AspNetCore.Mvc.Formatters.Json/project.json
+++ b/src/Microsoft.AspNetCore.Mvc.Formatters.Json/project.json
@ -23,9 +23,9 @@
  },
  "frameworks": {
    "net451": {},
-    "netstandard1.3": {
+    "netstandard1.5": {
      "imports": [
-        "dotnet5.4",
+        "dotnet5.6",
        "portable-net451+win8"
      ]
    }
--- a/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/project.json
+++ b/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/project.json
@ -31,9 +31,9 @@
        "System.Xml": ""
      }
    },
-    "netstandard1.3": {
+    "netstandard1.5": {
      "imports": [
-        "dotnet5.4",
+        "dotnet5.6",
        "portable-net451+win8"
      ],
      "dependencies": {
--- a/src/Microsoft.AspNetCore.Mvc.Razor.Host/project.json
+++ b/src/Microsoft.AspNetCore.Mvc.Razor.Host/project.json
@ -24,7 +24,7 @@
  },
  "frameworks": {
    "net451": { },
-    "netstandard1.3": {
+    "netstandard1.5": {
      "dependencies": {
        "System.Collections.Concurrent": "4.0.12-*",
        "System.ComponentModel.TypeConverter": "4.0.1-*",
@ -32,7 +32,7 @@
        "System.Text.Encoding.Extensions": "4.0.11-*"
      },
      "imports": [
-        "dotnet5.4"
+        "dotnet5.6"
      ]
    }
  },
--- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewDataDictionary.cs
+++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewDataDictionary.cs
@ -5,7 +5,7 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Globalization;
-#if NETSTANDARD1_3
+#if NETSTANDARD1_5
 using System.Reflection;
 #endif
 using Microsoft.AspNetCore.Mvc.ModelBinding;
--- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/project.json
+++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/project.json
@ -42,9 +42,9 @@
  },
  "frameworks": {
    "net451": {},
-    "netstandard1.3": {
+    "netstandard1.5": {
      "imports": [
-        "dotnet5.4",
+        "dotnet5.6",
        "portable-net451+win8"
      ]
    }
--- a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/CollectionExtensions.cs
+++ b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/CollectionExtensions.cs
@ -1,7 +1,7 @@
 // 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.

-#if NETSTANDARD1_3
+#if NETSTANDARD1_5

 using System.Collections.ObjectModel;
 using System.Diagnostics;
--- a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/ContentNegotiationResult.cs
+++ b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/ContentNegotiationResult.cs
@ -1,7 +1,7 @@
 // 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.

-#if NETSTANDARD1_3
+#if NETSTANDARD1_5

 using System.Collections.Generic;
 using System.Net.Http.Headers;
--- a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/DefaultContentNegotiator.cs
+++ b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/DefaultContentNegotiator.cs
@ -1,7 +1,7 @@
 // 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.

-#if NETSTANDARD1_3
+#if NETSTANDARD1_5

 using System.Collections.Generic;
 using System.Collections.ObjectModel;
--- a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/FormDataCollection.cs
+++ b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/FormDataCollection.cs
@ -1,7 +1,7 @@
 // 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.

-#if NETSTANDARD1_3
+#if NETSTANDARD1_5

 using Microsoft.AspNetCore.WebUtilities;
 using System.Collections;
--- a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/FormattingUtilities.cs
+++ b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/FormattingUtilities.cs
@ -1,7 +1,7 @@
 // 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.

-#if NETSTANDARD1_3
+#if NETSTANDARD1_5

 using System.Collections.Generic;
 using System.Globalization;
--- a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/IContentNegotiator.cs
+++ b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/IContentNegotiator.cs
@ -1,7 +1,7 @@
 // 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.

-#if NETSTANDARD1_3
+#if NETSTANDARD1_5

 using System.Collections.Generic;
 using System.Net.Http.Headers;
--- a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/ListWrapperCollection.cs
+++ b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/ListWrapperCollection.cs
@ -1,7 +1,7 @@
 // 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.

-#if NETSTANDARD1_3
+#if NETSTANDARD1_5

 using System.Collections.Generic;

--- a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeConstants.cs
+++ b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeConstants.cs
@ -1,7 +1,7 @@
 // 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.

-#if NETSTANDARD1_3
+#if NETSTANDARD1_5

 using System.Net.Http.Headers;

--- a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeFormatterMatch.cs
+++ b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeFormatterMatch.cs
@ -1,7 +1,7 @@
 // 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.

-#if NETSTANDARD1_3
+#if NETSTANDARD1_5

 using System.Net.Http.Headers;

--- a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeFormatterMatchRanking.cs
+++ b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeFormatterMatchRanking.cs
@ -1,7 +1,7 @@
 // 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.

-#if NETSTANDARD1_3
+#if NETSTANDARD1_5

 namespace System.Net.Http.Formatting
 {
--- a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeHeaderValueExtensions.cs
+++ b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeHeaderValueExtensions.cs
@ -1,7 +1,7 @@
 // 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.

-#if NETSTANDARD1_3
+#if NETSTANDARD1_5

 using System.Collections.Generic;
 using System.Diagnostics;
--- a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeWithQualityHeaderComparer.cs
+++ b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/MediaTypeWithQualityHeaderComparer.cs
@ -1,7 +1,7 @@
 // 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.

-#if NETSTANDARD1_3
+#if NETSTANDARD1_5

 using System.Collections.Generic;
 using System.Diagnostics;
--- a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/ParsedMediaTypeHeaderValue.cs
+++ b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/ParsedMediaTypeHeaderValue.cs
@ -1,7 +1,7 @@
 // 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.

-#if NETSTANDARD1_3
+#if NETSTANDARD1_5

 using System.Diagnostics;
 using System.Net.Http.Headers;
--- a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/StringWithQualityHeaderValueComparer.cs
+++ b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ContentNegotiator/StringWithQualityHeaderValueComparer.cs
@ -1,7 +1,7 @@
 // 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.

-#if NETSTANDARD1_3
+#if NETSTANDARD1_5

 using System.Collections.Generic;
 using System.Diagnostics;
--- a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/HttpRequestMessage/HttpRequestMessageExtensions.cs
+++ b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/HttpRequestMessage/HttpRequestMessageExtensions.cs
@ -19,7 +19,7 @@ namespace System.Net.Http
    /// </summary>
    public static class HttpRequestMessageExtensions
    {
-#if !NETSTANDARD1_3
+#if !NETSTANDARD1_5

        /// <summary>
        /// Helper method for creating an <see cref="HttpResponseMessage"/> message with a "416 (Requested Range Not
--- a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/project.json
+++ b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/project.json
@ -31,9 +31,9 @@
        "System.Xml": ""
      }
    },
-    "netstandard1.3": {
+    "netstandard1.5": {
      "imports": [
-        "dotnet5.4",
+        "dotnet5.6",
        "portable-net451+win8"
      ],
      "dependencies": {
--- a/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/project.json
+++ b/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/project.json
@ -9,9 +9,6 @@
    "Microsoft.NETCore.Platforms": "1.0.1-*"
  },
  "testRunner": "xunit",
-  "commands": {
-    "test": "xunit.runner.aspnet"
-  },
  "frameworks": {
    "netstandardapp1.5": {
      "imports": [
@ -23,13 +20,6 @@
        "dotnet-test-xunit": "1.0.0-dev-*"
      }
    },
-    "dnx451": {
-      "dependencies": {
-        "Moq": "4.2.1312.1622",
-        "System.Runtime": "4.1.0-*",
-        "xunit.runner.aspnet": "2.0.0-aspnet-*"
-      }
-    },
    "net451": {
      "dependencies": {
        "Moq": "4.2.1312.1622"
--- a/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/project.json
+++ b/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/project.json
@ -14,9 +14,6 @@
    "Microsoft.NETCore.Platforms": "1.0.1-*"
  },
  "testRunner": "xunit",
-  "commands": {
-    "test": "xunit.runner.aspnet"
-  },
  "frameworks": {
    "netstandardapp1.5": {
      "imports": [
@ -28,13 +25,6 @@
        "dotnet-test-xunit": "1.0.0-dev-*"
      }
    },
-    "dnx451": {
-      "dependencies": {
-        "Moq": "4.2.1312.1622",
-        "System.Runtime": "4.1.0-*",
-        "xunit.runner.aspnet": "2.0.0-aspnet-*"
-      }
-    },
    "net451": {
      "dependencies": {
        "Moq": "4.2.1312.1622"
--- a/test/Microsoft.AspNetCore.Mvc.Core.Test/project.json
+++ b/test/Microsoft.AspNetCore.Mvc.Core.Test/project.json
@ -24,9 +24,6 @@
    "Microsoft.NETCore.Platforms": "1.0.1-*"
  },
  "testRunner": "xunit",
-  "commands": {
-    "test": "xunit.runner.aspnet"
-  },
  "frameworks": {
    "netstandardapp1.5": {
      "imports": [
@ -38,13 +35,6 @@
        "dotnet-test-xunit": "1.0.0-dev-*"
      }
    },
-    "dnx451": {
-      "dependencies": {
-        "Moq": "4.2.1312.1622",
-        "System.Runtime": "4.1.0-*",
-        "xunit.runner.aspnet": "2.0.0-aspnet-*"
-      }
-    },
    "net451": {
      "dependencies": {
        "Moq": "4.2.1312.1622"
--- a/test/Microsoft.AspNetCore.Mvc.Cors.Test/project.json
+++ b/test/Microsoft.AspNetCore.Mvc.Cors.Test/project.json
@ -16,9 +16,6 @@
    "Microsoft.NETCore.Platforms": "1.0.1-*"
  },
  "testRunner": "xunit",
-  "commands": {
-    "test": "xunit.runner.aspnet"
-  },
  "frameworks": {
    "netstandardapp1.5": {
      "imports": [
@ -30,13 +27,6 @@
        "dotnet-test-xunit": "1.0.0-dev-*"
      }
    },
-    "dnx451": {
-      "dependencies": {
-        "Moq": "4.2.1312.1622",
-        "System.Runtime": "4.1.0-*",
-        "xunit.runner.aspnet": "2.0.0-aspnet-*"
-      }
-    },
    "net451": {
      "dependencies": {
        "Moq": "4.2.1312.1622"
--- a/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/project.json
+++ b/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/project.json
@ -16,9 +16,6 @@
    "Microsoft.NETCore.Platforms": "1.0.1-*"
  },
  "testRunner": "xunit",
-  "commands": {
-    "test": "xunit.runner.aspnet"
-  },
  "frameworks": {
    "netstandardapp1.5": {
      "imports": [
@ -30,13 +27,6 @@
        "dotnet-test-xunit": "1.0.0-dev-*"
      }
    },
-    "dnx451": {
-      "dependencies": {
-        "Moq": "4.2.1312.1622",
-        "System.Runtime": "4.1.0-*",
-        "xunit.runner.aspnet": "2.0.0-aspnet-*"
-      }
-    },
    "net451": {
      "dependencies": {
        "Moq": "4.2.1312.1622"
--- a/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/project.json
+++ b/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/project.json
@ -16,9 +16,6 @@
    "Microsoft.NETCore.Platforms": "1.0.1-*"
  },
  "testRunner": "xunit",
-  "commands": {
-    "test": "xunit.runner.aspnet"
-  },
  "frameworks": {
    "netstandardapp1.5": {
      "imports": [
@ -30,13 +27,6 @@
        "dotnet-test-xunit": "1.0.0-dev-*"
      }
    },
-    "dnx451": {
-      "dependencies": {
-        "Moq": "4.2.1312.1622",
-        "System.Runtime": "4.1.0-*",
-        "xunit.runner.aspnet": "2.0.0-aspnet-*"
-      }
-    },
    "net451": {
      "dependencies": {
        "Moq": "4.2.1312.1622"
--- a/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlSerializerInputFormatterTest.cs
+++ b/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlSerializerInputFormatterTest.cs
@ -1,7 +1,7 @@
 // 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.

-#if DNX451
+#if NET451
 using System;
 using System.Collections.Generic;
 using System.IO;
--- a/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/project.json
+++ b/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/project.json
@ -15,9 +15,6 @@
    "Microsoft.NETCore.Platforms": "1.0.1-*"
  },
  "testRunner": "xunit",
-  "commands": {
-    "test": "xunit.runner.aspnet"
-  },
  "frameworks": {
    "netstandardapp1.5": {
      "imports": [
@ -29,13 +26,6 @@
        "dotnet-test-xunit": "1.0.0-dev-*"
      }
    },
-    "dnx451": {
-      "dependencies": {
-        "Moq": "4.2.1312.1622",
-        "System.Runtime": "4.1.0-*",
-        "xunit.runner.aspnet": "2.0.0-aspnet-*"
-      }
-    },
    "net451": {
      "dependencies": {
        "Moq": "4.2.1312.1622"
--- a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/CompilationOptionsTests.cs
+++ b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/CompilationOptionsTests.cs
@ -22,7 +22,7 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests
        public async Task CompilationOptions_AreUsedByViewsAndPartials()
        {
            // Arrange
-#if NET451 || DNX451
+#if NET451
            var expected =
@"This method is running from NET451
 This method is only defined in NET451";
--- a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/MvcTestFixture.cs
+++ b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/MvcTestFixture.cs
@ -11,9 +11,6 @@ using Microsoft.AspNetCore.Mvc.Razor.Compilation;
 using Microsoft.AspNetCore.Mvc.Razor.Internal;
 using Microsoft.AspNetCore.TestHost;
 using Microsoft.AspNetCore.Testing;
-#if DNX451
-using Microsoft.Extensions.CompilationAbstractions;
-#endif
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.PlatformAbstractions;

@ -59,26 +56,13 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests
        {
            var startupAssembly = typeof(TStartup).GetTypeInfo().Assembly;
            var applicationName = startupAssembly.GetName().Name;
-#if DNX451
-            var libraryManager = DnxPlatformServices.Default.LibraryManager;
-            var library = libraryManager.GetLibrary(applicationName);
-            return Path.GetDirectoryName(library.Path);
-#else
            var applicationBasePath = PlatformServices.Default.Application.ApplicationBasePath;
            return Path.GetFullPath(Path.Combine(applicationBasePath, relativePath, applicationName));
-#endif
        }

        protected virtual void InitializeServices(IServiceCollection services)
        {
            var startupAssembly = typeof(TStartup).GetTypeInfo().Assembly;
-            var applicationName = startupAssembly.GetName().Name;
-
-            var applicationEnvironment = PlatformServices.Default.Application;
-#if DNX451
-            services.AddSingleton(CompilationServices.Default.LibraryExporter);
-            services.AddSingleton<ICompilationService, DnxRoslynCompilationService>();
-#endif

            // Inject a custom assembly provider. Overrides AddMvc() because that uses TryAdd().
            var assemblyProvider = new StaticAssemblyProvider();
--- a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/project.json
+++ b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/project.json
@ -53,9 +53,6 @@
    "XmlFormattersWebSite": "1.0.0"
  },
  "testRunner": "xunit",
-  "commands": {
-    "test": "xunit.runner.aspnet"
-  },
  "frameworks": {
    "netstandardapp1.5": {
      "dependencies": {
@ -68,17 +65,6 @@
        "portable-net451+win8"
      ]
    },
-    "dnx451": {
-      "dependencies": {
-        "Microsoft.AspNetCore.Mvc.Dnx": "1.0.0-*",
-        "System.Collections": "4.0.11-*",
-        "System.IO": "4.1.0-*",
-        "System.Reflection": "4.1.0-*",
-        "System.Runtime": "4.1.0-*",
-        "System.Threading": "4.0.11-*",
-        "xunit.runner.aspnet": "2.0.0-aspnet-*"
-      }
-    },
    "net451": {}
  },
  "exclude": [
--- a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/project.json
+++ b/test/Microsoft.AspNetCore.Mvc.IntegrationTests/project.json
@ -15,9 +15,6 @@
    "Microsoft.NETCore.Platforms": "1.0.1-*"
  },
  "testRunner": "xunit",
-  "commands": {
-    "test": "xunit.runner.aspnet"
-  },
  "frameworks": {
    "netstandardapp1.5": {
      "imports": [
@ -29,13 +26,6 @@
        "dotnet-test-xunit": "1.0.0-dev-*"
      }
    },
-    "dnx451": {
-      "dependencies": {
-        "Moq": "4.2.1312.1622",
-        "System.Runtime": "4.1.0-*",
-        "xunit.runner.aspnet": "2.0.0-aspnet-*"
-      }
-    },
    "net451": {
      "dependencies": {
        "Moq": "4.2.1312.1622"
--- a/test/Microsoft.AspNetCore.Mvc.Localization.Test/project.json
+++ b/test/Microsoft.AspNetCore.Mvc.Localization.Test/project.json
@ -14,9 +14,6 @@
    "Microsoft.NETCore.Platforms": "1.0.1-*"
  },
  "testRunner": "xunit",
-  "commands": {
-    "test": "xunit.runner.aspnet"
-  },
  "frameworks": {
    "netstandardapp1.5": {
      "imports": [
@ -28,13 +25,6 @@
        "dotnet-test-xunit": "1.0.0-dev-*"
      }
    },
-    "dnx451": {
-      "dependencies": {
-        "Moq": "4.2.1312.1622",
-        "System.Runtime": "4.1.0-*",
-        "xunit.runner.aspnet": "2.0.0-aspnet-*"
-      }
-    },
    "net451": {
      "dependencies": {
        "Moq": "4.2.1312.1622"
--- a/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/project.json
+++ b/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/project.json
@ -15,9 +15,6 @@
    "Microsoft.NETCore.Platforms": "1.0.1-*"
  },
  "testRunner": "xunit",
-  "commands": {
-    "test": "xunit.runner.aspnet"
-  },
  "compilationOptions": {
    "define": [
      "__RemoveThisBitTo__GENERATE_BASELINES"
@ -35,13 +32,6 @@
        "dotnet-test-xunit": "1.0.0-dev-*"
      }
    },
-    "dnx451": {
-      "dependencies": {
-        "Moq": "4.2.1312.1622",
-        "System.Runtime": "4.1.0-*",
-        "xunit.runner.aspnet": "2.0.0-aspnet-*"
-      }
-    },
    "net451": {
      "dependencies": {
        "Moq": "4.2.1312.1622"
--- a/test/Microsoft.AspNetCore.Mvc.Razor.Test/project.json
+++ b/test/Microsoft.AspNetCore.Mvc.Razor.Test/project.json
@ -30,9 +30,6 @@
    "Microsoft.NETCore.Platforms": "1.0.1-*"
  },
  "testRunner": "xunit",
-  "commands": {
-    "test": "xunit.runner.aspnet"
-  },
  "frameworks": {
    "netstandardapp1.5": {
      "imports": [
@ -44,13 +41,6 @@
        "dotnet-test-xunit": "1.0.0-dev-*"
      }
    },
-    "dnx451": {
-      "dependencies": {
-        "Moq": "4.2.1312.1622",
-        "System.Runtime": "4.1.0-*",
-        "xunit.runner.aspnet": "2.0.0-aspnet-*"
-      }
-    },
    "net451": {
      "dependencies": {
        "Moq": "4.2.1312.1622"
--- a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/project.json
+++ b/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/project.json
@ -17,9 +17,6 @@
    "Microsoft.NETCore.Platforms": "1.0.1-*"
  },
  "testRunner": "xunit",
-  "commands": {
-    "test": "xunit.runner.aspnet"
-  },
  "frameworks": {
    "netstandardapp1.5": {
      "imports": [
@ -31,13 +28,6 @@
        "dotnet-test-xunit": "1.0.0-dev-*"
      }
    },
-    "dnx451": {
-      "dependencies": {
-        "Moq": "4.2.1312.1622",
-        "System.Runtime": "4.1.0-*",
-        "xunit.runner.aspnet": "2.0.0-aspnet-*"
-      }
-    },
    "net451": {
      "dependencies": {
        "Moq": "4.2.1312.1622"
--- a/test/Microsoft.AspNetCore.Mvc.Test/project.json
+++ b/test/Microsoft.AspNetCore.Mvc.Test/project.json
@ -11,9 +11,6 @@
    "xunit": "2.1.0"
  },
  "testRunner": "xunit",
-  "commands": {
-    "test": "xunit.runner.aspnet"
-  },
  "frameworks": {
    "netstandardapp1.5": {
      "imports": [
@ -25,13 +22,6 @@
        "dotnet-test-xunit": "1.0.0-dev-*"
      }
    },
-    "dnx451": {
-      "dependencies": {
-        "Moq": "4.2.1312.1622",
-        "System.Runtime": "4.1.0-*",
-        "xunit.runner.aspnet": "2.0.0-aspnet-*"
-      }
-    },
    "net451": {
      "dependencies": {
        "Moq": "4.2.1312.1622"
--- a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentSelectorTest.cs
+++ b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentSelectorTest.cs
@ -211,11 +211,7 @@ namespace Microsoft.AspNetCore.Mvc.ViewComponents
                return
                    GetAssemblyProvider()
                    .CandidateAssemblies
-                    .SelectMany(a => a.DefinedTypes)
-#if DNX451
-                    .Select(t => t.GetTypeInfo())
-#endif
-                    ;
+                    .SelectMany(a => a.DefinedTypes);
            }

            private static IAssemblyProvider GetAssemblyProvider()
--- a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/project.json
+++ b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/project.json
@ -22,9 +22,6 @@
    "Microsoft.NETCore.Platforms": "1.0.1-*"
  },
  "testRunner": "xunit",
-  "commands": {
-    "test": "xunit.runner.aspnet"
-  },
  "frameworks": {
    "netstandardapp1.5": {
      "imports": [
@ -36,13 +33,6 @@
        "dotnet-test-xunit": "1.0.0-dev-*"
      }
    },
-    "dnx451": {
-      "dependencies": {
-        "Moq": "4.2.1312.1622",
-        "System.Runtime": "4.1.0-*",
-        "xunit.runner.aspnet": "2.0.0-aspnet-*"
-      }
-    },
    "net451": {
      "dependencies": {
        "Moq": "4.2.1312.1622"
--- a/test/WebSites/Microsoft.AspNetCore.Mvc.TestConfiguration/project.json
+++ b/test/WebSites/Microsoft.AspNetCore.Mvc.TestConfiguration/project.json
@ -9,9 +9,9 @@
  },
  "frameworks": {
    "net451": {},
-    "netstandardapp1.5": {
+    "netstandard1.3": {
      "imports": [
-        "dnxcore50",
+        "dotnet4.5",
        "portable-net451+win8"
      ]
    }