Ticket ## : Fix the build

habarthierry-hue · habarthierry-hue · commit d7b29176ad48 · 2020-05-08T14:44:50.000+02:00
diff --git a/appveyor.yml b/appveyor.yml
@@ -14,7 +14,7 @@ install:
 nuget:
   disable_publish_on_pr: true
 build_script:
-- cmd: .\psake.cmd publish
+- cmd: .\psake.cmd ci
 test: off
 artifacts:
 - path: build\results\*.nupkg
@@ -27,10 +27,12 @@ deploy:
   api_key:
     secure: zs1JVjFHRdvB36fGq2rN8MR7QeJnCVkt7VTG4ZHT5OYDNpuh2AlGHqK+rseevn8l
   skip_symbols: true
+  artifact: /.*\.nupkg/
   on:
     branch: master
 - provider: NuGet
   name: production
+  artifact: /.*\.nupkg/
   api_key:
     secure: Uigh51VjtY/sVniNFhkSvZ60/FvI9DyJ/g2feCm/WNdzeN9x5FSiqQwF9Y8qQ6nj
   on:
diff --git a/conf/casemanagement.nginx b/conf/casemanagement.nginx
@@ -13,7 +13,7 @@ server {
 	server_name simpleidserver.northeurope.cloudapp.azure.com;
 		
 	location /casemanagement {
-		proxy_pass http://localhost:51724;
+		proxy_pass http://localhost:5002;
 		proxy_set_header Upgrade $http_upgrade;
 		proxy_set_header Connection keep-alive;
 		proxy_set_header Host $host;
@@ -36,7 +36,7 @@ server {
 	}
     
 	location /casemanagementperformance {
-		proxy_pass http://localhost:51725;
+		proxy_pass http://localhost:5003;
 		proxy_set_header Upgrade $http_upgrade;
 		proxy_set_header Connection keep-alive;
 		proxy_set_header Host $host;
@@ -59,30 +59,7 @@ server {
 	}
 		
 	location /casemanagementapi {				
-		proxy_pass http://localhost:56696;
-		proxy_set_header Upgrade $http_upgrade;
-		proxy_set_header Connection keep-alive;
-		proxy_set_header Host $host;
-		proxy_pass_header Set-Cookie;
-		proxy_pass_request_headers on;
-		proxy_cache_bypass $http_upgrade;
-		proxy_cookie_domain localhost $host;
-		proxy_set_header X-Scheme https;
-		proxy_set_header X-Real-IP $remote_addr;
-		proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-		proxy_set_header X-Forwarded-Proto $scheme;
-		proxy_set_header X-URL-SCHEME https;
-		client_max_body_size 1M;
-		client_body_buffer_size 4096k;
-		proxy_connect_timeout 90;
-		proxy_send_timeout 90;
-		proxy_read_timeout 90;
-		proxy_buffer_size 128k;
-		proxy_buffers 32 256k;
-	}
-	
-	location /casemanagementidentity {				
-		proxy_pass http://localhost:60000;
+		proxy_pass http://localhost:5004;
 		proxy_set_header Upgrade $http_upgrade;
 		proxy_set_header Connection keep-alive;
 		proxy_set_header Host $host;
diff --git a/conf/casemanagement.service b/conf/casemanagement.service
@@ -1,13 +1,13 @@
 [Unit]
-Description=Case management
+Description=Case Management API
 After=network.target
 
 [Service]
-ExecStart=/usr/bin/dotnet /src/CaseManagement/src/CaseManagement.CMMN.Host/bin/Debug/netcoreapp3.1/CaseManagement.CMMN.Host.dll --server.urls="http://*:54942"
+ExecStart=/usr/bin/dotnet /home/ftpuser/src/build/results/services/CaseManagementApi/CaseManagement.CMMN.Host.dll --server.urls="http://*:60005"
 KillMode=process
 TimeoutStopSec=5s
 Restart=always
-WorkingDirectory=/src/CaseManagement/src/CaseManagement.CMMN.Host/bin/Debug/netcoreapp3.1
+WorkingDirectory=/home/ftpuser/src/build/results/services/CaseManagementApi
 
 [Install]
 WantedBy=multi-user.target
diff --git a/conf/casemanagementgateway.service b/conf/casemanagementgateway.service
@@ -1,13 +1,13 @@
 [Unit]
-Description=Case management gateway
+Description=Case Management gateway
 After=network.target
 
 [Service]
-ExecStart=/usr/bin/dotnet /src/CaseManagement/src/CaseManagement.Gateway.Website.Host/bin/Debug/netcoreapp3.1/CaseManagement.Gateway.Website.Host.dll --pathBase=/casemanagementapi --server.urls="http://*:56696"
+ExecStart=/usr/bin/dotnet /home/ftpuser/src/build/results/services/CaseManagementGateway/CaseManagement.Gateway.Website.Host.dll --pathBase=/casemanagementapi  --server.urls="http://*:5004"
 KillMode=process
 TimeoutStopSec=5s
 Restart=always
-WorkingDirectory=/src/CaseManagement/src/CaseManagement.Gateway.Website.Host
+WorkingDirectory=/home/ftpuser/src/build/results/services/CaseManagementGateway
 
 [Install]
 WantedBy=multi-user.target
diff --git a/conf/casemanagementidentity.service b/conf/casemanagementidentity.service
diff --git a/conf/casemanagementoauth.service b/conf/casemanagementoauth.service
diff --git a/conf/casemanagementperformance.service b/conf/casemanagementperformance.service
@@ -1,13 +1,13 @@
 [Unit]
-Description=Case management performance
+Description=Case Management performance
 After=network.target
 
 [Service]
-ExecStart=/usr/bin/dotnet /src/CaseManagement/src/CaseManagement.Performance/bin/Debug/netcoreapp2.2/CaseManagement.Performance.dll --pathBase=/casemanagementperformance --server.urls="http://*:51725"
+ExecStart=/usr/bin/dotnet /home/ftpuser/src/build/results/services/CaseManagementPerformance/CaseManagement.Performance.dll --pathBase=/casemanagementperformance --server.urls="http://*:5003"
 KillMode=process
 TimeoutStopSec=5s
 Restart=always
-WorkingDirectory=/src/CaseManagement/src/CaseManagement.Performance
+WorkingDirectory=/home/ftpuser/src/build/results/services/CaseManagementPerformance
 
 [Install]
 WantedBy=multi-user.target
diff --git a/conf/casemanagementwebsite.service b/conf/casemanagementwebsite.service
@@ -3,11 +3,11 @@ Description=Case management website
 After=network.target
 
 [Service]
-ExecStart=/usr/bin/dotnet /src/CaseManagement/src/CaseManagement.Website/bin/Debug/netcoreapp2.2/CaseManagement.Website.dll --pathBase=/casemanagement --server.urls="http://*:51724"
+ExecStart=/usr/bin/dotnet /home/ftpuser/src/build/results/services/CaseManagementWebsite/CaseManagement.Website.dll --pathBase=/casemanagement --server.urls="http://*:5002"
 KillMode=process
 TimeoutStopSec=5s
 Restart=always
-WorkingDirectory=/src/CaseManagement/src/CaseManagement.Website
+WorkingDirectory=/home/ftpuser/src/build/results/services/CaseManagementWebsite
 
 [Install]
 WantedBy=multi-user.target
diff --git a/default.ps1 b/default.ps1
@@ -23,6 +23,9 @@ task publish {
 	exec { npm install $source_dir\CaseManagement.Website --prefix $source_dir\CaseManagement.Website }
 	exec { npm run build-azure --prefix $source_dir\CaseManagement.Website }
 	exec { dotnet publish $source_dir\CaseManagement.Website -c $config -o $result_dir\services\CaseManagementWebsite }
+	exec { npm install $source_dir\CaseManagement.Performance --prefix $source_dir\CaseManagement.Performance }
+	exec { npm run build-azure --prefix $source_dir\CaseManagement.Performance }
+	exec { dotnet publish $source_dir\CaseManagement.Performance -c $config -o $result_dir\services\CaseManagementPerformance }
 }
 
 task clean {
diff --git a/src/CaseManagement.CMMN.Host/Properties/launchSettings.json b/src/CaseManagement.CMMN.Host/Properties/launchSettings.json
@@ -5,7 +5,7 @@
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       },
-      "applicationUrl": "http://localhost:54942/"
+      "applicationUrl": "http://localhost:60005/"
     }
   }
 }
diff --git a/src/CaseManagement.CMMN.Host/Startup.cs b/src/CaseManagement.CMMN.Host/Startup.cs
@@ -62,12 +62,12 @@ public void ConfigureServices(IServiceCollection services)
                     ValidAudiences = new List<string>
                     {
                         "http://localhost:60000",
-                        "http://simpleidserver.northeurope.cloudapp.azure.com/casemanagementidentity"
+                        "http://simpleidserver.northeurope.cloudapp.azure.com/openid"
                     },
                     ValidIssuers = new List<string>
                     {
                         "http://localhost:60000",
-                        "http://simpleidserver.northeurope.cloudapp.azure.com/casemanagementidentity"
+                        "http://simpleidserver.northeurope.cloudapp.azure.com/openid"
                     }
                 };
             });
