jmanuelcorral 
							
						 
					 
					
						
						
						
						
							
						
						
							a0699501b1 
							
						 
					 
					
						
						
							
							Merged from Dev  
						
						
						
						
					 
					
						2019-03-27 15:54:03 +01:00 
						 
				 
			
				
					
						
							
							
								jmanuelcorral 
							
						 
					 
					
						
						
						
						
							
						
						
							905f8552d9 
							
						 
					 
					
						
						
							
							Updated pointing to ELK external service for testing and demo purposes  
						
						
						
						
					 
					
						2019-03-22 13:45:02 +01:00 
						 
				 
			
				
					
						
							
							
								jmanuelcorral 
							
						 
					 
					
						
						
						
						
							
						
						
							65b7b31d8d 
							
						 
					 
					
						
						
							
							Done Updating versions  
						
						
						
						
					 
					
						2019-03-21 16:38:01 +01:00 
						 
				 
			
				
					
						
							
							
								jmanuelcorral 
							
						 
					 
					
						
						
						
						
							
						
						
							06e07914e1 
							
						 
					 
					
						
						
							
							First version with Kibana/ElasticSearch & Logstash, needs refactor  
						
						
						
						
					 
					
						2019-03-19 15:57:47 +01:00 
						 
				 
			
				
					
						
							
							
								eiximenis 
							
						 
					 
					
						
						
						
						
							
						
						
							1f762a6bcf 
							
						 
					 
					
						
						
							
							devspaces scripts  
						
						
						
						
					 
					
						2019-03-15 19:52:34 +01:00 
						 
				 
			
				
					
						
							
							
								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 
							
						 
					 
					
						
						
						
						
							
						
						
							1723771030 
							
						 
					 
					
						
						
							
							Marketing API devspaces  
						
						
						
						
					 
					
						2019-02-25 16:18:45 +01: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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								Miguel Veloso 
							
						 
					 
					
						
						
						
						
							
						
						
							ca02053586 
							
						 
					 
					
						
						
							
							Added Seq to Marketing.API  
						
						
						
						
					 
					
						2019-02-18 16:32:08 +00: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 
						 
				 
			
				
					
						
							
							
								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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								Erik Pique 
							
						 
					 
					
						
						
						
						
							
						
						
							9775219a34 
							
						 
					 
					
						
						
							
							change netcore 2.1 to 2.2 and update nugets  
						
						
						
						
					 
					
						2018-11-12 17:27:54 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Pique 
							
						 
					 
					
						
						
						
						
							
						
						
							349d5ea3bb 
							
						 
					 
					
						
						
							
							update swagger nuget to 2.4.0 from 3.0.0  
						
						
						
						
					 
					
						2018-09-27 09:31:16 +02:00 
						 
				 
			
				
					
						
							
							
								Unai Zorrilla Castro 
							
						 
					 
					
						
						
						
						
							
						
						
							b005b63ff5 
							
						 
					 
					
						
						
							
							Add azure key vault support in all services  
						
						
						
						
					 
					
						2018-07-31 09:38:00 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							b02c1b825d 
							
						 
					 
					
						
						
							
							Migrate all dockerfiles to use 2.1 image. Added ApiBehaviorOptions into Catalog  
						
						
						
						
					 
					
						2018-05-15 16:27:10 +02:00 
						 
				 
			
				
					
						
							
							
								Unai Zorrilla Castro 
							
						 
					 
					
						
						
						
						
							
						
						
							d1b6bc84fa 
							
						 
					 
					
						
						
							
							Migrated projects and references to use 2.1 rc1 libraries  
						
						
						
						
					 
					
						2018-05-15 12:42:08 +02:00 
						 
				 
			
				
					
						
							
							
								Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							02f94eeb0e 
							
						 
					 
					
						
						
							
							Updated k8s scripts  
						
						
						
						
					 
					
						2018-04-16 19:28:12 +02:00 
						 
				 
			
				
					
						
							
							
								David Britch 
							
						 
					 
					
						
						
						
						
							
						
						
							e519fbde43 
							
						 
					 
					
						
						
							
							Merge branch 'bff' into xamarin-settings  
						
						
						
						
					 
					
						2018-03-29 13:52:03 +01:00 
						 
				 
			
				
					
						
							
							
								eiximenis 
							
						 
					 
					
						
						
						
						
							
						
						
							0e119eac86 
							
						 
					 
					
						
						
							
							Merge branch 'xamarin-oidcclient' into bff  
						
						... 
						
						
						
						# Conflicts:
