Merge pull request #1522 from gkhanna79/Stabilize104

Stabilize Core-Setup for 1.0.4
dotnet · Feb 10, 2017 · 8243508 · 8243508
2 parents d82a107 + 458590c
commit 8243508
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 7 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.4-servicing-*"
+          "version": "1.0.4"
         },
         "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.4-servicing-*"
+          "version": "1.0.4"
         },
         "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.4-servicing-*",
+        "Microsoft.NETCore.App": "1.0.4",
         "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.4-servicing-*",
+        "Microsoft.NETCore.App": "1.0.4",
         "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,6 +5,6 @@
 MAJOR_VERSION=1
 MINOR_VERSION=0
 PATCH_VERSION=4
-RELEASE_SUFFIX=servicing
+RELEASE_SUFFIX=
 CHANNEL=preview
 BRANCH_NAME=release/1.0.0
diff --git a/build_projects/shared-build-targets-utils/Utils/BuildVersion.cs b/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 => $"{ProductionVersion}-{VersionSuffix}-00";
+        public string NetCoreAppVersion => $"{ProductionVersion}";
         public string ProductionVersion => $"{Major}.{Minor}.{Patch}";
     }
 }
diff --git a/build_projects/shared-build-targets-utils/Utils/HostVersion.cs b/build_projects/shared-build-targets-utils/Utils/HostVersion.cs
@@ -61,10 +61,16 @@ public override string ToString()
         //
 
         // Full versions and package information.
-        public bool EnsureStableVersion => false;
+        public bool EnsureStableVersion => true;
         public string LatestHostPrerelease => "servicing";
         public string LatestHostBuildMajor => CommitCountString;
         public string LatestHostBuildMinor => "00";
+
+        // These are the versions used by GenerateMSbuildPropsFile to generate version.props that is used for
+        // versioning of host nuget package projects.
+        //
+        // These versions should only be incremented in a servicing release if the package in question
+        // is being updated.
         public VerInfo LatestHostVersion => new VerInfo(1, 0, 1, "", "", "", CommitCountString);
         public VerInfo LatestHostFxrVersion => new VerInfo(1, 0, 1, "", "", "", CommitCountString);
         public VerInfo LatestHostPolicyVersion => new VerInfo(1, 0, 3, "", "", "", CommitCountString);
@@ -97,6 +103,8 @@ public override string ToString()
         //
         // Locked muxer for consumption in CLI.
         //
+        // These versions are used when generating platform installers.
+        //
         public bool IsLocked = true; // Set this variable to toggle muxer locking.
         public VerInfo LockedHostFxrVersion => IsLocked ? new VerInfo(1, 0, 1, "", "", "", CommitCountString) : LatestHostFxrVersion;
         public VerInfo LockedHostVersion    => IsLocked ? new VerInfo(1, 0, 1, "", "", "", CommitCountString) : LatestHostVersion;

diff --git a/pkg/stable.packages.props b/pkg/stable.packages.props
@@ -160,5 +160,10 @@
     <StablePackage Include="runtime.win7-x86.Microsoft.NETCore.DotNetHostPolicy">
       <Version>1.0.3</Version>
     </StablePackage>
+
+    <!-- NETCore 1.0.4 servicing core-setup -->
+    <StablePackage Include="Microsoft.NETCore.App">
+      <Version>1.0.4</Version>
+    </StablePackage>
 </ItemGroup>
 </Project>