Merge branch 'master' into dev

templates/DotNetTemplating/2.x/CSharp-WebApi/.template.config/template.json

@@ -429,8 +429,13 @@
           "description": "Target Steeltoe version 2.3.0"
         },
         {
+<<<<<<< HEAD
           "choice": "2.4.0",
           "description": "Target Steeltoe version 2.4.0"
+=======
+          "choice": "2.4.0-rc1",
+          "description": "Target Steeltoe version 2.4.0-rc1"
+>>>>>>> master
         }
       ]
     },

templates/DotNetTemplating/2.x/CSharp-WebApi/Startup.cs

@@ -25,7 +25,11 @@ using Microsoft.Extensions.Options;
 #if (Actuators || CloudFoundry)
 using Steeltoe.Management.CloudFoundry;
 using Steeltoe.Management.Endpoint;
+<<<<<<< HEAD
 #if (SteeltoeVersion == "2.2.0" || SteeltoeVersion == "2.3.0" || SteeltoeVersion == "2.4.0")
+=======
+#if (SteeltoeVersion == "2.2.0" || SteeltoeVersion == "2.3.0" || SteeltoeVersion == "2.4.0-rc1")
+>>>>>>> master
 using Steeltoe.Management.Hypermedia;
 #endif
 #endif
@@ -86,7 +90,11 @@ namespace Company.WebApplication1
 #if (MySql)
             services.AddMySqlConnection(Configuration);
 #endif
+<<<<<<< HEAD
 #if (SteeltoeVersion == "2.2.0" || SteeltoeVersion == "2.3.0" || SteeltoeVersion == "2.4.0")
+=======
+#if (SteeltoeVersion == "2.2.0" || SteeltoeVersion == "2.3.0" || SteeltoeVersion == "2.4.0-rc1")
+>>>>>>> master
 #if (Actuators && CloudFoundry)
 	        services.AddCloudFoundryActuators(Configuration, MediaTypeVersion.V2, ActuatorContext.ActuatorAndCloudFoundry);
 #elif (Actuators)
@@ -160,7 +168,11 @@ namespace Company.WebApplication1
 #if (OrganizationalAuth || IndividualAuth)
             app.UseAuthentication();
 #endif
+<<<<<<< HEAD
 #if (SteeltoeVersion == "2.2.0" || SteeltoeVersion == "2.3.0" || SteeltoeVersion == "2.4.0")
+=======
+#if (SteeltoeVersion == "2.2.0" || SteeltoeVersion == "2.3.0" || SteeltoeVersion == "2.4.0-rc1")
+>>>>>>> master
 #if (Actuators && CloudFoundry)
             app.UseCloudFoundryActuators(MediaTypeVersion.V2, ActuatorContext.ActuatorAndCloudFoundry);
 #elif (Actuators)