#	.dockerignore
#	docker-compose.override.yml
#	docker-compose.yml
#	eShopOnContainers-ServicesAndWebApps.sln
#	k8s/deploy.ps1
#	k8s/deployments.yaml
#	k8s/frontend.yaml
#	src/Services/Identity/Identity.API/Data/ConfigurationDbContextSeed.cs
#	src/Services/Ordering/Ordering.Domain/AggregatesModel/OrderAggregate/Order.cs 
						
						
					 
					
						2018-03-23 12:37:12 +01:00 
						 
				 
			
				
					
						
							
							
								Miguel Veloso 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							b12b536439 
							
						 
					 
					
						
						
							
							Merge pull request  #524  from SychevIgor/packagesupdate  
						
						... 
						
						
						
						packages update 
						
						
					 
					
						2018-03-17 16:25:58 +00:00 
						 
				 
			
				
					
						
							
							
								Cesar De la Torre Llorente 
							
						 
					 
					
						
						
						
						
							
						
						
							b78daa4685 
							
						 
					 
					
						
						
							
							Fix microsoft/aspnetcore-build:2.0.5-2.1.4 name in dockerfiles  
						
						
						
						
					 
					
						2018-03-16 10:41:23 -07:00 
						 
				 
			
				
					
						
							
							
								Cesar De la Torre Llorente 
							
						 
					 
					
						
						
						
						
							
						
						
							c17ecfa16a 
							
						 
					 
					
						
						
							
							Fallback to aspnetcore-build:2.0.5-2.1.4 until issue with aspnetcore-build:2.0 is solved:  https://github.com/dotnet-architecture/eShopOnContainers/issues/543  
						
						
						
						
					 
					
						2018-03-14 16:35:51 -07:00 
						 
				 
			
				
					
						
							
							
								Sychev Igor 
							
						 
					 
					
						
						
						
						
							
						
						
							039632bebd 
							
						 
					 
					
						
						
							
							docker to 2.0.5 .net core  
						
						
						
						
					 
					
						2018-03-05 00:59:27 +03:00 
						 
				 
			
				
					
						
							
							
								Sychev Igor 
							
						 
					 
					
						
						
						
						
							
						
						
							c1db0703a7 
							
						 
					 
					
						
						
							
							packages update 2  
						
						
						
						
					 
					
						2018-03-04 14:10:51 +03:00 
						 
				 
			
				
					
						
							
							
								Sychev Igor 
							
						 
					 
					
						
						
						
						
							
						
						
							ccad354645 
							
						 
					 
					
						
						
							
							packages update  
						
						
						
						
					 
					
						2018-03-04 14:10:51 +03:00 
						 
				 
			
				
					
						
							
							
								Miguel Veloso 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							5f3b1557e6 
							
						 
					 
					
						
						
							
							Merge pull request  #491  from raboud/ContextSeed  
						
						... 
						
						
						
						Changed AddRange to AddRangeAsync 
						
						
					 
					
						2018-02-15 22:43:46 +00:00 
						 
				 
			
				
					
						
							
							
								Cesar De la Torre 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c5038ad77e 
							
						 
					 
					
						
						
							
							Merge pull request  #487  from yantang-msft/FixDeployment  
						
						... 
						
						
						
						Update AI k8s package version, otherwise kubernetes deployment will fail 
						
						
					 
					
						2018-02-09 13:12:11 -08:00 
						 
				 
			
				
					
						
							
							
								Robert Raboud 
							
						 
					 
					
						
						
						
						
							
						
						
							2451ab9dff 
							
						 
					 
					
						
						
							
							Changed AddRange to AddRangeAwait  
						
						
						
						
					 
					
						2018-01-30 08:16:20 -05:00 
						 
				 
			
				
					
						
							
							
								Eduard Tomàs 
							
						 
					 
					
						
						
						
						
							
						
						
							47a33ddd05 
							
						 
					 
					
						
						
							
							BFF Purchase - WIP  
						
						
						
						
					 
					
						2018-01-29 16:58:08 +01:00 
						 
				 
			
				
					
						
							
							
								yantang 
							
						 
					 
					
						
						
						
						
							
						
						
							23bdd59b10 
							
						 
					 
					
						
						
							
							Update AI k8s package version, otherwise kubernetes deployment will fail because of deadlock.  
						
						
						
						
					 
					
						2018-01-28 23:33:44 -08:00 
						 
				 
			
				
					
						
							
							
								Eduard Tomàs 
							
						 
					 
					
						
						
						
						
							
						
						
							9371eb1077 
							
						 
					 
					
						
						
							
							Add a endpoint returning only a 200 to be used  as a liveness probe for k8s  
						
						
						
						
					 
					
						2018-01-22 11:46:18 +01:00 
						 
				 
			
				
					
						
							
							
								Cesar De la Torre 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							ded64feae2 
							
						 
					 
					
						
						
							
							Merge pull request  #452  from SychevIgor/k8appinsbeta2  
						
						... 
						
						
						
						Upgrades to "Microsoft.ApplicationInsights.Kubernetes" Version="1.0.0-beta2" 
						
						
					 
					
						2018-01-16 12:41:29 -08:00