Merge pull request #3867 from wtgodbe/Stable1011

Mark packages as stable for 1.0.11
dotnet · Mar 28, 2018 · 5cb0d32 · 5cb0d32
2 parents da13023 + 5663b2d
commit 5cb0d32
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -345,5 +345,34 @@
     <StablePackage Include="runtime.win7-x86.Microsoft.NETCore.DotNetHostPolicy">
       <Version>1.0.10</Version>
     </StablePackage>
+
+    <!-- NETCore 1.0.11 servicing core-setup -->
+    <StablePackage Include="Microsoft.NETCore.App">
+      <Version>1.0.11</Version>
+    </StablePackage>
+    <StablePackage Include="Microsoft.NETCore.DotNetHostPolicy">
+      <Version>1.0.11</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.debian.8-x64.Microsoft.NETCore.DotNetHostPolicy">
+      <Version>1.0.11</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.osx.10.10-x64.Microsoft.NETCore.DotNetHostPolicy">
+      <Version>1.0.11</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.rhel.7-x64.Microsoft.NETCore.DotNetHostPolicy">
+      <Version>1.0.11</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.ubuntu.14.04-x64.Microsoft.NETCore.DotNetHostPolicy">
+      <Version>1.0.11</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.ubuntu.16.04-x64.Microsoft.NETCore.DotNetHostPolicy">
+      <Version>1.0.11</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.win7-x64.Microsoft.NETCore.DotNetHostPolicy">
+      <Version>1.0.11</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.win7-x86.Microsoft.NETCore.DotNetHostPolicy">
+      <Version>1.0.11</Version>
+    </StablePackage>
 </ItemGroup>
 </Project>