From cc178d425f86f47da0e9a663a08063e1957f6f11 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Thu, 26 May 2016 13:11:22 -0500 Subject: [PATCH 1/4] Update CoreFx, SharedFx to rc3-24126-00, rc3-004312 --- .../project.json | 4 ++-- .../DesktopAppWithNativeDep/project.json | 2 +- .../DesktopAppWithRuntimes/project.json | 2 +- .../KestrelDesktop/project.json | 2 +- .../KestrelDesktopForce32/project.json | 2 +- .../KestrelDesktopWithRuntimes/project.json | 2 +- .../project.json | 2 +- .../project.json | 4 ++-- .../src/BrokenProjectPathSample/project.json | 4 ++-- .../src/EmptyConsoleApp/project.json | 2 +- .../src/EmptyLibrary/project.json | 2 +- .../src/EmptyNetCoreApp/project.json | 2 +- .../src/FailReleaseProject/project.json | 2 +- .../IncompatiblePackageSample/project.json | 4 ++-- .../src/Project1/project.json | 4 ++-- .../ToolWithOutputName/project.json | 4 ++-- .../project.json | 4 ++-- .../project.json | 4 ++-- .../dotnet-desktop-and-portable/project.json | 4 ++-- .../dotnet-hello/v1/dotnet-hello/project.json | 4 ++-- .../dotnet-hello/v2/dotnet-hello/project.json | 4 ++-- .../TestPackages/dotnet-portable/project.json | 4 ++-- .../TestApp1/project.json | 6 +++-- .../TestApp2/project.json | 2 +- .../AppWithBomGlobalJson/project.json | 4 ++-- .../project.json | 4 ++-- .../project.json | 4 ++-- .../AppWithDirectDependency/project.json | 4 ++-- .../project.json | 4 ++-- .../project.json | 4 ++-- .../AppWithOutputAssemblyName/project.json | 4 ++-- .../AppWithToolDependency/project.json | 4 ++-- .../TestProjects/CompileFail/project.json | 4 ++-- .../PortableApp_Standalone/project.json | 4 ++-- .../DependencyContextFromTool/project.json | 4 ++-- .../DependencyContextValidator/project.json | 2 +- .../TestApp/project.json | 11 ++++++--- .../TestAppDeps/project.json | 11 ++++++--- .../TestAppPortable/project.json | 4 ++-- .../TestAppPortableDeps/project.json | 4 ++-- .../TestApp/project.json | 2 +- .../TestProjects/EndToEndTestApp/project.json | 4 ++-- .../CompileFailApp/project.json | 4 ++-- .../FSharpTestProjects/TestApp/project.json | 4 ++-- .../TestAppWithArgs/project.json | 4 ++-- .../TestLibrary/project.json | 2 +- .../KestrelPortable/project.json | 4 ++-- .../KestrelStandalone/project.json | 4 ++-- .../project.json | 2 +- .../OutputStandardOutputAndError/project.json | 4 ++-- .../SingleTargetApp/project.json | 6 ++--- .../SingleTargetP0/project.json | 8 +++---- .../SingleTargetP1/project.json | 8 +++---- .../SingleTargetP2/project.json | 6 ++--- .../TwoTargetApp/project.json | 8 +++---- .../TwoTargetGraph/TwoTargetP0/project.json | 10 ++++---- .../TwoTargetGraph/TwoTargetP1/project.json | 10 ++++---- .../TwoTargetGraph/TwoTargetP2/project.json | 8 +++---- .../TwoTargetLargeP0/project.json | 10 ++++---- .../TwoTargetLargeP1/project.json | 12 +++++----- .../TwoTargetLargeP2/project.json | 12 +++++----- .../TwoTargetLargeP3/project.json | 10 ++++---- .../TwoTargetLargeP4/project.json | 12 +++++----- .../TwoTargetLargeP5/project.json | 8 +++---- .../TwoTargetLargeP6/project.json | 8 +++---- .../PortableTests/PortableApp/project.json | 4 ++-- .../project.json | 4 ++-- .../PortableAppWithNative/project.json | 4 ++-- .../PortableTests/StandaloneApp/project.json | 4 ++-- .../MultipleFrameworkProject/project.json | 8 +++---- .../NetCoreAppOnlyProject/project.json | 6 ++--- .../ResourcesTests/TestApp/project.json | 4 ++-- .../TestLibraryWithResources/project.json | 2 +- .../TestAppMultiTarget/project.json | 4 ++-- .../TestApp/project.json | 4 ++-- .../TestLibrary/project.json | 2 +- .../TestProjects/TestAppSimple/project.json | 4 ++-- .../TestProjects/TestAppWithArgs/project.json | 4 ++-- .../App/project.json | 4 ++-- .../LibraryWithBuildDependency/project.json | 2 +- .../TestAppWithContentPackage/project.json | 11 ++++++--- .../TestAppWithContents/project.json | 4 ++-- .../TestAppWithLibrary/TestApp/project.json | 4 ++-- .../TestLibrary/project.json | 2 +- .../TestAppWithResourceDeps/project.json | 12 +++++----- .../TestAppWithScripts/project.json | 4 ++-- .../TestApp/project.json | 4 ++-- .../TestLibrary/project.json | 2 +- .../TestLibrary2/project.json | 2 +- .../TestLibraryWithAppDependency/project.json | 2 +- .../TestAppWithUnicodéPath/project.json | 4 ++-- .../TestApp/project.json | 4 ++-- .../TestLibraryGreater/project.json | 2 +- .../TestLibraryLesser/project.json | 2 +- .../TestLibraryWithAnalyzer/project.json | 2 +- .../TestLibraryWithConfiguration/project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- .../TestLibraryWithXmlDoc/project.json | 2 +- .../TestMicrosoftCSharpReference/project.json | 4 ++-- .../project.json | 6 ++--- .../TestMscorlibReference/project.json | 2 +- .../project.json | 14 ++++++----- .../src/L0/project.json | 4 ++-- .../src/L11/project.json | 2 +- .../src/L12/project.json | 2 +- .../src/L21/project.json | 2 +- .../src/L22/project.json | 2 +- .../project.json | 4 ++-- .../TestProjectWithResource/project.json | 4 ++-- .../TestLibraryWithRuleSet/project.json | 2 +- .../TestSimpleIncrementalApp/project.json | 4 ++-- .../TestSystemCoreReference/project.json | 2 +- .../TestSystemReference/project.json | 2 +- .../project.json | 6 ++--- build_projects/dotnet-cli-build/project.json | 14 +++++------ .../DependencyVersions.cs | 6 ++--- .../shared-build-targets-utils/project.json | 12 +++++----- .../update-dependencies/project.json | 24 +++++++++---------- src/Microsoft.DotNet.Cli.Utils/project.json | 2 +- src/Microsoft.DotNet.Files/project.json | 2 +- .../project.json | 16 ++++++------- .../project.json | 2 +- .../project.json | 16 ++++++------- .../project.json | 6 ++--- .../project.json | 4 ++-- src/compilers/project.json | 4 ++-- src/dotnet-compile-fsc/project.json | 4 ++-- .../CSharp_Console/project.json.template | 2 +- .../FSharp_Console/project.json.template | 2 +- src/dotnet/project.json | 20 ++++++++-------- test/ArgumentForwardingTests/project.json | 4 ++-- test/ArgumentsReflector/project.json | 4 ++-- test/EndToEnd/project.json | 4 ++-- test/Kestrel.Tests/project.json | 4 ++-- .../project.json | 6 ++--- .../project.json | 4 ++-- .../project.json | 4 ++-- .../project.json | 4 ++-- test/Performance/project.json | 4 ++-- test/ScriptExecutorTests/project.json | 4 ++-- .../project.json | 4 ++-- .../project.json | 6 ++--- .../TestAppWithFullPdbs/project.json | 2 +- .../TestAppWithPortablePdbs/project.json | 2 +- test/binding-redirects.Tests/project.json | 2 +- test/crossgen.Tests/project.json | 4 ++-- test/dotnet-build.Tests/project.json | 4 ++-- test/dotnet-compile-fsc.Tests/project.json | 4 ++-- test/dotnet-compile.Tests/project.json | 4 ++-- test/dotnet-compile.UnitTests/project.json | 4 ++-- test/dotnet-new.Tests/project.json | 2 +- test/dotnet-pack.Tests/project.json | 6 ++--- .../project.json | 6 ++--- test/dotnet-publish.Tests/project.json | 6 ++--- test/dotnet-resgen.Tests/project.json | 4 ++-- test/dotnet-run.Tests/project.json | 4 ++-- test/dotnet-run.UnitTests/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 | 4 ++-- 162 files changed, 399 insertions(+), 380 deletions(-) diff --git a/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json b/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json index 12f902b6e..0f2c1d31a 100644 --- a/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json +++ b/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json @@ -11,7 +11,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004306" + "version": "1.0.0-rc3-004312" } }, "imports": [ @@ -30,4 +30,4 @@ ] } } -} \ No newline at end of file +} diff --git a/TestAssets/DesktopTestProjects/DesktopAppWithNativeDep/project.json b/TestAssets/DesktopTestProjects/DesktopAppWithNativeDep/project.json index e39d01715..99f44114b 100644 --- a/TestAssets/DesktopTestProjects/DesktopAppWithNativeDep/project.json +++ b/TestAssets/DesktopTestProjects/DesktopAppWithNativeDep/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { "PackageWithFakeNativeDep": "1.0.0-*", - "Microsoft.NETCore.Platforms": "1.0.0-rc3-24123-01" + "Microsoft.NETCore.Platforms": "1.0.1-rc3-24126-00" }, "buildOptions": { "emitEntryPoint": true diff --git a/TestAssets/DesktopTestProjects/DesktopAppWithRuntimes/project.json b/TestAssets/DesktopTestProjects/DesktopAppWithRuntimes/project.json index 7bdb51a2e..3714d9941 100644 --- a/TestAssets/DesktopTestProjects/DesktopAppWithRuntimes/project.json +++ b/TestAssets/DesktopTestProjects/DesktopAppWithRuntimes/project.json @@ -1,7 +1,7 @@ { "version": "1.0.0-*", "dependencies": { - "Microsoft.NETCore.Windows.ApiSets": "1.0.1-rc3-24123-01" + "Microsoft.NETCore.Windows.ApiSets": "1.0.1-rc3-24126-00" }, "buildOptions": { "emitEntryPoint": true diff --git a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktop/project.json b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktop/project.json index c2260088c..1f0a1143c 100644 --- a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktop/project.json +++ b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktop/project.json @@ -4,7 +4,7 @@ "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-20113", "Microsoft.AspNetCore.Hosting": "1.0.0-rc2-20113", "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20254", - "Microsoft.NETCore.Platforms": "1.0.0-rc3-24123-01" + "Microsoft.NETCore.Platforms": "1.0.1-rc3-24126-00" }, "buildOptions": { "emitEntryPoint": true, diff --git a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopForce32/project.json b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopForce32/project.json index e5ff5bed0..369078972 100644 --- a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopForce32/project.json +++ b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopForce32/project.json @@ -4,7 +4,7 @@ "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-20113", "Microsoft.AspNetCore.Hosting": "1.0.0-rc2-20113", "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20254", - "Microsoft.NETCore.Platforms": "1.0.0-rc3-24123-01" + "Microsoft.NETCore.Platforms": "1.0.1-rc3-24126-00" }, "buildOptions": { "platform": "anycpu32bitpreferred", diff --git a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopWithRuntimes/project.json b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopWithRuntimes/project.json index 73003e91c..0c28a29cc 100644 --- a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopWithRuntimes/project.json +++ b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopWithRuntimes/project.json @@ -4,7 +4,7 @@ "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-20113", "Microsoft.AspNetCore.Hosting": "1.0.0-rc2-20113", "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20254", - "Microsoft.NETCore.Platforms": "1.0.0-rc3-24123-01" + "Microsoft.NETCore.Platforms": "1.0.1-rc3-24126-00" }, "buildOptions": { "emitEntryPoint": true, diff --git a/TestAssets/DesktopTestProjects/LibraryWithDirectDependencyDesktopAndPortable/project.json b/TestAssets/DesktopTestProjects/LibraryWithDirectDependencyDesktopAndPortable/project.json index c21a12c54..841c330f5 100644 --- a/TestAssets/DesktopTestProjects/LibraryWithDirectDependencyDesktopAndPortable/project.json +++ b/TestAssets/DesktopTestProjects/LibraryWithDirectDependencyDesktopAndPortable/project.json @@ -9,7 +9,7 @@ "frameworks": { "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.5.0-rc3-24123-01" + "NETStandard.Library": "1.5.0-rc3-24126-00" }, "imports": [ "portable-net45+win8", diff --git a/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json b/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json index 429af88df..cfb0532f9 100644 --- a/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json +++ b/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc2-*" + "version": "1.0.0-rc3-004312" }, "ThisIsNotARealDependencyAndIfSomeoneGoesAndAddsAProjectWithThisNameIWillFindThemAndPunishThem": { "target": "project" @@ -17,4 +17,4 @@ "imports": "dnxcore50" } } -} \ No newline at end of file +} diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json index fcdc4152e..5a6dc9178 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json @@ -1,9 +1,9 @@ { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004306", + "Microsoft.NETCore.App": "1.0.0-rc3-004312", "EmptyLibrary": "1.0.0-*" }, "frameworks": { - "netcoreapp1.0": { } + "netcoreapp1.0": {} } } diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json index 2a3454785..27c12013b 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json @@ -3,7 +3,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004306" + "Microsoft.NETCore.App": "1.0.0-rc3-004312" } }, "dnx451": {} diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json index 3414899b5..5db4e735f 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-rc3-24123-01" + "NETStandard.Library": "1.5.0-rc3-24126-00" } } } diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json index d3457e983..6ac1aef8f 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004306" + "version": "1.0.0-rc3-004312" }, "Newtonsoft.Json": "8.0.3" } diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json index 538180070..080dd9e3c 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json @@ -3,7 +3,7 @@ "netcoreapp1.0": { "imports": "dnxcore50", "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004306" + "Microsoft.NETCore.App": "1.0.0-rc3-004312" } } }, diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json index 6319f0416..4d4112877 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json @@ -1,9 +1,9 @@ { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004306", + "Microsoft.NETCore.App": "1.0.0-rc3-004312", "Microsoft.Web.Administration": "7.0.0" }, "frameworks": { - "netcoreapp1.0": { } + "netcoreapp1.0": {} } } diff --git a/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json b/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json index bd0856ed8..00cab37ca 100755 --- a/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json +++ b/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json @@ -4,9 +4,9 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004306" + "Microsoft.NETCore.App": "1.0.0-rc3-004312" }, "frameworks": { "netcoreapp1.0": {} } -} \ No newline at end of file +} diff --git a/TestAssets/TestPackages/ToolWithOutputName/project.json b/TestAssets/TestPackages/ToolWithOutputName/project.json index fed9ed997..29d27dd71 100644 --- a/TestAssets/TestPackages/ToolWithOutputName/project.json +++ b/TestAssets/TestPackages/ToolWithOutputName/project.json @@ -9,9 +9,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004306" + "version": "1.0.0-rc3-004312" } } } } -} \ No newline at end of file +} diff --git a/TestAssets/TestPackages/dotnet-dependency-context-test/project.json b/TestAssets/TestPackages/dotnet-dependency-context-test/project.json index bbda1564c..c5d2c4e6e 100644 --- a/TestAssets/TestPackages/dotnet-dependency-context-test/project.json +++ b/TestAssets/TestPackages/dotnet-dependency-context-test/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004306" + "version": "1.0.0-rc3-004312" }, "Microsoft.Extensions.DependencyModel": { "target": "project" @@ -20,4 +20,4 @@ ] } } -} \ No newline at end of file +} diff --git a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json index ccaace04d..37d9c4a98 100644 --- a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json +++ b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json @@ -12,7 +12,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004306" + "version": "1.0.0-rc3-004312" }, "Microsoft.DotNet.Cli.Utils": { "target": "project" @@ -32,4 +32,4 @@ ] } } -} \ No newline at end of file +} diff --git a/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json b/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json index e643e41ef..cada905bf 100644 --- a/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json +++ b/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json @@ -8,10 +8,10 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004306" + "version": "1.0.0-rc3-004312" } } }, "net451": {} } -} \ No newline at end of file +} diff --git a/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json index acc670554..620c21216 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": { - "Microsoft.NETCore.App": "1.0.0-rc3-004306" + "Microsoft.NETCore.App": "1.0.0-rc3-004312" }, "frameworks": { "netcoreapp1.0": {} @@ -19,4 +19,4 @@ "rhel.7.2-x64": {}, "debian.8-x64": {} } -} \ No newline at end of file +} diff --git a/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json b/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json index b73544cc0..a9a83d476 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": { - "Microsoft.NETCore.App": "1.0.0-rc3-004306" + "Microsoft.NETCore.App": "1.0.0-rc3-004312" }, "frameworks": { "netcoreapp1.0": {} @@ -19,4 +19,4 @@ "rhel.7.2-x64": {}, "debian.8-x64": {} } -} \ No newline at end of file +} diff --git a/TestAssets/TestPackages/dotnet-portable/project.json b/TestAssets/TestPackages/dotnet-portable/project.json index 0d4051849..a81dd5542 100644 --- a/TestAssets/TestPackages/dotnet-portable/project.json +++ b/TestAssets/TestPackages/dotnet-portable/project.json @@ -8,9 +8,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004306" + "version": "1.0.0-rc3-004312" } } } } -} \ No newline at end of file +} diff --git a/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json b/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json index 5e52f72be..9e039c303 100644 --- a/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json +++ b/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json @@ -3,14 +3,16 @@ "emitEntryPoint": true }, "dependencies": { - "TestApp2": { "target": "project" } + "TestApp2": { + "target": "project" + } }, "frameworks": { "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004306" + "version": "1.0.0-rc3-004312" } } } diff --git a/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json b/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json index 4856c3d73..b70a98d3b 100644 --- a/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json +++ b/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004306" + "version": "1.0.0-rc3-004312" } } } diff --git a/TestAssets/TestProjects/AppWithBomGlobalJson/project.json b/TestAssets/TestProjects/AppWithBomGlobalJson/project.json index 6d6ae8cd8..c4334edf4 100644 --- a/TestAssets/TestProjects/AppWithBomGlobalJson/project.json +++ b/TestAssets/TestProjects/AppWithBomGlobalJson/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004306" + "Microsoft.NETCore.App": "1.0.0-rc3-004312" }, "frameworks": { "netcoreapp1.0": {} @@ -25,4 +25,4 @@ "target": "package" } } -} \ No newline at end of file +} diff --git a/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json b/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json index 8854296b1..860a697d6 100644 --- a/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json +++ b/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json @@ -5,7 +5,7 @@ }, "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004306", + "version": "1.0.0-rc3-004312", "type": "platform" } }, @@ -18,4 +18,4 @@ "target": "package" } } -} \ No newline at end of file +} diff --git a/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json b/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json index bd8f4fab2..d59aa1796 100644 --- a/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json +++ b/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004306", + "Microsoft.NETCore.App": "1.0.0-rc3-004312", "dotnet-hello": { "version": "1.0.0", "target": "package" @@ -29,4 +29,4 @@ "target": "package" } } -} \ No newline at end of file +} diff --git a/TestAssets/TestProjects/AppWithDirectDependency/project.json b/TestAssets/TestProjects/AppWithDirectDependency/project.json index f66bb6dfd..fa84a265c 100644 --- a/TestAssets/TestProjects/AppWithDirectDependency/project.json +++ b/TestAssets/TestProjects/AppWithDirectDependency/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004306", + "Microsoft.NETCore.App": "1.0.0-rc3-004312", "dotnet-hello": { "version": "1.0.0", "target": "package" @@ -23,4 +23,4 @@ "rhel.7.2-x64": {}, "debian.8-x64": {} } -} \ No newline at end of file +} diff --git a/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json b/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json index 3b40c9294..9364be826 100644 --- a/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json +++ b/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json @@ -5,7 +5,7 @@ }, "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004306", + "version": "1.0.0-rc3-004312", "type": "platform" }, "xunit.core": "2.1.0", @@ -21,4 +21,4 @@ ] } } -} \ No newline at end of file +} diff --git a/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json b/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json index dd9d75d6d..d1be29402 100644 --- a/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json +++ b/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json @@ -8,7 +8,7 @@ "target": "package" }, "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004306", + "version": "1.0.0-rc3-004312", "type": "platform" } }, @@ -24,4 +24,4 @@ ] } } -} \ No newline at end of file +} diff --git a/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json b/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json index 5c59c08d9..747f34eb4 100644 --- a/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json +++ b/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004306" + "Microsoft.NETCore.App": "1.0.0-rc3-004312" }, "frameworks": { "netcoreapp1.0": {} @@ -19,4 +19,4 @@ "rhel.7.2-x64": {}, "debian.8-x64": {} } -} \ No newline at end of file +} diff --git a/TestAssets/TestProjects/AppWithToolDependency/project.json b/TestAssets/TestProjects/AppWithToolDependency/project.json index 0d13ce8d6..e63f00e7e 100644 --- a/TestAssets/TestProjects/AppWithToolDependency/project.json +++ b/TestAssets/TestProjects/AppWithToolDependency/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004306" + "Microsoft.NETCore.App": "1.0.0-rc3-004312" }, "frameworks": { "netcoreapp1.0": {} @@ -25,4 +25,4 @@ "rhel.7.2-x64": {}, "debian.8-x64": {} } -} \ No newline at end of file +} diff --git a/TestAssets/TestProjects/CompileFail/project.json b/TestAssets/TestProjects/CompileFail/project.json index 72019737a..a7025e31e 100644 --- a/TestAssets/TestProjects/CompileFail/project.json +++ b/TestAssets/TestProjects/CompileFail/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004306" + "Microsoft.NETCore.App": "1.0.0-rc3-004312" }, "frameworks": { "netcoreapp1.0": {} @@ -19,4 +19,4 @@ "rhel.7.2-x64": {}, "debian.8-x64": {} } -} \ No newline at end of file +} diff --git a/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json b/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json index 2646a2a7a..b70a98d3b 100644 --- a/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json +++ b/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json @@ -8,9 +8,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004306" + "version": "1.0.0-rc3-004312" } } } } -} \ No newline at end of file +} diff --git a/TestAssets/TestProjects/DependencyContextFromTool/project.json b/TestAssets/TestProjects/DependencyContextFromTool/project.json index 571237efc..6d9c3c92a 100644 --- a/TestAssets/TestProjects/DependencyContextFromTool/project.json +++ b/TestAssets/TestProjects/DependencyContextFromTool/project.json @@ -12,7 +12,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004306" + "version": "1.0.0-rc3-004312" } } } @@ -25,4 +25,4 @@ ] } } -} \ No newline at end of file +} diff --git a/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json b/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json index 5254cd619..7451538b2 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json @@ -9,7 +9,7 @@ "netstandard1.5": { "imports": "dnxcore50", "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004306" + "Microsoft.NETCore.App": "1.0.0-rc3-004312" } }, "net451": {} diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json index a13004d02..26cd6a36b 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json @@ -5,11 +5,16 @@ "preserveCompilationContext": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004306", + "Microsoft.NETCore.App": "1.0.0-rc3-004312", "DependencyContextValidator": "1.0.0-*" }, "frameworks": { - "netcoreapp1.0": { "imports": ["dnxcore50", "portable-net45+win8"] } + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] + } }, "runtimes": { "win7-x64": {}, @@ -21,4 +26,4 @@ "rhel.7.2-x64": {}, "debian.8-x64": {} } -} \ No newline at end of file +} diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json index f37f78513..2d8cda65c 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json @@ -4,11 +4,16 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004306", + "Microsoft.NETCore.App": "1.0.0-rc3-004312", "DependencyContextValidator": "1.0.0-*" }, "frameworks": { - "netcoreapp1.0": { "imports": ["dnxcore50", "portable-net45+win8"] } + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] + } }, "runtimes": { "win7-x64": {}, @@ -20,4 +25,4 @@ "rhel.7.2-x64": {}, "debian.8-x64": {} } -} \ No newline at end of file +} diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json index 9e1d2ce85..7190f491c 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json @@ -7,7 +7,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004306" + "version": "1.0.0-rc3-004312" }, "DependencyContextValidator": "1.0.0-*" }, @@ -19,4 +19,4 @@ ] } } -} \ No newline at end of file +} diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json index c4daf76e8..53e4db283 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004306" + "version": "1.0.0-rc3-004312" }, "DependencyContextValidator": "1.0.0-*" }, @@ -18,4 +18,4 @@ ] } } -} \ No newline at end of file +} diff --git a/TestAssets/TestProjects/DuplicatedReferenceAssembly/TestApp/project.json b/TestAssets/TestProjects/DuplicatedReferenceAssembly/TestApp/project.json index 1484309bd..7e75df3da 100644 --- a/TestAssets/TestProjects/DuplicatedReferenceAssembly/TestApp/project.json +++ b/TestAssets/TestProjects/DuplicatedReferenceAssembly/TestApp/project.json @@ -2,7 +2,7 @@ "version": "1.0.0", "dependencies": { "TestLibrary": "1.0.0", - "System.IO.Compression": "4.1.0-rc3-24123-01" + "System.IO.Compression": "4.1.0-rc3-24126-00" }, "frameworks": { "net461": {} diff --git a/TestAssets/TestProjects/EndToEndTestApp/project.json b/TestAssets/TestProjects/EndToEndTestApp/project.json index fe1c4c15f..52e4bf0a0 100644 --- a/TestAssets/TestProjects/EndToEndTestApp/project.json +++ b/TestAssets/TestProjects/EndToEndTestApp/project.json @@ -14,7 +14,7 @@ } }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004306" + "Microsoft.NETCore.App": "1.0.0-rc3-004312" }, "packOptions": { "files": { @@ -26,7 +26,7 @@ }, "publishOptions": "testpublishfile.txt", "frameworks": { - "netcoreapp1.0": { } + "netcoreapp1.0": {} }, "runtimes": { "win7-x64": {}, diff --git a/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json b/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json index afad3eaf0..a04d45c92 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json @@ -11,7 +11,7 @@ }, "dependencies": { "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", - "Microsoft.NETCore.App": "1.0.0-rc3-004306" + "Microsoft.NETCore.App": "1.0.0-rc3-004312" }, "tools": { "dotnet-compile-fsc": { @@ -41,4 +41,4 @@ "rhel.7.2-x64": {}, "debian.8-x64": {} } -} \ No newline at end of file +} diff --git a/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json b/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json index f357f184f..07e815a87 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json @@ -14,7 +14,7 @@ "version": "1.0.0-*", "target": "project" }, - "Microsoft.NETCore.App": "1.0.0-rc3-004306", + "Microsoft.NETCore.App": "1.0.0-rc3-004312", "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221" }, "tools": { @@ -42,4 +42,4 @@ "rhel.7.2-x64": {}, "debian.8-x64": {} } -} \ No newline at end of file +} diff --git a/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json b/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json index 6a47e729e..b0ea18828 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json @@ -11,7 +11,7 @@ }, "dependencies": { "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", - "Microsoft.NETCore.App": "1.0.0-rc3-004306" + "Microsoft.NETCore.App": "1.0.0-rc3-004312" }, "tools": { "dotnet-compile-fsc": { @@ -38,4 +38,4 @@ "rhel.7.2-x64": {}, "debian.8-x64": {} } -} \ No newline at end of file +} diff --git a/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/project.json b/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/project.json index 88bb27f20..ecf97d96d 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/project.json +++ b/TestAssets/TestProjects/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-rc3-24123-01" + "NETStandard.Library": "1.5.0-rc3-24126-00" }, "tools": { "dotnet-compile-fsc": { diff --git a/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json b/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json index 6bec45fda..7bed41978 100644 --- a/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json +++ b/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json @@ -18,7 +18,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004306" + "version": "1.0.0-rc3-004312" } }, "imports": [ @@ -27,4 +27,4 @@ ] } } -} \ No newline at end of file +} diff --git a/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json b/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json index 2d079a113..0f4119718 100644 --- a/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json +++ b/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json @@ -16,7 +16,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004306" + "Microsoft.NETCore.App": "1.0.0-rc3-004312" }, "imports": [ "dnxcore50", @@ -34,4 +34,4 @@ "rhel.7.2-x64": {}, "debian.8-x64": {} } -} \ No newline at end of file +} diff --git a/TestAssets/TestProjects/LibraryWithOutputAssemblyName/project.json b/TestAssets/TestProjects/LibraryWithOutputAssemblyName/project.json index 4477d6f5c..22e9a3533 100644 --- a/TestAssets/TestProjects/LibraryWithOutputAssemblyName/project.json +++ b/TestAssets/TestProjects/LibraryWithOutputAssemblyName/project.json @@ -3,7 +3,7 @@ "outputName": "MyLibrary" }, "dependencies": { - "NETStandard.Library": "1.5.0-rc3-24123-01" + "NETStandard.Library": "1.5.0-rc3-24126-00" }, "frameworks": { "netstandard1.5": {} diff --git a/TestAssets/TestProjects/OutputStandardOutputAndError/project.json b/TestAssets/TestProjects/OutputStandardOutputAndError/project.json index 72019737a..a7025e31e 100644 --- a/TestAssets/TestProjects/OutputStandardOutputAndError/project.json +++ b/TestAssets/TestProjects/OutputStandardOutputAndError/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004306" + "Microsoft.NETCore.App": "1.0.0-rc3-004312" }, "frameworks": { "netcoreapp1.0": {} @@ -19,4 +19,4 @@ "rhel.7.2-x64": {}, "debian.8-x64": {} } -} \ No newline at end of file +} diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json index 2c2634f98..0a61010d7 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json @@ -6,10 +6,10 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc2-*" - }, + "version": "1.0.0-rc3-004312" + } }, "frameworks": { - "netcoreapp1.0": { } + "netcoreapp1.0": {} } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json index 21f71d7cf..70f19bd09 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json @@ -4,15 +4,15 @@ "emitEntryPoint": true }, "dependencies": { - "SingleTargetP1" : { + "SingleTargetP1": { "target": "project" }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc2-*" - }, + "version": "1.0.0-rc3-004312" + } }, "frameworks": { - "netcoreapp1.0": { } + "netcoreapp1.0": {} } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json index 0f4fee5ad..317cbfc4b 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json @@ -1,15 +1,15 @@ { "version": "1.0.0-*", "dependencies": { - "SingleTargetP2" : { + "SingleTargetP2": { "target": "project" }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc2-*" - }, + "version": "1.0.0-rc3-004312" + } }, "frameworks": { - "netcoreapp1.0": { } + "netcoreapp1.0": {} } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json index 71ae27297..a1f7a7d5d 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json @@ -3,10 +3,10 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc2-*" - }, + "version": "1.0.0-rc3-004312" + } }, "frameworks": { - "netcoreapp1.0": { } + "netcoreapp1.0": {} } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json index ff31615bb..3e71c2771 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json @@ -6,11 +6,11 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc2-*" - }, + "version": "1.0.0-rc3-004312" + } }, "frameworks": { - "netcoreapp1.0": { }, - "netstandard1.5": { } + "netcoreapp1.0": {}, + "netstandard1.5": {} } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json index 6f7aa8bf2..7451cf25f 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json @@ -4,16 +4,16 @@ "emitEntryPoint": true }, "dependencies": { - "TwoTargetP1" : { + "TwoTargetP1": { "target": "project" }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc2-*" - }, + "version": "1.0.0-rc3-004312" + } }, "frameworks": { - "netcoreapp1.0": { }, - "netstandard1.5": { } + "netcoreapp1.0": {}, + "netstandard1.5": {} } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json index 3e279184d..1744a299f 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json @@ -1,16 +1,16 @@ { "version": "1.0.0-*", "dependencies": { - "TwoTargetP2" : { + "TwoTargetP2": { "target": "project" }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc2-*" - }, + "version": "1.0.0-rc3-004312" + } }, "frameworks": { - "netcoreapp1.0": { }, - "netstandard1.5": { } + "netcoreapp1.0": {}, + "netstandard1.5": {} } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json index a1f979cc9..1c0e35f60 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json @@ -3,11 +3,11 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc2-*" - }, + "version": "1.0.0-rc3-004312" + } }, "frameworks": { - "netcoreapp1.0": { }, - "netstandard1.5": { } + "netcoreapp1.0": {}, + "netstandard1.5": {} } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json index 8c1b58054..287fbdbbc 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json @@ -4,16 +4,16 @@ "emitEntryPoint": true }, "dependencies": { - "TwoTargetLargeP1" : { + "TwoTargetLargeP1": { "target": "project" }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc2-*" - }, + "version": "1.0.0-rc3-004312" + } }, "frameworks": { - "netcoreapp1.0": { }, - "netstandard1.5": { } + "netcoreapp1.0": {}, + "netstandard1.5": {} } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json index 5b080a6f1..818272029 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json @@ -1,19 +1,19 @@ { "version": "1.0.0-*", "dependencies": { - "TwoTargetLargeP2" : { + "TwoTargetLargeP2": { "target": "project" }, - "TwoTargetLargeP4" : { + "TwoTargetLargeP4": { "target": "project" }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc2-*" - }, + "version": "1.0.0-rc3-004312" + } }, "frameworks": { - "netcoreapp1.0": { }, - "netstandard1.5": { } + "netcoreapp1.0": {}, + "netstandard1.5": {} } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json index 8b7d44b36..d95437413 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json @@ -1,19 +1,19 @@ { "version": "1.0.0-*", "dependencies": { - "TwoTargetLargeP3" : { + "TwoTargetLargeP3": { "target": "project" }, - "TwoTargetLargeP4" : { + "TwoTargetLargeP4": { "target": "project" }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc2-*" - }, + "version": "1.0.0-rc3-004312" + } }, "frameworks": { - "netcoreapp1.0": { }, - "netstandard1.5": { } + "netcoreapp1.0": {}, + "netstandard1.5": {} } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json index e75856ac1..348540b1d 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json @@ -1,16 +1,16 @@ { "version": "1.0.0-*", "dependencies": { - "TwoTargetLargeP4" : { + "TwoTargetLargeP4": { "target": "project" }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc2-*" - }, + "version": "1.0.0-rc3-004312" + } }, "frameworks": { - "netcoreapp1.0": { }, - "netstandard1.5": { } + "netcoreapp1.0": {}, + "netstandard1.5": {} } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json index ea7cad01d..8a09a05b1 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json @@ -1,19 +1,19 @@ { "version": "1.0.0-*", "dependencies": { - "TwoTargetLargeP5" : { + "TwoTargetLargeP5": { "target": "project" }, - "TwoTargetLargeP6" : { + "TwoTargetLargeP6": { "target": "project" }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc2-*" - }, + "version": "1.0.0-rc3-004312" + } }, "frameworks": { - "netcoreapp1.0": { }, - "netstandard1.5": { } + "netcoreapp1.0": {}, + "netstandard1.5": {} } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json index a1f979cc9..1c0e35f60 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json @@ -3,11 +3,11 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc2-*" - }, + "version": "1.0.0-rc3-004312" + } }, "frameworks": { - "netcoreapp1.0": { }, - "netstandard1.5": { } + "netcoreapp1.0": {}, + "netstandard1.5": {} } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json index a1f979cc9..1c0e35f60 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json @@ -3,11 +3,11 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc2-*" - }, + "version": "1.0.0-rc3-004312" + } }, "frameworks": { - "netcoreapp1.0": { }, - "netstandard1.5": { } + "netcoreapp1.0": {}, + "netstandard1.5": {} } } diff --git a/TestAssets/TestProjects/PortableTests/PortableApp/project.json b/TestAssets/TestProjects/PortableTests/PortableApp/project.json index e208c3e57..c63c0458a 100644 --- a/TestAssets/TestProjects/PortableTests/PortableApp/project.json +++ b/TestAssets/TestProjects/PortableTests/PortableApp/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004306" + "version": "1.0.0-rc3-004312" } } } @@ -24,4 +24,4 @@ "someProperty": "someValue" } } -} \ No newline at end of file +} diff --git a/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json b/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json index cdeaaa5ce..74b8d5419 100644 --- a/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json +++ b/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json @@ -11,9 +11,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004306" + "version": "1.0.0-rc3-004312" } } } } -} \ No newline at end of file +} diff --git a/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json b/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json index 9089f3c50..3aa452d0e 100644 --- a/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json +++ b/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json @@ -7,11 +7,11 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004306" + "version": "1.0.0-rc3-004312" }, "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*" }, "imports": "dnxcore50" } } -} \ No newline at end of file +} diff --git a/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json b/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json index caaae3996..d2d158ae2 100644 --- a/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json +++ b/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json @@ -5,7 +5,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc2-*" + "Microsoft.NETCore.App": "1.0.0-rc3-004312" } } }, @@ -30,4 +30,4 @@ "someProperty": "someValue" } } -} \ No newline at end of file +} diff --git a/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json b/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json index 849c45856..6f0e533a1 100644 --- a/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json +++ b/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { "dotnet-test-xunit": "1.0.0-rc2-192208-24", - "Microsoft.NETCore.Platforms": "1.0.1-rc3-24123-01", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-24126-00", "xunit": "2.1.0" }, "frameworks": { @@ -15,10 +15,10 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc2-*" + "version": "1.0.0-rc3-004312" }, - "System.Linq.Expressions": "4.1.0-rc3-24123-01", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01" + "System.Linq.Expressions": "4.1.0-rc3-24126-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24126-00" } }, "net451": {} diff --git a/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json b/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json index 689c78cca..4746659af 100644 --- a/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json +++ b/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json @@ -3,10 +3,10 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc2-*" + "version": "1.0.0-rc3-004312" }, - "System.Linq.Expressions": "4.1.0-rc3-24123-01", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01", + "System.Linq.Expressions": "4.1.0-rc3-24126-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24126-00", "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-rc2-192208-24" }, diff --git a/TestAssets/TestProjects/ResourcesTests/TestApp/project.json b/TestAssets/TestProjects/ResourcesTests/TestApp/project.json index 8aec4114d..d9c5f6e88 100644 --- a/TestAssets/TestProjects/ResourcesTests/TestApp/project.json +++ b/TestAssets/TestProjects/ResourcesTests/TestApp/project.json @@ -7,7 +7,7 @@ "Microsoft.Data.OData": "5.6.4", "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004306" + "version": "1.0.0-rc3-004312" }, "TestLibraryWithResources": { "target": "project" @@ -20,4 +20,4 @@ ] } } -} \ No newline at end of file +} diff --git a/TestAssets/TestProjects/ResourcesTests/TestLibraryWithResources/project.json b/TestAssets/TestProjects/ResourcesTests/TestLibraryWithResources/project.json index b04a1fe3b..22148fa31 100644 --- a/TestAssets/TestProjects/ResourcesTests/TestLibraryWithResources/project.json +++ b/TestAssets/TestProjects/ResourcesTests/TestLibraryWithResources/project.json @@ -1,7 +1,7 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.5.0-rc3-24123-01" + "NETStandard.Library": "1.5.0-rc3-24126-00" }, "frameworks": { "netstandard1.5": { diff --git a/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json b/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json index 71c2c8b05..ab741c6f4 100644 --- a/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json +++ b/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json @@ -7,11 +7,11 @@ "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004306", + "version": "1.0.0-rc3-004312", "type": "platform" } } }, "net451": {} } -} \ No newline at end of file +} diff --git a/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json b/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json index c09a9ca1e..69bf15e57 100644 --- a/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json @@ -6,7 +6,7 @@ }, "dependencies": { "TestLibrary": "1.0.0-*", - "Microsoft.NETCore.App": "1.0.0-rc3-004306" + "Microsoft.NETCore.App": "1.0.0-rc3-004312" }, "frameworks": { "netcoreapp1.0": {} @@ -21,4 +21,4 @@ "rhel.7.2-x64": {}, "debian.8-x64": {} } -} \ No newline at end of file +} diff --git a/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json b/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json index ef42abd54..7ef1bb347 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-rc3-24123-01" + "NETStandard.Library": "1.5.0-rc3-24126-00" }, "frameworks": { "netstandard1.5": {} diff --git a/TestAssets/TestProjects/TestAppSimple/project.json b/TestAssets/TestProjects/TestAppSimple/project.json index 72019737a..a7025e31e 100644 --- a/TestAssets/TestProjects/TestAppSimple/project.json +++ b/TestAssets/TestProjects/TestAppSimple/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004306" + "Microsoft.NETCore.App": "1.0.0-rc3-004312" }, "frameworks": { "netcoreapp1.0": {} @@ -19,4 +19,4 @@ "rhel.7.2-x64": {}, "debian.8-x64": {} } -} \ No newline at end of file +} diff --git a/TestAssets/TestProjects/TestAppWithArgs/project.json b/TestAssets/TestProjects/TestAppWithArgs/project.json index 72019737a..a7025e31e 100644 --- a/TestAssets/TestProjects/TestAppWithArgs/project.json +++ b/TestAssets/TestProjects/TestAppWithArgs/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004306" + "Microsoft.NETCore.App": "1.0.0-rc3-004312" }, "frameworks": { "netcoreapp1.0": {} @@ -19,4 +19,4 @@ "rhel.7.2-x64": {}, "debian.8-x64": {} } -} \ No newline at end of file +} diff --git a/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json b/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json index e24ee18aa..9953c543f 100644 --- a/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json +++ b/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004306" + "version": "1.0.0-rc3-004312" }, "LibraryWithBuildDependency": { "target": "project" @@ -17,4 +17,4 @@ "imports": "dnxcore50" } } -} \ No newline at end of file +} diff --git a/TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json b/TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json index 5796c2aa6..e4f41cf43 100644 --- a/TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json +++ b/TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004306" + "version": "1.0.0-rc3-004312" }, "Microsoft.Net.Compilers": { "type": "build", diff --git a/TestAssets/TestProjects/TestAppWithContentPackage/project.json b/TestAssets/TestProjects/TestAppWithContentPackage/project.json index 818c5a6b7..a356fc4d0 100644 --- a/TestAssets/TestProjects/TestAppWithContentPackage/project.json +++ b/TestAssets/TestProjects/TestAppWithContentPackage/project.json @@ -5,11 +5,16 @@ "outputName": "AppWithContentPackage" }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004306", + "Microsoft.NETCore.App": "1.0.0-rc3-004312", "SharedContentA": "1.0.0-*" }, "frameworks": { - "netcoreapp1.0": { "imports": ["netstandardapp1.5", "dnxcore50"] } + "netcoreapp1.0": { + "imports": [ + "netstandardapp1.5", + "dnxcore50" + ] + } }, "runtimes": { "win7-x64": {}, @@ -21,4 +26,4 @@ "rhel.7.2-x64": {}, "debian.8-x64": {} } -} \ No newline at end of file +} diff --git a/TestAssets/TestProjects/TestAppWithContents/project.json b/TestAssets/TestProjects/TestAppWithContents/project.json index 43b534c4e..b2c733644 100644 --- a/TestAssets/TestProjects/TestAppWithContents/project.json +++ b/TestAssets/TestProjects/TestAppWithContents/project.json @@ -7,7 +7,7 @@ } }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004306" + "Microsoft.NETCore.App": "1.0.0-rc3-004312" }, "frameworks": { "netcoreapp1.0": {} @@ -25,4 +25,4 @@ "rhel.7.2-x64": {}, "debian.8-x64": {} } -} \ No newline at end of file +} diff --git a/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json b/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json index 890c28416..06708408e 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-*" }, - "Microsoft.NETCore.App": "1.0.0-rc3-004306" + "Microsoft.NETCore.App": "1.0.0-rc3-004312" }, "frameworks": { "netcoreapp1.0": {} @@ -24,4 +24,4 @@ "rhel.7.2-x64": {}, "debian.8-x64": {} } -} \ No newline at end of file +} diff --git a/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json b/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json index ef42abd54..7ef1bb347 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-rc3-24123-01" + "NETStandard.Library": "1.5.0-rc3-24126-00" }, "frameworks": { "netstandard1.5": {} diff --git a/TestAssets/TestProjects/TestAppWithResourceDeps/project.json b/TestAssets/TestProjects/TestAppWithResourceDeps/project.json index c36b8a094..3efc07eb7 100644 --- a/TestAssets/TestProjects/TestAppWithResourceDeps/project.json +++ b/TestAssets/TestProjects/TestAppWithResourceDeps/project.json @@ -4,12 +4,12 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.5.0-rc2-24027", - "Microsoft.CSharp": "4.0.1-rc2-24027", - "System.Dynamic.Runtime": "4.0.11-rc2-24027", - "System.Reflection.Metadata": "1.3.0-rc2-24027", - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027", - "System.Xml.XmlSerializer": "4.0.11-rc2-24027", + "NETStandard.Library": "1.5.0-rc3-24126-00", + "Microsoft.CSharp": "4.0.1-rc3-24126-00", + "System.Dynamic.Runtime": "4.0.11-rc3-24126-00", + "System.Reflection.Metadata": "1.3.0-rc3-24126-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24126-00", + "System.Xml.XmlSerializer": "4.0.11-rc3-24126-00", "WindowsAzure.Storage": "6.2.2-preview" }, "frameworks": { diff --git a/TestAssets/TestProjects/TestAppWithScripts/project.json b/TestAssets/TestProjects/TestAppWithScripts/project.json index c20d52c00..88d1ba3ab 100644 --- a/TestAssets/TestProjects/TestAppWithScripts/project.json +++ b/TestAssets/TestProjects/TestAppWithScripts/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004306" + "Microsoft.NETCore.App": "1.0.0-rc3-004312" }, "frameworks": { "netcoreapp1.0": {} @@ -33,4 +33,4 @@ "echoscript postcompile_output ?%compile:ProjectPath%? ?%compile:Configuration%? ?%compile:OutputPath%? ?%compile:TargetFramework%? ?%compile:Runtime%?" ] } -} \ No newline at end of file +} diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json index 89c6a46fe..fe2387a2c 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-*" }, - "Microsoft.NETCore.App": "1.0.0-rc3-004306" + "Microsoft.NETCore.App": "1.0.0-rc3-004312" }, "frameworks": { "netcoreapp1.0": {} @@ -32,4 +32,4 @@ "echo postpublish_output ?%publish:ProjectPath%? ?%publish:Configuration%? ?%publish:OutputPath%? ?%publish:Framework%? ?%publish:Runtime%?" ] } -} \ No newline at end of file +} diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json index dfb9233c2..9884bde76 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-rc3-24123-01" + "NETStandard.Library": "1.5.0-rc3-24126-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json index 7d87433d6..a2a57a78c 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-rc3-24123-01" + "NETStandard.Library": "1.5.0-rc3-24126-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json index 028558e63..e08c08de3 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-rc3-24123-01" + "NETStandard.Library": "1.5.0-rc3-24126-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json b/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json index 72019737a..a7025e31e 100644 --- a/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json +++ b/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004306" + "Microsoft.NETCore.App": "1.0.0-rc3-004312" }, "frameworks": { "netcoreapp1.0": {} @@ -19,4 +19,4 @@ "rhel.7.2-x64": {}, "debian.8-x64": {} } -} \ No newline at end of file +} diff --git a/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json b/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json index 890c28416..06708408e 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-*" }, - "Microsoft.NETCore.App": "1.0.0-rc3-004306" + "Microsoft.NETCore.App": "1.0.0-rc3-004312" }, "frameworks": { "netcoreapp1.0": {} @@ -24,4 +24,4 @@ "rhel.7.2-x64": {}, "debian.8-x64": {} } -} \ No newline at end of file +} diff --git a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json index 2ee427ae1..8ed0ea57d 100644 --- a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json +++ b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json @@ -7,7 +7,7 @@ "net451": {}, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.5.0-rc3-24123-01" + "NETStandard.Library": "1.5.0-rc3-24126-00" }, "imports": "portable-net45+win8" } diff --git a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json index d577ceb7d..1d0559fe2 100644 --- a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json +++ b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json @@ -13,7 +13,7 @@ "net451": {}, "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004306" + "Microsoft.NETCore.App": "1.0.0-rc3-004312" }, "imports": "portable-net45+win8" } diff --git a/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json b/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json index 5c0a5f7f9..84a59b3db 100644 --- a/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json +++ b/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json @@ -1,7 +1,7 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.5.0-rc3-24123-01", + "NETStandard.Library": "1.5.0-rc3-24126-00", "System.Runtime.Analyzers": { "version": "1.1.0", "type": "build" diff --git a/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json b/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json index b5968a650..9bc1e3854 100644 --- a/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json +++ b/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json @@ -10,7 +10,7 @@ ] }, "dependencies": { - "NETStandard.Library": "1.5.0-rc3-24123-01" + "NETStandard.Library": "1.5.0-rc3-24126-00" }, "configurations": { "Test": {} diff --git a/TestAssets/TestProjects/TestLibraryWithDeprecatedProjectFile/project.json b/TestAssets/TestProjects/TestLibraryWithDeprecatedProjectFile/project.json index 63de5623c..1cd4877f4 100644 --- a/TestAssets/TestProjects/TestLibraryWithDeprecatedProjectFile/project.json +++ b/TestAssets/TestProjects/TestLibraryWithDeprecatedProjectFile/project.json @@ -5,7 +5,7 @@ }, "packInclude": {}, "dependencies": { - "NETStandard.Library": "1.5.0-rc3-24123-01" + "NETStandard.Library": "1.5.0-rc3-24126-00" }, "frameworks": { "netstandard1.5": {} diff --git a/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json b/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json index 2edc52d3e..a2a9688c0 100644 --- a/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json +++ b/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json @@ -28,7 +28,7 @@ "netstandard1.5": { "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.5.0-rc3-24123-01" + "NETStandard.Library": "1.5.0-rc3-24126-00" } } } diff --git a/TestAssets/TestProjects/TestLibraryWithXmlDoc/project.json b/TestAssets/TestProjects/TestLibraryWithXmlDoc/project.json index 9a76e0dc9..71e9a4482 100644 --- a/TestAssets/TestProjects/TestLibraryWithXmlDoc/project.json +++ b/TestAssets/TestProjects/TestLibraryWithXmlDoc/project.json @@ -4,7 +4,7 @@ "xmlDoc": true }, "dependencies": { - "NETStandard.Library": "1.5.0-rc3-24123-01" + "NETStandard.Library": "1.5.0-rc3-24126-00" }, "frameworks": { "netstandard1.5": {} diff --git a/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json b/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json index ec0d7a59a..2dc00d082 100644 --- a/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json +++ b/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json @@ -5,12 +5,12 @@ "netcoreapp1.0": { "imports": "dnxcore50", "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004306" + "Microsoft.NETCore.App": "1.0.0-rc3-004312" } }, "net451": { "dependencies": { - "Microsoft.CSharp": "4.0.1-rc3-24123-01" + "Microsoft.CSharp": "4.0.1-rc3-24126-00" } } }, diff --git a/TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json b/TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json index 6d320f6a1..7132b7436 100644 --- a/TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json +++ b/TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json @@ -5,17 +5,17 @@ "netcoreapp1.0": { "imports": "dnxcore50", "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004306" + "Microsoft.NETCore.App": "1.0.0-rc3-004312" } }, "netcore50": { "dependencies": { - "System.Private.Uri": "4.0.1-rc3-24123-01" + "System.Private.Uri": "4.0.1-rc3-24126-00" } }, "net99": { "dependencies": { - "Microsoft.CSharp": "4.0.1-rc3-24123-01" + "Microsoft.CSharp": "4.0.1-rc3-24126-00" } } }, diff --git a/TestAssets/TestProjects/TestMscorlibReference/project.json b/TestAssets/TestProjects/TestMscorlibReference/project.json index 2836696b9..7f7234cb0 100644 --- a/TestAssets/TestProjects/TestMscorlibReference/project.json +++ b/TestAssets/TestProjects/TestMscorlibReference/project.json @@ -4,7 +4,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004306" + "Microsoft.NETCore.App": "1.0.0-rc3-004312" } }, "net451": { diff --git a/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json b/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json index 29006a6e4..4f6005fa3 100644 --- a/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json +++ b/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json @@ -2,17 +2,19 @@ "version": "1.0.0-*", "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004306", - "type": "platform" - }, + "version": "1.0.0-rc3-004312", + "type": "platform" + } }, "frameworks": { "netcoreapp1.0": { - "imports": [ "portable-net451+win8" ] + "imports": [ + "portable-net451+win8" + ] } }, "runtimes": { - "win7-x64": {}, - "win7-x86": {} + "win7-x64": {}, + "win7-x86": {} } } diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json index aef2b4528..128d785ec 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-*", - "Microsoft.NETCore.App": "1.0.0-rc3-004306" + "Microsoft.NETCore.App": "1.0.0-rc3-004312" }, "frameworks": { "netcoreapp1.0": {} @@ -21,4 +21,4 @@ "rhel.7.2-x64": {}, "debian.8-x64": {} } -} \ No newline at end of file +} diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json index d69436ab1..90ea62680 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-*", - "Microsoft.NETCore.App": "1.0.0-rc3-004306" + "Microsoft.NETCore.App": "1.0.0-rc3-004312" }, "frameworks": { "netstandard1.5": { diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json index 0ca363e97..417c45f11 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-*", - "Microsoft.NETCore.App": "1.0.0-rc3-004306" + "Microsoft.NETCore.App": "1.0.0-rc3-004312" }, "frameworks": { "netstandard1.5": { diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json index 652a4b863..c01f103c9 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": { - "Microsoft.NETCore.App": "1.0.0-rc3-004306" + "Microsoft.NETCore.App": "1.0.0-rc3-004312" }, "frameworks": { "netstandard1.5": { diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json index 652a4b863..c01f103c9 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": { - "Microsoft.NETCore.App": "1.0.0-rc3-004306" + "Microsoft.NETCore.App": "1.0.0-rc3-004312" }, "frameworks": { "netstandard1.5": { diff --git a/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json b/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json index 72019737a..a7025e31e 100644 --- a/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json +++ b/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004306" + "Microsoft.NETCore.App": "1.0.0-rc3-004312" }, "frameworks": { "netcoreapp1.0": {} @@ -19,4 +19,4 @@ "rhel.7.2-x64": {}, "debian.8-x64": {} } -} \ No newline at end of file +} diff --git a/TestAssets/TestProjects/TestProjectWithResource/project.json b/TestAssets/TestProjects/TestProjectWithResource/project.json index 72019737a..a7025e31e 100644 --- a/TestAssets/TestProjects/TestProjectWithResource/project.json +++ b/TestAssets/TestProjects/TestProjectWithResource/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004306" + "Microsoft.NETCore.App": "1.0.0-rc3-004312" }, "frameworks": { "netcoreapp1.0": {} @@ -19,4 +19,4 @@ "rhel.7.2-x64": {}, "debian.8-x64": {} } -} \ No newline at end of file +} diff --git a/TestAssets/TestProjects/TestRuleSet/TestLibraryWithRuleSet/project.json b/TestAssets/TestProjects/TestRuleSet/TestLibraryWithRuleSet/project.json index 737aa24c5..17d11d98a 100644 --- a/TestAssets/TestProjects/TestRuleSet/TestLibraryWithRuleSet/project.json +++ b/TestAssets/TestProjects/TestRuleSet/TestLibraryWithRuleSet/project.json @@ -6,7 +6,7 @@ ] }, "dependencies": { - "NETStandard.Library": "1.5.0-rc3-24123-01", + "NETStandard.Library": "1.5.0-rc3-24126-00", "System.Runtime.Analyzers": { "version": "1.1.0", "type": "build" diff --git a/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json b/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json index 3adfd24c5..a684d619d 100644 --- a/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json +++ b/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json @@ -5,7 +5,7 @@ "xmlDoc": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004306" + "Microsoft.NETCore.App": "1.0.0-rc3-004312" }, "frameworks": { "netcoreapp1.0": {} @@ -20,4 +20,4 @@ "rhel.7.2-x64": {}, "debian.8-x64": {} } -} \ No newline at end of file +} diff --git a/TestAssets/TestProjects/TestSystemCoreReference/project.json b/TestAssets/TestProjects/TestSystemCoreReference/project.json index f7ff63933..0cfb0a63a 100644 --- a/TestAssets/TestProjects/TestSystemCoreReference/project.json +++ b/TestAssets/TestProjects/TestSystemCoreReference/project.json @@ -4,7 +4,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004306" + "Microsoft.NETCore.App": "1.0.0-rc3-004312" } }, "net451": { diff --git a/TestAssets/TestProjects/TestSystemReference/project.json b/TestAssets/TestProjects/TestSystemReference/project.json index 91601db32..83a933e74 100644 --- a/TestAssets/TestProjects/TestSystemReference/project.json +++ b/TestAssets/TestProjects/TestSystemReference/project.json @@ -4,7 +4,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004306" + "Microsoft.NETCore.App": "1.0.0-rc3-004312" } }, "net451": { diff --git a/build_projects/Microsoft.DotNet.Cli.Build.Framework/project.json b/build_projects/Microsoft.DotNet.Cli.Build.Framework/project.json index ecbb0e364..a26e43a79 100644 --- a/build_projects/Microsoft.DotNet.Cli.Build.Framework/project.json +++ b/build_projects/Microsoft.DotNet.Cli.Build.Framework/project.json @@ -10,9 +10,9 @@ ] }, "dependencies": { - "NETStandard.Library": "1.5.0-rc3-24123-01", - "System.Diagnostics.Process": "4.1.0-rc3-24123-01", - "System.Reflection.TypeExtensions": "4.1.0-rc3-24123-01" + "NETStandard.Library": "1.5.0-rc3-24126-00", + "System.Diagnostics.Process": "4.1.0-rc3-24126-00", + "System.Reflection.TypeExtensions": "4.1.0-rc3-24126-00" }, "frameworks": { "netstandard1.5": { diff --git a/build_projects/dotnet-cli-build/project.json b/build_projects/dotnet-cli-build/project.json index a9de9c344..cbe573cd0 100644 --- a/build_projects/dotnet-cli-build/project.json +++ b/build_projects/dotnet-cli-build/project.json @@ -5,13 +5,13 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.5.0-rc3-24123-01", - "Microsoft.NETCore.Runtime": "1.0.2-rc3-24123-01", - "Microsoft.CSharp": "4.0.1-rc3-24123-01", - "System.Dynamic.Runtime": "4.0.11-rc3-24123-01", - "System.Reflection.Metadata": "1.3.0-rc3-24123-01", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01", - "System.Xml.XmlSerializer": "4.0.11-rc3-24123-01", + "NETStandard.Library": "1.5.0-rc3-24126-00", + "Microsoft.NETCore.Runtime": "1.0.2-rc3-24126-00", + "Microsoft.CSharp": "4.0.1-rc3-24126-00", + "System.Dynamic.Runtime": "4.0.11-rc3-24126-00", + "System.Reflection.Metadata": "1.3.0-rc3-24126-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24126-00", + "System.Xml.XmlSerializer": "4.0.11-rc3-24126-00", "WindowsAzure.Storage": "6.2.2-preview", "NuGet.CommandLine.XPlat": "3.5.0-rc-1285", "Microsoft.DotNet.Cli.Build.Framework": { diff --git a/build_projects/shared-build-targets-utils/DependencyVersions.cs b/build_projects/shared-build-targets-utils/DependencyVersions.cs index 9228c3226..3d16e14fd 100644 --- a/build_projects/shared-build-targets-utils/DependencyVersions.cs +++ b/build_projects/shared-build-targets-utils/DependencyVersions.cs @@ -7,10 +7,10 @@ namespace Microsoft.DotNet.Cli.Build { public class DependencyVersions { - public static readonly string CoreCLRVersion = "1.0.2-rc3-24123-01"; + public static readonly string CoreCLRVersion = "1.0.2-rc3-24126-00"; - public static readonly string SharedFrameworkVersion = "1.0.0-rc3-004308"; - public static readonly string SharedHostVersion = "1.0.1-rc3-004308-00"; + public static readonly string SharedFrameworkVersion = "1.0.0-rc3-004312"; + public static readonly string SharedHostVersion = "1.0.1-rc3-004312-00"; public static readonly string SharedFrameworkChannel = "preview"; public static readonly string SharedHostChannel = "preview"; diff --git a/build_projects/shared-build-targets-utils/project.json b/build_projects/shared-build-targets-utils/project.json index 5fa4efa1a..4d1eba7ba 100644 --- a/build_projects/shared-build-targets-utils/project.json +++ b/build_projects/shared-build-targets-utils/project.json @@ -2,12 +2,12 @@ "version": "1.0.0-*", "description": "Build scripts for dotnet-cli", "dependencies": { - "NETStandard.Library": "1.5.0-rc3-24123-01", - "Microsoft.CSharp": "4.0.1-rc3-24123-01", - "System.Dynamic.Runtime": "4.0.11-rc3-24123-01", - "System.Reflection.Metadata": "1.3.0-rc3-24123-01", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01", - "System.Xml.XmlSerializer": "4.0.11-rc3-24123-01", + "NETStandard.Library": "1.5.0-rc3-24126-00", + "Microsoft.CSharp": "4.0.1-rc3-24126-00", + "System.Dynamic.Runtime": "4.0.11-rc3-24126-00", + "System.Reflection.Metadata": "1.3.0-rc3-24126-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24126-00", + "System.Xml.XmlSerializer": "4.0.11-rc3-24126-00", "WindowsAzure.Storage": "6.2.2-preview", "Microsoft.DotNet.Cli.Build.Framework": { "target": "project" diff --git a/build_projects/update-dependencies/project.json b/build_projects/update-dependencies/project.json index e6b372bee..002145b0f 100644 --- a/build_projects/update-dependencies/project.json +++ b/build_projects/update-dependencies/project.json @@ -5,10 +5,10 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.5.0-rc3-24123-01", - "Microsoft.CSharp": "4.0.1-rc3-24123-01", - "Microsoft.NETCore.Runtime": "1.0.2-rc3-24123-01", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01", + "NETStandard.Library": "1.5.0-rc3-24126-00", + "Microsoft.CSharp": "4.0.1-rc3-24126-00", + "Microsoft.NETCore.Runtime": "1.0.2-rc3-24126-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24126-00", "Microsoft.DotNet.Cli.Build.Framework": { "target": "project" }, @@ -26,13 +26,13 @@ } }, "runtimes": { - "win7-x64": { }, - "win7-x86": { }, - "osx.10.10-x64": { }, - "osx.10.11-x64": { }, - "ubuntu.14.04-x64": { }, - "centos.7-x64": { }, - "rhel.7.2-x64": { }, - "debian.8-x64": { } + "win7-x64": {}, + "win7-x86": {}, + "osx.10.10-x64": {}, + "osx.10.11-x64": {}, + "ubuntu.14.04-x64": {}, + "centos.7-x64": {}, + "rhel.7.2-x64": {}, + "debian.8-x64": {} } } diff --git a/src/Microsoft.DotNet.Cli.Utils/project.json b/src/Microsoft.DotNet.Cli.Utils/project.json index 9ee7e339b..8e7f4c9cd 100644 --- a/src/Microsoft.DotNet.Cli.Utils/project.json +++ b/src/Microsoft.DotNet.Cli.Utils/project.json @@ -26,7 +26,7 @@ "portable-net45+wp80+win8+wpa81+dnxcore50" ], "dependencies": { - "System.Diagnostics.Process": "4.1.0-rc3-24123-01" + "System.Diagnostics.Process": "4.1.0-rc3-24126-00" } } } diff --git a/src/Microsoft.DotNet.Files/project.json b/src/Microsoft.DotNet.Files/project.json index 0b3b8b54a..ff860b1ec 100644 --- a/src/Microsoft.DotNet.Files/project.json +++ b/src/Microsoft.DotNet.Files/project.json @@ -11,7 +11,7 @@ "Microsoft.DotNet.ProjectModel": { "target": "project" }, - "System.Linq.Expressions": "4.1.0-rc3-24123-01" + "System.Linq.Expressions": "4.1.0-rc3-24126-00" }, "frameworks": { "net451": { diff --git a/src/Microsoft.DotNet.InternalAbstractions/project.json b/src/Microsoft.DotNet.InternalAbstractions/project.json index e4fb1b334..dda97da08 100644 --- a/src/Microsoft.DotNet.InternalAbstractions/project.json +++ b/src/Microsoft.DotNet.InternalAbstractions/project.json @@ -10,14 +10,14 @@ "net451": {}, "netstandard1.3": { "dependencies": { - "System.AppContext": "4.1.0-rc3-24123-01", - "System.Collections": "4.0.11-rc3-24123-01", - "System.IO": "4.1.0-rc3-24123-01", - "System.IO.FileSystem": "4.0.1-rc3-24123-01", - "System.Reflection.TypeExtensions": "4.1.0-rc3-24123-01", - "System.Runtime.Extensions": "4.1.0-rc3-24123-01", - "System.Runtime.InteropServices": "4.1.0-rc3-24123-01", - "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc3-24123-01" + "System.AppContext": "4.1.0-rc3-24126-00", + "System.Collections": "4.0.11-rc3-24126-00", + "System.IO": "4.1.0-rc3-24126-00", + "System.IO.FileSystem": "4.0.1-rc3-24126-00", + "System.Reflection.TypeExtensions": "4.1.0-rc3-24126-00", + "System.Runtime.Extensions": "4.1.0-rc3-24126-00", + "System.Runtime.InteropServices": "4.1.0-rc3-24126-00", + "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc3-24126-00" } } }, diff --git a/src/Microsoft.DotNet.ProjectModel.Loader/project.json b/src/Microsoft.DotNet.ProjectModel.Loader/project.json index 5c6468708..6bda11d14 100644 --- a/src/Microsoft.DotNet.ProjectModel.Loader/project.json +++ b/src/Microsoft.DotNet.ProjectModel.Loader/project.json @@ -7,7 +7,7 @@ "Microsoft.DotNet.ProjectModel": { "target": "project" }, - "System.Runtime.Loader": "4.0.0-rc3-24123-01" + "System.Runtime.Loader": "4.0.0-rc3-24126-00" }, "frameworks": { "netstandard1.5": { diff --git a/src/Microsoft.DotNet.ProjectModel/project.json b/src/Microsoft.DotNet.ProjectModel/project.json index a9cdae609..2d96e13a7 100644 --- a/src/Microsoft.DotNet.ProjectModel/project.json +++ b/src/Microsoft.DotNet.ProjectModel/project.json @@ -11,7 +11,7 @@ "Newtonsoft.Json": "7.0.1", "NuGet.Packaging": "3.5.0-rc-1285", "NuGet.RuntimeModel": "3.5.0-rc-1285", - "System.Reflection.Metadata": "1.3.0-rc3-24123-01" + "System.Reflection.Metadata": "1.3.0-rc3-24126-00" }, "frameworks": { "net451": { @@ -33,13 +33,13 @@ "dotnet5.4" ], "dependencies": { - "Microsoft.CSharp": "4.0.1-rc3-24123-01", - "System.Dynamic.Runtime": "4.0.11-rc3-24123-01", - "System.Runtime.Loader": "4.0.0-rc3-24123-01", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01", - "System.Security.Cryptography.Algorithms": "4.2.0-rc3-24123-01", - "System.Threading.Thread": "4.0.0-rc3-24123-01", - "System.Xml.XDocument": "4.0.11-rc3-24123-01" + "Microsoft.CSharp": "4.0.1-rc3-24126-00", + "System.Dynamic.Runtime": "4.0.11-rc3-24126-00", + "System.Runtime.Loader": "4.0.0-rc3-24126-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24126-00", + "System.Security.Cryptography.Algorithms": "4.2.0-rc3-24126-00", + "System.Threading.Thread": "4.0.0-rc3-24126-00", + "System.Xml.XDocument": "4.0.11-rc3-24126-00" } } } diff --git a/src/Microsoft.Extensions.DependencyModel/project.json b/src/Microsoft.Extensions.DependencyModel/project.json index d7946f065..a1db0b4e9 100644 --- a/src/Microsoft.Extensions.DependencyModel/project.json +++ b/src/Microsoft.Extensions.DependencyModel/project.json @@ -16,9 +16,9 @@ "netstandard1.5": { "imports": "portable-net45+wp80+win8+wpa81+dnxcore50", "dependencies": { - "System.Diagnostics.Debug": "4.0.11-rc3-24123-01", - "System.Dynamic.Runtime": "4.0.11-rc3-24123-01", - "System.Linq": "4.1.0-rc3-24123-01" + "System.Diagnostics.Debug": "4.0.11-rc3-24126-00", + "System.Dynamic.Runtime": "4.0.11-rc3-24126-00", + "System.Linq": "4.1.0-rc3-24126-00" } } }, diff --git a/src/Microsoft.Extensions.Testing.Abstractions/project.json b/src/Microsoft.Extensions.Testing.Abstractions/project.json index 5ae13c7f9..bbc8a149a 100644 --- a/src/Microsoft.Extensions.Testing.Abstractions/project.json +++ b/src/Microsoft.Extensions.Testing.Abstractions/project.json @@ -22,8 +22,8 @@ "portable-net45+win8" ], "dependencies": { - "System.Resources.ResourceManager": "4.0.1-rc3-24123-01", - "System.Reflection.TypeExtensions": "4.1.0-rc3-24123-01" + "System.Resources.ResourceManager": "4.0.1-rc3-24126-00", + "System.Reflection.TypeExtensions": "4.1.0-rc3-24126-00" } } }, diff --git a/src/compilers/project.json b/src/compilers/project.json index 7fbfea77c..3838cc7d6 100644 --- a/src/compilers/project.json +++ b/src/compilers/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004306" + "version": "1.0.0-rc3-004312" }, "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160429-01", "Microsoft.Net.Compilers.netcore": "1.3.0-beta1-20160429-01", @@ -20,4 +20,4 @@ ] } } -} \ No newline at end of file +} diff --git a/src/dotnet-compile-fsc/project.json b/src/dotnet-compile-fsc/project.json index acf9d140a..72f886dba 100644 --- a/src/dotnet-compile-fsc/project.json +++ b/src/dotnet-compile-fsc/project.json @@ -24,7 +24,7 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004306" + "version": "1.0.0-rc3-004312" } }, "frameworks": { @@ -36,4 +36,4 @@ ] } } -} \ No newline at end of file +} 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 38a08507e..713b66a13 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-rc3-004306" + "version": "1.0.0-rc3-004312" } }, "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 425388896..97b538a37 100644 --- a/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template +++ b/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template @@ -13,7 +13,7 @@ "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-160316", "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004306" + "version": "1.0.0-rc3-004312" } }, "tools": { diff --git a/src/dotnet/project.json b/src/dotnet/project.json index e08abd2fd..e13e14e8c 100644 --- a/src/dotnet/project.json +++ b/src/dotnet/project.json @@ -26,8 +26,8 @@ }, "NuGet.CommandLine.XPlat": "3.5.0-rc-1285", "Newtonsoft.Json": "7.0.1", - "System.Text.Encoding.CodePages": "4.0.1-rc3-24123-01", - "System.Diagnostics.FileVersionInfo": "4.0.0-rc3-24123-01", + "System.Text.Encoding.CodePages": "4.0.1-rc3-24126-00", + "System.Diagnostics.FileVersionInfo": "4.0.0-rc3-24126-00", "Microsoft.ApplicationInsights": "2.0.0", "Microsoft.DotNet.ProjectModel": { "target": "project" @@ -43,16 +43,16 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004306" + "version": "1.0.0-rc3-004312" }, - "System.Diagnostics.TraceSource": "4.0.0-rc3-24123-01", - "System.Diagnostics.TextWriterTraceListener": "4.0.0-rc3-24123-01", - "System.Resources.Writer": "4.0.0-rc3-24123-01", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01", - "System.Private.DataContractSerialization": "4.1.1-rc3-24123-01", - "System.Text.RegularExpressions": "4.1.0-rc3-24123-01", + "System.Diagnostics.TraceSource": "4.0.0-rc3-24126-00", + "System.Diagnostics.TextWriterTraceListener": "4.0.0-rc3-24126-00", + "System.Resources.Writer": "4.0.0-rc3-24126-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24126-00", + "System.Private.DataContractSerialization": "4.1.1-rc3-24126-00", + "System.Text.RegularExpressions": "4.1.0-rc3-24126-00", "Microsoft.Win32.Registry": { - "version": "4.0.0-rc3-24123-01", + "version": "4.0.0-rc3-24126-00", "exclude": "compile" } }, diff --git a/test/ArgumentForwardingTests/project.json b/test/ArgumentForwardingTests/project.json index 42354c478..ab534900f 100644 --- a/test/ArgumentForwardingTests/project.json +++ b/test/ArgumentForwardingTests/project.json @@ -6,9 +6,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004306" + "version": "1.0.0-rc3-004312" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24126-00", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/ArgumentsReflector/project.json b/test/ArgumentsReflector/project.json index 997a61c79..8c101033d 100644 --- a/test/ArgumentsReflector/project.json +++ b/test/ArgumentsReflector/project.json @@ -11,7 +11,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004306" + "version": "1.0.0-rc3-004312" } }, "frameworks": { @@ -22,4 +22,4 @@ "reflector_cmd.cmd" ] } -} \ No newline at end of file +} diff --git a/test/EndToEnd/project.json b/test/EndToEnd/project.json index 05cb6e309..2e96998b7 100644 --- a/test/EndToEnd/project.json +++ b/test/EndToEnd/project.json @@ -6,9 +6,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004306" + "version": "1.0.0-rc3-004312" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24126-00", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/Kestrel.Tests/project.json b/test/Kestrel.Tests/project.json index 88d342c3c..2f44cdb97 100644 --- a/test/Kestrel.Tests/project.json +++ b/test/Kestrel.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004306" + "version": "1.0.0-rc3-004312" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24126-00", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json index 80557d732..f409bb3f1 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json @@ -16,10 +16,10 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004306" + "version": "1.0.0-rc3-004312" }, - "System.Diagnostics.TraceSource": "4.0.0-rc3-24123-01", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01", + "System.Diagnostics.TraceSource": "4.0.0-rc3-24126-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24126-00", "NuGet.Versioning": "3.5.0-rc-1285", "NuGet.Packaging": "3.5.0-rc-1285", "NuGet.Frameworks": "3.5.0-rc-1285", diff --git a/test/Microsoft.DotNet.Compiler.Common.Tests/project.json b/test/Microsoft.DotNet.Compiler.Common.Tests/project.json index 2ccb1c7f7..ecea9dd3b 100644 --- a/test/Microsoft.DotNet.Compiler.Common.Tests/project.json +++ b/test/Microsoft.DotNet.Compiler.Common.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004306" + "version": "1.0.0-rc3-004312" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24126-00", "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 301856970..325c01a7f 100644 --- a/test/Microsoft.DotNet.ProjectModel.Tests/project.json +++ b/test/Microsoft.DotNet.ProjectModel.Tests/project.json @@ -11,9 +11,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004306" + "version": "1.0.0-rc3-004312" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24126-00", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/Microsoft.Extensions.DependencyModel.Tests/project.json b/test/Microsoft.Extensions.DependencyModel.Tests/project.json index 498726ad4..1bef89c3d 100644 --- a/test/Microsoft.Extensions.DependencyModel.Tests/project.json +++ b/test/Microsoft.Extensions.DependencyModel.Tests/project.json @@ -7,9 +7,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004306" + "version": "1.0.0-rc3-004312" }, - "System.Diagnostics.TraceSource": "4.0.0-rc3-24123-01", + "System.Diagnostics.TraceSource": "4.0.0-rc3-24126-00", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/Performance/project.json b/test/Performance/project.json index 56c5a0162..92bd301a3 100644 --- a/test/Performance/project.json +++ b/test/Performance/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004306" + "version": "1.0.0-rc3-004312" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24126-00", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/ScriptExecutorTests/project.json b/test/ScriptExecutorTests/project.json index 15fc8323c..22fcb9632 100644 --- a/test/ScriptExecutorTests/project.json +++ b/test/ScriptExecutorTests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004306" + "version": "1.0.0-rc3-004312" }, "Microsoft.DotNet.ProjectModel": { "target": "project" @@ -38,4 +38,4 @@ ] } } -} \ No newline at end of file +} diff --git a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json index 2ae352956..13c57f5e3 100644 --- a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json +++ b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json @@ -3,12 +3,12 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004306" + "version": "1.0.0-rc3-004312" }, "Microsoft.Extensions.Testing.Abstractions": { "target": "project" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24126-00", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json index 6b033c5dc..9b8be8bd8 100644 --- a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json +++ b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json @@ -3,13 +3,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004306" + "version": "1.0.0-rc3-004312" }, "Microsoft.Extensions.Testing.Abstractions": { "target": "project" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01", - "System.Diagnostics.Process": "4.1.0-rc3-24123-01", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24126-00", + "System.Diagnostics.Process": "4.1.0-rc3-24126-00", "TestAppWithPortablePdbs": { "target": "project" }, diff --git a/test/TestingAbstractions/TestAppWithFullPdbs/project.json b/test/TestingAbstractions/TestAppWithFullPdbs/project.json index a38205283..cb9a8e9ec 100644 --- a/test/TestingAbstractions/TestAppWithFullPdbs/project.json +++ b/test/TestingAbstractions/TestAppWithFullPdbs/project.json @@ -4,7 +4,7 @@ "debugType": "full" }, "dependencies": { - "NETStandard.Library": "1.5.0-rc3-24123-01" + "NETStandard.Library": "1.5.0-rc3-24126-00" }, "frameworks": { "netstandard1.5": {} diff --git a/test/TestingAbstractions/TestAppWithPortablePdbs/project.json b/test/TestingAbstractions/TestAppWithPortablePdbs/project.json index 16fc0dcae..afbc755d4 100644 --- a/test/TestingAbstractions/TestAppWithPortablePdbs/project.json +++ b/test/TestingAbstractions/TestAppWithPortablePdbs/project.json @@ -4,7 +4,7 @@ "debugType": "portable" }, "dependencies": { - "NETStandard.Library": "1.5.0-rc3-24123-01" + "NETStandard.Library": "1.5.0-rc3-24126-00" }, "frameworks": { "netstandard1.5": {} diff --git a/test/binding-redirects.Tests/project.json b/test/binding-redirects.Tests/project.json index 6769bb7db..4e2b853f8 100644 --- a/test/binding-redirects.Tests/project.json +++ b/test/binding-redirects.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-rc2-192208-24", - "Microsoft.NETCore.Platforms": "1.0.1-rc3-24123-01", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-24126-00", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" } diff --git a/test/crossgen.Tests/project.json b/test/crossgen.Tests/project.json index 8c5bfca85..c8e2dd80d 100644 --- a/test/crossgen.Tests/project.json +++ b/test/crossgen.Tests/project.json @@ -3,8 +3,8 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004306" - }, + "version": "1.0.0-rc3-004312" + }, "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-build.Tests/project.json b/test/dotnet-build.Tests/project.json index 1f567b976..6c3b6b6a3 100644 --- a/test/dotnet-build.Tests/project.json +++ b/test/dotnet-build.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004306" + "version": "1.0.0-rc3-004312" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24126-00", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-compile-fsc.Tests/project.json b/test/dotnet-compile-fsc.Tests/project.json index b32a8bac4..0f4ddff62 100644 --- a/test/dotnet-compile-fsc.Tests/project.json +++ b/test/dotnet-compile-fsc.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004306" + "version": "1.0.0-rc3-004312" }, "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" @@ -43,4 +43,4 @@ ] } } -} \ No newline at end of file +} diff --git a/test/dotnet-compile.Tests/project.json b/test/dotnet-compile.Tests/project.json index 83d5fadf7..aceb1095b 100644 --- a/test/dotnet-compile.Tests/project.json +++ b/test/dotnet-compile.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004306" + "version": "1.0.0-rc3-004312" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24126-00", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-compile.UnitTests/project.json b/test/dotnet-compile.UnitTests/project.json index 802a89c00..d86e8bee6 100644 --- a/test/dotnet-compile.UnitTests/project.json +++ b/test/dotnet-compile.UnitTests/project.json @@ -11,7 +11,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004306" + "version": "1.0.0-rc3-004312" }, "Microsoft.DotNet.Cli.Utils": { "target": "project" @@ -23,7 +23,7 @@ "target": "project" }, "Microsoft.Win32.Registry": { - "version": "4.0.0-rc3-24123-01", + "version": "4.0.0-rc3-24126-00", "exclude": "Compile" }, "Microsoft.DotNet.ProjectModel": { diff --git a/test/dotnet-new.Tests/project.json b/test/dotnet-new.Tests/project.json index 6b8a8432e..c2b3051be 100644 --- a/test/dotnet-new.Tests/project.json +++ b/test/dotnet-new.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004306" + "version": "1.0.0-rc3-004312" }, "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" diff --git a/test/dotnet-pack.Tests/project.json b/test/dotnet-pack.Tests/project.json index 504f3485f..219a2bcc6 100644 --- a/test/dotnet-pack.Tests/project.json +++ b/test/dotnet-pack.Tests/project.json @@ -3,10 +3,10 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004306" + "version": "1.0.0-rc3-004312" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01", - "System.IO.Compression.ZipFile": "4.0.1-rc3-24123-01", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24126-00", + "System.IO.Compression.ZipFile": "4.0.1-rc3-24126-00", "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 505e57743..dff82f879 100644 --- a/test/dotnet-projectmodel-server.Tests/project.json +++ b/test/dotnet-projectmodel-server.Tests/project.json @@ -2,13 +2,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004306" + "version": "1.0.0-rc3-004312" }, "dotnet": { "target": "project" }, "Microsoft.Win32.Registry": { - "version": "4.0.0-rc3-24123-01", + "version": "4.0.0-rc3-24126-00", "exclude": "Compile" }, "Microsoft.DotNet.Tools.Tests.Utilities": { @@ -19,7 +19,7 @@ }, "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-rc2-192208-24", - "System.Net.NameResolution": "4.0.0-rc3-24123-01" + "System.Net.NameResolution": "4.0.0-rc3-24126-00" }, "frameworks": { "netcoreapp1.0": { diff --git a/test/dotnet-publish.Tests/project.json b/test/dotnet-publish.Tests/project.json index 7de6bf691..759f78a4a 100644 --- a/test/dotnet-publish.Tests/project.json +++ b/test/dotnet-publish.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004306" + "version": "1.0.0-rc3-004312" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24126-00", "Microsoft.DotNet.TestFramework": { "target": "project" }, @@ -15,7 +15,7 @@ "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00206", "dotnet-test-xunit": "1.0.0-rc2-192208-24", - "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc3-24123-01" + "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc3-24126-00" }, "frameworks": { "netcoreapp1.0": { diff --git a/test/dotnet-resgen.Tests/project.json b/test/dotnet-resgen.Tests/project.json index be59bf61e..832c9998a 100644 --- a/test/dotnet-resgen.Tests/project.json +++ b/test/dotnet-resgen.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004306" + "version": "1.0.0-rc3-004312" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24126-00", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-run.Tests/project.json b/test/dotnet-run.Tests/project.json index 88d342c3c..2f44cdb97 100644 --- a/test/dotnet-run.Tests/project.json +++ b/test/dotnet-run.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004306" + "version": "1.0.0-rc3-004312" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24126-00", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-run.UnitTests/project.json b/test/dotnet-run.UnitTests/project.json index e7d226ebf..0048139ef 100644 --- a/test/dotnet-run.UnitTests/project.json +++ b/test/dotnet-run.UnitTests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004306" + "version": "1.0.0-rc3-004312" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24126-00", "dotnet": { "target": "project" }, diff --git a/test/dotnet-test.Tests/project.json b/test/dotnet-test.Tests/project.json index bd274e559..bf9904442 100644 --- a/test/dotnet-test.Tests/project.json +++ b/test/dotnet-test.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004306" + "version": "1.0.0-rc3-004312" }, "Newtonsoft.Json": "7.0.1", "Microsoft.DotNet.Tools.Tests.Utilities": { @@ -15,9 +15,9 @@ "Microsoft.DotNet.ProjectModel": { "target": "project" }, - "System.Net.NameResolution": "4.0.0-rc3-24123-01", - "System.Net.Sockets": "4.1.0-rc3-24123-01", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01", + "System.Net.NameResolution": "4.0.0-rc3-24126-00", + "System.Net.Sockets": "4.1.0-rc3-24126-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24126-00", "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-rc2-192208-24" }, diff --git a/test/dotnet-test.UnitTests/project.json b/test/dotnet-test.UnitTests/project.json index ab29cece1..ed927d8ea 100644 --- a/test/dotnet-test.UnitTests/project.json +++ b/test/dotnet-test.UnitTests/project.json @@ -3,14 +3,14 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004306" + "version": "1.0.0-rc3-004312" }, "Newtonsoft.Json": "7.0.1", "dotnet": { "target": "project" }, "Microsoft.Win32.Registry": { - "version": "4.0.0-rc3-24123-01", + "version": "4.0.0-rc3-24126-00", "exclude": "Compile" }, "xunit": "2.1.0", diff --git a/test/dotnet.Tests/project.json b/test/dotnet.Tests/project.json index c64cb4f85..5e694725f 100644 --- a/test/dotnet.Tests/project.json +++ b/test/dotnet.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004306" + "version": "1.0.0-rc3-004312" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24126-00", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/tools/MultiProjectValidator/project.json b/tools/MultiProjectValidator/project.json index 4d539ce49..c1942e541 100644 --- a/tools/MultiProjectValidator/project.json +++ b/tools/MultiProjectValidator/project.json @@ -5,7 +5,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004306", + "Microsoft.NETCore.App": "1.0.0-rc3-004312", "Microsoft.DotNet.ProjectModel": { "target": "project" }, @@ -20,4 +20,4 @@ ] } } -} \ No newline at end of file +} From 369ec935c777d237d3486b83066b9abe2391cf38 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Thu, 26 May 2016 13:13:24 -0500 Subject: [PATCH 2/4] Update Roslyn to beta1-20160525-03. --- TestAssets/TestProjects/AppWithNet46AndRoslyn/project.json | 2 +- .../PortableTests/PortableAppCompilationContext/project.json | 2 +- src/Microsoft.DotNet.Compiler.Common/project.json | 2 +- src/Microsoft.DotNet.ProjectModel.Workspaces/project.json | 2 +- src/compilers/project.json | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/TestAssets/TestProjects/AppWithNet46AndRoslyn/project.json b/TestAssets/TestProjects/AppWithNet46AndRoslyn/project.json index 47850f11e..8fd9dbde3 100644 --- a/TestAssets/TestProjects/AppWithNet46AndRoslyn/project.json +++ b/TestAssets/TestProjects/AppWithNet46AndRoslyn/project.json @@ -3,7 +3,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160429-01" + "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160525-03" }, "frameworks": { "net46": { } diff --git a/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json b/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json index 74b8d5419..7ee01d495 100644 --- a/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json +++ b/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json @@ -4,7 +4,7 @@ "preserveCompilationContext": true }, "dependencies": { - "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160429-01" + "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160525-03" }, "frameworks": { "netcoreapp1.0": { diff --git a/src/Microsoft.DotNet.Compiler.Common/project.json b/src/Microsoft.DotNet.Compiler.Common/project.json index 1bb95fdb4..a6d846f1d 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": { - "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160429-01", + "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160525-03", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json b/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json index 5035dfcdf..33bdaaf76 100644 --- a/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json +++ b/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json @@ -10,7 +10,7 @@ "Microsoft.DotNet.Compiler.Common": { "target": "project" }, - "Microsoft.CodeAnalysis.CSharp.Workspaces": "1.3.0-beta1-20160429-01" + "Microsoft.CodeAnalysis.CSharp.Workspaces": "1.3.0-beta1-20160525-03" }, "frameworks": { "net451": { diff --git a/src/compilers/project.json b/src/compilers/project.json index 3838cc7d6..a9d8c43e9 100644 --- a/src/compilers/project.json +++ b/src/compilers/project.json @@ -8,8 +8,8 @@ "type": "platform", "version": "1.0.0-rc3-004312" }, - "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160429-01", - "Microsoft.Net.Compilers.netcore": "1.3.0-beta1-20160429-01", + "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160525-03", + "Microsoft.Net.Compilers.netcore": "1.3.0-beta1-20160525-03", "Microsoft.DiaSymReader.Native": "1.4.0-rc" }, "frameworks": { From 409ccb2c9c97ca41d083f9c099b794fb7fc0d4a2 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Thu, 26 May 2016 15:00:54 -0500 Subject: [PATCH 3/4] Add WorkingDirectory to output when a command fails for easier debugging. --- .../Command.cs | 31 ++++++++++--------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/build_projects/Microsoft.DotNet.Cli.Build.Framework/Command.cs b/build_projects/Microsoft.DotNet.Cli.Build.Framework/Command.cs index a70457016..cc96344f7 100644 --- a/build_projects/Microsoft.DotNet.Cli.Build.Framework/Command.cs +++ b/build_projects/Microsoft.DotNet.Cli.Build.Framework/Command.cs @@ -147,7 +147,7 @@ namespace Microsoft.DotNet.Cli.Build.Framework } return this; } - + public Command Environment(string key, string value) { _process.StartInfo.Environment[key] = value; @@ -293,21 +293,25 @@ namespace Microsoft.DotNet.Cli.Build.Framework return this; } - private string FormatProcessInfo(ProcessStartInfo info) + private string FormatProcessInfo(ProcessStartInfo info, bool includeWorkingDirectory) { + string prefix = includeWorkingDirectory ? + $"{info.WorkingDirectory}> {info.FileName}" : + info.FileName; + if (string.IsNullOrWhiteSpace(info.Arguments)) { - return info.FileName; + return prefix; } - return info.FileName + " " + info.Arguments; + return prefix + " " + info.Arguments; } private void ReportExecBegin() { if (!_quietBuildReporter) { - BuildReporter.BeginSection("EXEC", FormatProcessInfo(_process.StartInfo)); + BuildReporter.BeginSection("EXEC", FormatProcessInfo(_process.StartInfo, includeWorkingDirectory: false)); } } @@ -315,15 +319,14 @@ namespace Microsoft.DotNet.Cli.Build.Framework { if (!_quietBuildReporter) { - var message = $"{FormatProcessInfo(_process.StartInfo)} exited with {exitCode}"; - if (exitCode == 0) - { - BuildReporter.EndSection("EXEC", message.Green(), success: true); - } - else - { - BuildReporter.EndSection("EXEC", message.Red().Bold(), success: false); - } + bool success = exitCode == 0; + + var message = $"{FormatProcessInfo(_process.StartInfo, includeWorkingDirectory: !success)} exited with {exitCode}"; + + BuildReporter.EndSection( + "EXEC", + success ? message.Green() : message.Red().Bold(), + success); } } From 08a3ffe3aae9c0b50d78c6cf8d99ec4d8b847b92 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Thu, 26 May 2016 15:42:30 -0500 Subject: [PATCH 4/4] Move to netstandard1.6 This is needed because DependencyModel uses the AppContext.GetData API, which is only available in netstandard1.6 as of CoreFX build rc3-24126. --- .../DependencyContextValidator/project.json | 2 +- .../TestAppWithResourceDeps/project.json | 2 +- .../dotnet-cli-build/TestPackageProjects.cs | 16 ++++++++-------- src/Microsoft.DotNet.Cli.Utils/project.json | 2 +- .../project.json | 2 +- src/Microsoft.DotNet.Files/project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- src/Microsoft.DotNet.ProjectModel/project.json | 2 +- src/Microsoft.DotNet.TestFramework/project.json | 2 +- .../DependencyContextPaths.cs | 2 +- .../project.json | 2 +- .../project.json | 2 +- 13 files changed, 20 insertions(+), 20 deletions(-) diff --git a/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json b/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json index 7451538b2..08366b78a 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json @@ -6,7 +6,7 @@ } }, "frameworks": { - "netstandard1.5": { + "netstandard1.6": { "imports": "dnxcore50", "dependencies": { "Microsoft.NETCore.App": "1.0.0-rc3-004312" diff --git a/TestAssets/TestProjects/TestAppWithResourceDeps/project.json b/TestAssets/TestProjects/TestAppWithResourceDeps/project.json index 3efc07eb7..50064dbbf 100644 --- a/TestAssets/TestProjects/TestAppWithResourceDeps/project.json +++ b/TestAssets/TestProjects/TestAppWithResourceDeps/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.5.0-rc3-24126-00", + "Microsoft.NETCore.App": "1.0.0-rc3-004312", "Microsoft.CSharp": "4.0.1-rc3-24126-00", "System.Dynamic.Runtime": "4.0.11-rc3-24126-00", "System.Reflection.Metadata": "1.3.0-rc3-24126-00", diff --git a/build_projects/dotnet-cli-build/TestPackageProjects.cs b/build_projects/dotnet-cli-build/TestPackageProjects.cs index dbe5d42b6..a6e4a6931 100644 --- a/build_projects/dotnet-cli-build/TestPackageProjects.cs +++ b/build_projects/dotnet-cli-build/TestPackageProjects.cs @@ -125,7 +125,7 @@ namespace Microsoft.DotNet.Cli.Build IsApplicable = true, VersionSuffix = s_testPackageBuildVersionSuffix, Clean = false, - Frameworks = new [] { "net451", "netstandard1.5" } + Frameworks = new [] { "net451", "netstandard1.6" } }, new TestPackageProject() { @@ -135,7 +135,7 @@ namespace Microsoft.DotNet.Cli.Build IsApplicable = true, VersionSuffix = s_testPackageBuildVersionSuffix, Clean = false, - Frameworks = new [] { "net451", "netstandard1.5" } + Frameworks = new [] { "net451", "netstandard1.6" } }, new TestPackageProject() { @@ -145,7 +145,7 @@ namespace Microsoft.DotNet.Cli.Build IsApplicable = true, VersionSuffix = s_testPackageBuildVersionSuffix, Clean = false, - Frameworks = new [] { "netstandard1.5" } + Frameworks = new [] { "netstandard1.6" } }, new TestPackageProject() { @@ -155,7 +155,7 @@ namespace Microsoft.DotNet.Cli.Build IsApplicable =true, VersionSuffix = s_testPackageBuildVersionSuffix, Clean = false, - Frameworks = new [] { "netstandard1.5" } + Frameworks = new [] { "netstandard1.6" } }, new TestPackageProject() { @@ -175,7 +175,7 @@ namespace Microsoft.DotNet.Cli.Build IsApplicable = true, VersionSuffix = s_testPackageBuildVersionSuffix, Clean = false, - Frameworks = new [] { "net451", "netstandard1.5" } + Frameworks = new [] { "net451", "netstandard1.6" } }, new TestPackageProject() { @@ -185,7 +185,7 @@ namespace Microsoft.DotNet.Cli.Build IsApplicable = true, VersionSuffix = s_testPackageBuildVersionSuffix, Clean = false, - Frameworks = new [] { "net451", "netstandard1.5" } + Frameworks = new [] { "net451", "netstandard1.6" } }, new TestPackageProject() { @@ -195,7 +195,7 @@ namespace Microsoft.DotNet.Cli.Build IsApplicable = true, VersionSuffix = s_testPackageBuildVersionSuffix, Clean = false, - Frameworks = new [] { "netstandard1.5" } + Frameworks = new [] { "netstandard1.6" } }, new TestPackageProject() { @@ -205,7 +205,7 @@ namespace Microsoft.DotNet.Cli.Build IsApplicable = true, VersionSuffix = s_testPackageBuildVersionSuffix, Clean = false, - Frameworks = new [] { "netstandard1.5" } + Frameworks = new [] { "netstandard1.6" } }, new TestPackageProject() { diff --git a/src/Microsoft.DotNet.Cli.Utils/project.json b/src/Microsoft.DotNet.Cli.Utils/project.json index 8e7f4c9cd..429967dba 100644 --- a/src/Microsoft.DotNet.Cli.Utils/project.json +++ b/src/Microsoft.DotNet.Cli.Utils/project.json @@ -21,7 +21,7 @@ } } }, - "netstandard1.5": { + "netstandard1.6": { "imports": [ "portable-net45+wp80+win8+wpa81+dnxcore50" ], diff --git a/src/Microsoft.DotNet.Compiler.Common/project.json b/src/Microsoft.DotNet.Compiler.Common/project.json index a6d846f1d..45c3fa058 100644 --- a/src/Microsoft.DotNet.Compiler.Common/project.json +++ b/src/Microsoft.DotNet.Compiler.Common/project.json @@ -32,7 +32,7 @@ } } }, - "netstandard1.5": { + "netstandard1.6": { "imports": [ "portable-net45+wp80+win8+wpa81+dnxcore50" ] diff --git a/src/Microsoft.DotNet.Files/project.json b/src/Microsoft.DotNet.Files/project.json index ff860b1ec..b166224b4 100644 --- a/src/Microsoft.DotNet.Files/project.json +++ b/src/Microsoft.DotNet.Files/project.json @@ -27,7 +27,7 @@ } } }, - "netstandard1.5": { + "netstandard1.6": { "imports": [ "portable-net45+wp80+win8+wpa81+dnxcore50" ] diff --git a/src/Microsoft.DotNet.ProjectModel.Loader/project.json b/src/Microsoft.DotNet.ProjectModel.Loader/project.json index 6bda11d14..583063d7f 100644 --- a/src/Microsoft.DotNet.ProjectModel.Loader/project.json +++ b/src/Microsoft.DotNet.ProjectModel.Loader/project.json @@ -10,7 +10,7 @@ "System.Runtime.Loader": "4.0.0-rc3-24126-00" }, "frameworks": { - "netstandard1.5": { + "netstandard1.6": { "imports": "portable-net45+wp80+win8+wpa81+dnxcore50" } } diff --git a/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json b/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json index 33bdaaf76..f0245a3ea 100644 --- a/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json +++ b/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json @@ -26,7 +26,7 @@ } } }, - "netstandard1.5": { + "netstandard1.6": { "imports": [ "portable-net45+wp80+win8+wpa81+dnxcore50", "portable-net45+win8" diff --git a/src/Microsoft.DotNet.ProjectModel/project.json b/src/Microsoft.DotNet.ProjectModel/project.json index 2d96e13a7..5c08abab1 100644 --- a/src/Microsoft.DotNet.ProjectModel/project.json +++ b/src/Microsoft.DotNet.ProjectModel/project.json @@ -27,7 +27,7 @@ } } }, - "netstandard1.5": { + "netstandard1.6": { "imports": [ "portable-net45+wp80+win8+wpa81+dnxcore50", "dotnet5.4" diff --git a/src/Microsoft.DotNet.TestFramework/project.json b/src/Microsoft.DotNet.TestFramework/project.json index e7c68774c..a4b1a4cbb 100644 --- a/src/Microsoft.DotNet.TestFramework/project.json +++ b/src/Microsoft.DotNet.TestFramework/project.json @@ -10,7 +10,7 @@ } }, "frameworks": { - "netstandard1.5": { + "netstandard1.6": { "imports": [ "portable-net45+wp80+win8+wpa81+dnxcore50" ] diff --git a/src/Microsoft.Extensions.DependencyModel/DependencyContextPaths.cs b/src/Microsoft.Extensions.DependencyModel/DependencyContextPaths.cs index 1374d3a1f..28700ba1b 100644 --- a/src/Microsoft.Extensions.DependencyModel/DependencyContextPaths.cs +++ b/src/Microsoft.Extensions.DependencyModel/DependencyContextPaths.cs @@ -20,7 +20,7 @@ namespace Microsoft.Extensions.DependencyModel private static DependencyContextPaths GetCurrent() { -#if NETSTANDARD1_5 +#if NETSTANDARD1_6 var deps = AppContext.GetData(DepsFilesProperty); #else var deps = AppDomain.CurrentDomain.GetData(DepsFilesProperty); diff --git a/src/Microsoft.Extensions.DependencyModel/project.json b/src/Microsoft.Extensions.DependencyModel/project.json index a1db0b4e9..d4e806539 100644 --- a/src/Microsoft.Extensions.DependencyModel/project.json +++ b/src/Microsoft.Extensions.DependencyModel/project.json @@ -13,7 +13,7 @@ }, "frameworks": { "net451": {}, - "netstandard1.5": { + "netstandard1.6": { "imports": "portable-net45+wp80+win8+wpa81+dnxcore50", "dependencies": { "System.Diagnostics.Debug": "4.0.11-rc3-24126-00", diff --git a/src/Microsoft.Extensions.Testing.Abstractions/project.json b/src/Microsoft.Extensions.Testing.Abstractions/project.json index bbc8a149a..910696d54 100644 --- a/src/Microsoft.Extensions.Testing.Abstractions/project.json +++ b/src/Microsoft.Extensions.Testing.Abstractions/project.json @@ -16,7 +16,7 @@ }, "frameworks": { "net451": {}, - "netstandard1.5": { + "netstandard1.6": { "imports": [ "portable-net45+wp80+win8+wpa81+dnxcore50", "portable-net45+win8"