Erik Pique 
							
						 
					 
					
						
						
						
						
							
						
						
							e9811980f3 
							
						 
					 
					
						
						
							
							fix catalog  
						
						
						
						
					 
					
						2019-07-26 15:39:50 +02:00 
						 
				 
			
				
					
						
							
							
								Erik Pique 
							
						 
					 
					
						
						
						
						
							
						
						
							9e97fb415b 
							
						 
					 
					
						
						
							
							Merge branch 'features/migration-dotnet3' of  https://github.com/dotnet-architecture/eShopOnContainers  into features/migration-dotnet3  
						
						
						
						
					 
					
						2019-07-26 11:15:22 +02:00 
						 
				 
			
				
					
						
							
							
								Erik Pique 
							
						 
					 
					
						
						
						
						
							
						
						
							0a0b013b73 
							
						 
					 
					
						
						
							
							change startup routing  
						
						
						
						
					 
					
						2019-07-26 11:11:31 +02:00 
						 
				 
			
				
					
						
							
							
								ericuss 
							
						 
					 
					
						
						
						
						
							
						
						
							e10fbfd6ea 
							
						 
					 
					
						
						
							
							Migrate Ordering.UnitTests and fix packages of Ordering.API  
						
						
						
						
					 
					
						2019-07-26 10:54:17 +02:00 
						 
				 
			
				
					
						
							
							
								Erik Pique 
							
						 
					 
					
						
						
						
						
							
						
						
							8b0ec9038f 
							
						 
					 
					
						
						
							
							fix routing  
						
						
						
						
					 
					
						2019-07-26 09:42:43 +02:00 
						 
				 
			
				
					
						
							
							
								Erik Pique 
							
						 
					 
					
						
						
						
						
							
						
						
							50a1e1311e 
							
						 
					 
					
						
						
							
							update preview7  
						
						
						
						
					 
					
						2019-07-25 11:30:17 +02:00 
						 
				 
			
				
					
						
							
							
								Erik Pique 
							
						 
					 
					
						
						
						
						
							
						
						
							25067820e0 
							
						 
					 
					
						
						
							
							Merge branch 'features/migration-dotnet3' of  https://github.com/dotnet-architecture/eShopOnContainers  into features/migration-dotnet3  
						
						
						
						
					 
					
						2019-07-24 12:15:47 +02:00 
						 
				 
			
				
					
						
							
							
								Erik Pique 
							
						 
					 
					
						
						
						
						
							
						
						
							79405b89b0 
							
						 
					 
					
						
						
							
							modify retries count  
						
						
						
						
					 
					
						2019-07-24 12:15:38 +02:00 
						 
				 
			
				
					
						
							
							
								ericuss 
							
						 
					 
					
						
						
						
						
							
						
						
							eb1c2705cb 
							
						 
					 
					
						
						
							
							Migrate Catalog.UnitTests  
						
						
						
						
					 
					
						2019-07-24 11:22:46 +02:00 
						 
				 
			
				
					
						
							
							
								Erik Pique 
							
						 
					 
					
						
						
						
						
							
						
						
							fe93901f08 
							
						 
					 
					
						
						
							
							identity service  
						
						
						
						
					 
					
						2019-07-23 15:23:26 +02:00 
						 
				 
			
				
					
						
							
							
								Erik Pique 
							
						 
					 
					
						
						
						
						
							
						
						
							756142db94 
							
						 
					 
					
						
						
							
							upgrade net3 webapp  
						
						
						
						
					 
					
						2019-07-23 12:14:09 +02:00 
						 
				 
			
				
					
						
							
							
								Erik Pique 
							
						 
					 
					
						
						
						
						
							
						
						
							66bee87584 
							
						 
					 
					
						
						
							
							migrate marketing  
						
						
						
						
					 
					
						2019-07-22 16:16:57 +02:00 
						 
				 
			
				
					
						
							
							
								eiximenis 
							
						 
					 
					
						
						
						
						
							
						
						
							577aca1d4c 
							
						 
					 
					
						
						
							
							Basket.API updated to net3  
						
						
						
						
					 
					
						2019-07-19 13:09:30 +02:00 
						 
				 
			
				
					
						
							
							
								eiximenis 
							
						 
					 
					
						
						
						
						
							
						
						
							96c3b12721 
							
						 
					 
					
						
						
							
							More package refs moved to dependencies.props  
						
						
						
						
					 
					
						2019-07-18 12:31:27 +02:00 
						 
				 
			
				
					
						
							
							
								eiximenis 
							
						 
					 
					
						
						
						
						
							
						
						
							437bdd7431 
							
						 
					 
					
						
						
							
							Using Directory.Build.props for handling versions. Needed to start the update to net3  
						
						
						
						
					 
					
						2019-07-17 18:26:20 +02:00 
						 
				 
			
				
					
						
							
							
								eiximenis 
							
						 
					 
					
						
						
						
						
							
						
						
							591086956d 
							
						 
					 
					
						
						
							
							grpc poc working on k8s, using envoy as a sidecar in catalog api  
						
						
						
						
					 
					
						2019-06-27 16:16:11 +02:00 
						 
				 
			
				
					
						
							
							
								Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							db00159347 
							
						 
					 
					
						
						
							
							Added envoy + config grpc json transcoder  
						
						
						
						
					 
					
						2019-06-27 11:15:24 +02:00 
						 
				 
			
				
					
						
							
							
								eiximenis 
							
						 
					 
					
						
						
						
						
							
						
						
							7c0e2a1c86 
							
						 
					 
					
						
						
							
							Catalog.API gRPC support for one endpoint  
						
						
						
						
					 
					
						2019-06-26 12:58:07 +02:00 
						 
				 
			
				
					
						
							
							
								eiximenis 
							
						 
					 
					
						
						
						
						
							
						
						
							58f156f417 
							
						 
					 
					
						
						
							
							fixing dockerfiles for windows  
						
						
						
						
					 
					
						2019-05-28 11:49:39 +02:00 
						 
				 
			
				
					
						
							
							
								Miguel Veloso 
							
						 
					 
					
						
						
						
						
							
						
						
							61ecfba052 
							
						 
					 
					
						
						
							
							Add a TransactionId to IntegrationEventLogEntry to ensure that chained integration events are only published once from the correct transaction scope  
						
						
						
						
					 
					
						2019-05-07 21:29:37 +01:00 
						 
				 
			
				
					
						
							
							
								Miguel Veloso 
							
						 
					 
					
						
						
						
						
							
						
						
							914e8bd0cd 
							
						 
					 
					
						
						
							
							Make the RUN restore-packages optional through an option on docker-compose  
						
						
						
						
					 
					
						2019-04-22 18:10:53 +01:00 
						 
				 
			
				
					
						
							
							
								Miguel Veloso 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							376030c179 
							
						 
					 
					
						
						
							
							Merge branch 'dev' into enhancement/add-restore-packages-layer  
						
						
						
						
					 
					
						2019-04-15 19:39:06 +01:00 
						 
				 
			
				
					
						
							
							
								Miguel Veloso 
							
						 
					 
					
						
						
						
						
							
						
						
							3ef07a580c 
							
						 
					 
					
						
						
							
							Fix compilation errors and failling unit tests  
						
						
						
						
					 
					
						2019-04-15 19:32:12 +01:00 
						 
				 
			
				
					
						
							
							
								Miguel Veloso 
							
						 
					 
					
						
						
						
						
							
						
						
							06018d4080 
							
						 
					 
					
						
						
							
							Streamline Dockerfiles  
						
						
						
						
					 
					
						2019-04-13 08:23:40 +01:00 
						 
				 
			
				
					
						
							
							
								Miguel Veloso 
							
						 
					 
					
						
						
						
						
							
						
						
							be75d554f2 
							
						 
					 
					
						
						
							
							Inital Dockerfiles  
						
						
						
						
					 
					
						2019-04-12 19:45:45 +01:00 
						 
				 
			
				
					
						
							
							
								Miguel Veloso 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							8dea75d1fc 
							
						 
					 
					
						
						
							
							Merge pull request  #1003  from dotnet-architecture/fix/unit-and-functional-tests-failures  
						
						... 
						
						
						
						Fix tests projects compilation errors and unit tests failures 
						
						
					 
					
						2019-04-11 20:17:59 +01:00 
						 
				 
			
				
					
						
							
							
								Miguel Veloso 
							
						 
					 
					
						
						
						
						
							
						
						
							493df257c8 
							
						 
					 
					
						
						
							
							Fix compilation errors and unit tests failures  
						
						
						
						
					 
					
						2019-04-11 20:12:58 +01:00 
						 
				 
			
				
					
						
							
							
								eiximenis 
							
						 
					 
					
						
						
						
						
							
						
						
							c0e125f2bf 
							
						 
					 
					
						
						
							
							Merge from features/devspaces to dev  
						
						
						
						
					 
					
						2019-04-11 14:38:31 +02:00 
						 
				 
			
				
					
						
							
							
								Lee Dumond 
							
						 
					 
					
						
						
						
						
							
						
						
							e987dcfb7d 
							
						 
					 
					
						
						
							
							fix references in functional test projects  
						
						
						
						
					 
					
						2019-04-08 19:25:28 -05:00 
						 
				 
			
				
					
						
							
							
								Rafsanul Hasan 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							665392fa0b 
							
						 
					 
					
						
						
							
							Merge pull request  #100  from sicsbd/dev  
						
						... 
						
						
						
						update to latest commit 
						
						
					 
					
						2019-04-03 08:13:32 +06:00 
						 
				 
			
				
					
						
							
							
								Miguel Veloso 
							
						 
					 
					
						
						
						
						
							
						
						
							396d33fe7b 
							
						 
					 
					
						
						
							
							Use AsyncEventingBasicConsumer in RabbitMQ to properly use async event handlers  
						
						
						
						
					 
					
						2019-04-02 15:36:20 +01:00 
						 
				 
			
				
					
						
							
							
								rafsanulhasan 
							
						 
					 
					
						
						
						
						
							
						
						
							a10d9fb663 
							
						 
					 
					
						
						
							
							fix typo  
						
						
						
						
					 
					
						2019-04-02 15:57:04 +06:00 
						 
				 
			
				
					
						
							
							
								eiximenis 
							
						 
					 
					
						
						
						
						
							
						
						
							e809029e2c 
							
						 
					 
					
						
						
							
							Final fixes to make it work under Devspaces  
						
						
						
						
					 
					
						2019-03-28 18:59:45 +01:00 
						 
				 
			
				
					
						
							
							
								jmanuelcorral 
							
						 
					 
					
						
						
						
						
							
						
						
							0706c724ad 
							
						 
					 
					
						
						
							
							Changed default logstashUrl to null  
						
						
						
						
					 
					
						2019-03-27 15:58:57 +01:00 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								eiximenis 
							
						 
					 
					
						
						
						
						
							
						
						
							a327fac586 
							
						 
					 
					
						
						
							
							updating middle name of azds config for catalog.api  
						
						
						
						
					 
					
						2019-03-21 10:17:35 +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 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							1219f892c5 
							
						 
					 
					
						
						
							
							Merge pull request  #899  from davidhenley/patch-1  
						
						... 
						
						
						
						Fixed typo in HttpGlobalExceptionFilter 
						
						
					 
					
						2019-03-05 19:21:25 +00: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 
							
						 
					 
					
						
						
						
						
							
						
						
							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