From 8f85782763f99eb22d7466cd784d3e4bf331f1bc Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 18 Apr 2019 15:23:34 -0700 Subject: [PATCH] Bump versions & Mark 1.0.16 stable --- .../TestProjects/PortableApp/project.json | 2 +- .../TestProjects/PortableTestApp/project.json | 2 +- .../TestProjects/StandaloneApp/project.json | 2 +- .../StandaloneTestApp/project.json | 2 +- branchinfo.txt | 2 +- build_projects/dotnet-host-build/project.json | 2 +- .../DependencyVersions.cs | 4 +-- .../Utils/HostVersion.cs | 2 +- .../update-dependencies/project.json | 2 +- .../Microsoft.NETCore.App/project.json | 2 +- pkg/projects/Microsoft.NETCore/project.json | 4 +-- pkg/stable.packages.props | 29 +++++++++++++++++++ .../RuntimeGraphGenerator/project.json | 2 +- 13 files changed, 43 insertions(+), 14 deletions(-) diff --git a/TestAssets/TestProjects/PortableApp/project.json b/TestAssets/TestProjects/PortableApp/project.json index 43485799a8..051005903e 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.16-servicing-*" + "version": "1.0.16" }, "Newtonsoft.Json": "9.0.1-beta1" } diff --git a/TestAssets/TestProjects/PortableTestApp/project.json b/TestAssets/TestProjects/PortableTestApp/project.json index 77985a0a83..bf28355c9d 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.16-servicing-*" + "version": "1.0.16" }, "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 a3e6e46874..fb43357fb0 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.16-servicing-*", + "Microsoft.NETCore.App": "1.0.16", "Newtonsoft.Json": "9.0.1-beta1" } } diff --git a/TestAssets/TestProjects/StandaloneTestApp/project.json b/TestAssets/TestProjects/StandaloneTestApp/project.json index 01a895ccb2..a9104f8531 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.16-servicing-*", + "Microsoft.NETCore.App": "1.0.16", "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 cf46065d2e..9cf83f1862 100644 --- a/branchinfo.txt +++ b/branchinfo.txt @@ -5,7 +5,7 @@ MAJOR_VERSION=1 MINOR_VERSION=0 PATCH_VERSION=16 -RELEASE_SUFFIX=servicing +RELEASE_SUFFIX= CHANNEL=preview BRANCH_NAME=release/1.0.0 CONTAINER_NAME=dotnet diff --git a/build_projects/dotnet-host-build/project.json b/build_projects/dotnet-host-build/project.json index 8273810a22..5b1bc2a29b 100644 --- a/build_projects/dotnet-host-build/project.json +++ b/build_projects/dotnet-host-build/project.json @@ -6,7 +6,7 @@ }, "dependencies": { "NETStandard.Library": "1.6.0", - "Microsoft.NETCore.Runtime.CoreCLR": "1.0.18-servicing-27612-01", + "Microsoft.NETCore.Runtime.CoreCLR": "1.0.18", "Microsoft.CSharp": "4.0.1", "System.Dynamic.Runtime": "4.0.11", "System.Reflection.Metadata": "1.3.0", diff --git a/build_projects/shared-build-targets-utils/DependencyVersions.cs b/build_projects/shared-build-targets-utils/DependencyVersions.cs index 025c10a94c..8794449f5f 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.18-servicing-27612-01"; - public static readonly string JitVersion = "1.0.18-servicing-27612-01"; + public static readonly string CoreCLRVersion = "1.0.18"; + public static readonly string JitVersion = "1.0.18"; } } diff --git a/build_projects/shared-build-targets-utils/Utils/HostVersion.cs b/build_projects/shared-build-targets-utils/Utils/HostVersion.cs index 724c7c36c1..361f55f14c 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/build_projects/update-dependencies/project.json b/build_projects/update-dependencies/project.json index f0521ed5ce..18c1c87dc8 100644 --- a/build_projects/update-dependencies/project.json +++ b/build_projects/update-dependencies/project.json @@ -7,7 +7,7 @@ "dependencies": { "NETStandard.Library": "1.6.0", "Microsoft.CSharp": "4.0.1", - "Microsoft.NETCore.Runtime.CoreCLR": "1.0.18-servicing-27612-01", + "Microsoft.NETCore.Runtime.CoreCLR": "1.0.18", "System.Runtime.Serialization.Primitives": "4.1.1", "Microsoft.DotNet.Cli.Build.Framework": { "target": "project" diff --git a/pkg/projects/Microsoft.NETCore.App/project.json b/pkg/projects/Microsoft.NETCore.App/project.json index 35a46cf5a8..69cd761f77 100644 --- a/pkg/projects/Microsoft.NETCore.App/project.json +++ b/pkg/projects/Microsoft.NETCore.App/project.json @@ -4,7 +4,7 @@ "Microsoft.CodeAnalysis.CSharp": "1.3.0", "Microsoft.CodeAnalysis.VisualBasic": "1.3.0", "Microsoft.CSharp": "4.0.1", - "Microsoft.NETCore.Runtime.CoreCLR": "1.0.18-servicing-27612-01", + "Microsoft.NETCore.Runtime.CoreCLR": "1.0.18", "Microsoft.VisualBasic": "10.0.1", "NETStandard.Library": "1.6.0", "System.Buffers": "4.0.0", diff --git a/pkg/projects/Microsoft.NETCore/project.json b/pkg/projects/Microsoft.NETCore/project.json index 719c8901c6..ce083851c2 100644 --- a/pkg/projects/Microsoft.NETCore/project.json +++ b/pkg/projects/Microsoft.NETCore/project.json @@ -28,7 +28,7 @@ "System.Linq.Queryable": "4.0.1", "System.Net.Http": "4.1.1", "System.Net.NetworkInformation": "4.1.0", - "System.Net.Primitives": "4.0.12-servicing-27615-02", + "System.Net.Primitives": "4.0.12", "System.Numerics.Vectors": "4.1.1", "System.ObjectModel": "4.0.12", "System.Reflection": "4.1.0", @@ -47,7 +47,7 @@ "System.Security.Principal": "4.0.1", "System.Text.Encoding": "4.0.11", "System.Text.Encoding.Extensions": "4.0.11", - "System.Text.RegularExpressions": "4.1.1-servicing-27615-02", + "System.Text.RegularExpressions": "4.1.1", "System.Threading": "4.0.11", "System.Threading.Tasks": "4.0.11", "System.Threading.Tasks.Dataflow": "4.6.0", diff --git a/pkg/stable.packages.props b/pkg/stable.packages.props index a06f5dca5d..9c2462de43 100644 --- a/pkg/stable.packages.props +++ b/pkg/stable.packages.props @@ -490,5 +490,34 @@ 1.0.15 + + + + 1.0.16 + + + 1.0.16 + + + 1.0.16 + + + 1.0.16 + + + 1.0.16 + + + 1.0.16 + + + 1.0.16 + + + 1.0.16 + + + 1.0.16 + diff --git a/tools/independent/RuntimeGraphGenerator/project.json b/tools/independent/RuntimeGraphGenerator/project.json index d9f0834a59..a97cae5a51 100644 --- a/tools/independent/RuntimeGraphGenerator/project.json +++ b/tools/independent/RuntimeGraphGenerator/project.json @@ -11,7 +11,7 @@ "Microsoft.DotNet.ProjectModel": "1.0.0-rc2-002794", "Microsoft.DotNet.Cli.Utils": "1.0.0-preview2-002794", "NETStandard.Library": "1.6.0", - "Microsoft.NETCore.Runtime.CoreCLR": "1.0.18-servicing-27612-01" + "Microsoft.NETCore.Runtime.CoreCLR": "1.0.18" }, "frameworks": { "netcoreapp1.0": {