From f47f651ba8df5d08bbdf25c2903dbcc64b675dae Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 18 Apr 2019 15:29:33 -0700 Subject: [PATCH] Update dependencies & Mark 1.1.13 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.pkgproj | 4 +- .../Microsoft.NETCore.App/project.json | 2 +- pkg/projects/Microsoft.NETCore/project.json | 4 +- pkg/stable.packages.props | 149 ++++++++++++++++++ .../RuntimeGraphGenerator/project.json | 2 +- 14 files changed, 165 insertions(+), 16 deletions(-) diff --git a/TestAssets/TestProjects/PortableApp/project.json b/TestAssets/TestProjects/PortableApp/project.json index 3bf8aba2b8..dc9c7d2583 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.1.13-servicing-*" + "version": "1.1.13" }, "Newtonsoft.Json": "9.0.1-beta1" } diff --git a/TestAssets/TestProjects/PortableTestApp/project.json b/TestAssets/TestProjects/PortableTestApp/project.json index f30daa6162..84e5acde3b 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.1.13-servicing-*" + "version": "1.1.13" }, "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 cfb68ab17c..c1bc64470d 100644 --- a/TestAssets/TestProjects/StandaloneApp/project.json +++ b/TestAssets/TestProjects/StandaloneApp/project.json @@ -5,7 +5,7 @@ "frameworks": { "netcoreapp1.1": { "dependencies": { - "Microsoft.NETCore.App": "1.1.13-servicing-*", + "Microsoft.NETCore.App": "1.1.13", "Newtonsoft.Json": "9.0.1-beta1" } } diff --git a/TestAssets/TestProjects/StandaloneTestApp/project.json b/TestAssets/TestProjects/StandaloneTestApp/project.json index 086f6cf6fe..23e8afd4e9 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.1.13-servicing-*", + "Microsoft.NETCore.App": "1.1.13", "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 05e406d5a3..5e4f04fc37 100644 --- a/branchinfo.txt +++ b/branchinfo.txt @@ -4,7 +4,7 @@ MAJOR_VERSION=1 MINOR_VERSION=1 PATCH_VERSION=13 -RELEASE_SUFFIX=servicing +RELEASE_SUFFIX= CHANNEL=release/1.1.0 BRANCH_NAME=release/1.1.0 CONTAINER_NAME=dotnet diff --git a/build_projects/dotnet-host-build/project.json b/build_projects/dotnet-host-build/project.json index a8d3765178..11c33ecc40 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.1", - "Microsoft.NETCore.Runtime.CoreCLR": "1.1.11", + "Microsoft.NETCore.Runtime.CoreCLR": "1.1.13", "Microsoft.NETCore.Platforms": "1.1.2", "Microsoft.NETCore.Targets": "1.1.4", "System.Net.Http": "4.3.4", diff --git a/build_projects/shared-build-targets-utils/DependencyVersions.cs b/build_projects/shared-build-targets-utils/DependencyVersions.cs index 8b0056daa3..5ea8578231 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.1.13-servicing-27612-03"; - public static readonly string JitVersion = "1.1.13-servicing-27612-03"; + public static readonly string CoreCLRVersion = "1.1.13"; + public static readonly string JitVersion = "1.1.13"; } } diff --git a/build_projects/shared-build-targets-utils/Utils/HostVersion.cs b/build_projects/shared-build-targets-utils/Utils/HostVersion.cs index d24dbe8e71..baec006c59 100644 --- a/build_projects/shared-build-targets-utils/Utils/HostVersion.cs +++ b/build_projects/shared-build-targets-utils/Utils/HostVersion.cs @@ -64,7 +64,7 @@ public override string ToString() // Full versions and package information. public string LatestHostBuildMajor => CommitCountString; public string LatestHostBuildMinor => "00"; - public static bool EnsureStableVersion => false; + public static bool EnsureStableVersion => true; // Comment below lines when stabilizing 1.1.X and we are going to update one (or more) of the host packages. // diff --git a/build_projects/update-dependencies/project.json b/build_projects/update-dependencies/project.json index 4115693c3e..8d0f7ec909 100644 --- a/build_projects/update-dependencies/project.json +++ b/build_projects/update-dependencies/project.json @@ -7,7 +7,7 @@ "dependencies": { "NETStandard.Library": "1.6.1", "Microsoft.CSharp": "4.3.0", - "Microsoft.NETCore.Runtime.CoreCLR": "1.1.13-servicing-27612-03", + "Microsoft.NETCore.Runtime.CoreCLR": "1.1.13", "Microsoft.NETCore.Platforms": "1.1.2", "Microsoft.NETCore.Targets": "1.1.4", "System.Runtime.Serialization.Primitives": "4.3.0", diff --git a/pkg/projects/Microsoft.NETCore.App/Microsoft.NETCore.App.pkgproj b/pkg/projects/Microsoft.NETCore.App/Microsoft.NETCore.App.pkgproj index d74a801072..cdc6eb0c84 100644 --- a/pkg/projects/Microsoft.NETCore.App/Microsoft.NETCore.App.pkgproj +++ b/pkg/projects/Microsoft.NETCore.App/Microsoft.NETCore.App.pkgproj @@ -70,13 +70,13 @@ 4.0.1 - 1.0.15 + 1.0.16 1.0.2 - 1.0.17 + 1.0.18 10.0.1 diff --git a/pkg/projects/Microsoft.NETCore.App/project.json b/pkg/projects/Microsoft.NETCore.App/project.json index 75a485a249..dbd03a8a45 100644 --- a/pkg/projects/Microsoft.NETCore.App/project.json +++ b/pkg/projects/Microsoft.NETCore.App/project.json @@ -6,7 +6,7 @@ "Microsoft.CSharp": "4.3.0", "Microsoft.DiaSymReader.Native": "1.4.1", "Microsoft.NETCore.Platforms": "1.1.2", - "Microsoft.NETCore.Runtime.CoreCLR": "1.1.13-servicing-27612-03", + "Microsoft.NETCore.Runtime.CoreCLR": "1.1.13", "Microsoft.NETCore.Targets": "1.1.4", "Microsoft.VisualBasic": "10.1.0", "NETStandard.Library": "1.6.1", diff --git a/pkg/projects/Microsoft.NETCore/project.json b/pkg/projects/Microsoft.NETCore/project.json index f455ca5ef1..c1d4279411 100644 --- a/pkg/projects/Microsoft.NETCore/project.json +++ b/pkg/projects/Microsoft.NETCore/project.json @@ -29,7 +29,7 @@ "System.Linq.Queryable": "4.3.0", "System.Net.Http": "4.3.0", "System.Net.NetworkInformation": "4.3.0", - "System.Net.Primitives": "4.3.1-servicing-27615-02", + "System.Net.Primitives": "4.3.1", "System.Numerics.Vectors": "4.3.0", "System.ObjectModel": "4.3.0", "System.Reflection": "4.3.0", @@ -48,7 +48,7 @@ "System.Security.Principal": "4.3.0", "System.Text.Encoding": "4.3.0", "System.Text.Encoding.Extensions": "4.3.0", - "System.Text.RegularExpressions": "4.3.1-servicing-27615-02", + "System.Text.RegularExpressions": "4.3.1", "System.Threading": "4.3.0", "System.Threading.Tasks": "4.3.0", "System.Threading.Tasks.Dataflow": "4.7.0", diff --git a/pkg/stable.packages.props b/pkg/stable.packages.props index 9c73d174f9..e17f3b48fa 100644 --- a/pkg/stable.packages.props +++ b/pkg/stable.packages.props @@ -1013,5 +1013,154 @@ 1.1.12 + + + + 1.1.13 + + + 1.1.13 + + + 1.1.13 + + + 1.1.13 + + + 1.1.13 + + + 1.1.13 + + + 1.1.13 + + + 1.1.13 + + + 1.1.13 + + + 1.1.13 + + + 1.1.13 + + + 1.1.13 + + + 1.1.13 + + + 1.1.13 + + + 1.1.13 + + + 1.1.13 + + + 1.1.13 + + + 1.1.13 + + + 1.1.13 + + + 1.1.13 + + + 1.1.13 + + + 1.1.13 + + + 1.1.13 + + + 1.1.13 + + + 1.1.13 + + + 1.1.13 + + + 1.1.13 + + + 1.1.13 + + + 1.1.13 + + + 1.1.13 + + + 1.1.13 + + + 1.1.13 + + + 1.1.13 + + + 1.1.13 + + + 1.1.13 + + + 1.1.13 + + + 1.1.13 + + + 1.1.13 + + + 1.1.13 + + + 1.1.13 + + + 1.1.13 + + + 1.1.13 + + + 1.1.13 + + + 1.1.13 + + + 1.1.13 + + + 1.1.13 + + + 1.1.13 + + + 1.1.13 + + + 1.1.13 + \ No newline at end of file diff --git a/tools/independent/RuntimeGraphGenerator/project.json b/tools/independent/RuntimeGraphGenerator/project.json index 1fd624a678..4a1d3ac68f 100644 --- a/tools/independent/RuntimeGraphGenerator/project.json +++ b/tools/independent/RuntimeGraphGenerator/project.json @@ -13,7 +13,7 @@ "Microsoft.DotNet.ProjectModel": "1.0.0-rc2-002794", "Microsoft.DotNet.Cli.Utils": "1.0.0-preview2-002794", "NETStandard.Library": "1.6.1", - "Microsoft.NETCore.Runtime.CoreCLR": "1.1.13-servicing-27612-03" + "Microsoft.NETCore.Runtime.CoreCLR": "1.1.13" }, "frameworks": { "netcoreapp1.0": {