Miguel Veloso 
							
						 
					 
					
						
						
						
						
							
						
						
							c1d7ca8951 
							
						 
					 
					
						
						
							
							Merge branch 'dev' into features/add-seq-sink  
						
						... 
						
						
						
						# Conflicts SOLVED:
#	.gitignore
#	src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHostExtensions.cs
#	src/Services/Basket/Basket.API/Basket.API.csproj
#	src/Services/Basket/Basket.API/Program.cs
#	src/Services/Basket/Basket.API/Startup.cs
#	src/Services/Catalog/Catalog.API/Catalog.API.csproj
#	src/Services/Catalog/Catalog.API/Program.cs
#	src/Services/Catalog/Catalog.API/Startup.cs
#	src/Services/Identity/Identity.API/Identity.API.csproj
#	src/Services/Identity/Identity.API/Program.cs
#	src/Services/Identity/Identity.API/Startup.cs
#	src/Services/Location/Locations.API/Locations.API.csproj
#	src/Services/Location/Locations.API/Program.cs
#	src/Services/Location/Locations.API/Startup.cs
#	src/Services/Marketing/Marketing.API/Marketing.API.csproj
#	src/Services/Marketing/Marketing.API/Program.cs
#	src/Services/Marketing/Marketing.API/Startup.cs
#	src/Services/Ordering/Ordering.API/Ordering.API.csproj
#	src/Services/Ordering/Ordering.API/Program.cs
#	src/Services/Ordering/Ordering.API/Startup.cs
#	src/Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj
#	src/Services/Ordering/Ordering.SignalrHub/Program.cs
#	src/Services/Ordering/Ordering.SignalrHub/Startup.cs
#	src/Services/Payment/Payment.API/Payment.API.csproj
#	src/Services/Payment/Payment.API/Program.cs
#	src/Services/Payment/Payment.API/Startup.cs
#	src/Web/WebMVC/Program.cs
#	src/Web/WebMVC/Startup.cs
#	src/Web/WebStatus/Program.cs
#	src/Web/WebStatus/Startup.cs
#	src/Web/WebStatus/WebStatus.csproj 
						
						
					 
					
						2019-02-28 15:34:12 +00:00 
						 
				 
			
				
					
						
							
							
								Igor_Sychev 
							
						 
					 
					
						
						
						
						
							
						
						
							e98c625f81 
							
						 
					 
					
						
						
							
							runfix  
						
						
						
						
					 
					
						2019-02-28 11:43:44 +03:00 
						 
				 
			
				
					
						
							
							
								Miguel Veloso 
							
						 
					 
					
						
						
						
						
							
						
						
							b6b0744c74 
							
						 
					 
					
						
						
							
							Standarize ApplicationContext logging property  
						
						
						
						
					 
					
						2019-02-26 21:59:16 +00:00 
						 
				 
			
				
					
						
							
							
								Miguel Veloso 
							
						 
					 
					
						
						
						
						
							
						
						
							38a86f19c4 
							
						 
					 
					
						
						
							
							General refactoring for documentation  
						
						
						
						
					 
					
						2019-02-26 21:55:04 +00:00 
						 
				 
			
				
					
						
							
							
								Igor_Sychev 
							
						 
					 
					
						
						
						
						
							
						
						
							185a5dcc31 
							
						 
					 
					
						
						
							
							minor packages update  
						
						... 
						
						
						
						replace preview apis with production