diff --git a/src/CaseManagement.Gateway.Website.Host/Startup.cs b/src/CaseManagement.Gateway.Website.Host/Startup.cs
@@ -46,12 +46,12 @@ public void ConfigureServices(IServiceCollection services)
                     ValidAudiences = new List<string>
                     {
                         "http://localhost:60000",
-                        "http://simpleidserver.northeurope.cloudapp.azure.com/casemanagementidentity"
+                        "http://simpleidserver.northeurope.cloudapp.azure.com/openid"
                     },
                     ValidIssuers = new List<string>
                     {
                         "http://localhost:60000",
-                        "http://simpleidserver.northeurope.cloudapp.azure.com/casemanagementidentity"
+                        "http://simpleidserver.northeurope.cloudapp.azure.com/openid"
                     }
                 };
             });
@@ -91,7 +91,7 @@ public void ConfigureServices(IServiceCollection services)
                 .AllowAnyHeader()));
             services.AddWebsiteGateway(opts =>
             {
-                opts.ApiUrl = "http://localhost:54942";
+                opts.ApiUrl = "http://localhost:60005";
                 opts.TokenUrl = "http://localhost:60001/token";
                 opts.ClientId = "websiteGateway";
                 opts.ClientSecret = "websiteGatewaySecret";
diff --git a/src/CaseManagement.Performance/config/webpack.azure.js b/src/CaseManagement.Performance/config/webpack.azure.js
@@ -10,7 +10,7 @@ const FilterWarningsPlugin = require('webpack-filter-warnings-plugin');
 
 const ENV = process.env.ENV = process.env.NODE_ENV = 'azure';
 const API_URL = process.env.API_URL = "http://simpleidserver.northeurope.cloudapp.azure.com/casemanagementapi";
-const OPENID_URL = process.env.OPENID_URL = "http://simpleidserver.northeurope.cloudapp.azure.com/casemanagementidentity";
+const OPENID_URL = process.env.OPENID_URL = "http://simpleidserver.northeurope.cloudapp.azure.com/openid";
 const REDIRECT_URL = process.env.REDIRECT_URL = "http://simpleidserver.northeurope.cloudapp.azure.com/casemanagementperformance";
 const BASE_URL = process.env.BASE_URL || '/casemanagementperformance/';
 
diff --git a/src/CaseManagement.Website/CaseManagement.Website.csproj b/src/CaseManagement.Website/CaseManagement.Website.csproj
@@ -9,7 +9,4 @@
   <ItemGroup>
     <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="wwwroot\assets\monaco\" />
-  </ItemGroup>
 </Project>
diff --git a/src/CaseManagement.Website/Properties/launchSettings.json b/src/CaseManagement.Website/Properties/launchSettings.json
@@ -1,27 +1,11 @@
 {
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:51723/",
-      "sslPort": 0
-    }
-  },
   "profiles": {
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
     "CaseManagement.Website": {
       "commandName": "Project",
-      "launchBrowser": true,
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       },
-      "applicationUrl": "http://localhost:51724/"
+      "applicationUrl": "http://localhost:5000/"
     }
   }
 }
