Merge pull request #5924 from wtgodbe/1113Stable

Update dependencies & Mark 1.1.13 stable
dotnet · Apr 18, 2019 · 5917a1a · 5917a1a
2 parents 46266c4 + f47f651
commit 5917a1a
Show file tree

Hide file tree

Showing 14 changed files with 165 additions and 16 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.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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -70,13 +70,13 @@
       <Version>4.0.1</Version>
     </NETCoreApp10Dependency>
     <NETCoreApp10Dependency Include="Microsoft.NETCore.DotNetHostPolicy">
-      <Version>1.0.15</Version>
+      <Version>1.0.16</Version>
     </NETCoreApp10Dependency>
     <NETCoreApp10Dependency Include="Microsoft.NETCore.Platforms">
       <Version>1.0.2</Version>
     </NETCoreApp10Dependency>
     <NETCoreApp10Dependency Include="Microsoft.NETCore.Runtime.CoreCLR">
-      <Version>1.0.17</Version>
+      <Version>1.0.18</Version>
     </NETCoreApp10Dependency>
     <NETCoreApp10Dependency Include="Microsoft.VisualBasic">
       <Version>10.0.1</Version>

diff --git 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
@@ -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
@@ -1013,5 +1013,154 @@
     <StablePackage Include="runtime.win7-x86.Microsoft.NETCore.DotNetHostResolver">
       <Version>1.1.12</Version>
     </StablePackage>
+
+    <!-- NETCore 1.1.13 core-setup -->
+    <StablePackage Include="Microsoft.NETCore.App">
+      <Version>1.1.13</Version>
+    </StablePackage>
+    <StablePackage Include="Microsoft.NETCore.DotNetHost">
+      <Version>1.1.13</Version>
+    </StablePackage>
+    <StablePackage Include="Microsoft.NETCore.DotNetHostPolicy">
+      <Version>1.1.13</Version>
+    </StablePackage>
+    <StablePackage Include="Microsoft.NETCore.DotNetHostResolver">
+      <Version>1.1.13</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.debian.8-x64.Microsoft.NETCore.DotNetHost">
+      <Version>1.1.13</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.debian.8-x64.Microsoft.NETCore.DotNetHostPolicy">
+      <Version>1.1.13</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.debian.8-x64.Microsoft.NETCore.DotNetHostResolver">
+      <Version>1.1.13</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.debian.9-x64.Microsoft.NETCore.DotNetHost">
+      <Version>1.1.13</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.debian.9-x64.Microsoft.NETCore.DotNetHostPolicy">
+      <Version>1.1.13</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.debian.9-x64.Microsoft.NETCore.DotNetHostResolver">
+      <Version>1.1.13</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.fedora.24-x64.Microsoft.NETCore.DotNetHost">
+      <Version>1.1.13</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.fedora.24-x64.Microsoft.NETCore.DotNetHostPolicy">
+      <Version>1.1.13</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.fedora.24-x64.Microsoft.NETCore.DotNetHostResolver">
+      <Version>1.1.13</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.fedora.27-x64.Microsoft.NETCore.DotNetHost">
+      <Version>1.1.13</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.fedora.27-x64.Microsoft.NETCore.DotNetHostPolicy">
+      <Version>1.1.13</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.fedora.27-x64.Microsoft.NETCore.DotNetHostResolver">
+      <Version>1.1.13</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.fedora.28-x64.Microsoft.NETCore.DotNetHost">
+      <Version>1.1.13</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.fedora.28-x64.Microsoft.NETCore.DotNetHostPolicy">
+      <Version>1.1.13</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.fedora.28-x64.Microsoft.NETCore.DotNetHostResolver">
+      <Version>1.1.13</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.opensuse.42.1-x64.Microsoft.NETCore.DotNetHost">
+      <Version>1.1.13</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.opensuse.42.1-x64.Microsoft.NETCore.DotNetHostPolicy">
+      <Version>1.1.13</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.opensuse.42.1-x64.Microsoft.NETCore.DotNetHostResolver">
+      <Version>1.1.13</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.opensuse.42.3-x64.Microsoft.NETCore.DotNetHost">
+      <Version>1.1.13</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.opensuse.42.3-x64.Microsoft.NETCore.DotNetHostPolicy">
+      <Version>1.1.13</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.opensuse.42.3-x64.Microsoft.NETCore.DotNetHostResolver">
+      <Version>1.1.13</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.osx.10.10-x64.Microsoft.NETCore.DotNetHost">
+      <Version>1.1.13</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.osx.10.10-x64.Microsoft.NETCore.DotNetHostPolicy">
+      <Version>1.1.13</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.osx.10.10-x64.Microsoft.NETCore.DotNetHostResolver">
+      <Version>1.1.13</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.rhel.7-x64.Microsoft.NETCore.DotNetHost">
+      <Version>1.1.13</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.rhel.7-x64.Microsoft.NETCore.DotNetHostPolicy">
+      <Version>1.1.13</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.rhel.7-x64.Microsoft.NETCore.DotNetHostResolver">
+      <Version>1.1.13</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.ubuntu.14.04-x64.Microsoft.NETCore.DotNetHost">
+      <Version>1.1.13</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.ubuntu.14.04-x64.Microsoft.NETCore.DotNetHostPolicy">
+      <Version>1.1.13</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.ubuntu.14.04-x64.Microsoft.NETCore.DotNetHostResolver">
+      <Version>1.1.13</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.ubuntu.16.04-x64.Microsoft.NETCore.DotNetHost">
+      <Version>1.1.13</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.ubuntu.16.04-x64.Microsoft.NETCore.DotNetHostPolicy">
+      <Version>1.1.13</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.ubuntu.16.04-x64.Microsoft.NETCore.DotNetHostResolver">
+      <Version>1.1.13</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.ubuntu.18.04-x64.Microsoft.NETCore.DotNetHost">
+      <Version>1.1.13</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.ubuntu.18.04-x64.Microsoft.NETCore.DotNetHostPolicy">
+      <Version>1.1.13</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.ubuntu.18.04-x64.Microsoft.NETCore.DotNetHostResolver">
+      <Version>1.1.13</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.win10-arm64.Microsoft.NETCore.DotNetHost">
+      <Version>1.1.13</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.win10-arm64.Microsoft.NETCore.DotNetHostPolicy">
+      <Version>1.1.13</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.win10-arm64.Microsoft.NETCore.DotNetHostResolver">
+      <Version>1.1.13</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.win7-x64.Microsoft.NETCore.DotNetHost">
+      <Version>1.1.13</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.win7-x64.Microsoft.NETCore.DotNetHostPolicy">
+      <Version>1.1.13</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.win7-x64.Microsoft.NETCore.DotNetHostResolver">
+      <Version>1.1.13</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.win7-x86.Microsoft.NETCore.DotNetHost">
+      <Version>1.1.13</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.win7-x86.Microsoft.NETCore.DotNetHostPolicy">
+      <Version>1.1.13</Version>
+    </StablePackage>
+    <StablePackage Include="runtime.win7-x86.Microsoft.NETCore.DotNetHostResolver">
+      <Version>1.1.13</Version>
+    </StablePackage>
   </ItemGroup>
 </Project>
diff --git 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": {