diff --git a/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json b/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json index 8c3949fcc..73d785c82 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-004363" + "version": "1.0.0-rc3-004391" } }, "imports": [ diff --git a/TestAssets/DesktopTestProjects/DesktopAppWithNativeDep/project.json b/TestAssets/DesktopTestProjects/DesktopAppWithNativeDep/project.json index 6d8c692de..3c68e68e7 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.1-rc3-24131-00" + "Microsoft.NETCore.Platforms": "1.0.1-rc3-24201-00" }, "buildOptions": { "emitEntryPoint": true diff --git a/TestAssets/DesktopTestProjects/DesktopAppWithRuntimes/project.json b/TestAssets/DesktopTestProjects/DesktopAppWithRuntimes/project.json index 0f003d06b..aaf7ea898 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-24131-00" + "Microsoft.NETCore.Windows.ApiSets": "1.0.1-rc3-24201-00" }, "buildOptions": { "emitEntryPoint": true diff --git a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktop/project.json b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktop/project.json index 5723e91e2..534b7b815 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.1-rc3-24131-00" + "Microsoft.NETCore.Platforms": "1.0.1-rc3-24201-00" }, "buildOptions": { "emitEntryPoint": true, diff --git a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopForce32/project.json b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopForce32/project.json index 259d3f26b..618f1e566 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.1-rc3-24131-00" + "Microsoft.NETCore.Platforms": "1.0.1-rc3-24201-00" }, "buildOptions": { "platform": "anycpu32bitpreferred", diff --git a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopWithRuntimes/project.json b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopWithRuntimes/project.json index 5f7a1db5c..1a2987a4b 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.1-rc3-24131-00" + "Microsoft.NETCore.Platforms": "1.0.1-rc3-24201-00" }, "buildOptions": { "emitEntryPoint": true, diff --git a/TestAssets/DesktopTestProjects/LibraryWithDirectDependencyDesktopAndPortable/project.json b/TestAssets/DesktopTestProjects/LibraryWithDirectDependencyDesktopAndPortable/project.json index 7ccf2c6f4..2e5c52de9 100644 --- a/TestAssets/DesktopTestProjects/LibraryWithDirectDependencyDesktopAndPortable/project.json +++ b/TestAssets/DesktopTestProjects/LibraryWithDirectDependencyDesktopAndPortable/project.json @@ -9,7 +9,7 @@ "frameworks": { "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24131-00" + "NETStandard.Library": "1.6.0-rc3-24201-00" }, "imports": [ "portable-net45+win8", diff --git a/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json b/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json index 4d6acaa7e..2d6344d4b 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-rc3-004363" + "version": "1.0.0-rc3-004391" }, "ThisIsNotARealDependencyAndIfSomeoneGoesAndAddsAProjectWithThisNameIWillFindThemAndPunishThem": { "target": "project" diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json index 062a87ade..839d915bf 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004363", + "Microsoft.NETCore.App": "1.0.0-rc3-004391", "EmptyLibrary": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json index 3d83a580e..cf11c6d49 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-004363" + "Microsoft.NETCore.App": "1.0.0-rc3-004391" } }, "dnx451": {} diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json index 8433b4b18..66d732150 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.6.0-rc3-24131-00" + "NETStandard.Library": "1.6.0-rc3-24201-00" } } } diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json index c74a01c3e..fcd04fd2a 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-004363" + "version": "1.0.0-rc3-004391" }, "Newtonsoft.Json": "8.0.3" } diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json index fe35c530d..35cb07bf6 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-004363" + "Microsoft.NETCore.App": "1.0.0-rc3-004391" } } }, diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json index e18c1ca60..6430397a0 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004363", + "Microsoft.NETCore.App": "1.0.0-rc3-004391", "Microsoft.Web.Administration": "7.0.0" }, "frameworks": { diff --git a/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json b/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json index 5d7ced6eb..b982a4f0e 100755 --- a/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json +++ b/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004363" + "Microsoft.NETCore.App": "1.0.0-rc3-004391" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestPackages/ToolWithOutputName/project.json b/TestAssets/TestPackages/ToolWithOutputName/project.json index cbd980542..5b261aab8 100644 --- a/TestAssets/TestPackages/ToolWithOutputName/project.json +++ b/TestAssets/TestPackages/ToolWithOutputName/project.json @@ -9,7 +9,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004363" + "version": "1.0.0-rc3-004391" } } } diff --git a/TestAssets/TestPackages/dotnet-dependency-context-test/project.json b/TestAssets/TestPackages/dotnet-dependency-context-test/project.json index a095092fe..ea78082a3 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-004363" + "version": "1.0.0-rc3-004391" }, "Microsoft.Extensions.DependencyModel": { "target": "project" diff --git a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json index efe7e2bcc..55926f12a 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-004363" + "version": "1.0.0-rc3-004391" }, "Microsoft.DotNet.Cli.Utils": { "target": "project" diff --git a/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json b/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json index 8527fe09e..a6765de66 100644 --- a/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json +++ b/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004363" + "version": "1.0.0-rc3-004391" } } }, diff --git a/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json index f0ddc3088..fde6cc710 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-004363" + "Microsoft.NETCore.App": "1.0.0-rc3-004391" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json b/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json index 309cf5866..4c5087ac8 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-004363" + "Microsoft.NETCore.App": "1.0.0-rc3-004391" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestPackages/dotnet-portable/project.json b/TestAssets/TestPackages/dotnet-portable/project.json index 3db8d853c..6ef23aabe 100644 --- a/TestAssets/TestPackages/dotnet-portable/project.json +++ b/TestAssets/TestPackages/dotnet-portable/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004363" + "version": "1.0.0-rc3-004391" } } } diff --git a/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json b/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json index 53fd867d2..c8e5bbf83 100644 --- a/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json +++ b/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json @@ -12,7 +12,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004363" + "version": "1.0.0-rc3-004391" } } } diff --git a/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json b/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json index fd7ac7eac..e68fd1e3c 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-004363" + "version": "1.0.0-rc3-004391" } } } diff --git a/TestAssets/TestProjects/AppWithBomGlobalJson/project.json b/TestAssets/TestProjects/AppWithBomGlobalJson/project.json index 92bc45c15..0681caade 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-004363" + "Microsoft.NETCore.App": "1.0.0-rc3-004391" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json b/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json index 8a8b2a5c1..5aba8ead8 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-004363", + "version": "1.0.0-rc3-004391", "type": "platform" } }, diff --git a/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json b/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json index daf36ce6c..b8a946e5c 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-004363", + "Microsoft.NETCore.App": "1.0.0-rc3-004391", "dotnet-hello": { "version": "1.0.0", "target": "package" diff --git a/TestAssets/TestProjects/AppWithDirectDependency/project.json b/TestAssets/TestProjects/AppWithDirectDependency/project.json index 6f334a860..a1933149c 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-004363", + "Microsoft.NETCore.App": "1.0.0-rc3-004391", "dotnet-hello": { "version": "1.0.0", "target": "package" diff --git a/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json b/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json index df79b5f04..a246fcd51 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-004363", + "version": "1.0.0-rc3-004391", "type": "platform" }, "xunit.core": "2.1.0", diff --git a/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json b/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json index 73347b66f..c498186a2 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-004363", + "version": "1.0.0-rc3-004391", "type": "platform" } }, diff --git a/TestAssets/TestProjects/AppWithNet46AndRoslyn/project.json b/TestAssets/TestProjects/AppWithNet46AndRoslyn/project.json index 8fd9dbde3..aff4727e9 100644 --- a/TestAssets/TestProjects/AppWithNet46AndRoslyn/project.json +++ b/TestAssets/TestProjects/AppWithNet46AndRoslyn/project.json @@ -3,9 +3,9 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160525-03" + "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160602-01" }, "frameworks": { - "net46": { } + "net46": {} } -} \ No newline at end of file +} diff --git a/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json b/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json index 3a1ab341d..70e12b5f4 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-004363" + "Microsoft.NETCore.App": "1.0.0-rc3-004391" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/AppWithToolDependency/project.json b/TestAssets/TestProjects/AppWithToolDependency/project.json index 08ab95018..d5aa5ce51 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-004363" + "Microsoft.NETCore.App": "1.0.0-rc3-004391" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/CompileFail/project.json b/TestAssets/TestProjects/CompileFail/project.json index 5a7531a06..f00cd0cc5 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-004363" + "Microsoft.NETCore.App": "1.0.0-rc3-004391" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json b/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json index fd7ac7eac..e68fd1e3c 100644 --- a/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json +++ b/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004363" + "version": "1.0.0-rc3-004391" } } } diff --git a/TestAssets/TestProjects/DependencyContextFromTool/project.json b/TestAssets/TestProjects/DependencyContextFromTool/project.json index 67b40292b..e460761bf 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-004363" + "version": "1.0.0-rc3-004391" } } } diff --git a/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json b/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json index 24254262c..3e2409e52 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json @@ -9,7 +9,7 @@ "netstandard1.6": { "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24131-00" + "NETStandard.Library": "1.6.0-rc3-24201-00" } }, "net451": {} diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json index 41852e2b9..f6edb66ed 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json @@ -5,7 +5,7 @@ "preserveCompilationContext": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004363", + "Microsoft.NETCore.App": "1.0.0-rc3-004391", "DependencyContextValidator": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json index ee6772cdd..fb3007473 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004363", + "Microsoft.NETCore.App": "1.0.0-rc3-004391", "DependencyContextValidator": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppFullClr/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppFullClr/project.json index e323a45cf..5b9b5911a 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestAppFullClr/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestAppFullClr/project.json @@ -7,7 +7,7 @@ "dependencies": { "DependencyContextValidator": "1.0.0-*", "System.Diagnostics.Process": { - "version": "4.1.0-rc3-24131-00", + "version": "4.1.0-rc3-24201-00", "type": "build" } }, diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json index 788e0e134..65e3d1112 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-004363" + "version": "1.0.0-rc3-004391" }, "DependencyContextValidator": "1.0.0-*" }, diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json index 351b19be2..cf126d541 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-004363" + "version": "1.0.0-rc3-004391" }, "DependencyContextValidator": "1.0.0-*" }, diff --git a/TestAssets/TestProjects/DuplicatedReferenceAssembly/TestApp/project.json b/TestAssets/TestProjects/DuplicatedReferenceAssembly/TestApp/project.json index 45fa9026e..b8511a76f 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-24131-00" + "System.IO.Compression": "4.1.0-rc3-24201-00" }, "frameworks": { "net461": {} diff --git a/TestAssets/TestProjects/EndToEndTestApp/project.json b/TestAssets/TestProjects/EndToEndTestApp/project.json index a5a5a0642..16b028951 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-004363" + "Microsoft.NETCore.App": "1.0.0-rc3-004391" }, "packOptions": { "files": { diff --git a/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json b/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json index 05c9447c0..8bf13b4ec 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-004363" + "Microsoft.NETCore.App": "1.0.0-rc3-004391" }, "tools": { "dotnet-compile-fsc": { diff --git a/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json b/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json index 6d594b5d1..8864f6dcf 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-004363", + "Microsoft.NETCore.App": "1.0.0-rc3-004391", "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221" }, "tools": { diff --git a/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json b/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json index cc7255ab5..ad27d40e8 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-004363" + "Microsoft.NETCore.App": "1.0.0-rc3-004391" }, "tools": { "dotnet-compile-fsc": { diff --git a/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/project.json b/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/project.json index b9d3646e9..2acb10d29 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.6.0-rc3-24131-00" + "NETStandard.Library": "1.6.0-rc3-24201-00" }, "tools": { "dotnet-compile-fsc": { diff --git a/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json b/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json index 590376f96..c7dfcfdc6 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-004363" + "version": "1.0.0-rc3-004391" } }, "imports": [ diff --git a/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json b/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json index a772ee702..be47f9fc3 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-004363" + "Microsoft.NETCore.App": "1.0.0-rc3-004391" }, "imports": [ "dnxcore50", diff --git a/TestAssets/TestProjects/LibraryWithOutputAssemblyName/project.json b/TestAssets/TestProjects/LibraryWithOutputAssemblyName/project.json index 66d5442bc..287ab17f4 100644 --- a/TestAssets/TestProjects/LibraryWithOutputAssemblyName/project.json +++ b/TestAssets/TestProjects/LibraryWithOutputAssemblyName/project.json @@ -3,7 +3,7 @@ "outputName": "MyLibrary" }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24131-00" + "NETStandard.Library": "1.6.0-rc3-24201-00" }, "frameworks": { "netstandard1.5": {} diff --git a/TestAssets/TestProjects/OutputStandardOutputAndError/project.json b/TestAssets/TestProjects/OutputStandardOutputAndError/project.json index 5a7531a06..f00cd0cc5 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-004363" + "Microsoft.NETCore.App": "1.0.0-rc3-004391" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json index d9f953eb9..2a22e71b4 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004363" + "version": "1.0.0-rc3-004391" } }, "frameworks": { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json index 311152261..b28365028 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json @@ -9,7 +9,7 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004363" + "version": "1.0.0-rc3-004391" } }, "frameworks": { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json index 94fbe8b4a..a50787c73 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json @@ -6,7 +6,7 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004363" + "version": "1.0.0-rc3-004391" } }, "frameworks": { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json index 547343c86..1c7ed6c89 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004363" + "version": "1.0.0-rc3-004391" } }, "frameworks": { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json index 2d067899d..493cbe24e 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json @@ -9,14 +9,14 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004363" + "version": "1.0.0-rc3-004391" } } }, "netstandard1.6": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24131-00", - "Microsoft.NETCore.Runtime": "1.0.2-rc3-24131-00" + "NETStandard.Library": "1.6.0-rc3-24201-00", + "Microsoft.NETCore.Runtime": "1.0.2-rc3-24201-00" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json index 6b9c8f50e..fe7317460 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json @@ -13,14 +13,14 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004363" + "version": "1.0.0-rc3-004391" } } }, "netstandard1.6": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24131-00", - "Microsoft.NETCore.Runtime": "1.0.2-rc3-24131-00" + "NETStandard.Library": "1.6.0-rc3-24201-00", + "Microsoft.NETCore.Runtime": "1.0.2-rc3-24201-00" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json index d7969ab08..902272bfb 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json @@ -10,13 +10,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004363" + "version": "1.0.0-rc3-004391" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24131-00" + "NETStandard.Library": "1.6.0-rc3-24201-00" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json index 97858b165..134f3f977 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json @@ -6,13 +6,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004363" + "version": "1.0.0-rc3-004391" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24131-00" + "NETStandard.Library": "1.6.0-rc3-24201-00" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json index 99447d12b..1431fb0dd 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json @@ -13,14 +13,14 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004363" + "version": "1.0.0-rc3-004391" } } }, "netstandard1.6": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24131-00", - "Microsoft.NETCore.Runtime": "1.0.2-rc3-24131-00" + "NETStandard.Library": "1.6.0-rc3-24201-00", + "Microsoft.NETCore.Runtime": "1.0.2-rc3-24201-00" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json index e7d3c57e5..beb29611b 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json @@ -13,13 +13,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004363" + "version": "1.0.0-rc3-004391" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24131-00" + "NETStandard.Library": "1.6.0-rc3-24201-00" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json index a56020a68..4ed6429b0 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json @@ -13,13 +13,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004363" + "version": "1.0.0-rc3-004391" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24131-00" + "NETStandard.Library": "1.6.0-rc3-24201-00" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json index 9d0735efa..741389231 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json @@ -10,13 +10,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004363" + "version": "1.0.0-rc3-004391" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24131-00" + "NETStandard.Library": "1.6.0-rc3-24201-00" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json index 9f69372bd..8d9e7ebc2 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json @@ -13,13 +13,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004363" + "version": "1.0.0-rc3-004391" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24131-00" + "NETStandard.Library": "1.6.0-rc3-24201-00" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json index 97858b165..134f3f977 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json @@ -6,13 +6,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004363" + "version": "1.0.0-rc3-004391" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24131-00" + "NETStandard.Library": "1.6.0-rc3-24201-00" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json index 97858b165..134f3f977 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json @@ -6,13 +6,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004363" + "version": "1.0.0-rc3-004391" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24131-00" + "NETStandard.Library": "1.6.0-rc3-24201-00" } } } diff --git a/TestAssets/TestProjects/PortableTests/PortableApp/project.json b/TestAssets/TestProjects/PortableTests/PortableApp/project.json index 3dc35c8a3..fbcfb3a50 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-004363" + "version": "1.0.0-rc3-004391" } } } diff --git a/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json b/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json index cf104923b..bc6e751c6 100644 --- a/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json +++ b/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json @@ -4,14 +4,14 @@ "preserveCompilationContext": true }, "dependencies": { - "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160525-03" + "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160602-01" }, "frameworks": { "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004363" + "version": "1.0.0-rc3-004391" } } } diff --git a/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json b/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json index d045419cf..9bae38fa7 100644 --- a/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json +++ b/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json @@ -7,9 +7,10 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004363" + "version": "1.0.0-rc3-004391" }, - "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*" + "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", + "Libuv": "1.9.0-rc2-20896" }, "imports": "dnxcore50" } diff --git a/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json b/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json index 11e935623..c9ab41143 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-rc3-004363" + "Microsoft.NETCore.App": "1.0.0-rc3-004391" } } }, diff --git a/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json b/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json index 389e52c7b..b85bf3917 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-24131-00", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-24201-00", "xunit": "2.1.0" }, "frameworks": { @@ -15,10 +15,10 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004363" + "version": "1.0.0-rc3-004391" }, - "System.Linq.Expressions": "4.1.0-rc3-24131-00", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24131-00" + "System.Linq.Expressions": "4.1.0-rc3-24201-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-00" } }, "net451": {} diff --git a/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json b/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json index b13200960..40f38369d 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-rc3-004363" + "version": "1.0.0-rc3-004391" }, - "System.Linq.Expressions": "4.1.0-rc3-24131-00", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24131-00", + "System.Linq.Expressions": "4.1.0-rc3-24201-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-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 dad3182d5..49c655046 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-004363" + "version": "1.0.0-rc3-004391" }, "TestLibraryWithResources": { "target": "project" diff --git a/TestAssets/TestProjects/ResourcesTests/TestLibraryWithResources/project.json b/TestAssets/TestProjects/ResourcesTests/TestLibraryWithResources/project.json index d9b8ba447..2811884f5 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.6.0-rc3-24131-00" + "NETStandard.Library": "1.6.0-rc3-24201-00" }, "frameworks": { "netstandard1.5": { diff --git a/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json b/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json index 01258b1f1..2a8008262 100644 --- a/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json +++ b/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json @@ -7,7 +7,7 @@ "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004363", + "version": "1.0.0-rc3-004391", "type": "platform" } } diff --git a/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json b/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json index ca3b41fc0..4ef627563 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-004363" + "Microsoft.NETCore.App": "1.0.0-rc3-004391" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json b/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json index 6841ca05a..4db9e476b 100644 --- a/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json +++ b/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json @@ -10,7 +10,7 @@ ] }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24131-00" + "NETStandard.Library": "1.6.0-rc3-24201-00" }, "frameworks": { "netstandard1.5": {} diff --git a/TestAssets/TestProjects/TestAppSimple/project.json b/TestAssets/TestProjects/TestAppSimple/project.json index 5a7531a06..f00cd0cc5 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-004363" + "Microsoft.NETCore.App": "1.0.0-rc3-004391" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithArgs/project.json b/TestAssets/TestProjects/TestAppWithArgs/project.json index 5a7531a06..f00cd0cc5 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-004363" + "Microsoft.NETCore.App": "1.0.0-rc3-004391" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json b/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json index 6960f59fc..3baed9d9a 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-004363" + "version": "1.0.0-rc3-004391" }, "LibraryWithBuildDependency": { "target": "project" diff --git a/TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json b/TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json index 4fc45e733..1c76ce870 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-004363" + "version": "1.0.0-rc3-004391" }, "Microsoft.Net.Compilers": { "type": "build", diff --git a/TestAssets/TestProjects/TestAppWithContentPackage/project.json b/TestAssets/TestProjects/TestAppWithContentPackage/project.json index aa48a5853..9a9904b2f 100644 --- a/TestAssets/TestProjects/TestAppWithContentPackage/project.json +++ b/TestAssets/TestProjects/TestAppWithContentPackage/project.json @@ -5,7 +5,7 @@ "outputName": "AppWithContentPackage" }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004363", + "Microsoft.NETCore.App": "1.0.0-rc3-004391", "SharedContentA": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/TestProjects/TestAppWithContents/project.json b/TestAssets/TestProjects/TestAppWithContents/project.json index 411de8989..5173e47c8 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-004363" + "Microsoft.NETCore.App": "1.0.0-rc3-004391" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json b/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json index f878539a7..cbcee04f6 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-004363" + "Microsoft.NETCore.App": "1.0.0-rc3-004391" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json b/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json index 6841ca05a..4db9e476b 100644 --- a/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json +++ b/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json @@ -10,7 +10,7 @@ ] }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24131-00" + "NETStandard.Library": "1.6.0-rc3-24201-00" }, "frameworks": { "netstandard1.5": {} diff --git a/TestAssets/TestProjects/TestAppWithResourceDeps/project.json b/TestAssets/TestProjects/TestAppWithResourceDeps/project.json index 1f4a458fa..5b13124c6 100644 --- a/TestAssets/TestProjects/TestAppWithResourceDeps/project.json +++ b/TestAssets/TestProjects/TestAppWithResourceDeps/project.json @@ -4,12 +4,12 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004363", - "Microsoft.CSharp": "4.0.1-rc3-24131-00", - "System.Dynamic.Runtime": "4.0.11-rc3-24131-00", - "System.Reflection.Metadata": "1.3.0-rc3-24131-00", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24131-00", - "System.Xml.XmlSerializer": "4.0.11-rc3-24131-00", + "Microsoft.NETCore.App": "1.0.0-rc3-004391", + "Microsoft.CSharp": "4.0.1-rc3-24201-00", + "System.Dynamic.Runtime": "4.0.11-rc3-24201-00", + "System.Reflection.Metadata": "1.3.0-rc3-24201-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-00", + "System.Xml.XmlSerializer": "4.0.11-rc3-24201-00", "WindowsAzure.Storage": "6.2.2-preview" }, "frameworks": { diff --git a/TestAssets/TestProjects/TestAppWithScripts/project.json b/TestAssets/TestProjects/TestAppWithScripts/project.json index 39c39bc6e..d7478a434 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-004363" + "Microsoft.NETCore.App": "1.0.0-rc3-004391" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json index f3b08db44..a708c4984 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-004363" + "Microsoft.NETCore.App": "1.0.0-rc3-004391" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json index 12c9b6a7e..4c04f0eed 100644 --- a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json +++ b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json @@ -10,7 +10,7 @@ ] }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24131-00" + "NETStandard.Library": "1.6.0-rc3-24201-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json index 6c8af4fe2..528c6c6f5 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.6.0-rc3-24131-00" + "NETStandard.Library": "1.6.0-rc3-24201-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json index 24c110320..dd135028b 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.6.0-rc3-24131-00" + "NETStandard.Library": "1.6.0-rc3-24201-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json b/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json index 5a7531a06..f00cd0cc5 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-004363" + "Microsoft.NETCore.App": "1.0.0-rc3-004391" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json b/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json index f878539a7..cbcee04f6 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-004363" + "Microsoft.NETCore.App": "1.0.0-rc3-004391" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json index 2fcb0052b..d7a4a1beb 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.6.0-rc3-24131-00" + "NETStandard.Library": "1.6.0-rc3-24201-00" }, "imports": "portable-net45+win8" } diff --git a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json index 7ce34d360..e5a12cea5 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-004363" + "Microsoft.NETCore.App": "1.0.0-rc3-004391" }, "imports": "portable-net45+win8" } diff --git a/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json b/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json index 14704fb08..ae7da5238 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.6.0-rc3-24131-00", + "NETStandard.Library": "1.6.0-rc3-24201-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 43dba1222..a8e93f129 100644 --- a/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json +++ b/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json @@ -10,7 +10,7 @@ ] }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24131-00" + "NETStandard.Library": "1.6.0-rc3-24201-00" }, "configurations": { "Test": {} diff --git a/TestAssets/TestProjects/TestLibraryWithDeprecatedProjectFile/project.json b/TestAssets/TestProjects/TestLibraryWithDeprecatedProjectFile/project.json index cc3ab9e8b..32f2e8ef0 100644 --- a/TestAssets/TestProjects/TestLibraryWithDeprecatedProjectFile/project.json +++ b/TestAssets/TestProjects/TestLibraryWithDeprecatedProjectFile/project.json @@ -5,7 +5,7 @@ }, "packInclude": {}, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24131-00" + "NETStandard.Library": "1.6.0-rc3-24201-00" }, "frameworks": { "netstandard1.5": {} diff --git a/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json b/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json index c425f6f7e..aac9cb13f 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.6.0-rc3-24131-00" + "NETStandard.Library": "1.6.0-rc3-24201-00" } } } diff --git a/TestAssets/TestProjects/TestLibraryWithXmlDoc/project.json b/TestAssets/TestProjects/TestLibraryWithXmlDoc/project.json index a2985e8d8..8bb43f362 100644 --- a/TestAssets/TestProjects/TestLibraryWithXmlDoc/project.json +++ b/TestAssets/TestProjects/TestLibraryWithXmlDoc/project.json @@ -4,7 +4,7 @@ "xmlDoc": true }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24131-00" + "NETStandard.Library": "1.6.0-rc3-24201-00" }, "frameworks": { "netstandard1.5": {} diff --git a/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json b/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json index 011369217..0931e08dd 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-004363" + "Microsoft.NETCore.App": "1.0.0-rc3-004391" } }, "net451": { "dependencies": { - "Microsoft.CSharp": "4.0.1-rc3-24131-00" + "Microsoft.CSharp": "4.0.1-rc3-24201-00" } } }, diff --git a/TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json b/TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json index be24cfb94..c701f0f79 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-004363" + "Microsoft.NETCore.App": "1.0.0-rc3-004391" } }, "netcore50": { "dependencies": { - "System.Private.Uri": "4.0.1-rc3-24131-00" + "System.Private.Uri": "4.0.1-rc3-24201-00" } }, "net99": { "dependencies": { - "Microsoft.CSharp": "4.0.1-rc3-24131-00" + "Microsoft.CSharp": "4.0.1-rc3-24201-00" } } }, diff --git a/TestAssets/TestProjects/TestMscorlibReference/project.json b/TestAssets/TestProjects/TestMscorlibReference/project.json index fadab596e..39d4270b8 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-004363" + "Microsoft.NETCore.App": "1.0.0-rc3-004391" } }, "net451": { diff --git a/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json b/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json index cc0a69c82..a3a3813db 100644 --- a/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json +++ b/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004363", + "version": "1.0.0-rc3-004391", "type": "platform" } }, diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json index 399ea5eec..9f2d9a2e9 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-004363" + "Microsoft.NETCore.App": "1.0.0-rc3-004391" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json index 4d8712050..e3a91edfe 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json @@ -3,7 +3,7 @@ "dependencies": { "L12": "1.0.0-*", "L21": "1.0.0-*", - "NETStandard.Library": "1.6.0-rc3-24131-00" + "NETStandard.Library": "1.6.0-rc3-24201-00" }, "frameworks": { "netstandard1.5": { diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json index c09e68b66..b47370eb2 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { "L22": "1.0.0-*", - "NETStandard.Library": "1.6.0-rc3-24131-00" + "NETStandard.Library": "1.6.0-rc3-24201-00" }, "frameworks": { "netstandard1.5": { diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json index d9b8ba447..2811884f5 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json @@ -1,7 +1,7 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24131-00" + "NETStandard.Library": "1.6.0-rc3-24201-00" }, "frameworks": { "netstandard1.5": { diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json index d9b8ba447..2811884f5 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json @@ -1,7 +1,7 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24131-00" + "NETStandard.Library": "1.6.0-rc3-24201-00" }, "frameworks": { "netstandard1.5": { diff --git a/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json b/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json index 5a7531a06..f00cd0cc5 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-004363" + "Microsoft.NETCore.App": "1.0.0-rc3-004391" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestProjectWithResource/project.json b/TestAssets/TestProjects/TestProjectWithResource/project.json index 5a7531a06..f00cd0cc5 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-004363" + "Microsoft.NETCore.App": "1.0.0-rc3-004391" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestRuleSet/TestLibraryWithRuleSet/project.json b/TestAssets/TestProjects/TestRuleSet/TestLibraryWithRuleSet/project.json index 72962c8a8..559314522 100644 --- a/TestAssets/TestProjects/TestRuleSet/TestLibraryWithRuleSet/project.json +++ b/TestAssets/TestProjects/TestRuleSet/TestLibraryWithRuleSet/project.json @@ -6,7 +6,7 @@ ] }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24131-00", + "NETStandard.Library": "1.6.0-rc3-24201-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 ca47de82d..6ebe7062a 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-004363" + "Microsoft.NETCore.App": "1.0.0-rc3-004391" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestSystemCoreReference/project.json b/TestAssets/TestProjects/TestSystemCoreReference/project.json index 2c8a9f45d..fccc288ef 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-004363" + "Microsoft.NETCore.App": "1.0.0-rc3-004391" } }, "net451": { diff --git a/TestAssets/TestProjects/TestSystemReference/project.json b/TestAssets/TestProjects/TestSystemReference/project.json index dc9cb06f7..ac7312c9d 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-004363" + "Microsoft.NETCore.App": "1.0.0-rc3-004391" } }, "net451": { diff --git a/branchinfo.txt b/branchinfo.txt index fcd5884d1..cd228204d 100644 --- a/branchinfo.txt +++ b/branchinfo.txt @@ -5,4 +5,4 @@ MAJOR_VERSION=1 MINOR_VERSION=0 PATCH_VERSION=0 RELEASE_SUFFIX=preview3 -CHANNEL=preview +CHANNEL=rel-1.0.0 diff --git a/build_projects/Microsoft.DotNet.Cli.Build.Framework/project.json b/build_projects/Microsoft.DotNet.Cli.Build.Framework/project.json index cc59a3249..b046f3793 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.6.0-rc3-24131-00", - "System.Diagnostics.Process": "4.1.0-rc3-24131-00", - "System.Reflection.TypeExtensions": "4.1.0-rc3-24131-00" + "NETStandard.Library": "1.6.0-rc3-24201-00", + "System.Diagnostics.Process": "4.1.0-rc3-24201-00", + "System.Reflection.TypeExtensions": "4.1.0-rc3-24201-00" }, "frameworks": { "netstandard1.5": { diff --git a/build_projects/dotnet-cli-build/CliDependencyVersions.cs b/build_projects/dotnet-cli-build/CliDependencyVersions.cs index 71d3a766a..5fb6d1b78 100644 --- a/build_projects/dotnet-cli-build/CliDependencyVersions.cs +++ b/build_projects/dotnet-cli-build/CliDependencyVersions.cs @@ -7,8 +7,8 @@ namespace Microsoft.DotNet.Cli.Build { public class CliDependencyVersions { - public static readonly string SharedFrameworkVersion = "1.0.0-rc3-004363"; - public static readonly string SharedHostVersion = "1.0.1-rc3-004363-00"; + public static readonly string SharedFrameworkVersion = "1.0.0-rc3-004391"; + public static readonly string SharedHostVersion = "1.0.1-rc3-004391-00"; public static readonly string SharedFrameworkChannel = "preview"; public static readonly string SharedHostChannel = "preview"; diff --git a/build_projects/dotnet-cli-build/PkgTargets.cs b/build_projects/dotnet-cli-build/PkgTargets.cs index 8b1d772fa..ee93dbb22 100644 --- a/build_projects/dotnet-cli-build/PkgTargets.cs +++ b/build_projects/dotnet-cli-build/PkgTargets.cs @@ -56,6 +56,14 @@ namespace Microsoft.DotNet.Cli.Build string resourcePath = Path.Combine(Dirs.RepoRoot, "packaging", "osx", "clisdk", "resources"); string outFilePath = Path.Combine(Dirs.Packages, c.BuildContext.Get("CombinedFrameworkSDKHostInstallerFile")); + // Copy SharedFX and host installers in the correct place + var sharedFrameworkPkgIntermediatePath = Path.Combine(PkgsIntermediateDir, $"{SharedFxComponentId}.pkg"); + var sharedHostPkgIntermediatePath = Path.Combine(PkgsIntermediateDir, $"{SharedHostComponentId}.pkg"); + + File.Copy(c.BuildContext.Get("SharedFrameworkInstallerFile"), sharedFrameworkPkgIntermediatePath, true); + File.Copy(c.BuildContext.Get("SharedHostInstallerFile"), sharedHostPkgIntermediatePath, true); + + string inputDistTemplatePath = Path.Combine( Dirs.RepoRoot, "packaging", diff --git a/build_projects/dotnet-cli-build/PrepareTargets.cs b/build_projects/dotnet-cli-build/PrepareTargets.cs index 1b69277a2..b31827060 100644 --- a/build_projects/dotnet-cli-build/PrepareTargets.cs +++ b/build_projects/dotnet-cli-build/PrepareTargets.cs @@ -187,6 +187,11 @@ namespace Microsoft.DotNet.Cli.Build [BuildPlatforms(BuildPlatform.Windows, BuildPlatform.OSX, BuildPlatform.Ubuntu)] public static BuildTargetResult DownloadHostAndSharedFxInstallers(BuildTargetContext c) { + if (CurrentPlatform.IsUbuntu && !CurrentPlatform.IsVersion("14.04")) + { + return c.Success(); + } + var sharedFrameworkVersion = CliDependencyVersions.SharedFrameworkVersion; var hostVersion = CliDependencyVersions.SharedHostVersion; @@ -198,7 +203,7 @@ namespace Microsoft.DotNet.Cli.Build Mkdirp(Path.GetDirectoryName(sharedFrameworkInstallerDownloadFile)); Mkdirp(Path.GetDirectoryName(sharedHostInstallerDownloadFile)); - + if ( ! File.Exists(sharedFrameworkInstallerDownloadFile)) { var sharedFrameworkInstallerDestinationFile = c.BuildContext.Get("SharedFrameworkInstallerFile"); @@ -227,7 +232,6 @@ namespace Microsoft.DotNet.Cli.Build sharedHostInstallerDownloadFile).Wait(); File.Copy(sharedHostInstallerDownloadFile, sharedHostInstallerDestinationFile, true); - } return c.Success(); diff --git a/build_projects/dotnet-cli-build/PublishTargets.cs b/build_projects/dotnet-cli-build/PublishTargets.cs index 63e931b3e..ed0b07264 100644 --- a/build_projects/dotnet-cli-build/PublishTargets.cs +++ b/build_projects/dotnet-cli-build/PublishTargets.cs @@ -2,14 +2,8 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using System.Net.Http; -using System.Text; using System.Text.RegularExpressions; using Microsoft.DotNet.Cli.Build.Framework; -using Microsoft.WindowsAzure.Storage; -using Microsoft.WindowsAzure.Storage.Blob; - -using static Microsoft.DotNet.Cli.Build.Framework.BuildHelpers; namespace Microsoft.DotNet.Cli.Build { @@ -44,7 +38,6 @@ namespace Microsoft.DotNet.Cli.Build [Target(nameof(PrepareTargets.Init), nameof(PublishTargets.InitPublish), nameof(PublishTargets.PublishArtifacts), - nameof(PublishTargets.TriggerDockerHubBuilds), nameof(PublishTargets.FinalizeBuild))] [Environment("PUBLISH_TO_AZURE_BLOB", "1", "true")] // This is set by CI systems public static BuildTargetResult Publish(BuildTargetContext c) @@ -218,7 +211,7 @@ namespace Microsoft.DotNet.Cli.Build AzurePublisherTool.PublishFile(versionBadgeBlob, versionBadge); return c.Success(); } - + [Target] [BuildPlatforms(BuildPlatform.Ubuntu, "14.04")] public static BuildTargetResult PublishSdkInstallerFileToAzure(BuildTargetContext c) @@ -295,45 +288,6 @@ namespace Microsoft.DotNet.Cli.Build return c.Success(); } - [Target] - [Environment("DOCKER_HUB_REPO")] - [Environment("DOCKER_HUB_TRIGGER_TOKEN")] - public static BuildTargetResult TriggerDockerHubBuilds(BuildTargetContext c) - { - string dockerHubRepo = Environment.GetEnvironmentVariable("DOCKER_HUB_REPO"); - string dockerHubTriggerToken = Environment.GetEnvironmentVariable("DOCKER_HUB_TRIGGER_TOKEN"); - - Uri baseDockerHubUri = new Uri("https://registry.hub.docker.com/u/"); - Uri dockerHubTriggerUri; - if (!Uri.TryCreate(baseDockerHubUri, $"{dockerHubRepo}/trigger/{dockerHubTriggerToken}/", out dockerHubTriggerUri)) - { - return c.Failed("Invalid DOCKER_HUB_REPO and/or DOCKER_HUB_TRIGGER_TOKEN"); - } - - c.Info($"Triggering automated DockerHub builds for {dockerHubRepo}"); - using (HttpClient client = new HttpClient()) - { - StringContent requestContent = new StringContent("{\"build\": true}", Encoding.UTF8, "application/json"); - try - { - HttpResponseMessage response = client.PostAsync(dockerHubTriggerUri, requestContent).Result; - if (!response.IsSuccessStatusCode) - { - StringBuilder sb = new StringBuilder(); - sb.AppendLine($"HTTP request to {dockerHubTriggerUri.ToString()} was unsuccessful."); - sb.AppendLine($"Response status code: {response.StatusCode}. Reason phrase: {response.ReasonPhrase}."); - sb.Append($"Respone content: {response.Content.ReadAsStringAsync().Result}"); - return c.Failed(sb.ToString()); - } - } - catch (AggregateException e) - { - return c.Failed($"HTTP request to {dockerHubTriggerUri.ToString()} failed. {e.ToString()}"); - } - } - return c.Success(); - } - [Target(nameof(PrepareTargets.Init))] public static BuildTargetResult UpdateVersionsRepo(BuildTargetContext c) { diff --git a/build_projects/dotnet-cli-build/build.ps1 b/build_projects/dotnet-cli-build/build.ps1 index 0f27922a7..a6afbd678 100644 --- a/build_projects/dotnet-cli-build/build.ps1 +++ b/build_projects/dotnet-cli-build/build.ps1 @@ -56,7 +56,9 @@ if (!(Test-Path $env:DOTNET_INSTALL_DIR)) # Install a stage 0 Write-Host "Installing .NET Core CLI Stage 0 from branchinfo channel" -& "$RepoRoot\scripts\obtain\dotnet-install.ps1" -Channel $env:CHANNEL -Architecture $Architecture -Verbose + +#TODO change 'preview' channel back to $env:CHANNEL when we have a first build in the current channel +& "$RepoRoot\scripts\obtain\dotnet-install.ps1" -Channel preview -Architecture $Architecture -Verbose if($LASTEXITCODE -ne 0) { throw "Failed to install stage0" } # Put the stage0 on the path diff --git a/build_projects/dotnet-cli-build/build.sh b/build_projects/dotnet-cli-build/build.sh index 412013fef..7278d7366 100755 --- a/build_projects/dotnet-cli-build/build.sh +++ b/build_projects/dotnet-cli-build/build.sh @@ -85,7 +85,8 @@ done < "$REPOROOT/branchinfo.txt" [ -z "$DOTNET_INSTALL_DIR" ] && export DOTNET_INSTALL_DIR=$REPOROOT/.dotnet_stage0/$(uname) [ -d "$DOTNET_INSTALL_DIR" ] || mkdir -p $DOTNET_INSTALL_DIR -$REPOROOT/scripts/obtain/dotnet-install.sh --channel $CHANNEL --verbose +#TODO change 'preview' channel back to $env:CHANNEL when we have a first build in the current channel +$REPOROOT/scripts/obtain/dotnet-install.sh --channel preview --verbose # Put stage 0 on the PATH (for this shell only) PATH="$DOTNET_INSTALL_DIR:$PATH" diff --git a/build_projects/dotnet-cli-build/project.json b/build_projects/dotnet-cli-build/project.json index 6cfd36d04..2c29d03d6 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.6.0-rc3-24131-00", - "Microsoft.NETCore.Runtime": "1.0.2-rc3-24131-00", - "Microsoft.CSharp": "4.0.1-rc3-24131-00", - "System.Dynamic.Runtime": "4.0.11-rc3-24131-00", - "System.Reflection.Metadata": "1.3.0-rc3-24131-00", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24131-00", - "System.Xml.XmlSerializer": "4.0.11-rc3-24131-00", + "NETStandard.Library": "1.6.0-rc3-24201-00", + "Microsoft.NETCore.Runtime": "1.0.2-rc3-24201-00", + "Microsoft.CSharp": "4.0.1-rc3-24201-00", + "System.Dynamic.Runtime": "4.0.11-rc3-24201-00", + "System.Reflection.Metadata": "1.3.0-rc3-24201-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-00", + "System.Xml.XmlSerializer": "4.0.11-rc3-24201-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 1b27d9022..9da914807 100644 --- a/build_projects/shared-build-targets-utils/DependencyVersions.cs +++ b/build_projects/shared-build-targets-utils/DependencyVersions.cs @@ -7,6 +7,6 @@ namespace Microsoft.DotNet.Cli.Build { public class DependencyVersions { - public static readonly string CoreCLRVersion = "1.0.2-rc3-24131-00"; + public static readonly string CoreCLRVersion = "1.0.2-rc3-24201-00"; } } diff --git a/build_projects/shared-build-targets-utils/project.json b/build_projects/shared-build-targets-utils/project.json index 204ff64c6..2ea1ac22d 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.6.0-rc3-24131-00", - "Microsoft.CSharp": "4.0.1-rc3-24131-00", - "System.Dynamic.Runtime": "4.0.11-rc3-24131-00", - "System.Reflection.Metadata": "1.3.0-rc3-24131-00", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24131-00", - "System.Xml.XmlSerializer": "4.0.11-rc3-24131-00", + "NETStandard.Library": "1.6.0-rc3-24201-00", + "Microsoft.CSharp": "4.0.1-rc3-24201-00", + "System.Dynamic.Runtime": "4.0.11-rc3-24201-00", + "System.Reflection.Metadata": "1.3.0-rc3-24201-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-00", + "System.Xml.XmlSerializer": "4.0.11-rc3-24201-00", "WindowsAzure.Storage": "6.2.2-preview", "Microsoft.DotNet.Cli.Build.Framework": { "target": "project" diff --git a/build_projects/update-dependencies/Config.cs b/build_projects/update-dependencies/Config.cs index 8d5008ee1..f495e2bcc 100644 --- a/build_projects/update-dependencies/Config.cs +++ b/build_projects/update-dependencies/Config.cs @@ -19,7 +19,8 @@ namespace Microsoft.DotNet.Scripts /// The following Environment Variables can optionally be specified: /// /// COREFX_VERSION_URL - The Url to get the current CoreFx package versions. (ex. "https://raw.githubusercontent.com/dotnet/versions/master/build-info/dotnet/corefx/release/1.0.0/Latest_Packages.txt") - /// CORESETUP_VERSION_URL - The Url to get the current dotnet/core-setup package versions. (ex. "https://raw.githubusercontent.com/dotnet/versions/master/build-info/dotnet/core-setup/master/Latest_Packages.txt") + /// ROSLYN_VERSION_URL - The Url to get the current Roslyn version. (ex. "https://raw.githubusercontent.com/dotnet/versions/master/build-info/dotnet/roslyn/netcore1.0/Latest_Packages.txt") + /// CORESETUP_VERSION_URL - The Url to get the current dotnet/core-setup package versions. (ex. "https://raw.githubusercontent.com/dotnet/versions/master/build-info/dotnet/core-setup/release/1.0.0/Latest_Packages.txt") /// GITHUB_ORIGIN_OWNER - The owner of the GitHub fork to push the commit and create the PR from. (ex. "dotnet-bot") /// GITHUB_UPSTREAM_OWNER - The owner of the GitHub base repo to create the PR to. (ex. "dotnet") /// GITHUB_PROJECT - The repo name under the ORIGIN and UPSTREAM owners. (ex. "cli") @@ -35,7 +36,8 @@ namespace Microsoft.DotNet.Scripts private Lazy _password = new Lazy(() => GetEnvironmentVariable("GITHUB_PASSWORD")); private Lazy _coreFxVersionUrl = new Lazy(() => GetEnvironmentVariable("COREFX_VERSION_URL", "https://raw.githubusercontent.com/dotnet/versions/master/build-info/dotnet/corefx/release/1.0.0/Latest_Packages.txt")); - private Lazy _coreSetupVersionUrl = new Lazy(() => GetEnvironmentVariable("CORESETUP_VERSION_URL", "https://raw.githubusercontent.com/dotnet/versions/master/build-info/dotnet/core-setup/master/Latest_Packages.txt")); + private Lazy _roslynVersionUrl = new Lazy(() => GetEnvironmentVariable("ROSLYN_VERSION_URL", "https://raw.githubusercontent.com/dotnet/versions/master/build-info/dotnet/roslyn/netcore1.0/Latest_Packages.txt")); + private Lazy _coreSetupVersionUrl = new Lazy(() => GetEnvironmentVariable("CORESETUP_VERSION_URL", "https://raw.githubusercontent.com/dotnet/versions/master/build-info/dotnet/core-setup/release/1.0.0/Latest_Packages.txt")); private Lazy _gitHubOriginOwner; private Lazy _gitHubUpstreamOwner = new Lazy(() => GetEnvironmentVariable("GITHUB_UPSTREAM_OWNER", "dotnet")); private Lazy _gitHubProject = new Lazy(() => GetEnvironmentVariable("GITHUB_PROJECT", "cli")); @@ -53,6 +55,7 @@ namespace Microsoft.DotNet.Scripts public string Email => _email.Value; public string Password => _password.Value; public string CoreFxVersionUrl => _coreFxVersionUrl.Value; + public string RoslynVersionUrl => _roslynVersionUrl.Value; public string CoreSetupVersionUrl => _coreSetupVersionUrl.Value; public string GitHubOriginOwner => _gitHubOriginOwner.Value; public string GitHubUpstreamOwner => _gitHubUpstreamOwner.Value; diff --git a/build_projects/update-dependencies/UpdateFilesTargets.cs b/build_projects/update-dependencies/UpdateFilesTargets.cs index 4f4ca8d7f..0b5d55de2 100644 --- a/build_projects/update-dependencies/UpdateFilesTargets.cs +++ b/build_projects/update-dependencies/UpdateFilesTargets.cs @@ -32,6 +32,7 @@ namespace Microsoft.DotNet.Scripts List dependencyInfos = c.GetDependencyInfos(); dependencyInfos.Add(CreateDependencyInfo("CoreFx", Config.Instance.CoreFxVersionUrl).Result); + dependencyInfos.Add(CreateDependencyInfo("Roslyn", Config.Instance.RoslynVersionUrl).Result); dependencyInfos.Add(CreateDependencyInfo("CoreSetup", Config.Instance.CoreSetupVersionUrl).Result); return c.Success(); @@ -139,19 +140,33 @@ namespace Microsoft.DotNet.Scripts { if (id == packageInfo.Id) { + string oldVersion; if (dependencyProperty.Value is JObject) { - dependencyProperty.Value["version"] = packageInfo.Version.ToNormalizedString(); + oldVersion = (string)dependencyProperty.Value["version"]; } else { - dependencyProperty.Value = packageInfo.Version.ToNormalizedString(); + oldVersion = (string)dependencyProperty.Value; } - // mark the DependencyInfo as updated so we can tell which dependencies were updated - dependencyInfo.IsUpdated = true; + string newVersion = packageInfo.Version.ToNormalizedString(); + if (oldVersion != newVersion) + { + if (dependencyProperty.Value is JObject) + { + dependencyProperty.Value["version"] = newVersion; + } + else + { + dependencyProperty.Value = newVersion; + } - return true; + // mark the DependencyInfo as updated so we can tell which dependencies were updated + dependencyInfo.IsUpdated = true; + + return true; + } } } } diff --git a/build_projects/update-dependencies/project.json b/build_projects/update-dependencies/project.json index 7205aa6ac..0b52ee8f2 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.6.0-rc3-24131-00", - "Microsoft.CSharp": "4.0.1-rc3-24131-00", - "Microsoft.NETCore.Runtime": "1.0.2-rc3-24131-00", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24131-00", + "NETStandard.Library": "1.6.0-rc3-24201-00", + "Microsoft.CSharp": "4.0.1-rc3-24201-00", + "Microsoft.NETCore.Runtime": "1.0.2-rc3-24201-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-00", "Microsoft.DotNet.Cli.Build.Framework": { "target": "project" }, diff --git a/build_projects/update-dependencies/update-dependencies.ps1 b/build_projects/update-dependencies/update-dependencies.ps1 index 0f2eea827..4ecef6840 100644 --- a/build_projects/update-dependencies/update-dependencies.ps1 +++ b/build_projects/update-dependencies/update-dependencies.ps1 @@ -17,6 +17,8 @@ if($Help) exit 0 } +$Architecture='x64' + $RepoRoot = "$PSScriptRoot\..\.." $AppPath = "$PSScriptRoot" @@ -28,7 +30,7 @@ if (!$env:DOTNET_INSTALL_DIR) # Install a stage 0 Write-Host "Installing .NET Core CLI Stage 0" -& "$RepoRoot\scripts\obtain\dotnet-install.ps1" -Architecture x64 +& "$RepoRoot\scripts\obtain\dotnet-install.ps1" -Architecture $Architecture if($LASTEXITCODE -ne 0) { throw "Failed to install stage0" } # Put the stage0 on the path diff --git a/netci.groovy b/netci.groovy index 0ff12330a..8a2698aab 100644 --- a/netci.groovy +++ b/netci.groovy @@ -9,7 +9,7 @@ def project = GithubProject def branch = GithubBranchName def isPR = true -def platformList = ['Debian8.2:x64:Debug', 'Ubuntu:x64:Release', 'Ubuntu16.04:x64:Debug', 'OSX:x64:Release', 'Windows_NT:x64:Release', 'Windows_NT:x86:Debug', 'RHEL7.2:x64:Release', 'CentOS7.1:x64:Debug', 'Fedora23:x64:Debug', 'openSUSE13.2:x64:Debug'] +def platformList = ['Debian8.2:x64:Debug', 'Ubuntu:x64:Release', 'Ubuntu16.04:x64:Debug', 'OSX:x64:Release', 'Windows_NT:x64:Release', 'Windows_NT:x86:Debug', 'RHEL7.2:x64:Release', 'CentOS7.1:x64:Debug', 'Fedora23:x64:Debug', 'OpenSUSE13.2:x64:Debug'] def static getBuildJobName(def configuration, def os, def architecture) { return configuration.toLowerCase() + '_' + os.toLowerCase() + '_' + architecture.toLowerCase() @@ -32,7 +32,7 @@ platformList.each { platform -> buildCommand = ".\\build.cmd -Configuration ${configuration} -Architecture ${architecture} -RunInstallerTestsInDocker -Targets Default" } else if (os == 'Ubuntu') { - buildCommand = "./build.sh --skip-prereqs --configuration ${configuration} --docker ubuntu --targets Default" + buildCommand = "./build.sh --skip-prereqs --configuration ${configuration} --docker ubuntu.14.04 --targets Default" } else { // Jenkins non-Ubuntu CI machines don't have docker diff --git a/packaging/debian/dotnet-debian_config.json b/packaging/debian/dotnet-debian_config.json index 117d4cd67..3a33544df 100644 --- a/packaging/debian/dotnet-debian_config.json +++ b/packaging/debian/dotnet-debian_config.json @@ -29,7 +29,6 @@ }, "debian_dependencies":{ - "clang-3.5" : {}, "%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME%" : {} } } diff --git a/scripts/docker/debian/Dockerfile b/scripts/docker/debian/Dockerfile index 3798f757f..fe062be44 100644 --- a/scripts/docker/debian/Dockerfile +++ b/scripts/docker/debian/Dockerfile @@ -7,60 +7,39 @@ FROM debian:jessie # Misc Dependencies for build -RUN apt-get update && apt-get -qqy install curl unzip gettext sudo +RUN apt-get update && \ + apt-get -qqy install \ + curl \ + unzip \ + gettext \ + sudo && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists/* # This could become a "microsoft/coreclr" image, since it just installs the dependencies for CoreCLR (and stdlib) -RUN echo "deb http://llvm.org/apt/jessie/ llvm-toolchain-jessie-3.6 main" | tee /etc/apt/sources.list.d/llvm.list && \ - curl http://llvm.org/apt/llvm-snapshot.gpg.key | apt-key add - && \ - apt-get update && apt-get -qqy install\ - libc6 \ - libedit2 \ - libffi6 \ - libgcc1 \ - libicu52 \ - liblldb-3.6 \ - libllvm3.6 \ - liblttng-ust0 \ - liblzma5 \ - libncurses5 \ - libpython2.7 \ - libstdc++6 \ - libtinfo5 \ - libunwind8 \ - libuuid1 \ - zlib1g \ - libasn1-8-heimdal \ - libcomerr2 \ - libcurl3 \ - libgpg-error0 \ - libgssapi3-heimdal \ - libgssapi-krb5-2 \ - libhcrypto4-heimdal \ - libheimbase1-heimdal \ - libheimntlm0-heimdal \ - libhx509-5-heimdal \ - libidn11 \ - libk5crypto3 \ - libkeyutils1 \ - libkrb5-26-heimdal \ - libkrb5-3 \ - libkrb5support0 \ - libldap-2.4-2 \ - libp11-kit0 \ - libroken18-heimdal \ - libsasl2-2 \ - libsqlite3-0 \ - libssl1.0.0 \ - libssl-dev \ - libtasn1-6 \ - libwind0-heimdal - -# Install Dotnet CLI dependencies. -# clang is required for dotnet-compile-native -RUN apt-get -qqy install clang-3.5 +RUN apt-get update &&\ + apt-get -qqy install \ + libunwind8 \ + libkrb5-3 \ + libicu52 \ + liblttng-ust0 \ + libssl1.0.0 \ + zlib1g \ + libuuid1 && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists/* # Install Build Prereqs -RUN apt-get -qq install -y debhelper build-essential devscripts git cmake +RUN apt-get update && \ + apt-get -qqy install \ + debhelper \ + build-essential \ + devscripts \ + git \ + cmake \ + clang-3.5 && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists/* # Use clang as c++ compiler RUN update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-3.5 100 diff --git a/scripts/docker/fedora.23/Dockerfile b/scripts/docker/fedora.23/Dockerfile index 7bdcde793..62972d7e6 100644 --- a/scripts/docker/fedora.23/Dockerfile +++ b/scripts/docker/fedora.23/Dockerfile @@ -21,8 +21,8 @@ RUN dnf install -y git \ zip \ tar \ nodejs \ + findutils \ npm && \ - findutils && \ dnf clean all && \ npm install -g azure-cli && \ npm cache clean diff --git a/scripts/docker/ubuntu.14.04/Dockerfile b/scripts/docker/ubuntu.14.04/Dockerfile new file mode 100644 index 000000000..995a74b3b --- /dev/null +++ b/scripts/docker/ubuntu.14.04/Dockerfile @@ -0,0 +1,63 @@ +# +# Copyright (c) .NET Foundation and contributors. All rights reserved. +# Licensed under the MIT license. See LICENSE file in the project root for full license information. +# + +# Dockerfile that creates a container suitable to build dotnet-cli +FROM ubuntu:14.04 + +# Misc Dependencies for build +RUN apt-get update && \ + apt-get -qqy install \ + curl \ + unzip \ + gettext \ + sudo && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists/* + +# This could become a "microsoft/coreclr" image, since it just installs the dependencies for CoreCLR (and stdlib) +RUN apt-get update && \ + apt-get -qqy install \ + libunwind8 \ + libkrb5-3 \ + libicu52 \ + liblttng-ust0 \ + libssl1.0.0 \ + zlib1g \ + libuuid1 && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists/* + +# Install Build Prereqs +RUN apt-get update && \ + apt-get -qqy install \ + debhelper \ + build-essential \ + devscripts \ + git \ + cmake \ + clang-3.5 \ + lldb-3.6 && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists/* + +# Use clang as c++ compiler +RUN update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-3.5 100 +RUN update-alternatives --set c++ /usr/bin/clang++-3.5 + +# Setup User to match Host User, and give superuser permissions +ARG USER_ID=0 +RUN useradd -m code_executor -u ${USER_ID} -g sudo +RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers + +# With the User Change, we need to change permissions on these directories +RUN chmod -R a+rwx /usr/local +RUN chmod -R a+rwx /home +RUN chmod -R 755 /usr/lib/sudo + +# Set user to the one we just created +USER ${USER_ID} + +# Set working directory +WORKDIR /opt/code diff --git a/scripts/docker/ubuntu.16.04/Dockerfile b/scripts/docker/ubuntu.16.04/Dockerfile index 3bea47f9e..a101e49ba 100644 --- a/scripts/docker/ubuntu.16.04/Dockerfile +++ b/scripts/docker/ubuntu.16.04/Dockerfile @@ -8,42 +8,27 @@ FROM ubuntu:16.04 # Install the base toolchain we need to build anything (clang, cmake, make and the like) # this does not include libraries that we need to compile different projects, we'd like # them in a different layer. -RUN apt-get update && \ - apt-get install -y wget && \ - echo "deb http://llvm.org/apt/trusty/ llvm-toolchain-trusty-3.6 main" | tee /etc/apt/sources.list.d/llvm.list && \ - wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | apt-key add - && \ +RUN rm -rf rm -rf /var/lib/apt/lists/* && \ + apt-get clean && \ apt-get update && \ apt-get install -y cmake \ make \ llvm-3.5 \ clang-3.5 \ - lldb-3.6 \ - lldb-3.6-dev && \ - apt-get clean - -# Install tools used by the VSO build automation. nodejs-legacy is a Debian specific -# package that provides `node' on the path (which azure cli needs). -RUN apt-get install -y git \ - zip \ + git \ curl \ tar \ - nodejs \ - nodejs-legacy \ - npm && \ - apt-get clean && \ - npm install -g azure-cli && \ - npm cache clean + sudo && \ + apt-get clean # Dependencies for CoreCLR and CoreFX -RUN apt-get install -y gettext \ - libunwind8-dev \ - libkrb5-dev \ - libunwind8 \ - libicu-dev \ - liblttng-ust-dev \ - libcurl4-openssl-dev \ - libssl-dev \ - uuid-dev && \ +RUN apt-get install -y libunwind8 \ + libkrb5-3 \ + libicu55 \ + liblttng-ust0 \ + libssl1.0.0 \ + zlib1g \ + libuuid1 && \ apt-get clean # Setup User to match Host User, and give superuser permissions @@ -60,4 +45,4 @@ RUN chmod -R 755 /usr/lib/sudo USER ${USER_ID} # Set working directory -WORKDIR /opt/code \ No newline at end of file +WORKDIR /opt/code diff --git a/scripts/docker/ubuntu/Dockerfile b/scripts/docker/ubuntu/Dockerfile deleted file mode 100644 index c57e4e4ca..000000000 --- a/scripts/docker/ubuntu/Dockerfile +++ /dev/null @@ -1,87 +0,0 @@ -# -# Copyright (c) .NET Foundation and contributors. All rights reserved. -# Licensed under the MIT license. See LICENSE file in the project root for full license information. -# - -# Dockerfile that creates a container suitable to build dotnet-cli -FROM ubuntu:14.04 - -# Misc Dependencies for build -RUN apt-get update && apt-get -qqy install curl unzip gettext sudo - -# This could become a "microsoft/coreclr" image, since it just installs the dependencies for CoreCLR (and stdlib) -RUN echo "deb http://llvm.org/apt/trusty/ llvm-toolchain-trusty-3.6 main" | tee /etc/apt/sources.list.d/llvm.list && \ - curl http://llvm.org/apt/llvm-snapshot.gpg.key | apt-key add - && \ - apt-get update && apt-get -qqy install\ - libc6 \ - libedit2 \ - libffi6 \ - libgcc1 \ - libicu52 \ - liblldb-3.6 \ - libllvm3.6 \ - liblttng-ust0 \ - liblzma5 \ - libncurses5 \ - libpython2.7 \ - libstdc++6 \ - libtinfo5 \ - libunwind8 \ - liburcu1 \ - libuuid1 \ - zlib1g \ - libasn1-8-heimdal \ - libcomerr2 \ - libcurl3 \ - libgcrypt11 \ - libgnutls26 \ - libgpg-error0 \ - libgssapi3-heimdal \ - libgssapi-krb5-2 \ - libhcrypto4-heimdal \ - libheimbase1-heimdal \ - libheimntlm0-heimdal \ - libhx509-5-heimdal \ - libidn11 \ - libk5crypto3 \ - libkeyutils1 \ - libkrb5-26-heimdal \ - libkrb5-3 \ - libkrb5support0 \ - libldap-2.4-2 \ - libp11-kit0 \ - libroken18-heimdal \ - librtmp0 \ - libsasl2-2 \ - libsqlite3-0 \ - libssl1.0.0 \ - libssl-dev \ - libtasn1-6 \ - libwind0-heimdal - -# Install Dotnet CLI dependencies. -# clang is required for dotnet-compile-native -RUN apt-get -qqy install clang-3.5 - -# Install Build Prereqs -RUN apt-get -qq install -y debhelper build-essential devscripts git cmake - -# Use clang as c++ compiler -RUN update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-3.5 100 -RUN update-alternatives --set c++ /usr/bin/clang++-3.5 - -# Setup User to match Host User, and give superuser permissions -ARG USER_ID=0 -RUN useradd -m code_executor -u ${USER_ID} -g sudo -RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers - -# With the User Change, we need to change permissions on these directories -RUN chmod -R a+rwx /usr/local -RUN chmod -R a+rwx /home -RUN chmod -R 755 /usr/lib/sudo - -# Set user to the one we just created -USER ${USER_ID} - -# Set working directory -WORKDIR /opt/code diff --git a/scripts/dockerrun.sh b/scripts/dockerrun.sh index 807454db9..8d989542d 100755 --- a/scripts/dockerrun.sh +++ b/scripts/dockerrun.sh @@ -123,8 +123,6 @@ docker run $INTERACTIVE -t --rm --sig-proxy=true \ -e REPO_SERVER \ -e DOTNET_BUILD_SKIP_CROSSGEN \ -e PUBLISH_TO_AZURE_BLOB \ - -e DOCKER_HUB_REPO \ - -e DOCKER_HUB_TRIGGER_TOKEN \ -e NUGET_FEED_URL \ -e NUGET_API_KEY \ -e GITHUB_PASSWORD \ diff --git a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/PackagedCommandSpecFactory.cs b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/PackagedCommandSpecFactory.cs index 106049425..6842d3e13 100644 --- a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/PackagedCommandSpecFactory.cs +++ b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/PackagedCommandSpecFactory.cs @@ -36,15 +36,12 @@ namespace Microsoft.DotNet.Cli.Utils return null; } - var isPortable = IsPortableApp(commandPath, runtimeConfigPath); - - return CreateCommandSpecWrappingWithCorehostIfDll( + return CreateCommandSpecWrappingWithMuxerIfDll( commandPath, commandArguments, depsFilePath, commandResolutionStrategy, nugetPackagesRoot, - isPortable, runtimeConfigPath); } @@ -58,65 +55,57 @@ namespace Microsoft.DotNet.Cli.Utils return filePath; } - private CommandSpec CreateCommandSpecWrappingWithCorehostIfDll( + private CommandSpec CreateCommandSpecWrappingWithMuxerIfDll( string commandPath, IEnumerable commandArguments, string depsFilePath, CommandResolutionStrategy commandResolutionStrategy, string nugetPackagesRoot, - bool isPortable, string runtimeConfigPath) { var commandExtension = Path.GetExtension(commandPath); if (commandExtension == FileNameSuffixes.DotNet.DynamicLib) { - return CreatePackageCommandSpecUsingCorehost( + return CreatePackageCommandSpecUsingMuxer( commandPath, commandArguments, depsFilePath, commandResolutionStrategy, nugetPackagesRoot, - isPortable, runtimeConfigPath); } return CreateCommandSpec(commandPath, commandArguments, commandResolutionStrategy); } - private CommandSpec CreatePackageCommandSpecUsingCorehost( + private CommandSpec CreatePackageCommandSpecUsingMuxer( string commandPath, IEnumerable commandArguments, string depsFilePath, CommandResolutionStrategy commandResolutionStrategy, string nugetPackagesRoot, - bool isPortable, string runtimeConfigPath) { var host = string.Empty; var arguments = new List(); - if (isPortable) - { - var muxer = new Muxer(); + var muxer = new Muxer(); - host = muxer.MuxerPath; - if (host == null) - { - throw new Exception("Unable to locate dotnet multiplexer"); - } - - arguments.Add("exec"); - } - else + host = muxer.MuxerPath; + if (host == null) { - host = CoreHost.HostExePath; + throw new Exception("Unable to locate dotnet multiplexer"); } + + arguments.Add("exec"); + if (runtimeConfigPath != null) { arguments.Add("--runtimeconfig"); arguments.Add(runtimeConfigPath); } + if (depsFilePath != null) { arguments.Add("--depsfile"); @@ -141,23 +130,5 @@ namespace Microsoft.DotNet.Cli.Utils return new CommandSpec(commandPath, escapedArgs, commandResolutionStrategy); } - - private bool IsPortableApp(string commandPath, string runtimeConfigPath) - { - var commandDir = Path.GetDirectoryName(commandPath); - - runtimeConfigPath = string.IsNullOrEmpty(runtimeConfigPath) - ? Directory.EnumerateFiles(commandDir).FirstOrDefault(x => x.EndsWith("runtimeconfig.json")) - : runtimeConfigPath; - - if (runtimeConfigPath == null || !File.Exists(runtimeConfigPath)) - { - return false; - } - - var runtimeConfig = new RuntimeConfig(runtimeConfigPath); - - return runtimeConfig.IsPortable; - } } } diff --git a/src/Microsoft.DotNet.Cli.Utils/project.json b/src/Microsoft.DotNet.Cli.Utils/project.json index 32854a0b1..c5e668719 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-24131-00" + "System.Diagnostics.Process": "4.1.0-rc3-24201-00" } } } diff --git a/src/Microsoft.DotNet.Compiler.Common/project.json b/src/Microsoft.DotNet.Compiler.Common/project.json index b1f0a74be..17dc634fa 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-20160525-03", + "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160602-01", "Microsoft.DotNet.ProjectModel": { "target": "project" }, @@ -39,4 +39,4 @@ } }, "scripts": {} -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.Files/project.json b/src/Microsoft.DotNet.Files/project.json index 0ae21dc36..cd1fd1316 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-24131-00" + "System.Linq.Expressions": "4.1.0-rc3-24201-00" }, "frameworks": { "net451": { diff --git a/src/Microsoft.DotNet.InternalAbstractions/project.json b/src/Microsoft.DotNet.InternalAbstractions/project.json index 49d90a1e6..789fc26d8 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-24131-00", - "System.Collections": "4.0.11-rc3-24131-00", - "System.IO": "4.1.0-rc3-24131-00", - "System.IO.FileSystem": "4.0.1-rc3-24131-00", - "System.Reflection.TypeExtensions": "4.1.0-rc3-24131-00", - "System.Runtime.Extensions": "4.1.0-rc3-24131-00", - "System.Runtime.InteropServices": "4.1.0-rc3-24131-00", - "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc3-24131-00" + "System.AppContext": "4.1.0-rc3-24201-00", + "System.Collections": "4.0.11-rc3-24201-00", + "System.IO": "4.1.0-rc3-24201-00", + "System.IO.FileSystem": "4.0.1-rc3-24201-00", + "System.Reflection.TypeExtensions": "4.1.0-rc3-24201-00", + "System.Runtime.Extensions": "4.1.0-rc3-24201-00", + "System.Runtime.InteropServices": "4.1.0-rc3-24201-00", + "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc3-24201-00" } } }, diff --git a/src/Microsoft.DotNet.ProjectModel.Loader/project.json b/src/Microsoft.DotNet.ProjectModel.Loader/project.json index 70f35e13a..58e873b98 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-24131-00" + "System.Runtime.Loader": "4.0.0-rc3-24201-00" }, "frameworks": { "netstandard1.6": { diff --git a/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json b/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json index f0a3a7671..801454cd7 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-20160525-03" + "Microsoft.CodeAnalysis.CSharp.Workspaces": "1.3.0-beta1-20160602-01" }, "frameworks": { "net451": { @@ -33,4 +33,4 @@ ] } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectModel/BuildWorkspace.cs b/src/Microsoft.DotNet.ProjectModel/BuildWorkspace.cs index 5ac6e0e2b..232abdae7 100644 --- a/src/Microsoft.DotNet.ProjectModel/BuildWorkspace.cs +++ b/src/Microsoft.DotNet.ProjectModel/BuildWorkspace.cs @@ -66,7 +66,8 @@ namespace Microsoft.DotNet.ProjectModel throw new InvalidOperationException($"Can not find runtime target for framework '{context.TargetFramework}' compatible with one of the target runtimes: '{rids}'. " + "Possible causes:" + Environment.NewLine + "1. The project has not been restored or restore failed - run `dotnet restore`" + Environment.NewLine + - $"2. The project does not list one of '{rids}' in the 'runtimes' section."); + $"2. The project does not list one of '{rids}' in the 'runtimes' section." + Environment.NewLine + + "3. You may be trying to publish a library, which is not supported. Use `dotnet pack` to distribute libraries."); } return runtimeContext; diff --git a/src/Microsoft.DotNet.ProjectModel/project.json b/src/Microsoft.DotNet.ProjectModel/project.json index 441c8336e..f14617f8e 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-24131-00" + "System.Reflection.Metadata": "1.3.0-rc3-24201-00" }, "frameworks": { "net451": { @@ -33,13 +33,13 @@ "dotnet5.4" ], "dependencies": { - "Microsoft.CSharp": "4.0.1-rc3-24131-00", - "System.Dynamic.Runtime": "4.0.11-rc3-24131-00", - "System.Runtime.Loader": "4.0.0-rc3-24131-00", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24131-00", - "System.Security.Cryptography.Algorithms": "4.2.0-rc3-24131-00", - "System.Threading.Thread": "4.0.0-rc3-24131-00", - "System.Xml.XDocument": "4.0.11-rc3-24131-00" + "Microsoft.CSharp": "4.0.1-rc3-24201-00", + "System.Dynamic.Runtime": "4.0.11-rc3-24201-00", + "System.Runtime.Loader": "4.0.0-rc3-24201-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-00", + "System.Security.Cryptography.Algorithms": "4.2.0-rc3-24201-00", + "System.Threading.Thread": "4.0.0-rc3-24201-00", + "System.Xml.XDocument": "4.0.11-rc3-24201-00" } } } diff --git a/src/Microsoft.Extensions.DependencyModel/project.json b/src/Microsoft.Extensions.DependencyModel/project.json index 83b904388..8f5fd3b13 100644 --- a/src/Microsoft.Extensions.DependencyModel/project.json +++ b/src/Microsoft.Extensions.DependencyModel/project.json @@ -16,9 +16,9 @@ "netstandard1.6": { "imports": "portable-net45+wp80+win8+wpa81+dnxcore50", "dependencies": { - "System.Diagnostics.Debug": "4.0.11-rc3-24131-00", - "System.Dynamic.Runtime": "4.0.11-rc3-24131-00", - "System.Linq": "4.1.0-rc3-24131-00" + "System.Diagnostics.Debug": "4.0.11-rc3-24201-00", + "System.Dynamic.Runtime": "4.0.11-rc3-24201-00", + "System.Linq": "4.1.0-rc3-24201-00" } } }, diff --git a/src/Microsoft.Extensions.Testing.Abstractions/project.json b/src/Microsoft.Extensions.Testing.Abstractions/project.json index 8a7390308..874e60f92 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-24131-00", - "System.Reflection.TypeExtensions": "4.1.0-rc3-24131-00" + "System.Resources.ResourceManager": "4.0.1-rc3-24201-00", + "System.Reflection.TypeExtensions": "4.1.0-rc3-24201-00" } } }, diff --git a/src/compilers/project.json b/src/compilers/project.json index c9701e82b..f672a3961 100644 --- a/src/compilers/project.json +++ b/src/compilers/project.json @@ -6,10 +6,10 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004363" + "version": "1.0.0-rc3-004391" }, - "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160525-03", - "Microsoft.Net.Compilers.netcore": "1.3.0-beta1-20160525-03", + "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160602-01", + "Microsoft.Net.Compilers.netcore": "1.3.0-beta1-20160602-01", "Microsoft.DiaSymReader.Native": "1.4.0-rc" }, "frameworks": { diff --git a/src/dotnet-compile-fsc/project.json b/src/dotnet-compile-fsc/project.json index 76c003588..08dcdc001 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-004363" + "version": "1.0.0-rc3-004391" } }, "frameworks": { diff --git a/src/dotnet/commands/dotnet-help/HelpCommand.cs b/src/dotnet/commands/dotnet-help/HelpCommand.cs index 35eb0db1c..ecc9bb030 100644 --- a/src/dotnet/commands/dotnet-help/HelpCommand.cs +++ b/src/dotnet/commands/dotnet-help/HelpCommand.cs @@ -8,16 +8,22 @@ namespace Microsoft.DotNet.Tools.Help { public class HelpCommand { - private const string UsageText = @"Usage: dotnet [common-options] [command] [arguments] + private const string UsageText = @"Usage: dotnet [host-options] [command] [arguments] [common-options] Arguments: - [command] The command to execute - [arguments] Arguments to pass to the command + [command] The command to execute + [arguments] Arguments to pass to the command + [host-options] Options specific to dotnet (host) + [common-options] Options common to all commands -Common Options (passed before the command): - -v|--verbose Enable verbose output - --version Display .NET CLI Version Number - --info Display .NET CLI Info +Common options: + -v|--verbose Enable verbose output + -h|--help Show help + +Host options (passed before the command): + -v|--verbose Enable verbose output + --version Display .NET CLI Version Number + --info Display .NET CLI Info Common Commands: new Initialize a basic .NET project 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 3a246f40d..f0b52d4d3 100644 --- a/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template +++ b/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template @@ -9,7 +9,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004363" + "version": "1.0.0-rc3-004391" } }, "imports": "dnxcore50" diff --git a/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template b/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template index c5a2e919c..423f06268 100644 --- a/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template +++ b/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template @@ -27,7 +27,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004363" + "version": "1.0.0-rc3-004391" } }, "imports": [ diff --git a/src/dotnet/project.json b/src/dotnet/project.json index 685a8a97c..85c9f32dc 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-24131-00", - "System.Diagnostics.FileVersionInfo": "4.0.0-rc3-24131-00", + "System.Text.Encoding.CodePages": "4.0.1-rc3-24201-00", + "System.Diagnostics.FileVersionInfo": "4.0.0-rc3-24201-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-004363" + "version": "1.0.0-rc3-004391" }, - "System.Diagnostics.TraceSource": "4.0.0-rc3-24131-00", - "System.Diagnostics.TextWriterTraceListener": "4.0.0-rc3-24131-00", - "System.Resources.Writer": "4.0.0-rc3-24131-00", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24131-00", - "System.Private.DataContractSerialization": "4.1.1-rc3-24131-00", - "System.Text.RegularExpressions": "4.1.0-rc3-24131-00", + "System.Diagnostics.TraceSource": "4.0.0-rc3-24201-00", + "System.Diagnostics.TextWriterTraceListener": "4.0.0-rc3-24201-00", + "System.Resources.Writer": "4.0.0-rc3-24201-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-00", + "System.Private.DataContractSerialization": "4.1.1-rc3-24201-00", + "System.Text.RegularExpressions": "4.1.0-rc3-24201-00", "Microsoft.Win32.Registry": { - "version": "4.0.0-rc3-24131-00", + "version": "4.0.0-rc3-24201-00", "exclude": "compile" } }, diff --git a/test/ArgumentForwardingTests/project.json b/test/ArgumentForwardingTests/project.json index 9a272f1a9..6611df052 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-004363" + "version": "1.0.0-rc3-004391" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24131-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-00", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/ArgumentsReflector/project.json b/test/ArgumentsReflector/project.json index cf75f55e9..17ca93d24 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-004363" + "version": "1.0.0-rc3-004391" } }, "frameworks": { diff --git a/test/EndToEnd/project.json b/test/EndToEnd/project.json index 0ac1c56db..c790f1b1c 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-004363" + "version": "1.0.0-rc3-004391" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24131-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-00", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/Kestrel.Tests/project.json b/test/Kestrel.Tests/project.json index 4b9fc90cc..0cdb2225e 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-004363" + "version": "1.0.0-rc3-004391" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24131-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-00", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectDependencyCommandResolver.cs b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectDependencyCommandResolver.cs index 29a31653c..3f2d057fa 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectDependencyCommandResolver.cs +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectDependencyCommandResolver.cs @@ -114,7 +114,7 @@ namespace Microsoft.DotNet.Cli.Utils.Tests } [Fact] - public void It_returns_a_CommandSpec_with_CoreHost_as_FileName_and_CommandName_in_Args_when_CommandName_exists_in_ProjectDependencies() + public void It_returns_a_CommandSpec_with_Dotnet_as_FileName_and_CommandName_in_Args_when_CommandName_exists_in_ProjectDependencies() { var projectDependenciesCommandResolver = SetupProjectDependenciesCommandResolver(); @@ -133,7 +133,7 @@ namespace Microsoft.DotNet.Cli.Utils.Tests var commandFile = Path.GetFileNameWithoutExtension(result.Path); - commandFile.Should().Be("corehost"); + commandFile.Should().Be("dotnet"); result.Args.Should().Contain(commandResolverArguments.CommandName); } @@ -159,7 +159,7 @@ namespace Microsoft.DotNet.Cli.Utils.Tests } [Fact] - public void It_passes_depsfile_arg_to_corehost_when_returning_a_commandspec() + public void It_passes_depsfile_arg_to_host_when_returning_a_commandspec() { var projectDependenciesCommandResolver = SetupProjectDependenciesCommandResolver(); diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json index 8a9870ebd..f82c42597 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-004363" + "version": "1.0.0-rc3-004391" }, - "System.Diagnostics.TraceSource": "4.0.0-rc3-24131-00", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24131-00", + "System.Diagnostics.TraceSource": "4.0.0-rc3-24201-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-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 324239891..a23541719 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-004363" + "version": "1.0.0-rc3-004391" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24131-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-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 e5d2ea472..e5ccc089c 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-004363" + "version": "1.0.0-rc3-004391" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24131-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-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 4c376c88c..72ea3925f 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-004363" + "version": "1.0.0-rc3-004391" }, - "System.Diagnostics.TraceSource": "4.0.0-rc3-24131-00", + "System.Diagnostics.TraceSource": "4.0.0-rc3-24201-00", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/Performance/project.json b/test/Performance/project.json index ddc9f750a..0fe20f6b6 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-004363" + "version": "1.0.0-rc3-004391" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24131-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-00", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/ScriptExecutorTests/project.json b/test/ScriptExecutorTests/project.json index 60d742226..b2cd4a4e3 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-004363" + "version": "1.0.0-rc3-004391" }, "Microsoft.DotNet.ProjectModel": { "target": "project" diff --git a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json index c835445ce..3aca242d5 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-004363" + "version": "1.0.0-rc3-004391" }, "Microsoft.Extensions.Testing.Abstractions": { "target": "project" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24131-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-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 d6a2ed8c5..855a03212 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-004363" + "version": "1.0.0-rc3-004391" }, "Microsoft.Extensions.Testing.Abstractions": { "target": "project" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24131-00", - "System.Diagnostics.Process": "4.1.0-rc3-24131-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-00", + "System.Diagnostics.Process": "4.1.0-rc3-24201-00", "TestAppWithPortablePdbs": { "target": "project" }, diff --git a/test/TestingAbstractions/TestAppWithFullPdbs/project.json b/test/TestingAbstractions/TestAppWithFullPdbs/project.json index e79cb4a90..de246a370 100644 --- a/test/TestingAbstractions/TestAppWithFullPdbs/project.json +++ b/test/TestingAbstractions/TestAppWithFullPdbs/project.json @@ -4,7 +4,7 @@ "debugType": "full" }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24131-00" + "NETStandard.Library": "1.6.0-rc3-24201-00" }, "frameworks": { "netstandard1.5": {} diff --git a/test/TestingAbstractions/TestAppWithPortablePdbs/project.json b/test/TestingAbstractions/TestAppWithPortablePdbs/project.json index 71413b895..0eb05161a 100644 --- a/test/TestingAbstractions/TestAppWithPortablePdbs/project.json +++ b/test/TestingAbstractions/TestAppWithPortablePdbs/project.json @@ -4,7 +4,7 @@ "debugType": "portable" }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24131-00" + "NETStandard.Library": "1.6.0-rc3-24201-00" }, "frameworks": { "netstandard1.5": {} diff --git a/test/binding-redirects.Tests/project.json b/test/binding-redirects.Tests/project.json index 27750dafe..c3a9439a6 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-24131-00", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-24201-00", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" } diff --git a/test/crossgen.Tests/project.json b/test/crossgen.Tests/project.json index 87eac7591..cf0c9c2c3 100644 --- a/test/crossgen.Tests/project.json +++ b/test/crossgen.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004363" + "version": "1.0.0-rc3-004391" }, "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" diff --git a/test/dotnet-build.Tests/project.json b/test/dotnet-build.Tests/project.json index fc58189b0..a896e4e03 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-004363" + "version": "1.0.0-rc3-004391" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24131-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-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 7731f2dcd..5787e532e 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-004363" + "version": "1.0.0-rc3-004391" }, "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" diff --git a/test/dotnet-compile.Tests/project.json b/test/dotnet-compile.Tests/project.json index 79424ad72..003f7873c 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-004363" + "version": "1.0.0-rc3-004391" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24131-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-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 89e56c0de..af57778a5 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-004363" + "version": "1.0.0-rc3-004391" }, "Microsoft.DotNet.Cli.Utils": { "target": "project" @@ -23,7 +23,7 @@ "target": "project" }, "Microsoft.Win32.Registry": { - "version": "4.0.0-rc3-24131-00", + "version": "4.0.0-rc3-24201-00", "exclude": "Compile" }, "Microsoft.DotNet.ProjectModel": { diff --git a/test/dotnet-new.Tests/project.json b/test/dotnet-new.Tests/project.json index c740dcabc..d939186b8 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-004363" + "version": "1.0.0-rc3-004391" }, "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" diff --git a/test/dotnet-pack.Tests/project.json b/test/dotnet-pack.Tests/project.json index 0d017b33e..e7b8a8d77 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-004363" + "version": "1.0.0-rc3-004391" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24131-00", - "System.IO.Compression.ZipFile": "4.0.1-rc3-24131-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-00", + "System.IO.Compression.ZipFile": "4.0.1-rc3-24201-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 30d5d905a..a8c124616 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-004363" + "version": "1.0.0-rc3-004391" }, "dotnet": { "target": "project" }, "Microsoft.Win32.Registry": { - "version": "4.0.0-rc3-24131-00", + "version": "4.0.0-rc3-24201-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-24131-00" + "System.Net.NameResolution": "4.0.0-rc3-24201-00" }, "frameworks": { "netcoreapp1.0": { diff --git a/test/dotnet-publish.Tests/PublishPortableTests.cs b/test/dotnet-publish.Tests/PublishPortableTests.cs index a7f774b22..a3f3f0eeb 100644 --- a/test/dotnet-publish.Tests/PublishPortableTests.cs +++ b/test/dotnet-publish.Tests/PublishPortableTests.cs @@ -36,6 +36,8 @@ namespace Microsoft.DotNet.Tools.Publish.Tests // Prior to `type:platform` trimming, this would have been published. publishDir.Should().NotHaveFile("System.Linq.dll"); + // PortableAppWithNative references a Libuv version that is explicitly + // not what is in Microsoft.NETCore.App. var runtimesOutput = publishDir.Sub("runtimes"); runtimesOutput.Should().Exist(); diff --git a/test/dotnet-publish.Tests/project.json b/test/dotnet-publish.Tests/project.json index e9d25c516..109982b5c 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-004363" + "version": "1.0.0-rc3-004391" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24131-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-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-24131-00" + "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc3-24201-00" }, "frameworks": { "netcoreapp1.0": { diff --git a/test/dotnet-resgen.Tests/project.json b/test/dotnet-resgen.Tests/project.json index 673418e0f..8079cd28c 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-004363" + "version": "1.0.0-rc3-004391" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24131-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-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 4b9fc90cc..0cdb2225e 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-004363" + "version": "1.0.0-rc3-004391" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24131-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-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 dfe65a2e3..419f5f50d 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-004363" + "version": "1.0.0-rc3-004391" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24131-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-00", "dotnet": { "target": "project" }, diff --git a/test/dotnet-test.Tests/project.json b/test/dotnet-test.Tests/project.json index 27809dd47..dec44f0df 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-004363" + "version": "1.0.0-rc3-004391" }, "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-24131-00", - "System.Net.Sockets": "4.1.0-rc3-24131-00", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24131-00", + "System.Net.NameResolution": "4.0.0-rc3-24201-00", + "System.Net.Sockets": "4.1.0-rc3-24201-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-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 c3156cda9..594a2dc87 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-004363" + "version": "1.0.0-rc3-004391" }, "Newtonsoft.Json": "7.0.1", "dotnet": { "target": "project" }, "Microsoft.Win32.Registry": { - "version": "4.0.0-rc3-24131-00", + "version": "4.0.0-rc3-24201-00", "exclude": "Compile" }, "xunit": "2.1.0", diff --git a/test/dotnet.Tests/project.json b/test/dotnet.Tests/project.json index e99892843..bc3d00f53 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-004363" + "version": "1.0.0-rc3-004391" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24131-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-00", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/tools/MultiProjectValidator/project.json b/tools/MultiProjectValidator/project.json index 09a54e91f..dfaa36cc7 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-004363", + "Microsoft.NETCore.App": "1.0.0-rc3-004391", "Microsoft.DotNet.ProjectModel": { "target": "project" },