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

148 Commits

Author SHA1 Message Date
Miguel Veloso
e8d99c06c9 Merge branch 'features/migration-dotnet3' into dotnet3-migration/dev-dotnet3 
# Conflicts:
#	README.md
#	docker-compose.override.yml
#	docker-compose.yml
#	k8s/helm/deploy-all.ps1
#	k8s/helm/webstatus/values.yaml
#	src/ApiGateways/ApiGw-Base/Dockerfile
#	src/ApiGateways/ApiGw-Base/OcelotApiGw.csproj
#	src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile
#	src/ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj
#	src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile
#	src/ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj
#	src/BuildingBlocks/EventBus/EventBus.Tests/EventBus.Tests.csproj
#	src/BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogEF.csproj
#	src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHost.Customization.csproj
#	src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj
#	src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/eShopOnContainers.UnitTests.csproj
#	src/Services/Basket/Basket.API/Basket.API.csproj
#	src/Services/Basket/Basket.API/Dockerfile
#	src/Services/Basket/Basket.FunctionalTests/Basket.FunctionalTests.csproj
#	src/Services/Basket/Basket.UnitTests/Basket.UnitTests.csproj
#	src/Services/Catalog/Catalog.API/Catalog.API.csproj
#	src/Services/Catalog/Catalog.API/Dockerfile
#	src/Services/Catalog/Catalog.FunctionalTests/Catalog.FunctionalTests.csproj
#	src/Services/Catalog/Catalog.UnitTests/Catalog.UnitTests.csproj
#	src/Services/Identity/Identity.API/Dockerfile
#	src/Services/Identity/Identity.API/Identity.API.csproj
#	src/Services/Location/Locations.API/Dockerfile
#	src/Services/Location/Locations.API/Locations.API.csproj
#	src/Services/Location/Locations.FunctionalTests/Locations.FunctionalTests.csproj
#	src/Services/Marketing/Infrastructure/AzureFunctions/marketing-functions.csproj
#	src/Services/Marketing/Marketing.API/Dockerfile
#	src/Services/Marketing/Marketing.API/Marketing.API.csproj
#	src/Services/Marketing/Marketing.FunctionalTests/Marketing.FunctionalTests.csproj
#	src/Services/Ordering/Ordering.API/Dockerfile
#	src/Services/Ordering/Ordering.API/Ordering.API.csproj
#	src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile
#	src/Services/Ordering/Ordering.BackgroundTasks/Ordering.BackgroundTasks.csproj
#	src/Services/Ordering/Ordering.Domain/Ordering.Domain.csproj
#	src/Services/Ordering/Ordering.FunctionalTests/Ordering.FunctionalTests.csproj
#	src/Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj
#	src/Services/Ordering/Ordering.SignalrHub/Dockerfile
#	src/Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj
#	src/Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj
#	src/Services/Payment/Payment.API/Dockerfile
#	src/Services/Payment/Payment.API/Payment.API.csproj
#	src/Services/Webhooks/Webhooks.API/Dockerfile
#	src/Services/Webhooks/Webhooks.API/Webhooks.API.csproj
#	src/Web/WebMVC/Dockerfile
#	src/Web/WebMVC/WebMVC.csproj
#	src/Web/WebSPA/Dockerfile
#	src/Web/WebSPA/WebSPA.csproj
#	src/Web/WebStatus/Dockerfile
#	src/Web/WebStatus/WebStatus.csproj
#	src/Web/WebStatus/appsettings.Development.json
#	src/Web/WebhookClient/Dockerfile
#	test/ServicesTests/Application.FunctionalTests/Application.FunctionalTests.csproj
 2019-11-07 16:31:17 +00:00
Miguel Veloso
b34b8d2403 Sort package references 2019-11-06 11:14:19 +00:00
Miguel Veloso
9bbb37aed5 Sort package references 2019-11-06 10:40:03 +00:00
eiximenis
34a0c03434 Update dockerfile.develop to net3 2019-10-31 09:45:18 +01:00
Miguel Veloso
c0eb481f8e Remove obsolote package 2019-10-23 17:03:11 +01:00
eiximenis
9b57122f7a update to net3 rc1 2019-09-19 10:12:14 +02:00
eiximenis
a2053deb49 Final charts tunning and allowing Linkerd Mesh to be used 2019-09-10 19:49:50 +02:00
ericuss
ffe2884dc4 fix checkout process of mvc app 2019-08-30 14:20:26 +02:00
eiximenis
870363861f Update Dockerfiles for use /src as build context root 2019-08-28 14:11:29 +02:00
Miguel Veloso
038b3caffa Update Dockerfiles to improve local build time 2019-08-16 19:56:30 +01:00
Mateusz Karkula
033ebd350e Fix WebStatus HealthChecks replacement 2019-08-09 20:11:45 +02:00
ericuss
76cb5c5e79 add comment 2019-07-31 09:13:14 +02:00
ericuss
de36e8c09e Migrate locations.functionaltest to 3.0 2019-07-30 10:56:14 +02:00
ericuss
4d8f3cba65 partial checkin 2019-07-29 14:05:17 +02:00
Erik Pique
0a0b013b73 change startup routing 2019-07-26 11:11:31 +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
79405b89b0 modify retries count 2019-07-24 12:15:38 +02:00
Erik Pique
756142db94 upgrade net3 webapp 2019-07-23 12:14:09 +02:00
Erik Pique
6d063b3c03 Merge branch 'features/ep-migration-dotnet3' into features/migration-dotnet3 2019-07-23 08:33:39 +02:00
Erik Pique
1e49084844 netcore 3 ordering 2019-07-23 08:30:05 +02:00
=
e7f26be573 Migrate locations api 2019-07-22 16:23:30 +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
58f156f417 fixing dockerfiles for windows 2019-05-28 11:49:39 +02:00
Miguel Veloso
91515e7ea6 Remove deprecated Swashbuckle API, refactor 2019-05-13 18:15:50 +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
06018d4080 Streamline Dockerfiles 2019-04-13 08:23:40 +01:00
Miguel Veloso
be75d554f2 Inital Dockerfiles 2019-04-12 19:45:45 +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
Miguel Veloso
396d33fe7b Use AsyncEventingBasicConsumer in RabbitMQ to properly use async event handlers 2019-04-02 15:36:20 +01: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
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
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
89a0695779 Locations API devspaces 2019-02-25 16:10:45 +01:00
Miguel Veloso
dfc680e152 Fix naming inconsistency 2019-02-21 18:32:57 +00:00
Miguel Veloso
405e5be62b Add publishing integration events traces 2019-02-21 17:58:36 +00:00
Miguel Veloso
f7c6853404 Added Seq to Locations.API 2019-02-18 15:02:21 +00:00