diff --git a/TestAssets/FSharpTestProjects/CompileFail/project.json b/TestAssets/FSharpTestProjects/CompileFail/project.json index 84d87f6df..bf1d8a0c5 100644 --- a/TestAssets/FSharpTestProjects/CompileFail/project.json +++ b/TestAssets/FSharpTestProjects/CompileFail/project.json @@ -9,7 +9,7 @@ ], "dependencies": { "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", - "NETStandard.Library": "1.5.0-rc2-23911" + "NETStandard.Library": "1.5.0-rc2-23924" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/FSharpTestProjects/TestApp/project.json b/TestAssets/FSharpTestProjects/TestApp/project.json index 90fcb92b9..a2b8bf1ed 100644 --- a/TestAssets/FSharpTestProjects/TestApp/project.json +++ b/TestAssets/FSharpTestProjects/TestApp/project.json @@ -9,7 +9,7 @@ ], "dependencies": { "TestLibrary": "1.0.0-*", - "NETStandard.Library": "1.5.0-rc2-23911", + "NETStandard.Library": "1.5.0-rc2-23924", "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221" }, "frameworks": { diff --git a/TestAssets/FSharpTestProjects/TestAppWithArgs/project.json b/TestAssets/FSharpTestProjects/TestAppWithArgs/project.json index 84d87f6df..bf1d8a0c5 100644 --- a/TestAssets/FSharpTestProjects/TestAppWithArgs/project.json +++ b/TestAssets/FSharpTestProjects/TestAppWithArgs/project.json @@ -9,7 +9,7 @@ ], "dependencies": { "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", - "NETStandard.Library": "1.5.0-rc2-23911" + "NETStandard.Library": "1.5.0-rc2-23924" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/FSharpTestProjects/TestLibrary/project.json b/TestAssets/FSharpTestProjects/TestLibrary/project.json index 0b29b1792..d0b78696d 100644 --- a/TestAssets/FSharpTestProjects/TestLibrary/project.json +++ b/TestAssets/FSharpTestProjects/TestLibrary/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", - "NETStandard.Library": "1.5.0-rc2-23911" + "NETStandard.Library": "1.5.0-rc2-23924" }, "compilerName": "fsc", "compileFiles": [ diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json index 7ce8666ac..d9389ff82 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911", + "NETStandard.Library": "1.5.0-rc2-23924", "EmptyLibrary": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json index a81519a70..7267c7fca 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json @@ -4,7 +4,7 @@ "netstandardapp1.5": { "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911" + "NETStandard.Library": "1.5.0-rc2-23924" } }, "dnx451": {} diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json index 17c4e9e46..ad738a71d 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json @@ -5,7 +5,7 @@ "netstandard1.3": { "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911" + "NETStandard.Library": "1.5.0-rc2-23924" } } } diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json index 83b5d4335..e2ea8cb92 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json @@ -3,7 +3,7 @@ "netstandardapp1.5": { "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911" + "NETStandard.Library": "1.5.0-rc2-23924" } } }, diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json index 37a82e632..d310a48ef 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911", + "NETStandard.Library": "1.5.0-rc2-23924", "Microsoft.Web.Administration": "7.0.0" }, "frameworks": { diff --git a/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json b/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json index bb3a9cebf..7dbf4efa6 100755 --- a/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json +++ b/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911" + "NETStandard.Library": "1.5.0-rc2-23924" }, "frameworks": { "dnxcore50": {} diff --git a/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json index cafaf976b..9354228b6 100644 --- a/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json +++ b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911" + "NETStandard.Library": "1.5.0-rc2-23924" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json b/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json index c1bd9c205..fc306e987 100644 --- a/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json +++ b/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911" + "NETStandard.Library": "1.5.0-rc2-23924" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestPackages/dotnet-portable/project.json b/TestAssets/TestPackages/dotnet-portable/project.json index 6e79060d4..d5a2ea453 100644 --- a/TestAssets/TestPackages/dotnet-portable/project.json +++ b/TestAssets/TestPackages/dotnet-portable/project.json @@ -3,7 +3,6 @@ "compilationOptions": { "emitEntryPoint": true }, - "frameworks": { "netstandard1.5": { "imports": [ @@ -11,7 +10,10 @@ "portable-net45+win8" ], "dependencies": { - "Microsoft.NETCore.App": { "type": "platform", "version": "1.0.0-rc2-23911" } + "Microsoft.NETCore.App": { + "type": "platform", + "version": "1.0.0-rc2-23924" + } } } } diff --git a/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json b/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json index c888180eb..665d73eb4 100644 --- a/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json +++ b/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911", + "NETStandard.Library": "1.5.0-rc2-23924", "dotnet-hello": { "version": "1.0.0", "target": "package" diff --git a/TestAssets/TestProjects/AppWithDirectDependency/project.json b/TestAssets/TestProjects/AppWithDirectDependency/project.json index 14cc1022a..021e8cef5 100644 --- a/TestAssets/TestProjects/AppWithDirectDependency/project.json +++ b/TestAssets/TestProjects/AppWithDirectDependency/project.json @@ -5,7 +5,7 @@ }, "testRunner": "must-be-specified-to-generate-deps", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911", + "NETStandard.Library": "1.5.0-rc2-23924", "dotnet-hello": { "version": "1.0.0", "target": "package" diff --git a/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json b/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json index 5881f34db..4d9914336 100644 --- a/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json +++ b/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json @@ -1,15 +1,15 @@ { - "compilationOptions": { - "outputName": "MyApp", - "emitEntryPoint": true, - "preserveCompilationContext": true - }, - "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901" - }, - "frameworks": { - "netstandardapp1.5": { - "imports": "dnxcore50" - } + "compilationOptions": { + "outputName": "MyApp", + "emitEntryPoint": true, + "preserveCompilationContext": true + }, + "dependencies": { + "NETStandard.Library": "1.0.0-rc2-23924" + }, + "frameworks": { + "netstandardapp1.5": { + "imports": "dnxcore50" } -} \ No newline at end of file + } +} diff --git a/TestAssets/TestProjects/AppWithToolDependency/project.json b/TestAssets/TestProjects/AppWithToolDependency/project.json index b25c0b2a3..660ec4426 100644 --- a/TestAssets/TestProjects/AppWithToolDependency/project.json +++ b/TestAssets/TestProjects/AppWithToolDependency/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911" + "NETStandard.Library": "1.5.0-rc2-23924" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/CompileFail/project.json b/TestAssets/TestProjects/CompileFail/project.json index 2e5ebbe30..6ed448952 100644 --- a/TestAssets/TestProjects/CompileFail/project.json +++ b/TestAssets/TestProjects/CompileFail/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911" + "NETStandard.Library": "1.5.0-rc2-23924" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json b/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json index 00cd67349..2d80d81be 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json @@ -1,7 +1,7 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911", + "NETStandard.Library": "1.5.0-rc2-23924", "Microsoft.Extensions.DependencyModel": { "target": "project", "version": "1.0.0-*" diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json index 965a3f06e..bff60679c 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json @@ -5,7 +5,7 @@ "preserveCompilationContext": true }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911", + "NETStandard.Library": "1.5.0-rc2-23924", "DependencyContextValidator": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json index f41c7127f..ec8cad99d 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911", + "NETStandard.Library": "1.5.0-rc2-23924", "DependencyContextValidator": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/TestProjects/LibraryWithOutputAssemblyName/project.json b/TestAssets/TestProjects/LibraryWithOutputAssemblyName/project.json index e204fe123..e4b1d8d9e 100644 --- a/TestAssets/TestProjects/LibraryWithOutputAssemblyName/project.json +++ b/TestAssets/TestProjects/LibraryWithOutputAssemblyName/project.json @@ -1,13 +1,13 @@ { - "compilationOptions": { - "outputName": "MyLibrary" - }, - "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23901" - }, - "frameworks": { - "netstandardapp1.5": { - "imports": "dnxcore50" - } + "compilationOptions": { + "outputName": "MyLibrary" + }, + "dependencies": { + "NETStandard.Library": "1.0.0-rc2-23924" + }, + "frameworks": { + "netstandardapp1.5": { + "imports": "dnxcore50" } -} \ No newline at end of file + } +} diff --git a/TestAssets/TestProjects/OutputStandardOutputAndError/project.json b/TestAssets/TestProjects/OutputStandardOutputAndError/project.json index 2e5ebbe30..6ed448952 100644 --- a/TestAssets/TestProjects/OutputStandardOutputAndError/project.json +++ b/TestAssets/TestProjects/OutputStandardOutputAndError/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911" + "NETStandard.Library": "1.5.0-rc2-23924" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/PortableTests/PortableApp/project.json b/TestAssets/TestProjects/PortableTests/PortableApp/project.json index 5a5cd38cf..56d593360 100644 --- a/TestAssets/TestProjects/PortableTests/PortableApp/project.json +++ b/TestAssets/TestProjects/PortableTests/PortableApp/project.json @@ -10,7 +10,10 @@ "portable-net45+win8" ], "dependencies": { - "Microsoft.NETCore.App": { "type": "platform", "version": "1.0.0-rc2-23911" } + "Microsoft.NETCore.App": { + "type": "platform", + "version": "1.0.0-rc2-23924" + } } } } diff --git a/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json b/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json index 48de1d5ff..c58bbdb2b 100644 --- a/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json +++ b/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json @@ -6,7 +6,7 @@ "netstandard1.5": { "imports": [ "dnxcore50", "portable-net45+win8" ], "dependencies": { - "Microsoft.NETCore.App": { "type": "platform", "version": "1.0.0-rc2-23911" }, + "Microsoft.NETCore.App": { "type": "platform", "version": "1.0.0-rc2-23924" }, "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*" } } diff --git a/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json b/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json index 2cf04776c..ea636259a 100644 --- a/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json +++ b/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json @@ -9,18 +9,18 @@ "portable-net45+win8" ], "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc2-23911" + "Microsoft.NETCore.App": "1.0.0-rc2-23924" } } }, "runtimes": { - "win7-x64": { }, - "win7-x86": { }, - "osx.10.10-x64": { }, - "osx.10.11-x64": { }, - "ubuntu.14.04-x64": { }, - "centos.7-x64": { }, - "rhel.7.2-x64": { }, - "debian.8.2-x64": { } + "win7-x64": {}, + "win7-x86": {}, + "osx.10.10-x64": {}, + "osx.10.11-x64": {}, + "ubuntu.14.04-x64": {}, + "centos.7-x64": {}, + "rhel.7.2-x64": {}, + "debian.8.2-x64": {} } } diff --git a/TestAssets/TestProjects/ProjectWithTests/project.json b/TestAssets/TestProjects/ProjectWithTests/project.json index db7fc17fa..80b7a27aa 100644 --- a/TestAssets/TestProjects/ProjectWithTests/project.json +++ b/TestAssets/TestProjects/ProjectWithTests/project.json @@ -1,13 +1,12 @@ { "version": "1.0.0-*", - "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911", - + "NETStandard.Library": "1.5.0-rc2-23924", + "System.Linq.Expressions": "4.0.11-rc2-23924", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23924", "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-dev-91790-12" }, - "frameworks": { "netstandardapp1.5": { "imports": [ @@ -16,6 +15,5 @@ ] } }, - "testRunner": "xunit" } diff --git a/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json b/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json index a081d6a7d..cdeb32955 100644 --- a/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json +++ b/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json @@ -7,7 +7,7 @@ "netstandardapp1.5": { "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911" + "NETStandard.Library": "1.5.0-rc2-23924" } }, "net451": {} diff --git a/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json b/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json index 6df0b0c6d..ed7b9eb7e 100644 --- a/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json @@ -6,7 +6,7 @@ }, "dependencies": { "TestLibrary": "1.0.0-*", - "NETStandard.Library": "1.5.0-rc2-23911" + "NETStandard.Library": "1.5.0-rc2-23924" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json b/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json index f0b60ee88..4c29fd995 100644 --- a/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json +++ b/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json @@ -10,7 +10,7 @@ ] }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911" + "NETStandard.Library": "1.5.0-rc2-23924" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestAppWithArgs/project.json b/TestAssets/TestProjects/TestAppWithArgs/project.json index 2e5ebbe30..6ed448952 100644 --- a/TestAssets/TestProjects/TestAppWithArgs/project.json +++ b/TestAssets/TestProjects/TestAppWithArgs/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911" + "NETStandard.Library": "1.5.0-rc2-23924" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestAppWithContentPackage/project.json b/TestAssets/TestProjects/TestAppWithContentPackage/project.json index c92de9622..1fc3f27e5 100644 --- a/TestAssets/TestProjects/TestAppWithContentPackage/project.json +++ b/TestAssets/TestProjects/TestAppWithContentPackage/project.json @@ -5,7 +5,7 @@ "outputName": "AppWithContentPackage" }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911", + "NETStandard.Library": "1.5.0-rc2-23924", "SharedContentA": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/TestProjects/TestAppWithContents/project.json b/TestAssets/TestProjects/TestAppWithContents/project.json index e5f81bb6f..36e6a7b4e 100644 --- a/TestAssets/TestProjects/TestAppWithContents/project.json +++ b/TestAssets/TestProjects/TestAppWithContents/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911" + "NETStandard.Library": "1.5.0-rc2-23924" }, "content": "testcontentfile.txt", "frameworks": { diff --git a/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json b/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json index 88dd7cbee..d83f0b9cf 100644 --- a/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json @@ -9,7 +9,7 @@ "target": "project", "version": "1.0.0-*" }, - "NETStandard.Library": "1.5.0-rc2-23911" + "NETStandard.Library": "1.5.0-rc2-23924" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json b/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json index f0b60ee88..4c29fd995 100644 --- a/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json +++ b/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json @@ -10,7 +10,7 @@ ] }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911" + "NETStandard.Library": "1.5.0-rc2-23924" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestAppWithScripts/project.json b/TestAssets/TestProjects/TestAppWithScripts/project.json index 11692199c..4cdc40b5a 100644 --- a/TestAssets/TestProjects/TestAppWithScripts/project.json +++ b/TestAssets/TestProjects/TestAppWithScripts/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911" + "NETStandard.Library": "1.5.0-rc2-23924" }, "frameworks": { "netstandardapp1.5": { @@ -12,10 +12,17 @@ } }, "scripts": { - "prepublish": [ "echoscript prepublish_output ?%publish:ProjectPath%? ?%publish:Configuration%? ?%publish:OutputPath%? ?%publish:TargetFramework%? ?%publish:Runtime%?" ], - "postpublish": [ "echoscript postpublish_output ?%publish:ProjectPath%? ?%publish:Configuration%? ?%publish:OutputPath%? ?%publish:TargetFramework%? ?%publish:Runtime%?" ], - - "precompile": [ "echoscript precompile_output ?%compile:ProjectPath%? ?%compile:Configuration%? ?%compile:OutputPath%? ?%compile:TargetFramework%? ?%compile:Runtime%?" ], - "postcompile": [ "echoscript postcompile_output ?%compile:ProjectPath%? ?%compile:Configuration%? ?%compile:OutputPath%? ?%compile:TargetFramework%? ?%compile:Runtime%?" ] + "prepublish": [ + "echoscript prepublish_output ?%publish:ProjectPath%? ?%publish:Configuration%? ?%publish:OutputPath%? ?%publish:TargetFramework%? ?%publish:Runtime%?" + ], + "postpublish": [ + "echoscript postpublish_output ?%publish:ProjectPath%? ?%publish:Configuration%? ?%publish:OutputPath%? ?%publish:TargetFramework%? ?%publish:Runtime%?" + ], + "precompile": [ + "echoscript precompile_output ?%compile:ProjectPath%? ?%compile:Configuration%? ?%compile:OutputPath%? ?%compile:TargetFramework%? ?%compile:Runtime%?" + ], + "postcompile": [ + "echoscript postcompile_output ?%compile:ProjectPath%? ?%compile:Configuration%? ?%compile:OutputPath%? ?%compile:TargetFramework%? ?%compile:Runtime%?" + ] } } diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json index efafdef41..2565bb1f8 100644 --- a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json @@ -9,7 +9,7 @@ "target": "project", "version": "1.0.0-*" }, - "NETStandard.Library": "1.5.0-rc2-23911" + "NETStandard.Library": "1.5.0-rc2-23924" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json index f0b60ee88..4c29fd995 100644 --- a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json +++ b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json @@ -10,7 +10,7 @@ ] }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911" + "NETStandard.Library": "1.5.0-rc2-23924" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json index bc94bb833..1af9c8f7d 100644 --- a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json +++ b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json @@ -8,7 +8,7 @@ "target": "project", "version": "1.0.0-*" }, - "NETStandard.Library": "1.5.0-rc2-23911" + "NETStandard.Library": "1.5.0-rc2-23924" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json index 9b7ae73b7..bc660076e 100644 --- a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json +++ b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json @@ -5,7 +5,7 @@ "target": "project", "version": "1.0.0-*" }, - "NETStandard.Library": "1.5.0-rc2-23911" + "NETStandard.Library": "1.5.0-rc2-23924" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json b/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json index 88dd7cbee..d83f0b9cf 100644 --- a/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json @@ -9,7 +9,7 @@ "target": "project", "version": "1.0.0-*" }, - "NETStandard.Library": "1.5.0-rc2-23911" + "NETStandard.Library": "1.5.0-rc2-23924" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json index 6254293c5..1480454ec 100644 --- a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json +++ b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json @@ -12,7 +12,7 @@ "portable-net45+wp80+win8" ], "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911" + "NETStandard.Library": "1.5.0-rc2-23924" } } } diff --git a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json index f1bb8120d..ce721c4e0 100644 --- a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json +++ b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json @@ -15,7 +15,7 @@ "portable-net45+wp80+win8" ], "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911" + "NETStandard.Library": "1.5.0-rc2-23924" } } } diff --git a/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json b/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json index 930858382..a5d85eec6 100644 --- a/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json +++ b/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911", + "NETStandard.Library": "1.5.0-rc2-23924", "System.Runtime.Analyzers": { "version": "1.1.0", "type": "build" diff --git a/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json b/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json index a4c57dce6..e9af3aa14 100644 --- a/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json +++ b/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json @@ -10,7 +10,7 @@ ] }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911" + "NETStandard.Library": "1.5.0-rc2-23924" }, "configurations": { "Test": {} diff --git a/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json b/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json index f12c8dafa..7e976a86f 100644 --- a/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json +++ b/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json @@ -12,7 +12,7 @@ "netstandardapp1.5": { "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911" + "NETStandard.Library": "1.5.0-rc2-23924" } } } diff --git a/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json b/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json index 8d78b8ecc..72e3eb4ba 100644 --- a/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json +++ b/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json @@ -5,12 +5,12 @@ "netstandardapp1.5": { "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911" + "NETStandard.Library": "1.5.0-rc2-23924" } }, "dnx451": { "dependencies": { - "Microsoft.CSharp": "4.0.1-rc2-23911" + "Microsoft.CSharp": "4.0.1-rc2-23924" } } } diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json index 06f18fa20..4ce4d0229 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json @@ -6,7 +6,7 @@ "dependencies": { "L11": "1.0.0-*", "L12": "1.0.0-*", - "NETStandard.Library": "1.5.0-rc2-23911" + "NETStandard.Library": "1.5.0-rc2-23924" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json index ed65c4c04..3ec17a90b 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json @@ -3,7 +3,7 @@ "dependencies": { "L12": "1.0.0-*", "L21": "1.0.0-*", - "NETStandard.Library": "1.5.0-rc2-23911" + "NETStandard.Library": "1.5.0-rc2-23924" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json index e9486914f..475bd3947 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { "L22": "1.0.0-*", - "NETStandard.Library": "1.5.0-rc2-23911" + "NETStandard.Library": "1.5.0-rc2-23924" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json index 155cb2f02..d3a58c375 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json @@ -1,7 +1,7 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911" + "NETStandard.Library": "1.5.0-rc2-23924" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json index 155cb2f02..d3a58c375 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json @@ -1,7 +1,7 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911" + "NETStandard.Library": "1.5.0-rc2-23924" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json b/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json index 2e5ebbe30..6ed448952 100644 --- a/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json +++ b/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911" + "NETStandard.Library": "1.5.0-rc2-23924" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestProjectWithResource/project.json b/TestAssets/TestProjects/TestProjectWithResource/project.json index 2e5ebbe30..6ed448952 100644 --- a/TestAssets/TestProjects/TestProjectWithResource/project.json +++ b/TestAssets/TestProjects/TestProjectWithResource/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911" + "NETStandard.Library": "1.5.0-rc2-23924" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json b/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json index 7c888a5ad..090c5d7bd 100644 --- a/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json +++ b/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json @@ -5,7 +5,7 @@ "xmlDoc": true }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911" + "NETStandard.Library": "1.5.0-rc2-23924" }, "frameworks": { "netstandardapp1.5": { diff --git a/scripts/Microsoft.DotNet.Cli.Build.Framework/project.json b/scripts/Microsoft.DotNet.Cli.Build.Framework/project.json index cb16f68b2..566a090c6 100644 --- a/scripts/Microsoft.DotNet.Cli.Build.Framework/project.json +++ b/scripts/Microsoft.DotNet.Cli.Build.Framework/project.json @@ -1,8 +1,8 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911", - "System.Diagnostics.Process": "4.1.0-rc2-23911", + "NETStandard.Library": "1.5.0-rc2-23924", + "System.Diagnostics.Process": "4.1.0-rc2-23924", "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-16537" }, "frameworks": { diff --git a/scripts/dotnet-cli-build/CompileTargets.cs b/scripts/dotnet-cli-build/CompileTargets.cs index bd3e32265..d2e5f3f5a 100644 --- a/scripts/dotnet-cli-build/CompileTargets.cs +++ b/scripts/dotnet-cli-build/CompileTargets.cs @@ -14,7 +14,7 @@ namespace Microsoft.DotNet.Cli.Build { public class CompileTargets { - public static readonly string CoreCLRVersion = "1.0.2-rc2-23911"; + public static readonly string CoreCLRVersion = "1.0.2-rc2-23924"; public static readonly string AppDepSdkVersion = "1.0.6-prerelease-00003"; public static readonly bool IsWinx86 = CurrentPlatform.IsWindows && CurrentArchitecture.Isx86; @@ -278,7 +278,8 @@ namespace Microsoft.DotNet.Cli.Build var runtimeGraphGeneratorExe = Path.Combine(runtimeGraphGeneratorOutput, $"{runtimeGraphGeneratorName}{Constants.ExeSuffix}"); Cmd(runtimeGraphGeneratorExe, "--project", SharedFrameworkSourceRoot, "--deps", destinationDeps, runtimeGraphGeneratorRuntime) - .Execute(); + .Execute() + .EnsureSuccessful(); } else { diff --git a/scripts/dotnet-cli-build/project.json b/scripts/dotnet-cli-build/project.json index 72295b954..729b4ff17 100755 --- a/scripts/dotnet-cli-build/project.json +++ b/scripts/dotnet-cli-build/project.json @@ -1,18 +1,23 @@ -{ +{ "version": "1.0.0-*", "description": "Build scripts for dotnet-cli", "compilationOptions": { "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911", + "NETStandard.Library": "1.5.0-rc2-23924", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23924", + "System.Xml.XmlSerializer": "4.0.11-rc2-23924", "Microsoft.DotNet.Cli.Build.Framework": "1.0.0-*", "WindowsAzure.Storage": "6.2.2-preview", "System.Reflection.Metadata": "1.2.0" }, "frameworks": { "netstandardapp1.5": { - "imports": [ "dnxcore50", "portable-net45+win8" ] + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] } } } diff --git a/scripts/update-dependencies/project.json b/scripts/update-dependencies/project.json index bec7ab10d..fa78a3f27 100644 --- a/scripts/update-dependencies/project.json +++ b/scripts/update-dependencies/project.json @@ -5,9 +5,9 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911", - "Microsoft.CSharp": "4.0.1-rc2-23911", - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23911", + "NETStandard.Library": "1.5.0-rc2-23924", + "Microsoft.CSharp": "4.0.1-rc2-23924", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23924", "Microsoft.DotNet.Cli.Build.Framework": "1.0.0-*", "NuGet.Versioning": "3.5.0-beta-1068", "Newtonsoft.Json": "7.0.1", diff --git a/src/Microsoft.DotNet.Cli.Utils/project.json b/src/Microsoft.DotNet.Cli.Utils/project.json index a6c174cf6..ee19f5d23 100644 --- a/src/Microsoft.DotNet.Cli.Utils/project.json +++ b/src/Microsoft.DotNet.Cli.Utils/project.json @@ -20,11 +20,11 @@ } } }, - "netstandard1.3": { + "netstandard1.5": { "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911", - "System.Diagnostics.Process": "4.1.0-rc2-23911" + "NETStandard.Library": "1.5.0-rc2-23924", + "System.Diagnostics.Process": "4.1.0-rc2-23924" } } } diff --git a/src/Microsoft.DotNet.Compiler.Common/project.json b/src/Microsoft.DotNet.Compiler.Common/project.json index 9a885ff0e..c5ae89950 100644 --- a/src/Microsoft.DotNet.Compiler.Common/project.json +++ b/src/Microsoft.DotNet.Compiler.Common/project.json @@ -4,7 +4,7 @@ "keyFile": "../../tools/Key.snk" }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911", + "NETStandard.Library": "1.5.0-rc2-23924", "System.CommandLine": "0.1.0-e160323-1", "Microsoft.CodeAnalysis.CSharp": "1.2.0-beta1-20160202-02", "Microsoft.DotNet.ProjectModel": "1.0.0-*", @@ -12,7 +12,7 @@ "Microsoft.DotNet.Files": "1.0.0-*" }, "frameworks": { - "netstandard1.3": { + "netstandard1.5": { "imports": [ "dnxcore50", "portable-net45+win8" diff --git a/src/Microsoft.DotNet.Files/project.json b/src/Microsoft.DotNet.Files/project.json index 1131165e9..5d355bc76 100644 --- a/src/Microsoft.DotNet.Files/project.json +++ b/src/Microsoft.DotNet.Files/project.json @@ -5,14 +5,14 @@ }, "description": "Abstraction to interact with the file system and file paths.", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911", - "System.Linq.Expressions": "4.0.11-rc2-23911", + "NETStandard.Library": "1.5.0-rc2-23924", + "System.Linq.Expressions": "4.0.11-rc2-23924", "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-15996", "Microsoft.DotNet.Cli.Utils": "1.0.0-*", "Microsoft.DotNet.ProjectModel": "1.0.0-*" }, "frameworks": { - "netstandard1.3": { + "netstandard1.5": { "imports": "dnxcore50" } }, diff --git a/src/Microsoft.DotNet.InternalAbstractions/project.json b/src/Microsoft.DotNet.InternalAbstractions/project.json index 3daa0c061..2996c8edb 100644 --- a/src/Microsoft.DotNet.InternalAbstractions/project.json +++ b/src/Microsoft.DotNet.InternalAbstractions/project.json @@ -17,7 +17,7 @@ "netstandard1.3": { "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911" + "NETStandard.Library": "1.5.0-rc2-23924" } } }, diff --git a/src/Microsoft.DotNet.ProjectModel.Loader/project.json b/src/Microsoft.DotNet.ProjectModel.Loader/project.json index 9d2eca854..9cdfeb769 100644 --- a/src/Microsoft.DotNet.ProjectModel.Loader/project.json +++ b/src/Microsoft.DotNet.ProjectModel.Loader/project.json @@ -4,12 +4,12 @@ "keyFile": "../../tools/Key.snk" }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911", + "NETStandard.Library": "1.5.0-rc2-23924", "Microsoft.DotNet.ProjectModel": "1.0.0-*", - "System.Runtime.Loader": "4.0.0-rc2-23911" + "System.Runtime.Loader": "4.0.0-rc2-23924" }, "frameworks": { - "netstandard1.3": { + "netstandard1.5": { "imports": "dnxcore50" } } diff --git a/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json b/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json index e14bbe01b..513486c98 100644 --- a/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json +++ b/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json @@ -4,13 +4,13 @@ "keyFile": "../../tools/Key.snk" }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911", + "NETStandard.Library": "1.5.0-rc2-23924", "Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.Compiler.Common": "1.0.0-*", "Microsoft.CodeAnalysis.CSharp.Workspaces": "1.2.0-beta1-20160202-02" }, "frameworks": { - "netstandard1.3": { + "netstandard1.5": { "imports": [ "dnxcore50", "portable-net45+win8" diff --git a/src/Microsoft.DotNet.ProjectModel/Compilation/LibraryExporter.cs b/src/Microsoft.DotNet.ProjectModel/Compilation/LibraryExporter.cs index 95b91cf7d..d83638068 100644 --- a/src/Microsoft.DotNet.ProjectModel/Compilation/LibraryExporter.cs +++ b/src/Microsoft.DotNet.ProjectModel/Compilation/LibraryExporter.cs @@ -221,12 +221,12 @@ namespace Microsoft.DotNet.ProjectModel.Compilation if (runtime.Any()) { - builder.AddRuntimeAssemblyGroup(new LibraryAssetGroup(targetGroup.Key, runtime)); + builder.AddRuntimeAssemblyGroup(new LibraryAssetGroup(targetGroup.Key, runtime.Where(a => !PackageDependencyProvider.IsPlaceholderFile(a.RelativePath)))); } if (native.Any()) { - builder.AddNativeLibraryGroup(new LibraryAssetGroup(targetGroup.Key, native)); + builder.AddNativeLibraryGroup(new LibraryAssetGroup(targetGroup.Key, native.Where(a => !PackageDependencyProvider.IsPlaceholderFile(a.RelativePath)))); } } } diff --git a/src/Microsoft.DotNet.ProjectModel/project.json b/src/Microsoft.DotNet.ProjectModel/project.json index 05e4099ce..2dfbdc33c 100644 --- a/src/Microsoft.DotNet.ProjectModel/project.json +++ b/src/Microsoft.DotNet.ProjectModel/project.json @@ -5,7 +5,7 @@ }, "description": "Types to model a .NET Project", "dependencies": { - "System.Reflection.Metadata": "1.2.0-rc2-23904", + "System.Reflection.Metadata": "1.2.0-rc2-23924", "NuGet.Packaging": "3.5.0-beta-1068", "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-15996", "Microsoft.Extensions.JsonParser.Sources": { @@ -32,16 +32,16 @@ } } }, - "netstandard1.3": { + "netstandard1.5": { "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911", - "System.Dynamic.Runtime": "4.0.11-rc2-23911", - "System.Threading.Thread": "4.0.0-rc2-23911", - "System.Runtime.Loader": "4.0.0-rc2-23911", - "System.Security.Cryptography.Algorithms": "4.1.0-rc2-23911", - "Microsoft.CSharp": "4.0.1-rc2-23911", - "System.Xml.XDocument": "4.0.11-rc2-23911" + "NETStandard.Library": "1.5.0-rc2-23924", + "System.Dynamic.Runtime": "4.0.11-rc2-23924", + "System.Threading.Thread": "4.0.0-rc2-23924", + "System.Runtime.Loader": "4.0.0-rc2-23924", + "System.Security.Cryptography.Algorithms": "4.1.0-rc2-23924", + "Microsoft.CSharp": "4.0.1-rc2-23924", + "System.Xml.XDocument": "4.0.11-rc2-23924" } } } diff --git a/src/Microsoft.DotNet.TestFramework/project.json b/src/Microsoft.DotNet.TestFramework/project.json index 2e096995e..9024a5f16 100644 --- a/src/Microsoft.DotNet.TestFramework/project.json +++ b/src/Microsoft.DotNet.TestFramework/project.json @@ -11,10 +11,10 @@ "licenseUrl": "", "dependencies": { "Microsoft.DotNet.Cli.Utils": "1.0.0-*", - "NETStandard.Library": "1.5.0-rc2-23911" + "NETStandard.Library": "1.5.0-rc2-23924" }, "frameworks": { - "netstandard1.3": { + "netstandard1.5": { "imports": "dnxcore50" } } diff --git a/src/Microsoft.Extensions.DependencyModel/project.json b/src/Microsoft.Extensions.DependencyModel/project.json index 30fc3f304..9556a02ae 100644 --- a/src/Microsoft.Extensions.DependencyModel/project.json +++ b/src/Microsoft.Extensions.DependencyModel/project.json @@ -23,14 +23,11 @@ }, "frameworks": { "net451": {}, - "netstandard1.3": { + "netstandard1.5": { "imports": "dnxcore50", "dependencies": { - "System.IO.FileSystem": "4.0.1-rc2-23911", - "System.Linq": "4.1.0-rc2-23911", - "System.Runtime": "4.1.0-rc2-23911", - "System.Reflection": "4.1.0-rc2-23911", - "System.Dynamic.Runtime": "4.0.11-rc2-23911" + "NETStandard.Library": "1.5.0-rc2-23924", + "System.Dynamic.Runtime": "4.0.11-rc2-23924" } } }, diff --git a/src/Microsoft.Extensions.Testing.Abstractions/project.json b/src/Microsoft.Extensions.Testing.Abstractions/project.json index e392da6d6..8c8a2d6a3 100644 --- a/src/Microsoft.Extensions.Testing.Abstractions/project.json +++ b/src/Microsoft.Extensions.Testing.Abstractions/project.json @@ -16,12 +16,12 @@ }, "frameworks": { "net451": {}, - "netstandard1.3": { + "netstandard1.5": { "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911", - "System.Resources.ResourceManager": "4.0.1-rc2-23911", - "System.Reflection.TypeExtensions": "4.1.0-rc2-23911" + "NETStandard.Library": "1.5.0-rc2-23924", + "System.Resources.ResourceManager": "4.0.1-rc2-23924", + "System.Reflection.TypeExtensions": "4.1.0-rc2-23924" } } }, diff --git a/src/dotnet/commands/dotnet-compile-native/appdep/project.json b/src/dotnet/commands/dotnet-compile-native/appdep/project.json index eaac3555d..6202237aa 100644 --- a/src/dotnet/commands/dotnet-compile-native/appdep/project.json +++ b/src/dotnet/commands/dotnet-compile-native/appdep/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911", + "NETStandard.Library": "1.5.0-rc2-23924", "Microsoft.DotNet.AppDep": "1.0.6-prerelease-00003" }, "frameworks": { diff --git a/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template b/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template index be12f3038..e6ed07c4b 100644 --- a/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template +++ b/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template @@ -4,11 +4,17 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": { "type": "platform", "version": "1.0.0-rc2-23911" } + "Microsoft.NETCore.App": { + "type": "platform", + "version": "1.0.0-rc2-23924" + } }, "frameworks": { "netstandard1.5": { - "imports": [ "portable-net45+win8", "dnxcore50" ] + "imports": [ + "portable-net45+win8", + "dnxcore50" + ] } } } diff --git a/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template b/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template index 0a26a0595..d4639c625 100644 --- a/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template +++ b/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template @@ -9,11 +9,17 @@ ], "dependencies": { "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-160316", - "Microsoft.NETCore.App": { "type": "platform", "version": "1.0.0-rc2-23911" } + "Microsoft.NETCore.App": { + "type": "platform", + "version": "1.0.0-rc2-23924" + } }, "frameworks": { "netstandard1.5": { - "imports": [ "portable-net45+win8", "dnxcore50" ] + "imports": [ + "portable-net45+win8", + "dnxcore50" + ] } } } diff --git a/src/dotnet/project.json b/src/dotnet/project.json index 3afdc9056..ea9754ac9 100644 --- a/src/dotnet/project.json +++ b/src/dotnet/project.json @@ -49,22 +49,25 @@ "type": "build" }, "Microsoft.Extensions.Testing.Abstractions": "1.0.0-*", - "Microsoft.NETCore.ConsoleHost": "1.0.0-rc2-23911", - "Microsoft.NETCore.TestHost": "1.0.0-rc2-23911", - "NETStandard.Library": "1.5.0-rc2-23911", - "System.Reflection.Metadata": "1.3.0-rc2-23911", - "System.Diagnostics.TextWriterTraceListener": "4.0.0-rc2-23911", - "System.Diagnostics.TraceSource": "4.0.0-rc2-23911", - "System.Linq.Expressions": "4.0.11-rc2-23911", - "System.Xml.XDocument": "4.0.11-rc2-23911", - "System.Resources.ReaderWriter": "4.0.0-rc2-23911", - "System.Net.Sockets": "4.1.0-rc2-23911", - "System.Threading.ThreadPool": "4.0.10-rc2-23911", + "Microsoft.NETCore.ConsoleHost": "1.0.0-rc2-23924", + "Microsoft.NETCore.TestHost": "1.0.0-rc2-23924", + "NETStandard.Library": "1.5.0-rc2-23924", + "System.Reflection.Metadata": "1.3.0-rc2-23924", + "System.Diagnostics.TextWriterTraceListener": "4.0.0-rc2-23924", + "System.Diagnostics.TraceSource": "4.0.0-rc2-23924", + "System.Linq.Expressions": "4.0.11-rc2-23924", + "System.Xml.XDocument": "4.0.11-rc2-23924", + "System.Resources.ReaderWriter": "4.0.0-rc2-23924", + "System.Net.Sockets": "4.1.0-rc2-23924", + "System.Threading.ThreadPool": "4.0.10-rc2-23924", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23924", + "System.Private.DataContractSerialization": "4.1.1-rc2-23924", + "System.Net.Requests": "4.0.11-rc2-23924", "Microsoft.Win32.Registry": { - "version": "4.0.0-rc2-23911", + "version": "4.0.0-rc2-23924", "exclude": "compile" }, - "System.Net.NameResolution": "4.0.0-rc2-23911" + "System.Net.NameResolution": "4.0.0-rc2-23924" }, "frameworks": { "netstandardapp1.5": { diff --git a/src/sharedframework/framework/project.json b/src/sharedframework/framework/project.json index b65eb3277..b2b2d3d0d 100644 --- a/src/sharedframework/framework/project.json +++ b/src/sharedframework/framework/project.json @@ -1,28 +1,26 @@ { - "version": "1.0.0-*", - "compilationOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc2-23911", - "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160318-02" - }, - - "runtimes": { - "win7-x64": {}, - "win7-x86": {}, - "osx.10.10-x64": {}, - "osx.10.11-x64": {}, - "ubuntu.14.04-x64": {}, - "centos.7-x64": {}, - "rhel.7.2-x64": {}, - "debian.8.2-x64": {} - }, - - "frameworks": { - "dnxcore50": { - "imports": [ "portable-net45+win8"] - } + "version": "1.0.0-*", + "compilationOptions": { + "emitEntryPoint": true + }, + "dependencies": { + "Microsoft.NETCore.App": "1.0.0-rc2-23924" + }, + "runtimes": { + "win7-x64": {}, + "win7-x86": {}, + "osx.10.10-x64": {}, + "osx.10.11-x64": {}, + "ubuntu.14.04-x64": {}, + "centos.7-x64": {}, + "rhel.7.2-x64": {}, + "debian.8.2-x64": {} + }, + "frameworks": { + "dnxcore50": { + "imports": [ + "portable-net45+win8" + ] } -} \ No newline at end of file + } +} diff --git a/test/ArgumentForwardingTests/project.json b/test/ArgumentForwardingTests/project.json index 70c21b3f1..84c489d09 100644 --- a/test/ArgumentForwardingTests/project.json +++ b/test/ArgumentForwardingTests/project.json @@ -4,7 +4,8 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911", + "NETStandard.Library": "1.5.0-rc2-23924", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23924", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/ArgumentsReflector/project.json b/test/ArgumentsReflector/project.json index 6869effa2..ec696c97a 100644 --- a/test/ArgumentsReflector/project.json +++ b/test/ArgumentsReflector/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911" + "NETStandard.Library": "1.5.0-rc2-23924" }, "frameworks": { "netstandardapp1.5": { diff --git a/test/EndToEnd/project.json b/test/EndToEnd/project.json index d3ab8a3a6..188dc2210 100644 --- a/test/EndToEnd/project.json +++ b/test/EndToEnd/project.json @@ -4,7 +4,8 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911", + "NETStandard.Library": "1.5.0-rc2-23924", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23924", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json index 995255af3..222d67327 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json @@ -4,7 +4,8 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911", + "NETStandard.Library": "1.5.0-rc2-23924", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23924", "NuGet.Versioning": "3.5.0-beta-1068", "NuGet.Packaging": "3.5.0-beta-1068", "NuGet.Frameworks": "3.5.0-beta-1068", diff --git a/test/Microsoft.DotNet.Compiler.Common.Tests/project.json b/test/Microsoft.DotNet.Compiler.Common.Tests/project.json index e95dacee2..1aad5fe9f 100644 --- a/test/Microsoft.DotNet.Compiler.Common.Tests/project.json +++ b/test/Microsoft.DotNet.Compiler.Common.Tests/project.json @@ -1,7 +1,8 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911", + "NETStandard.Library": "1.5.0-rc2-23924", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23924", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/Microsoft.DotNet.ProjectModel.Tests/project.json b/test/Microsoft.DotNet.ProjectModel.Tests/project.json index 25cf46739..edfa02b92 100644 --- a/test/Microsoft.DotNet.ProjectModel.Tests/project.json +++ b/test/Microsoft.DotNet.ProjectModel.Tests/project.json @@ -1,7 +1,8 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911", + "NETStandard.Library": "1.5.0-rc2-23924", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23924", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json b/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json index 2463caa8f..67267f7c3 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json @@ -5,8 +5,9 @@ "keyFile": "../../tools/Key.snk" }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911", - "System.Collections.Immutable": "1.2.0-rc2-23911", + "NETStandard.Library": "1.5.0-rc2-23924", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23924", + "System.Collections.Immutable": "1.2.0-rc2-23924", "FluentAssertions": "4.0.0", "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-dev-91790-12", diff --git a/test/Microsoft.Extensions.DependencyModel.Tests/project.json b/test/Microsoft.Extensions.DependencyModel.Tests/project.json index f5f578e2e..8627910b0 100644 --- a/test/Microsoft.Extensions.DependencyModel.Tests/project.json +++ b/test/Microsoft.Extensions.DependencyModel.Tests/project.json @@ -5,7 +5,7 @@ "keyFile": "../../tools/Key.snk" }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911", + "NETStandard.Library": "1.5.0-rc2-23924", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/ScriptExecutorTests/project.json b/test/ScriptExecutorTests/project.json index a7848a2c4..04c88e2a0 100644 --- a/test/ScriptExecutorTests/project.json +++ b/test/ScriptExecutorTests/project.json @@ -1,7 +1,7 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911", + "NETStandard.Library": "1.5.0-rc2-23924", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/dotnet-build.Tests/project.json b/test/dotnet-build.Tests/project.json index 23dce9bc7..6a20212f2 100644 --- a/test/dotnet-build.Tests/project.json +++ b/test/dotnet-build.Tests/project.json @@ -1,7 +1,8 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911", + "NETStandard.Library": "1.5.0-rc2-23924", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23924", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-compile.Tests/project.json b/test/dotnet-compile.Tests/project.json index c1c79bacd..b499c6ff4 100644 --- a/test/dotnet-compile.Tests/project.json +++ b/test/dotnet-compile.Tests/project.json @@ -1,7 +1,8 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911", + "NETStandard.Library": "1.5.0-rc2-23924", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23924", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-compile.UnitTests/project.json b/test/dotnet-compile.UnitTests/project.json index e6cd5027b..b07f96c5a 100644 --- a/test/dotnet-compile.UnitTests/project.json +++ b/test/dotnet-compile.UnitTests/project.json @@ -1,7 +1,7 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911", + "NETStandard.Library": "1.5.0-rc2-23924", "Microsoft.DotNet.Cli.Utils": { "target": "project" }, @@ -9,7 +9,7 @@ "target": "project" }, "Microsoft.Win32.Registry": { - "version": "4.0.0-rc2-23911", + "version": "4.0.0-rc2-23924", "exclude": "Compile" }, "Microsoft.DotNet.ProjectModel": { diff --git a/test/dotnet-pack.Tests/project.json b/test/dotnet-pack.Tests/project.json index 18b034060..c2ad35c60 100644 --- a/test/dotnet-pack.Tests/project.json +++ b/test/dotnet-pack.Tests/project.json @@ -1,8 +1,9 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911", - "System.IO.Compression.ZipFile": "4.0.1-rc2-23911", + "NETStandard.Library": "1.5.0-rc2-23924", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23924", + "System.IO.Compression.ZipFile": "4.0.1-rc2-23924", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-projectmodel-server.Tests/project.json b/test/dotnet-projectmodel-server.Tests/project.json index 2c6dd69cb..bb7a5e087 100644 --- a/test/dotnet-projectmodel-server.Tests/project.json +++ b/test/dotnet-projectmodel-server.Tests/project.json @@ -4,7 +4,7 @@ "target": "project" }, "Microsoft.Win32.Registry": { - "version": "4.0.0-rc2-23911", + "version": "4.0.0-rc2-23924", "exclude": "Compile" }, "Microsoft.DotNet.ProjectModel": { @@ -15,7 +15,7 @@ }, "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-dev-91790-12", - "System.Net.NameResolution": "4.0.0-rc2-23911" + "System.Net.NameResolution": "4.0.0-rc2-23924" }, "frameworks": { "netstandardapp1.5": { diff --git a/test/dotnet-publish.Tests/project.json b/test/dotnet-publish.Tests/project.json index 852bde9aa..54d7ab1ed 100644 --- a/test/dotnet-publish.Tests/project.json +++ b/test/dotnet-publish.Tests/project.json @@ -1,7 +1,8 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911", + "NETStandard.Library": "1.5.0-rc2-23924", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23924", "Microsoft.DotNet.TestFramework": "1.0.0-*", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" diff --git a/test/dotnet-resgen.Tests/project.json b/test/dotnet-resgen.Tests/project.json index 0f2247866..806dabbc3 100644 --- a/test/dotnet-resgen.Tests/project.json +++ b/test/dotnet-resgen.Tests/project.json @@ -1,7 +1,8 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911", + "NETStandard.Library": "1.5.0-rc2-23924", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23924", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-run.Tests/project.json b/test/dotnet-run.Tests/project.json index 6731f311f..5df7c0bb0 100644 --- a/test/dotnet-run.Tests/project.json +++ b/test/dotnet-run.Tests/project.json @@ -1,7 +1,8 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911", + "NETStandard.Library": "1.5.0-rc2-23924", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23924", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-test.Tests/project.json b/test/dotnet-test.Tests/project.json index 07eb34c33..6974349c1 100644 --- a/test/dotnet-test.Tests/project.json +++ b/test/dotnet-test.Tests/project.json @@ -1,21 +1,26 @@ -{ +{ "version": "1.0.0-*", - "dependencies": { "Newtonsoft.Json": "7.0.1", - "NETStandard.Library": "1.5.0-rc2-23911", - "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, - "Microsoft.DotNet.TestFramework": { "target": "project" }, - "Microsoft.DotNet.ProjectModel": { "target": "project" }, - "Microsoft.Extensions.Testing.Abstractions": { "target": "project" }, - "System.Net.NameResolution": "4.0.0-rc2-23911", - "System.Net.Sockets": "4.1.0-rc2-23911", - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23911", - + "NETStandard.Library": "1.5.0-rc2-23924", + "Microsoft.DotNet.Tools.Tests.Utilities": { + "target": "project" + }, + "Microsoft.DotNet.TestFramework": { + "target": "project" + }, + "Microsoft.DotNet.ProjectModel": { + "target": "project" + }, + "Microsoft.Extensions.Testing.Abstractions": { + "target": "project" + }, + "System.Net.NameResolution": "4.0.0-rc2-23924", + "System.Net.Sockets": "4.1.0-rc2-23924", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23924", "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-dev-91790-12" }, - "frameworks": { "netstandardapp1.5": { "imports": [ @@ -28,6 +33,5 @@ "../../TestAssets/TestProjects/ProjectWithTests/**/*", "../../TestAssets/TestProjects/global.json" ], - "testRunner": "xunit" } diff --git a/test/dotnet-test.UnitTests/project.json b/test/dotnet-test.UnitTests/project.json index 81e469a45..11d648c3c 100644 --- a/test/dotnet-test.UnitTests/project.json +++ b/test/dotnet-test.UnitTests/project.json @@ -2,12 +2,12 @@ "version": "1.0.0-*", "dependencies": { "Newtonsoft.Json": "7.0.1", - "NETStandard.Library": "1.5.0-rc2-23911", + "NETStandard.Library": "1.5.0-rc2-23924", "dotnet": { "target": "project" }, "Microsoft.Win32.Registry": { - "version": "4.0.0-rc2-23911", + "version": "4.0.0-rc2-23924", "exclude": "Compile" }, "xunit": "2.1.0", diff --git a/test/dotnet.Tests/project.json b/test/dotnet.Tests/project.json index 4443e85ea..29a918c8b 100644 --- a/test/dotnet.Tests/project.json +++ b/test/dotnet.Tests/project.json @@ -1,7 +1,8 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911", + "NETStandard.Library": "1.5.0-rc2-23924", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23924", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/tools/MultiProjectValidator/project.json b/tools/MultiProjectValidator/project.json index 130929817..e34ad518a 100644 --- a/tools/MultiProjectValidator/project.json +++ b/tools/MultiProjectValidator/project.json @@ -5,7 +5,7 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911", + "NETStandard.Library": "1.5.0-rc2-23924", "Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.Cli.Utils": "1.0.0-*" }, diff --git a/tools/RuntimeGraphGenerator/project.json b/tools/RuntimeGraphGenerator/project.json index 02b0682c8..8121f9adb 100644 --- a/tools/RuntimeGraphGenerator/project.json +++ b/tools/RuntimeGraphGenerator/project.json @@ -7,12 +7,12 @@ "NuGet.RuntimeModel": "3.5.0-beta-1068", "NuGet.Versioning": "3.5.0-beta-1068", "System.CommandLine": "0.1.0-e160119-1", - "System.Runtime.Serialization.Json": "1.0.0-rc2-23911", + "System.Runtime.Serialization.Json": "4.0.2-rc2-23924", "Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.Cli.Utils": "1.0.0-*", "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-16537", - "Microsoft.NETCore.ConsoleHost": "1.0.0-rc2-23911", - "NETStandard.Library": "1.5.0-rc2-23911" + "Microsoft.NETCore.ConsoleHost": "1.0.0-rc2-23924", + "NETStandard.Library": "1.5.0-rc2-23924" }, "frameworks": { "netstandardapp1.5": { @@ -21,5 +21,5 @@ "portable-net45+wp80+win8+wpa81+dnxcore50" ] } - }, + } }