ayan.poddar/eShopOnContainers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
2,007 Commits 36 Branches 19 Tags 655 MiB
Commit Graph

2007 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Igor Sychev
5b90e1efe4 Parallel dotnet build process. 
it's working 2m 24s instead of 3m 48s (sequential execution)
theis only one problem... write-host not working inside the workflow
 2017-09-02 14:14:33 +03:00
Jorge Arteiro
7bf0fb8faa Updated Docker image version to Sql Server RC2 2017-09-02 15:44:38 +10:00
Christian Arenas
cf7bbc804f Add logout at performance test 2017-09-01 15:10:20 +02:00
Christian Arenas
8dd071ba83 Refactor global variables 2017-09-01 14:17:51 +02:00
Ramón Tomás
0d0b812e99 Merge branch 'EntityTypeConfigurationOnEFCore2' into netcore2 2017-08-31 17:58:46 +02:00
Unai Zorrilla Castro
70e429b760 Added IEntityTypeConfiguration feature from EF Core 2 2017-08-31 17:16:28 +02:00
Ramón Tomás
7d502c0020 Merge branch 'netcore2' of https://github.com/dotnet-architecture/eShopOnContainers into netcore2 2017-08-31 17:06:19 +02:00
Ramón Tomás
ecef3bed68 Set same vs version for all the solutions 2017-08-31 17:06:03 +02:00
Christian Arenas
146c302a5d Add Ordering refactor 2017-08-31 16:28:31 +02:00
Unai Zorrilla Castro
4a6fc5299a Remove warning on usings in Marketing.API 2017-08-31 16:23:51 +02:00
Christian Arenas
0d74b64c33 Add globar variables in app.config and refactor Catalog.API & Marketing.API 2017-08-31 15:56:04 +02:00
Cesar De la Torre
49a3963320 Merge pull request #297 from SychevIgor/SychevIgor/WindowsDockerfileFix 
CLI-Windows using wrong dll names in Dockerfile.nanowin
 2017-08-30 09:55:57 -07:00
Ramón Tomás
3a9e15ba87 Merge branch 'netcore2' of https://github.com/dotnet-architecture/eShopOnContainers into netcore2 2017-08-30 18:51:37 +02:00
Ramón Tomás
05aa265c60 Updated aspnetcore.host to v2.0 in testing projects 2017-08-30 18:51:22 +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