484 Commits

Author SHA1 Message Date
Onurkan Bakırcı
a04a00241b
Startup typeof error edited 2022-03-21 15:44:40 +03:00
Onurkan Bakırcı
7c6221cc22
Swagger comment support added Catalog, Webhook, Order and Basket services. Swagger and swagger comment support added to Identity Service 2022-03-21 15:33:02 +03:00
Marranica
750d2db417
Update appsettings.json
Fixed typo in Vault ClientId configuration value from "your-clien-id" to "your-client-id"
2022-03-19 23:09:52 +00:00
A-Soltani
4458a096c9
fix constructor injection for _validators (#1809) 2022-03-16 15:22:16 -05:00
KurnakovMaksim
4ac25bf58d
Little fix and refactoring (#1860)
* Delete repeat setting a property in CreateOrderCommand ctor

* Fix catalogTypeName -> catalogBrandName in exception message

* Delete useless null check from ConsentController

* Add null check for subjectId
2022-03-09 20:21:19 +05:30
dependabot[bot]
56233eb10e
Bump Google.Protobuf in /src/Services/Ordering/Ordering.API
Bumps [Google.Protobuf](https://github.com/protocolbuffers/protobuf) from 3.14.0 to 3.15.0.
- [Release notes](https://github.com/protocolbuffers/protobuf/releases)
- [Changelog](https://github.com/protocolbuffers/protobuf/blob/master/generate_changelog.py)
- [Commits](https://github.com/protocolbuffers/protobuf/compare/v3.14.0...v3.15.0)

---
updated-dependencies:
- dependency-name: Google.Protobuf
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-16 15:56:07 +00:00
chertby
346bab2225
docs: Fix typo in comments (#1796) 2021-12-07 14:52:32 +05:30
Sumit Ghosh
9e5cd835b4
Removed language preview version from csproj (#1793) 2021-11-17 16:42:17 +05:30
Sumit Ghosh
630cb35cfb
Updates to .NET 6.0 (#1786)
* Seeking feedback: Build and run on .Net 6 preview 6 (#1734)

* Updgrade build and hosting machines to .net6 latest

* Target .net 6

* ILogger is ambiguous?

* More ILogger ambiguity

* Use preview 6... seeing errors in preview 7...

* Of course the SDK version is different :)

* downgrade the last nonworking component

* Only restore the packages we need for the one off service stuck in .net 5

* Downgrade development docker files to use the preview 6 sdk

* Updates `basket-api` to .NET 6 (#1742)

* Use global usings

* Use file-scoped namespaces

* Updates docker images to preview 7

* Created a new migration plan

* Included global usings for identity project

* Updated docker file to preview version to 7

* Updated dockerfiles

* Merged conent from Startup.cs to Program.cs

* Removed Starup.cs

* Removed unnecessary files

* Revert "Removed unnecessary files"

This reverts commit 536bddcd96b54673401cedbe802520dce12b3472.

* Revert "Removed Starup.cs"

This reverts commit 46175d7aa97475d88ec46bce39ed498c7037d924.

* Revert "Merged conent from Startup.cs to Program.cs"

This reverts commit 2766ea86dfef9220fe3f0c27a37a9a6c18153078.

* Removed extra spaces

* Updated basket-api project file

* Update src/Services/Basket/Basket.API/Grpc/BasketService.cs

Co-authored-by: David Pine <david.pine@microsoft.com>

* Apply suggestions from code review

Co-authored-by: David Pine <david.pine@microsoft.com>

* Moved the fully qualified namespace on top

* Updated relevant packages in basket.api project

* Updated relevant packages in identity.api project

Co-authored-by: David Pine <david.pine@microsoft.com>

* Updates all the services to .NET 6.0 (#1770)

* Created global using file for catalog.api

* Moved individual usings statements to globalusing

* Updated catalog.api project

* Fixed local run bug for catalog.api

* Included globalusing for payment.api

* Refactored namespace statement for payment.api

* Moved namespaces to ordering.domain project

* Included globalusing for ordering.domain project

* Included globalusings for ordering.infrastructure project

* Refactored namespaces for ordering.infrastructure project

* Updated relevant packages in ordering.infrastructure project

* Included globalusings for ordering.signalrHub project

* Moved all the namespace to globalusings

* Updated packages in ordering.signalrHub csproj file

* Refactored namespace statements in catalog.api project

* Fixed namespace name in ordering.domain

* Included global usings for ordering.api project

* Moved all usings to globalusing file

* Updated ordering.api csproj project

* Fixed bug in statup.cs

* Updated ordering.unittests.csproj file

* Included globalusings in webhooks.api project

* Moved using statements to globalusing file in webhooks.api

* Included globalusing for web.bff.shoppping aggregator project

* Moved namespaces to globalusing shopping aggregator

* Included globalusing mobile.bff.shoppping project

* Moved namespaces to globalusing file

* Included globalusing for eventbus project

* Moved namespaces to global usings for eventbus

* Included globalusing for EventBusRabbitMQ project

* Moved using statements to EventBusRabbitMQ project

* Included global using in EventBusServiceBus project

* Moved using statements to globalusing for EventBusServiceBus

* Included globalusing file for IntegrationEventLogEF project

* Move using statements to globalusing file

* Updated packages of IntegrationEventLogEF project

* Included globalusing to Devspaces.Support project

* Moved using statements to globalusing Devspaces

* Updated dependent packages for Devspaces.Support.csproj

* Fixed bug in Basket API

* Fixed bug in catalog.api

* Fixed bug Identity.API

* Included globalusing to Basket.UnitTest project

* Moved namespaces to Basket.UnitTest project

* Updated packages of Basket.UnitTest csproj

* Included globalusing for Basket.FunctionalTests project

* Included file-scoped namespaces Basket.FunctionalTests

* Updated packages of Basket.FunctionalTests.csproj file

* Updated catalog unit test project to Net 6.0

* Included global usings for Catalog.FunctionalTests

* Included file-scope namespace catalog.functionaltests

* Updated packages of catalog.functionaltest csproj

* Included MigrateDbContext method in HostExtensions

* Included globalusing for ordering.UnitTests project

* Included file-scope statement for Ordering.UnitTest project

* Included globalusing for Ordering.FunctionalTests

* Included file-scope namespace statement for using

* Updated packages in  Ordering.FunctionalTests.csproj

* Apply suggestions from code review

Co-authored-by: David Pine <david.pine@microsoft.com>

* Apply suggestions from code review

Co-authored-by: David Pine <david.pine@microsoft.com>

* Update src/Services/Ordering/Ordering.API/Startup.cs

Co-authored-by: David Pine <david.pine@microsoft.com>

* Update src/Services/Ordering/Ordering.Domain/Events/OrderStatusChangedToPaidDomainEvent.cs

Co-authored-by: David Pine <david.pine@microsoft.com>

* Update src/Services/Ordering/Ordering.SignalrHub/IntegrationEvents/EventHandling/OrderStatusChangedToSubmittedIntegrationEventHandler.cs

Co-authored-by: David Pine <david.pine@microsoft.com>

* Update src/Services/Ordering/Ordering.SignalrHub/IntegrationEvents/Events/OrderStatusChangedToAwaitingValidationIntegrationEvent.cs

Co-authored-by: David Pine <david.pine@microsoft.com>

* Apply suggestions from code review

Co-authored-by: David Pine <david.pine@microsoft.com>

* Apply suggestions from code review

Co-authored-by: David Pine <david.pine@microsoft.com>

Co-authored-by: David Pine <david.pine@microsoft.com>

* Updates WebMVC to .NET 6.0 (#1773)

* Included globalusing WebMVC

* Included file scope namespaces for all files

* Updated dockerfile

* Updated packages to WebMVC

* Fixes few bugs in Net 6.0 service migration (#1774)

* Created global using file for catalog.api

* Moved individual usings statements to globalusing

* Updated catalog.api project

* Fixed local run bug for catalog.api

* Included globalusing for payment.api

* Refactored namespace statement for payment.api

* Moved namespaces to ordering.domain project

* Included globalusing for ordering.domain project

* Included globalusings for ordering.infrastructure project

* Refactored namespaces for ordering.infrastructure project

* Updated relevant packages in ordering.infrastructure project

* Included globalusings for ordering.signalrHub project

* Moved all the namespace to globalusings

* Updated packages in ordering.signalrHub csproj file

* Refactored namespace statements in catalog.api project

* Fixed namespace name in ordering.domain

* Included global usings for ordering.api project

* Moved all usings to globalusing file

* Updated ordering.api csproj project

* Fixed bug in statup.cs

* Updated ordering.unittests.csproj file

* Included globalusings in webhooks.api project

* Moved using statements to globalusing file in webhooks.api

* Included globalusing for web.bff.shoppping aggregator project

* Moved namespaces to globalusing shopping aggregator

* Included globalusing mobile.bff.shoppping project

* Moved namespaces to globalusing file

* Included globalusing for eventbus project

* Moved namespaces to global usings for eventbus

* Included globalusing for EventBusRabbitMQ project

* Moved using statements to EventBusRabbitMQ project

* Included global using in EventBusServiceBus project

* Moved using statements to globalusing for EventBusServiceBus

* Included globalusing file for IntegrationEventLogEF project

* Move using statements to globalusing file

* Updated packages of IntegrationEventLogEF project

* Included globalusing to Devspaces.Support project

* Moved using statements to globalusing Devspaces

* Updated dependent packages for Devspaces.Support.csproj

* Fixed bug in Basket API

* Fixed bug in catalog.api

* Fixed bug Identity.API

* Included globalusing to Basket.UnitTest project

* Moved namespaces to Basket.UnitTest project

* Updated packages of Basket.UnitTest csproj

* Included globalusing for Basket.FunctionalTests project

* Included file-scoped namespaces Basket.FunctionalTests

* Updated packages of Basket.FunctionalTests.csproj file

* Updated catalog unit test project to Net 6.0

* Included global usings for Catalog.FunctionalTests

* Included file-scope namespace catalog.functionaltests

* Updated packages of catalog.functionaltest csproj

* Included MigrateDbContext method in HostExtensions

* Included globalusing for ordering.UnitTests project

* Included file-scope statement for Ordering.UnitTest project

* Included globalusing for Ordering.FunctionalTests

* Included file-scope namespace statement for using

* Updated packages in  Ordering.FunctionalTests.csproj

* Apply suggestions from code review

Co-authored-by: David Pine <david.pine@microsoft.com>

* Apply suggestions from code review

Co-authored-by: David Pine <david.pine@microsoft.com>

* Update src/Services/Ordering/Ordering.API/Startup.cs

Co-authored-by: David Pine <david.pine@microsoft.com>

* Update src/Services/Ordering/Ordering.Domain/Events/OrderStatusChangedToPaidDomainEvent.cs

Co-authored-by: David Pine <david.pine@microsoft.com>

* Update src/Services/Ordering/Ordering.SignalrHub/IntegrationEvents/EventHandling/OrderStatusChangedToSubmittedIntegrationEventHandler.cs

Co-authored-by: David Pine <david.pine@microsoft.com>

* Update src/Services/Ordering/Ordering.SignalrHub/IntegrationEvents/Events/OrderStatusChangedToAwaitingValidationIntegrationEvent.cs

Co-authored-by: David Pine <david.pine@microsoft.com>

* Apply suggestions from code review

Co-authored-by: David Pine <david.pine@microsoft.com>

* Apply suggestions from code review

Co-authored-by: David Pine <david.pine@microsoft.com>

* Fixed bugs in Mobile.BFF.Shopping project

* Fixed bugs in Web.Bff.Shopping aggregator project

* Fixed bugs in EventBusServiceBus project

* Fixed bug in Mobile.Bff.Shopping project

Co-authored-by: David Pine <david.pine@microsoft.com>

* Updates webhook client project to .NET 6.0 (#1777)

* Included globalusing file for webhookclient

* Included file scope namespaces for Webhookclient

* Updated packages in WebHookClient project

* Updates webspa project to Net 6.0 (#1778)

* Included globalusing in webspa project

* Included file scoped namespace for webspa project

* Updated packages in WebSPA project

* Updates the Application.FunctionalTests project to .NET 6.0 (#1781)

* Included globalusing in Application.FunctionalTests project

* Included file scoped namespace

* Renamed Azure.Messaging.ServiceBus namespace

* Updates .NET version of Dockerfile to 6.0 (#1785)

* Updatated package versions to RC2

* Updated package versions to RC2

* Updated Dockerfiles to .NET 6 RC2

* Changed docker file tag to 6.0

* Updated Program class

* Updated globalusing file

* Removed preview tag reference from Dockerfile.develop file

* Updated dotnet version to .NET 6.0

* Updated all packages to the .NET 6.0

* Removed RC tag from dockerfile

* Fixed bundleconfig json

* Updated readme files

* Fixed ingress yaml indentation

* Included globalusing for WebStatus project

* Updated WebStatus project to .NET 6.0

* Included scoped namespace

* Updated Dockerfile of WebStatus to .NET 6.0

Co-authored-by: Josh Coleman <83677148+JcolemanNR@users.noreply.github.com>
Co-authored-by: David Pine <david.pine@microsoft.com>
2021-11-15 19:02:23 +05:30
Wenjie Yu(MSFT)
c357aeac63
Update ServiceBus sdk from t1 to t2 (#1698)
* Update ServiceBus to the new SDKs.

* resolve errors

* resolve errors

* update codes

* update codes

* add a call in constructor

* remove changes

* add Dispose() menthod in interface

* Update codes

* update the method to get topicName

* Remove invalid changes

* resolve the errors in service

* fix issue

* fix issue

* update code

Co-authored-by: zedy <zedy@wicresoft.com>
2021-10-26 15:09:15 +05:30
dependabot[bot]
71994d0ad8
Bump Microsoft.AspNetCore.Authentication.JwtBearer (#1750)
Bumps [Microsoft.AspNetCore.Authentication.JwtBearer](https://github.com/dotnet/aspnetcore) from 5.0.2 to 5.0.9.
- [Release notes](https://github.com/dotnet/aspnetcore/releases)
- [Commits](https://github.com/dotnet/aspnetcore/compare/v5.0.2...v5.0.9)

---
updated-dependencies:
- dependency-name: Microsoft.AspNetCore.Authentication.JwtBearer
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-08-26 16:28:48 +05:30
zedy
be9ce6d069
Update keyvault sdk from t1 to t2 (#1685)
* Upgrade Microsoft.Extensions.Configuration.AzureKeyVault to

* Update keyvault uri

* Update Program.cs

Modify format

* modify format

* resolve conflict

* replace credential

Co-authored-by: Wenjie Yu <v-wenjyu@microsoft.com>
2021-06-08 14:45:15 +05:30
Sander Obdeijn
8ed25875af
Added EventBus.Tests to solution (#1684)
* - Added EventBus.Tests to solution
- Updated targetframework to net5.0
- Consolidated nuget packages

* Added copy EventBus.Tests.csproj to DockerFile's
2021-05-31 14:46:44 +05:30
Sumit Ghosh
19baeb7069
Migrates from Newtonsoft.Json to System.Text.Json (#1658)
* Included System.Text.Json related changes

* Fixed order details summary in WebMVC

* Updated custom JsonConverter
2021-05-03 16:36:31 +05:30
Rich Lander
d0cd2830a8
Update sdk tag (#1647) 2021-04-13 18:45:38 +05:30
Roman Marusyk
9b1a08a761
Service Bus persisted connection for ISubscriptionClient (#1521) 2021-03-09 15:32:28 +05:30
Sumit Ghosh
834af1209e
Fixes : #1599 | Applies patch to dotnet/sdk buster-slim docker image (#1601)
* Included docker file patch

* Used specific npm 6 package version
2021-02-04 12:29:39 +05:30
Borja García Rodríguez
2b91170662 clean up solution 2021-01-20 17:57:32 +01:00
Miguel Veloso
79e7e42aa8 Upgrade healthchecks packages 2021-01-13 13:45:29 +00:00
Miguel Veloso
96c0c1d32c Upgrade key packages 2021-01-13 13:14:59 +00:00
Borja García Rodríguez
ad29cfcdfe fix restores on docker.develop images 2020-12-28 20:57:32 +01:00
Borja García Rodríguez
ce504d9d36 Updated to aspnet 5 dockerfiles.development for azds 2020-12-28 16:54:35 +01:00
Miguel Veloso
a60152c16a
Merge pull request #1562 from borjasanes/feature/delete-load-test-references
remove load test references
2020-12-23 17:18:41 +00:00
Borja García Rodríguez
c970512232 remove load test references 2020-12-23 17:17:19 +01:00
Borja García Rodríguez
6fc60480c1 integration events updated to record types 2020-12-23 10:19:38 +01:00
Borja García Rodríguez
ff728ec096 consolidate packages 2020-12-22 16:45:47 +01:00
Borja García Rodríguez
6f399e3c8b Merge branch 'feature/net-5' into feature/webapps-net5-migration 2020-12-22 15:50:35 +01:00
Borja García Rodríguez
55a177feac update dockerfiles without location & api csprojs 2020-12-21 13:29:07 +01:00
Borja García Rodríguez
aef73d7b6e fix functional tests 2020-12-21 12:06:15 +01:00
David Sanz
35b30a109a Top-level statements. Change ordering net standard projects to dotnet 5. 2020-12-17 11:33:55 +01:00
David Sanz
6b47be9335 Update nuget packages for Ordering service. 2020-12-16 13:43:12 +01:00
David Sanz
90d70f8efc Add record types for DTOs. Update ordering DockerFiles to dotnet 5.0 base images. 2020-12-15 16:32:07 +01:00
David Sanz
b90c0f4c3e Update to netcore 5.0 framework 2020-12-15 11:46:06 +01:00
ansonzhang
388d0b7b5d
Fixed #1495 bug : UseLoadTest missing claimsType (#1508)
* Update ByPassAuthMiddleware.cs

* Update ByPassAuthMiddleware.cs

* remove WebMVC/ByPassAuthMiddleware duplicate cliam

* remove Ordering.API/ByPassAuthMid  duplicate cliam

* remove Location.API/ByPassAuthMid  duplicate cliam

* remove Market.API/ByPassAuthMid  duplicate cliam

* change webmvc bypassauth: claimType of sub

* change ordering bypassauth: claimType of sub

* change location bypassauth: claimType of sub

* change market bypassauth: claimType of sub
2020-11-05 17:42:21 +05:30
Christian Morgenthaler
beda8378d5 correct call order of "app.UseCors" 2020-06-08 21:58:48 +02:00
ericuss
09fabcdcfb Remove obsolete middleware UseApplicationInsights 2020-04-07 09:29:46 +02:00
ericuss
e671f32c44 Change extension method to load the configuration 2020-04-07 08:59:01 +02:00
Miguel Veloso
5d0cd5007c
Merge pull request #1222 from dotnet-architecture/fix/1181
fixed https://github.com/dotnet-architecture/eShopOnContainers/issues…
2020-01-27 14:29:34 +01:00
Miguel Veloso
135c56a7a8 Add cache use comment to Dockerfiles to force PR validation 2020-01-27 09:58:53 +00:00
epique@plainconcepts.com
314c6742fc fixed https://github.com/dotnet-architecture/eShopOnContainers/issues/1181 2020-01-21 12:53:31 +01:00
Miguel Veloso
44d3fcf767 Update packages 2019-12-17 17:41:03 +00:00
Miguel Veloso
3a1aff0191 Update base images to 3.1 2019-12-16 18:52:28 +00:00
Miguel Veloso
285b0cebe4 Fix to close issue #1162 2019-11-20 17:44:05 +00:00
Miguel Veloso
593be81bb0 Improve docker build cache usage 2019-11-18 15:04:11 +00:00
Miguel Veloso
ade6358eca Reorganize project folders 2019-11-18 15:03:28 +00:00
Miguel Veloso
0c14810a33 Replace obsolete IHostingEnvironment for IWebHostEnvironment 2019-11-08 16:02:58 +00:00
Miguel Veloso
866e89cad2 Remove string interpolation from logging 2019-11-08 15:15:15 +00:00
Miguel Veloso
a1f64f9b6c Add back logging traces referenced in the wiki 2019-11-07 18:22:23 +00:00
Miguel Veloso
5013ff40ba Remove unnecessary commands from dockerfiles 2019-11-07 16:56:22 +00:00
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