Eduard Tomàs
							
						 
					 | 
					
						
						
						
						
							
						
						
							34a8ad3171
							
						
					 | 
					
						
						
							
							Merge branch 'netcore2' into dev
						
						
						
						
						
						
						
						# Conflicts:
#	cli-linux/build-bits-linux.sh
#	docker-compose.ci.build.yml
#	src/Services/Location/Locations.API/Dockerfile.nanowin
#	src/Services/Marketing/Marketing.API/Dockerfile.nanowin
#	src/Services/Payment/Payment.API/Dockerfile.nanowin
#	src/Web/WebStatus/Dockerfile.nanowin 
						
						
					 | 
					
						2017-09-05 16:12:42 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Eduard Tomàs
							
						 
					 | 
					
						
						
						
						
							
						
						
							6fd4f46058
							
						
					 | 
					
						
						
							
							Fix for rabbitMQ under windows containers.
						
						
						
						
						
						
						
						Also some config tweaking on windows 
						
						
					 | 
					
						2017-09-05 15:55:17 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Eduard Tomàs
							
						 
					 | 
					
						
						
						
						
							
						
						
							8198126daf
							
						
					 | 
					
						
						
							
							Use dotnet multi-architecture images.
						
						
						
						
						
						
						
						Removing docker-compose.windows.override (not needed as is identical to docker-compose.override) 
						
						
					 | 
					
						2017-09-04 19:07:53 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jacano
							
						 
					 | 
					
						
						
						
						
							
						
						
							41d9afb84d
							
						
					 | 
					
						
						
							
							Core, Android and iOS project updated to netstandard 2.0
						
						
						
						
						
						
					 | 
					
						2017-09-04 12:45:01 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jacano
							
						 
					 | 
					
						
						
						
						
							
						
						
							208047c6ca
							
						
					 | 
					
						
						
							
							test runners updated
						
						
						
						
						
						
					 | 
					
						2017-09-04 12:45:01 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jacano
							
						 
					 | 
					
						
						
						
						
							
						
						
							d3aa16f27d
							
						
					 | 
					
						
						
							
							UITest to package reference
						
						
						
						
						
						
					 | 
					
						2017-09-04 12:45:01 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jacano
							
						 
					 | 
					
						
						
						
						
							
						
						
							f01431407a
							
						
					 | 
					
						
						
							
							UWP in netstandard 2
						
						
						
						
						
						
					 | 
					
						2017-09-04 12:45:00 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jacano
							
						 
					 | 
					
						
						
						
						
							
						
						
							c722d4907b
							
						
					 | 
					
						
						
							
							project.json removed from core
						
						
						
						
						
						
					 | 
					
						2017-09-04 12:45:00 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Egor Grishechko
							
						 
					 | 
					
						
						
						
						
							
						
						
							62ea7064c2
							
						
					 | 
					
						
						
							
							Fix "DRY up RedisBasketRepository"
						
						
						
						
						
						
						
						https://github.com/dotnet-architecture/eShopOnContainers/issues/62 
						
						
					 | 
					
						2017-09-02 20:02:55 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Unai Zorrilla Castro
							
						 
					 | 
					
						
						
						
						
							
						
						
							70e429b760
							
						
					 | 
					
						
						
							
							Added IEntityTypeConfiguration feature from EF Core 2
						
						
						
						
						
						
					 | 
					
						2017-08-31 17:16:28 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Unai Zorrilla Castro
							
						 
					 | 
					
						
						
						
						
							
						
						
							4a6fc5299a
							
						
					 | 
					
						
						
							
							Remove warning on usings in Marketing.API
						
						
						
						
						
						
					 | 
					
						2017-08-31 16:23:51 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RamonTC
							
						 
					 | 
					
						
						
						
						
							
						
						
							4ea8f6814e
							
						
					 | 
					
						
						
							
							Merge pull request #299 from SychevIgor/SychevIgor/WindowsDockerFiles20
						
						
						
						
						
						
						
						windows docker files update to 2.0 base images 
						
						
					 | 
					
						2017-08-30 17:55:26 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							c9ff332b84
							
						
					 | 
					
						
						
							
							Fix merging duplicated ConfigureAuth method
						
						
						
						
						
						
					 | 
					
						2017-08-30 08:59:39 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							faea50f715
							
						
					 | 
					
						
						
							
							Merge
						
						
						
						
						
						
					 | 
					
						2017-08-30 08:08:01 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Sychev
							
						 
					 | 
					
						
						
						
						
							
						
						
							dc566ea2a1
							
						
					 | 
					
						
						
							
							nanowin
						
						
						
						
						
						
					 | 
					
						2017-08-30 08:48:06 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							9ed7325e0e
							
						
					 | 
					
						
						
							
							Downgrade Identity.api version due to compatibility issues
						
						
						
						
						
						
						
						Updated Test project version
