| 
							
							
								 Ramón Tomás | 248a3ac82c | Merge branch 'dev' into eShopOnServiceFabric-Win | 2017-09-12 15:48:09 +02:00 |  | 
			
				
					| 
							
							
								 Ramón Tomás | 4e12176801 | Update identity.api base image to aspnetcore2.0 Rename Identity.api namespace | 2017-09-12 15:39:06 +02:00 |  | 
			
				
					| 
							
							
								 Unai Zorrilla Castro | 4f8ca3eebb | Fix migrations for new identity server, fix new program template for dotnetcore2 | 2017-09-12 13:44:52 +02:00 |  | 
			
				
					| 
							
							
								 Ramón Tomás | cbb6b580a8 | Created WebMVC, WebSPA and Webstatus SF application project. Created IdentityServer SF application project | 2017-09-12 01:00:33 +02:00 |  | 
			
				
					| 
							
							
								 Unai Zorrilla Castro | aed97fdc99 | Migrated Identity.API to Identity Server 4 on dotnetcore2 | 2017-09-11 12:43:45 +02:00 |  | 
			
				
					| 
							
							
								 Ramón Tomás | de9b655889 | Added SuffixPath attr to service endpoints Added SetBasePath env. var setting to services | 2017-09-08 16:42:56 +02:00 |  | 
			
				
					| 
							
							
								 Ramón Tomás | 2cad76c134 | Merge from Dev | 2017-09-08 12:17:14 +02:00 |  | 
			
				
					| 
							
							
								 Ramón Tomás | ca88050d9d | Rename connectionstring variable in Idsrv | 2017-09-08 12:12:49 +02:00 |  | 
			
				
					| 
							
							
								 Eduard Tomàs | 7321d5e5fc | Base path fix and k8s config updated | 2017-09-07 19:18:53 +02:00 |  | 
			
				
					| 
							
							
								 Ramón Tomás | 89cbbb43f7 | Test base_path | 2017-09-07 15:46:08 +02:00 |  | 
			
				
					| 
							
							
								 Eduard Tomàs | 0f1d904459 | Merge pull request #307 from SychevIgor/SychevIgor/DotnetRestoreRemove dotnet restore not needed in cli 2.0 | 2017-09-07 14:57:43 +02:00 |  | 
			
				
					| 
							
							
								 Eduard Tomàs | 9959860b64 | Merge pull request #322 from SychevIgor/SychevIgor/ImagesConsistency sync k8 images with local windows/linux images for consistency | 2017-09-07 14:56:46 +02:00 |  | 
			
				
					| 
							
							
								 Ramón Tomás | 17395497e5 | Added PathBase WebMVC | 2017-09-07 13:39:13 +02:00 |  | 
			
				
					| 
							
							
								 Igor Sychev | b8652c734b | sync k8 images with local windows/linux images for consistency | 2017-09-07 08:01:51 +03:00 |  | 
			
				
					| 
							
							
								 Igor Sychev | fda16ba617 | dotnet restore not needed in cli 2.0 "Starting with .NET Core 2.0 SDK, dotnet restore runs implicitily when you run dotnet build." (C) https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-build?tabs=netcore2x | 2017-09-07 08:00:11 +03:00 |  | 
			
				
					| 
							
							
								 Igor Sychev | 2a64cd57de | dotnet restore not needed in cli 2.0 "Starting with .NET Core 2.0 SDK, dotnet restore runs implicitily when you run dotnet build." (C) https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-build?tabs=netcore2x | 2017-09-07 08:00:11 +03:00 |  | 
			
				
					| 
							
							
								 Unai Zorrilla Castro | 6c5bdda2f5 | Improve build-bits-linux.sh (removed dotnet restore (doing with publish now)  and set quiet on verbosity in order to reduce issues with System.Console.dll on build container). Remove unnecesary namespace on Identity.Api startup.cs | 2017-09-06 18:43:38 +02:00 |  | 
			
				
					| 
							
							
								 Ramón Tomás | d00777008c | Update ARM template | 2017-09-06 16:00:48 +02:00 |  | 
			
				
					| 
							
							
								 Ramón Tomás | 9fc4bfea7b | Merge branch 'netcore2' into eShopOnServiceFabric-Win | 2017-09-06 15:27:07 +02:00 |  | 
			
				
					| 
							
							
								 Ramón Tomás | 03e4559b30 | Created last services added to eShop Updated with latest configurations | 2017-09-06 15:23:14 +02:00 |  | 
			
				
					| 
							
							
								 Eduard Tomàs | e85ce8332c | Merge pull request #318 from SychevIgor/SychevIgor/GracePeriodDropFromk8 dropped GracePeriodManager from k8 | 2017-09-06 11:03:38 +02:00 |  | 
			
				
					| 
							
							
								 Igor Sychev | 442671a722 | dropped GracePeriodManager from k8 | 2017-09-06 10:03:45 +03:00 |  | 
			
				
					| 
							
							
								 Eduard Tomàs | 45e7924707 | Merge remote-tracking branch 'origin/netcore2' into dev | 2017-09-06 07:16:49 +02:00 |  | 
			
				
					| 
							
							
								 Cesar De la Torre | 903b26d529 | Setting to use SQL Server Developer Edition so there's no issue about any time bomb because of licensing or trial period. | 2017-09-05 15:35:28 -07:00 |  | 
			
				
					| 
							
							
								 Unai Zorrilla Castro | 7be5cb933d | Update BundlerMinimifier.Core version to netcoreapp2 | 2017-09-05 20:24:58 +02:00 |  | 
			
				
					| 
							
							
								 Cesar De la Torre | df21bc84cb | Merge pull request #317 from SychevIgor/SychevIgor/NobuildFix NoBuild missed some images | 2017-09-05 11:10:05 -07:00 |  | 
			
				
					| 
							
							
								 Cesar De la Torre | 38ad91ac01 | Update README.md | 2017-09-05 10:44:22 -07:00 |  | 
			
				
					| 
							
							
								 Cesar De la Torre | cc9f589c0a | Update README.md | 2017-09-05 10:40:20 -07:00 |  | 
			
				
					| 
							
							
								 Igor Sychev | 30644de2a1 | NoBuild missed some images | 2017-09-05 19:07:57 +03:00 |  | 
			
				
					| 
							
							
								 Eduard Tomàs | 210c42b7de | doc updated to reflect netcore2 moving | 2017-09-05 16:18:01 +02:00 |  | 
			
				
					| 
							
							
								 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 |  | 
			
				
					| 
							
							
								 Christian Arenas | 3db84ea0dc | Merge branch 'loadtest' into dev | 2017-09-05 16:07:20 +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 |  | 
			
				
					| 
							
							
								 Ramón Tomás | 8f4bee4cae | Merge Netcore2 | 2017-09-05 11:30:14 +02:00 |  | 
			
				
					| 
							
							
								 Eduard Tomàs | 4e87a5c77e | Merge branch 'netcore2' of https://github.com/dotnet-architecture/eShopOnContainers into netcore2 # Conflicts:
