diff --git a/TestAssets/TestProjects/PortableApp/project.json b/TestAssets/TestProjects/PortableApp/project.json index 4a2dc9948e..43485799a8 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.15" + "version": "1.0.16-servicing-*" }, "Newtonsoft.Json": "9.0.1-beta1" } diff --git a/TestAssets/TestProjects/PortableTestApp/project.json b/TestAssets/TestProjects/PortableTestApp/project.json index e4f76ad61f..77985a0a83 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.15" + "version": "1.0.16-servicing-*" }, "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 faceb25906..a3e6e46874 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.15", + "Microsoft.NETCore.App": "1.0.16-servicing-*", "Newtonsoft.Json": "9.0.1-beta1" } } diff --git a/TestAssets/TestProjects/StandaloneTestApp/project.json b/TestAssets/TestProjects/StandaloneTestApp/project.json index 33795c4f90..01a895ccb2 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.15", + "Microsoft.NETCore.App": "1.0.16-servicing-*", "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 514a092341..cf46065d2e 100644 --- a/branchinfo.txt +++ b/branchinfo.txt @@ -4,8 +4,8 @@ # MAJOR_VERSION=1 MINOR_VERSION=0 -PATCH_VERSION=15 -RELEASE_SUFFIX= +PATCH_VERSION=16 +RELEASE_SUFFIX=servicing CHANNEL=preview BRANCH_NAME=release/1.0.0 CONTAINER_NAME=dotnet diff --git a/build_projects/shared-build-targets-utils/Utils/HostVersion.cs b/build_projects/shared-build-targets-utils/Utils/HostVersion.cs index 8e1ef9893a..724c7c36c1 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 => true; + public static bool EnsureStableVersion => false; public string LatestHostPrerelease => "servicing"; public string LatestHostBuildMajor => CommitCountString; public string LatestHostBuildMinor => "00"; @@ -76,8 +76,8 @@ public override string ToString() public VerInfo LatestHostFxrVersion => new VerInfo(1, 0, 1, "", "", "", CommitCountString); public VerInfo LatestHostPolicyVersion => (HostVersion.EnsureStableVersion ? - new VerInfo(1, 0, 15, "", "", "", CommitCountString) : - new VerInfo(1, 0, 15, LatestHostPrerelease, LatestHostBuildMajor, LatestHostBuildMinor, CommitCountString) + new VerInfo(1, 0, 16, "", "", "", CommitCountString) : + new VerInfo(1, 0, 16, LatestHostPrerelease, LatestHostBuildMajor, LatestHostBuildMinor, CommitCountString) ); public Dictionary LatestHostPackages => new Dictionary() diff --git a/build_projects/shared-build-targets-utils/Utils/Monikers.cs b/build_projects/shared-build-targets-utils/Utils/Monikers.cs index b67007bcf1..af17ea6de6 100644 --- a/build_projects/shared-build-targets-utils/Utils/Monikers.cs +++ b/build_projects/shared-build-targets-utils/Utils/Monikers.cs @@ -10,9 +10,9 @@ namespace Microsoft.DotNet.Cli.Build public class Monikers { public const string SharedFrameworkName = "Microsoft.NETCore.App"; - public const string SharedFxBrandName = "Microsoft .NET Core 1.0.15 - Runtime"; - public const string SharedHostBrandName = "Microsoft .NET Core 1.0.15 - Host"; - public const string HostFxrBrandName = "Microsoft .NET Core 1.0.15 - Host FX Resolver"; + public const string SharedFxBrandName = "Microsoft .NET Core 1.0.16 - Runtime"; + public const string SharedHostBrandName = "Microsoft .NET Core 1.0.16 - Host"; + public const string HostFxrBrandName = "Microsoft .NET Core 1.0.16 - Host FX Resolver"; public static string GetProductMoniker(BuildTargetContext c, string artifactPrefix, string version) { diff --git a/pkg/projects/Microsoft.NETCore.App/Microsoft.NETCore.App.pkgproj b/pkg/projects/Microsoft.NETCore.App/Microsoft.NETCore.App.pkgproj index 5e58d7d053..59cb92d5cc 100644 --- a/pkg/projects/Microsoft.NETCore.App/Microsoft.NETCore.App.pkgproj +++ b/pkg/projects/Microsoft.NETCore.App/Microsoft.NETCore.App.pkgproj @@ -3,7 +3,7 @@ - 1.0.15 + 1.0.16 AnyCPU