From 5c8b5498820ca4cd1a3ac205eae5643b1a1463ac Mon Sep 17 00:00:00 2001
From: "ASP.NET CI" <aspnetci@users.noreply.github.com>
Date: Tue, 21 Aug 2018 13:33:49 -0700
Subject: [PATCH 1/3] Update package branding for 2.2.0-preview2

---
 build/dependencies.props | 2 +-
 version.props            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build/dependencies.props b/build/dependencies.props
index b83b28598c..b8974fdba7 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -44,6 +44,6 @@
     <XunitPackageVersion>2.3.1</XunitPackageVersion>
     <XunitRunnerVisualStudioPackageVersion>2.4.0</XunitRunnerVisualStudioPackageVersion>
   </PropertyGroup>
-  <PropertyGroup Label="Package Versions: Pinned" />
   <Import Project="$(DotNetPackageVersionPropsPath)" Condition=" '$(DotNetPackageVersionPropsPath)' != '' " />
+  <PropertyGroup Label="Package Versions: Pinned" />
 </Project>
diff --git a/version.props b/version.props
index 8e872d018e..f77be62107 100644
--- a/version.props
+++ b/version.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <VersionPrefix>2.2.0</VersionPrefix>
-    <VersionSuffix>preview1</VersionSuffix>
+    <VersionSuffix>preview2</VersionSuffix>
     <PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' == 'rtm' ">$(VersionPrefix)</PackageVersion>
     <PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' != 'rtm' ">$(VersionPrefix)-$(VersionSuffix)-final</PackageVersion>
     <BuildNumber Condition="'$(BuildNumber)' == ''">t000</BuildNumber>
@@ -10,7 +10,7 @@
     <VersionSuffix Condition="'$(VersionSuffix)' != '' And '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
 
     <ExperimentalVersionPrefix>0.5.0</ExperimentalVersionPrefix>
-    <ExperimentalVersionSuffix>preview1</ExperimentalVersionSuffix>
+    <ExperimentalVersionSuffix>preview2</ExperimentalVersionSuffix>
     <ExperimentalPackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(ExperimentalVersionSuffix)' == 'rtm' ">$(ExperimentalVersionPrefix)</ExperimentalPackageVersion>
     <ExperimentalPackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(ExperimentalVersionSuffix)' != 'rtm' ">$(ExperimentalVersionPrefix)-$(ExperimentalVersionSuffix)-final</ExperimentalPackageVersion>
     <ExperimentalVersionSuffix Condition="'$(ExperimentalVersionSuffix)' != '' And '$(BuildNumber)' != ''">$(ExperimentalVersionSuffix)-$(BuildNumber)</ExperimentalVersionSuffix>

From fc7fa4f0f073f61f08b16df602b5e83f61c7b557 Mon Sep 17 00:00:00 2001
From: martincostello <martin@martincostello.com>
Date: Sun, 26 Aug 2018 11:12:54 +0100
Subject: [PATCH 2/3] Fix sample typo

Fix typo in sample comment.
---
 samples/HealthChecksSample/LivenessProbeStartup.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/HealthChecksSample/LivenessProbeStartup.cs b/samples/HealthChecksSample/LivenessProbeStartup.cs
index 3a4078759f..e927412456 100644
--- a/samples/HealthChecksSample/LivenessProbeStartup.cs
+++ b/samples/HealthChecksSample/LivenessProbeStartup.cs
@@ -50,7 +50,7 @@ namespace HealthChecksSample
             // The readiness check uses all of the registered health checks (default)
             app.UseHealthChecks("/health/ready");
 
-            // The liveness check uses an 'identity' health check that always returns healty
+            // The liveness check uses an 'identity' health check that always returns healthy
             app.UseHealthChecks("/health/live", new HealthCheckOptions()
             {
                 // Filters the set of health checks run by this middleware

From 6cd4cf1a7a19b35c87f9c123ecf390b700d4bec8 Mon Sep 17 00:00:00 2001
From: Zhiliang <zhiliaxu@microsoft.com>
Date: Mon, 27 Aug 2018 17:25:47 +0800
Subject: [PATCH 3/3] Fix typos in samples

---
 samples/HealthChecksSample/LivenessProbeStartup.cs      | 2 +-
 samples/HealthChecksSample/ManagementPortStartup.cs     | 2 +-
 samples/HealthChecksSample/SlowDependencyHealthCheck.cs | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/samples/HealthChecksSample/LivenessProbeStartup.cs b/samples/HealthChecksSample/LivenessProbeStartup.cs
index e927412456..f5eabc6696 100644
--- a/samples/HealthChecksSample/LivenessProbeStartup.cs
+++ b/samples/HealthChecksSample/LivenessProbeStartup.cs
@@ -43,7 +43,7 @@ namespace HealthChecksSample
             //
             // In this example, the liveness check will us an 'identity' check that always returns healthy.
             //
-            // In this example, the readiness check will run all registered checks, include a check with an 
+            // In this example, the readiness check will run all registered checks, include a check with a 
             // long initialization time (15 seconds).
 
 
diff --git a/samples/HealthChecksSample/ManagementPortStartup.cs b/samples/HealthChecksSample/ManagementPortStartup.cs
index a6ccce97ab..79b38dc875 100644
--- a/samples/HealthChecksSample/ManagementPortStartup.cs
+++ b/samples/HealthChecksSample/ManagementPortStartup.cs
@@ -34,7 +34,7 @@ namespace HealthChecksSample
             // to the specified port. This is typically used in a container environment where you can expose
             // a port for monitoring services to have access to the service.
             // - In this case the management is configured in the launchSettings.json and passed through 
-            //  and environment variable
+            //  an environment variable
             // - Additionally, the server is also configured to listen to requests on the management port.
             app.UseHealthChecks("/health", port: Configuration["ManagementPort"]);
 
diff --git a/samples/HealthChecksSample/SlowDependencyHealthCheck.cs b/samples/HealthChecksSample/SlowDependencyHealthCheck.cs
index 1ca03f88ae..7832724c81 100644
--- a/samples/HealthChecksSample/SlowDependencyHealthCheck.cs
+++ b/samples/HealthChecksSample/SlowDependencyHealthCheck.cs
@@ -4,7 +4,7 @@ using Microsoft.Extensions.Diagnostics.HealthChecks;
 
 namespace HealthChecksSample
 {
-    // Simulates a health check for an  application dependency that takes a while to initialize.
+    // Simulates a health check for an application dependency that takes a while to initialize.
     // This is part of the readiness/liveness probe sample.
     public class SlowDependencyHealthCheck : IHealthCheck
     {