Merge remote-tracking branch 'origin/release/2.2'

# Conflicts:
#	version.props

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>

samples/HealthChecksSample/LivenessProbeStartup.cs

@@ -43,14 +43,14 @@ 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).
 
 
             // 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

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"]);
 

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
     {