diff --git a/.gitignore b/.gitignore index 2e4b2d6b5d..06cfaa0cbe 100644 --- a/.gitignore +++ b/.gitignore @@ -8,15 +8,18 @@ TestResults/ _ReSharper.*/ packages/ artifacts/ -.build/ PublishProfiles/ +.vs/ +bower_components/ +node_modules/ +debugSettings.json +project.lock.json *.user *.suo *.cache *.docstates _ReSharper.* nuget.exe -project.lock.json *net45.csproj *net451.csproj *k10.csproj @@ -28,4 +31,8 @@ project.lock.json *.ncrunchsolution *.*sdf *.ipch -.build/ \ No newline at end of file +.settings +*.sln.ide +node_modules +*launchSettings.json +*.orig \ No newline at end of file diff --git a/test/Microsoft.AspNetCore.JsonPatch.Test/project.json b/test/Microsoft.AspNetCore.JsonPatch.Test/project.json index 4bd3e6450b..d6f8f5cbc6 100644 --- a/test/Microsoft.AspNetCore.JsonPatch.Test/project.json +++ b/test/Microsoft.AspNetCore.JsonPatch.Test/project.json @@ -3,10 +3,11 @@ "warningsAsErrors": true }, "dependencies": { - "dotnet-test-xunit": "1.0.0-*", + "dotnet-test-xunit": "2.2.0-*", "Microsoft.AspNetCore.JsonPatch": "1.1.0-*", "Microsoft.AspNetCore.Testing": "1.1.0-*", - "xunit": "2.1.0" + "Moq": "4.6.25-*", + "xunit": "2.2.0-*" }, "testRunner": "xunit", "frameworks": { @@ -16,30 +17,15 @@ "version": "1.0.0-*", "type": "platform" }, - "moq.netcore": "4.4.0-beta8", - "System.Diagnostics.Process": "4.1.0-*", "System.Diagnostics.TraceSource": "4.0.0-*" }, - "imports": [ - "dnxcore50", - "portable-net451+win8" - ] + "imports": "dotnet5.4" }, "net451": { "frameworkAssemblies": { "System.Linq.Expressions": { "type": "build" - }, - "System.Runtime": { - "type": "build" - }, - "System.Threading.Tasks": { - "type": "build" } - }, - "dependencies": { - "Moq": "4.2.1312.1622", - "xunit.runner.console": "2.1.0" } } }