Move Core-Setup to 1.0.2 LTS version

TestAssets/TestProjects/PortableApp/project.json

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

TestAssets/TestProjects/PortableTestApp/project.json

@@ -12,7 +12,7 @@
       "dependencies": {
         "Microsoft.NETCore.App": {
           "type": "platform",
-          "version": "1.0.1"
+          "version": "1.0.2-servicing-*"
         },
         "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.1",
+        "Microsoft.NETCore.App": "1.0.2-servicing-*",
         "Newtonsoft.Json": "9.0.1-beta1"
       }
     }

TestAssets/TestProjects/StandaloneTestApp/project.json

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

branchinfo.txt

@@ -5,7 +5,7 @@
 #
 MAJOR_VERSION=1
 MINOR_VERSION=0
-PATCH_VERSION=1
+PATCH_VERSION=2
 RELEASE_SUFFIX=servicing
 CHANNEL=preview
 BRANCH_NAME=release/1.0.0

build_projects/dotnet-host-build/CompileTargets.cs

@@ -31,6 +31,7 @@ public class CompileTargets
             { "win7-x86", "win7-x86" },
             { "osx.10.10-x64", "osx.10.10-x64" },
             { "osx.10.11-x64", "osx.10.10-x64" },
+            { "osx.10.12-x64", "osx.10.10-x64" },
             { "ubuntu.14.04-x64", "ubuntu.14.04-x64" },
             { "ubuntu.16.04-x64", "ubuntu.16.04-x64" },
             { "centos.7-x64", "rhel.7-x64" },
@@ -297,8 +298,8 @@ public static BuildTargetResult PackagePkgProjects(BuildTargetContext c)
 
                 Console.WriteLine($"Copying package {fileName} to artifacts directory {Dirs.CorehostLocalPackages}.");
             }
-            /*
-            Disable package list check to enable building only certain packages
+
+            // Comment out the loop below if we dont want to validate the built host packages
             foreach (var item in hostVersion.LatestHostPackages)
             {
                 var fileFilter = $"runtime.{HostPackagePlatformRid}.{item.Key}.{item.Value.ToString()}.nupkg";
@@ -307,7 +308,7 @@ Disable package list check to enable building only certain packages
                     throw new BuildFailureException($"Nupkg for {fileFilter} was not created.");
                 }
             }
-            */
+
             return c.Success();
         }
 

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.2";
-        public static readonly string JitVersion = "1.0.2";
+        public static readonly string CoreCLRVersion = "1.0.5-servicing-24530-02";
+        public static readonly string JitVersion = "1.0.5-servicing-24530-02";
     }
 }

build_projects/shared-build-targets-utils/Utils/BuildVersion.cs

@@ -6,7 +6,7 @@ public class BuildVersion : Version
     {
         public string SimpleVersion => $"{Major}.{Minor}.{Patch}.{CommitCountString}";
         public string VersionSuffix => $"{ReleaseSuffix}-{CommitCountString}";
-        public string NetCoreAppVersion => $"{Major}.{Minor}.{Patch}";
+        public string NetCoreAppVersion => $"{Major}.{Minor}.{Patch}-servicing-{CommitCountString}-00";
         public string ProductionVersion => $"{Major}.{Minor}.{Patch}";
     }
 }

build_projects/shared-build-targets-utils/Utils/HostVersion.cs

@@ -61,13 +61,15 @@ public override string ToString()
         //
 
         // Full versions and package information.
+        //
+        // Set the variable below to true to generate stable versions of the host packages
         public bool EnsureStableVersion => false;
         public string LatestHostPrerelease => "servicing";
         public string LatestHostBuildMajor => CommitCountString;
         public string LatestHostBuildMinor => "00";
-        public VerInfo LatestHostVersion => new VerInfo(1, 0, 1, LatestHostPrerelease, LatestHostBuildMajor, LatestHostBuildMinor, CommitCountString);
-        public VerInfo LatestHostFxrVersion => new VerInfo(1, 0, 1, LatestHostPrerelease, LatestHostBuildMajor, LatestHostBuildMinor, CommitCountString);
-        public VerInfo LatestHostPolicyVersion => new VerInfo(1, 0, 1, LatestHostPrerelease, LatestHostBuildMajor, LatestHostBuildMinor, CommitCountString);
+        public VerInfo LatestHostVersion => new VerInfo(1, 0, 2, LatestHostPrerelease, LatestHostBuildMajor, LatestHostBuildMinor, CommitCountString);
+        public VerInfo LatestHostFxrVersion => new VerInfo(1, 0, 2, LatestHostPrerelease, LatestHostBuildMajor, LatestHostBuildMinor, CommitCountString);
+        public VerInfo LatestHostPolicyVersion => new VerInfo(1, 0, 2, LatestHostPrerelease, LatestHostBuildMajor, LatestHostBuildMinor, CommitCountString);
 
         public Dictionary<string, VerInfo> LatestHostPackages => new Dictionary<string, VerInfo>()
         {
@@ -93,7 +95,9 @@ public override string ToString()
         //
         // Locked muxer for consumption in CLI.
         //
-        public bool IsLocked = true; // Set this variable to toggle muxer locking.
+        // Set this variable to toggle muxer locking. We set it to true once a stable release has been shipped
+        // and we wish to have the subsequent servicing releases lock to it.
+        public bool IsLocked = false; 
         public VerInfo LockedHostFxrVersion => IsLocked ? new VerInfo(1, 0, 1, "", "", "", CommitCountString) : LatestHostFxrVersion;
         public VerInfo LockedHostVersion    => IsLocked ? new VerInfo(1, 0, 1, "", "", "", CommitCountString) : LatestHostVersion;
     }

build_projects/shared-build-targets-utils/Utils/Monikers.cs

@@ -11,9 +11,9 @@ public class Monikers
     {
         public const string SharedFrameworkName = "Microsoft.NETCore.App";
         public const string CLISdkBrandName = "Microsoft .NET Core 1.0.0 - SDK Preview 2";
-        public const string SharedFxBrandName = "Microsoft .NET Core 1.0.1 - Runtime";
-        public const string SharedHostBrandName = "Microsoft .NET Core 1.0.1 - Host";
-        public const string HostFxrBrandName = "Microsoft .NET Core 1.0.1 - Host FX Resolver";
+        public const string SharedFxBrandName = "Microsoft .NET Core 1.0.2 - Runtime";
+        public const string SharedHostBrandName = "Microsoft .NET Core 1.0.2 - Host";
+        public const string HostFxrBrandName = "Microsoft .NET Core 1.0.2 - Host FX Resolver";
 
         public static string GetProductMoniker(BuildTargetContext c, string artifactPrefix, string version)
         {

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.1</Version>
+    <Version>1.0.2</Version>
     <PackagePlatform>AnyCPU</PackagePlatform>
   </PropertyGroup>
 

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.4",
+    "Microsoft.NETCore.Runtime.CoreCLR": "1.0.5-servicing-24530-02",
     "Microsoft.VisualBasic": "10.0.1",
     "NETStandard.Library": "1.6.0",
     "System.Buffers": "4.0.0",

pkg/projects/packages.builds

@@ -10,8 +10,10 @@
     <Project Include="*\*.builds" />
   </ItemGroup>
 
+  <!-- Specify the packages to be rebuilt, for servicing, here -->
   <ItemGroup Condition="'$(BuildAllPackages)' == 'false'" >
     <Project Include="Microsoft.NETCore.App\Microsoft.NETCore.App.builds" />
+    <Project Include="Microsoft.NETCore.DotNetHost\*.builds" />
   </ItemGroup>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />