diff --git a/NuGet.Config b/NuGet.Config index 55f84e99d..73b213125 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -3,6 +3,7 @@ + diff --git a/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json b/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json index 49096589b..885607884 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-004459-00" + "version": "1.0.0" } }, "imports": [ diff --git a/TestAssets/DesktopTestProjects/DesktopAppWithNativeDep/project.json b/TestAssets/DesktopTestProjects/DesktopAppWithNativeDep/project.json index 498535ab2..30113b6e3 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-24210-10" + "Microsoft.NETCore.Platforms": "1.0.1" }, "buildOptions": { "emitEntryPoint": true diff --git a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktop/project.json b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktop/project.json index f4c3018e7..5bd1f2723 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-24210-10" + "Microsoft.NETCore.Platforms": "1.0.1" }, "buildOptions": { "emitEntryPoint": true, diff --git a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopForce32/project.json b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopForce32/project.json index b8193f98d..93adffa3d 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-24210-10" + "Microsoft.NETCore.Platforms": "1.0.1" }, "buildOptions": { "platform": "anycpu32bitpreferred", diff --git a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopWithRuntimes/project.json b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopWithRuntimes/project.json index e6fe889b6..700f1e2f7 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-24210-10" + "Microsoft.NETCore.Platforms": "1.0.1" }, "buildOptions": { "emitEntryPoint": true, diff --git a/TestAssets/DesktopTestProjects/LibraryWithDirectDependencyDesktopAndPortable/project.json b/TestAssets/DesktopTestProjects/LibraryWithDirectDependencyDesktopAndPortable/project.json index ac8e9ead8..1d8d8a92c 100644 --- a/TestAssets/DesktopTestProjects/LibraryWithDirectDependencyDesktopAndPortable/project.json +++ b/TestAssets/DesktopTestProjects/LibraryWithDirectDependencyDesktopAndPortable/project.json @@ -9,7 +9,7 @@ "frameworks": { "netstandard1.6": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-10" + "NETStandard.Library": "1.6.0" }, "imports": [ "portable-net45+win8", diff --git a/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json b/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json index 151db940e..26475560f 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-004459-00" + "version": "1.0.0" }, "ThisIsNotARealDependencyAndIfSomeoneGoesAndAddsAProjectWithThisNameIWillFindThemAndPunishThem": { "target": "project" diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json index 5c39bd3bb..6390ad290 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-004459-00", + "Microsoft.NETCore.App": "1.0.0", "EmptyLibrary": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json index c2933f29c..a1827ad70 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-004459-00" + "Microsoft.NETCore.App": "1.0.0" } }, "dnx451": {} diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json index 0b5806c34..3ab07f47c 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-24210-10" + "NETStandard.Library": "1.6.0" } } } diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json index 32e0728ff..b20601e54 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-004459-00" + "version": "1.0.0" }, "Newtonsoft.Json": "8.0.3" } diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json index f3c2a4d7d..6bddf49a1 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-004459-00" + "Microsoft.NETCore.App": "1.0.0" } } }, diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json index e5e563d22..6a03cc355 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-004459-00", + "Microsoft.NETCore.App": "1.0.0", "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 880385704..71152b304 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-004459-00" + "Microsoft.NETCore.App": "1.0.0" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestPackages/ToolWithOutputName/project.json b/TestAssets/TestPackages/ToolWithOutputName/project.json index 30ea24932..c728ac1ea 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-004459-00" + "version": "1.0.0" } } } diff --git a/TestAssets/TestPackages/dotnet-dependency-context-test/project.json b/TestAssets/TestPackages/dotnet-dependency-context-test/project.json index 2bd588d5b..b42583346 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-004459-00" + "version": "1.0.0" }, "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 0163ecc6e..02f977709 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-004459-00" + "version": "1.0.0" }, "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 e76c58e56..6889f3f1d 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-004459-00" + "version": "1.0.0" } } }, diff --git a/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json index 20f067b60..17cca0fd2 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-004459-00" + "Microsoft.NETCore.App": "1.0.0" }, "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 d5df4239a..79ad59bc8 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-004459-00" + "Microsoft.NETCore.App": "1.0.0" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestPackages/dotnet-portable/project.json b/TestAssets/TestPackages/dotnet-portable/project.json index c176da7a8..587918c49 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-004459-00" + "version": "1.0.0" } } } diff --git a/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json b/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json index 1932a9e97..f4346ead4 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-004459-00" + "version": "1.0.0" } } } diff --git a/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json b/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json index e0e08326b..23295a370 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-004459-00" + "version": "1.0.0" } } } diff --git a/TestAssets/TestProjects/AppWithBomGlobalJson/project.json b/TestAssets/TestProjects/AppWithBomGlobalJson/project.json index 90e613311..c8fec215d 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-004459-00" + "Microsoft.NETCore.App": "1.0.0" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json b/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json index 3eedd3dcd..bb444a6c7 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-004459-00", + "version": "1.0.0", "type": "platform" } }, diff --git a/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json b/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json index 101b6de99..cffe971fe 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-004459-00", + "Microsoft.NETCore.App": "1.0.0", "dotnet-hello": { "version": "1.0.0", "target": "package" diff --git a/TestAssets/TestProjects/AppWithDirectDependency/project.json b/TestAssets/TestProjects/AppWithDirectDependency/project.json index a10d15456..d9d9fa091 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-004459-00", + "Microsoft.NETCore.App": "1.0.0", "dotnet-hello": { "version": "1.0.0", "target": "package" diff --git a/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json b/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json index aa7f65e32..3f2f8a04c 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-004459-00", + "version": "1.0.0", "type": "platform" }, "xunit.core": "2.1.0", diff --git a/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json b/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json index fa98be05a..535efe2d1 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-004459-00", + "version": "1.0.0", "type": "platform" } }, diff --git a/TestAssets/TestProjects/AppWithNet46AndRoslyn/project.json b/TestAssets/TestProjects/AppWithNet46AndRoslyn/project.json index 66f5463c1..c302fc457 100644 --- a/TestAssets/TestProjects/AppWithNet46AndRoslyn/project.json +++ b/TestAssets/TestProjects/AppWithNet46AndRoslyn/project.json @@ -3,7 +3,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160610-04" + "Microsoft.CodeAnalysis.CSharp": "1.3.0" }, "frameworks": { "net46": {} diff --git a/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json b/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json index 86bdd1df0..98ce82ca2 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-004459-00" + "Microsoft.NETCore.App": "1.0.0" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/AppWithToolDependency/project.json b/TestAssets/TestProjects/AppWithToolDependency/project.json index 5548d4571..5f5ebe36d 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-004459-00" + "Microsoft.NETCore.App": "1.0.0" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/CompileFail/project.json b/TestAssets/TestProjects/CompileFail/project.json index 1d919006d..7992d095a 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-004459-00" + "Microsoft.NETCore.App": "1.0.0" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json b/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json index e0e08326b..23295a370 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-004459-00" + "version": "1.0.0" } } } diff --git a/TestAssets/TestProjects/DependencyContextFromTool/project.json b/TestAssets/TestProjects/DependencyContextFromTool/project.json index 1cd3f3add..828af60de 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-004459-00" + "version": "1.0.0" } } } diff --git a/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json b/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json index 7ba4470b2..ece3b95e7 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-24210-10" + "NETStandard.Library": "1.6.0" } }, "net451": {} diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json index 84e979c84..5b51b8184 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-004459-00", + "Microsoft.NETCore.App": "1.0.0", "DependencyContextValidator": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json index 22cc1852a..a1a559368 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-004459-00", + "Microsoft.NETCore.App": "1.0.0", "DependencyContextValidator": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppFullClr/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppFullClr/project.json index a95eec9b1..002b9d168 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-24210-10", + "version": "4.1.0", "type": "build" } }, diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json index 4b2b86fd0..8183a28d3 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-004459-00" + "version": "1.0.0" }, "DependencyContextValidator": "1.0.0-*" }, diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json index 49ebd4a9c..045b78200 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-004459-00" + "version": "1.0.0" }, "DependencyContextValidator": "1.0.0-*" }, diff --git a/TestAssets/TestProjects/DuplicatedReferenceAssembly/TestApp/project.json b/TestAssets/TestProjects/DuplicatedReferenceAssembly/TestApp/project.json index cf0fde8fd..25e317a8b 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-24210-10" + "System.IO.Compression": "4.1.0" }, "frameworks": { "net461": {} diff --git a/TestAssets/TestProjects/EndToEndTestApp/project.json b/TestAssets/TestProjects/EndToEndTestApp/project.json index 762034df4..a83d47689 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-004459-00" + "Microsoft.NETCore.App": "1.0.0" }, "packOptions": { "files": { diff --git a/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json b/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json index f69d91bcf..e29c14026 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json @@ -10,12 +10,12 @@ } }, "dependencies": { - "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", - "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" + "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-160509", + "Microsoft.NETCore.App": "1.0.0" }, "tools": { "dotnet-compile-fsc": { - "version": "1.0.0-*", + "version": "1.0.0-preview2-*", "imports": [ "dnxcore50", "portable-net45+win81", diff --git a/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json b/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json index e0cfd5df5..8127db1bc 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json @@ -14,12 +14,12 @@ "version": "1.0.0-*", "target": "project" }, - "Microsoft.NETCore.App": "1.0.0-rc3-004459-00", - "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221" + "Microsoft.NETCore.App": "1.0.0", + "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-160509" }, "tools": { "dotnet-compile-fsc": { - "version": "1.0.0-*", + "version": "1.0.0-preview2-*", "imports": [ "dnxcore50", "portable-net45+win81", diff --git a/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json b/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json index 33ffd4602..0f1c4b84c 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json @@ -10,12 +10,12 @@ } }, "dependencies": { - "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", - "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" + "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-160509", + "Microsoft.NETCore.App": "1.0.0" }, "tools": { "dotnet-compile-fsc": { - "version": "1.0.0-*", + "version": "1.0.0-preview2-*", "imports": [ "dnxcore50", "portable-net45+win81", diff --git a/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/project.json b/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/project.json index 5865cdf2e..fff7c8bfb 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/project.json @@ -1,12 +1,12 @@ { "version": "1.0.0-*", "dependencies": { - "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", - "NETStandard.Library": "1.6.0-rc3-24210-10" + "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-160509", + "NETStandard.Library": "1.6.0" }, "tools": { "dotnet-compile-fsc": { - "version": "1.0.0-*", + "version": "1.0.0-preview2-*", "imports": [ "dnxcore50", "portable-net45+win81", diff --git a/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json b/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json index 1da519820..01dfc053a 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-004459-00" + "version": "1.0.0" } }, "imports": [ diff --git a/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json b/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json index c2a38ff73..2c8661b5c 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-004459-00" + "Microsoft.NETCore.App": "1.0.0" }, "imports": [ "dnxcore50", diff --git a/TestAssets/TestProjects/LibraryWithOutputAssemblyName/project.json b/TestAssets/TestProjects/LibraryWithOutputAssemblyName/project.json index 87000fe5f..c2d11ff89 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-24210-10" + "NETStandard.Library": "1.6.0" }, "frameworks": { "netstandard1.5": {} diff --git a/TestAssets/TestProjects/OutputStandardOutputAndError/project.json b/TestAssets/TestProjects/OutputStandardOutputAndError/project.json index 1d919006d..7992d095a 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-004459-00" + "Microsoft.NETCore.App": "1.0.0" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json index ad3934e3c..31b344316 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-004459-00" + "version": "1.0.0" } }, "frameworks": { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json index fe7da3595..ca8453bdc 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-004459-00" + "version": "1.0.0" } }, "frameworks": { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json index 09a81077f..5bffe254f 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-004459-00" + "version": "1.0.0" } }, "frameworks": { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json index 293f417ad..0a146084d 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-004459-00" + "version": "1.0.0" } }, "frameworks": { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json index dde335cd4..658a0b73b 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-004459-00" + "version": "1.0.0" } } }, "netstandard1.6": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-10", - "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24210-10" + "NETStandard.Library": "1.6.0", + "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json index 796341b86..525f7d864 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-004459-00" + "version": "1.0.0" } } }, "netstandard1.6": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-10", - "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24210-10" + "NETStandard.Library": "1.6.0", + "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json index b6dd4956a..669221ffa 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-004459-00" + "version": "1.0.0" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-10" + "NETStandard.Library": "1.6.0" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json index b2c7dfbd3..39b763734 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-004459-00" + "version": "1.0.0" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-10" + "NETStandard.Library": "1.6.0" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json index 56c1af3c7..0d89fc2cf 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-004459-00" + "version": "1.0.0" } } }, "netstandard1.6": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-10", - "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24210-10" + "NETStandard.Library": "1.6.0", + "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json index d90035e80..21713ec18 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-004459-00" + "version": "1.0.0" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-10" + "NETStandard.Library": "1.6.0" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json index db09f7fa5..e9f6aeee1 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-004459-00" + "version": "1.0.0" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-10" + "NETStandard.Library": "1.6.0" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json index 8ac7aa597..4a2e36e33 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-004459-00" + "version": "1.0.0" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-10" + "NETStandard.Library": "1.6.0" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json index 90235fad0..cb5a7f09c 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-004459-00" + "version": "1.0.0" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-10" + "NETStandard.Library": "1.6.0" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json index b2c7dfbd3..39b763734 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-004459-00" + "version": "1.0.0" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-10" + "NETStandard.Library": "1.6.0" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json index b2c7dfbd3..39b763734 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-004459-00" + "version": "1.0.0" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-10" + "NETStandard.Library": "1.6.0" } } } diff --git a/TestAssets/TestProjects/PortableTests/PortableApp/project.json b/TestAssets/TestProjects/PortableTests/PortableApp/project.json index f40d0c096..6fe0ce23c 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-004459-00" + "version": "1.0.0" } } } diff --git a/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json b/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json index a25cf4b09..5d37fd7dc 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-20160610-04" + "Microsoft.CodeAnalysis.CSharp": "1.3.0" }, "frameworks": { "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" } } } diff --git a/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json b/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json index 095c58de8..a66cc090e 100644 --- a/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json +++ b/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json @@ -7,7 +7,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" }, "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", "Libuv": "1.9.0-rc2-20896" diff --git a/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json b/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json index 2f1b31240..423e4ed9b 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-004459-00" + "Microsoft.NETCore.App": "1.0.0" } } }, diff --git a/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json b/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json index aaec13eb5..734eaa9a3 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-24210-10", + "Microsoft.NETCore.Platforms": "1.0.1", "xunit": "2.1.0" }, "frameworks": { @@ -15,10 +15,10 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" }, - "System.Linq.Expressions": "4.1.0-rc3-24210-10", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10" + "System.Linq.Expressions": "4.1.0", + "System.Runtime.Serialization.Primitives": "4.1.1" } }, "net451": {} diff --git a/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json b/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json index 5fcee9437..841f5b74d 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-004459-00" + "version": "1.0.0" }, - "System.Linq.Expressions": "4.1.0-rc3-24210-10", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", + "System.Linq.Expressions": "4.1.0", + "System.Runtime.Serialization.Primitives": "4.1.1", "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 1e03be991..9108a8d6d 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-004459-00" + "version": "1.0.0" }, "TestLibraryWithResources": { "target": "project" diff --git a/TestAssets/TestProjects/ResourcesTests/TestLibraryWithResources/project.json b/TestAssets/TestProjects/ResourcesTests/TestLibraryWithResources/project.json index 23cd1da8e..023156a9b 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-24210-10" + "NETStandard.Library": "1.6.0" }, "frameworks": { "netstandard1.5": { diff --git a/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json b/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json index 5e796a431..642a05576 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-004459-00", + "version": "1.0.0", "type": "platform" } } diff --git a/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json b/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json index c111e7f5d..c9e62cb6c 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-004459-00" + "Microsoft.NETCore.App": "1.0.0" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json b/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json index 29a9c0bde..48bc772d8 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-24210-10" + "NETStandard.Library": "1.6.0" }, "frameworks": { "netstandard1.5": {} diff --git a/TestAssets/TestProjects/TestAppSimple/project.json b/TestAssets/TestProjects/TestAppSimple/project.json index 1d919006d..7992d095a 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-004459-00" + "Microsoft.NETCore.App": "1.0.0" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithArgs/project.json b/TestAssets/TestProjects/TestAppWithArgs/project.json index 1d919006d..7992d095a 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-004459-00" + "Microsoft.NETCore.App": "1.0.0" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json b/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json index 46e224cce..ea017ca5a 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-004459-00" + "version": "1.0.0" }, "LibraryWithBuildDependency": { "target": "project" diff --git a/TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json b/TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json index 4014d737e..974daa091 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-004459-00" + "version": "1.0.0" }, "Microsoft.Net.Compilers": { "type": "build", diff --git a/TestAssets/TestProjects/TestAppWithContentPackage/project.json b/TestAssets/TestProjects/TestAppWithContentPackage/project.json index aa6098f61..aa869ee87 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-004459-00", + "Microsoft.NETCore.App": "1.0.0", "SharedContentA": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/TestProjects/TestAppWithContents/project.json b/TestAssets/TestProjects/TestAppWithContents/project.json index 83d5bf240..e68525165 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-004459-00" + "Microsoft.NETCore.App": "1.0.0" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json b/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json index 2cce5e3d2..da12c491f 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-004459-00" + "Microsoft.NETCore.App": "1.0.0" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json b/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json index 29a9c0bde..48bc772d8 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-24210-10" + "NETStandard.Library": "1.6.0" }, "frameworks": { "netstandard1.5": {} diff --git a/TestAssets/TestProjects/TestAppWithResourceDeps/project.json b/TestAssets/TestProjects/TestAppWithResourceDeps/project.json index 596cd8ec1..4cfc1d190 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-004459-00", - "Microsoft.CSharp": "4.0.1-rc3-24210-10", - "System.Dynamic.Runtime": "4.0.11-rc3-24210-10", - "System.Reflection.Metadata": "1.3.0-rc3-24210-10", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", - "System.Xml.XmlSerializer": "4.0.11-rc3-24210-10", + "Microsoft.NETCore.App": "1.0.0", + "Microsoft.CSharp": "4.0.1", + "System.Dynamic.Runtime": "4.0.11", + "System.Reflection.Metadata": "1.3.0", + "System.Runtime.Serialization.Primitives": "4.1.1", + "System.Xml.XmlSerializer": "4.0.11", "WindowsAzure.Storage": "6.2.2-preview" }, "frameworks": { diff --git a/TestAssets/TestProjects/TestAppWithScripts/project.json b/TestAssets/TestProjects/TestAppWithScripts/project.json index 0d2f1206f..aaaf3f4f1 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-004459-00" + "Microsoft.NETCore.App": "1.0.0" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json index f17e5b94f..24fe24f65 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-004459-00" + "Microsoft.NETCore.App": "1.0.0" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json index 6bcc02c9c..2a6005a2c 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-24210-10" + "NETStandard.Library": "1.6.0" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json index 41ac5ce8f..4854b7706 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-24210-10" + "NETStandard.Library": "1.6.0" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json index d4ecf731a..4a3ab1eaf 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-24210-10" + "NETStandard.Library": "1.6.0" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json b/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json index 1d919006d..7992d095a 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-004459-00" + "Microsoft.NETCore.App": "1.0.0" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json b/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json index 2cce5e3d2..da12c491f 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-004459-00" + "Microsoft.NETCore.App": "1.0.0" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json index a2f57d69f..b24e0eca8 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-24210-10" + "NETStandard.Library": "1.6.0" }, "imports": "portable-net45+win8" } diff --git a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json index cf97b2490..c425f741c 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-004459-00" + "Microsoft.NETCore.App": "1.0.0" }, "imports": "portable-net45+win8" } diff --git a/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json b/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json index 54928419c..73a907775 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-24210-10", + "NETStandard.Library": "1.6.0", "System.Runtime.Analyzers": { "version": "1.1.0", "type": "build" diff --git a/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json b/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json index cb41bb1fa..d979400d2 100644 --- a/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json +++ b/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json @@ -10,7 +10,7 @@ ] }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-10" + "NETStandard.Library": "1.6.0" }, "configurations": { "Test": {} diff --git a/TestAssets/TestProjects/TestLibraryWithDeprecatedProjectFile/project.json b/TestAssets/TestProjects/TestLibraryWithDeprecatedProjectFile/project.json index e152b7a64..90cf856ff 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-24210-10" + "NETStandard.Library": "1.6.0" }, "frameworks": { "netstandard1.5": {} diff --git a/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json b/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json index 309d754d7..396636d98 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-24210-10" + "NETStandard.Library": "1.6.0" } } } diff --git a/TestAssets/TestProjects/TestLibraryWithXmlDoc/project.json b/TestAssets/TestProjects/TestLibraryWithXmlDoc/project.json index c9e065bbe..eea518a92 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-24210-10" + "NETStandard.Library": "1.6.0" }, "frameworks": { "netstandard1.5": {} diff --git a/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json b/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json index 32a68dff8..77ebea69b 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-004459-00" + "Microsoft.NETCore.App": "1.0.0" } }, "net451": { "dependencies": { - "Microsoft.CSharp": "4.0.1-rc3-24210-10" + "Microsoft.CSharp": "4.0.1" } } }, diff --git a/TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json b/TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json index 0f66e0cdd..ecff54208 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-004459-00" + "Microsoft.NETCore.App": "1.0.0" } }, "netcore50": { "dependencies": { - "System.Private.Uri": "4.0.1-rc3-24210-10" + "System.Private.Uri": "4.0.1" } }, "net99": { "dependencies": { - "Microsoft.CSharp": "4.0.1-rc3-24210-10" + "Microsoft.CSharp": "4.0.1" } } }, diff --git a/TestAssets/TestProjects/TestMscorlibReference/project.json b/TestAssets/TestProjects/TestMscorlibReference/project.json index 815ce3ac0..8c2cbdd57 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-004459-00" + "Microsoft.NETCore.App": "1.0.0" } }, "net451": { diff --git a/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json b/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json index 6bbf3ddfb..a71b16492 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-004459-00", + "version": "1.0.0", "type": "platform" } }, diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json index edec9cff2..02b8a86b3 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-004459-00" + "Microsoft.NETCore.App": "1.0.0" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json index f32d34cc9..0c4571970 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-24210-10" + "NETStandard.Library": "1.6.0" }, "frameworks": { "netstandard1.5": { diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json index 356dfb0f9..bb8f44070 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-24210-10" + "NETStandard.Library": "1.6.0" }, "frameworks": { "netstandard1.5": { diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json index 23cd1da8e..023156a9b 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-24210-10" + "NETStandard.Library": "1.6.0" }, "frameworks": { "netstandard1.5": { diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json index 23cd1da8e..023156a9b 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-24210-10" + "NETStandard.Library": "1.6.0" }, "frameworks": { "netstandard1.5": { diff --git a/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json b/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json index 1d919006d..7992d095a 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-004459-00" + "Microsoft.NETCore.App": "1.0.0" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestProjectWithResource/project.json b/TestAssets/TestProjects/TestProjectWithResource/project.json index 1d919006d..7992d095a 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-004459-00" + "Microsoft.NETCore.App": "1.0.0" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestRuleSet/TestLibraryWithRuleSet/project.json b/TestAssets/TestProjects/TestRuleSet/TestLibraryWithRuleSet/project.json index 64571d94e..8a95d52f2 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-24210-10", + "NETStandard.Library": "1.6.0", "System.Runtime.Analyzers": { "version": "1.1.0", "type": "build" diff --git a/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json b/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json index 6dbc3a1e4..bd272bd57 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-004459-00" + "Microsoft.NETCore.App": "1.0.0" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestSystemCoreReference/project.json b/TestAssets/TestProjects/TestSystemCoreReference/project.json index b819fc948..14cdbb53e 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-004459-00" + "Microsoft.NETCore.App": "1.0.0" } }, "net451": { diff --git a/TestAssets/TestProjects/TestSystemReference/project.json b/TestAssets/TestProjects/TestSystemReference/project.json index a7bd68ca4..7d9a8b91b 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-004459-00" + "Microsoft.NETCore.App": "1.0.0" } }, "net451": { diff --git a/build_projects/Microsoft.DotNet.Cli.Build.Framework/project.json b/build_projects/Microsoft.DotNet.Cli.Build.Framework/project.json index 998eaf29b..c8fdcde8a 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-24210-10", - "System.Diagnostics.Process": "4.1.0-rc3-24210-10", - "System.Reflection.TypeExtensions": "4.1.0-rc3-24210-10" + "NETStandard.Library": "1.6.0", + "System.Diagnostics.Process": "4.1.0", + "System.Reflection.TypeExtensions": "4.1.0" }, "frameworks": { "netstandard1.5": { diff --git a/build_projects/dotnet-cli-build/CliDependencyVersions.cs b/build_projects/dotnet-cli-build/CliDependencyVersions.cs index c544104b9..c2b8a859b 100644 --- a/build_projects/dotnet-cli-build/CliDependencyVersions.cs +++ b/build_projects/dotnet-cli-build/CliDependencyVersions.cs @@ -7,10 +7,12 @@ namespace Microsoft.DotNet.Cli.Build { public class CliDependencyVersions { - public static readonly string SharedFrameworkVersion = "1.0.0-rc3-004459-00"; - public static readonly string SharedHostVersion = "1.0.1-rc3-004459-00"; + public static readonly string SharedFrameworkVersion = "1.0.0"; + public static readonly string SharedHostVersion = "1.0.1"; + public static readonly string HostFxrVersion = "1.0.1"; public static readonly string SharedFrameworkChannel = "preview"; public static readonly string SharedHostChannel = "preview"; + public static readonly string HostFxrChannel = "preview"; } -} \ No newline at end of file +} diff --git a/build_projects/dotnet-cli-build/DebTargets.cs b/build_projects/dotnet-cli-build/DebTargets.cs index 0fab6aa82..8a362ba6c 100644 --- a/build_projects/dotnet-cli-build/DebTargets.cs +++ b/build_projects/dotnet-cli-build/DebTargets.cs @@ -13,16 +13,25 @@ namespace Microsoft.DotNet.Cli.Build public class DebTargets { [Target(nameof(GenerateSdkDeb))] - [BuildPlatforms(BuildPlatform.Ubuntu, "14.04")] + [BuildPlatforms(BuildPlatform.Ubuntu)] public static BuildTargetResult GenerateDebs(BuildTargetContext c) { return c.Success(); } [Target(nameof(InstallSharedFramework))] - [BuildPlatforms(BuildPlatform.Ubuntu, "14.04")] + [BuildPlatforms(BuildPlatform.Ubuntu)] public static BuildTargetResult GenerateSdkDeb(BuildTargetContext c) { + // Ubuntu 16.04 Jenkins Machines don't have docker or debian package build tools + // So we need to skip this target if the tools aren't present. + // https://github.com/dotnet/core-setup/issues/167 + if (DebuildNotPresent()) + { + c.Info("Debuild not present, skipping target: {nameof(RemovePackages)}"); + return c.Success(); + } + var channel = c.BuildContext.Get("Channel").ToLower(); var packageName = Monikers.GetSdkDebianPackageName(c); var version = c.BuildContext.Get("BuildVersion").NuGetVersion; @@ -61,7 +70,7 @@ namespace Microsoft.DotNet.Cli.Build [Target(nameof(InstallSDK), nameof(RunE2ETest), nameof(RemovePackages))] - [BuildPlatforms(BuildPlatform.Ubuntu, "14.04")] + [BuildPlatforms(BuildPlatform.Ubuntu)] public static BuildTargetResult TestDebInstaller(BuildTargetContext c) { return c.Success(); @@ -70,14 +79,49 @@ namespace Microsoft.DotNet.Cli.Build [Target] public static BuildTargetResult InstallSharedHost(BuildTargetContext c) { + // Ubuntu 16.04 Jenkins Machines don't have docker or debian package build tools + // So we need to skip this target if the tools aren't present. + // https://github.com/dotnet/core-setup/issues/167 + if (DebuildNotPresent()) + { + c.Info("Debuild not present, skipping target: {nameof(RemovePackages)}"); + return c.Success(); + } + InstallPackage(c.BuildContext.Get("SharedHostInstallerFile")); return c.Success(); } - + [Target(nameof(InstallSharedHost))] + public static BuildTargetResult InstallHostFxr(BuildTargetContext c) + { + // Ubuntu 16.04 Jenkins Machines don't have docker or debian package build tools + // So we need to skip this target if the tools aren't present. + // https://github.com/dotnet/core-setup/issues/167 + if (DebuildNotPresent()) + { + c.Info("Debuild not present, skipping target: {nameof(RemovePackages)}"); + return c.Success(); + } + + InstallPackage(c.BuildContext.Get("HostFxrInstallerFile")); + + return c.Success(); + } + + [Target(nameof(InstallHostFxr))] public static BuildTargetResult InstallSharedFramework(BuildTargetContext c) { + // Ubuntu 16.04 Jenkins Machines don't have docker or debian package build tools + // So we need to skip this target if the tools aren't present. + // https://github.com/dotnet/core-setup/issues/167 + if (DebuildNotPresent()) + { + c.Info("Debuild not present, skipping target: {nameof(RemovePackages)}"); + return c.Success(); + } + InstallPackage(c.BuildContext.Get("SharedFrameworkInstallerFile")); return c.Success(); @@ -86,15 +130,33 @@ namespace Microsoft.DotNet.Cli.Build [Target(nameof(InstallSharedFramework))] public static BuildTargetResult InstallSDK(BuildTargetContext c) { + // Ubuntu 16.04 Jenkins Machines don't have docker or debian package build tools + // So we need to skip this target if the tools aren't present. + // https://github.com/dotnet/core-setup/issues/167 + if (DebuildNotPresent()) + { + c.Info("Debuild not present, skipping target: {nameof(RemovePackages)}"); + return c.Success(); + } + InstallPackage(c.BuildContext.Get("SdkInstallerFile")); return c.Success(); } [Target] - [BuildPlatforms(BuildPlatform.Ubuntu, "14.04")] + [BuildPlatforms(BuildPlatform.Ubuntu)] public static BuildTargetResult RunE2ETest(BuildTargetContext c) { + // Ubuntu 16.04 Jenkins Machines don't have docker or debian package build tools + // So we need to skip this target if the tools aren't present. + // https://github.com/dotnet/core-setup/issues/167 + if (DebuildNotPresent()) + { + c.Info("Debuild not present, skipping target: {nameof(RemovePackages)}"); + return c.Success(); + } + Directory.SetCurrentDirectory(Path.Combine(Dirs.RepoRoot, "test", "EndToEnd")); Cmd("dotnet", "build") @@ -111,13 +173,23 @@ namespace Microsoft.DotNet.Cli.Build } [Target] - [BuildPlatforms(BuildPlatform.Ubuntu, "14.04")] + [BuildPlatforms(BuildPlatform.Ubuntu)] public static BuildTargetResult RemovePackages(BuildTargetContext c) { + // Ubuntu 16.04 Jenkins Machines don't have docker or debian package build tools + // So we need to skip this target if the tools aren't present. + // https://github.com/dotnet/core-setup/issues/167 + if (DebuildNotPresent()) + { + c.Info("Debuild not present, skipping target: {nameof(RemovePackages)}"); + return c.Success(); + } + IEnumerable orderedPackageNames = new List() { Monikers.GetSdkDebianPackageName(c), Monikers.GetDebianSharedFrameworkPackageName(CliDependencyVersions.SharedFrameworkVersion), + Monikers.GetDebianHostFxrPackageName(CliDependencyVersions.HostFxrVersion), Monikers.GetDebianSharedHostPackageName(c) }; @@ -142,5 +214,10 @@ namespace Microsoft.DotNet.Cli.Build .Execute() .EnsureSuccessful(); } + + private static bool DebuildNotPresent() + { + return Cmd("/usr/bin/env", "debuild", "-h").Execute().ExitCode != 0; + } } } diff --git a/build_projects/dotnet-cli-build/MsiTargets.cs b/build_projects/dotnet-cli-build/MsiTargets.cs index 0f8610f3d..1e7ee4b21 100644 --- a/build_projects/dotnet-cli-build/MsiTargets.cs +++ b/build_projects/dotnet-cli-build/MsiTargets.cs @@ -29,6 +29,8 @@ namespace Microsoft.DotNet.Cli.Build private static string SdkBundle { get; set; } + private static string HostFxrMsi { get; set; } + private static string SharedHostMsi { get; set; } private static string SharedFrameworkMsi { get; set; } @@ -82,6 +84,7 @@ namespace Microsoft.DotNet.Cli.Build SdkEngine = GetEngineName(SdkBundle); SharedFrameworkMsi = Path.ChangeExtension(c.BuildContext.Get("SharedFrameworkInstallerFile"), "msi"); + HostFxrMsi = Path.ChangeExtension(c.BuildContext.Get("HostFxrInstallerFile"), "msi"); SharedHostMsi = Path.ChangeExtension(c.BuildContext.Get("SharedHostInstallerFile"), "msi"); var buildVersion = c.BuildContext.Get("BuildVersion"); @@ -134,7 +137,7 @@ namespace Microsoft.DotNet.Cli.Build Cmd("powershell", "-NoProfile", "-NoLogo", Path.Combine(Dirs.RepoRoot, "packaging", "windows", "clisdk", "generatebundle.ps1"), - SdkMsi, SharedFrameworkMsi, SharedHostMsi, SdkBundle, WixRoot, cliSdkBrandName, MsiVersion, CliDisplayVersion, CliNugetVersion, upgradeCode, Arch) + SdkMsi, SharedFrameworkMsi, HostFxrMsi, SharedHostMsi, SdkBundle, WixRoot, cliSdkBrandName, MsiVersion, CliDisplayVersion, CliNugetVersion, upgradeCode, Arch) .EnvironmentVariable("Stage2Dir", Dirs.Stage2) .Execute() .EnsureSuccessful(); diff --git a/build_projects/dotnet-cli-build/PackageTargets.cs b/build_projects/dotnet-cli-build/PackageTargets.cs index 20ffe99cd..546c4971e 100644 --- a/build_projects/dotnet-cli-build/PackageTargets.cs +++ b/build_projects/dotnet-cli-build/PackageTargets.cs @@ -13,7 +13,8 @@ namespace Microsoft.DotNet.Cli.Build { public static readonly string[] ProjectsToPack = new string[] { - "dotnet-compile-fsc", + // TODO: https://github.com/dotnet/cli/issues/3558 + // "dotnet-compile-fsc", "Microsoft.DotNet.Cli.Utils", "Microsoft.DotNet.Compiler.Common", "Microsoft.DotNet.Files", diff --git a/build_projects/dotnet-cli-build/PkgTargets.cs b/build_projects/dotnet-cli-build/PkgTargets.cs index ee93dbb22..4f0e5b639 100644 --- a/build_projects/dotnet-cli-build/PkgTargets.cs +++ b/build_projects/dotnet-cli-build/PkgTargets.cs @@ -20,6 +20,7 @@ namespace Microsoft.DotNet.Cli.Build public static string CLISdkComponentId { get; set; } public static string CLISdkPkgId { get; set; } public static string CLISdkNugetVersion { get; set; } + public static string HostFxrComponentId { get; set; } [Target] [BuildPlatforms(BuildPlatform.OSX)] @@ -29,6 +30,7 @@ namespace Microsoft.DotNet.Cli.Build Directory.CreateDirectory(PkgsIntermediateDir); SharedHostComponentId = $"com.microsoft.dotnet.sharedhost.component.osx.x64"; + HostFxrComponentId = $"com.microsoft.dotnet.hostfxr.component.osx.x64"; string sharedFrameworkNugetName = Monikers.SharedFrameworkName; SharedFrameworkNugetVersion = CliDependencyVersions.SharedFrameworkVersion; @@ -59,10 +61,12 @@ namespace Microsoft.DotNet.Cli.Build // Copy SharedFX and host installers in the correct place var sharedFrameworkPkgIntermediatePath = Path.Combine(PkgsIntermediateDir, $"{SharedFxComponentId}.pkg"); var sharedHostPkgIntermediatePath = Path.Combine(PkgsIntermediateDir, $"{SharedHostComponentId}.pkg"); + var hostFxrPkgIntermediatePath = Path.Combine(PkgsIntermediateDir, $"{HostFxrComponentId}.pkg"); + File.Copy(c.BuildContext.Get("SharedFrameworkInstallerFile"), sharedFrameworkPkgIntermediatePath, true); File.Copy(c.BuildContext.Get("SharedHostInstallerFile"), sharedHostPkgIntermediatePath, true); - + File.Copy(c.BuildContext.Get("HostFxrInstallerFile"), hostFxrPkgIntermediatePath, true); string inputDistTemplatePath = Path.Combine( Dirs.RepoRoot, @@ -75,11 +79,13 @@ namespace Microsoft.DotNet.Cli.Build string formattedDistContents = distTemplate.Replace("{SharedFxComponentId}", SharedFxComponentId) .Replace("{SharedHostComponentId}", SharedHostComponentId) + .Replace("{HostFxrComponentId}", HostFxrComponentId) .Replace("{CLISdkComponentId}", CLISdkComponentId) .Replace("{CLISdkNugetVersion}", CLISdkNugetVersion) .Replace("{CLISdkBrandName}", Monikers.CLISdkBrandName) .Replace("{SharedFxBrandName}", Monikers.SharedFxBrandName) - .Replace("{SharedHostBrandName}", Monikers.SharedHostBrandName); + .Replace("{SharedHostBrandName}", Monikers.SharedHostBrandName) + .Replace("{HostFxrBrandName}", Monikers.HostFxrBrandName); File.WriteAllText(distributionPath, formattedDistContents); Cmd("productbuild", diff --git a/build_projects/dotnet-cli-build/PrepareTargets.cs b/build_projects/dotnet-cli-build/PrepareTargets.cs index 98c776947..5e6b94854 100644 --- a/build_projects/dotnet-cli-build/PrepareTargets.cs +++ b/build_projects/dotnet-cli-build/PrepareTargets.cs @@ -141,6 +141,7 @@ namespace Microsoft.DotNet.Cli.Build var cliVersion = c.BuildContext.Get("BuildVersion").NuGetVersion; var sharedFrameworkVersion = CliDependencyVersions.SharedFrameworkVersion; var hostVersion = CliDependencyVersions.SharedHostVersion; + var hostFxrVersion = CliDependencyVersions.HostFxrVersion; // Generated Installers + Archives AddInstallerArtifactToContext(c, "dotnet-sdk", "Sdk", cliVersion); @@ -150,6 +151,7 @@ namespace Microsoft.DotNet.Cli.Build //Downloaded Installers + Archives AddInstallerArtifactToContext(c, "dotnet-host", "SharedHost", hostVersion); + AddInstallerArtifactToContext(c, "dotnet-hostfxr", "HostFxr", hostFxrVersion); AddInstallerArtifactToContext(c, "dotnet-sharedframework", "SharedFramework", sharedFrameworkVersion); AddInstallerArtifactToContext(c, "dotnet", "CombinedFrameworkHost", sharedFrameworkVersion); @@ -207,22 +209,21 @@ 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; + var hostFxrVersion = CliDependencyVersions.HostFxrVersion; var sharedFrameworkChannel = CliDependencyVersions.SharedFrameworkChannel; var sharedHostChannel = CliDependencyVersions.SharedHostChannel; + var hostFxrChannel = CliDependencyVersions.HostFxrChannel; var sharedFrameworkInstallerDownloadFile = Path.Combine(CliDirs.CoreSetupDownload, "sharedFrameworkInstaller"); var sharedHostInstallerDownloadFile = Path.Combine(CliDirs.CoreSetupDownload, "sharedHostInstaller"); + var hostFxrInstallerDownloadFile = Path.Combine(CliDirs.CoreSetupDownload, "hostFxrInstaller"); Mkdirp(Path.GetDirectoryName(sharedFrameworkInstallerDownloadFile)); Mkdirp(Path.GetDirectoryName(sharedHostInstallerDownloadFile)); + Mkdirp(Path.GetDirectoryName(hostFxrInstallerDownloadFile)); if ( ! File.Exists(sharedFrameworkInstallerDownloadFile)) { @@ -254,6 +255,21 @@ namespace Microsoft.DotNet.Cli.Build File.Copy(sharedHostInstallerDownloadFile, sharedHostInstallerDestinationFile, true); } + if ( ! File.Exists(hostFxrInstallerDownloadFile)) + { + var hostFxrInstallerDestinationFile = c.BuildContext.Get("HostFxrInstallerFile"); + Mkdirp(Path.GetDirectoryName(hostFxrInstallerDestinationFile)); + + AzurePublisher.DownloadFile( + AzurePublisher.CalculateInstallerBlob( + hostFxrInstallerDestinationFile, + hostFxrChannel, + hostFxrVersion), + hostFxrInstallerDownloadFile).Wait(); + + File.Copy(hostFxrInstallerDownloadFile, hostFxrInstallerDestinationFile, true); + } + return c.Success(); } diff --git a/build_projects/dotnet-cli-build/PublishTargets.cs b/build_projects/dotnet-cli-build/PublishTargets.cs index 984ae2840..6c367534f 100644 --- a/build_projects/dotnet-cli-build/PublishTargets.cs +++ b/build_projects/dotnet-cli-build/PublishTargets.cs @@ -196,7 +196,7 @@ namespace Microsoft.DotNet.Cli.Build [Target( nameof(PublishSdkDebToDebianRepo))] - [BuildPlatforms(BuildPlatform.Ubuntu, "14.04")] + [BuildPlatforms(BuildPlatform.Ubuntu)] public static BuildTargetResult PublishDebFilesToDebianRepo(BuildTargetContext c) { return c.Success(); @@ -212,7 +212,7 @@ namespace Microsoft.DotNet.Cli.Build } [Target] - [BuildPlatforms(BuildPlatform.Ubuntu, "14.04")] + [BuildPlatforms(BuildPlatform.Ubuntu)] public static BuildTargetResult PublishSdkInstallerFileToAzure(BuildTargetContext c) { var version = CliNuGetVersion; @@ -270,7 +270,7 @@ namespace Microsoft.DotNet.Cli.Build } [Target] - [BuildPlatforms(BuildPlatform.Ubuntu, "14.04")] + [BuildPlatforms(BuildPlatform.Ubuntu)] public static BuildTargetResult PublishSdkDebToDebianRepo(BuildTargetContext c) { var version = CliNuGetVersion; diff --git a/build_projects/dotnet-cli-build/TestTargets.cs b/build_projects/dotnet-cli-build/TestTargets.cs index 2c3a9c394..413f411a4 100644 --- a/build_projects/dotnet-cli-build/TestTargets.cs +++ b/build_projects/dotnet-cli-build/TestTargets.cs @@ -24,7 +24,8 @@ namespace Microsoft.DotNet.Cli.Build "dotnet-build.Tests", "dotnet-compile.Tests", "dotnet-compile.UnitTests", - "dotnet-compile-fsc.Tests", + // TODO: https://github.com/dotnet/cli/issues/3558 + // "dotnet-compile-fsc.Tests", "dotnet-new.Tests", "dotnet-pack.Tests", "dotnet-projectmodel-server.Tests", diff --git a/build_projects/dotnet-cli-build/build.ps1 b/build_projects/dotnet-cli-build/build.ps1 index 73f5f5e9d..8094ed22c 100644 --- a/build_projects/dotnet-cli-build/build.ps1 +++ b/build_projects/dotnet-cli-build/build.ps1 @@ -10,6 +10,21 @@ param( [switch]$NoPackage, [switch]$Help) +function RemoveDirectory([string] $path) +{ + if (Test-Path $path) + { + Remove-Item $path -Recurse -Force + } +} + +function CleanNuGet() +{ + RemoveDirectory($env:LocalAppData + "\NuGet\Cache") + RemoveDirectory($env:LocalAppData + "\NuGet\v3-cache") + RemoveDirectory($env:NUGET_PACKAGES) +} + if($Help) { Write-Host "Usage: .\build.ps1 [-Configuration ] [-NoPackage] [-Help] [-Targets ]" @@ -63,6 +78,12 @@ if($LASTEXITCODE -ne 0) { throw "Failed to install stage0" } # Put the stage0 on the path $env:PATH = "$env:DOTNET_INSTALL_DIR;$env:PATH" +# Ensure clean package folder and caches +CleanNuGet + +# Disable first run since we want to control all package sources +$env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 + # Restore the build scripts Write-Host "Restoring Build Script projects..." pushd "$PSScriptRoot\.." diff --git a/build_projects/dotnet-cli-build/build.sh b/build_projects/dotnet-cli-build/build.sh index 2ec1a8a24..77fd912ca 100755 --- a/build_projects/dotnet-cli-build/build.sh +++ b/build_projects/dotnet-cli-build/build.sh @@ -101,6 +101,14 @@ then ulimit -n 1024 fi +# Clean old NuGet packages +rm -rf "$HOME/.local/share/NuGet/Cache" +rm -rf "$HOME/.local/share/NuGet/v3-cache" +rm -rf "$NUGET_PACKAGES" + +# Disable first run since we want to control all package sources +export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 + # Restore the build scripts echo "Restoring Build Script projects..." ( diff --git a/build_projects/dotnet-cli-build/project.json b/build_projects/dotnet-cli-build/project.json index 479b8fa45..ff78d04ec 100644 --- a/build_projects/dotnet-cli-build/project.json +++ b/build_projects/dotnet-cli-build/project.json @@ -5,15 +5,15 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-10", - "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24210-10", - "Microsoft.CSharp": "4.0.1-rc3-24210-10", - "System.Dynamic.Runtime": "4.0.11-rc3-24210-10", - "System.Reflection.Metadata": "1.3.0-rc3-24210-10", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", - "System.Xml.XmlSerializer": "4.0.11-rc3-24210-10", + "NETStandard.Library": "1.6.0", + "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2", + "Microsoft.CSharp": "4.0.1", + "System.Dynamic.Runtime": "4.0.11", + "System.Reflection.Metadata": "1.3.0", + "System.Runtime.Serialization.Primitives": "4.1.1", + "System.Xml.XmlSerializer": "4.0.11", "WindowsAzure.Storage": "6.2.2-preview", - "NuGet.CommandLine.XPlat": "3.5.0-beta2-1480", + "NuGet.CommandLine.XPlat": "3.5.0-beta2-1484", "Microsoft.DotNet.Cli.Build.Framework": { "target": "project" }, diff --git a/build_projects/shared-build-targets-utils/DependencyVersions.cs b/build_projects/shared-build-targets-utils/DependencyVersions.cs index 0f1bd9cde..2a43aa7f8 100644 --- a/build_projects/shared-build-targets-utils/DependencyVersions.cs +++ b/build_projects/shared-build-targets-utils/DependencyVersions.cs @@ -7,7 +7,7 @@ namespace Microsoft.DotNet.Cli.Build { public class DependencyVersions { - public static readonly string CoreCLRVersion = "1.0.2-rc3-24210-10"; - public static readonly string JitVersion = "1.0.2-rc3-24210-10"; + public static readonly string CoreCLRVersion = "1.0.2"; + public static readonly string JitVersion = "1.0.2"; } } diff --git a/build_projects/shared-build-targets-utils/Utils/Monikers.cs b/build_projects/shared-build-targets-utils/Utils/Monikers.cs index 5358e1ad9..b9f8ef2d5 100644 --- a/build_projects/shared-build-targets-utils/Utils/Monikers.cs +++ b/build_projects/shared-build-targets-utils/Utils/Monikers.cs @@ -13,6 +13,7 @@ namespace Microsoft.DotNet.Cli.Build public const string CLISdkBrandName = "Microsoft .NET Core 1.0.0 - SDK Preview 2"; public const string SharedFxBrandName = "Microsoft .NET Core 1.0.0 - Runtime"; public const string SharedHostBrandName = "Microsoft .NET Core 1.0.0 - Host"; + public const string HostFxrBrandName = "Microsoft .NET Core 1.0.0 - Host FX Resolver"; public static string GetProductMoniker(BuildTargetContext c, string artifactPrefix, string version) { @@ -45,29 +46,6 @@ namespace Microsoft.DotNet.Cli.Build return $"{CurrentPlatform.Current}_{CurrentArchitecture.Current}"; } - public static string GetDebianPackageName(BuildTargetContext c) - { - var channel = c.BuildContext.Get("Channel").ToLower(); - var packageName = ""; - switch (channel) - { - case "dev": - packageName = "dotnet-nightly"; - break; - case "beta": - case "rc1": - case "rc2": - case "preview": - case "rtm": - packageName = "dotnet"; - break; - default: - throw new Exception($"Unknown channel - {channel}"); - } - - return packageName; - } - public static string GetSdkDebianPackageName(BuildTargetContext c) { var channel = c.BuildContext.Get("Channel").ToLower(); @@ -93,6 +71,11 @@ namespace Microsoft.DotNet.Cli.Build return $"{packagePrefix}-dev-{nugetVersion}"; } + public static string GetDebianHostFxrPackageName(string hostFxrNugetVersion) + { + return $"dotnet-hostfxr-{hostFxrNugetVersion}".ToLower(); + } + public static string GetDebianSharedFrameworkPackageName(string sharedFrameworkNugetVersion) { return $"dotnet-sharedframework-{SharedFrameworkName}-{sharedFrameworkNugetVersion}".ToLower(); diff --git a/build_projects/shared-build-targets-utils/project.json b/build_projects/shared-build-targets-utils/project.json index 47212f8e8..7ccbe17cb 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-24210-10", - "Microsoft.CSharp": "4.0.1-rc3-24210-10", - "System.Dynamic.Runtime": "4.0.11-rc3-24210-10", - "System.Reflection.Metadata": "1.3.0-rc3-24210-10", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", - "System.Xml.XmlSerializer": "4.0.11-rc3-24210-10", + "NETStandard.Library": "1.6.0", + "Microsoft.CSharp": "4.0.1", + "System.Dynamic.Runtime": "4.0.11", + "System.Reflection.Metadata": "1.3.0", + "System.Runtime.Serialization.Primitives": "4.1.1", + "System.Xml.XmlSerializer": "4.0.11", "WindowsAzure.Storage": "6.2.2-preview", "Microsoft.DotNet.Cli.Build.Framework": { "target": "project" diff --git a/build_projects/update-dependencies/UpdateFilesTargets.cs b/build_projects/update-dependencies/UpdateFilesTargets.cs index 1156c0b2e..9a0c3053c 100644 --- a/build_projects/update-dependencies/UpdateFilesTargets.cs +++ b/build_projects/update-dependencies/UpdateFilesTargets.cs @@ -221,6 +221,7 @@ namespace Microsoft.DotNet.Scripts ReplaceFileContents(@"build_projects\dotnet-cli-build\CliDependencyVersions.cs", fileContents => { fileContents = ReplaceDependencyVersion(c, fileContents, "SharedFrameworkVersion", "Microsoft.NETCore.App"); + fileContents = ReplaceDependencyVersion(c, fileContents, "HostFxrVersion", "Microsoft.NETCore.DotNetHostResolver"); fileContents = ReplaceDependencyVersion(c, fileContents, "SharedHostVersion", "Microsoft.NETCore.DotNetHost"); return fileContents; diff --git a/build_projects/update-dependencies/project.json b/build_projects/update-dependencies/project.json index eab57b07e..9c9d79edf 100644 --- a/build_projects/update-dependencies/project.json +++ b/build_projects/update-dependencies/project.json @@ -5,15 +5,15 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-10", - "Microsoft.CSharp": "4.0.1-rc3-24210-10", - "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24210-10", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", + "NETStandard.Library": "1.6.0", + "Microsoft.CSharp": "4.0.1", + "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2", + "System.Runtime.Serialization.Primitives": "4.1.1", "Microsoft.DotNet.Cli.Build.Framework": { "target": "project" }, - "NuGet.Versioning": "3.5.0-beta2-1480", - "Newtonsoft.Json": "9.0.1-beta1", + "NuGet.Versioning": "3.5.0-beta2-1484", + "Newtonsoft.Json": "9.0.1", "Octokit": "0.18.0", "Microsoft.Net.Http": "2.2.29" }, diff --git a/packaging/osx/clisdk/Distribution-Template b/packaging/osx/clisdk/Distribution-Template index 8ec9b852a..d70c70cc4 100644 --- a/packaging/osx/clisdk/Distribution-Template +++ b/packaging/osx/clisdk/Distribution-Template @@ -15,12 +15,16 @@ + + + + @@ -28,6 +32,7 @@ {SharedFxComponentId}.pkg + {HostFxrComponentId}.pkg {SharedHostComponentId}.pkg {CLISdkComponentId}.pkg diff --git a/packaging/windows/clisdk/bundle.wxs b/packaging/windows/clisdk/bundle.wxs index 4b0bf8577..1ab894dd5 100644 --- a/packaging/windows/clisdk/bundle.wxs +++ b/packaging/windows/clisdk/bundle.wxs @@ -49,6 +49,9 @@ + + + diff --git a/packaging/windows/clisdk/generatebundle.ps1 b/packaging/windows/clisdk/generatebundle.ps1 index fd8084247..948caed91 100644 --- a/packaging/windows/clisdk/generatebundle.ps1 +++ b/packaging/windows/clisdk/generatebundle.ps1 @@ -4,6 +4,7 @@ param( [Parameter(Mandatory=$true)][string]$CLISDKMSIFile, [Parameter(Mandatory=$true)][string]$SharedFxMSIFile, + [Parameter(Mandatory=$true)][string]$HostFxrMSIFile, [Parameter(Mandatory=$true)][string]$SharedHostMSIFile, [Parameter(Mandatory=$true)][string]$DotnetBundleOutput, [Parameter(Mandatory=$true)][string]$WixRoot, @@ -36,6 +37,7 @@ function RunCandleForBundle -dCLISDKMsiSourcePath="$CLISDKMSIFile" ` -dUpgradeCode="$UpgradeCode" ` -dSharedFXMsiSourcePath="$SharedFxMSIFile" ` + -dHostFXRMsiSourcePath="$HostFxrMSIFile" ` -dSharedHostMsiSourcePath="$SharedHostMSIFile" ` -arch "$Architecture" ` -ext WixBalExtension.dll ` diff --git a/scripts/docker/ubuntu.16.04/Dockerfile b/scripts/docker/ubuntu.16.04/Dockerfile index a101e49ba..fa7cf4ccc 100644 --- a/scripts/docker/ubuntu.16.04/Dockerfile +++ b/scripts/docker/ubuntu.16.04/Dockerfile @@ -28,7 +28,8 @@ RUN apt-get install -y libunwind8 \ liblttng-ust0 \ libssl1.0.0 \ zlib1g \ - libuuid1 && \ + libuuid1 \ + liblldb-3.6 && \ apt-get clean # Setup User to match Host User, and give superuser permissions diff --git a/src/Microsoft.DotNet.Archive/project.json b/src/Microsoft.DotNet.Archive/project.json index 564b171cf..b5a9fe4d6 100644 --- a/src/Microsoft.DotNet.Archive/project.json +++ b/src/Microsoft.DotNet.Archive/project.json @@ -5,8 +5,8 @@ }, "description": "Archive and compression types.", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24201-00", - "System.Linq.Parallel": "4.0.1-rc3-24201-00" + "NETStandard.Library": "1.6.0", + "System.Linq.Parallel": "4.0.1" }, "frameworks": { "netstandard1.3": {} diff --git a/src/Microsoft.DotNet.Cli.Utils/project.json b/src/Microsoft.DotNet.Cli.Utils/project.json index 2bd0ad701..f5d94d1d1 100644 --- a/src/Microsoft.DotNet.Cli.Utils/project.json +++ b/src/Microsoft.DotNet.Cli.Utils/project.json @@ -8,10 +8,10 @@ "Microsoft.DotNet.ProjectModel": { "target": "project" }, - "NuGet.Versioning": "3.5.0-beta2-1480", - "NuGet.Packaging": "3.5.0-beta2-1480", - "NuGet.Frameworks": "3.5.0-beta2-1480", - "NuGet.ProjectModel": "3.5.0-beta2-1480" + "NuGet.Versioning": "3.5.0-beta2-1484", + "NuGet.Packaging": "3.5.0-beta2-1484", + "NuGet.Frameworks": "3.5.0-beta2-1484", + "NuGet.ProjectModel": "3.5.0-beta2-1484" }, "frameworks": { "net451": { @@ -26,7 +26,7 @@ "portable-net45+wp80+win8+wpa81+dnxcore50" ], "dependencies": { - "System.Diagnostics.Process": "4.1.0-rc3-24210-10" + "System.Diagnostics.Process": "4.1.0" } } } diff --git a/src/Microsoft.DotNet.Compiler.Common/project.json b/src/Microsoft.DotNet.Compiler.Common/project.json index 6a465f630..f417afaee 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-20160610-04", + "Microsoft.CodeAnalysis.CSharp": "1.3.0", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/src/Microsoft.DotNet.Files/project.json b/src/Microsoft.DotNet.Files/project.json index 41065305c..d0fd8d083 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-24210-10" + "System.Linq.Expressions": "4.1.0" }, "frameworks": { "net451": { diff --git a/src/Microsoft.DotNet.InternalAbstractions/project.json b/src/Microsoft.DotNet.InternalAbstractions/project.json index ed8a8a11a..df3817ea1 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-24210-10", - "System.Collections": "4.0.11-rc3-24210-10", - "System.IO": "4.1.0-rc3-24210-10", - "System.IO.FileSystem": "4.0.1-rc3-24210-10", - "System.Reflection.TypeExtensions": "4.1.0-rc3-24210-10", - "System.Runtime.Extensions": "4.1.0-rc3-24210-10", - "System.Runtime.InteropServices": "4.1.0-rc3-24210-10", - "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc3-24210-10" + "System.AppContext": "4.1.0", + "System.Collections": "4.0.11", + "System.IO": "4.1.0", + "System.IO.FileSystem": "4.0.1", + "System.Reflection.TypeExtensions": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Runtime.InteropServices": "4.1.0", + "System.Runtime.InteropServices.RuntimeInformation": "4.0.0" } } }, diff --git a/src/Microsoft.DotNet.ProjectModel.Loader/project.json b/src/Microsoft.DotNet.ProjectModel.Loader/project.json index 88d1d7f7c..bec315e14 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-24210-10" + "System.Runtime.Loader": "4.0.0" }, "frameworks": { "netstandard1.6": { diff --git a/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json b/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json index ed0a7b253..b89e236d9 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-20160610-04" + "Microsoft.CodeAnalysis.CSharp.Workspaces": "1.3.0" }, "frameworks": { "net451": { diff --git a/src/Microsoft.DotNet.ProjectModel/project.json b/src/Microsoft.DotNet.ProjectModel/project.json index bf867fffa..bc2e35fc7 100644 --- a/src/Microsoft.DotNet.ProjectModel/project.json +++ b/src/Microsoft.DotNet.ProjectModel/project.json @@ -8,10 +8,10 @@ "Microsoft.Extensions.DependencyModel": { "target": "project" }, - "Newtonsoft.Json": "9.0.1-beta1", - "NuGet.Packaging": "3.5.0-beta2-1480", - "NuGet.RuntimeModel": "3.5.0-beta2-1480", - "System.Reflection.Metadata": "1.3.0-rc3-24210-10" + "Newtonsoft.Json": "9.0.1", + "NuGet.Packaging": "3.5.0-beta2-1484", + "NuGet.RuntimeModel": "3.5.0-beta2-1484", + "System.Reflection.Metadata": "1.3.0" }, "frameworks": { "net451": { @@ -33,13 +33,13 @@ "dotnet5.4" ], "dependencies": { - "Microsoft.CSharp": "4.0.1-rc3-24210-10", - "System.Dynamic.Runtime": "4.0.11-rc3-24210-10", - "System.Runtime.Loader": "4.0.0-rc3-24210-10", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", - "System.Security.Cryptography.Algorithms": "4.2.0-rc3-24210-10", - "System.Threading.Thread": "4.0.0-rc3-24210-10", - "System.Xml.XDocument": "4.0.11-rc3-24210-10" + "Microsoft.CSharp": "4.0.1", + "System.Dynamic.Runtime": "4.0.11", + "System.Runtime.Loader": "4.0.0", + "System.Runtime.Serialization.Primitives": "4.1.1", + "System.Security.Cryptography.Algorithms": "4.2.0", + "System.Threading.Thread": "4.0.0", + "System.Xml.XDocument": "4.0.11" } } } diff --git a/src/Microsoft.Extensions.DependencyModel/project.json b/src/Microsoft.Extensions.DependencyModel/project.json index 228b15c74..cdaa04b26 100644 --- a/src/Microsoft.Extensions.DependencyModel/project.json +++ b/src/Microsoft.Extensions.DependencyModel/project.json @@ -9,16 +9,16 @@ "Microsoft.DotNet.InternalAbstractions": { "target": "project" }, - "Newtonsoft.Json": "9.0.1-beta1" + "Newtonsoft.Json": "9.0.1" }, "frameworks": { "net451": {}, "netstandard1.6": { "imports": "portable-net45+wp80+win8+wpa81+dnxcore50", "dependencies": { - "System.Diagnostics.Debug": "4.0.11-rc3-24210-10", - "System.Dynamic.Runtime": "4.0.11-rc3-24210-10", - "System.Linq": "4.1.0-rc3-24210-10" + "System.Diagnostics.Debug": "4.0.11", + "System.Dynamic.Runtime": "4.0.11", + "System.Linq": "4.1.0" } } }, diff --git a/src/Microsoft.Extensions.Testing.Abstractions/project.json b/src/Microsoft.Extensions.Testing.Abstractions/project.json index 7d4c3bba9..7fa46aded 100644 --- a/src/Microsoft.Extensions.Testing.Abstractions/project.json +++ b/src/Microsoft.Extensions.Testing.Abstractions/project.json @@ -7,7 +7,7 @@ "keyFile": "../../tools/Key.snk" }, "dependencies": { - "Newtonsoft.Json": "9.0.1-beta1", + "Newtonsoft.Json": "9.0.1", "Microsoft.DotNet.ProjectModel": { "target": "project" }, @@ -22,8 +22,8 @@ "portable-net45+win8" ], "dependencies": { - "System.Resources.ResourceManager": "4.0.1-rc3-24210-10", - "System.Reflection.TypeExtensions": "4.1.0-rc3-24210-10" + "System.Resources.ResourceManager": "4.0.1", + "System.Reflection.TypeExtensions": "4.1.0" } } }, diff --git a/src/compilers/project.json b/src/compilers/project.json index dbce8408e..b2b6ed1b8 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-004459-00" + "version": "1.0.0" }, - "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160610-04", - "Microsoft.Net.Compilers.netcore": "1.3.0-beta1-20160610-04", + "Microsoft.CodeAnalysis.CSharp": "1.3.0", + "Microsoft.Net.Compilers.netcore": "1.3.0", "Microsoft.DiaSymReader.Native": "1.4.0-rc2" }, "frameworks": { diff --git a/src/dotnet-archive/project.json b/src/dotnet-archive/project.json index b4f4bcceb..cbd69d99f 100644 --- a/src/dotnet-archive/project.json +++ b/src/dotnet-archive/project.json @@ -14,7 +14,7 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0" } }, "frameworks": { diff --git a/src/dotnet-compile-fsc/project.json b/src/dotnet-compile-fsc/project.json index b1cbf583b..1316b760b 100644 --- a/src/dotnet-compile-fsc/project.json +++ b/src/dotnet-compile-fsc/project.json @@ -12,7 +12,7 @@ } }, "dependencies": { - "Microsoft.FSharp.Compiler.netcore": "1.0.0-alpha-160318", + "Microsoft.FSharp.Compiler.netcore": "1.0.0-alpha-160509", "Microsoft.DotNet.ProjectModel": { "target": "project" }, @@ -24,7 +24,7 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" } }, "frameworks": { diff --git a/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template b/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template index 85f2831fc..ce67b3a46 100644 --- a/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template +++ b/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template @@ -10,7 +10,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" } }, "imports": "dnxcore50" diff --git a/src/dotnet/commands/dotnet-new/CSharp_Lib/project.json.template b/src/dotnet/commands/dotnet-new/CSharp_Lib/project.json.template index a4b0be834..6f1ec549e 100644 --- a/src/dotnet/commands/dotnet-new/CSharp_Lib/project.json.template +++ b/src/dotnet/commands/dotnet-new/CSharp_Lib/project.json.template @@ -3,12 +3,11 @@ "buildOptions": { "debugType": "portable" }, - "dependencies": { - }, + "dependencies": {}, "frameworks": { "netstandard1.6": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-06" + "NETStandard.Library": "1.6.0" } } } diff --git a/src/dotnet/commands/dotnet-new/CSharp_xunittest/project.json.template b/src/dotnet/commands/dotnet-new/CSharp_xunittest/project.json.template index 1ad68b4a7..eb7568bbe 100644 --- a/src/dotnet/commands/dotnet-new/CSharp_xunittest/project.json.template +++ b/src/dotnet/commands/dotnet-new/CSharp_xunittest/project.json.template @@ -4,7 +4,7 @@ "debugType": "portable" }, "dependencies": { - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", + "System.Runtime.Serialization.Primitives": "4.1.1", "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-rc2-192208-24" }, @@ -14,7 +14,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" } }, "imports": [ 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 91d768c92..f2c366a2a 100644 --- a/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template +++ b/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template @@ -14,7 +14,7 @@ }, "tools": { "dotnet-compile-fsc": { - "version": "1.0.0-*", + "version": "1.0.0-preview2-*", "imports": [ "dnxcore50", "portable-net45+win81", @@ -27,7 +27,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" } }, "imports": [ diff --git a/src/dotnet/project.json b/src/dotnet/project.json index ce7ff392b..b832a23c1 100644 --- a/src/dotnet/project.json +++ b/src/dotnet/project.json @@ -23,13 +23,13 @@ }, "dependencies": { "NuGet.Commands": { - "version": "3.5.0-beta2-1480", + "version": "3.5.0-beta2-1484", "exclude": "compile" }, - "NuGet.CommandLine.XPlat": "3.5.0-beta2-1480", - "Newtonsoft.Json": "9.0.1-beta1", - "System.Text.Encoding.CodePages": "4.0.1-rc3-24210-10", - "System.Diagnostics.FileVersionInfo": "4.0.0-rc3-24210-10", + "NuGet.CommandLine.XPlat": "3.5.0-beta2-1484", + "Newtonsoft.Json": "9.0.1", + "System.Text.Encoding.CodePages": "4.0.1", + "System.Diagnostics.FileVersionInfo": "4.0.0", "Microsoft.ApplicationInsights": "2.0.0", "Microsoft.DotNet.ProjectModel": { "target": "project" @@ -48,16 +48,16 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" }, - "System.Diagnostics.TraceSource": "4.0.0-rc3-24210-10", - "System.Diagnostics.TextWriterTraceListener": "4.0.0-rc3-24210-10", - "System.Resources.Writer": "4.0.0-rc3-24210-10", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", - "System.Private.DataContractSerialization": "4.1.1-rc3-24210-10", - "System.Text.RegularExpressions": "4.1.0-rc3-24210-10", + "System.Diagnostics.TraceSource": "4.0.0", + "System.Diagnostics.TextWriterTraceListener": "4.0.0", + "System.Resources.Writer": "4.0.0", + "System.Runtime.Serialization.Primitives": "4.1.1", + "System.Private.DataContractSerialization": "4.1.1", + "System.Text.RegularExpressions": "4.1.0", "Microsoft.Win32.Registry": { - "version": "4.0.0-rc3-24210-10", + "version": "4.0.0", "exclude": "compile" } }, diff --git a/test/ArgumentForwardingTests/project.json b/test/ArgumentForwardingTests/project.json index a391c9e5c..0e64842fd 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-004459-00" + "version": "1.0.0" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", + "System.Runtime.Serialization.Primitives": "4.1.1", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/ArgumentsReflector/project.json b/test/ArgumentsReflector/project.json index 88b1ba720..c80d2d28b 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-004459-00" + "version": "1.0.0" } }, "frameworks": { diff --git a/test/EndToEnd/project.json b/test/EndToEnd/project.json index 8a911c5ab..f03e5cce3 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-004459-00" + "version": "1.0.0" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", + "System.Runtime.Serialization.Primitives": "4.1.1", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/Kestrel.Tests/project.json b/test/Kestrel.Tests/project.json index b8875c599..74a7a577e 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-004459-00" + "version": "1.0.0" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", + "System.Runtime.Serialization.Primitives": "4.1.1", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json index 88c497746..e039ceef3 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json @@ -16,14 +16,14 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" }, - "System.Diagnostics.TraceSource": "4.0.0-rc3-24210-10", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", - "NuGet.Versioning": "3.5.0-beta2-1480", - "NuGet.Packaging": "3.5.0-beta2-1480", - "NuGet.Frameworks": "3.5.0-beta2-1480", - "NuGet.ProjectModel": "3.5.0-beta2-1480", + "System.Diagnostics.TraceSource": "4.0.0", + "System.Runtime.Serialization.Primitives": "4.1.1", + "NuGet.Versioning": "3.5.0-beta2-1484", + "NuGet.Packaging": "3.5.0-beta2-1484", + "NuGet.Frameworks": "3.5.0-beta2-1484", + "NuGet.ProjectModel": "3.5.0-beta2-1484", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/Microsoft.DotNet.Compiler.Common.Tests/project.json b/test/Microsoft.DotNet.Compiler.Common.Tests/project.json index 9bdddafa7..957e27589 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-004459-00" + "version": "1.0.0" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", + "System.Runtime.Serialization.Primitives": "4.1.1", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/Microsoft.DotNet.Configurer.UnitTests/project.json b/test/Microsoft.DotNet.Configurer.UnitTests/project.json index 2eaaf6fa0..7ec1fe263 100644 --- a/test/Microsoft.DotNet.Configurer.UnitTests/project.json +++ b/test/Microsoft.DotNet.Configurer.UnitTests/project.json @@ -6,9 +6,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0" }, - "System.Diagnostics.TraceSource": "4.0.0-rc3-24131-00", + "System.Diagnostics.TraceSource": "4.0.0", "Microsoft.DotNet.Configurer": { "target": "project" }, diff --git a/test/Microsoft.DotNet.ProjectModel.Loader.Tests/project.json b/test/Microsoft.DotNet.ProjectModel.Loader.Tests/project.json index 9458181ef..92cb2447f 100644 --- a/test/Microsoft.DotNet.ProjectModel.Loader.Tests/project.json +++ b/test/Microsoft.DotNet.ProjectModel.Loader.Tests/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" }, "Microsoft.DotNet.ProjectModel.Loader": { "target": "project" diff --git a/test/Microsoft.DotNet.ProjectModel.Tests/project.json b/test/Microsoft.DotNet.ProjectModel.Tests/project.json index b7e04fb6c..83f4d79ed 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-004459-00" + "version": "1.0.0" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", + "System.Runtime.Serialization.Primitives": "4.1.1", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/Microsoft.Extensions.DependencyModel.Tests/project.json b/test/Microsoft.Extensions.DependencyModel.Tests/project.json index adfcf366d..2a88f7308 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-004459-00" + "version": "1.0.0" }, - "System.Diagnostics.TraceSource": "4.0.0-rc3-24210-10", + "System.Diagnostics.TraceSource": "4.0.0", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/Performance/project.json b/test/Performance/project.json index 3c79d334f..5eb477030 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-004459-00" + "version": "1.0.0" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", + "System.Runtime.Serialization.Primitives": "4.1.1", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/ScriptExecutorTests/project.json b/test/ScriptExecutorTests/project.json index a184d35c6..4bf28a4f4 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-004459-00" + "version": "1.0.0" }, "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 5ab96fa2e..b71c3c37e 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-004459-00" + "version": "1.0.0" }, "Microsoft.Extensions.Testing.Abstractions": { "target": "project" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", + "System.Runtime.Serialization.Primitives": "4.1.1", "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 c12bbd674..0469b5ce0 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-004459-00" + "version": "1.0.0" }, "Microsoft.Extensions.Testing.Abstractions": { "target": "project" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", - "System.Diagnostics.Process": "4.1.0-rc3-24210-10", + "System.Runtime.Serialization.Primitives": "4.1.1", + "System.Diagnostics.Process": "4.1.0", "TestAppWithPortablePdbs": { "target": "project" }, diff --git a/test/TestingAbstractions/TestAppWithFullPdbs/project.json b/test/TestingAbstractions/TestAppWithFullPdbs/project.json index 47e1d65d8..b599ab10e 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-24210-10" + "NETStandard.Library": "1.6.0" }, "frameworks": { "netstandard1.5": {} diff --git a/test/TestingAbstractions/TestAppWithPortablePdbs/project.json b/test/TestingAbstractions/TestAppWithPortablePdbs/project.json index 2a6dd8615..e39fdbcc7 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-24210-10" + "NETStandard.Library": "1.6.0" }, "frameworks": { "netstandard1.5": {} diff --git a/test/binding-redirects.Tests/project.json b/test/binding-redirects.Tests/project.json index eb0b4c069..92ef38bb0 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-24210-10", + "Microsoft.NETCore.Platforms": "1.0.1", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" } diff --git a/test/crossgen.Tests/project.json b/test/crossgen.Tests/project.json index b5c21fcd0..0ac5ff6e9 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-004459-00" + "version": "1.0.0" }, "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" diff --git a/test/dotnet-build.Tests/project.json b/test/dotnet-build.Tests/project.json index a2387b9d8..7da2ca9b7 100644 --- a/test/dotnet-build.Tests/project.json +++ b/test/dotnet-build.Tests/project.json @@ -3,16 +3,16 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", + "System.Runtime.Serialization.Primitives": "4.1.1", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, "Microsoft.DotNet.Cli.Utils": { "target": "project" }, - "Newtonsoft.Json": "9.0.1-beta1", + "Newtonsoft.Json": "9.0.1", "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-rc2-192208-24" }, diff --git a/test/dotnet-compile-fsc.Tests/project.json b/test/dotnet-compile-fsc.Tests/project.json index c9d3584e4..9079e8c82 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-004459-00" + "version": "1.0.0" }, "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" diff --git a/test/dotnet-compile.Tests/project.json b/test/dotnet-compile.Tests/project.json index f28ba9181..bd877015e 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-004459-00" + "version": "1.0.0" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", + "System.Runtime.Serialization.Primitives": "4.1.1", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-compile.UnitTests/project.json b/test/dotnet-compile.UnitTests/project.json index f5a673c55..0dad51a39 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-004459-00" + "version": "1.0.0" }, "Microsoft.DotNet.Cli.Utils": { "target": "project" @@ -23,7 +23,7 @@ "target": "project" }, "Microsoft.Win32.Registry": { - "version": "4.0.0-rc3-24210-10", + "version": "4.0.0", "exclude": "Compile" }, "Microsoft.DotNet.ProjectModel": { diff --git a/test/dotnet-new.Tests/project.json b/test/dotnet-new.Tests/project.json index f80198f9f..53784a3a6 100644 --- a/test/dotnet-new.Tests/project.json +++ b/test/dotnet-new.Tests/project.json @@ -3,12 +3,12 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" }, "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, - "Newtonsoft.Json": "9.0.1-beta1", + "Newtonsoft.Json": "9.0.1", "dotnet": { "target": "project" }, diff --git a/test/dotnet-pack.Tests/project.json b/test/dotnet-pack.Tests/project.json index 508969c37..a6911a7ab 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-004459-00" + "version": "1.0.0" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", - "System.IO.Compression.ZipFile": "4.0.1-rc3-24210-10", + "System.Runtime.Serialization.Primitives": "4.1.1", + "System.IO.Compression.ZipFile": "4.0.1", "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 7812ce777..c75556768 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-004459-00" + "version": "1.0.0" }, "dotnet": { "target": "project" }, "Microsoft.Win32.Registry": { - "version": "4.0.0-rc3-24210-10", + "version": "4.0.0", "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-24210-10" + "System.Net.NameResolution": "4.0.0" }, "frameworks": { "netcoreapp1.0": { diff --git a/test/dotnet-publish.Tests/project.json b/test/dotnet-publish.Tests/project.json index c04255337..05d468142 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-004459-00" + "version": "1.0.0" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", + "System.Runtime.Serialization.Primitives": "4.1.1", "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-24210-10" + "System.Runtime.InteropServices.RuntimeInformation": "4.0.0" }, "frameworks": { "netcoreapp1.0": { diff --git a/test/dotnet-resgen.Tests/project.json b/test/dotnet-resgen.Tests/project.json index 7799dc3a8..88f4c8b8c 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-004459-00" + "version": "1.0.0" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", + "System.Runtime.Serialization.Primitives": "4.1.1", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-run.Tests/project.json b/test/dotnet-run.Tests/project.json index b8875c599..74a7a577e 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-004459-00" + "version": "1.0.0" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", + "System.Runtime.Serialization.Primitives": "4.1.1", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-run.UnitTests/project.json b/test/dotnet-run.UnitTests/project.json index 1e3a48024..ec9ab9148 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-004459-00" + "version": "1.0.0" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", + "System.Runtime.Serialization.Primitives": "4.1.1", "dotnet": { "target": "project" }, diff --git a/test/dotnet-test.Tests/project.json b/test/dotnet-test.Tests/project.json index 23296092b..3066cbada 100644 --- a/test/dotnet-test.Tests/project.json +++ b/test/dotnet-test.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" }, - "Newtonsoft.Json": "9.0.1-beta1", + "Newtonsoft.Json": "9.0.1", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, @@ -15,9 +15,9 @@ "Microsoft.DotNet.ProjectModel": { "target": "project" }, - "System.Net.NameResolution": "4.0.0-rc3-24210-10", - "System.Net.Sockets": "4.1.0-rc3-24210-10", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", + "System.Net.NameResolution": "4.0.0", + "System.Net.Sockets": "4.1.0", + "System.Runtime.Serialization.Primitives": "4.1.1", "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 b1723a0bd..182cde0fe 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-004459-00" + "version": "1.0.0" }, - "Newtonsoft.Json": "9.0.1-beta1", + "Newtonsoft.Json": "9.0.1", "dotnet": { "target": "project" }, "Microsoft.Win32.Registry": { - "version": "4.0.0-rc3-24210-10", + "version": "4.0.0", "exclude": "Compile" }, "xunit": "2.1.0", diff --git a/test/dotnet.Tests/GivenThatTheUserIsRunningDoNetForTheFirstTime.cs b/test/dotnet.Tests/GivenThatTheUserIsRunningDoNetForTheFirstTime.cs index c08442d86..5df9c2c8b 100644 --- a/test/dotnet.Tests/GivenThatTheUserIsRunningDoNetForTheFirstTime.cs +++ b/test/dotnet.Tests/GivenThatTheUserIsRunningDoNetForTheFirstTime.cs @@ -26,6 +26,7 @@ namespace Microsoft.DotNet.Tests var command = new DotnetCommand() .WithWorkingDirectory(testDirectory.Path); command.Environment["NUGET_PACKAGES"] = testNugetCache; + command.Environment["DOTNET_SKIP_FIRST_TIME_EXPERIENCE"] = ""; _firstDotnetUseCommandResult = command.ExecuteWithCapturedOutput("new"); diff --git a/test/dotnet.Tests/project.json b/test/dotnet.Tests/project.json index 9e21fa839..66c9d8fed 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-004459-00" + "version": "1.0.0" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", + "System.Runtime.Serialization.Primitives": "4.1.1", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/tools/Archiver/project.json b/tools/Archiver/project.json index 07db9fa6e..899fd6995 100644 --- a/tools/Archiver/project.json +++ b/tools/Archiver/project.json @@ -12,7 +12,7 @@ "Microsoft.DotNet.Archive": { "target": "project" }, - "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" + "Microsoft.NETCore.App": "1.0.0" }, "frameworks": { "netcoreapp1.0": {} diff --git a/tools/MultiProjectValidator/project.json b/tools/MultiProjectValidator/project.json index da314f5b0..0edf465ca 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-004459-00", + "Microsoft.NETCore.App": "1.0.0", "Microsoft.DotNet.ProjectModel": { "target": "project" },