Merge branch 'development' into 'release/staging'

Development

See merge request liermao/microservice-autodevopspipelines!101

MicroService.AutoDevOpsPipeLines.sln

@@ -11,7 +11,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		devops\deploy.production.props = devops\deploy.production.props
 		devops\deploy.props = devops\deploy.props
 		devops\deploy.staging.props = devops\deploy.staging.props
-		devops\token.props = devops\token.props
 		devops\version.props = devops\version.props
 	EndProjectSection
 EndProject

devops/PipeLines/Functions.core.sh

@@ -141,8 +141,9 @@ function IsPublishableOf()
 # get updating's environment of branch
 function RollEnvironmentOf()
 {
-    FirstCharUpperCase ${CI_COMMIT_REF_NAME} branch
-	declare env=($(grep -oP "(?<=${branch}>)[^<]+" "./devops/branch.env.props"))
+	declare branch=${CI_COMMIT_REF_NAME}
+	declare name=($(grep -oP "(?<=${branch}>)[^<]+" "./devops/branch.env.props"))
+	FirstCharUpperCase ${name} env
 	eval $1="${env}"
 }
 

devops/deploy.props

 <Project>
   <PropertyGroup>
-    <Replicas>1</Replicas>
+    <Replicas>2</Replicas>
     <ImageUserName>devopspipelines</ImageUserName>
   </PropertyGroup>
 </Project>

devops/token.props

-<Project>
-  <PropertyGroup>
-    <Kubernetes>
-      <AccessToken>
-        <Staging></Staging>
-        <Production></Production>
-      </AccessToken>
-    </Kubernetes>
-  </PropertyGroup>
-</Project>

src/Services/Basket/Basket.API/Startup.cs

@@ -11,7 +11,7 @@ namespace Basket.API
     {
         public Startup(IConfiguration configuration)
         {
-            Configuration = configuration;  
+            Configuration = configuration;     
         }
 
         public IConfiguration Configuration { get; }

src/Services/Catalog/Catalog.API/Program.cs

@@ -14,7 +14,7 @@ namespace Catalog.API
     {   
         public static void Main(string[] args)
         {
-            CreateWebHostBuilder(args).Build().Run();
+            CreateWebHostBuilder(args).Build().Run();  
         }
 
         public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>

src/Services/Identity/Identity.API/Startup.cs

@@ -9,7 +9,7 @@ namespace Identity.API
 {
     public class Startup
     {
-        public Startup(IConfiguration configuration)
+        public Startup(IConfiguration configuration)  
         {
             Configuration = configuration;   
         }

src/Services/Marketing/Marketing.API/Program.cs

@@ -13,7 +13,7 @@ namespace Marketing.API
     public class Program
     {
         public static void Main(string[] args)
-        {
+        {  
             CreateWebHostBuilder(args).Build().Run();
         }
 

src/Services/Ordering/Ordering.API/Startup.cs

@@ -11,7 +11,7 @@ namespace Ordering.API
     {
         public Startup(IConfiguration configuration)
         {
-            Configuration = configuration;
+            Configuration = configuration;  
         }
 
         public IConfiguration Configuration { get; }

src/Services/Payment/Payment.API/Startup.cs

@@ -11,7 +11,7 @@ namespace Payment.API
     {
         public Startup(IConfiguration configuration)
         {
-            Configuration = configuration;
+            Configuration = configuration;  
         }
 
         public IConfiguration Configuration { get; }