50 Commits

Author SHA1 Message Date
Dzmitry Ausiyevich
4fd5530a0d Initial version [need refactoring] 2022-12-18 20:22:51 +02:00
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
066b055e36 Angular 10 version running 2021-06-17 23:23:52 +01:00
Miguel Veloso
2a0db634c4 Update to .NET 5 2021-06-17 17:17:04 +01:00
Miguel Veloso
bbe423cf8e Initial version running 2021-06-15 15:34:41 +01:00
Miguel Veloso
dbf782d210 Initial eShop-Learn version 2021-06-15 09:57:28 +01:00
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
Rich Lander
d0cd2830a8
Update sdk tag (#1647) 2021-04-13 18:45:38 +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
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
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
Carlos de Miguel Ferrero
f1eb453683 Upgrade to 12 node version 2020-12-17 10:35:23 +01:00
Carlos de Miguel Ferrero
7d8c21fe9a Upgrade node version 10.3 to docker 2020-12-15 17:24:08 +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
5f1bdbcc47 Fix npm & docker build warnings #1224
Update Angular 7 to 8 to fix warnings and vulnerabilities
2020-01-24 10:32:20 +01:00
Miguel Veloso
3a1aff0191 Update base images to 3.1 2019-12-16 18:52:28 +00:00
Miguel Veloso
593be81bb0 Improve docker build cache usage 2019-11-18 15:04:11 +00:00
Miguel Veloso
5013ff40ba Remove unnecessary commands from dockerfiles 2019-11-07 16:56:22 +00:00
eiximenis
a2053deb49 Final charts tunning and allowing Linkerd Mesh to be used 2019-09-10 19:49:50 +02:00
ericuss
bd1daf232d Add layers in docker for npm install 2019-09-04 15:04:17 +02:00
eiximenis
870363861f Update Dockerfiles for use /src as build context root 2019-08-28 14:11:29 +02:00
Erik Pique
756142db94 upgrade net3 webapp 2019-07-23 12:14:09 +02:00
eiximenis
58f156f417 fixing dockerfiles for windows 2019-05-28 11:49:39 +02: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
06018d4080 Streamline Dockerfiles 2019-04-13 08:23:40 +01:00
Miguel Veloso
be75d554f2 Inital Dockerfiles 2019-04-12 19:45:45 +01:00
jmanuelcorral
65b7b31d8d Done Updating versions 2019-03-21 16:38:01 +01:00
Ramón Tomás
ffca2da0b3 Migrated to netcore 2.2 2018-12-11 13:51:58 +01:00
Erik Pique
574e07b09f update dockerfiles 2018-11-13 10:23:00 +01:00
Erik Pique
9775219a34 change netcore 2.1 to 2.2 and update nugets 2018-11-12 17:27:54 +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
eiximenis
684aa4927f Updates to make it work with Docker
- Dockerfiles changes
- Minor csproj updates to bring back "dotnet bundle" cli
- Enable all protocols in SignalR
- Update package-lock.json in spa
2018-05-16 14:45:15 +02:00
Unai Zorrilla Castro
b02c1b825d Migrate all dockerfiles to use 2.1 image. Added ApiBehaviorOptions into Catalog 2018-05-15 16:27:10 +02:00
Miguel Veloso
b12b536439
Merge pull request #524 from SychevIgor/packagesupdate
packages update
2018-03-17 16:25:58 +00:00
Cesar De la Torre Llorente
b78daa4685 Fix microsoft/aspnetcore-build:2.0.5-2.1.4 name in dockerfiles 2018-03-16 10:41:23 -07:00
Cesar De la Torre Llorente
c17ecfa16a Fallback to aspnetcore-build:2.0.5-2.1.4 until issue with aspnetcore-build:2.0 is solved: https://github.com/dotnet-architecture/eShopOnContainers/issues/543 2018-03-14 16:35:51 -07:00
Sychev Igor
039632bebd docker to 2.0.5 .net core 2018-03-05 00:59:27 +03:00
yanchenw
56a60e3d2f Try to fix windows container build error 2018-01-05 14:15:20 -08:00
yanchenw
607a30491e Optimize multistage build 2018-01-04 15:00:05 -08:00
yanchenw
e4fa15b813 Optimize multi-stage build Dockerfile
Remove explicitly copied dependencies, copy entire solution
into the conainter and depends on the cache to reduce build
time.

Addd temporary solution file which does not contains the
dcproj file to work around the issue that the dotnet cli
cannot handle dcproj.
2018-01-04 11:01:45 -08:00
Sychev Igor
77e5f9ba5a images to support 2.0.3 packages with security fixes 2017-12-14 09:16:34 +03:00
dsanz
2e955c7f13 Fix multistaging build 2017-12-12 17:35:07 +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
Eduard Tomas
56902a5549 [WIP] Projects & Dockerfile migrated to 2.0
Lots of things to address yet, because nuget packages are still on 1.1
2017-06-21 19:03:48 +02:00
Cesar De la Torre
4410e455e0 Updates to target .NET Core 1.1.2 - Version changes at every .csproj file, dockerfile and the docker-compose.ci.build.yml file for building from the CLI. 2017-05-25 17:01:10 -07:00
Cesar De la Torre
d5cd24a3b9 Fixed another bug related to the change of the SPA project name/path tp just WebSPA.dll at the dockerfile 2017-02-22 19:45:32 -08:00
etomas
dc8ae55c7a Renaming WebSpa
Fixes #51
2017-02-22 09:16:31 +01:00