Merge pull request #1523 from gkhanna79/Stabilize111

gkhanna79 · web-flow · commit 362e48a95c86 · 2017-02-09T17:24:12.000-08:00
Stabilization of Core-Setup for 1.1.1
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.1-servicing-*"
+          "version": "1.1.1"
         },
         "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.1-servicing-*"
+          "version": "1.1.1"
         },
         "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.1-servicing-*",
+        "Microsoft.NETCore.App": "1.1.1",
         "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.1-servicing-*",
+        "Microsoft.NETCore.App": "1.1.1",
         "Newtonsoft.Json": "9.0.1-beta1",
         "xunit": "2.1.0",
         "xunit.netcore.extensions": "1.0.0-prerelease-00206",
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 => $"{Major}.{Minor}.{Patch}-{VersionSuffix}-00";
+        public string NetCoreAppVersion => $"{Major}.{Minor}.{Patch}";
         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
@@ -63,19 +63,23 @@ public override string ToString()
         // Full versions and package information.
         public string LatestHostBuildMajor => CommitCountString;
         public string LatestHostBuildMinor => "00";
-        public bool EnsureStableVersion => false;
+        public bool EnsureStableVersion => true;
 
-        // Comment below lines when stabilizing 1.1.1
-        public VerInfo LatestHostVersion => new VerInfo(1, 1, 1, ReleaseSuffix, LatestHostBuildMajor, LatestHostBuildMinor, CommitCountString);
-        public VerInfo LatestHostFxrVersion => new VerInfo(1, 1, 1, ReleaseSuffix, LatestHostBuildMajor, LatestHostBuildMinor, CommitCountString);
-        public VerInfo LatestHostPolicyVersion => new VerInfo(1, 1, 1, ReleaseSuffix, LatestHostBuildMajor, LatestHostBuildMinor, CommitCountString);
+        // Comment below lines when stabilizing 1.1.X and we are going to update one (or more) of the host packages.
+        //
+        // public VerInfo LatestHostVersion => new VerInfo(1, 1, 1, ReleaseSuffix, LatestHostBuildMajor, LatestHostBuildMinor, CommitCountString);
+        // public VerInfo LatestHostFxrVersion => new VerInfo(1, 1, 1, ReleaseSuffix, LatestHostBuildMajor, LatestHostBuildMinor, CommitCountString);
+        // public VerInfo LatestHostPolicyVersion => new VerInfo(1, 1, 1, ReleaseSuffix, LatestHostBuildMajor, LatestHostBuildMinor, CommitCountString);
+
+        // These are the versions used by GenerateMSbuildPropsFile to generate version.props that is used for 
+        // versioning of the host packages.
+        //
+        // These should only be incremented in a servicing release if we are updating one (or more) of the host packages.
+
+        public VerInfo LatestHostVersion => new VerInfo(1, 1, 0, "", "", "", CommitCountString);
+        public VerInfo LatestHostFxrVersion => new VerInfo(1, 1, 0, "", "", "", CommitCountString);
+        public VerInfo LatestHostPolicyVersion => new VerInfo(1, 1, 0, "", "", "", CommitCountString);
 
-        // Uncomment below lines when stabilizing 1.1.1
-/*
-        public VerInfo LatestHostVersion => new VerInfo(1, 1, 1, "", "", "", CommitCountString);
-        public VerInfo LatestHostFxrVersion => new VerInfo(1, 1, 1, "", "", "", CommitCountString);
-        public VerInfo LatestHostPolicyVersion => new VerInfo(1, 1, 1, "", "", "", CommitCountString);
-*/
 
         // If you are producing host packages use this to validate them.
         public Dictionary<string, VerInfo> LatestHostPackagesToValidate => new Dictionary<string, VerInfo>()
@@ -98,6 +102,8 @@ public override string ToString()
         //
         // Locked muxer for consumption in CLI.
         //
+        // These are used for generating platform installers.
+        //
         public bool IsLocked = true; // Set this variable to toggle muxer locking.
         public VerInfo LockedHostFxrVersion => IsLocked ? new VerInfo(1, 1, 0, "", "", "", CommitCountString) : LatestHostFxrVersion;
         public VerInfo LockedHostVersion    => IsLocked ? new VerInfo(1, 1, 0, "", "", "", CommitCountString) : LatestHostVersion;
diff --git a/pkg/projects/Microsoft.NETCore.App/Microsoft.NETCore.App.pkgproj b/pkg/projects/Microsoft.NETCore.App/Microsoft.NETCore.App.pkgproj
@@ -67,10 +67,10 @@
       <Version>4.0.1</Version>
     </NETCoreApp10Dependency>
     <NETCoreApp10Dependency Include="Microsoft.NETCore.DotNetHostPolicy">
