From f6270de38748c48fed40fda895e35ebe4d08ec12 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Fri, 13 Nov 2015 13:40:31 -0800 Subject: [PATCH] Updating Microsoft.AspNet.Mvc.WebApiCompatShimTest to use Microsoft.Extensions.DependencyInjection --- .../BadRequestErrorMessageResultTest.cs | 2 +- .../ConflictResultTest.cs | 2 +- .../ExceptionResultTest.cs | 4 +--- .../InternalServerErrorResultTest.cs | 2 +- .../InvalidModelStateResultTest.cs | 4 +--- .../NegotiatedContentResultTest.cs | 4 +--- .../project.json | 24 +++++++++---------- 7 files changed, 18 insertions(+), 24 deletions(-) diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/BadRequestErrorMessageResultTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/BadRequestErrorMessageResultTest.cs index 4e2d1a079a..9158c77511 100644 --- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/BadRequestErrorMessageResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/BadRequestErrorMessageResultTest.cs @@ -14,7 +14,7 @@ using Microsoft.AspNet.Routing; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Testing; using Microsoft.Extensions.OptionsModel; -using Microsoft.Framework.DependencyInjection; +using Microsoft.Extensions.DependencyInjection; using Moq; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ConflictResultTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ConflictResultTest.cs index 0eeb5eede8..d4dba2486e 100644 --- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ConflictResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ConflictResultTest.cs @@ -9,7 +9,7 @@ using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Routing; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Testing; -using Microsoft.Framework.DependencyInjection; +using Microsoft.Extensions.DependencyInjection; using Xunit; namespace System.Web.Http diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ExceptionResultTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ExceptionResultTest.cs index 1d56212580..5c1322eec8 100644 --- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ExceptionResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ExceptionResultTest.cs @@ -11,11 +11,9 @@ using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.Formatters; using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.AspNet.Routing; -using Microsoft.Extensions.Logging; +using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging.Testing; using Microsoft.Extensions.OptionsModel; -using Microsoft.Framework.DependencyInjection; -using Moq; using Xunit; namespace System.Web.Http diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/InternalServerErrorResultTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/InternalServerErrorResultTest.cs index f6ec139f78..d09ef2755d 100644 --- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/InternalServerErrorResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/InternalServerErrorResultTest.cs @@ -9,7 +9,7 @@ using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Routing; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Testing; -using Microsoft.Framework.DependencyInjection; +using Microsoft.Extensions.DependencyInjection; using Xunit; namespace System.Web.Http diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/InvalidModelStateResultTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/InvalidModelStateResultTest.cs index 8cf9ef6e47..0807ff1d73 100644 --- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/InvalidModelStateResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/InvalidModelStateResultTest.cs @@ -12,11 +12,9 @@ using Microsoft.AspNet.Mvc.Formatters; using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Routing; -using Microsoft.Extensions.Logging; +using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging.Testing; using Microsoft.Extensions.OptionsModel; -using Microsoft.Framework.DependencyInjection; -using Moq; using Xunit; namespace System.Web.Http diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/NegotiatedContentResultTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/NegotiatedContentResultTest.cs index bfb7f59097..d266885246 100644 --- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/NegotiatedContentResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/NegotiatedContentResultTest.cs @@ -11,11 +11,9 @@ using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.Formatters; using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.AspNet.Routing; -using Microsoft.Extensions.Logging; +using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging.Testing; using Microsoft.Extensions.OptionsModel; -using Microsoft.Framework.DependencyInjection; -using Moq; using Xunit; namespace System.Web.Http diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/project.json b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/project.json index f6be08e0a8..8799b5ed65 100644 --- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/project.json +++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/project.json @@ -1,24 +1,24 @@ { "compilationOptions": { - "warningsAsErrors": "false" + "warningsAsErrors": true }, "dependencies": { "Microsoft.AspNet.Http": "1.0.0-*", "Microsoft.AspNet.Mvc.WebApiCompatShim": "6.0.0-*", "Microsoft.AspNet.Testing": "1.0.0-*", "Microsoft.Extensions.Logging.Testing": "1.0.0-*", - "Microsoft.Framework.DependencyInjection": "1.0.0-*", + "Microsoft.Extensions.DependencyInjection": "1.0.0-*", "xunit.runner.aspnet": "2.0.0-aspnet-*" }, - "commands": { - "test": "xunit.runner.aspnet" + "commands": { + "test": "xunit.runner.aspnet" + }, + "frameworks": { + "dnx451": { + "dependencies": { + "Moq": "4.2.1312.1622" + } }, - "frameworks": { - "dnx451": { - "dependencies": { - "Moq": "4.2.1312.1622" - } - }, - "dnxcore50": { } - } + "dnxcore50": { } + } }