From 9bc478660af6ddf37f543db592c4e7e8790cce09 Mon Sep 17 00:00:00 2001 From: eerhardt Date: Tue, 22 Mar 2016 15:39:04 +0000 Subject: [PATCH 01/11] Updating dependencies from last known good builds --- .../CompileFail/project.json | 2 +- .../FSharpTestProjects/TestApp/project.json | 2 +- .../TestAppWithArgs/project.json | 2 +- .../TestLibrary/project.json | 2 +- .../src/BrokenProjectPathSample/project.json | 2 +- .../src/EmptyConsoleApp/project.json | 2 +- .../src/EmptyLibrary/project.json | 2 +- .../src/FailReleaseProject/project.json | 2 +- .../IncompatiblePackageSample/project.json | 2 +- .../src/Project1/project.json | 2 +- .../dotnet-hello/v1/dotnet-hello/project.json | 2 +- .../dotnet-hello/v2/dotnet-hello/project.json | 2 +- .../TestPackages/dotnet-portable/project.json | 6 ++- .../project.json | 2 +- .../AppWithDirectDependency/project.json | 2 +- .../AppWithOutputAssemblyName/project.json | 26 +++++----- .../AppWithToolDependency/project.json | 2 +- .../TestProjects/CompileFail/project.json | 2 +- .../DependencyContextValidator/project.json | 2 +- .../TestApp/project.json | 2 +- .../TestAppDeps/project.json | 2 +- .../project.json | 22 ++++---- .../OutputStandardOutputAndError/project.json | 2 +- .../PortableTests/PortableApp/project.json | 5 +- .../PortableAppWithNative/project.json | 2 +- .../PortableTests/StandaloneApp/project.json | 18 +++---- .../ProjectWithTests/project.json | 6 +-- .../TestAppMultiTarget/project.json | 2 +- .../TestApp/project.json | 2 +- .../TestLibrary/project.json | 2 +- .../TestProjects/TestAppWithArgs/project.json | 2 +- .../TestAppWithContentPackage/project.json | 2 +- .../TestAppWithContents/project.json | 2 +- .../TestAppWithLibrary/TestApp/project.json | 2 +- .../TestLibrary/project.json | 2 +- .../TestAppWithScripts/project.json | 19 ++++--- .../TestApp/project.json | 2 +- .../TestLibrary/project.json | 2 +- .../TestLibrary2/project.json | 2 +- .../TestLibraryWithAppDependency/project.json | 2 +- .../TestApp/project.json | 2 +- .../TestLibraryGreater/project.json | 2 +- .../TestLibraryLesser/project.json | 2 +- .../TestLibraryWithAnalyzer/project.json | 2 +- .../TestLibraryWithConfiguration/project.json | 2 +- .../project.json | 2 +- .../TestMicrosoftCSharpReference/project.json | 4 +- .../src/L0/project.json | 2 +- .../src/L11/project.json | 2 +- .../src/L12/project.json | 2 +- .../src/L21/project.json | 2 +- .../src/L22/project.json | 2 +- .../project.json | 2 +- .../TestProjectWithResource/project.json | 2 +- .../TestSimpleIncrementalApp/project.json | 2 +- .../project.json | 4 +- scripts/dotnet-cli-build/CompileTargets.cs | 2 +- scripts/dotnet-cli-build/project.json | 9 ++-- scripts/update-dependencies/project.json | 6 +-- src/Microsoft.DotNet.Cli.Utils/project.json | 4 +- .../project.json | 2 +- src/Microsoft.DotNet.Files/project.json | 4 +- .../project.json | 2 +- .../project.json | 4 +- .../project.json | 2 +- .../project.json | 16 +++--- .../project.json | 2 +- .../project.json | 10 ++-- .../project.json | 6 +-- .../dotnet-compile-native/appdep/project.json | 2 +- .../CSharp_Console/project.json.template | 10 +++- .../FSharp_Console/project.json.template | 10 +++- src/dotnet/project.json | 26 +++++----- src/sharedframework/framework/project.json | 51 +++++++++---------- test/ArgumentForwardingTests/project.json | 2 +- test/ArgumentsReflector/project.json | 2 +- test/EndToEnd/project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- .../project.json | 4 +- .../project.json | 2 +- test/ScriptExecutorTests/project.json | 2 +- test/dotnet-build.Tests/project.json | 2 +- test/dotnet-compile.Tests/project.json | 2 +- test/dotnet-compile.UnitTests/project.json | 4 +- test/dotnet-pack.Tests/project.json | 4 +- .../project.json | 4 +- test/dotnet-publish.Tests/project.json | 2 +- test/dotnet-resgen.Tests/project.json | 2 +- test/dotnet-run.Tests/project.json | 2 +- test/dotnet-test.Tests/project.json | 30 ++++++----- test/dotnet-test.UnitTests/project.json | 4 +- test/dotnet.Tests/project.json | 2 +- tools/MultiProjectValidator/project.json | 2 +- tools/RuntimeGraphGenerator/project.json | 8 +-- 96 files changed, 243 insertions(+), 217 deletions(-) diff --git a/TestAssets/FSharpTestProjects/CompileFail/project.json b/TestAssets/FSharpTestProjects/CompileFail/project.json index 84d87f6df..cf5e6817d 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-23922" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/FSharpTestProjects/TestApp/project.json b/TestAssets/FSharpTestProjects/TestApp/project.json index 90fcb92b9..522802b61 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-23922", "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..cf5e6817d 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-23922" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/FSharpTestProjects/TestLibrary/project.json b/TestAssets/FSharpTestProjects/TestLibrary/project.json index 0b29b1792..bb5fa3901 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-23922" }, "compilerName": "fsc", "compileFiles": [ diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json index 7ce8666ac..cf68417d5 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-23922", "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..fd3999b7d 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-23922" } }, "dnx451": {} diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json index 17c4e9e46..7e43e7e49 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-23922" } } } diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json index 83b5d4335..af3aa6857 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-23922" } } }, diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json index 37a82e632..7ae44fd02 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-23922", "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..613f1917c 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-23922" }, "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..2531f907e 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-23922" }, "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..368954887 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-23922" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestPackages/dotnet-portable/project.json b/TestAssets/TestPackages/dotnet-portable/project.json index 6e79060d4..47af859ea 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-23922" + } } } } diff --git a/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json b/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json index c888180eb..bf58ff2c1 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-23922", "dotnet-hello": { "version": "1.0.0", "target": "package" diff --git a/TestAssets/TestProjects/AppWithDirectDependency/project.json b/TestAssets/TestProjects/AppWithDirectDependency/project.json index 14cc1022a..ede0c28d5 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-23922", "dotnet-hello": { "version": "1.0.0", "target": "package" diff --git a/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json b/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json index 5881f34db..e53f25a68 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-23922" + }, + "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..f663db04c 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-23922" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/CompileFail/project.json b/TestAssets/TestProjects/CompileFail/project.json index 2e5ebbe30..a85445245 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-23922" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json b/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json index 00cd67349..2e9510f6e 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-23922", "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..ec843fed9 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-23922", "DependencyContextValidator": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json index f41c7127f..deec46975 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-23922", "DependencyContextValidator": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/TestProjects/LibraryWithOutputAssemblyName/project.json b/TestAssets/TestProjects/LibraryWithOutputAssemblyName/project.json index e204fe123..5129b9087 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-23922" + }, + "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..a85445245 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-23922" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/PortableTests/PortableApp/project.json b/TestAssets/TestProjects/PortableTests/PortableApp/project.json index 5a5cd38cf..7b548797a 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-23922" + } } } } diff --git a/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json b/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json index 48de1d5ff..8341703f5 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-23922" }, "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..9e83698a3 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-23922" } } }, "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..ccdab6950 100644 --- a/TestAssets/TestProjects/ProjectWithTests/project.json +++ b/TestAssets/TestProjects/ProjectWithTests/project.json @@ -1,13 +1,10 @@ { "version": "1.0.0-*", - "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911", - + "NETStandard.Library": "1.5.0-rc2-23922", "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-dev-91790-12" }, - "frameworks": { "netstandardapp1.5": { "imports": [ @@ -16,6 +13,5 @@ ] } }, - "testRunner": "xunit" } diff --git a/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json b/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json index a081d6a7d..2bc7be33c 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-23922" } }, "net451": {} diff --git a/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json b/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json index 6df0b0c6d..6131170f2 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-23922" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json b/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json index f0b60ee88..ebf01b23f 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-23922" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestAppWithArgs/project.json b/TestAssets/TestProjects/TestAppWithArgs/project.json index 2e5ebbe30..a85445245 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-23922" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestAppWithContentPackage/project.json b/TestAssets/TestProjects/TestAppWithContentPackage/project.json index c92de9622..3fe4d016a 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-23922", "SharedContentA": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/TestProjects/TestAppWithContents/project.json b/TestAssets/TestProjects/TestAppWithContents/project.json index e5f81bb6f..0f73b1826 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-23922" }, "content": "testcontentfile.txt", "frameworks": { diff --git a/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json b/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json index 88dd7cbee..1f3723769 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-23922" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json b/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json index f0b60ee88..ebf01b23f 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-23922" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestAppWithScripts/project.json b/TestAssets/TestProjects/TestAppWithScripts/project.json index 11692199c..025fc6e2f 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-23922" }, "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..a2a8eb396 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-23922" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json index f0b60ee88..ebf01b23f 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-23922" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json index bc94bb833..b5de14fa9 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-23922" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json index 9b7ae73b7..93aa91df5 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-23922" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json b/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json index 88dd7cbee..1f3723769 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-23922" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json index 6254293c5..2d1cdf991 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-23922" } } } diff --git a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json index f1bb8120d..128cb41a9 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-23922" } } } diff --git a/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json b/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json index 930858382..279d465dc 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-23922", "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..2c565b758 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-23922" }, "configurations": { "Test": {} diff --git a/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json b/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json index f12c8dafa..b9fb5c50c 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-23922" } } } diff --git a/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json b/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json index 8d78b8ecc..47e4e6bb3 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-23922" } }, "dnx451": { "dependencies": { - "Microsoft.CSharp": "4.0.1-rc2-23911" + "Microsoft.CSharp": "4.0.1-rc2-23922" } } } diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json index 06f18fa20..98ee17238 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-23922" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json index ed65c4c04..f0668ced2 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-23922" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json index e9486914f..35f303f31 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-23922" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json index 155cb2f02..87c3ef65b 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-23922" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json index 155cb2f02..87c3ef65b 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-23922" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json b/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json index 2e5ebbe30..a85445245 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-23922" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestProjectWithResource/project.json b/TestAssets/TestProjects/TestProjectWithResource/project.json index 2e5ebbe30..a85445245 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-23922" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json b/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json index 7c888a5ad..7c6c07bcb 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-23922" }, "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..be96f2e3a 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-23922", + "System.Diagnostics.Process": "4.1.0-rc2-23922", "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..73fc2e716 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-23922"; public static readonly string AppDepSdkVersion = "1.0.6-prerelease-00003"; public static readonly bool IsWinx86 = CurrentPlatform.IsWindows && CurrentArchitecture.Isx86; diff --git a/scripts/dotnet-cli-build/project.json b/scripts/dotnet-cli-build/project.json index 72295b954..7fcfd6d82 100755 --- a/scripts/dotnet-cli-build/project.json +++ b/scripts/dotnet-cli-build/project.json @@ -1,18 +1,21 @@ -{ +{ "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-23922", "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..eefac3334 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-23922", + "Microsoft.CSharp": "4.0.1-rc2-23922", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922", "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..8241526cf 100644 --- a/src/Microsoft.DotNet.Cli.Utils/project.json +++ b/src/Microsoft.DotNet.Cli.Utils/project.json @@ -23,8 +23,8 @@ "netstandard1.3": { "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911", - "System.Diagnostics.Process": "4.1.0-rc2-23911" + "NETStandard.Library": "1.5.0-rc2-23922", + "System.Diagnostics.Process": "4.1.0-rc2-23922" } } } diff --git a/src/Microsoft.DotNet.Compiler.Common/project.json b/src/Microsoft.DotNet.Compiler.Common/project.json index 9a885ff0e..5dc0d485d 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-23922", "System.CommandLine": "0.1.0-e160323-1", "Microsoft.CodeAnalysis.CSharp": "1.2.0-beta1-20160202-02", "Microsoft.DotNet.ProjectModel": "1.0.0-*", diff --git a/src/Microsoft.DotNet.Files/project.json b/src/Microsoft.DotNet.Files/project.json index 1131165e9..e5c28e732 100644 --- a/src/Microsoft.DotNet.Files/project.json +++ b/src/Microsoft.DotNet.Files/project.json @@ -5,8 +5,8 @@ }, "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-23922", + "System.Linq.Expressions": "4.0.11-rc2-23922", "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-15996", "Microsoft.DotNet.Cli.Utils": "1.0.0-*", "Microsoft.DotNet.ProjectModel": "1.0.0-*" diff --git a/src/Microsoft.DotNet.InternalAbstractions/project.json b/src/Microsoft.DotNet.InternalAbstractions/project.json index 3daa0c061..c43037ac2 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-23922" } } }, diff --git a/src/Microsoft.DotNet.ProjectModel.Loader/project.json b/src/Microsoft.DotNet.ProjectModel.Loader/project.json index 9d2eca854..ae8627183 100644 --- a/src/Microsoft.DotNet.ProjectModel.Loader/project.json +++ b/src/Microsoft.DotNet.ProjectModel.Loader/project.json @@ -4,9 +4,9 @@ "keyFile": "../../tools/Key.snk" }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911", + "NETStandard.Library": "1.5.0-rc2-23922", "Microsoft.DotNet.ProjectModel": "1.0.0-*", - "System.Runtime.Loader": "4.0.0-rc2-23911" + "System.Runtime.Loader": "4.0.0-rc2-23922" }, "frameworks": { "netstandard1.3": { diff --git a/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json b/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json index e14bbe01b..7416e3fa6 100644 --- a/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json +++ b/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json @@ -4,7 +4,7 @@ "keyFile": "../../tools/Key.snk" }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911", + "NETStandard.Library": "1.5.0-rc2-23922", "Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.Compiler.Common": "1.0.0-*", "Microsoft.CodeAnalysis.CSharp.Workspaces": "1.2.0-beta1-20160202-02" diff --git a/src/Microsoft.DotNet.ProjectModel/project.json b/src/Microsoft.DotNet.ProjectModel/project.json index 05e4099ce..bb32ac46b 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-23922", "NuGet.Packaging": "3.5.0-beta-1068", "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-15996", "Microsoft.Extensions.JsonParser.Sources": { @@ -35,13 +35,13 @@ "netstandard1.3": { "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-23922", + "System.Dynamic.Runtime": "4.0.11-rc2-23922", + "System.Threading.Thread": "4.0.0-rc2-23922", + "System.Runtime.Loader": "4.0.0-rc2-23922", + "System.Security.Cryptography.Algorithms": "4.1.0-rc2-23922", + "Microsoft.CSharp": "4.0.1-rc2-23922", + "System.Xml.XDocument": "4.0.11-rc2-23922" } } } diff --git a/src/Microsoft.DotNet.TestFramework/project.json b/src/Microsoft.DotNet.TestFramework/project.json index 2e096995e..7516de3b0 100644 --- a/src/Microsoft.DotNet.TestFramework/project.json +++ b/src/Microsoft.DotNet.TestFramework/project.json @@ -11,7 +11,7 @@ "licenseUrl": "", "dependencies": { "Microsoft.DotNet.Cli.Utils": "1.0.0-*", - "NETStandard.Library": "1.5.0-rc2-23911" + "NETStandard.Library": "1.5.0-rc2-23922" }, "frameworks": { "netstandard1.3": { diff --git a/src/Microsoft.Extensions.DependencyModel/project.json b/src/Microsoft.Extensions.DependencyModel/project.json index 30fc3f304..99bad0e61 100644 --- a/src/Microsoft.Extensions.DependencyModel/project.json +++ b/src/Microsoft.Extensions.DependencyModel/project.json @@ -26,11 +26,11 @@ "netstandard1.3": { "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" + "System.IO.FileSystem": "4.0.1-rc2-23922", + "System.Linq": "4.1.0-rc2-23922", + "System.Runtime": "4.1.0-rc2-23922", + "System.Reflection": "4.1.0-rc2-23922", + "System.Dynamic.Runtime": "4.0.11-rc2-23922" } } }, diff --git a/src/Microsoft.Extensions.Testing.Abstractions/project.json b/src/Microsoft.Extensions.Testing.Abstractions/project.json index e392da6d6..5e7f0a9fd 100644 --- a/src/Microsoft.Extensions.Testing.Abstractions/project.json +++ b/src/Microsoft.Extensions.Testing.Abstractions/project.json @@ -19,9 +19,9 @@ "netstandard1.3": { "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-23922", + "System.Resources.ResourceManager": "4.0.1-rc2-23922", + "System.Reflection.TypeExtensions": "4.1.0-rc2-23922" } } }, diff --git a/src/dotnet/commands/dotnet-compile-native/appdep/project.json b/src/dotnet/commands/dotnet-compile-native/appdep/project.json index eaac3555d..c3de132b0 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-23922", "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..f8b4a6787 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-23922" + } }, "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..151d08726 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-23922" + } }, "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..c8b5029da 100644 --- a/src/dotnet/project.json +++ b/src/dotnet/project.json @@ -49,22 +49,22 @@ "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-23922", + "Microsoft.NETCore.TestHost": "1.0.0-rc2-23922", + "NETStandard.Library": "1.5.0-rc2-23922", + "System.Reflection.Metadata": "1.3.0-rc2-23922", + "System.Diagnostics.TextWriterTraceListener": "4.0.0-rc2-23922", + "System.Diagnostics.TraceSource": "4.0.0-rc2-23922", + "System.Linq.Expressions": "4.0.11-rc2-23922", + "System.Xml.XDocument": "4.0.11-rc2-23922", + "System.Resources.ReaderWriter": "4.0.0-rc2-23922", + "System.Net.Sockets": "4.1.0-rc2-23922", + "System.Threading.ThreadPool": "4.0.10-rc2-23922", "Microsoft.Win32.Registry": { - "version": "4.0.0-rc2-23911", + "version": "4.0.0-rc2-23922", "exclude": "compile" }, - "System.Net.NameResolution": "4.0.0-rc2-23911" + "System.Net.NameResolution": "4.0.0-rc2-23922" }, "frameworks": { "netstandardapp1.5": { diff --git a/src/sharedframework/framework/project.json b/src/sharedframework/framework/project.json index b65eb3277..3f0a320fc 100644 --- a/src/sharedframework/framework/project.json +++ b/src/sharedframework/framework/project.json @@ -1,28 +1,27 @@ { - "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-23922", + "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" + ] } -} \ No newline at end of file + } +} diff --git a/test/ArgumentForwardingTests/project.json b/test/ArgumentForwardingTests/project.json index 70c21b3f1..dae052067 100644 --- a/test/ArgumentForwardingTests/project.json +++ b/test/ArgumentForwardingTests/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911", + "NETStandard.Library": "1.5.0-rc2-23922", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/ArgumentsReflector/project.json b/test/ArgumentsReflector/project.json index 6869effa2..027dd343b 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-23922" }, "frameworks": { "netstandardapp1.5": { diff --git a/test/EndToEnd/project.json b/test/EndToEnd/project.json index d3ab8a3a6..02363e552 100644 --- a/test/EndToEnd/project.json +++ b/test/EndToEnd/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911", + "NETStandard.Library": "1.5.0-rc2-23922", "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..797958fe9 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911", + "NETStandard.Library": "1.5.0-rc2-23922", "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..02bf95c13 100644 --- a/test/Microsoft.DotNet.Compiler.Common.Tests/project.json +++ b/test/Microsoft.DotNet.Compiler.Common.Tests/project.json @@ -1,7 +1,7 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911", + "NETStandard.Library": "1.5.0-rc2-23922", "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..89d98fc0a 100644 --- a/test/Microsoft.DotNet.ProjectModel.Tests/project.json +++ b/test/Microsoft.DotNet.ProjectModel.Tests/project.json @@ -1,7 +1,7 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911", + "NETStandard.Library": "1.5.0-rc2-23922", "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..feb6a7d20 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json @@ -5,8 +5,8 @@ "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-23922", + "System.Collections.Immutable": "1.2.0-rc2-23922", "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..ec84928b0 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-23922", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/ScriptExecutorTests/project.json b/test/ScriptExecutorTests/project.json index a7848a2c4..094c2e9a6 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-23922", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/dotnet-build.Tests/project.json b/test/dotnet-build.Tests/project.json index 23dce9bc7..2d3d8a4de 100644 --- a/test/dotnet-build.Tests/project.json +++ b/test/dotnet-build.Tests/project.json @@ -1,7 +1,7 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911", + "NETStandard.Library": "1.5.0-rc2-23922", "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..998db787d 100644 --- a/test/dotnet-compile.Tests/project.json +++ b/test/dotnet-compile.Tests/project.json @@ -1,7 +1,7 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911", + "NETStandard.Library": "1.5.0-rc2-23922", "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..1f22a79c0 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-23922", "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-23922", "exclude": "Compile" }, "Microsoft.DotNet.ProjectModel": { diff --git a/test/dotnet-pack.Tests/project.json b/test/dotnet-pack.Tests/project.json index 18b034060..c25eafc01 100644 --- a/test/dotnet-pack.Tests/project.json +++ b/test/dotnet-pack.Tests/project.json @@ -1,8 +1,8 @@ { "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-23922", + "System.IO.Compression.ZipFile": "4.0.1-rc2-23922", "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..7b5df4ea8 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-23922", "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-23922" }, "frameworks": { "netstandardapp1.5": { diff --git a/test/dotnet-publish.Tests/project.json b/test/dotnet-publish.Tests/project.json index 852bde9aa..451ab106e 100644 --- a/test/dotnet-publish.Tests/project.json +++ b/test/dotnet-publish.Tests/project.json @@ -1,7 +1,7 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911", + "NETStandard.Library": "1.5.0-rc2-23922", "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..9724763e2 100644 --- a/test/dotnet-resgen.Tests/project.json +++ b/test/dotnet-resgen.Tests/project.json @@ -1,7 +1,7 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911", + "NETStandard.Library": "1.5.0-rc2-23922", "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..47bca3459 100644 --- a/test/dotnet-run.Tests/project.json +++ b/test/dotnet-run.Tests/project.json @@ -1,7 +1,7 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911", + "NETStandard.Library": "1.5.0-rc2-23922", "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..42e868056 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-23922", + "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-23922", + "System.Net.Sockets": "4.1.0-rc2-23922", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922", "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..2a7e847bd 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-23922", "dotnet": { "target": "project" }, "Microsoft.Win32.Registry": { - "version": "4.0.0-rc2-23911", + "version": "4.0.0-rc2-23922", "exclude": "Compile" }, "xunit": "2.1.0", diff --git a/test/dotnet.Tests/project.json b/test/dotnet.Tests/project.json index 4443e85ea..680187988 100644 --- a/test/dotnet.Tests/project.json +++ b/test/dotnet.Tests/project.json @@ -1,7 +1,7 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23911", + "NETStandard.Library": "1.5.0-rc2-23922", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/tools/MultiProjectValidator/project.json b/tools/MultiProjectValidator/project.json index 130929817..cab1d2fd8 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-23922", "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..7b8e87b28 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": "1.0.0-rc2-23922", "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-23922", + "NETStandard.Library": "1.5.0-rc2-23922" }, "frameworks": { "netstandardapp1.5": { @@ -21,5 +21,5 @@ "portable-net45+wp80+win8+wpa81+dnxcore50" ] } - }, + } } From 3186432ebd513a3717c9401fe20883ffee9363bd Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Tue, 22 Mar 2016 15:19:54 -0500 Subject: [PATCH 02/11] Fix up the project.json files for CoreFX build rc2-23922. - ProjectModel uses AssemblyLoadContext which is only available in netstandard1.5. Moving ProjectModel and all its dependencies up to netstandard1.5. - Work around our dependencies still being on old CoreFX builds by hoisting System.Runtime.Serialization.Primitives, System.Private.DataContractSerialization, System.Linq.Expressions, and System.Xml.XmlSerializer references to the current version. --- TestAssets/TestProjects/ProjectWithTests/project.json | 2 ++ scripts/dotnet-cli-build/project.json | 2 ++ src/Microsoft.DotNet.Cli.Utils/project.json | 2 +- src/Microsoft.DotNet.Compiler.Common/project.json | 2 +- src/Microsoft.DotNet.Files/project.json | 2 +- src/Microsoft.DotNet.ProjectModel.Loader/project.json | 2 +- src/Microsoft.DotNet.ProjectModel.Workspaces/project.json | 2 +- src/Microsoft.DotNet.ProjectModel/project.json | 2 +- src/Microsoft.DotNet.TestFramework/project.json | 2 +- src/Microsoft.Extensions.DependencyModel/project.json | 5 +---- src/Microsoft.Extensions.Testing.Abstractions/project.json | 2 +- src/dotnet/project.json | 2 ++ test/ArgumentForwardingTests/project.json | 1 + test/EndToEnd/project.json | 1 + test/Microsoft.DotNet.Cli.Utils.Tests/project.json | 1 + test/Microsoft.DotNet.Compiler.Common.Tests/project.json | 1 + test/Microsoft.DotNet.ProjectModel.Tests/project.json | 1 + test/Microsoft.DotNet.Tools.Tests.Utilities/project.json | 1 + test/dotnet-build.Tests/project.json | 1 + test/dotnet-compile.Tests/project.json | 1 + test/dotnet-pack.Tests/project.json | 1 + test/dotnet-publish.Tests/project.json | 1 + test/dotnet-resgen.Tests/project.json | 1 + test/dotnet-run.Tests/project.json | 1 + test/dotnet.Tests/project.json | 1 + 25 files changed, 28 insertions(+), 12 deletions(-) diff --git a/TestAssets/TestProjects/ProjectWithTests/project.json b/TestAssets/TestProjects/ProjectWithTests/project.json index ccdab6950..12b7e629f 100644 --- a/TestAssets/TestProjects/ProjectWithTests/project.json +++ b/TestAssets/TestProjects/ProjectWithTests/project.json @@ -2,6 +2,8 @@ "version": "1.0.0-*", "dependencies": { "NETStandard.Library": "1.5.0-rc2-23922", + "System.Linq.Expressions": "4.0.11-rc2-23922", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922", "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-dev-91790-12" }, diff --git a/scripts/dotnet-cli-build/project.json b/scripts/dotnet-cli-build/project.json index 7fcfd6d82..1920c6db9 100755 --- a/scripts/dotnet-cli-build/project.json +++ b/scripts/dotnet-cli-build/project.json @@ -6,6 +6,8 @@ }, "dependencies": { "NETStandard.Library": "1.5.0-rc2-23922", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922", + "System.Xml.XmlSerializer": "4.0.11-rc2-23922", "Microsoft.DotNet.Cli.Build.Framework": "1.0.0-*", "WindowsAzure.Storage": "6.2.2-preview", "System.Reflection.Metadata": "1.2.0" diff --git a/src/Microsoft.DotNet.Cli.Utils/project.json b/src/Microsoft.DotNet.Cli.Utils/project.json index 8241526cf..22c957794 100644 --- a/src/Microsoft.DotNet.Cli.Utils/project.json +++ b/src/Microsoft.DotNet.Cli.Utils/project.json @@ -20,7 +20,7 @@ } } }, - "netstandard1.3": { + "netstandard1.5": { "imports": "dnxcore50", "dependencies": { "NETStandard.Library": "1.5.0-rc2-23922", diff --git a/src/Microsoft.DotNet.Compiler.Common/project.json b/src/Microsoft.DotNet.Compiler.Common/project.json index 5dc0d485d..256b2944f 100644 --- a/src/Microsoft.DotNet.Compiler.Common/project.json +++ b/src/Microsoft.DotNet.Compiler.Common/project.json @@ -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 e5c28e732..edff18f41 100644 --- a/src/Microsoft.DotNet.Files/project.json +++ b/src/Microsoft.DotNet.Files/project.json @@ -12,7 +12,7 @@ "Microsoft.DotNet.ProjectModel": "1.0.0-*" }, "frameworks": { - "netstandard1.3": { + "netstandard1.5": { "imports": "dnxcore50" } }, diff --git a/src/Microsoft.DotNet.ProjectModel.Loader/project.json b/src/Microsoft.DotNet.ProjectModel.Loader/project.json index ae8627183..3c4cebefc 100644 --- a/src/Microsoft.DotNet.ProjectModel.Loader/project.json +++ b/src/Microsoft.DotNet.ProjectModel.Loader/project.json @@ -9,7 +9,7 @@ "System.Runtime.Loader": "4.0.0-rc2-23922" }, "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 7416e3fa6..1d1d18642 100644 --- a/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json +++ b/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json @@ -10,7 +10,7 @@ "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/project.json b/src/Microsoft.DotNet.ProjectModel/project.json index bb32ac46b..aafff0f43 100644 --- a/src/Microsoft.DotNet.ProjectModel/project.json +++ b/src/Microsoft.DotNet.ProjectModel/project.json @@ -32,7 +32,7 @@ } } }, - "netstandard1.3": { + "netstandard1.5": { "imports": "dnxcore50", "dependencies": { "NETStandard.Library": "1.5.0-rc2-23922", diff --git a/src/Microsoft.DotNet.TestFramework/project.json b/src/Microsoft.DotNet.TestFramework/project.json index 7516de3b0..b4d5ed930 100644 --- a/src/Microsoft.DotNet.TestFramework/project.json +++ b/src/Microsoft.DotNet.TestFramework/project.json @@ -14,7 +14,7 @@ "NETStandard.Library": "1.5.0-rc2-23922" }, "frameworks": { - "netstandard1.3": { + "netstandard1.5": { "imports": "dnxcore50" } } diff --git a/src/Microsoft.Extensions.DependencyModel/project.json b/src/Microsoft.Extensions.DependencyModel/project.json index 99bad0e61..2e578abb7 100644 --- a/src/Microsoft.Extensions.DependencyModel/project.json +++ b/src/Microsoft.Extensions.DependencyModel/project.json @@ -26,10 +26,7 @@ "netstandard1.3": { "imports": "dnxcore50", "dependencies": { - "System.IO.FileSystem": "4.0.1-rc2-23922", - "System.Linq": "4.1.0-rc2-23922", - "System.Runtime": "4.1.0-rc2-23922", - "System.Reflection": "4.1.0-rc2-23922", + "NETStandard.Library": "1.5.0-rc2-23922", "System.Dynamic.Runtime": "4.0.11-rc2-23922" } } diff --git a/src/Microsoft.Extensions.Testing.Abstractions/project.json b/src/Microsoft.Extensions.Testing.Abstractions/project.json index 5e7f0a9fd..5fa4ab773 100644 --- a/src/Microsoft.Extensions.Testing.Abstractions/project.json +++ b/src/Microsoft.Extensions.Testing.Abstractions/project.json @@ -16,7 +16,7 @@ }, "frameworks": { "net451": {}, - "netstandard1.3": { + "netstandard1.5": { "imports": "dnxcore50", "dependencies": { "NETStandard.Library": "1.5.0-rc2-23922", diff --git a/src/dotnet/project.json b/src/dotnet/project.json index c8b5029da..0cd86acbd 100644 --- a/src/dotnet/project.json +++ b/src/dotnet/project.json @@ -60,6 +60,8 @@ "System.Resources.ReaderWriter": "4.0.0-rc2-23922", "System.Net.Sockets": "4.1.0-rc2-23922", "System.Threading.ThreadPool": "4.0.10-rc2-23922", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922", + "System.Private.DataContractSerialization": "4.1.1-rc2-23922", "Microsoft.Win32.Registry": { "version": "4.0.0-rc2-23922", "exclude": "compile" diff --git a/test/ArgumentForwardingTests/project.json b/test/ArgumentForwardingTests/project.json index dae052067..3ee0a0b6c 100644 --- a/test/ArgumentForwardingTests/project.json +++ b/test/ArgumentForwardingTests/project.json @@ -5,6 +5,7 @@ }, "dependencies": { "NETStandard.Library": "1.5.0-rc2-23922", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/EndToEnd/project.json b/test/EndToEnd/project.json index 02363e552..e414cabe0 100644 --- a/test/EndToEnd/project.json +++ b/test/EndToEnd/project.json @@ -5,6 +5,7 @@ }, "dependencies": { "NETStandard.Library": "1.5.0-rc2-23922", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922", "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 797958fe9..9e51da297 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json @@ -5,6 +5,7 @@ }, "dependencies": { "NETStandard.Library": "1.5.0-rc2-23922", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922", "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 02bf95c13..0f8e1e9db 100644 --- a/test/Microsoft.DotNet.Compiler.Common.Tests/project.json +++ b/test/Microsoft.DotNet.Compiler.Common.Tests/project.json @@ -2,6 +2,7 @@ "version": "1.0.0-*", "dependencies": { "NETStandard.Library": "1.5.0-rc2-23922", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922", "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 89d98fc0a..ad6af8e6d 100644 --- a/test/Microsoft.DotNet.ProjectModel.Tests/project.json +++ b/test/Microsoft.DotNet.ProjectModel.Tests/project.json @@ -2,6 +2,7 @@ "version": "1.0.0-*", "dependencies": { "NETStandard.Library": "1.5.0-rc2-23922", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922", "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 feb6a7d20..fe9ef0b32 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json @@ -6,6 +6,7 @@ }, "dependencies": { "NETStandard.Library": "1.5.0-rc2-23922", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922", "System.Collections.Immutable": "1.2.0-rc2-23922", "FluentAssertions": "4.0.0", "xunit": "2.1.0", diff --git a/test/dotnet-build.Tests/project.json b/test/dotnet-build.Tests/project.json index 2d3d8a4de..31265a0ef 100644 --- a/test/dotnet-build.Tests/project.json +++ b/test/dotnet-build.Tests/project.json @@ -2,6 +2,7 @@ "version": "1.0.0-*", "dependencies": { "NETStandard.Library": "1.5.0-rc2-23922", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-compile.Tests/project.json b/test/dotnet-compile.Tests/project.json index 998db787d..b0015820f 100644 --- a/test/dotnet-compile.Tests/project.json +++ b/test/dotnet-compile.Tests/project.json @@ -2,6 +2,7 @@ "version": "1.0.0-*", "dependencies": { "NETStandard.Library": "1.5.0-rc2-23922", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-pack.Tests/project.json b/test/dotnet-pack.Tests/project.json index c25eafc01..90a509c47 100644 --- a/test/dotnet-pack.Tests/project.json +++ b/test/dotnet-pack.Tests/project.json @@ -2,6 +2,7 @@ "version": "1.0.0-*", "dependencies": { "NETStandard.Library": "1.5.0-rc2-23922", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922", "System.IO.Compression.ZipFile": "4.0.1-rc2-23922", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" diff --git a/test/dotnet-publish.Tests/project.json b/test/dotnet-publish.Tests/project.json index 451ab106e..25dd63798 100644 --- a/test/dotnet-publish.Tests/project.json +++ b/test/dotnet-publish.Tests/project.json @@ -2,6 +2,7 @@ "version": "1.0.0-*", "dependencies": { "NETStandard.Library": "1.5.0-rc2-23922", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922", "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 9724763e2..72011dbbe 100644 --- a/test/dotnet-resgen.Tests/project.json +++ b/test/dotnet-resgen.Tests/project.json @@ -2,6 +2,7 @@ "version": "1.0.0-*", "dependencies": { "NETStandard.Library": "1.5.0-rc2-23922", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-run.Tests/project.json b/test/dotnet-run.Tests/project.json index 47bca3459..26b12e51e 100644 --- a/test/dotnet-run.Tests/project.json +++ b/test/dotnet-run.Tests/project.json @@ -2,6 +2,7 @@ "version": "1.0.0-*", "dependencies": { "NETStandard.Library": "1.5.0-rc2-23922", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet.Tests/project.json b/test/dotnet.Tests/project.json index 680187988..6c13bb9ca 100644 --- a/test/dotnet.Tests/project.json +++ b/test/dotnet.Tests/project.json @@ -2,6 +2,7 @@ "version": "1.0.0-*", "dependencies": { "NETStandard.Library": "1.5.0-rc2-23922", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, From fd0ebb1bab31ebb33ea7713a7d43bf4a5df24855 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Tue, 22 Mar 2016 17:46:14 -0500 Subject: [PATCH 03/11] Fix the RuntimeGraphGenerator 1. It was using the wrong version of System.Runtime.Serialization.Json 2. When invoking it during the build, we weren't ensuring it was successful, which allows the build to continue when it fails. --- scripts/dotnet-cli-build/CompileTargets.cs | 3 ++- tools/RuntimeGraphGenerator/project.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/dotnet-cli-build/CompileTargets.cs b/scripts/dotnet-cli-build/CompileTargets.cs index 73fc2e716..336337efc 100644 --- a/scripts/dotnet-cli-build/CompileTargets.cs +++ b/scripts/dotnet-cli-build/CompileTargets.cs @@ -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/tools/RuntimeGraphGenerator/project.json b/tools/RuntimeGraphGenerator/project.json index 7b8e87b28..a85e9a3c8 100644 --- a/tools/RuntimeGraphGenerator/project.json +++ b/tools/RuntimeGraphGenerator/project.json @@ -7,7 +7,7 @@ "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-23922", + "System.Runtime.Serialization.Json": "4.0.2-rc2-23922", "Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.Cli.Utils": "1.0.0-*", "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-16537", From c07115f52cc1b7ab5a29365b370601bdc4b18633 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Wed, 23 Mar 2016 00:12:38 -0500 Subject: [PATCH 04/11] Add System.Net.Requests dependency to dotnet to hoist the out of date version brought in by FSharp.Compiler. --- src/dotnet/project.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/dotnet/project.json b/src/dotnet/project.json index 0cd86acbd..607bbeb2e 100644 --- a/src/dotnet/project.json +++ b/src/dotnet/project.json @@ -62,6 +62,7 @@ "System.Threading.ThreadPool": "4.0.10-rc2-23922", "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922", "System.Private.DataContractSerialization": "4.1.1-rc2-23922", + "System.Net.Requests": "4.0.11-rc2-23922", "Microsoft.Win32.Registry": { "version": "4.0.0-rc2-23922", "exclude": "compile" From a5813791d5be37fe04068ecfdc1fe0f9525843eb Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Wed, 23 Mar 2016 09:11:26 -0500 Subject: [PATCH 05/11] Updating CoreFX version to rc2-23923 --- .../CompileFail/project.json | 2 +- .../FSharpTestProjects/TestApp/project.json | 2 +- .../TestAppWithArgs/project.json | 2 +- .../TestLibrary/project.json | 2 +- .../src/BrokenProjectPathSample/project.json | 2 +- .../src/EmptyConsoleApp/project.json | 2 +- .../src/EmptyLibrary/project.json | 2 +- .../src/FailReleaseProject/project.json | 2 +- .../IncompatiblePackageSample/project.json | 2 +- .../src/Project1/project.json | 2 +- .../dotnet-hello/v1/dotnet-hello/project.json | 2 +- .../dotnet-hello/v2/dotnet-hello/project.json | 2 +- .../TestPackages/dotnet-portable/project.json | 2 +- .../project.json | 2 +- .../AppWithDirectDependency/project.json | 2 +- .../AppWithOutputAssemblyName/project.json | 2 +- .../AppWithToolDependency/project.json | 2 +- .../TestProjects/CompileFail/project.json | 2 +- .../DependencyContextValidator/project.json | 2 +- .../TestApp/project.json | 2 +- .../TestAppDeps/project.json | 2 +- .../project.json | 2 +- .../OutputStandardOutputAndError/project.json | 2 +- .../PortableTests/PortableApp/project.json | 2 +- .../PortableAppWithNative/project.json | 2 +- .../PortableTests/StandaloneApp/project.json | 2 +- .../ProjectWithTests/project.json | 6 ++-- .../TestAppMultiTarget/project.json | 2 +- .../TestApp/project.json | 2 +- .../TestLibrary/project.json | 2 +- .../TestProjects/TestAppWithArgs/project.json | 2 +- .../TestAppWithContentPackage/project.json | 2 +- .../TestAppWithContents/project.json | 2 +- .../TestAppWithLibrary/TestApp/project.json | 2 +- .../TestLibrary/project.json | 2 +- .../TestAppWithScripts/project.json | 2 +- .../TestApp/project.json | 2 +- .../TestLibrary/project.json | 2 +- .../TestLibrary2/project.json | 2 +- .../TestLibraryWithAppDependency/project.json | 2 +- .../TestApp/project.json | 2 +- .../TestLibraryGreater/project.json | 2 +- .../TestLibraryLesser/project.json | 2 +- .../TestLibraryWithAnalyzer/project.json | 2 +- .../TestLibraryWithConfiguration/project.json | 2 +- .../project.json | 2 +- .../TestMicrosoftCSharpReference/project.json | 4 +-- .../src/L0/project.json | 2 +- .../src/L11/project.json | 2 +- .../src/L12/project.json | 2 +- .../src/L21/project.json | 2 +- .../src/L22/project.json | 2 +- .../project.json | 2 +- .../TestProjectWithResource/project.json | 2 +- .../TestSimpleIncrementalApp/project.json | 2 +- .../project.json | 4 +-- scripts/dotnet-cli-build/CompileTargets.cs | 2 +- scripts/dotnet-cli-build/project.json | 6 ++-- scripts/update-dependencies/project.json | 6 ++-- src/Microsoft.DotNet.Cli.Utils/project.json | 4 +-- .../project.json | 2 +- src/Microsoft.DotNet.Files/project.json | 4 +-- .../project.json | 2 +- .../project.json | 4 +-- .../project.json | 2 +- .../project.json | 16 +++++----- .../project.json | 2 +- .../project.json | 4 +-- .../project.json | 6 ++-- .../dotnet-compile-native/appdep/project.json | 2 +- .../CSharp_Console/project.json.template | 2 +- .../FSharp_Console/project.json.template | 2 +- src/dotnet/project.json | 32 +++++++++---------- src/sharedframework/framework/project.json | 2 +- test/ArgumentForwardingTests/project.json | 4 +-- test/ArgumentsReflector/project.json | 2 +- test/EndToEnd/project.json | 4 +-- .../project.json | 4 +-- .../project.json | 4 +-- .../project.json | 4 +-- .../project.json | 6 ++-- .../project.json | 2 +- test/ScriptExecutorTests/project.json | 2 +- test/dotnet-build.Tests/project.json | 4 +-- test/dotnet-compile.Tests/project.json | 4 +-- test/dotnet-compile.UnitTests/project.json | 4 +-- test/dotnet-pack.Tests/project.json | 6 ++-- .../project.json | 4 +-- test/dotnet-publish.Tests/project.json | 4 +-- test/dotnet-resgen.Tests/project.json | 4 +-- test/dotnet-run.Tests/project.json | 4 +-- test/dotnet-test.Tests/project.json | 8 ++--- test/dotnet-test.UnitTests/project.json | 4 +-- test/dotnet.Tests/project.json | 4 +-- tools/MultiProjectValidator/project.json | 2 +- tools/RuntimeGraphGenerator/project.json | 6 ++-- 96 files changed, 155 insertions(+), 155 deletions(-) diff --git a/TestAssets/FSharpTestProjects/CompileFail/project.json b/TestAssets/FSharpTestProjects/CompileFail/project.json index cf5e6817d..c21d4b534 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-23922" + "NETStandard.Library": "1.5.0-rc2-23923" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/FSharpTestProjects/TestApp/project.json b/TestAssets/FSharpTestProjects/TestApp/project.json index 522802b61..fbe681861 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-23922", + "NETStandard.Library": "1.5.0-rc2-23923", "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 cf5e6817d..c21d4b534 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-23922" + "NETStandard.Library": "1.5.0-rc2-23923" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/FSharpTestProjects/TestLibrary/project.json b/TestAssets/FSharpTestProjects/TestLibrary/project.json index bb5fa3901..da83787b1 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-23922" + "NETStandard.Library": "1.5.0-rc2-23923" }, "compilerName": "fsc", "compileFiles": [ diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json index cf68417d5..e50dfb5b8 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-23922", + "NETStandard.Library": "1.5.0-rc2-23923", "EmptyLibrary": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json index fd3999b7d..772e50245 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-23922" + "NETStandard.Library": "1.5.0-rc2-23923" } }, "dnx451": {} diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json index 7e43e7e49..1fbedab18 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-23922" + "NETStandard.Library": "1.5.0-rc2-23923" } } } diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json index af3aa6857..b846dca68 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-23922" + "NETStandard.Library": "1.5.0-rc2-23923" } } }, diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json index 7ae44fd02..be61ff6b4 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-23922", + "NETStandard.Library": "1.5.0-rc2-23923", "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 613f1917c..95a1147c3 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-23922" + "NETStandard.Library": "1.5.0-rc2-23923" }, "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 2531f907e..af996e4d7 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-23922" + "NETStandard.Library": "1.5.0-rc2-23923" }, "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 368954887..b17cef597 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-23922" + "NETStandard.Library": "1.5.0-rc2-23923" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestPackages/dotnet-portable/project.json b/TestAssets/TestPackages/dotnet-portable/project.json index 47af859ea..112e9031b 100644 --- a/TestAssets/TestPackages/dotnet-portable/project.json +++ b/TestAssets/TestPackages/dotnet-portable/project.json @@ -12,7 +12,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc2-23922" + "version": "1.0.0-rc2-23923" } } } diff --git a/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json b/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json index bf58ff2c1..1dfa37317 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-23922", + "NETStandard.Library": "1.5.0-rc2-23923", "dotnet-hello": { "version": "1.0.0", "target": "package" diff --git a/TestAssets/TestProjects/AppWithDirectDependency/project.json b/TestAssets/TestProjects/AppWithDirectDependency/project.json index ede0c28d5..346611031 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-23922", + "NETStandard.Library": "1.5.0-rc2-23923", "dotnet-hello": { "version": "1.0.0", "target": "package" diff --git a/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json b/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json index e53f25a68..a9f447ed1 100644 --- a/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json +++ b/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json @@ -5,7 +5,7 @@ "preserveCompilationContext": true }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23922" + "NETStandard.Library": "1.0.0-rc2-23923" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/AppWithToolDependency/project.json b/TestAssets/TestProjects/AppWithToolDependency/project.json index f663db04c..ced0180f2 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-23922" + "NETStandard.Library": "1.5.0-rc2-23923" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/CompileFail/project.json b/TestAssets/TestProjects/CompileFail/project.json index a85445245..3f2be6c69 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-23922" + "NETStandard.Library": "1.5.0-rc2-23923" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json b/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json index 2e9510f6e..7006c16dc 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-23922", + "NETStandard.Library": "1.5.0-rc2-23923", "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 ec843fed9..6d1849a81 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-23922", + "NETStandard.Library": "1.5.0-rc2-23923", "DependencyContextValidator": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json index deec46975..f37db52f4 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-23922", + "NETStandard.Library": "1.5.0-rc2-23923", "DependencyContextValidator": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/TestProjects/LibraryWithOutputAssemblyName/project.json b/TestAssets/TestProjects/LibraryWithOutputAssemblyName/project.json index 5129b9087..7ea51f225 100644 --- a/TestAssets/TestProjects/LibraryWithOutputAssemblyName/project.json +++ b/TestAssets/TestProjects/LibraryWithOutputAssemblyName/project.json @@ -3,7 +3,7 @@ "outputName": "MyLibrary" }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23922" + "NETStandard.Library": "1.0.0-rc2-23923" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/OutputStandardOutputAndError/project.json b/TestAssets/TestProjects/OutputStandardOutputAndError/project.json index a85445245..3f2be6c69 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-23922" + "NETStandard.Library": "1.5.0-rc2-23923" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/PortableTests/PortableApp/project.json b/TestAssets/TestProjects/PortableTests/PortableApp/project.json index 7b548797a..3a0719d81 100644 --- a/TestAssets/TestProjects/PortableTests/PortableApp/project.json +++ b/TestAssets/TestProjects/PortableTests/PortableApp/project.json @@ -12,7 +12,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc2-23922" + "version": "1.0.0-rc2-23923" } } } diff --git a/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json b/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json index 8341703f5..3d87e0d41 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-23922" }, + "Microsoft.NETCore.App": { "type": "platform", "version": "1.0.0-rc2-23923" }, "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*" } } diff --git a/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json b/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json index 9e83698a3..d3ab2c35d 100644 --- a/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json +++ b/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json @@ -9,7 +9,7 @@ "portable-net45+win8" ], "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc2-23922" + "Microsoft.NETCore.App": "1.0.0-rc2-23923" } } }, diff --git a/TestAssets/TestProjects/ProjectWithTests/project.json b/TestAssets/TestProjects/ProjectWithTests/project.json index 12b7e629f..a6a679609 100644 --- a/TestAssets/TestProjects/ProjectWithTests/project.json +++ b/TestAssets/TestProjects/ProjectWithTests/project.json @@ -1,9 +1,9 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23922", - "System.Linq.Expressions": "4.0.11-rc2-23922", - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922", + "NETStandard.Library": "1.5.0-rc2-23923", + "System.Linq.Expressions": "4.0.11-rc2-23923", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23923", "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-dev-91790-12" }, diff --git a/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json b/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json index 2bc7be33c..1b90d4c53 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-23922" + "NETStandard.Library": "1.5.0-rc2-23923" } }, "net451": {} diff --git a/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json b/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json index 6131170f2..c1d34f2e4 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-23922" + "NETStandard.Library": "1.5.0-rc2-23923" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json b/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json index ebf01b23f..7b4ee6915 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-23922" + "NETStandard.Library": "1.5.0-rc2-23923" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestAppWithArgs/project.json b/TestAssets/TestProjects/TestAppWithArgs/project.json index a85445245..3f2be6c69 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-23922" + "NETStandard.Library": "1.5.0-rc2-23923" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestAppWithContentPackage/project.json b/TestAssets/TestProjects/TestAppWithContentPackage/project.json index 3fe4d016a..17e46581e 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-23922", + "NETStandard.Library": "1.5.0-rc2-23923", "SharedContentA": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/TestProjects/TestAppWithContents/project.json b/TestAssets/TestProjects/TestAppWithContents/project.json index 0f73b1826..cd49bc966 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-23922" + "NETStandard.Library": "1.5.0-rc2-23923" }, "content": "testcontentfile.txt", "frameworks": { diff --git a/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json b/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json index 1f3723769..8b8b0744d 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-23922" + "NETStandard.Library": "1.5.0-rc2-23923" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json b/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json index ebf01b23f..7b4ee6915 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-23922" + "NETStandard.Library": "1.5.0-rc2-23923" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestAppWithScripts/project.json b/TestAssets/TestProjects/TestAppWithScripts/project.json index 025fc6e2f..5c6e48a5f 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-23922" + "NETStandard.Library": "1.5.0-rc2-23923" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json index a2a8eb396..4885cac53 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-23922" + "NETStandard.Library": "1.5.0-rc2-23923" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json index ebf01b23f..7b4ee6915 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-23922" + "NETStandard.Library": "1.5.0-rc2-23923" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json index b5de14fa9..b0723243c 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-23922" + "NETStandard.Library": "1.5.0-rc2-23923" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json index 93aa91df5..a362f4e7f 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-23922" + "NETStandard.Library": "1.5.0-rc2-23923" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json b/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json index 1f3723769..8b8b0744d 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-23922" + "NETStandard.Library": "1.5.0-rc2-23923" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json index 2d1cdf991..888521ff8 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-23922" + "NETStandard.Library": "1.5.0-rc2-23923" } } } diff --git a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json index 128cb41a9..04eff95bb 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-23922" + "NETStandard.Library": "1.5.0-rc2-23923" } } } diff --git a/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json b/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json index 279d465dc..569919064 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-23922", + "NETStandard.Library": "1.5.0-rc2-23923", "System.Runtime.Analyzers": { "version": "1.1.0", "type": "build" diff --git a/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json b/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json index 2c565b758..a7731a443 100644 --- a/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json +++ b/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json @@ -10,7 +10,7 @@ ] }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23922" + "NETStandard.Library": "1.5.0-rc2-23923" }, "configurations": { "Test": {} diff --git a/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json b/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json index b9fb5c50c..3a66c367b 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-23922" + "NETStandard.Library": "1.5.0-rc2-23923" } } } diff --git a/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json b/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json index 47e4e6bb3..3383fd459 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-23922" + "NETStandard.Library": "1.5.0-rc2-23923" } }, "dnx451": { "dependencies": { - "Microsoft.CSharp": "4.0.1-rc2-23922" + "Microsoft.CSharp": "4.0.1-rc2-23923" } } } diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json index 98ee17238..dc50f6dad 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-23922" + "NETStandard.Library": "1.5.0-rc2-23923" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json index f0668ced2..76e456102 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-23922" + "NETStandard.Library": "1.5.0-rc2-23923" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json index 35f303f31..1b681080c 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-23922" + "NETStandard.Library": "1.5.0-rc2-23923" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json index 87c3ef65b..3a3dd224f 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-23922" + "NETStandard.Library": "1.5.0-rc2-23923" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json index 87c3ef65b..3a3dd224f 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-23922" + "NETStandard.Library": "1.5.0-rc2-23923" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json b/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json index a85445245..3f2be6c69 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-23922" + "NETStandard.Library": "1.5.0-rc2-23923" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestProjectWithResource/project.json b/TestAssets/TestProjects/TestProjectWithResource/project.json index a85445245..3f2be6c69 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-23922" + "NETStandard.Library": "1.5.0-rc2-23923" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json b/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json index 7c6c07bcb..f65f557c4 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-23922" + "NETStandard.Library": "1.5.0-rc2-23923" }, "frameworks": { "netstandardapp1.5": { diff --git a/scripts/Microsoft.DotNet.Cli.Build.Framework/project.json b/scripts/Microsoft.DotNet.Cli.Build.Framework/project.json index be96f2e3a..4f27b485f 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-23922", - "System.Diagnostics.Process": "4.1.0-rc2-23922", + "NETStandard.Library": "1.5.0-rc2-23923", + "System.Diagnostics.Process": "4.1.0-rc2-23923", "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 336337efc..1d220699a 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-23922"; + public static readonly string CoreCLRVersion = "1.0.2-rc2-23923"; public static readonly string AppDepSdkVersion = "1.0.6-prerelease-00003"; public static readonly bool IsWinx86 = CurrentPlatform.IsWindows && CurrentArchitecture.Isx86; diff --git a/scripts/dotnet-cli-build/project.json b/scripts/dotnet-cli-build/project.json index 1920c6db9..a47d5d3e3 100755 --- a/scripts/dotnet-cli-build/project.json +++ b/scripts/dotnet-cli-build/project.json @@ -5,9 +5,9 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23922", - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922", - "System.Xml.XmlSerializer": "4.0.11-rc2-23922", + "NETStandard.Library": "1.5.0-rc2-23923", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23923", + "System.Xml.XmlSerializer": "4.0.11-rc2-23923", "Microsoft.DotNet.Cli.Build.Framework": "1.0.0-*", "WindowsAzure.Storage": "6.2.2-preview", "System.Reflection.Metadata": "1.2.0" diff --git a/scripts/update-dependencies/project.json b/scripts/update-dependencies/project.json index eefac3334..cb85fed12 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-23922", - "Microsoft.CSharp": "4.0.1-rc2-23922", - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922", + "NETStandard.Library": "1.5.0-rc2-23923", + "Microsoft.CSharp": "4.0.1-rc2-23923", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23923", "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 22c957794..cfcf2e81a 100644 --- a/src/Microsoft.DotNet.Cli.Utils/project.json +++ b/src/Microsoft.DotNet.Cli.Utils/project.json @@ -23,8 +23,8 @@ "netstandard1.5": { "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23922", - "System.Diagnostics.Process": "4.1.0-rc2-23922" + "NETStandard.Library": "1.5.0-rc2-23923", + "System.Diagnostics.Process": "4.1.0-rc2-23923" } } } diff --git a/src/Microsoft.DotNet.Compiler.Common/project.json b/src/Microsoft.DotNet.Compiler.Common/project.json index 256b2944f..c2ccf10ef 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-23922", + "NETStandard.Library": "1.5.0-rc2-23923", "System.CommandLine": "0.1.0-e160323-1", "Microsoft.CodeAnalysis.CSharp": "1.2.0-beta1-20160202-02", "Microsoft.DotNet.ProjectModel": "1.0.0-*", diff --git a/src/Microsoft.DotNet.Files/project.json b/src/Microsoft.DotNet.Files/project.json index edff18f41..7c501a399 100644 --- a/src/Microsoft.DotNet.Files/project.json +++ b/src/Microsoft.DotNet.Files/project.json @@ -5,8 +5,8 @@ }, "description": "Abstraction to interact with the file system and file paths.", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23922", - "System.Linq.Expressions": "4.0.11-rc2-23922", + "NETStandard.Library": "1.5.0-rc2-23923", + "System.Linq.Expressions": "4.0.11-rc2-23923", "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-15996", "Microsoft.DotNet.Cli.Utils": "1.0.0-*", "Microsoft.DotNet.ProjectModel": "1.0.0-*" diff --git a/src/Microsoft.DotNet.InternalAbstractions/project.json b/src/Microsoft.DotNet.InternalAbstractions/project.json index c43037ac2..b962e6ca3 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-23922" + "NETStandard.Library": "1.5.0-rc2-23923" } } }, diff --git a/src/Microsoft.DotNet.ProjectModel.Loader/project.json b/src/Microsoft.DotNet.ProjectModel.Loader/project.json index 3c4cebefc..a7edc535c 100644 --- a/src/Microsoft.DotNet.ProjectModel.Loader/project.json +++ b/src/Microsoft.DotNet.ProjectModel.Loader/project.json @@ -4,9 +4,9 @@ "keyFile": "../../tools/Key.snk" }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23922", + "NETStandard.Library": "1.5.0-rc2-23923", "Microsoft.DotNet.ProjectModel": "1.0.0-*", - "System.Runtime.Loader": "4.0.0-rc2-23922" + "System.Runtime.Loader": "4.0.0-rc2-23923" }, "frameworks": { "netstandard1.5": { diff --git a/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json b/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json index 1d1d18642..68f18ef59 100644 --- a/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json +++ b/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json @@ -4,7 +4,7 @@ "keyFile": "../../tools/Key.snk" }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23922", + "NETStandard.Library": "1.5.0-rc2-23923", "Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.Compiler.Common": "1.0.0-*", "Microsoft.CodeAnalysis.CSharp.Workspaces": "1.2.0-beta1-20160202-02" diff --git a/src/Microsoft.DotNet.ProjectModel/project.json b/src/Microsoft.DotNet.ProjectModel/project.json index aafff0f43..0a69b4814 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-23922", + "System.Reflection.Metadata": "1.2.0-rc2-23923", "NuGet.Packaging": "3.5.0-beta-1068", "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-15996", "Microsoft.Extensions.JsonParser.Sources": { @@ -35,13 +35,13 @@ "netstandard1.5": { "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23922", - "System.Dynamic.Runtime": "4.0.11-rc2-23922", - "System.Threading.Thread": "4.0.0-rc2-23922", - "System.Runtime.Loader": "4.0.0-rc2-23922", - "System.Security.Cryptography.Algorithms": "4.1.0-rc2-23922", - "Microsoft.CSharp": "4.0.1-rc2-23922", - "System.Xml.XDocument": "4.0.11-rc2-23922" + "NETStandard.Library": "1.5.0-rc2-23923", + "System.Dynamic.Runtime": "4.0.11-rc2-23923", + "System.Threading.Thread": "4.0.0-rc2-23923", + "System.Runtime.Loader": "4.0.0-rc2-23923", + "System.Security.Cryptography.Algorithms": "4.1.0-rc2-23923", + "Microsoft.CSharp": "4.0.1-rc2-23923", + "System.Xml.XDocument": "4.0.11-rc2-23923" } } } diff --git a/src/Microsoft.DotNet.TestFramework/project.json b/src/Microsoft.DotNet.TestFramework/project.json index b4d5ed930..edb2a7d9e 100644 --- a/src/Microsoft.DotNet.TestFramework/project.json +++ b/src/Microsoft.DotNet.TestFramework/project.json @@ -11,7 +11,7 @@ "licenseUrl": "", "dependencies": { "Microsoft.DotNet.Cli.Utils": "1.0.0-*", - "NETStandard.Library": "1.5.0-rc2-23922" + "NETStandard.Library": "1.5.0-rc2-23923" }, "frameworks": { "netstandard1.5": { diff --git a/src/Microsoft.Extensions.DependencyModel/project.json b/src/Microsoft.Extensions.DependencyModel/project.json index 2e578abb7..b07044581 100644 --- a/src/Microsoft.Extensions.DependencyModel/project.json +++ b/src/Microsoft.Extensions.DependencyModel/project.json @@ -26,8 +26,8 @@ "netstandard1.3": { "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23922", - "System.Dynamic.Runtime": "4.0.11-rc2-23922" + "NETStandard.Library": "1.5.0-rc2-23923", + "System.Dynamic.Runtime": "4.0.11-rc2-23923" } } }, diff --git a/src/Microsoft.Extensions.Testing.Abstractions/project.json b/src/Microsoft.Extensions.Testing.Abstractions/project.json index 5fa4ab773..62f77f3f1 100644 --- a/src/Microsoft.Extensions.Testing.Abstractions/project.json +++ b/src/Microsoft.Extensions.Testing.Abstractions/project.json @@ -19,9 +19,9 @@ "netstandard1.5": { "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23922", - "System.Resources.ResourceManager": "4.0.1-rc2-23922", - "System.Reflection.TypeExtensions": "4.1.0-rc2-23922" + "NETStandard.Library": "1.5.0-rc2-23923", + "System.Resources.ResourceManager": "4.0.1-rc2-23923", + "System.Reflection.TypeExtensions": "4.1.0-rc2-23923" } } }, diff --git a/src/dotnet/commands/dotnet-compile-native/appdep/project.json b/src/dotnet/commands/dotnet-compile-native/appdep/project.json index c3de132b0..c8d99aae2 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-23922", + "NETStandard.Library": "1.5.0-rc2-23923", "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 f8b4a6787..931ba93e0 100644 --- a/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template +++ b/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc2-23922" + "version": "1.0.0-rc2-23923" } }, "frameworks": { 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 151d08726..567ec0854 100644 --- a/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template +++ b/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template @@ -11,7 +11,7 @@ "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-160316", "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc2-23922" + "version": "1.0.0-rc2-23923" } }, "frameworks": { diff --git a/src/dotnet/project.json b/src/dotnet/project.json index 607bbeb2e..93ac5f242 100644 --- a/src/dotnet/project.json +++ b/src/dotnet/project.json @@ -49,25 +49,25 @@ "type": "build" }, "Microsoft.Extensions.Testing.Abstractions": "1.0.0-*", - "Microsoft.NETCore.ConsoleHost": "1.0.0-rc2-23922", - "Microsoft.NETCore.TestHost": "1.0.0-rc2-23922", - "NETStandard.Library": "1.5.0-rc2-23922", - "System.Reflection.Metadata": "1.3.0-rc2-23922", - "System.Diagnostics.TextWriterTraceListener": "4.0.0-rc2-23922", - "System.Diagnostics.TraceSource": "4.0.0-rc2-23922", - "System.Linq.Expressions": "4.0.11-rc2-23922", - "System.Xml.XDocument": "4.0.11-rc2-23922", - "System.Resources.ReaderWriter": "4.0.0-rc2-23922", - "System.Net.Sockets": "4.1.0-rc2-23922", - "System.Threading.ThreadPool": "4.0.10-rc2-23922", - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922", - "System.Private.DataContractSerialization": "4.1.1-rc2-23922", - "System.Net.Requests": "4.0.11-rc2-23922", + "Microsoft.NETCore.ConsoleHost": "1.0.0-rc2-23923", + "Microsoft.NETCore.TestHost": "1.0.0-rc2-23923", + "NETStandard.Library": "1.5.0-rc2-23923", + "System.Reflection.Metadata": "1.3.0-rc2-23923", + "System.Diagnostics.TextWriterTraceListener": "4.0.0-rc2-23923", + "System.Diagnostics.TraceSource": "4.0.0-rc2-23923", + "System.Linq.Expressions": "4.0.11-rc2-23923", + "System.Xml.XDocument": "4.0.11-rc2-23923", + "System.Resources.ReaderWriter": "4.0.0-rc2-23923", + "System.Net.Sockets": "4.1.0-rc2-23923", + "System.Threading.ThreadPool": "4.0.10-rc2-23923", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23923", + "System.Private.DataContractSerialization": "4.1.1-rc2-23923", + "System.Net.Requests": "4.0.11-rc2-23923", "Microsoft.Win32.Registry": { - "version": "4.0.0-rc2-23922", + "version": "4.0.0-rc2-23923", "exclude": "compile" }, - "System.Net.NameResolution": "4.0.0-rc2-23922" + "System.Net.NameResolution": "4.0.0-rc2-23923" }, "frameworks": { "netstandardapp1.5": { diff --git a/src/sharedframework/framework/project.json b/src/sharedframework/framework/project.json index 3f0a320fc..40f32f2b5 100644 --- a/src/sharedframework/framework/project.json +++ b/src/sharedframework/framework/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc2-23922", + "Microsoft.NETCore.App": "1.0.0-rc2-23923", "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160318-02" }, "runtimes": { diff --git a/test/ArgumentForwardingTests/project.json b/test/ArgumentForwardingTests/project.json index 3ee0a0b6c..ce7492e4a 100644 --- a/test/ArgumentForwardingTests/project.json +++ b/test/ArgumentForwardingTests/project.json @@ -4,8 +4,8 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23922", - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922", + "NETStandard.Library": "1.5.0-rc2-23923", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23923", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/ArgumentsReflector/project.json b/test/ArgumentsReflector/project.json index 027dd343b..becdac653 100644 --- a/test/ArgumentsReflector/project.json +++ b/test/ArgumentsReflector/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23922" + "NETStandard.Library": "1.5.0-rc2-23923" }, "frameworks": { "netstandardapp1.5": { diff --git a/test/EndToEnd/project.json b/test/EndToEnd/project.json index e414cabe0..e56263493 100644 --- a/test/EndToEnd/project.json +++ b/test/EndToEnd/project.json @@ -4,8 +4,8 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23922", - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922", + "NETStandard.Library": "1.5.0-rc2-23923", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23923", "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 9e51da297..e2fa560af 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json @@ -4,8 +4,8 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23922", - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922", + "NETStandard.Library": "1.5.0-rc2-23923", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23923", "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 0f8e1e9db..d28f3e50c 100644 --- a/test/Microsoft.DotNet.Compiler.Common.Tests/project.json +++ b/test/Microsoft.DotNet.Compiler.Common.Tests/project.json @@ -1,8 +1,8 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23922", - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922", + "NETStandard.Library": "1.5.0-rc2-23923", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23923", "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 ad6af8e6d..2d3d8c48d 100644 --- a/test/Microsoft.DotNet.ProjectModel.Tests/project.json +++ b/test/Microsoft.DotNet.ProjectModel.Tests/project.json @@ -1,8 +1,8 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23922", - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922", + "NETStandard.Library": "1.5.0-rc2-23923", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23923", "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 fe9ef0b32..5e6e4b797 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json @@ -5,9 +5,9 @@ "keyFile": "../../tools/Key.snk" }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23922", - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922", - "System.Collections.Immutable": "1.2.0-rc2-23922", + "NETStandard.Library": "1.5.0-rc2-23923", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23923", + "System.Collections.Immutable": "1.2.0-rc2-23923", "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 ec84928b0..bff15650e 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-23922", + "NETStandard.Library": "1.5.0-rc2-23923", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/ScriptExecutorTests/project.json b/test/ScriptExecutorTests/project.json index 094c2e9a6..dfbc2e6b3 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-23922", + "NETStandard.Library": "1.5.0-rc2-23923", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/dotnet-build.Tests/project.json b/test/dotnet-build.Tests/project.json index 31265a0ef..726fefbbc 100644 --- a/test/dotnet-build.Tests/project.json +++ b/test/dotnet-build.Tests/project.json @@ -1,8 +1,8 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23922", - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922", + "NETStandard.Library": "1.5.0-rc2-23923", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23923", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-compile.Tests/project.json b/test/dotnet-compile.Tests/project.json index b0015820f..250da6623 100644 --- a/test/dotnet-compile.Tests/project.json +++ b/test/dotnet-compile.Tests/project.json @@ -1,8 +1,8 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23922", - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922", + "NETStandard.Library": "1.5.0-rc2-23923", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23923", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-compile.UnitTests/project.json b/test/dotnet-compile.UnitTests/project.json index 1f22a79c0..f58c81c8d 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-23922", + "NETStandard.Library": "1.5.0-rc2-23923", "Microsoft.DotNet.Cli.Utils": { "target": "project" }, @@ -9,7 +9,7 @@ "target": "project" }, "Microsoft.Win32.Registry": { - "version": "4.0.0-rc2-23922", + "version": "4.0.0-rc2-23923", "exclude": "Compile" }, "Microsoft.DotNet.ProjectModel": { diff --git a/test/dotnet-pack.Tests/project.json b/test/dotnet-pack.Tests/project.json index 90a509c47..9b884c4f2 100644 --- a/test/dotnet-pack.Tests/project.json +++ b/test/dotnet-pack.Tests/project.json @@ -1,9 +1,9 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23922", - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922", - "System.IO.Compression.ZipFile": "4.0.1-rc2-23922", + "NETStandard.Library": "1.5.0-rc2-23923", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23923", + "System.IO.Compression.ZipFile": "4.0.1-rc2-23923", "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 7b5df4ea8..acf56bd54 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-23922", + "version": "4.0.0-rc2-23923", "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-23922" + "System.Net.NameResolution": "4.0.0-rc2-23923" }, "frameworks": { "netstandardapp1.5": { diff --git a/test/dotnet-publish.Tests/project.json b/test/dotnet-publish.Tests/project.json index 25dd63798..c8ad0b5ea 100644 --- a/test/dotnet-publish.Tests/project.json +++ b/test/dotnet-publish.Tests/project.json @@ -1,8 +1,8 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23922", - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922", + "NETStandard.Library": "1.5.0-rc2-23923", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23923", "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 72011dbbe..194aadb72 100644 --- a/test/dotnet-resgen.Tests/project.json +++ b/test/dotnet-resgen.Tests/project.json @@ -1,8 +1,8 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23922", - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922", + "NETStandard.Library": "1.5.0-rc2-23923", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23923", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-run.Tests/project.json b/test/dotnet-run.Tests/project.json index 26b12e51e..65148ea81 100644 --- a/test/dotnet-run.Tests/project.json +++ b/test/dotnet-run.Tests/project.json @@ -1,8 +1,8 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23922", - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922", + "NETStandard.Library": "1.5.0-rc2-23923", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23923", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-test.Tests/project.json b/test/dotnet-test.Tests/project.json index 42e868056..b825ed290 100644 --- a/test/dotnet-test.Tests/project.json +++ b/test/dotnet-test.Tests/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { "Newtonsoft.Json": "7.0.1", - "NETStandard.Library": "1.5.0-rc2-23922", + "NETStandard.Library": "1.5.0-rc2-23923", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, @@ -15,9 +15,9 @@ "Microsoft.Extensions.Testing.Abstractions": { "target": "project" }, - "System.Net.NameResolution": "4.0.0-rc2-23922", - "System.Net.Sockets": "4.1.0-rc2-23922", - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922", + "System.Net.NameResolution": "4.0.0-rc2-23923", + "System.Net.Sockets": "4.1.0-rc2-23923", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23923", "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-dev-91790-12" }, diff --git a/test/dotnet-test.UnitTests/project.json b/test/dotnet-test.UnitTests/project.json index 2a7e847bd..59f6a93c0 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-23922", + "NETStandard.Library": "1.5.0-rc2-23923", "dotnet": { "target": "project" }, "Microsoft.Win32.Registry": { - "version": "4.0.0-rc2-23922", + "version": "4.0.0-rc2-23923", "exclude": "Compile" }, "xunit": "2.1.0", diff --git a/test/dotnet.Tests/project.json b/test/dotnet.Tests/project.json index 6c13bb9ca..571208ffc 100644 --- a/test/dotnet.Tests/project.json +++ b/test/dotnet.Tests/project.json @@ -1,8 +1,8 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23922", - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922", + "NETStandard.Library": "1.5.0-rc2-23923", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23923", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/tools/MultiProjectValidator/project.json b/tools/MultiProjectValidator/project.json index cab1d2fd8..a359ebe82 100644 --- a/tools/MultiProjectValidator/project.json +++ b/tools/MultiProjectValidator/project.json @@ -5,7 +5,7 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23922", + "NETStandard.Library": "1.5.0-rc2-23923", "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 a85e9a3c8..762a41e4c 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": "4.0.2-rc2-23922", + "System.Runtime.Serialization.Json": "4.0.2-rc2-23923", "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-23922", - "NETStandard.Library": "1.5.0-rc2-23922" + "Microsoft.NETCore.ConsoleHost": "1.0.0-rc2-23923", + "NETStandard.Library": "1.5.0-rc2-23923" }, "frameworks": { "netstandardapp1.5": { From 95ad1ee461a7d2c3858eaaefebb2be30e2830c43 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Wed, 23 Mar 2016 09:16:40 -0500 Subject: [PATCH 06/11] Removing Microsoft.CodeAnalysis.CSharp from the sharedframework dependency since Microsoft.NETCore.App now has the correct version. --- src/sharedframework/framework/project.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/sharedframework/framework/project.json b/src/sharedframework/framework/project.json index 40f32f2b5..ad08b3f0b 100644 --- a/src/sharedframework/framework/project.json +++ b/src/sharedframework/framework/project.json @@ -4,8 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc2-23923", - "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160318-02" + "Microsoft.NETCore.App": "1.0.0-rc2-23923" }, "runtimes": { "win7-x64": {}, From 1febe48d7113f22e959bf2ae48441b46cceade3f Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Thu, 24 Mar 2016 08:37:08 -0500 Subject: [PATCH 07/11] Updating CoreFX version to rc2-23924 --- .../CompileFail/project.json | 2 +- .../FSharpTestProjects/TestApp/project.json | 2 +- .../TestAppWithArgs/project.json | 2 +- .../TestLibrary/project.json | 2 +- .../src/BrokenProjectPathSample/project.json | 2 +- .../src/EmptyConsoleApp/project.json | 2 +- .../src/EmptyLibrary/project.json | 2 +- .../src/FailReleaseProject/project.json | 2 +- .../IncompatiblePackageSample/project.json | 2 +- .../src/Project1/project.json | 2 +- .../dotnet-hello/v1/dotnet-hello/project.json | 2 +- .../dotnet-hello/v2/dotnet-hello/project.json | 2 +- .../TestPackages/dotnet-portable/project.json | 2 +- .../project.json | 2 +- .../AppWithDirectDependency/project.json | 2 +- .../AppWithOutputAssemblyName/project.json | 2 +- .../AppWithToolDependency/project.json | 2 +- .../TestProjects/CompileFail/project.json | 2 +- .../DependencyContextValidator/project.json | 2 +- .../TestApp/project.json | 2 +- .../TestAppDeps/project.json | 2 +- .../project.json | 2 +- .../OutputStandardOutputAndError/project.json | 2 +- .../PortableTests/PortableApp/project.json | 2 +- .../PortableAppWithNative/project.json | 2 +- .../PortableTests/StandaloneApp/project.json | 2 +- .../ProjectWithTests/project.json | 6 ++-- .../TestAppMultiTarget/project.json | 2 +- .../TestApp/project.json | 2 +- .../TestLibrary/project.json | 2 +- .../TestProjects/TestAppWithArgs/project.json | 2 +- .../TestAppWithContentPackage/project.json | 2 +- .../TestAppWithContents/project.json | 2 +- .../TestAppWithLibrary/TestApp/project.json | 2 +- .../TestLibrary/project.json | 2 +- .../TestAppWithScripts/project.json | 2 +- .../TestApp/project.json | 2 +- .../TestLibrary/project.json | 2 +- .../TestLibrary2/project.json | 2 +- .../TestLibraryWithAppDependency/project.json | 2 +- .../TestApp/project.json | 2 +- .../TestLibraryGreater/project.json | 2 +- .../TestLibraryLesser/project.json | 2 +- .../TestLibraryWithAnalyzer/project.json | 2 +- .../TestLibraryWithConfiguration/project.json | 2 +- .../project.json | 2 +- .../TestMicrosoftCSharpReference/project.json | 4 +-- .../src/L0/project.json | 2 +- .../src/L11/project.json | 2 +- .../src/L12/project.json | 2 +- .../src/L21/project.json | 2 +- .../src/L22/project.json | 2 +- .../project.json | 2 +- .../TestProjectWithResource/project.json | 2 +- .../TestSimpleIncrementalApp/project.json | 2 +- .../project.json | 4 +-- scripts/dotnet-cli-build/CompileTargets.cs | 2 +- scripts/dotnet-cli-build/project.json | 6 ++-- scripts/update-dependencies/project.json | 6 ++-- src/Microsoft.DotNet.Cli.Utils/project.json | 4 +-- .../project.json | 2 +- src/Microsoft.DotNet.Files/project.json | 4 +-- .../project.json | 2 +- .../project.json | 4 +-- .../project.json | 2 +- .../project.json | 16 +++++----- .../project.json | 2 +- .../project.json | 4 +-- .../project.json | 6 ++-- .../dotnet-compile-native/appdep/project.json | 2 +- .../CSharp_Console/project.json.template | 2 +- .../FSharp_Console/project.json.template | 2 +- src/dotnet/project.json | 32 +++++++++---------- src/sharedframework/framework/project.json | 2 +- test/ArgumentForwardingTests/project.json | 4 +-- test/ArgumentsReflector/project.json | 2 +- test/EndToEnd/project.json | 4 +-- .../project.json | 4 +-- .../project.json | 4 +-- .../project.json | 4 +-- .../project.json | 6 ++-- .../project.json | 2 +- test/ScriptExecutorTests/project.json | 2 +- test/dotnet-build.Tests/project.json | 4 +-- test/dotnet-compile.Tests/project.json | 4 +-- test/dotnet-compile.UnitTests/project.json | 4 +-- test/dotnet-pack.Tests/project.json | 6 ++-- .../project.json | 4 +-- test/dotnet-publish.Tests/project.json | 4 +-- test/dotnet-resgen.Tests/project.json | 4 +-- test/dotnet-run.Tests/project.json | 4 +-- test/dotnet-test.Tests/project.json | 8 ++--- test/dotnet-test.UnitTests/project.json | 4 +-- test/dotnet.Tests/project.json | 4 +-- tools/MultiProjectValidator/project.json | 2 +- tools/RuntimeGraphGenerator/project.json | 6 ++-- 96 files changed, 155 insertions(+), 155 deletions(-) diff --git a/TestAssets/FSharpTestProjects/CompileFail/project.json b/TestAssets/FSharpTestProjects/CompileFail/project.json index c21d4b534..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-23923" + "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 fbe681861..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-23923", + "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 c21d4b534..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-23923" + "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 da83787b1..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-23923" + "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 e50dfb5b8..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-23923", + "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 772e50245..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-23923" + "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 1fbedab18..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-23923" + "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 b846dca68..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-23923" + "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 be61ff6b4..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-23923", + "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 95a1147c3..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-23923" + "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 af996e4d7..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-23923" + "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 b17cef597..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-23923" + "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 112e9031b..d5a2ea453 100644 --- a/TestAssets/TestPackages/dotnet-portable/project.json +++ b/TestAssets/TestPackages/dotnet-portable/project.json @@ -12,7 +12,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc2-23923" + "version": "1.0.0-rc2-23924" } } } diff --git a/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json b/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json index 1dfa37317..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-23923", + "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 346611031..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-23923", + "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 a9f447ed1..4d9914336 100644 --- a/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json +++ b/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json @@ -5,7 +5,7 @@ "preserveCompilationContext": true }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23923" + "NETStandard.Library": "1.0.0-rc2-23924" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/AppWithToolDependency/project.json b/TestAssets/TestProjects/AppWithToolDependency/project.json index ced0180f2..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-23923" + "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 3f2be6c69..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-23923" + "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 7006c16dc..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-23923", + "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 6d1849a81..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-23923", + "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 f37db52f4..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-23923", + "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 7ea51f225..e4b1d8d9e 100644 --- a/TestAssets/TestProjects/LibraryWithOutputAssemblyName/project.json +++ b/TestAssets/TestProjects/LibraryWithOutputAssemblyName/project.json @@ -3,7 +3,7 @@ "outputName": "MyLibrary" }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23923" + "NETStandard.Library": "1.0.0-rc2-23924" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/OutputStandardOutputAndError/project.json b/TestAssets/TestProjects/OutputStandardOutputAndError/project.json index 3f2be6c69..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-23923" + "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 3a0719d81..56d593360 100644 --- a/TestAssets/TestProjects/PortableTests/PortableApp/project.json +++ b/TestAssets/TestProjects/PortableTests/PortableApp/project.json @@ -12,7 +12,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc2-23923" + "version": "1.0.0-rc2-23924" } } } diff --git a/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json b/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json index 3d87e0d41..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-23923" }, + "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 d3ab2c35d..ea636259a 100644 --- a/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json +++ b/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json @@ -9,7 +9,7 @@ "portable-net45+win8" ], "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc2-23923" + "Microsoft.NETCore.App": "1.0.0-rc2-23924" } } }, diff --git a/TestAssets/TestProjects/ProjectWithTests/project.json b/TestAssets/TestProjects/ProjectWithTests/project.json index a6a679609..80b7a27aa 100644 --- a/TestAssets/TestProjects/ProjectWithTests/project.json +++ b/TestAssets/TestProjects/ProjectWithTests/project.json @@ -1,9 +1,9 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23923", - "System.Linq.Expressions": "4.0.11-rc2-23923", - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23923", + "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" }, diff --git a/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json b/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json index 1b90d4c53..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-23923" + "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 c1d34f2e4..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-23923" + "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 7b4ee6915..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-23923" + "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 3f2be6c69..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-23923" + "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 17e46581e..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-23923", + "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 cd49bc966..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-23923" + "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 8b8b0744d..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-23923" + "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 7b4ee6915..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-23923" + "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 5c6e48a5f..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-23923" + "NETStandard.Library": "1.5.0-rc2-23924" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json index 4885cac53..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-23923" + "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 7b4ee6915..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-23923" + "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 b0723243c..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-23923" + "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 a362f4e7f..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-23923" + "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 8b8b0744d..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-23923" + "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 888521ff8..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-23923" + "NETStandard.Library": "1.5.0-rc2-23924" } } } diff --git a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json index 04eff95bb..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-23923" + "NETStandard.Library": "1.5.0-rc2-23924" } } } diff --git a/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json b/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json index 569919064..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-23923", + "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 a7731a443..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-23923" + "NETStandard.Library": "1.5.0-rc2-23924" }, "configurations": { "Test": {} diff --git a/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json b/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json index 3a66c367b..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-23923" + "NETStandard.Library": "1.5.0-rc2-23924" } } } diff --git a/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json b/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json index 3383fd459..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-23923" + "NETStandard.Library": "1.5.0-rc2-23924" } }, "dnx451": { "dependencies": { - "Microsoft.CSharp": "4.0.1-rc2-23923" + "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 dc50f6dad..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-23923" + "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 76e456102..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-23923" + "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 1b681080c..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-23923" + "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 3a3dd224f..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-23923" + "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 3a3dd224f..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-23923" + "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 3f2be6c69..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-23923" + "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 3f2be6c69..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-23923" + "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 f65f557c4..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-23923" + "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 4f27b485f..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-23923", - "System.Diagnostics.Process": "4.1.0-rc2-23923", + "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 1d220699a..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-23923"; + 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; diff --git a/scripts/dotnet-cli-build/project.json b/scripts/dotnet-cli-build/project.json index a47d5d3e3..729b4ff17 100755 --- a/scripts/dotnet-cli-build/project.json +++ b/scripts/dotnet-cli-build/project.json @@ -5,9 +5,9 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23923", - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23923", - "System.Xml.XmlSerializer": "4.0.11-rc2-23923", + "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" diff --git a/scripts/update-dependencies/project.json b/scripts/update-dependencies/project.json index cb85fed12..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-23923", - "Microsoft.CSharp": "4.0.1-rc2-23923", - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23923", + "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 cfcf2e81a..ee19f5d23 100644 --- a/src/Microsoft.DotNet.Cli.Utils/project.json +++ b/src/Microsoft.DotNet.Cli.Utils/project.json @@ -23,8 +23,8 @@ "netstandard1.5": { "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23923", - "System.Diagnostics.Process": "4.1.0-rc2-23923" + "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 c2ccf10ef..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-23923", + "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-*", diff --git a/src/Microsoft.DotNet.Files/project.json b/src/Microsoft.DotNet.Files/project.json index 7c501a399..5d355bc76 100644 --- a/src/Microsoft.DotNet.Files/project.json +++ b/src/Microsoft.DotNet.Files/project.json @@ -5,8 +5,8 @@ }, "description": "Abstraction to interact with the file system and file paths.", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23923", - "System.Linq.Expressions": "4.0.11-rc2-23923", + "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-*" diff --git a/src/Microsoft.DotNet.InternalAbstractions/project.json b/src/Microsoft.DotNet.InternalAbstractions/project.json index b962e6ca3..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-23923" + "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 a7edc535c..9cdfeb769 100644 --- a/src/Microsoft.DotNet.ProjectModel.Loader/project.json +++ b/src/Microsoft.DotNet.ProjectModel.Loader/project.json @@ -4,9 +4,9 @@ "keyFile": "../../tools/Key.snk" }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23923", + "NETStandard.Library": "1.5.0-rc2-23924", "Microsoft.DotNet.ProjectModel": "1.0.0-*", - "System.Runtime.Loader": "4.0.0-rc2-23923" + "System.Runtime.Loader": "4.0.0-rc2-23924" }, "frameworks": { "netstandard1.5": { diff --git a/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json b/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json index 68f18ef59..513486c98 100644 --- a/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json +++ b/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json @@ -4,7 +4,7 @@ "keyFile": "../../tools/Key.snk" }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23923", + "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" diff --git a/src/Microsoft.DotNet.ProjectModel/project.json b/src/Microsoft.DotNet.ProjectModel/project.json index 0a69b4814..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-23923", + "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": { @@ -35,13 +35,13 @@ "netstandard1.5": { "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23923", - "System.Dynamic.Runtime": "4.0.11-rc2-23923", - "System.Threading.Thread": "4.0.0-rc2-23923", - "System.Runtime.Loader": "4.0.0-rc2-23923", - "System.Security.Cryptography.Algorithms": "4.1.0-rc2-23923", - "Microsoft.CSharp": "4.0.1-rc2-23923", - "System.Xml.XDocument": "4.0.11-rc2-23923" + "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 edb2a7d9e..9024a5f16 100644 --- a/src/Microsoft.DotNet.TestFramework/project.json +++ b/src/Microsoft.DotNet.TestFramework/project.json @@ -11,7 +11,7 @@ "licenseUrl": "", "dependencies": { "Microsoft.DotNet.Cli.Utils": "1.0.0-*", - "NETStandard.Library": "1.5.0-rc2-23923" + "NETStandard.Library": "1.5.0-rc2-23924" }, "frameworks": { "netstandard1.5": { diff --git a/src/Microsoft.Extensions.DependencyModel/project.json b/src/Microsoft.Extensions.DependencyModel/project.json index b07044581..ed6aaf4e3 100644 --- a/src/Microsoft.Extensions.DependencyModel/project.json +++ b/src/Microsoft.Extensions.DependencyModel/project.json @@ -26,8 +26,8 @@ "netstandard1.3": { "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23923", - "System.Dynamic.Runtime": "4.0.11-rc2-23923" + "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 62f77f3f1..8c8a2d6a3 100644 --- a/src/Microsoft.Extensions.Testing.Abstractions/project.json +++ b/src/Microsoft.Extensions.Testing.Abstractions/project.json @@ -19,9 +19,9 @@ "netstandard1.5": { "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23923", - "System.Resources.ResourceManager": "4.0.1-rc2-23923", - "System.Reflection.TypeExtensions": "4.1.0-rc2-23923" + "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 c8d99aae2..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-23923", + "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 931ba93e0..e6ed07c4b 100644 --- a/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template +++ b/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc2-23923" + "version": "1.0.0-rc2-23924" } }, "frameworks": { 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 567ec0854..d4639c625 100644 --- a/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template +++ b/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template @@ -11,7 +11,7 @@ "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-160316", "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc2-23923" + "version": "1.0.0-rc2-23924" } }, "frameworks": { diff --git a/src/dotnet/project.json b/src/dotnet/project.json index 93ac5f242..ea9754ac9 100644 --- a/src/dotnet/project.json +++ b/src/dotnet/project.json @@ -49,25 +49,25 @@ "type": "build" }, "Microsoft.Extensions.Testing.Abstractions": "1.0.0-*", - "Microsoft.NETCore.ConsoleHost": "1.0.0-rc2-23923", - "Microsoft.NETCore.TestHost": "1.0.0-rc2-23923", - "NETStandard.Library": "1.5.0-rc2-23923", - "System.Reflection.Metadata": "1.3.0-rc2-23923", - "System.Diagnostics.TextWriterTraceListener": "4.0.0-rc2-23923", - "System.Diagnostics.TraceSource": "4.0.0-rc2-23923", - "System.Linq.Expressions": "4.0.11-rc2-23923", - "System.Xml.XDocument": "4.0.11-rc2-23923", - "System.Resources.ReaderWriter": "4.0.0-rc2-23923", - "System.Net.Sockets": "4.1.0-rc2-23923", - "System.Threading.ThreadPool": "4.0.10-rc2-23923", - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23923", - "System.Private.DataContractSerialization": "4.1.1-rc2-23923", - "System.Net.Requests": "4.0.11-rc2-23923", + "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-23923", + "version": "4.0.0-rc2-23924", "exclude": "compile" }, - "System.Net.NameResolution": "4.0.0-rc2-23923" + "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 ad08b3f0b..b2b2d3d0d 100644 --- a/src/sharedframework/framework/project.json +++ b/src/sharedframework/framework/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc2-23923" + "Microsoft.NETCore.App": "1.0.0-rc2-23924" }, "runtimes": { "win7-x64": {}, diff --git a/test/ArgumentForwardingTests/project.json b/test/ArgumentForwardingTests/project.json index ce7492e4a..84c489d09 100644 --- a/test/ArgumentForwardingTests/project.json +++ b/test/ArgumentForwardingTests/project.json @@ -4,8 +4,8 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23923", - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23923", + "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 becdac653..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-23923" + "NETStandard.Library": "1.5.0-rc2-23924" }, "frameworks": { "netstandardapp1.5": { diff --git a/test/EndToEnd/project.json b/test/EndToEnd/project.json index e56263493..188dc2210 100644 --- a/test/EndToEnd/project.json +++ b/test/EndToEnd/project.json @@ -4,8 +4,8 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23923", - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23923", + "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 e2fa560af..222d67327 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json @@ -4,8 +4,8 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23923", - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23923", + "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 d28f3e50c..1aad5fe9f 100644 --- a/test/Microsoft.DotNet.Compiler.Common.Tests/project.json +++ b/test/Microsoft.DotNet.Compiler.Common.Tests/project.json @@ -1,8 +1,8 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23923", - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23923", + "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 2d3d8c48d..edfa02b92 100644 --- a/test/Microsoft.DotNet.ProjectModel.Tests/project.json +++ b/test/Microsoft.DotNet.ProjectModel.Tests/project.json @@ -1,8 +1,8 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23923", - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23923", + "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 5e6e4b797..67267f7c3 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json @@ -5,9 +5,9 @@ "keyFile": "../../tools/Key.snk" }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23923", - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23923", - "System.Collections.Immutable": "1.2.0-rc2-23923", + "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 bff15650e..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-23923", + "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 dfbc2e6b3..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-23923", + "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 726fefbbc..6a20212f2 100644 --- a/test/dotnet-build.Tests/project.json +++ b/test/dotnet-build.Tests/project.json @@ -1,8 +1,8 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23923", - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23923", + "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 250da6623..b499c6ff4 100644 --- a/test/dotnet-compile.Tests/project.json +++ b/test/dotnet-compile.Tests/project.json @@ -1,8 +1,8 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23923", - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23923", + "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 f58c81c8d..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-23923", + "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-23923", + "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 9b884c4f2..c2ad35c60 100644 --- a/test/dotnet-pack.Tests/project.json +++ b/test/dotnet-pack.Tests/project.json @@ -1,9 +1,9 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23923", - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23923", - "System.IO.Compression.ZipFile": "4.0.1-rc2-23923", + "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 acf56bd54..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-23923", + "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-23923" + "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 c8ad0b5ea..54d7ab1ed 100644 --- a/test/dotnet-publish.Tests/project.json +++ b/test/dotnet-publish.Tests/project.json @@ -1,8 +1,8 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23923", - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23923", + "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 194aadb72..806dabbc3 100644 --- a/test/dotnet-resgen.Tests/project.json +++ b/test/dotnet-resgen.Tests/project.json @@ -1,8 +1,8 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23923", - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23923", + "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 65148ea81..5df7c0bb0 100644 --- a/test/dotnet-run.Tests/project.json +++ b/test/dotnet-run.Tests/project.json @@ -1,8 +1,8 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23923", - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23923", + "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 b825ed290..6974349c1 100644 --- a/test/dotnet-test.Tests/project.json +++ b/test/dotnet-test.Tests/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { "Newtonsoft.Json": "7.0.1", - "NETStandard.Library": "1.5.0-rc2-23923", + "NETStandard.Library": "1.5.0-rc2-23924", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, @@ -15,9 +15,9 @@ "Microsoft.Extensions.Testing.Abstractions": { "target": "project" }, - "System.Net.NameResolution": "4.0.0-rc2-23923", - "System.Net.Sockets": "4.1.0-rc2-23923", - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23923", + "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" }, diff --git a/test/dotnet-test.UnitTests/project.json b/test/dotnet-test.UnitTests/project.json index 59f6a93c0..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-23923", + "NETStandard.Library": "1.5.0-rc2-23924", "dotnet": { "target": "project" }, "Microsoft.Win32.Registry": { - "version": "4.0.0-rc2-23923", + "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 571208ffc..29a918c8b 100644 --- a/test/dotnet.Tests/project.json +++ b/test/dotnet.Tests/project.json @@ -1,8 +1,8 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23923", - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23923", + "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 a359ebe82..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-23923", + "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 762a41e4c..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": "4.0.2-rc2-23923", + "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-23923", - "NETStandard.Library": "1.5.0-rc2-23923" + "Microsoft.NETCore.ConsoleHost": "1.0.0-rc2-23924", + "NETStandard.Library": "1.5.0-rc2-23924" }, "frameworks": { "netstandardapp1.5": { From f7188ddb20efb760513c58d4a3ae4bd753cd0e6a Mon Sep 17 00:00:00 2001 From: Andrew Stanton-Nurse Date: Thu, 24 Mar 2016 12:42:04 -0700 Subject: [PATCH 08/11] fix issue in LibraryExporter with placeholders --- .../Compilation/LibraryExporter.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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)))); } } } From 5090f3bbb5229f03167a6f56519b7dc9c1e97fc6 Mon Sep 17 00:00:00 2001 From: Andrew Stanton-Nurse Date: Thu, 24 Mar 2016 15:11:54 -0700 Subject: [PATCH 09/11] change dependency model to netstandard 1.5 --- src/Microsoft.Extensions.DependencyModel/project.json | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Microsoft.Extensions.DependencyModel/project.json b/src/Microsoft.Extensions.DependencyModel/project.json index ed6aaf4e3..bc2b54af9 100644 --- a/src/Microsoft.Extensions.DependencyModel/project.json +++ b/src/Microsoft.Extensions.DependencyModel/project.json @@ -23,11 +23,14 @@ }, "frameworks": { "net451": {}, - "netstandard1.3": { + "netstandard1.5": { "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23924", - "System.Dynamic.Runtime": "4.0.11-rc2-23924" + "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" } } }, From 9414e8d8ad4d594f0e8ecd64a2e447fd3c0a6e17 Mon Sep 17 00:00:00 2001 From: Andrew Stanton-Nurse Date: Thu, 24 Mar 2016 15:31:47 -0700 Subject: [PATCH 10/11] fix DependencyModel project.json --- src/Microsoft.Extensions.DependencyModel/project.json | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/Microsoft.Extensions.DependencyModel/project.json b/src/Microsoft.Extensions.DependencyModel/project.json index bc2b54af9..ed6aaf4e3 100644 --- a/src/Microsoft.Extensions.DependencyModel/project.json +++ b/src/Microsoft.Extensions.DependencyModel/project.json @@ -23,14 +23,11 @@ }, "frameworks": { "net451": {}, - "netstandard1.5": { + "netstandard1.3": { "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" } } }, From 4e8569d57f3bcb874c82fde5d8d80e3125aa9c4a Mon Sep 17 00:00:00 2001 From: Andrew Stanton-Nurse Date: Thu, 24 Mar 2016 16:07:17 -0700 Subject: [PATCH 11/11] herp derp netstandard --- src/Microsoft.Extensions.DependencyModel/project.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Microsoft.Extensions.DependencyModel/project.json b/src/Microsoft.Extensions.DependencyModel/project.json index ed6aaf4e3..9556a02ae 100644 --- a/src/Microsoft.Extensions.DependencyModel/project.json +++ b/src/Microsoft.Extensions.DependencyModel/project.json @@ -23,7 +23,7 @@ }, "frameworks": { "net451": {}, - "netstandard1.3": { + "netstandard1.5": { "imports": "dnxcore50", "dependencies": { "NETStandard.Library": "1.5.0-rc2-23924",