diff --git a/src/CaseManagement.Website/config/webpack.azure.js b/src/CaseManagement.Website/config/webpack.azure.js
@@ -10,7 +10,7 @@ const FilterWarningsPlugin = require('webpack-filter-warnings-plugin');
 
 const ENV = process.env.ENV = process.env.NODE_ENV = 'azure';
 const API_URL = process.env.API_URL = "http://simpleidserver.northeurope.cloudapp.azure.com/casemanagementapi";
-const OPENID_URL = process.env.OPENID_URL = "http://simpleidserver.northeurope.cloudapp.azure.com/casemanagementidentity";
+const OPENID_URL = process.env.OPENID_URL = "http://simpleidserver.northeurope.cloudapp.azure.com/openid";
 const REDIRECT_URL = process.env.REDIRECT_URL = "http://simpleidserver.northeurope.cloudapp.azure.com/casemanagement";
 const BASE_URL = process.env.BASE_URL || '/casemanagement/';
 

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,9 @@ task publish {`
`23`	`23`	`exec { npm install $source_dir\CaseManagement.Website --prefix $source_dir\CaseManagement.Website }`
`24`	`24`	`exec { npm run build-azure --prefix $source_dir\CaseManagement.Website }`
`25`	`25`	`exec { dotnet publish $source_dir\CaseManagement.Website -c $config -o $result_dir\services\CaseManagementWebsite }`
	`26`	`+ exec { npm install $source_dir\CaseManagement.Performance --prefix $source_dir\CaseManagement.Performance }`
	`27`	`+ exec { npm run build-azure --prefix $source_dir\CaseManagement.Performance }`
	`28`	`+ exec { dotnet publish $source_dir\CaseManagement.Performance -c $config -o $result_dir\services\CaseManagementPerformance }`
`26`	`29`	`}`
`27`	`30`
`28`	`31`	`task clean {`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`"environmentVariables": {`
`6`	`6`	`"ASPNETCORE_ENVIRONMENT": "Development"`
`7`	`7`	`},`
`8`		`- "applicationUrl": "http://localhost:54942/"`
	`8`	`+ "applicationUrl": "http://localhost:60005/"`
`9`	`9`	`}`
`10`	`10`	`}`
`11`	`11`	`}`