replace EnableKubernetes with AddApplicationInsightsKubernetesEnricher
replace  loggerFactory.AddAzureWebAppDiagnostics(); with  loggerBuilder.AddAzureWebAppDiagnostics(); 
						
						
					 
					
						2019-02-26 22:28:30 +03:00 
						 
				 
			
				
					
						
							
							
								eiximenis 
							
						 
					 
					
						
						
						
						
							
						
						
							e310a525fe 
							
						 
					 
					
						
						
							
							Devspaces files for Apigateways, basket, ordering, aggregators  
						
						
						
						
					 
					
						2019-02-25 13:26:31 +01:00 
						 
				 
			
				
					
						
							
							
								Miguel Veloso 
							
						 
					 
					
						
						
						
						
							
						
						
							7dbab01b44 
							
						 
					 
					
						
						
							
							Update traces templates  
						
						
						
						
					 
					
						2019-02-22 15:10:18 +00:00 
						 
				 
			
				
					
						
							
							
								Miguel Veloso 
							
						 
					 
					
						
						
						
						
							
						
						
							63a325e92e 
							
						 
					 
					
						
						
							
							Fix non-structured traces  
						
						
						
						
					 
					
						2019-02-22 15:05:28 +00:00 
						 
				 
			
				
					
						
							
							
								Miguel Veloso 
							
						 
					 
					
						
						
						
						
							
						
						
							dfc680e152 
							
						 
					 
					
						
						
							
							Fix naming inconsistency  
						
						
						
						
					 
					
						2019-02-21 18:32:57 +00:00 
						 
				 
			
				
					
						
							
							
								Miguel Veloso 
							
						 
					 
					
						
						
						
						
							
						
						
							405e5be62b 
							
						 
					 
					
						
						
							
							Add publishing integration events traces  
						
						
						
						
					 
					
						2019-02-21 17:58:36 +00:00 
						 
				 
			
				
					
						
							
							
								Miguel Veloso 
							
						 
					 
					
						
						
						
						
							
						
						
							12148c9723 
							
						 
					 
					
						
						
							
							Refactor LogContext for IntegrationEvent Handlers to include AppName  
						
						
						
						
					 
					
						2019-02-21 15:51:37 +00:00 
						 
				 
			
				
					
						
							
							
								Miguel Veloso 
							
						 
					 
					
						
						
						
						
							
						
						
							2158938dda 
							
						 
					 
					
						
						
							
							Fix IntegrationEventIdContext logging property name  
						
						
						
						
					 
					
						2019-02-18 22:35:00 +00:00 
						 
				 
			
				
					
						
							
							
								Miguel Veloso 
							
						 
					 
					
						
						
						
						
							
						
						
							122fab5108 
							
						 
					 
					
						
						
							
							Add LogContext to IntegrationEventHandlers  
						
						
						
						
					 
					
						2019-02-18 19:33:04 +00:00 
						 
				 
			
				
					
						
							
							
								eiximenis 
							
						 
					 
					
						
						
						
						
							
						
						
							820330556b 
							
						 
					 
					
						
						
							
							updated files to new devspaces format  
						
						
						
						
					 
					
						2019-02-13 10:02:07 +01:00 
						 
				 
			
				
					
						
							
							
								eiximenis 
							
						 
					 
					
						
						
						
						
							
						
						
							eed86811aa 
							
						 
					 
					
						
						
							
							Merge branch 'test-devspaces' of  https://github.com/dotnet-architecture/eShopOnContainers  into features/devspaces  
						
						
						
						
					 
					
						2019-02-12 15:55:16 +01:00 
						 
				 
			
				
					
						
							
							
								Miguel Veloso 
							
						 
					 
					
						
						
						
						
							
						
						
							423066a822 
							
						 
					 
					
						
						
							
							Add log traces for integration event handling  
						
						
						
						
					 
					
						2019-02-06 18:53:30 +00:00 
						 
				 
			
				
					
						
							
							
								Miguel Veloso 
							
						 
					 
					
						
						
						
						
							
						
						
							24b660f339 
							
						 
					 
					
						
						
							
							Expore Program.AppName/AppShortName for logging  
						
						
						
						
					 
					
						2019-02-06 13:03:54 +00:00 
						 
				 
			
				
					
						
							
							
								Miguel Veloso 
							
						 
					 
					
						
						
						
						
							
						
						
							3a22e2f35b 
							
						 
					 
					
						
						
							
							Add Seq as sink and some integration event traces  
						
						
						
						
					 
					
						2019-01-31 13:33:36 +00:00 
						 
				 
			
				
					
						
							
							
								Miguel Veloso 
							
						 
					 
					
						
						
						
						
							
						
						
							d6aee2ce35 
							
						 
					 
					
						
						
							
							Remove MachineName from logger configuration, not really useful for eShopOnContainers  
						
						
						
						
					 
					
						2019-01-31 10:47:07 +00:00 
						 
				 
			
				
					
						
							
							
								Miguel Veloso 
							
						 
					 
					
						
						
						
						
							
						
						
							7cd717cf06 
							
						 
					 
					
						
						
							
							Add integration event traces  
						
						
						
						
					 
					
						2019-01-31 10:43:54 +00:00 
						 
				 
			
				
					
						
							
							
								Miguel Veloso 
							
						 
					 
					
						
						
						
						
							
						
						
							4d6b2f03d2 
							
						 
					 
					
						
						
							
							Add Serilog and Seq working in Docker  
						
						
						
						
					 
					
						2019-01-31 10:43:32 +00:00 
						 
				 
			
				
					
						
							
							
								David Henley 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							86c36c9d2a 
							
						 
					 
					
						
						
							
							Fixed type in HttpGlobalExceptionFilter  
						
						... 
						
						
						
						Changed meesage to message 
						
						
					 
					
						2019-01-09 13:39:12 -06:00 
						 
				 
			
				
					
						
							
							
								Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							873d70a67e 
							
						 
					 
					
						
						
							
							Fixed netcore2.2 CORS issue not allowing wildcard origins  
						
						
						
						
					 
					
						2019-01-04 13:39:25 +01:00 
						 
				 
			
				
					
						
							
							
								Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							b9dcc80acd 
							
						 
					 
					
						
						
							
							Merge Netcore2.2 branch  
						
						
						
						
					 
					
						2019-01-03 18:41:58 +01:00 
						 
				 
			
				
					
						
							
							
								Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							dbf175f913 
							
						 
					 
					
						
						
							
							Fixed missing env variables in marketing.api in k8s scripts  
						
						... 
						
						
						
						Added Resource path in webstatus UI when deploying with K8S
