Merge pull request #5923 from wtgodbe/1016Stable

wtgodbe · web-flow · commit 8f3458b0ff7d · 2019-04-18T15:34:18.000-07:00
Bump versions &amp; Mark 1.0.16 stable
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.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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -490,5 +490,34 @@
     <StablePackage Include="runtime.win7-x86.Microsoft.NETCore.DotNetHostPolicy">
       <Version>1.0.15</Version>
     </StablePackage>
+
+    <!-- NETCore 1.0.16 servicing core-setup -->
+    <StablePackage Include="Microsoft.NETCore.App">
+      <Version>1.0.16</Version>
+    </StablePackage>
+    <StablePackage Include="Microsoft.NETCore.DotNetHostPolicy">
+      <Version>1.0.16</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.debian.8-x64.Microsoft.NETCore.DotNetHostPolicy">
+      <Version>1.0.16</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.osx.10.10-x64.Microsoft.NETCore.DotNetHostPolicy">
+      <Version>1.0.16</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.rhel.7-x64.Microsoft.NETCore.DotNetHostPolicy">
+      <Version>1.0.16</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.ubuntu.14.04-x64.Microsoft.NETCore.DotNetHostPolicy">
+      <Version>1.0.16</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.ubuntu.16.04-x64.Microsoft.NETCore.DotNetHostPolicy">
+      <Version>1.0.16</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.win7-x64.Microsoft.NETCore.DotNetHostPolicy">
+      <Version>1.0.16</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.win7-x86.Microsoft.NETCore.DotNetHostPolicy">
+      <Version>1.0.16</Version>
+    </StablePackage>
 </ItemGroup>
 </Project>
diff --git 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": {

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`"dependencies": {`
`10`	`10`	`"Microsoft.NETCore.App": {`
`11`	`11`	`"type": "platform",`
`12`		`- "version": "1.0.16-servicing-*"`
	`12`	`+ "version": "1.0.16"`
`13`	`13`	`},`
`14`	`14`	`"Newtonsoft.Json": "9.0.1-beta1"`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`"frameworks": {`
`6`	`6`	`"netcoreapp1.0": {`
`7`	`7`	`"dependencies": {`
`8`		`- "Microsoft.NETCore.App": "1.0.16-servicing-*",`
	`8`	`+ "Microsoft.NETCore.App": "1.0.16",`
`9`	`9`	`"Newtonsoft.Json": "9.0.1-beta1"`
`10`	`10`	`}`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ namespace Microsoft.DotNet.Cli.Build`
`7`	`7`	`{`
`8`	`8`	`public class DependencyVersions`
`9`	`9`	`{`
`10`		`- public static readonly string CoreCLRVersion = "1.0.18-servicing-27612-01";`
`11`		`- public static readonly string JitVersion = "1.0.18-servicing-27612-01";`
	`10`	`+ public static readonly string CoreCLRVersion = "1.0.18";`
	`11`	`+ public static readonly string JitVersion = "1.0.18";`
`12`	`12`	`}`
`13`	`13`	`}`