ericuss 
							
						 
					 
					
						
						
						
						
							
						
						
							ceb3d9b0bc 
							
						 
					 
					
						
						
							
							Merge branch 'features/migration-dotnet3' of  https://github.com/dotnet-architecture/eShopOnContainers  into features/migration-dotnet3  
						
						
						
						
					 
					
						2019-08-05 16:18:34 +02:00 
						 
				 
			
				
					
						
							
							
								ericuss 
							
						 
					 
					
						
						
						
						
							
						
						
							48bc95f88c 
							
						 
					 
					
						
						
							
							Fix functional tests of Marketing  
						
						
						
						
					 
					
						2019-08-05 16:17:18 +02:00 
						 
				 
			
				
					
						
							
							
								Erik Pique 
							
						 
					 
					
						
						
						
						
							
						
						
							c52484859f 
							
						 
					 
					
						
						
							
							change bff to 2.2 and fix mvc routing  
						
						
						
						
					 
					
						2019-08-05 15:03:57 +02:00 
						 
				 
			
				
					
						
							
							
								ericuss 
							
						 
					 
					
						
						
						
						
							
						
						
							44af7aa8d2 
							
						 
					 
					
						
						
							
							Partial checkin  
						
						
						
						
					 
					
						2019-08-05 14:21:58 +02:00 
						 
				 
			
				
					
						
							
							
								ericuss 
							
						 
					 
					
						
						
						
						
							
						
						
							aedd0e38e9 
							
						 
					 
					
						
						
							
							partial checkin  
						
						
						
						
					 
					
						2019-08-05 10:20:20 +02:00 
						 
				 
			
				
					
						
							
							
								Erik Pique 
							
						 
					 
					
						
						
						
						
							
						
						
							671d8b1e27 
							
						 
					 
					
						
						
							
							fix to startup identiy: remove old migrations and add initial migration.  
						
						
						
						
					 
					
						2019-07-29 13:21:00 +02:00 
						 
				 
			
				
					
						
							
							
								ericuss 
							
						 
					 
					
						
						
						
						
							
						
						
							e10fbfd6ea 
							
						 
					 
					
						
						
							
							Migrate Ordering.UnitTests and fix packages of Ordering.API  
						
						
						
						
					 
					
						2019-07-26 10:54:17 +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 
						 
				 
			
				
					
						
							
							
								Miguel Veloso 
							
						 
					 
					
						
						
						
						
							
						
						
							2621c36956 
							
						 
					 
					
						
						
							
							Add Task.Yield() to avoid synchronus deadlock by ensuring asynchronous execution  
						
						
						
						
					 
					
						2019-06-17 22:00:19 +01: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 
						 
				 
			
				
					
						
							
							
								eiximenis 
							
						 
					 
					
						
						
						
						
							
						
						
							c0e125f2bf 
							
						 
					 
					
						
						
							
							Merge from features/devspaces to dev  
						
						
						
						
					 
					
						2019-04-11 14:38:31 +02:00 
						 
				 
			
				
					
						
							
							
								Miguel Veloso 
							
						 
					 
					
						
						
						
						
							
						
						
							396d33fe7b 
							
						 
					 
					
						
						
							
							Use AsyncEventingBasicConsumer in RabbitMQ to properly use async event handlers  
						
						
						
						
					 
					
						2019-04-02 15:36:20 +01:00 
						 
				 
			
				
					
						
							
							
								Eduard Tomàs 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a91514aa7e 
							
						 
					 
					
						
						
							
							Merge pull request  #540  from KoLogicDev/patch-1  
						
						... 
						
						
						
						Concurrency fix for EventBus 
						
						
					 
					
						2019-03-29 08:44:07 +01:00 
						 
				 
			
				
					
						
							
							
								liubaishui 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a92383e123 
							
						 
					 
					
						
						
							
							Split RabbitMQ channel create and consumer create.  
						
						... 
						
						
						
						Because when channel create the Subscribe is not register, so the previously stored message may lose. This fix split the channel create and consumer create, when Subscribe registered then call the consumer create function. 
						
						
					 
					
						2019-03-15 21:03:42 +08:00 
						 
				 
			
				
					
						
							
							
								Ivan Buha 
							
						 
					 
					
						
						
						
						
							
						
						
							de8db69c31 
							
						 
					 
					
						
						
							
							Updated file names to match class and interface names.  
						
						
						
						
					 
					
						2019-03-05 14:52:23 -06:00 
						 
				 
			
				
					
						
							
							
								Miguel Veloso 
							
						 
					 
					
						
						
						
						
							
						
						
							76e1072d07 
							
						 
					 
					
						
						
							
							Add logging of subscription events  
						
						
						
						
					 
					
						2019-03-04 19:08:14 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							fbaaa8c450 
							
						 
					 
					
						
						
							
							devspaces source code support integrated in webmvc  
						
						
						
						
					 
					
						2019-02-25 18:04:49 +01:00 
						 
				 
			
				
					
						
							
							
								Miguel Veloso 
							
						 
					 
					
						
						
						
						
							
						
						
							63a325e92e 
							
						 
					 
					
						
						
							
							Fix non-structured traces  
						
						
						
						
					 
					
						2019-02-22 15:05:28 +00:00 
						 
				 
			
				
					
						
							
							
								eiximenis 
							
						 
					 
					
						
						
						
						
							
						
						
							0eae3c3ea3 
							
						 
					 
					
						
						
							
							Merge branch 'features/webhooks' into dev  
						
						
						
						
					 
					
						2019-02-11 15:19:50 +01:00 
						 
				 
			
				
					
						
							
							
								eiximenis 
							
						 
					 
					
						
						
						
						
							
						
						
							5b237b0a8b 
							
						 
					 
					
						
						
							
							webhooks flow finished. Only missing bug in api that don't show the hooks  
						
						
						
						
					 
					
						2019-02-06 19:59:26 +01:00 
						 
				 
			
				
					
						
							
							
								Miguel Veloso 
							
						 
					 
					
						
						
						
						
							
						
						
							d83fa3bafc 
							
						 
					 
					
						
						
							
							Standarize log message  
						
						
						
						
					 
					
						2019-01-31 15:30:50 +00:00 
						 
				 
			
				
					
						
							
							
								Miguel Veloso 
							
						 
					 
					
						
						
						
						
							
						
						
							6d2c1fc717 
							
						 
					 
					
						
						
							
							Use structured logging for exceptions  
						
						
						
						
					 
					
						2019-01-31 13:32:27 +00:00 
						 
				 
			
				
					
						
							
							
								eiximenis 
							
						 
					 
					
						
						
						
						
							
						
						
							8a31efeab2 
							
						 
					 
					
						
						
							
							badge for buid status  
						
						
						
						
					 
					
						2019-01-29 11:43:15 +01:00 
						 
				 
			
				
					
						
							
							
								Ramón Tomás 
							
						 
					 
					
						
						
						
						
							
						
						
							b9dcc80acd 
							
						 
					 
					
						
						
							
							Merge Netcore2.2 branch  
						
						
						
						
					 
					
						2019-01-03 18:41: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 
						 
				 
			
				
					
						
							
							
								RamonTC 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							7fc68b4b86 
							
						 
					 
					
						
						
							
							Merge pull request  #818  from erikpique/feature/645  
						
						... 
						
						
						
						[BUG] When subscribing more than 1 different event handlers for the s… 
						
						
					 
					
						2018-11-14 09:53:23 +01:00 
						 
				 
			
				
					
						
							
							
								RamonTC 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							06de1b68e3 
							
						 
					 
					
						
						
							
							Merge pull request  #819  from erikpique/feature/667  
						
						... 
						
						
						
						[Bug] Deserialization of IntegrationEvent #667  
						
						
					 
					
						2018-11-14 09:52:31 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							4e9716667a 
							
						 
					 
					
						
						
							
							[Bug] Deserialization of IntegrationEvent  #667  
						
						... 
						
						
						
						https://github.com/dotnet-architecture/eShopOnContainers/issues/667  
					
						2018-10-09 13:10:52 +02:00 
						 
				 
			
				
					
						
							
							
								Erik Pique 
							
						 
					 
					
						
						
						
						
							
						
						
							681111221f 
							
						 
					 
					
						
						
							
							[BUG] When subscribing more than 1 different event handlers for the same event type  #645  
						
						... 
						
						
						
						https://github.com/dotnet-architecture/eShopOnContainers/issues/645  
					
						2018-10-09 10:13:20 +02:00 
						 
				 
			
				
					
						
							
							
								Miguel Veloso 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c3983b30c7 
							
						 
					 
					
						
						
							
							Merge pull request  #582  from i02coroj/fix-messages-lost  
						
						... 
						
						
						
						Update EventBusServiceBus.cs 
						
						
					 
					
						2018-07-26 20:02:33 +01:00 
						 
				 
			
				
					
						
							
							
								Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							8f5aa5c554 
							
						 
					 
					
						
						
							
							fix classname of EventBus.Test models  
						
						
						
						
					 
					
						2018-07-21 18:00:05 +08:00 
						 
				 
			
				
					
						
							
							
								Joni 
							
						 
					 
					
						
						
						
						
							
						
						
							389aaff013 
							
						 
					 
					
						
						
							
							Convert some magic strings to use "nameof" operator  
						
						
						
						
					 
					
						2018-07-03 16:17:52 +09: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 
						 
				 
			
				
					
						
							
							
								José Alberto 
							
						 
					 
					
						
						
						
						
							
						
						
							bee5286bc4 
							
						 
					 
					
						
						
							
							Remove unneeded local variable.  
						
						
						
						
					 
					
						2018-05-30 22:57:27 +02:00 
						 
				 
			
				
					
						
							
							
								José Alberto 
							
						 
					 
					
						
						
						
						
							
						
						
							44f43cdc0d 
							
						 
					 
					
						
						
							
							Remove unneeded local variable.  
						
						
						
						
					 
					
						2018-05-30 22:51:49 +02:00 
						 
				 
			
				
					
						
							
							
								Unai Zorrilla Castro 
							
						 
					 
					
						
						
						
						
							
						
						
							70a2682806 
							
						 
					 
					
						
						
							
							Working on compose dependencies and check new httpclient handlers retries  
						
						
						
						
					 
					
						2018-05-22 15:33:21 +02:00 
						 
				 
			
				
					
						
							
							
								Unai Zorrilla Castro 
							
						 
					 
					
						
						
						
						
							
						
						
							094ba7c3c6 
							
						 
					 
					
						
						
							
							Review HTTP Aggregators. Remove IHTTPClient Resiliency building block. Fix TestController code ( ask about on this controller ). Tested with VS and docker-compose up directly  
						
						
						
						
					 
					
						2018-05-21 11:38:09 +02:00 
						 
				 
			
				
					
						
							
							
								Unai Zorrilla Castro 
							
						 
					 
					
						
						
						
						
							
						
						
							d1b6bc84fa 
							
						 
					 
					
						
						
							
							Migrated projects and references to use 2.1 rc1 libraries  
						
						
						
						
					 
					
						2018-05-15 12:42:08 +02:00 
						 
				 
			
				
					
						
							
							
								i02coroj 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							8b846968e2 
							
						 
					 
					
						
						
							
							Update EventBusServiceBus.cs  
						
						... 
						
						
						
						Do not complete messages until actually processed. 
						
						
					 
					
						2018-04-13 12:03:34 +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