Fix issue Idsrv token 
						
						
					 | 
					
						2017-08-29 18:11:30 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Unai Zorrilla Castro
							
						 
					 | 
					
						
						
						
						
							
						
						
							6ac34cbdaa
							
						
					 | 
					
						
						
							
							Update functional tests
						
						
						
						
						
						
					 | 
					
						2017-08-29 12:48:04 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							c601c3e169
							
						
					 | 
					
						
						
							
							Merge branch 'netcore2' of https://github.com/dotnet-architecture/eShopOnContainers into netcore2
						
						
						
						
						
						
					 | 
					
						2017-08-29 12:14:16 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							e20223b6e2
							
						
					 | 
					
						
						
							
							Included Aspnetcore.all metapackage
						
						
						
						
						
						
					 | 
					
						2017-08-29 12:14:10 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Unai Zorrilla Castro
							
						 
					 | 
					
						
						
						
						
							
						
						
							cd78d98436
							
						
					 | 
					
						
						
							
							Updated Identity.API to preview version of IdentityServer4, Fix breaking changes. Not well tested
						
						
						
						
						
						
					 | 
					
						2017-08-29 12:12:45 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							364c07a528
							
						
					 | 
					
						
						
							
							Included AspnetCore.all metapackage
						
						
						
						
						
						
					 | 
					
						2017-08-29 12:03:20 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Unai Zorrilla Castro
							
						 
					 | 
					
						
						
						
						
							
						
						
							acefa64465
							
						
					 | 
					
						
						
							
							Updated Program and Startup to new .NETCoreApp2.0 templates. Minor refactorings
						
						
						
						
						
						
					 | 
					
						2017-08-29 11:40:23 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Unai Zorrilla Castro
							
						 
					 | 
					
						
						
						
						
							
						
						
							116d5b55bb
							
						
					 | 
					
						
						
							
							Updated Startup and Program to use new .NETCoreApp2.0 templates.Minor Refactorings
						
						
						
						
						
						
					 | 
					
						2017-08-29 11:28:21 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							c1890780a9
							
						
					 | 
					
						
						
							
							Merge branch 'netcore2' of https://github.com/dotnet-architecture/eShopOnContainers into netcore2
						
						
						
						
						
						
					 | 
					
						2017-08-29 11:19:44 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Unai Zorrilla Castro
							
						 
					 | 
					
						
						
						
						
							
						
						
							c4454b005b
							
						
					 | 
					
						
						
							
							Migrated Payment.API to .NETCoreApp2.0. Update Startup and Program to new template. Minor refactorings. Remove unused PaymentController.cs
						
						
						
						
						
						
					 | 
					
						2017-08-29 11:17:09 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							e41531ae8c
							
						
					 | 
					
						
						
							
							Merge branch 'netcore2' of https://github.com/dotnet-architecture/eShopOnContainers into netcore2
						
						
						
						
						
						
					 | 
					
						2017-08-29 11:02:25 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							0c41218c2c
							
						
					 | 
					
						
						
							
							Include aspnetcore.all metapackage
						
						
						
						
						
						
					 | 
					
						2017-08-29 11:02:18 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Unai Zorrilla Castro
							
						 
					 | 
					
						
						
						
						
							
						
						
							360456f051
							
						
					 | 
					
						
						
							
							Migrated Marketing.API and Locations.API to .NETCoreApp2.0. Update Startup and Program to new .NETCoreApp2.0 templates
						
						
						
						
						
						
					 | 
					
						2017-08-29 11:01:27 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Unai Zorrilla Castro
							
						 
					 | 
					
						
						
						
						
							
						
						
							4e37f0df27
							
						
					 | 
					
						
						
							
							Migrate Building Blocks to .NETStandard2.0 and .NETCoreApp2.0. Fix packages references. Update Basket.API to new templates on .NETCoreApp2.0
						
						
						
						
						
						
					 | 
					
						2017-08-29 10:20:13 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Sychev
							
						 
					 | 
					
						
						
						
						
							
						
						
							03d5a50a54
							
						
					 | 
					
						
						
							
							CLI-Windows using wrong dll names in Dockerfile.nanowin
						
						
						
						
						
						
					 | 
					
						2017-08-28 09:16:21 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							8dc176add9
							
						
					 | 
					
						
						
							
							Fixed issue #291ordering.api fails after submitting orders
						
						
						
						
						
						
					 | 
					
						2017-08-26 22:55:24 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							01469da7d3
							
						
					 | 
					
						
						
							
							Fixed bug Swagger is not working for the services #290
						
						
						
						
						
						
					 | 
					
						2017-08-24 15:41:11 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Polys Georgiou
							
						 
					 | 
					
						
						
						
						
							
						
						
							3928ead483
							
						
					 | 
					
						
						
							
							Fix queue/table name null or whitespace check
						
						
						
						
						
						
					 | 
					
						2017-08-23 17:38:19 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							b44b347ea9
							
						
					 | 
					
						
						
							
							Merge branch 'dev' into netcore2
						
						
						
						
						
						
					 | 
					
						2017-08-23 16:43:02 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							4161efdd70
							
						
					 | 
					
						
						
							
							Update authentication middleware
						
						
						
						
						
						
						
						Update global to sdk 2.0.0 
						
						
					 | 
					
						2017-08-23 16:40:28 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								PLAINCONCEPTS\lruiz
							
						 
					 | 
					
						
						
						
						
							
						
						
							8d14869ca0
							
						
					 | 
					
						
						
							
							Fix bug #259
						
						
						
						
						
						
					 | 
					
						2017-08-23 11:06:50 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							58f3b5b274
							
						
					 | 
					
						
						
							
							Removed GracePeriod microservice and added as a HostService
						
						
						
						
						
						
					 | 
					
						2017-08-23 00:10:28 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							8288acf3a4
							
						
					 | 
					
						
						
							
							Update projects from netcore 2.0.0 preview to 2.0.0
						
						
						
						
						
						
						
						Fix netcore 2.0.0 breaking changes in authentication middleware 
						
						
					 | 
					
						2017-08-22 22:36:23 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								PLAINCONCEPTS\lruiz
							
						 
					 | 
					
						
						
						
						
							
						
						
							a6acdabf85
							
						
					 | 
					
						
						
							
							Fix bug #283
						
						
						
						
						
						
					 | 
					
						2017-08-22 20:03:48 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							2baedadc7a
							
						
					 | 
					
						
						
							
							Merge from Dev
						
						
						
						
						
						
					 | 
					
						2017-08-22 19:46:53 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								PLAINCONCEPTS\lruiz
							
						 
					 | 
					
						
						
						
						
							
						
						
							737bddadc2
							
						
					 | 
					
						
						
							
							Fix issue #259
						
						
						
						
						
						
					 | 
					
						2017-08-22 18:03:12 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								PLAINCONCEPTS\lruiz
							
						 
					 | 
					
						
						
						
						
							
						
						
							3d552b3219
							
						
					 | 
					
						
						
							
							Fix bug #263
						
						
						
						
						
						
					 | 
					
						2017-08-22 12:04:40 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							eb4396e659
							
						
					 | 
					
						
						
							
							Fix accountcontroller signin unit test
						
						
						
						
						
						
					 | 
					
						2017-08-21 17:57:53 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ramón Tomás
							
						 
					 | 
					
						
						
						
						
							
						
						
							b4dccbf774
							
						
					 | 
					
						
						
							
							Fix bug service bus not receiving messages
						
						
						
						
						
						
						
						Update service bus to 1.0 version 
						
						
					 | 
					
						2017-08-17 13:00:48 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cesar De la Torre
							
						 
					 | 
					
						
						
						
						
							
						
						
							4876dd562d
							
						
					 | 
					
						
						
							
							Merge pull request #222 from SychevIgor/IdentityInMVCFix
						
						
						
						
						
						
						
						Identity in mvc fix 
						
						
					 | 
					
						2017-08-16 14:11:15 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cesar De la Torre
							
						 
					 | 
					
						
						
						
						
							
						
						
							dca1b5eedd
							
						
					 | 
					
						
						
							
							Updated UserSecrets() obsolete API to AddUserSecrets<Startup>() update heading NET Core 2.0. See: https://github.com/aspnet/Announcements/issues/223
						
						
						
						
						
						
					 | 
					
						2017-08-16 13:47:07 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cesar De la Torre
							
						 
					 | 
					
						
						
						
						
							
						
						
							32da90b6af
							
						
					 | 
					
						
						
							
							Merge pull request #235 from skynode/patch-2
						
						
						
						
						
						
						
						Update Identity.API/Startup.cs 
						
						
					 | 
					
						2017-08-16 13:34:17 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cesar De la Torre
							
						 
					 | 
					
						
						
						
						
							
						
						
							ca4fb143dd
							
						
					 | 
					
						
						
							
							Merge pull request #218 from SychevIgor/bootstrapversionfix
						
						
						
						
						
						
						
						bootstrap version consolidated across all ui based apps. latest stabl… 
						
						
					 | 
					
						2017-08-16 13:27:54 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Cesar De la Torre
							
						 
					 | 
					
						
						
						
						
							
						
						
							6af0bd02de
							
						
					 | 
					
						
						
							
							Merge pull request #217 from SychevIgor/AIdeleted
						
						
						
						
						
						
						
						ApplicationInsights deleted from 3 projects. 
						
						
					 | 
					
						2017-08-16 13:20:23 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								IgorSychev
							
						 
					 | 
					
						
						
						
						
							
						
						
							f16d0ddffe
							
						
					 | 
					
						
						
							
							2 Views survived after identity redesign.
						
						
						
						
						
						
						
						In AccountController we don't have view for index action it's also looks like a some rudement 
						
						
					 | 
					
						2017-08-16 22:00:44 +03:00 | 
					
					
						
						
							
							
							
						
					 |