Added Liveness healthChecks
Updated k8s healthcheck configuration 
						
						
					 
					
						2019-01-03 17:11:56 +01:00 
						 
				 
			
				
					
						
							
							
								Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							fa0b1a7a6b 
							
						 
					 
					
						
						
							
							Added serilog  
						
						
						
						
					 
					
						2018-12-13 12:13:59 +01:00 
						 
				 
			
				
					
						
							
							
								Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							ffca2da0b3 
							
						 
					 
					
						
						
							
							Migrated to netcore 2.2  
						
						
						
						
					 
					
						2018-12-11 13:51:58 +01:00 
						 
				 
			
				
					
						
							
							
								RamonTC 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							75e4a11116 
							
						 
					 
					
						
						
							
							Merge pull request  #874  from erikpique/test-devspaces  
						
						... 
						
						
						
						Test devspaces 
						
						
					 
					
						2018-12-03 12:35:54 +01:00 
						 
				 
			
				
					
						
							
							
								RamonTC 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							f76d1a6e74 
							
						 
					 
					
						
						
							
							Merge pull request  #865  from erikpique/feature/58388  
						
						... 
						
						
						
						update test deploy 
						
						
					 
					
						2018-12-03 11:22:40 +01:00 
						 
				 
			
				
					
						
							
							
								Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							0f6f4e6d14 
							
						 
					 
					
						
						
							
							Integrate HealthCheck to all eShop services and apps  
						
						... 
						
						
						
						Integrate WebStatus with Healthcheck 
						
						
					 
					
						2018-11-30 17:43:22 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Pique 
							
						 
					 
					
						
						
						
						
							
						
						
							73412e267d 
							
						 
					 
					
						
						
							
							update test deploy  
						
						
						
						
					 
					
						2018-11-29 10:08:34 +01:00 
						 
				 
			
				
					
						
							
							
								RamonTC 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							f7cb3448f2 
							
						 
					 
					
						
						
							
							Merge pull request  #861  from erikpique/feature/58388  
						
						... 
						
						
						
						add test to CI 
						
						
					 
					
						2018-11-27 16:48:20 +01:00 
						 
				 
			
				
					
						
							
							
								RamonTC 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							06e641a97f 
							
						 
					 
					
						
						
							
							Merge pull request  #851  from erikpique/feature/60697  
						
						... 
						
						
						
						Feature/60697 
						
						
					 
					
						2018-11-26 17:40:27 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Pique 
							
						 
					 
					
						
						
						
						
							
						
						
							8cdfbfb941 
							
						 
					 
					
						
						
							
							add test to CI  
						
						
						
						
					 
					
						2018-11-20 10:58:12 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Pique 
							
						 
					 
					
						
						
						
						
							
						
						
							b8969e6746 
							
						 
					 
					
						
						
							
							standar names and fixed response for swagger apis  
						
						
						
						
					 
					
						2018-11-15 12:50:37 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Pique 
							
						 
					 
					
						
						
						
						
							
						
						
							deb3d38ebe 
							
						 
					 
					
						
						
							
							add features api  
						
						
						
						
					 
					
						2018-11-14 16:21:50 +01:00 
						 
				 
			
				
					
						
							
							
								erikpique 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							6aaa718af5 
							
						 
					 
					
						
						
							
							Merge branch 'dev' into feature/net22preview3  
						
						
						
						
					 
					
						2018-11-13 10:25:42 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Pique 
							
						 
					 
					
						
						
						
						
							
						
						
							9775219a34 
							
						 
					 
					
						
						
							
							change netcore 2.1 to 2.2 and update nugets  
						
						
						
						
					 
					
						2018-11-12 17:27:54 +01:00 
						 
				 
			
				
					
						
							
							
								Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							e3f8ac6e84 
							
						 
					 
					
						
						
							
							Refactoring IntegrationEventLog service  
						
						
						
						
					 
					
						2018-10-12 15:30:22 +02:00 
						 
				 
			
				
					
						
							
							
								Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							24bed0aa33 
							
						 
					 
					
						
						
							
							Send IntegrationEvents after committing transactions  
						
						
						
						
					 
					
						2018-10-11 17:16:31 +02:00 
						 
				 
			
				
					
						
							
							
								Erik Pique 
							
						 
					 
					
						
						
						
						
							
						
						
							349d5ea3bb 
							
						 
					 
					
						
						
							
							update swagger nuget to 2.4.0 from 3.0.0  
						
						
						
						
					 
					
						2018-09-27 09:31:16 +02:00 
						 
				 
			
				
					
						
							
							
								eiximenis 
							
						 
					 
					
						
						
						
						
							
						
						
							1b89edec15 
							
						 
					 
					
						
						
							
							mvc devspace  
						
						
						
						
					 
					
						2018-08-29 11:27:03 +02:00 
						 
				 
			
				
					
						
							
							
								eiximenis 
							
						 
					 
					
						
						
						
						
							
						
						
							91d06af314 
							
						 
					 
					
						
						
							
							starting deploys to devspaces  
						
						
						
						
					 
					
						2018-07-31 17:22:27 +02:00 
						 
				 
			
				
					
						
							
							
								Unai Zorrilla Castro 
							
						 
					 
					
						
						
						
						
							
						
						
							5c06f6e500 
							
						 
					 
					
						
						
							
							Fix issue 685  
						
						
						
						
					 
					
						2018-07-31 11:30:00 +02:00 
						 
				 
			
				
					
						
							
							
								Unai Zorrilla Castro 
							
						 
					 
					
						
						
						
						
							
						
						
							b005b63ff5 
							
						 
					 
					
						
						
							
							Add azure key vault support in all services  
						
						
						
						
					 
					
						2018-07-31 09:38:00 +02:00 
						 
				 
			
				
					
						
							
							
								eiximenis 
							
						 
					 
					
						
						
						
						
							
						
						
							fbf89f8fc7 
							
						 
					 
					
						
						
							
							1st devspaces test  
						
						
						
						
					 
					
						2018-07-17 11:04:29 +02:00 
						 
				 
			
				
					
						
							
							
								unaizorrilla 
							
						 
					 
					
						
						
						
						
							
						
						
							afca2308b1 
							
						 
					 
					
						
						
							
							Created unit test and functional tests on each microservice, work on settings for each project tests, modifyc how TestServer is created. Create a docker-compose for run tests  
						
						
						
						
					 
					
						2018-06-27 15:57:37 +02:00 
						 
				 
			
				
					
						
							
							
								eiximenis 
							
						 
					 
					
						
						
						
						
							
						
						
							51236fd5af 
							
						 
					 
					
						
						
							
							Update to netcore2.1 RTM  
						
						... 
						
						
						
						Updates to web Dockerfiles to support microsoft/dotnet:2.1-sdk 
						
						
					 
					
						2018-06-01 18:59:14 +02:00 
						 
				 
			
				
					
						
							
							
								eiximenis 
							
						 
					 
					
						
						
						
						
							
						
						
							684aa4927f 
							
						 
					 
					
						
						
							
							Updates to make it work with Docker  
						
						... 
						
						
						
						- Dockerfiles changes
- Minor csproj updates to bring back "dotnet bundle" cli
- Enable all protocols in SignalR
- Update package-lock.json in spa 
						
						
					 
					
						2018-05-16 14:45:15 +02:00 
						 
				 
			
				
					
						
							
							
								Unai Zorrilla Castro 
							
						 
					 
					
						
						
						
						
							
						
						
							36fb20acea 
							
						 
					 
					
						
						
							
							Refactoring Catalog and Order status and add problem details feature from 2.1  
						
						
						
						
					 
					
						2018-05-15 16:58:53 +02:00