Merged PR 89688: Merge github/release/1.0.0 to release/1.0.0

There were merge conflicts because I updated x509 in vsts for the non-stable build last weekend. So merging and updating to x509 stable package.

TestAssets/TestProjects/PortableApp/project.json

@@ -9,7 +9,7 @@
       "dependencies": {
         "Microsoft.NETCore.App": {
           "type": "platform",
-          "version": "1.0.8-servicing-*"
+          "version": "1.0.8"
         },
         "Newtonsoft.Json": "9.0.1-beta1"
       }

TestAssets/TestProjects/PortableTestApp/project.json

@@ -12,7 +12,7 @@
       "dependencies": {
         "Microsoft.NETCore.App": {
           "type": "platform",
-          "version": "1.0.8-servicing-*"
+          "version": "1.0.8"
         },
         "Newtonsoft.Json": "9.0.1-beta1",
         "xunit": "2.1.0",

TestAssets/TestProjects/StandaloneApp/project.json

@@ -5,7 +5,7 @@
   "frameworks": {
     "netcoreapp1.0": {
       "dependencies": {
-        "Microsoft.NETCore.App": "1.0.8-servicing-*",
+        "Microsoft.NETCore.App": "1.0.8",
         "Newtonsoft.Json": "9.0.1-beta1"
       }
     }

TestAssets/TestProjects/StandaloneTestApp/project.json

@@ -9,7 +9,7 @@
         "portable-net451+win8"
       ],
       "dependencies": {
-        "Microsoft.NETCore.App": "1.0.8-servicing-*",
+        "Microsoft.NETCore.App": "1.0.8",
         "Newtonsoft.Json": "9.0.1-beta1",
         "xunit": "2.1.0",
         "xunit.netcore.extensions": "1.0.0-prerelease-00206",

branchinfo.txt

@@ -5,6 +5,6 @@
 MAJOR_VERSION=1
 MINOR_VERSION=0
 PATCH_VERSION=8
-RELEASE_SUFFIX=servicing
+RELEASE_SUFFIX=
 CHANNEL=preview
 BRANCH_NAME=release/1.0.0

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.10-servicing-25807-01";
-        public static readonly string JitVersion = "1.0.10-servicing-25807-01";
+        public static readonly string CoreCLRVersion = "1.0.10";
+        public static readonly string JitVersion = "1.0.10";
     }
 }

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";

pkg/projects/Microsoft.NETCore.App/project.json

@@ -3,7 +3,7 @@
     "Microsoft.CodeAnalysis.CSharp": "1.3.0",
     "Microsoft.CodeAnalysis.VisualBasic": "1.3.0",
     "Microsoft.CSharp": "4.0.1",
-    "Microsoft.NETCore.Runtime.CoreCLR": "1.0.10-servicing-25807-01",
+    "Microsoft.NETCore.Runtime.CoreCLR": "1.0.10",
     "Microsoft.VisualBasic": "10.0.1",
     "NETStandard.Library": "1.6.0",
     "System.Buffers": "4.0.0",
@@ -30,10 +30,11 @@
     "System.Reflection.TypeExtensions": "4.1.0",
     "System.Resources.Reader": "4.0.0",
     "System.Runtime.Loader": "4.0.0",
-    "System.Security.Cryptography.Algorithms": "4.2.0",
+    "System.Security.Cryptography.Algorithms": "4.2.1",
     "System.Security.Cryptography.Encoding": "4.0.0",
     "System.Security.Cryptography.Primitives": "4.0.0",
-    "System.Security.Cryptography.X509Certificates": "4.1.2-servicing-25807-02",
+    "System.Security.Cryptography.X509Certificates": "4.1.2",
+    "System.Security.Cryptography.OpenSsl": "4.0.1",
     "System.Threading.Tasks.Dataflow": "4.6.0",
     "System.Threading.Tasks.Extensions": "4.0.0",
     "System.Threading.Tasks.Parallel": "4.0.1",
@@ -42,7 +43,7 @@
     "Libuv": "1.9.2",
     "Microsoft.NETCore.Platforms": "1.0.2",
     "System.Net.Http": "4.1.3",
-    "runtime.native.System.Security.Cryptography": "4.0.2"
+    "runtime.native.System.Security.Cryptography": "4.0.3"
   },
   "frameworks": {
     "netstandard1.5": {}

pkg/stable.packages.props

@@ -258,5 +258,34 @@
     <StablePackage Include="runtime.win7-x86.Microsoft.NETCore.DotNetHostPolicy">
       <Version>1.0.7</Version>
     </StablePackage>
+
+    <!-- NETCore 1.0.8 servicing core-setup -->
+    <StablePackage Include="Microsoft.NETCore.App">
+      <Version>1.0.8</Version>
+    </StablePackage>
+    <StablePackage Include="Microsoft.NETCore.DotNetHostPolicy">
+      <Version>1.0.8</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.debian.8-x64.Microsoft.NETCore.DotNetHostPolicy">
+      <Version>1.0.8</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.osx.10.10-x64.Microsoft.NETCore.DotNetHostPolicy">
+      <Version>1.0.8</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.rhel.7-x64.Microsoft.NETCore.DotNetHostPolicy">
+      <Version>1.0.8</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.ubuntu.14.04-x64.Microsoft.NETCore.DotNetHostPolicy">
+      <Version>1.0.8</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.ubuntu.16.04-x64.Microsoft.NETCore.DotNetHostPolicy">
+      <Version>1.0.8</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.win7-x64.Microsoft.NETCore.DotNetHostPolicy">
+      <Version>1.0.8</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.win7-x86.Microsoft.NETCore.DotNetHostPolicy">
+      <Version>1.0.8</Version>
+    </StablePackage>
 </ItemGroup>
 </Project>