76 Commits

Author SHA1 Message Date
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
Miguel Veloso
4b0c2c56dd Handle SPA/MVC branding for login and registration views 2021-06-18 15:08:05 +01:00
Miguel Veloso
2a0db634c4 Update to .NET 5 2021-06-17 17:17:04 +01:00
Miguel Veloso
dbf782d210 Initial eShop-Learn version 2021-06-15 09:57:28 +01:00
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
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
19460bb1f1 update nuget packages 2020-12-18 12:04:35 +01:00
Borja García Rodríguez
5fa317f5c4 net 5 webapps 2020-12-18 09:48:28 +01:00
Miguel Veloso
44d3fcf767 Update packages 2019-12-17 17:41:03 +00:00
Miguel Veloso
ade6358eca Reorganize project folders 2019-11-18 15:03:28 +00:00
Miguel Veloso
b34b8d2403 Sort package references 2019-11-06 11:14:19 +00:00
eiximenis
9b57122f7a update to net3 rc1 2019-09-19 10:12:14 +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
eiximenis
577aca1d4c Basket.API updated to net3 2019-07-19 13:09:30 +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
jmanuelcorral
65b7b31d8d Done Updating versions 2019-03-21 16:38:01 +01: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
Ramón Tomás
b9dcc80acd Merge Netcore2.2 branch 2019-01-03 18:41:58 +01:00
Ramón Tomás
dbf175f913 Fixed missing env variables in marketing.api in k8s scripts
Added Resource path in webstatus UI when deploying with K8S
Added Liveness healthChecks
Updated k8s healthcheck configuration
2019-01-03 17:11:56 +01:00
Ramón Tomás
fa0b1a7a6b Added serilog 2018-12-13 12:13:59 +01:00
Ramón Tomás
ffca2da0b3 Migrated to netcore 2.2 2018-12-11 13:51:58 +01:00
Ramón Tomás
eda8a6e90c Fixed rxjs version in package.json 2018-12-05 09:56:02 +01:00
Ramón Tomás
0f6f4e6d14 Integrate HealthCheck to all eShop services and apps
Integrate WebStatus with Healthcheck
2018-11-30 17:43:22 +01:00
erikpique
6aaa718af5
Merge branch 'dev' into feature/net22preview3 2018-11-13 10:25:42 +01:00
Erik Pique
9775219a34 change netcore 2.1 to 2.2 and update nugets 2018-11-12 17:27:54 +01:00
Ramón Tomás
dc767eb51c Fixed issue header not included in requests
Fixed issue httpclient returned response
2018-09-28 10:14:29 +02:00
IvanFarkas
f7e2255666 Updated WebSPA to Angular 6, Bootstrap 4, HttpClient and new rxjs 2018-08-29 13:59:14 +01:00
eiximenis
fcff8e45aa Fixes #630 2018-06-12 19:05:51 +02:00
eiximenis
51236fd5af Update to netcore2.1 RTM
Updates to web Dockerfiles to support microsoft/dotnet:2.1-sdk
2018-06-01 18:59:14 +02:00
Unai Zorrilla Castro
d1b6bc84fa Migrated projects and references to use 2.1 rc1 libraries 2018-05-15 12:42:08 +02:00
Ramón Tomás
02f94eeb0e Updated k8s scripts 2018-04-16 19:28:12 +02:00
Ramón Tomás
08e8a4ba26 Added signalr client service to SPA app 2018-04-13 17:10:25 +02:00
Ramón Tomás
f1f17798da Added missing Task.Background service docker-compose configuration
Added signalr client for MVC
Added signalr hub
Added signalr events when order status changes
2018-04-13 13:45:21 +02:00
Sychev Igor
c1db0703a7 packages update 2 2018-03-04 14:10:51 +03:00
Sychev Igor
ccad354645 packages update 2018-03-04 14:10:51 +03:00
yantang
23bdd59b10 Update AI k8s package version, otherwise kubernetes deployment will fail because of deadlock. 2018-01-28 23:33:44 -08:00
Cesar De la Torre
ded64feae2
Merge pull request #452 from SychevIgor/k8appinsbeta2
Upgrades to "Microsoft.ApplicationInsights.Kubernetes" Version="1.0.0-beta2"
2018-01-16 12:41:29 -08:00
yanchenw
56a60e3d2f Try to fix windows container build error 2018-01-05 14:15:20 -08:00
Sychev Igor
470e626802 "Microsoft.ApplicationInsights.Kubernetes" Version="1.0.0-beta2" 2018-01-04 10:11:32 +03:00
Sychev Igor
924c735072 microsoft packages to latest. including Logging from .net standard 1.3 to 2.0 upgrade 2017-12-14 09:16:34 +03:00
Sychev Igor
595e6e49a3 Microsoft.ApplicationInsights.ServiceFabric to 2.0.1-beta1 2017-12-12 10:13:34 +03:00
dsanz
9d7622a59a Merge branch 'dev' into features/docker-multi-arch 2017-12-11 15:12:26 +01:00
Ramón Tomás
4dff728d11 Replaced custom DataProtection.Redis lib with official Microsoft pkg
Removed Sessions in WebMVC app
Fixed GracePeriodMgr issues using multiple instances
2017-11-30 11:40:30 +01:00
yanchenw
091ed81e7b Converts to use multi-stage build Dockerfile
1. Changes the build context of all services to the root level to be
able to access the dependencies for each project.
2. Commented out the prepublish scripts, these steps are moved into the
Dockerfile

Did not change any script yet, need help to identify what scripts we
need to change.
2017-11-27 13:48:31 -08:00
Ramón Tomás
dc98e6a4c6 Added Appinsights Linux SF telemetry initializer 2017-10-13 11:35:26 +02:00
Ramón Tomás
c3e15969b9 Added Appinsights K8s telemetry initializer 2017-10-11 18:53:26 +02:00