Merge pull request #5356 from wtgodbe/1016

Update branding to 1.0.16 non-stable
dotnet · Mar 6, 2019 · 069511e · 069511e
2 parents 0d8dcb4 + 40c1eb2
commit 069511e
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 13 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.15"
+          "version": "1.0.16-servicing-*"
         },
         "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.15"
+          "version": "1.0.16-servicing-*"
         },
         "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.15",
+        "Microsoft.NETCore.App": "1.0.16-servicing-*",
         "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.15",
+        "Microsoft.NETCore.App": "1.0.16-servicing-*",
         "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,8 +4,8 @@
 #
 MAJOR_VERSION=1
 MINOR_VERSION=0
-PATCH_VERSION=15
-RELEASE_SUFFIX=
+PATCH_VERSION=16
+RELEASE_SUFFIX=servicing
 CHANNEL=preview
 BRANCH_NAME=release/1.0.0
 CONTAINER_NAME=dotnet
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 => true;
+        public static bool EnsureStableVersion => false;
         public string LatestHostPrerelease => "servicing";
         public string LatestHostBuildMajor => CommitCountString;
         public string LatestHostBuildMinor => "00";
@@ -76,8 +76,8 @@ public override string ToString()
         public VerInfo LatestHostFxrVersion => new VerInfo(1, 0, 1, "", "", "", CommitCountString);
         public VerInfo LatestHostPolicyVersion =>
             (HostVersion.EnsureStableVersion ?
-            new VerInfo(1, 0, 15, "", "", "", CommitCountString) :
-            new VerInfo(1, 0, 15, LatestHostPrerelease, LatestHostBuildMajor, LatestHostBuildMinor, CommitCountString)
+            new VerInfo(1, 0, 16, "", "", "", CommitCountString) :
+            new VerInfo(1, 0, 16, LatestHostPrerelease, LatestHostBuildMajor, LatestHostBuildMinor, CommitCountString)
             );
 
         public Dictionary<string, VerInfo> LatestHostPackages => new Dictionary<string, VerInfo>()

diff --git a/build_projects/shared-build-targets-utils/Utils/Monikers.cs b/build_projects/shared-build-targets-utils/Utils/Monikers.cs
@@ -10,9 +10,9 @@ namespace Microsoft.DotNet.Cli.Build
     public class Monikers
     {
         public const string SharedFrameworkName = "Microsoft.NETCore.App";
-        public const string SharedFxBrandName = "Microsoft .NET Core 1.0.15 - Runtime";
-        public const string SharedHostBrandName = "Microsoft .NET Core 1.0.15 - Host";
-        public const string HostFxrBrandName = "Microsoft .NET Core 1.0.15 - Host FX Resolver";
+        public const string SharedFxBrandName = "Microsoft .NET Core 1.0.16 - Runtime";
+        public const string SharedHostBrandName = "Microsoft .NET Core 1.0.16 - Host";
+        public const string HostFxrBrandName = "Microsoft .NET Core 1.0.16 - Host FX Resolver";
 
         public static string GetProductMoniker(BuildTargetContext c, string artifactPrefix, string version)
         {

diff --git a/pkg/projects/Microsoft.NETCore.App/Microsoft.NETCore.App.pkgproj b/pkg/projects/Microsoft.NETCore.App/Microsoft.NETCore.App.pkgproj
@@ -3,7 +3,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
 
   <PropertyGroup>
-    <Version>1.0.15</Version>
+    <Version>1.0.16</Version>
     <PackagePlatform>AnyCPU</PackagePlatform>
   </PropertyGroup>