From 5794cb0beed6172c77a2642c6289a069c2002e8f Mon Sep 17 00:00:00 2001
From: Santiago Fernandez Madero <safern@microsoft.com>
Date: Thu, 14 Sep 2017 16:27:41 -0700
Subject: [PATCH] Mark as stable for 1.1.4 release (#3209)

---
 .../TestProjects/PortableApp/project.json     |  2 +-
 .../TestProjects/PortableTestApp/project.json |  2 +-
 .../TestProjects/StandaloneApp/project.json   |  2 +-
 .../StandaloneTestApp/project.json            |  2 +-
 branchinfo.txt                                |  2 +-
 .../Utils/HostVersion.cs                      |  2 +-
 .../Microsoft.NETCore.App.pkgproj             |  4 +-
 pkg/stable.packages.props                     | 38 +++++++++++++++++++
 8 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/TestAssets/TestProjects/PortableApp/project.json b/TestAssets/TestProjects/PortableApp/project.json
index 88d5e9c701..99830fb939 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.4-servicing-*"
+          "version": "1.1.4"
         },
         "Newtonsoft.Json": "9.0.1-beta1"
       }
diff --git a/TestAssets/TestProjects/PortableTestApp/project.json b/TestAssets/TestProjects/PortableTestApp/project.json
index cdd0532c1a..f63ff24c16 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.4-servicing-*"
+          "version": "1.1.4"
         },
         "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 60468d4d52..cfd0140e0f 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.4-servicing-*",
+        "Microsoft.NETCore.App": "1.1.4",
         "Newtonsoft.Json": "9.0.1-beta1"
       }
     }
diff --git a/TestAssets/TestProjects/StandaloneTestApp/project.json b/TestAssets/TestProjects/StandaloneTestApp/project.json
index 61f1793b5d..1a0855f134 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.4-servicing-*",
+        "Microsoft.NETCore.App": "1.1.4",
         "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 a647eb295e..002f526e64 100644
--- a/branchinfo.txt
+++ b/branchinfo.txt
@@ -4,6 +4,6 @@
 MAJOR_VERSION=1
 MINOR_VERSION=1
 PATCH_VERSION=4
-RELEASE_SUFFIX=servicing
+RELEASE_SUFFIX=
 CHANNEL=release/1.1.0
 BRANCH_NAME=release/1.1.0
diff --git a/build_projects/shared-build-targets-utils/Utils/HostVersion.cs b/build_projects/shared-build-targets-utils/Utils/HostVersion.cs
index edb4c18826..e6c0f3a967 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/pkg/projects/Microsoft.NETCore.App/Microsoft.NETCore.App.pkgproj b/pkg/projects/Microsoft.NETCore.App/Microsoft.NETCore.App.pkgproj
index 783c13203f..008a9719ec 100644
--- a/pkg/projects/Microsoft.NETCore.App/Microsoft.NETCore.App.pkgproj
+++ b/pkg/projects/Microsoft.NETCore.App/Microsoft.NETCore.App.pkgproj
@@ -67,10 +67,10 @@
       <Version>4.0.1</Version>
     </NETCoreApp10Dependency>
     <NETCoreApp10Dependency Include="Microsoft.NETCore.DotNetHostPolicy">
-      <Version>1.0.5</Version>
+      <Version>1.0.7</Version>
     </NETCoreApp10Dependency>
     <NETCoreApp10Dependency Include="Microsoft.NETCore.Runtime.CoreCLR">
-      <Version>1.0.8</Version>
+      <Version>1.0.9</Version>
     </NETCoreApp10Dependency>
     <NETCoreApp10Dependency Include="Microsoft.VisualBasic">
       <Version>10.0.1</Version>
diff --git a/pkg/stable.packages.props b/pkg/stable.packages.props
index f71cb6aa7c..ff1ba98c3a 100644
--- a/pkg/stable.packages.props
+++ b/pkg/stable.packages.props
@@ -230,5 +230,43 @@
     <StablePackage Include="runtime.win7-x86.Microsoft.NETCore.DotNetHostPolicy">
       <Version>1.1.3</Version>
     </StablePackage>
+
+    <!-- NETCore 1.1.4 core-setup -->
+    <StablePackage Include="Microsoft.NETCore.App">
+      <Version>1.1.4</Version>
+    </StablePackage>
+    <StablePackage Include="Microsoft.NETCore.DotNetHostPolicy">
+      <Version>1.1.4</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.debian.8-x64.Microsoft.NETCore.DotNetHostPolicy">
+      <Version>1.1.4</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.fedora.24-x64.Microsoft.NETCore.DotNetHostPolicy">
+      <Version>1.1.4</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.opensuse.42.1-x64.Microsoft.NETCore.DotNetHostPolicy">
+      <Version>1.1.4</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.osx.10.10-x64.Microsoft.NETCore.DotNetHostPolicy">
+      <Version>1.1.4</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.rhel.7-x64.Microsoft.NETCore.DotNetHostPolicy">
+      <Version>1.1.4</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.ubuntu.14.04-x64.Microsoft.NETCore.DotNetHostPolicy">
+      <Version>1.1.4</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.ubuntu.16.04-x64.Microsoft.NETCore.DotNetHostPolicy">
+      <Version>1.1.4</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.win10-arm64.Microsoft.NETCore.DotNetHostPolicy">
+      <Version>1.1.4</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.win7-x64.Microsoft.NETCore.DotNetHostPolicy">
+      <Version>1.1.4</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.win7-x86.Microsoft.NETCore.DotNetHostPolicy">
+      <Version>1.1.4</Version>
+    </StablePackage>
   </ItemGroup>
 </Project>
\ No newline at end of file