From 236fcd8f959482e5b4683bf61b3b01247bb780c8 Mon Sep 17 00:00:00 2001 From: Andrew Stanton-Nurse Date: Thu, 11 Feb 2016 09:53:47 -0800 Subject: [PATCH 1/4] update everyone to 23811 add a little hackiness to the build script to use 23811 in the stage 0 as well --- .../dotnet-hello/v1/dotnet-hello/project.json | 2 +- .../dotnet-hello/v2/dotnet-hello/project.json | 2 +- .../TestProjects/CompileFail/project.json | 2 +- TestAssets/TestProjects/TestApp/project.json | 2 +- .../TestAppCompilationContext/project.json | 2 +- .../TestProjects/TestAppWithArgs/project.json | 2 +- .../TestAppWithContents/project.json | 2 +- .../TestLibraryGreater/project.json | 2 +- .../TestLibraryLesser/project.json | 2 +- .../TestProjects/TestLibrary/project.json | 2 +- .../TestLibraryWithAnalyzer/project.json | 2 +- .../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 +- scripts/obtain/install-tools.sh | 10 ++++++++ src/Microsoft.DotNet.Cli.Utils/project.json | 4 ++-- .../project.json | 2 +- src/Microsoft.DotNet.Files/project.json | 4 ++-- .../project.json | 4 ++-- .../project.json | 2 +- .../project.json | 14 +++++------ src/Microsoft.DotNet.Runtime/project.json | 2 +- .../project.json | 22 ++++++++--------- .../project.json | 6 ++--- .../dotnet-compile-native/appdep/project.json | 2 +- src/dotnet/project.json | 24 +++++++++---------- .../ArgumentForwardingTests/project.json | 4 ++-- .../Reflector/project.json | 4 ++-- test/EndToEnd/project.json | 2 +- .../CompileFail/project.json | 2 +- test/FSharpTestProjects/TestApp/project.json | 2 +- .../TestAppWithArgs/project.json | 2 +- .../TestLibrary/project.json | 2 +- .../Dotnet.Cli.Msi.Tests/project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- .../project.json | 4 ++-- .../project.json | 2 +- .../AppWithDirectDependency/project.json | 2 +- .../AppWithToolDependency/project.json | 2 +- test/dotnet-build.Tests/project.json | 2 +- test/dotnet-compile.Tests/project.json | 2 +- test/dotnet-publish.Tests/project.json | 2 +- .../src/BrokenProjectPathSample/project.json | 2 +- .../src/EmptyConsoleApp/project.json | 2 +- .../IncompatiblePackageSample/project.json | 2 +- tools/MultiProjectValidator/project.json | 2 +- 52 files changed, 96 insertions(+), 86 deletions(-) diff --git a/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json index a9eab76c8..c63b3b811 100644 --- a/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json +++ b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json @@ -5,7 +5,7 @@ }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23810" + "NETStandard.Library": "1.0.0-rc2-23811" }, "frameworks": { diff --git a/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json b/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json index 24c3a5c38..907930594 100644 --- a/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json +++ b/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json @@ -5,7 +5,7 @@ }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23810" + "NETStandard.Library": "1.0.0-rc2-23811" }, "frameworks": { diff --git a/TestAssets/TestProjects/CompileFail/project.json b/TestAssets/TestProjects/CompileFail/project.json index 506b85dce..8c87d36c9 100644 --- a/TestAssets/TestProjects/CompileFail/project.json +++ b/TestAssets/TestProjects/CompileFail/project.json @@ -5,7 +5,7 @@ }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23810" + "NETStandard.Library": "1.0.0-rc2-23811" }, "frameworks": { diff --git a/TestAssets/TestProjects/TestApp/project.json b/TestAssets/TestProjects/TestApp/project.json index 325f56373..51b830d57 100644 --- a/TestAssets/TestProjects/TestApp/project.json +++ b/TestAssets/TestProjects/TestApp/project.json @@ -8,7 +8,7 @@ "dependencies": { "TestLibrary": { "target":"project", "version":"1.0.0-*" }, - "NETStandard.Library": "1.0.0-rc2-23810" + "NETStandard.Library": "1.0.0-rc2-23811" }, "frameworks": { diff --git a/TestAssets/TestProjects/TestAppCompilationContext/project.json b/TestAssets/TestProjects/TestAppCompilationContext/project.json index d26d15119..6b317abf2 100644 --- a/TestAssets/TestProjects/TestAppCompilationContext/project.json +++ b/TestAssets/TestProjects/TestAppCompilationContext/project.json @@ -8,7 +8,7 @@ "dependencies": { "TestLibrary": "1.0.0-*", - "NETStandard.Library": "1.0.0-rc2-23810" + "NETStandard.Library": "1.0.0-rc2-23811" }, "frameworks": { diff --git a/TestAssets/TestProjects/TestAppWithArgs/project.json b/TestAssets/TestProjects/TestAppWithArgs/project.json index 506b85dce..8c87d36c9 100644 --- a/TestAssets/TestProjects/TestAppWithArgs/project.json +++ b/TestAssets/TestProjects/TestAppWithArgs/project.json @@ -5,7 +5,7 @@ }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23810" + "NETStandard.Library": "1.0.0-rc2-23811" }, "frameworks": { diff --git a/TestAssets/TestProjects/TestAppWithContents/project.json b/TestAssets/TestProjects/TestAppWithContents/project.json index 38b753634..163d133ed 100644 --- a/TestAssets/TestProjects/TestAppWithContents/project.json +++ b/TestAssets/TestProjects/TestAppWithContents/project.json @@ -5,7 +5,7 @@ }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23810" + "NETStandard.Library": "1.0.0-rc2-23811" }, "content": "testcontentfile.txt", diff --git a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json index 8cbc8019c..58f75ef01 100644 --- a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json +++ b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json @@ -10,7 +10,7 @@ "dnxcore50": { "imports" : "portable-net45+wp80+win8", "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23810" + "NETStandard.Library": "1.0.0-rc2-23811" } } } diff --git a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json index 6ad045d57..a98513eb9 100644 --- a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json +++ b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json @@ -11,7 +11,7 @@ "dnxcore50": { "imports" : "portable-net45+wp80+win8", "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23810" + "NETStandard.Library": "1.0.0-rc2-23811" } } } diff --git a/TestAssets/TestProjects/TestLibrary/project.json b/TestAssets/TestProjects/TestLibrary/project.json index 6f6fe3914..5752b3494 100644 --- a/TestAssets/TestProjects/TestLibrary/project.json +++ b/TestAssets/TestProjects/TestLibrary/project.json @@ -6,7 +6,7 @@ "additionalArguments": [ "-highentropyva+" ] }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23810" + "NETStandard.Library": "1.0.0-rc2-23811" }, "frameworks": { diff --git a/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json b/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json index dd77a8ef8..1988d3125 100644 --- a/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json +++ b/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json @@ -5,7 +5,7 @@ }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23810", + "NETStandard.Library": "1.0.0-rc2-23811", "System.Runtime.Analyzers": { "version": "1.1.0", "type": "build" } }, diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json index 2f88ae93b..20570bca8 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json @@ -8,7 +8,7 @@ "L11": "1.0.0-*", "L12": "1.0.0-*", - "NETStandard.Library": "1.0.0-rc2-23810" + "NETStandard.Library": "1.0.0-rc2-23811" }, "frameworks": { diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json index 576ad121f..99855bb69 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json @@ -5,7 +5,7 @@ "L12": "1.0.0-*", "L21": "1.0.0-*", - "NETStandard.Library": "1.0.0-rc2-23810" + "NETStandard.Library": "1.0.0-rc2-23811" }, "frameworks": { diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json index 7c5564961..c962653e4 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json @@ -4,7 +4,7 @@ "dependencies": { "L22": "1.0.0-*", - "NETStandard.Library": "1.0.0-rc2-23810" + "NETStandard.Library": "1.0.0-rc2-23811" }, "frameworks": { diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json index 444218fc7..4d4484b9c 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23810" + "NETStandard.Library": "1.0.0-rc2-23811" }, "frameworks": { diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json index 444218fc7..4d4484b9c 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23810" + "NETStandard.Library": "1.0.0-rc2-23811" }, "frameworks": { diff --git a/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json b/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json index 506b85dce..8c87d36c9 100644 --- a/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json +++ b/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json @@ -5,7 +5,7 @@ }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23810" + "NETStandard.Library": "1.0.0-rc2-23811" }, "frameworks": { diff --git a/TestAssets/TestProjects/TestProjectWithResource/project.json b/TestAssets/TestProjects/TestProjectWithResource/project.json index 506b85dce..8c87d36c9 100644 --- a/TestAssets/TestProjects/TestProjectWithResource/project.json +++ b/TestAssets/TestProjects/TestProjectWithResource/project.json @@ -5,7 +5,7 @@ }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23810" + "NETStandard.Library": "1.0.0-rc2-23811" }, "frameworks": { diff --git a/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json b/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json index a3295a128..c36cabd5e 100644 --- a/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json +++ b/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json @@ -6,7 +6,7 @@ }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23810" + "NETStandard.Library": "1.0.0-rc2-23811" }, "frameworks": { diff --git a/scripts/obtain/install-tools.sh b/scripts/obtain/install-tools.sh index b3be18f94..cf6d1d666 100755 --- a/scripts/obtain/install-tools.sh +++ b/scripts/obtain/install-tools.sh @@ -22,3 +22,13 @@ source "$DIR/../common/_common.sh" # Ensure the latest stage0 is installed header "Installing dotnet stage 0" $REPOROOT/scripts/obtain/install.sh + +# Now patch the runtime in stage 0 +# HACK(anurse): BIG HACK. This is just to dodge the current broken Linux stage0. We'll remove it as soon as we've got a new stage 0 +( + export PATH="$DOTNET_INSTALL_DIR/bin:$PATH" + cd $REPOROOT/src/Microsoft.DotNet.Runtime + dotnet restore + dotnet publish -o "$DOTNET_INSTALL_DIR/share/dotnet/cli/runtime" + cp $DOTNET_INSTALL_DIR/share/dotnet/cli/runtime/coreclr/* $DOTNET_INSTALL_DIR/share/dotnet/cli/bin +) diff --git a/src/Microsoft.DotNet.Cli.Utils/project.json b/src/Microsoft.DotNet.Cli.Utils/project.json index f941f35cd..ec5a4c08c 100644 --- a/src/Microsoft.DotNet.Cli.Utils/project.json +++ b/src/Microsoft.DotNet.Cli.Utils/project.json @@ -6,9 +6,9 @@ }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23810", + "NETStandard.Library": "1.0.0-rc2-23811", "Microsoft.DotNet.ProjectModel": "1.0.0-*", - "System.Reflection.Metadata": "1.2.0-rc2-23810", + "System.Reflection.Metadata": "1.2.0-rc2-23811", "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-16537" }, diff --git a/src/Microsoft.DotNet.Compiler.Common/project.json b/src/Microsoft.DotNet.Compiler.Common/project.json index ead4df3ec..207ea5d19 100644 --- a/src/Microsoft.DotNet.Compiler.Common/project.json +++ b/src/Microsoft.DotNet.Compiler.Common/project.json @@ -6,7 +6,7 @@ }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23810", + "NETStandard.Library": "1.0.0-rc2-23811", "System.CommandLine": "0.1.0-e160119-1", "Microsoft.CodeAnalysis.CSharp": "1.2.0-beta1-20160108-01", "Microsoft.DotNet.ProjectModel": "1.0.0-*", diff --git a/src/Microsoft.DotNet.Files/project.json b/src/Microsoft.DotNet.Files/project.json index 737ee1db1..256bc8562 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.0.0-rc2-23810", - "System.Linq.Expressions": "4.0.11-rc2-23810", + "NETStandard.Library": "1.0.0-rc2-23811", + "System.Linq.Expressions": "4.0.11-rc2-23811", "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-15996", diff --git a/src/Microsoft.DotNet.ProjectModel.Loader/project.json b/src/Microsoft.DotNet.ProjectModel.Loader/project.json index ca5ac493d..ad7f763ea 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.0.0-rc2-23810", + "NETStandard.Library": "1.0.0-rc2-23811", "Microsoft.DotNet.ProjectModel": "1.0.0-*", - "System.Runtime.Loader": "4.0.0-rc2-23810" + "System.Runtime.Loader": "4.0.0-rc2-23811" }, "frameworks": { "dnxcore50": { diff --git a/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json b/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json index ada899d47..5d60662e8 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.0.0-rc2-23810", + "NETStandard.Library": "1.0.0-rc2-23811", "Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.Compiler.Common": "1.0.0-*", "Microsoft.CodeAnalysis.CSharp.Workspaces": "1.2.0-beta1-20160108-01" diff --git a/src/Microsoft.DotNet.ProjectModel/project.json b/src/Microsoft.DotNet.ProjectModel/project.json index 3e1c58d26..6b56073f6 100644 --- a/src/Microsoft.DotNet.ProjectModel/project.json +++ b/src/Microsoft.DotNet.ProjectModel/project.json @@ -5,13 +5,13 @@ }, "description": "Types to model a .NET Project", "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23810", - "System.Reflection.Metadata": "1.2.0-rc2-23810", - "System.Runtime.Loader": "4.0.0-rc2-23810", - "System.Dynamic.Runtime": "4.0.11-rc2-23810", - "System.Security.Cryptography.Algorithms": "4.0.0-rc2-23810", - "Microsoft.CSharp": "4.0.1-rc2-23810", - "System.Xml.XDocument": "4.0.11-rc2-23810", + "NETStandard.Library": "1.0.0-rc2-23811", + "System.Reflection.Metadata": "1.2.0-rc2-23811", + "System.Runtime.Loader": "4.0.0-rc2-23811", + "System.Dynamic.Runtime": "4.0.11-rc2-23811", + "System.Security.Cryptography.Algorithms": "4.0.0-rc2-23811", + "Microsoft.CSharp": "4.0.1-rc2-23811", + "System.Xml.XDocument": "4.0.11-rc2-23811", "NuGet.Packaging": "3.4.0-beta-583", "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-15996", diff --git a/src/Microsoft.DotNet.Runtime/project.json b/src/Microsoft.DotNet.Runtime/project.json index e60674e5c..3c49af54d 100644 --- a/src/Microsoft.DotNet.Runtime/project.json +++ b/src/Microsoft.DotNet.Runtime/project.json @@ -5,7 +5,7 @@ }, "dependencies": { - "NETStandard.Library" : "1.0.0-rc2-23810" + "NETStandard.Library" : "1.0.0-rc2-23811" }, "frameworks": { diff --git a/src/Microsoft.Extensions.DependencyModel/project.json b/src/Microsoft.Extensions.DependencyModel/project.json index f83dd85c6..82df91b47 100644 --- a/src/Microsoft.Extensions.DependencyModel/project.json +++ b/src/Microsoft.Extensions.DependencyModel/project.json @@ -18,22 +18,22 @@ "dotnet5.4": { "imports": "portable-net451+win8", "dependencies": { - "System.IO.FileSystem": "4.0.1-rc2-23810", - "System.Linq": "4.0.1-rc2-23810", - "System.Runtime": "4.0.21-rc2-23810", - "System.Reflection": "4.1.0-rc2-23810", - "System.Dynamic.Runtime": "4.0.11-rc2-23810" + "System.IO.FileSystem": "4.0.1-rc2-23811", + "System.Linq": "4.0.1-rc2-23811", + "System.Runtime": "4.0.21-rc2-23811", + "System.Reflection": "4.1.0-rc2-23811", + "System.Dynamic.Runtime": "4.0.11-rc2-23811" } }, "dnxcore50": { "imports": "portable-net45+win8", "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1-rc2-23810", - "System.IO.FileSystem": "4.0.1-rc2-23810", - "System.Linq": "4.0.1-rc2-23810", - "System.Runtime": "4.0.21-rc2-23810", - "System.Reflection": "4.1.0-rc2-23810", - "System.Dynamic.Runtime": "4.0.11-rc2-23810" + "Microsoft.NETCore.Platforms": "1.0.1-rc2-23811", + "System.IO.FileSystem": "4.0.1-rc2-23811", + "System.Linq": "4.0.1-rc2-23811", + "System.Runtime": "4.0.21-rc2-23811", + "System.Reflection": "4.1.0-rc2-23811", + "System.Dynamic.Runtime": "4.0.11-rc2-23811" } } }, diff --git a/src/Microsoft.Extensions.Testing.Abstractions/project.json b/src/Microsoft.Extensions.Testing.Abstractions/project.json index bf7fe2ac1..d22bed163 100644 --- a/src/Microsoft.Extensions.Testing.Abstractions/project.json +++ b/src/Microsoft.Extensions.Testing.Abstractions/project.json @@ -13,9 +13,9 @@ "Newtonsoft.Json": "7.0.1", "Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.Extensions.Logging.Abstractions": "1.0.0-rc2-16040", - "NETStandard.Library": "1.0.0-rc2-23810", - "System.Resources.ResourceManager": "4.0.1-rc2-23810", - "System.Runtime.Serialization.Primitives": "4.1.0-rc2-23810" + "NETStandard.Library": "1.0.0-rc2-23811", + "System.Resources.ResourceManager": "4.0.1-rc2-23811", + "System.Runtime.Serialization.Primitives": "4.1.0-rc2-23811" }, "frameworks": { "dnxcore50": { diff --git a/src/dotnet/commands/dotnet-compile-native/appdep/project.json b/src/dotnet/commands/dotnet-compile-native/appdep/project.json index 5b8c513f0..48ef2c271 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.0.0-rc2-23810", + "NETStandard.Library": "1.0.0-rc2-23811", "Microsoft.DotNet.AppDep":"1.0.5-prerelease-00001" }, "frameworks": { diff --git a/src/dotnet/project.json b/src/dotnet/project.json index 7b5bcbd80..bf5ea8b6e 100644 --- a/src/dotnet/project.json +++ b/src/dotnet/project.json @@ -49,18 +49,18 @@ "version": "1.0.0-*", "type": "build" }, - "Microsoft.NETCore.ConsoleHost": "1.0.0-rc2-23810", - "Microsoft.NETCore.TestHost": "1.0.0-rc2-23810", - "NETStandard.Library": "1.0.0-rc2-23810", - "System.Diagnostics.TextWriterTraceListener": "4.0.0-rc2-23810", - "System.Diagnostics.TraceSource": "4.0.0-rc2-23810", - "System.Linq.Expressions": "4.0.11-rc2-23810", - "System.Xml.XDocument": "4.0.11-rc2-23810", - "System.Resources.ReaderWriter": "4.0.0-rc2-23810", - "System.Net.Sockets": "4.1.0-rc2-23810", - "System.IO.Compression.ZipFile": "4.0.1-rc2-23810", - "System.Threading.ThreadPool": "4.0.10-rc2-23810", - "System.Runtime.Serialization.Primitives": "4.1.0-rc2-23810" + "Microsoft.NETCore.ConsoleHost": "1.0.0-rc2-23811", + "Microsoft.NETCore.TestHost": "1.0.0-rc2-23811", + "NETStandard.Library": "1.0.0-rc2-23811", + "System.Diagnostics.TextWriterTraceListener": "4.0.0-rc2-23811", + "System.Diagnostics.TraceSource": "4.0.0-rc2-23811", + "System.Linq.Expressions": "4.0.11-rc2-23811", + "System.Xml.XDocument": "4.0.11-rc2-23811", + "System.Resources.ReaderWriter": "4.0.0-rc2-23811", + "System.Net.Sockets": "4.1.0-rc2-23811", + "System.IO.Compression.ZipFile": "4.0.1-rc2-23811", + "System.Threading.ThreadPool": "4.0.10-rc2-23811", + "System.Runtime.Serialization.Primitives": "4.1.0-rc2-23811" }, "frameworks": { "dnxcore50": { diff --git a/test/ArgumentForwardingTests/ArgumentForwardingTests/project.json b/test/ArgumentForwardingTests/ArgumentForwardingTests/project.json index 0ea999cb0..e895933c4 100644 --- a/test/ArgumentForwardingTests/ArgumentForwardingTests/project.json +++ b/test/ArgumentForwardingTests/ArgumentForwardingTests/project.json @@ -5,8 +5,8 @@ }, "dependencies": { - "NETStandard.Library" : "1.0.0-rc2-23810", - "Microsoft.NETCore.TestHost": "1.0.0-rc2-23810", + "NETStandard.Library" : "1.0.0-rc2-23811", + "Microsoft.NETCore.TestHost": "1.0.0-rc2-23811", "xunit": "2.1.0", "xunit.console.netcore": "1.0.2-prerelease-00101", diff --git a/test/ArgumentForwardingTests/Reflector/project.json b/test/ArgumentForwardingTests/Reflector/project.json index 0ea999cb0..e895933c4 100644 --- a/test/ArgumentForwardingTests/Reflector/project.json +++ b/test/ArgumentForwardingTests/Reflector/project.json @@ -5,8 +5,8 @@ }, "dependencies": { - "NETStandard.Library" : "1.0.0-rc2-23810", - "Microsoft.NETCore.TestHost": "1.0.0-rc2-23810", + "NETStandard.Library" : "1.0.0-rc2-23811", + "Microsoft.NETCore.TestHost": "1.0.0-rc2-23811", "xunit": "2.1.0", "xunit.console.netcore": "1.0.2-prerelease-00101", diff --git a/test/EndToEnd/project.json b/test/EndToEnd/project.json index 0f2dd718f..fa2b35eac 100644 --- a/test/EndToEnd/project.json +++ b/test/EndToEnd/project.json @@ -5,7 +5,7 @@ }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23810", + "NETStandard.Library": "1.0.0-rc2-23811", "Microsoft.DotNet.ProjectModel": { "target": "project" }, "Microsoft.DotNet.Cli.Utils": { "target": "project" }, diff --git a/test/FSharpTestProjects/CompileFail/project.json b/test/FSharpTestProjects/CompileFail/project.json index 2a385eeba..b3805b7cb 100644 --- a/test/FSharpTestProjects/CompileFail/project.json +++ b/test/FSharpTestProjects/CompileFail/project.json @@ -9,7 +9,7 @@ ], "dependencies": { "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", - "NETStandard.Library": "1.0.0-rc2-23810" + "NETStandard.Library": "1.0.0-rc2-23811" }, "frameworks": { diff --git a/test/FSharpTestProjects/TestApp/project.json b/test/FSharpTestProjects/TestApp/project.json index a98a7c08b..beeeb6878 100644 --- a/test/FSharpTestProjects/TestApp/project.json +++ b/test/FSharpTestProjects/TestApp/project.json @@ -9,7 +9,7 @@ ], "dependencies": { "TestLibrary": "1.0.0-*", - "NETStandard.Library": "1.0.0-rc2-23810", + "NETStandard.Library": "1.0.0-rc2-23811", "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", }, diff --git a/test/FSharpTestProjects/TestAppWithArgs/project.json b/test/FSharpTestProjects/TestAppWithArgs/project.json index 2a385eeba..b3805b7cb 100644 --- a/test/FSharpTestProjects/TestAppWithArgs/project.json +++ b/test/FSharpTestProjects/TestAppWithArgs/project.json @@ -9,7 +9,7 @@ ], "dependencies": { "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", - "NETStandard.Library": "1.0.0-rc2-23810" + "NETStandard.Library": "1.0.0-rc2-23811" }, "frameworks": { diff --git a/test/FSharpTestProjects/TestLibrary/project.json b/test/FSharpTestProjects/TestLibrary/project.json index 6083fa8aa..9ad1d7c4b 100644 --- a/test/FSharpTestProjects/TestLibrary/project.json +++ b/test/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.0.0-rc2-23810" + "NETStandard.Library": "1.0.0-rc2-23811" }, "compilerName": "fsc", "compileFiles": [ diff --git a/test/Installer/Dotnet.Cli.Msi.Tests/project.json b/test/Installer/Dotnet.Cli.Msi.Tests/project.json index 4017d42b8..8c5e66a00 100644 --- a/test/Installer/Dotnet.Cli.Msi.Tests/project.json +++ b/test/Installer/Dotnet.Cli.Msi.Tests/project.json @@ -14,4 +14,4 @@ } } } -} \ No newline at end of file +} diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json index 8800f3bb3..1d6f97f0b 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json @@ -5,7 +5,7 @@ }, "dependencies": { - "NETStandard.Library" : "1.0.0-rc2-23810", + "NETStandard.Library" : "1.0.0-rc2-23811", "Microsoft.DotNet.ProjectModel": { "target": "project" }, "Microsoft.DotNet.Cli.Utils": { "target": "project" }, diff --git a/test/Microsoft.DotNet.Compiler.Common.Tests/project.json b/test/Microsoft.DotNet.Compiler.Common.Tests/project.json index 1c2f72f99..1dd82487c 100644 --- a/test/Microsoft.DotNet.Compiler.Common.Tests/project.json +++ b/test/Microsoft.DotNet.Compiler.Common.Tests/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23810", + "NETStandard.Library": "1.0.0-rc2-23811", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, "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 e494be20f..804214a35 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json @@ -3,8 +3,8 @@ "description": "Microsoft.DotNet.Tools.Tests.Utilities Class Library", "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23810", - "System.Collections.Immutable": "1.2.0-rc2-23810", + "NETStandard.Library": "1.0.0-rc2-23811", + "System.Collections.Immutable": "1.2.0-rc2-23811", "FluentAssertions": "4.0.0", "xunit": "2.1.0", diff --git a/test/PackagedCommands/Consumers/AppWithDirectAndToolDependency/project.json b/test/PackagedCommands/Consumers/AppWithDirectAndToolDependency/project.json index 9fc613218..e8dad70a0 100644 --- a/test/PackagedCommands/Consumers/AppWithDirectAndToolDependency/project.json +++ b/test/PackagedCommands/Consumers/AppWithDirectAndToolDependency/project.json @@ -5,7 +5,7 @@ }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23810", + "NETStandard.Library": "1.0.0-rc2-23811", "dotnet-hello": { "version": "1.0.0", "target": "package" } }, diff --git a/test/PackagedCommands/Consumers/AppWithDirectDependency/project.json b/test/PackagedCommands/Consumers/AppWithDirectDependency/project.json index a2b0ecba3..153989b48 100644 --- a/test/PackagedCommands/Consumers/AppWithDirectDependency/project.json +++ b/test/PackagedCommands/Consumers/AppWithDirectDependency/project.json @@ -7,7 +7,7 @@ "testRunner": "must-be-specified-to-generate-deps", "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23810", + "NETStandard.Library": "1.0.0-rc2-23811", "dotnet-hello": {"version": "1.0.0", "target": "package"} }, diff --git a/test/PackagedCommands/Consumers/AppWithToolDependency/project.json b/test/PackagedCommands/Consumers/AppWithToolDependency/project.json index 7edc502cb..101a4088d 100644 --- a/test/PackagedCommands/Consumers/AppWithToolDependency/project.json +++ b/test/PackagedCommands/Consumers/AppWithToolDependency/project.json @@ -5,7 +5,7 @@ }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23810" + "NETStandard.Library": "1.0.0-rc2-23811" }, "frameworks": { diff --git a/test/dotnet-build.Tests/project.json b/test/dotnet-build.Tests/project.json index dfa6696dc..932c8c650 100644 --- a/test/dotnet-build.Tests/project.json +++ b/test/dotnet-build.Tests/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23810", + "NETStandard.Library": "1.0.0-rc2-23811", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, "Microsoft.DotNet.Cli.Utils": { diff --git a/test/dotnet-compile.Tests/project.json b/test/dotnet-compile.Tests/project.json index b20383964..a3c36b599 100644 --- a/test/dotnet-compile.Tests/project.json +++ b/test/dotnet-compile.Tests/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23810", + "NETStandard.Library": "1.0.0-rc2-23811", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, "Microsoft.DotNet.Cli.Utils": { diff --git a/test/dotnet-publish.Tests/project.json b/test/dotnet-publish.Tests/project.json index b695cd22f..db7d665b1 100644 --- a/test/dotnet-publish.Tests/project.json +++ b/test/dotnet-publish.Tests/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23810", + "NETStandard.Library": "1.0.0-rc2-23811", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, "Microsoft.DotNet.Cli.Utils": { diff --git a/testapp/DthTestProjects/src/BrokenProjectPathSample/project.json b/testapp/DthTestProjects/src/BrokenProjectPathSample/project.json index f89259e2b..be56eab80 100644 --- a/testapp/DthTestProjects/src/BrokenProjectPathSample/project.json +++ b/testapp/DthTestProjects/src/BrokenProjectPathSample/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23810", + "NETStandard.Library": "1.0.0-rc2-23811", "EmptyLibrary": "" }, "frameworks": { diff --git a/testapp/DthTestProjects/src/EmptyConsoleApp/project.json b/testapp/DthTestProjects/src/EmptyConsoleApp/project.json index 0843e1394..605055059 100644 --- a/testapp/DthTestProjects/src/EmptyConsoleApp/project.json +++ b/testapp/DthTestProjects/src/EmptyConsoleApp/project.json @@ -3,7 +3,7 @@ "frameworks": { "dnxcore50": { "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23810" + "NETStandard.Library": "1.0.0-rc2-23811" } }, "dnx451": { } diff --git a/testapp/DthTestProjects/src/IncompatiblePackageSample/project.json b/testapp/DthTestProjects/src/IncompatiblePackageSample/project.json index 74a1b8e03..061c66869 100644 --- a/testapp/DthTestProjects/src/IncompatiblePackageSample/project.json +++ b/testapp/DthTestProjects/src/IncompatiblePackageSample/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23810", + "NETStandard.Library": "1.0.0-rc2-23811", "Microsoft.Web.Administration": "7.0.0" }, "frameworks": { diff --git a/tools/MultiProjectValidator/project.json b/tools/MultiProjectValidator/project.json index 87351b6b4..98ddea4cf 100644 --- a/tools/MultiProjectValidator/project.json +++ b/tools/MultiProjectValidator/project.json @@ -6,7 +6,7 @@ }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23810", + "NETStandard.Library": "1.0.0-rc2-23811", "Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.Cli.Utils": "1.0.0-*" }, From 19216b996ba2a1663de00ae532aebe191097f00a Mon Sep 17 00:00:00 2001 From: Andrew Stanton-Nurse Date: Thu, 11 Feb 2016 11:03:50 -0800 Subject: [PATCH 2/4] update crossgen scripts --- scripts/crossgen/crossgen_roslyn.cmd | 2 +- scripts/crossgen/crossgen_roslyn.sh | 4 ++-- scripts/obtain/install-tools.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/crossgen/crossgen_roslyn.cmd b/scripts/crossgen/crossgen_roslyn.cmd index dacc2a8d6..2da8aa381 100644 --- a/scripts/crossgen/crossgen_roslyn.cmd +++ b/scripts/crossgen/crossgen_roslyn.cmd @@ -13,7 +13,7 @@ set BIN_DIR=%CD%\bin popd REM Replace with a robust method for finding the right crossgen.exe -set CROSSGEN_UTIL=%NUGET_PACKAGES%\runtime.win7-x64.Microsoft.NETCore.Runtime.CoreCLR\1.0.1-rc2-23810\tools\crossgen.exe +set CROSSGEN_UTIL=%NUGET_PACKAGES%\runtime.win7-x64.Microsoft.NETCore.Runtime.CoreCLR\1.0.1-rc2-23811\tools\crossgen.exe REM Crossgen currently requires itself to be next to mscorlib copy %CROSSGEN_UTIL% /Y %BIN_DIR% > nul diff --git a/scripts/crossgen/crossgen_roslyn.sh b/scripts/crossgen/crossgen_roslyn.sh index 5ad315de2..d50bb8814 100755 --- a/scripts/crossgen/crossgen_roslyn.sh +++ b/scripts/crossgen/crossgen_roslyn.sh @@ -44,7 +44,7 @@ fi READYTORUN="" # Replace with a robust method for finding the right crossgen.exe -CROSSGEN_UTIL=$NUGET_PACKAGES/runtime.$RID.Microsoft.NETCore.Runtime.CoreCLR/1.0.1-rc2-23810/tools/crossgen +CROSSGEN_UTIL=$NUGET_PACKAGES/runtime.$RID.Microsoft.NETCore.Runtime.CoreCLR/1.0.1-rc2-23811/tools/crossgen cd $BIN_DIR @@ -70,4 +70,4 @@ chmod +x crossgen ./crossgen -nologo $READYTORUN -platform_assemblies_paths $BIN_DIR vbc.dll [ -e vbc.ni.exe ] && [ ! -e vbc.ni.dll ] && mv vbc.ni.exe vbc.ni.dll -info "CrossGen Roslyn Finished" \ No newline at end of file +info "CrossGen Roslyn Finished" diff --git a/scripts/obtain/install-tools.sh b/scripts/obtain/install-tools.sh index cf6d1d666..f4a99f26c 100755 --- a/scripts/obtain/install-tools.sh +++ b/scripts/obtain/install-tools.sh @@ -29,6 +29,6 @@ $REPOROOT/scripts/obtain/install.sh export PATH="$DOTNET_INSTALL_DIR/bin:$PATH" cd $REPOROOT/src/Microsoft.DotNet.Runtime dotnet restore - dotnet publish -o "$DOTNET_INSTALL_DIR/share/dotnet/cli/runtime" + dotnet publish -o "$DOTNET_INSTALL_DIR/share/dotnet/cli/runtime/coreclr" cp $DOTNET_INSTALL_DIR/share/dotnet/cli/runtime/coreclr/* $DOTNET_INSTALL_DIR/share/dotnet/cli/bin ) From 8534bb8747b6588388937d6aac1c1604ad4ac83a Mon Sep 17 00:00:00 2001 From: Andrew Stanton-Nurse Date: Thu, 11 Feb 2016 11:33:32 -0800 Subject: [PATCH 3/4] turn echo off off --- scripts/crossgen/crossgen_roslyn.cmd | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/crossgen/crossgen_roslyn.cmd b/scripts/crossgen/crossgen_roslyn.cmd index 2da8aa381..f27515cbd 100644 --- a/scripts/crossgen/crossgen_roslyn.cmd +++ b/scripts/crossgen/crossgen_roslyn.cmd @@ -1,4 +1,6 @@ -@echo off +REM Turn echo off off so we can echo with echo and the echoing +REM (But seriously, this script has weird hangs and crashes sometimes so we want to know exactly which commands are failing) +REM @echo off REM Copyright (c) .NET Foundation and contributors. All rights reserved. REM Licensed under the MIT license. See LICENSE file in the project root for full license information. From b5450cabc2a5ae41364d39952bb362635d7f8070 Mon Sep 17 00:00:00 2001 From: Andrew Stanton-Nurse Date: Thu, 11 Feb 2016 12:11:45 -0800 Subject: [PATCH 4/4] update version in 'dotnet new' template --- .../commands/dotnet-new/CSharp_Console/project.json.template | 2 +- .../commands/dotnet-new/FSharp_Console/project.json.template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 506b85dce..8c87d36c9 100644 --- a/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template +++ b/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template @@ -5,7 +5,7 @@ }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23810" + "NETStandard.Library": "1.0.0-rc2-23811" }, "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 a7a2e65db..829f37a4c 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 @@ "dependencies": { "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", - "NETStandard.Library": "1.0.0-rc2-23810" + "NETStandard.Library": "1.0.0-rc2-23811" }, "frameworks": {