#	cli-windows/build-bits.ps1 | 2017-09-05 08:49:22 +02:00 |  | 
			
				
					| 
							
							
								 Eduard Tomàs | bbb36f3475 | Merge branch 'SychevIgor-SychevIgor/ParallelBuild' into netcore2 | 2017-09-05 08:43:48 +02:00 |  | 
			
				
					| 
							
							
								 Eduard Tomàs | dcc1ec620f | Removed GracePeriodManager project as it is no longer used in netcore2 | 2017-09-05 08:43:24 +02:00 |  | 
			
				
					| 
							
							
								 Eduard Tomàs | 2d8eafe587 | Merge branch 'SychevIgor/ParallelBuild' of https://github.com/SychevIgor/eShopOnContainers into SychevIgor-SychevIgor/ParallelBuild | 2017-09-05 08:35:01 +02:00 |  | 
			
				
					| 
							
							
								 Cesar De la Torre | 96f4601b62 | Merge pull request #312 from SychevIgor/SychevIgor/PublishRelease release publish configuration for win/mac, because for Linux it's already done | 2017-09-04 10:57:21 -07: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 |  | 
			
				
					| 
							
							
								 Eduard Tomàs | 4171375e47 | Merge pull request #313 from SychevIgor/SychevIgor/TypoFix k8 readme fix. | 2017-09-04 16:54:57 +02:00 |  | 
			
				
					| 
							
							
								 Eduard Tomàs | 8efd9504fb | Merge pull request #306 from jorgearteiro/patch-1 Updated Docker image version to Sql Server RC2 | 2017-09-04 16:54:16 +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 | 6515a3b58f | update sdk to 2.0.2 | 2017-09-04 12:45:00 +02:00 |  | 
			
				
					| 
							
							
								 jacano | c722d4907b | project.json removed from core | 2017-09-04 12:45:00 +02:00 |  | 
			
				
					| 
							
							
								 Igor Sychev | 34a08fb7cb | k8 readme fix. | 2017-09-03 11:51:18 +03:00 |  | 
			
				
					| 
							
							
								 Igor Sychev | c514c8c31d | release publish configuration for win/mac, because for Linux it's already done | 2017-09-03 11:30:27 +03:00 |  |