diff --git a/TestAssets/TestProjects/PortableApp/project.json b/TestAssets/TestProjects/PortableApp/project.json index e512824c99..b21f513852 100644 --- a/TestAssets/TestProjects/PortableApp/project.json +++ b/TestAssets/TestProjects/PortableApp/project.json @@ -9,7 +9,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.11-servicing-*" + "version": "1.0.11" }, "Newtonsoft.Json": "9.0.1-beta1" } diff --git a/TestAssets/TestProjects/PortableTestApp/project.json b/TestAssets/TestProjects/PortableTestApp/project.json index 69dbed0bb3..3559e21e89 100644 --- a/TestAssets/TestProjects/PortableTestApp/project.json +++ b/TestAssets/TestProjects/PortableTestApp/project.json @@ -12,7 +12,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.11-servicing-*" + "version": "1.0.11" }, "Newtonsoft.Json": "9.0.1-beta1", "xunit": "2.1.0", diff --git a/TestAssets/TestProjects/StandaloneApp/project.json b/TestAssets/TestProjects/StandaloneApp/project.json index ecefb80803..027f49e797 100644 --- a/TestAssets/TestProjects/StandaloneApp/project.json +++ b/TestAssets/TestProjects/StandaloneApp/project.json @@ -5,7 +5,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.11-servicing-*", + "Microsoft.NETCore.App": "1.0.11", "Newtonsoft.Json": "9.0.1-beta1" } } diff --git a/TestAssets/TestProjects/StandaloneTestApp/project.json b/TestAssets/TestProjects/StandaloneTestApp/project.json index 767eaef7d5..7323553575 100644 --- a/TestAssets/TestProjects/StandaloneTestApp/project.json +++ b/TestAssets/TestProjects/StandaloneTestApp/project.json @@ -9,7 +9,7 @@ "portable-net451+win8" ], "dependencies": { - "Microsoft.NETCore.App": "1.0.11-servicing-*", + "Microsoft.NETCore.App": "1.0.11", "Newtonsoft.Json": "9.0.1-beta1", "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00206", diff --git a/branchinfo.txt b/branchinfo.txt index 1966dd1dc5..2d224a8c7d 100644 --- a/branchinfo.txt +++ b/branchinfo.txt @@ -5,6 +5,6 @@ MAJOR_VERSION=1 MINOR_VERSION=0 PATCH_VERSION=11 -RELEASE_SUFFIX=servicing +RELEASE_SUFFIX= CHANNEL=preview BRANCH_NAME=release/1.0.0 diff --git a/build_projects/shared-build-targets-utils/Utils/HostVersion.cs b/build_projects/shared-build-targets-utils/Utils/HostVersion.cs index fad617249b..dedf294604 100644 --- a/build_projects/shared-build-targets-utils/Utils/HostVersion.cs +++ b/build_projects/shared-build-targets-utils/Utils/HostVersion.cs @@ -62,7 +62,7 @@ public override string ToString() // // Full versions and package information. - public static bool EnsureStableVersion => false; + public static bool EnsureStableVersion => true; public string LatestHostPrerelease => "servicing"; public string LatestHostBuildMajor => CommitCountString; public string LatestHostBuildMinor => "00"; diff --git a/pkg/projects/Microsoft.NETCore.App/project.json b/pkg/projects/Microsoft.NETCore.App/project.json index f956f3a134..b45143146d 100644 --- a/pkg/projects/Microsoft.NETCore.App/project.json +++ b/pkg/projects/Microsoft.NETCore.App/project.json @@ -11,6 +11,7 @@ "System.Collections.Immutable": "1.2.0", "System.ComponentModel": "4.0.1", "System.ComponentModel.Annotations": "4.1.0", + "System.Console": "4.0.1", "System.Diagnostics.DiagnosticSource": "4.0.0", "System.Diagnostics.Process": "4.1.0", "System.Dynamic.Runtime": "4.0.11", diff --git a/pkg/stable.packages.props b/pkg/stable.packages.props index 38fba12dd7..e5e2120bda 100644 --- a/pkg/stable.packages.props +++ b/pkg/stable.packages.props @@ -345,5 +345,34 @@ 1.0.10 + + + + 1.0.11 + + + 1.0.11 + + + 1.0.11 + + + 1.0.11 + + + 1.0.11 + + + 1.0.11 + + + 1.0.11 + + + 1.0.11 + + + 1.0.11 +