-      <Version>1.0.1</Version>
+      <Version>1.0.3</Version>
     </NETCoreApp10Dependency>
     <NETCoreApp10Dependency Include="Microsoft.NETCore.Runtime.CoreCLR">
-      <Version>1.0.4</Version>
+      <Version>1.0.6</Version>
     </NETCoreApp10Dependency>
     <NETCoreApp10Dependency Include="Microsoft.VisualBasic">
       <Version>10.0.1</Version>
@@ -181,6 +181,12 @@
     <NETCoreApp10Dependency Include="Libuv">
       <Version>1.9.1</Version>
     </NETCoreApp10Dependency>
+    <NETCoreApp10Dependency Include="Microsoft.NETCore.Platforms">
+      <Version>1.0.2</Version>
+    </NETCoreApp10Dependency>
+    <NETCoreApp10Dependency Include="System.Net.Http">
+      <Version>4.1.1</Version>
+    </NETCoreApp10Dependency>
 
     <Dependency Include="@(NETCoreApp10Dependency)">
       <TargetFramework>.NETCoreApp1.0</TargetFramework>
diff --git a/pkg/stable.packages.props b/pkg/stable.packages.props
@@ -2,6 +2,11 @@
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
 
+    <!-- NETCore 1.1.1 core-setup -->
+    <StablePackage Include="Microsoft.NETCore.App">
+      <Version>1.1.1</Version>
+    </StablePackage>
+
     <!-- NETCore 1.1.0 core-setup -->
     <StablePackage Include="Microsoft.NETCore.App">
       <Version>1.1.0</Version>
diff --git a/src/Microsoft.DotNet.PlatformAbstractions/project.json b/src/Microsoft.DotNet.PlatformAbstractions/project.json
@@ -1,6 +1,6 @@
 {
   "description": "Abstractions for making code that uses file system and environment testable.",
-  "version": "1.1.1-servicing-*",
+  "version": "1.1.1",
   "buildOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",
diff --git a/src/Microsoft.Extensions.DependencyModel/project.json b/src/Microsoft.Extensions.DependencyModel/project.json
@@ -1,6 +1,6 @@
 {
   "description": "Abstractions for reading `.deps` files.",
-  "version": "1.1.1-servicing-*",
+  "version": "1.1.1",
   "buildOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk"

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`"dependencies": {`
`10`	`10`	`"Microsoft.NETCore.App": {`
`11`	`11`	`"type": "platform",`
`12`		`- "version": "1.1.1-servicing-*"`
	`12`	`+ "version": "1.1.1"`
`13`	`13`	`},`
`14`	`14`	`"Newtonsoft.Json": "9.0.1-beta1"`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`"frameworks": {`
`6`	`6`	`"netcoreapp1.1": {`
`7`	`7`	`"dependencies": {`
`8`		`- "Microsoft.NETCore.App": "1.1.1-servicing-*",`
	`8`	`+ "Microsoft.NETCore.App": "1.1.1",`
`9`	`9`	`"Newtonsoft.Json": "9.0.1-beta1"`
`10`	`10`	`}`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ public class BuildVersion : Version`
`6`	`6`	`{`
`7`	`7`	`public string SimpleVersion => $"{Major}.{Minor}.{Patch}.{CommitCountString}";`
`8`	`8`	`public string VersionSuffix => $"{ReleaseSuffix}-{CommitCountString}";`
`9`		`- public string NetCoreAppVersion => $"{Major}.{Minor}.{Patch}-{VersionSuffix}-00";`
	`9`	`+ public string NetCoreAppVersion => $"{Major}.{Minor}.{Patch}";`
`10`	`10`	`public string ProductionVersion => $"{Major}.{Minor}.{Patch}";`
`11`	`11`	`}`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"description": "Abstractions for making code that uses file system and environment testable.",`
`3`		`- "version": "1.1.1-servicing-*",`
	`3`	`+ "version": "1.1.1",`
`4`	`4`	`"buildOptions": {`
`5`	`5`	`"warningsAsErrors": true,`
`6`	`6`	`"keyFile": "../../tools/Key.snk",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	"description": "Abstractions for reading `.deps` files.",
`3`		`- "version": "1.1.1-servicing-*",`
	`3`	`+ "version": "1.1.1",`
`4`	`4`	`"buildOptions": {`
`5`	`5`	`"warningsAsErrors": true,`
`6`	`6`	`"keyFile": "../../tools/Key.snk"`