From 46db1a69bd745282d1d6a1267193ee02e37c4cba Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Fri, 25 Mar 2016 16:47:59 -0500 Subject: [PATCH 1/3] Fix install path for update-dependencies.ps1. --- scripts/update-dependencies.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/update-dependencies.ps1 b/scripts/update-dependencies.ps1 index ccf609f57..c160126e8 100644 --- a/scripts/update-dependencies.ps1 +++ b/scripts/update-dependencies.ps1 @@ -28,7 +28,7 @@ Write-Host "Installing .NET Core CLI Stage 0" & "$PSScriptRoot\obtain\install.ps1" -Architecture x64 # Put the stage0 on the path -$env:PATH = "$env:DOTNET_INSTALL_DIR\cli;$env:PATH" +$env:PATH = "$env:DOTNET_INSTALL_DIR;$env:PATH" $appPath = "$PSScriptRoot\update-dependencies" From ed887d183a230b5eb74c98599603a50554a7efce Mon Sep 17 00:00:00 2001 From: eerhardt Date: Fri, 25 Mar 2016 16:48:25 -0500 Subject: [PATCH 2/3] 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 | 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 | 28 +++++++++++-------- .../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 | 8 +++--- 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 | 11 +++++--- .../dotnet-compile-native/appdep/project.json | 2 +- .../CSharp_Console/project.json.template | 2 +- .../FSharp_Console/project.json.template | 2 +- src/dotnet/project.json | 28 +++++++++---------- src/sharedframework/framework/project.json | 2 +- test/ArgumentForwardingTests/project.json | 4 +-- test/ArgumentsReflector/project.json | 2 +- test/EndToEnd/project.json | 4 +-- .../project.json | 5 ++-- .../project.json | 4 +-- .../project.json | 4 +-- .../project.json | 6 ++-- .../project.json | 2 +- test/ScriptExecutorTests/project.json | 2 +- .../project.json | 25 ++++++++++------- .../project.json | 19 +++++++------ .../TestAppWithFullPdbs/project.json | 7 +++-- .../TestAppWithPortablePdbs/project.json | 7 +++-- 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 ++-- 100 files changed, 208 insertions(+), 190 deletions(-) diff --git a/TestAssets/FSharpTestProjects/CompileFail/project.json b/TestAssets/FSharpTestProjects/CompileFail/project.json index bf1d8a0c5..2707dc7db 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-23924" + "NETStandard.Library": "1.5.0-rc2-23925" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/FSharpTestProjects/TestApp/project.json b/TestAssets/FSharpTestProjects/TestApp/project.json index a2b8bf1ed..fb5493291 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-23924", + "NETStandard.Library": "1.5.0-rc2-23925", "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 bf1d8a0c5..2707dc7db 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-23924" + "NETStandard.Library": "1.5.0-rc2-23925" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/FSharpTestProjects/TestLibrary/project.json b/TestAssets/FSharpTestProjects/TestLibrary/project.json index d0b78696d..b83086c95 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-23924" + "NETStandard.Library": "1.5.0-rc2-23925" }, "compilerName": "fsc", "compileFiles": [ diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json index d9389ff82..a8600a76e 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-23924", + "NETStandard.Library": "1.5.0-rc2-23925", "EmptyLibrary": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json index 7267c7fca..a5cea53de 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-23924" + "NETStandard.Library": "1.5.0-rc2-23925" } }, "dnx451": {} diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json index ad738a71d..cb830d810 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-23924" + "NETStandard.Library": "1.5.0-rc2-23925" } } } diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json index e2ea8cb92..35fa2db34 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-23924" + "NETStandard.Library": "1.5.0-rc2-23925" } } }, diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json index d310a48ef..dd3827428 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-23924", + "NETStandard.Library": "1.5.0-rc2-23925", "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 7dbf4efa6..99fd8d1d2 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-23924" + "NETStandard.Library": "1.5.0-rc2-23925" }, "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 9354228b6..957f50b62 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-23924" + "NETStandard.Library": "1.5.0-rc2-23925" }, "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 fc306e987..2917e04bb 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-23924" + "NETStandard.Library": "1.5.0-rc2-23925" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestPackages/dotnet-portable/project.json b/TestAssets/TestPackages/dotnet-portable/project.json index d5a2ea453..f975de857 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-23924" + "version": "1.0.0-rc2-23925" } } } diff --git a/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json b/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json index 665d73eb4..c49e3615b 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-23924", + "NETStandard.Library": "1.5.0-rc2-23925", "dotnet-hello": { "version": "1.0.0", "target": "package" diff --git a/TestAssets/TestProjects/AppWithDirectDependency/project.json b/TestAssets/TestProjects/AppWithDirectDependency/project.json index 021e8cef5..b598b03da 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-23924", + "NETStandard.Library": "1.5.0-rc2-23925", "dotnet-hello": { "version": "1.0.0", "target": "package" diff --git a/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json b/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json index 4d9914336..6cd40e67e 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-23924" + "NETStandard.Library": "1.0.0-rc2-23925" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/AppWithToolDependency/project.json b/TestAssets/TestProjects/AppWithToolDependency/project.json index 660ec4426..147370fc7 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-23924" + "NETStandard.Library": "1.5.0-rc2-23925" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/CompileFail/project.json b/TestAssets/TestProjects/CompileFail/project.json index 6ed448952..17db9e9b7 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-23924" + "NETStandard.Library": "1.5.0-rc2-23925" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json b/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json index 2d80d81be..0b31eb8b3 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-23924", + "NETStandard.Library": "1.5.0-rc2-23925", "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 bff60679c..0fffb6336 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-23924", + "NETStandard.Library": "1.5.0-rc2-23925", "DependencyContextValidator": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json index ec8cad99d..ff43ee8fe 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-23924", + "NETStandard.Library": "1.5.0-rc2-23925", "DependencyContextValidator": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/TestProjects/LibraryWithOutputAssemblyName/project.json b/TestAssets/TestProjects/LibraryWithOutputAssemblyName/project.json index e4b1d8d9e..edd569619 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-23924" + "NETStandard.Library": "1.0.0-rc2-23925" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/OutputStandardOutputAndError/project.json b/TestAssets/TestProjects/OutputStandardOutputAndError/project.json index 6ed448952..17db9e9b7 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-23924" + "NETStandard.Library": "1.5.0-rc2-23925" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/PortableTests/PortableApp/project.json b/TestAssets/TestProjects/PortableTests/PortableApp/project.json index 56d593360..380ffb3f7 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-23924" + "version": "1.0.0-rc2-23925" } } } diff --git a/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json b/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json index c58bbdb2b..04779ea70 100644 --- a/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json +++ b/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json @@ -1,14 +1,20 @@ { - "compilationOptions": { - "emitEntryPoint": true - }, - "frameworks": { - "netstandard1.5": { - "imports": [ "dnxcore50", "portable-net45+win8" ], - "dependencies": { - "Microsoft.NETCore.App": { "type": "platform", "version": "1.0.0-rc2-23924" }, - "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*" - } - } + "compilationOptions": { + "emitEntryPoint": true + }, + "frameworks": { + "netstandard1.5": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ], + "dependencies": { + "Microsoft.NETCore.App": { + "type": "platform", + "version": "1.0.0-rc2-23925" + }, + "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*" + } } + } } diff --git a/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json b/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json index ea636259a..90659dfe8 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-23924" + "Microsoft.NETCore.App": "1.0.0-rc2-23925" } } }, diff --git a/TestAssets/TestProjects/ProjectWithTests/project.json b/TestAssets/TestProjects/ProjectWithTests/project.json index 80b7a27aa..d703901b9 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-23924", - "System.Linq.Expressions": "4.0.11-rc2-23924", - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23924", + "NETStandard.Library": "1.5.0-rc2-23925", + "System.Linq.Expressions": "4.0.11-rc2-23925", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23925", "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 cdeb32955..d428f131e 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-23924" + "NETStandard.Library": "1.5.0-rc2-23925" } }, "net451": {} diff --git a/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json b/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json index ed7b9eb7e..db65ced3b 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-23924" + "NETStandard.Library": "1.5.0-rc2-23925" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json b/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json index 4c29fd995..0f45119de 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-23924" + "NETStandard.Library": "1.5.0-rc2-23925" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestAppWithArgs/project.json b/TestAssets/TestProjects/TestAppWithArgs/project.json index 6ed448952..17db9e9b7 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-23924" + "NETStandard.Library": "1.5.0-rc2-23925" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestAppWithContentPackage/project.json b/TestAssets/TestProjects/TestAppWithContentPackage/project.json index 1fc3f27e5..82c4ec0f7 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-23924", + "NETStandard.Library": "1.5.0-rc2-23925", "SharedContentA": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/TestProjects/TestAppWithContents/project.json b/TestAssets/TestProjects/TestAppWithContents/project.json index 36e6a7b4e..f9e1473a4 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-23924" + "NETStandard.Library": "1.5.0-rc2-23925" }, "content": "testcontentfile.txt", "frameworks": { diff --git a/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json b/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json index d83f0b9cf..3f4129654 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-23924" + "NETStandard.Library": "1.5.0-rc2-23925" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json b/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json index 4c29fd995..0f45119de 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-23924" + "NETStandard.Library": "1.5.0-rc2-23925" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestAppWithScripts/project.json b/TestAssets/TestProjects/TestAppWithScripts/project.json index 4cdc40b5a..693fed8bf 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-23924" + "NETStandard.Library": "1.5.0-rc2-23925" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json index 2565bb1f8..d82b10c71 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-23924" + "NETStandard.Library": "1.5.0-rc2-23925" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json index 4c29fd995..0f45119de 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-23924" + "NETStandard.Library": "1.5.0-rc2-23925" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json index 1af9c8f7d..67d6b2747 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-23924" + "NETStandard.Library": "1.5.0-rc2-23925" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json index bc660076e..be8360840 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-23924" + "NETStandard.Library": "1.5.0-rc2-23925" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json b/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json index d83f0b9cf..3f4129654 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-23924" + "NETStandard.Library": "1.5.0-rc2-23925" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json index 1480454ec..ee4684e5f 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-23924" + "NETStandard.Library": "1.5.0-rc2-23925" } } } diff --git a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json index ce721c4e0..77ee53c1a 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-23924" + "NETStandard.Library": "1.5.0-rc2-23925" } } } diff --git a/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json b/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json index a5d85eec6..9bb23b3d1 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-23924", + "NETStandard.Library": "1.5.0-rc2-23925", "System.Runtime.Analyzers": { "version": "1.1.0", "type": "build" diff --git a/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json b/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json index e9af3aa14..7056a1032 100644 --- a/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json +++ b/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json @@ -10,7 +10,7 @@ ] }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23924" + "NETStandard.Library": "1.5.0-rc2-23925" }, "configurations": { "Test": {} diff --git a/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json b/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json index 7e976a86f..b5b254557 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-23924" + "NETStandard.Library": "1.5.0-rc2-23925" } } } diff --git a/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json b/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json index 72e3eb4ba..94827d001 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-23924" + "NETStandard.Library": "1.5.0-rc2-23925" } }, "dnx451": { "dependencies": { - "Microsoft.CSharp": "4.0.1-rc2-23924" + "Microsoft.CSharp": "4.0.1-rc2-23925" } } } diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json index 4ce4d0229..0b0145028 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-23924" + "NETStandard.Library": "1.5.0-rc2-23925" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json index 3ec17a90b..adc2522a2 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-23924" + "NETStandard.Library": "1.5.0-rc2-23925" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json index 475bd3947..2e43cadba 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-23924" + "NETStandard.Library": "1.5.0-rc2-23925" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json index d3a58c375..a36a671bf 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-23924" + "NETStandard.Library": "1.5.0-rc2-23925" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json index d3a58c375..a36a671bf 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-23924" + "NETStandard.Library": "1.5.0-rc2-23925" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json b/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json index 6ed448952..17db9e9b7 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-23924" + "NETStandard.Library": "1.5.0-rc2-23925" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestProjectWithResource/project.json b/TestAssets/TestProjects/TestProjectWithResource/project.json index 6ed448952..17db9e9b7 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-23924" + "NETStandard.Library": "1.5.0-rc2-23925" }, "frameworks": { "netstandardapp1.5": { diff --git a/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json b/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json index 090c5d7bd..de784d1e8 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-23924" + "NETStandard.Library": "1.5.0-rc2-23925" }, "frameworks": { "netstandardapp1.5": { diff --git a/scripts/Microsoft.DotNet.Cli.Build.Framework/project.json b/scripts/Microsoft.DotNet.Cli.Build.Framework/project.json index 566a090c6..c5386d425 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-23924", - "System.Diagnostics.Process": "4.1.0-rc2-23924", + "NETStandard.Library": "1.5.0-rc2-23925", + "System.Diagnostics.Process": "4.1.0-rc2-23925", "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 1a1389923..e46c6ba9c 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-23924"; + public static readonly string CoreCLRVersion = "1.0.2-rc2-23925"; 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 63c2a871b..df10f005b 100755 --- a/scripts/dotnet-cli-build/project.json +++ b/scripts/dotnet-cli-build/project.json @@ -5,12 +5,12 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23924", - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23924", - "System.Xml.XmlSerializer": "4.0.11-rc2-23924", + "NETStandard.Library": "1.5.0-rc2-23925", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23925", + "System.Xml.XmlSerializer": "4.0.11-rc2-23925", "Microsoft.DotNet.Cli.Build.Framework": "1.0.0-*", "WindowsAzure.Storage": "6.2.2-preview", - "System.Reflection.Metadata": "1.3.0-rc2-23924" + "System.Reflection.Metadata": "1.3.0-rc2-23925" }, "frameworks": { "netstandardapp1.5": { diff --git a/scripts/update-dependencies/project.json b/scripts/update-dependencies/project.json index fa78a3f27..ac5465e1b 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-23924", - "Microsoft.CSharp": "4.0.1-rc2-23924", - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23924", + "NETStandard.Library": "1.5.0-rc2-23925", + "Microsoft.CSharp": "4.0.1-rc2-23925", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23925", "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 ee19f5d23..ceaa569d5 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-23924", - "System.Diagnostics.Process": "4.1.0-rc2-23924" + "NETStandard.Library": "1.5.0-rc2-23925", + "System.Diagnostics.Process": "4.1.0-rc2-23925" } } } diff --git a/src/Microsoft.DotNet.Compiler.Common/project.json b/src/Microsoft.DotNet.Compiler.Common/project.json index c5ae89950..2b91a7aca 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-23924", + "NETStandard.Library": "1.5.0-rc2-23925", "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 5d355bc76..a965384c4 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-23924", - "System.Linq.Expressions": "4.0.11-rc2-23924", + "NETStandard.Library": "1.5.0-rc2-23925", + "System.Linq.Expressions": "4.0.11-rc2-23925", "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 2996c8edb..a3112fd56 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-23924" + "NETStandard.Library": "1.5.0-rc2-23925" } } }, diff --git a/src/Microsoft.DotNet.ProjectModel.Loader/project.json b/src/Microsoft.DotNet.ProjectModel.Loader/project.json index 9cdfeb769..f90560337 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-23924", + "NETStandard.Library": "1.5.0-rc2-23925", "Microsoft.DotNet.ProjectModel": "1.0.0-*", - "System.Runtime.Loader": "4.0.0-rc2-23924" + "System.Runtime.Loader": "4.0.0-rc2-23925" }, "frameworks": { "netstandard1.5": { diff --git a/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json b/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json index 513486c98..e7fa615ee 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-23924", + "NETStandard.Library": "1.5.0-rc2-23925", "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 9bd42c32d..7316a9a09 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.3.0-rc2-23924", + "System.Reflection.Metadata": "1.3.0-rc2-23925", "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-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" + "NETStandard.Library": "1.5.0-rc2-23925", + "System.Dynamic.Runtime": "4.0.11-rc2-23925", + "System.Threading.Thread": "4.0.0-rc2-23925", + "System.Runtime.Loader": "4.0.0-rc2-23925", + "System.Security.Cryptography.Algorithms": "4.1.0-rc2-23925", + "Microsoft.CSharp": "4.0.1-rc2-23925", + "System.Xml.XDocument": "4.0.11-rc2-23925" } } } diff --git a/src/Microsoft.DotNet.TestFramework/project.json b/src/Microsoft.DotNet.TestFramework/project.json index 9024a5f16..9986a5f25 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-23924" + "NETStandard.Library": "1.5.0-rc2-23925" }, "frameworks": { "netstandard1.5": { diff --git a/src/Microsoft.Extensions.DependencyModel/project.json b/src/Microsoft.Extensions.DependencyModel/project.json index 9556a02ae..676794022 100644 --- a/src/Microsoft.Extensions.DependencyModel/project.json +++ b/src/Microsoft.Extensions.DependencyModel/project.json @@ -26,8 +26,8 @@ "netstandard1.5": { "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23924", - "System.Dynamic.Runtime": "4.0.11-rc2-23924" + "NETStandard.Library": "1.5.0-rc2-23925", + "System.Dynamic.Runtime": "4.0.11-rc2-23925" } } }, diff --git a/src/Microsoft.Extensions.Testing.Abstractions/project.json b/src/Microsoft.Extensions.Testing.Abstractions/project.json index 25d36f4e3..708820852 100644 --- a/src/Microsoft.Extensions.Testing.Abstractions/project.json +++ b/src/Microsoft.Extensions.Testing.Abstractions/project.json @@ -20,11 +20,14 @@ "frameworks": { "net451": {}, "netstandard1.5": { - "imports": [ "dnxcore50", "portable-net45+win8" ], + "imports": [ + "dnxcore50", + "portable-net45+win8" + ], "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23924", - "System.Resources.ResourceManager": "4.0.1-rc2-23924", - "System.Reflection.TypeExtensions": "4.1.0-rc2-23924" + "NETStandard.Library": "1.5.0-rc2-23925", + "System.Resources.ResourceManager": "4.0.1-rc2-23925", + "System.Reflection.TypeExtensions": "4.1.0-rc2-23925" } } }, diff --git a/src/dotnet/commands/dotnet-compile-native/appdep/project.json b/src/dotnet/commands/dotnet-compile-native/appdep/project.json index 6202237aa..92b1c47ec 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-23924", + "NETStandard.Library": "1.5.0-rc2-23925", "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 e6ed07c4b..873ed1507 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-23924" + "version": "1.0.0-rc2-23925" } }, "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 d4639c625..3673e627b 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-23924" + "version": "1.0.0-rc2-23925" } }, "frameworks": { diff --git a/src/dotnet/project.json b/src/dotnet/project.json index 49dbceab3..c209306d4 100644 --- a/src/dotnet/project.json +++ b/src/dotnet/project.json @@ -21,15 +21,13 @@ "exclude": "compile" }, "NuGet.CommandLine.XPlat": "3.5.0-beta-1068", - "Newtonsoft.Json": "7.0.1", "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160321-04", "Microsoft.Net.Compilers.netcore": "1.3.0-beta1-20160321-04", "Microsoft.Net.CSharp.Interactive.netcore": "1.3.0-beta1-20160321-04", "Microsoft.FSharp.Compiler.netcore": "1.0.0-alpha-160316", - "System.Text.Encoding.CodePages": "4.0.1-rc2-23924", - "System.Diagnostics.FileVersionInfo": "4.0.0-rc2-23924", - + "System.Text.Encoding.CodePages": "4.0.1-rc2-23925", + "System.Diagnostics.FileVersionInfo": "4.0.0-rc2-23925", "Microsoft.DiaSymReader.Native": "1.3.3", "System.CommandLine": "0.1.0-e160323-1", "Microsoft.DotNet.ProjectModel": "1.0.0-*", @@ -52,18 +50,18 @@ "type": "build" }, "Microsoft.Extensions.Testing.Abstractions": "1.0.0-*", - "Microsoft.NETCore.ConsoleHost": "1.0.0-rc2-23924", - "Microsoft.NETCore.TestHost": "1.0.0-rc2-23924", - "Microsoft.NETCore.App": "1.0.0-rc2-23924", - "System.Diagnostics.TraceSource": "4.0.0-rc2-23924", - "System.Diagnostics.TextWriterTraceListener": "4.0.0-rc2-23924", - "System.Resources.ReaderWriter": "4.0.0-rc2-23924", - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23924", - "System.Private.DataContractSerialization": "4.1.1-rc2-23924", + "Microsoft.NETCore.ConsoleHost": "1.0.0-rc2-23925", + "Microsoft.NETCore.TestHost": "1.0.0-rc2-23925", + "Microsoft.NETCore.App": "1.0.0-rc2-23925", + "System.Diagnostics.TraceSource": "4.0.0-rc2-23925", + "System.Diagnostics.TextWriterTraceListener": "4.0.0-rc2-23925", + "System.Resources.ReaderWriter": "4.0.0-rc2-23925", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23925", + "System.Private.DataContractSerialization": "4.1.1-rc2-23925", "Microsoft.Win32.Registry": { - "version": "4.0.0-rc2-23924", + "version": "4.0.0-rc2-23925", "exclude": "compile" - }, + } }, "frameworks": { "netstandardapp1.5": { @@ -73,5 +71,5 @@ ] } }, - "scripts": { } + "scripts": {} } diff --git a/src/sharedframework/framework/project.json b/src/sharedframework/framework/project.json index b2b2d3d0d..bbe2f7549 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-23924" + "Microsoft.NETCore.App": "1.0.0-rc2-23925" }, "runtimes": { "win7-x64": {}, diff --git a/test/ArgumentForwardingTests/project.json b/test/ArgumentForwardingTests/project.json index 84c489d09..f3102c6ef 100644 --- a/test/ArgumentForwardingTests/project.json +++ b/test/ArgumentForwardingTests/project.json @@ -4,8 +4,8 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23924", - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23924", + "NETStandard.Library": "1.5.0-rc2-23925", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23925", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/ArgumentsReflector/project.json b/test/ArgumentsReflector/project.json index ec696c97a..8cd064db8 100644 --- a/test/ArgumentsReflector/project.json +++ b/test/ArgumentsReflector/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23924" + "NETStandard.Library": "1.5.0-rc2-23925" }, "frameworks": { "netstandardapp1.5": { diff --git a/test/EndToEnd/project.json b/test/EndToEnd/project.json index 188dc2210..62145828f 100644 --- a/test/EndToEnd/project.json +++ b/test/EndToEnd/project.json @@ -4,8 +4,8 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23924", - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23924", + "NETStandard.Library": "1.5.0-rc2-23925", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23925", "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 222d67327..d5868c255 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json @@ -4,13 +4,12 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23924", - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23924", + "NETStandard.Library": "1.5.0-rc2-23925", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23925", "NuGet.Versioning": "3.5.0-beta-1068", "NuGet.Packaging": "3.5.0-beta-1068", "NuGet.Frameworks": "3.5.0-beta-1068", "NuGet.ProjectModel": "3.5.0-beta-1068", - "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/Microsoft.DotNet.Compiler.Common.Tests/project.json b/test/Microsoft.DotNet.Compiler.Common.Tests/project.json index 1aad5fe9f..181e6d073 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-23924", - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23924", + "NETStandard.Library": "1.5.0-rc2-23925", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23925", "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 edfa02b92..383a16504 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-23924", - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23924", + "NETStandard.Library": "1.5.0-rc2-23925", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23925", "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 67267f7c3..0ad9014db 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-23924", - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23924", - "System.Collections.Immutable": "1.2.0-rc2-23924", + "NETStandard.Library": "1.5.0-rc2-23925", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23925", + "System.Collections.Immutable": "1.2.0-rc2-23925", "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 8627910b0..34a2540e6 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-23924", + "NETStandard.Library": "1.5.0-rc2-23925", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/ScriptExecutorTests/project.json b/test/ScriptExecutorTests/project.json index 04c88e2a0..216f8348f 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-23924", + "NETStandard.Library": "1.5.0-rc2-23925", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json index 56e86b581..044e1e4b6 100644 --- a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json +++ b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json @@ -1,18 +1,24 @@ -{ +{ "version": "1.0.0-*", - "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23924", - "Microsoft.Extensions.Testing.Abstractions": { "target": "project" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23924", - "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, - "TestAppWithFullPdbs": { "target": "project" }, - "TestAppWithPortablePdbs": { "target": "project" }, + "NETStandard.Library": "1.5.0-rc2-23925", + "Microsoft.Extensions.Testing.Abstractions": { + "target": "project" + }, + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23925", + "Microsoft.DotNet.Tools.Tests.Utilities": { + "target": "project" + }, + "TestAppWithFullPdbs": { + "target": "project" + }, + "TestAppWithPortablePdbs": { + "target": "project" + }, "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-dev-91790-12", "FluentAssertions": "4.2.2" }, - "frameworks": { "netstandardapp1.5": { "imports": [ @@ -22,6 +28,5 @@ ] } }, - "testRunner": "xunit" } diff --git a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json index 8d699d117..595e4e8af 100644 --- a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json +++ b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json @@ -1,18 +1,20 @@ -{ +{ "version": "1.0.0-*", - "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23924", - "Microsoft.Extensions.Testing.Abstractions": { "target": "project" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23924", - "System.Diagnostics.Process": "4.1.0-rc2-23924", - "TestAppWithPortablePdbs": { "target": "project" }, + "NETStandard.Library": "1.5.0-rc2-23925", + "Microsoft.Extensions.Testing.Abstractions": { + "target": "project" + }, + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23925", + "System.Diagnostics.Process": "4.1.0-rc2-23925", + "TestAppWithPortablePdbs": { + "target": "project" + }, "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-dev-91790-12", "FluentAssertions": "4.2.2", "moq.netcore": "4.4.0-beta8" }, - "frameworks": { "netstandardapp1.5": { "imports": [ @@ -22,6 +24,5 @@ ] } }, - "testRunner": "xunit" } diff --git a/test/TestingAbstractions/TestAppWithFullPdbs/project.json b/test/TestingAbstractions/TestAppWithFullPdbs/project.json index a1a3c0a8e..1887460a2 100644 --- a/test/TestingAbstractions/TestAppWithFullPdbs/project.json +++ b/test/TestingAbstractions/TestAppWithFullPdbs/project.json @@ -4,11 +4,14 @@ "debugType": "full" }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23924" + "NETStandard.Library": "1.5.0-rc2-23925" }, "frameworks": { "netstandard1.5": { - "imports": [ "portable-net45+win8", "dnxcore50" ] + "imports": [ + "portable-net45+win8", + "dnxcore50" + ] } } } diff --git a/test/TestingAbstractions/TestAppWithPortablePdbs/project.json b/test/TestingAbstractions/TestAppWithPortablePdbs/project.json index 84ed1df9c..f75916a71 100644 --- a/test/TestingAbstractions/TestAppWithPortablePdbs/project.json +++ b/test/TestingAbstractions/TestAppWithPortablePdbs/project.json @@ -4,11 +4,14 @@ "debugType": "portable" }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23924" + "NETStandard.Library": "1.5.0-rc2-23925" }, "frameworks": { "netstandard1.5": { - "imports": [ "portable-net45+win8", "dnxcore50" ] + "imports": [ + "portable-net45+win8", + "dnxcore50" + ] } } } diff --git a/test/dotnet-build.Tests/project.json b/test/dotnet-build.Tests/project.json index 6a20212f2..39b405e09 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-23924", - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23924", + "NETStandard.Library": "1.5.0-rc2-23925", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23925", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-compile.Tests/project.json b/test/dotnet-compile.Tests/project.json index b499c6ff4..a2298b06a 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-23924", - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23924", + "NETStandard.Library": "1.5.0-rc2-23925", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23925", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-compile.UnitTests/project.json b/test/dotnet-compile.UnitTests/project.json index b07f96c5a..1e038fb80 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-23924", + "NETStandard.Library": "1.5.0-rc2-23925", "Microsoft.DotNet.Cli.Utils": { "target": "project" }, @@ -9,7 +9,7 @@ "target": "project" }, "Microsoft.Win32.Registry": { - "version": "4.0.0-rc2-23924", + "version": "4.0.0-rc2-23925", "exclude": "Compile" }, "Microsoft.DotNet.ProjectModel": { diff --git a/test/dotnet-pack.Tests/project.json b/test/dotnet-pack.Tests/project.json index c2ad35c60..78e56b710 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-23924", - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23924", - "System.IO.Compression.ZipFile": "4.0.1-rc2-23924", + "NETStandard.Library": "1.5.0-rc2-23925", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23925", + "System.IO.Compression.ZipFile": "4.0.1-rc2-23925", "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 bb7a5e087..2cf1010da 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-23924", + "version": "4.0.0-rc2-23925", "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-23924" + "System.Net.NameResolution": "4.0.0-rc2-23925" }, "frameworks": { "netstandardapp1.5": { diff --git a/test/dotnet-publish.Tests/project.json b/test/dotnet-publish.Tests/project.json index 54d7ab1ed..cb7fbc44a 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-23924", - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23924", + "NETStandard.Library": "1.5.0-rc2-23925", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23925", "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 806dabbc3..a1e0e5cbb 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-23924", - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23924", + "NETStandard.Library": "1.5.0-rc2-23925", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23925", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-run.Tests/project.json b/test/dotnet-run.Tests/project.json index 5df7c0bb0..ff62bdb17 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-23924", - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23924", + "NETStandard.Library": "1.5.0-rc2-23925", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23925", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-test.Tests/project.json b/test/dotnet-test.Tests/project.json index 0fea2f9d2..090e36f2c 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-23924", + "NETStandard.Library": "1.5.0-rc2-23925", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, @@ -12,9 +12,9 @@ "Microsoft.DotNet.ProjectModel": { "target": "project" }, - "System.Net.NameResolution": "4.0.0-rc2-23924", - "System.Net.Sockets": "4.1.0-rc2-23924", - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23924", + "System.Net.NameResolution": "4.0.0-rc2-23925", + "System.Net.Sockets": "4.1.0-rc2-23925", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23925", "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 11d648c3c..34fa3a683 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-23924", + "NETStandard.Library": "1.5.0-rc2-23925", "dotnet": { "target": "project" }, "Microsoft.Win32.Registry": { - "version": "4.0.0-rc2-23924", + "version": "4.0.0-rc2-23925", "exclude": "Compile" }, "xunit": "2.1.0", diff --git a/test/dotnet.Tests/project.json b/test/dotnet.Tests/project.json index 29a918c8b..9d901002d 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-23924", - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23924", + "NETStandard.Library": "1.5.0-rc2-23925", + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23925", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/tools/MultiProjectValidator/project.json b/tools/MultiProjectValidator/project.json index e34ad518a..8bcf43395 100644 --- a/tools/MultiProjectValidator/project.json +++ b/tools/MultiProjectValidator/project.json @@ -5,7 +5,7 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23924", + "NETStandard.Library": "1.5.0-rc2-23925", "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 8121f9adb..e7bda39ed 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-23924", + "System.Runtime.Serialization.Json": "4.0.2-rc2-23925", "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-23924", - "NETStandard.Library": "1.5.0-rc2-23924" + "Microsoft.NETCore.ConsoleHost": "1.0.0-rc2-23925", + "NETStandard.Library": "1.5.0-rc2-23925" }, "frameworks": { "netstandardapp1.5": { From 49c16e88232439c2591fbedc1d2b299fa3b307a6 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Fri, 25 Mar 2016 13:29:33 -0500 Subject: [PATCH 3/3] Overwrite dotnet.exe during our build. New CoreFX now has dotnet.exe in the shared framework. We need to overwrite it when we copy corehost. --- scripts/dotnet-cli-build/CompileTargets.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/dotnet-cli-build/CompileTargets.cs b/scripts/dotnet-cli-build/CompileTargets.cs index e46c6ba9c..b0920c016 100644 --- a/scripts/dotnet-cli-build/CompileTargets.cs +++ b/scripts/dotnet-cli-build/CompileTargets.cs @@ -308,7 +308,7 @@ namespace Microsoft.DotNet.Cli.Build // corehost will be renamed to dotnet at some point and then we will not need to rename it here. File.Copy( Path.Combine(Dirs.Corehost, CoreHostBaseName), - Path.Combine(SharedFrameworkNameAndVersionRoot, $"dotnet{Constants.ExeSuffix}")); + Path.Combine(SharedFrameworkNameAndVersionRoot, $"dotnet{Constants.ExeSuffix}"), true); File.Copy( Path.Combine(Dirs.Corehost, HostPolicyBaseName), Path.Combine(SharedFrameworkNameAndVersionRoot, HostPolicyBaseName), true);