4260 Commits

Author SHA1 Message Date
etomas
5b97c7329b Infrastructure to support Dockerfiles for both Windows & Linux 2017-02-23 16:39:18 +01:00
etomas
6d72c7dda0 OrderStatus and CardTypes as Enumerations 2017-02-23 13:57:36 +01: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
Cesar De la Torre
33501657b7 Fixed change in SPA path for the build bits scripts, PowerShell and Mac Bash 2017-02-22 18:54:51 -08:00
Cesar De la Torre
405db61454 Fix for issue #60 https://github.com/dotnet/eShopOnContainers/issues/60 - STS cannot be reached from the MVC app 2017-02-22 18:41:15 -08:00
Cesar De la Torre
34d73ced24 Merge branch 'vs2017' of https://github.com/dotnet/eShopOnContainers into vs2017 2017-02-22 08:58:51 -08:00
etomas
d6629addf8 Msising sln update for #51 2017-02-22 09:16:57 +01:00
etomas
dc8ae55c7a Renaming WebSpa
Fixes #51
2017-02-22 09:16:31 +01:00
Eduard Tomàs
8d26113841 Merge pull request #50 from BillWagner/updates-for-bulding-on-macos
Updates for bulding on macos
2017-02-22 08:50:11 +01:00
etomas
f2b752e458 Merge branch 'vs2017' of https://github.com/dotnet/eShopOnContainers into vs2017 2017-02-22 08:39:08 +01:00
etomas
6fdfe09b0a Solves #46 (by moving property configuration at the end of OnModelCreating) 2017-02-22 08:39:00 +01:00
Cesar De la Torre
7b9d14fe2a Minor refactoring in LogDecorator 2017-02-21 12:17:16 -08:00
Bill Wagner
bb5d48735d update build script for Mac
Until adding these, the project would not build correctly on a Mac.

script working for SPA

Add execute permissions to build-bits.sh on macOS

fix a rebase / automatic merge issue.

Somehow, the MVC image got in there twice.

update content nodes

Bug workaround for for the CLI. It turns out that the CLI does not
handle content nodes that have multiple paths. Instead, multiple nodes
are needed.

use the standard names for the web docker images.

fix a typo and update the csproj content listings.

Also, execute nom install as part of publishing  the spa application.
2017-02-21 14:04:35 -05:00
Cesar De la Torre
2f54214785 Home README updates 2017-02-20 16:43:29 -08:00
Cesar De la Torre
50e7a7a385 Updates in README.md 2017-02-20 16:40:36 -08:00
Cesar De la Torre
b7d91a6e32 Folder to place the WebMonolithic app into 2017-02-17 13:22:51 -08:00
Cesar De la Torre
b9d35c8385 Merge branch 'vs2017' of https://github.com/dotnet/eShopOnContainers into vs2017 2017-02-17 12:51:02 -08:00
etomas
20523925e5 SPA now works succesfully.
Solves #47
2017-02-17 13:26:42 +01:00
Cesar De la Torre
439ec70edf Better way to include the images/pictures in the bits/image:
<None Update="Pics\*">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </None>
2017-02-16 16:30:46 -08:00
Cesar De la Torre
dc1a245720 Cleaning the old build-image.ps1 files up as the Docker Images are build now with docker-compose build/up and the PowerShell Scrip "build-bits.ps1" just needs to build the .NET and SPA bits and publish it into each pub directory per project. 2017-02-16 13:59:40 -08:00
Cesar De la Torre
bf6e696ccb Fix: Manual update to .CSPROJ file XML as VS 2017 was throwing an error when trying to go to the pics folder properties to include it in the output directoy. Added:
<None Update="Pics">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </None>

See possible related bug in VS 2017:
https://github.com/dotnet/roslyn-project-system/issues/1579
2017-02-16 13:22:42 -08:00
Cesar De la Torre
fafaf42c63 Minor change in Catalog.API 2017-02-16 12:37:09 -08:00
Cesar De la Torre
8e58cd5cb3 New .PDF version 2017-02-16 12:32:31 -08:00
Cesar De la Torre
9ccf7f11ce Changes for CLI compatibility and New .PDF version 2017-02-16 12:31:53 -08:00
Cesar De la Torre
2576c695ad Raising number of Retries With Exponential Backoff so slower machines don't get a "maxNumber of retries reached" exception.. 2017-02-16 11:16:47 -08:00
Cesar De la Torre
68ad1895c6 Fixed bug https://github.com/dotnet/eShopOnContainers/issues/45
with Retry with Exponential Backoff
2017-02-15 23:12:37 -08:00
Cesar De la Torre
e859d61a68 Fixed the bug in the Add-Firewall-Rules Script. Weird that it had the IPs in the wrong place.. 2017-02-15 21:39:31 -08:00
Cesar De la Torre
422cad9f31 UPdates in README.MD for Firewall rule screenshot and better highlighted plus other minor changes 2017-02-15 21:19:48 -08:00
Cesar De la Torre
8ca6c0d5ac Minor upgrade to the delete-images.ps1 2017-02-15 19:32:21 -08:00
Cesar De la Torre
aae8283798 Marked all our images with eshop/ and added a delete-images.ps1 for eShop images 2017-02-15 18:55:50 -08:00
Cesar De la Torre
f68fee6513 Improving when deleting eShop images, so if there are no eShop images it doesn't show an error, like it was happening with Charle's version 2017-02-15 17:58:07 -08:00
Cesar De la Torre
02a1e78cb1 Updated docs to install Node (npm) so can install Bower and Gulp needed for the MVC app, until this is triggered from the .CSPROJ file as we were doing from the PROJECT.JSON in the MVC app 2017-02-15 17:33:10 -08:00
Cesar De la Torre
13a7628603 Set webmvc project as by default startup project when F5 with Docker in VS 2017 2017-02-15 14:39:51 -08:00
Eduard Tomàs
b215e547f1 Merge pull request #41 from chlowell/script-fix
Update build scripts
2017-02-15 08:36:52 +01:00
Charles Lowell
33672d0e7c Update eShopOnContainers.sln 2017-02-14 15:32:15 -08:00
Charles Lowell
5e544c0cab Delete only eshop containers and images 2017-02-14 11:02:33 -08:00
Charles Lowell
8cfa4e7c56 Correct Identity.API path 2017-02-14 11:02:33 -08:00
Charles Lowell
0cd8ccf54b Install WebSPA's npm dependencies before building 2017-02-14 11:02:33 -08:00
Charles Lowell
9d7c588fc5 Restore Ordering.API dependencies before build 2017-02-14 11:02:32 -08:00
etomas
c7e362ac67 Docker files ready for the Visual Studio Docker Tools
Everything works as exepcted except SPA version which need further adjustments
2017-02-14 18:11:51 +01:00
etomas
af14d37378 Projects migrated to vs2017 csproj format 2017-02-14 16:23:26 +01:00
etomas
7521e7434d Fixing a nullreference exception
Also util files to start only "external containers"
vs2015
2017-02-14 16:17:30 +01:00
etomas
decb87e0c6 Merge branch 'migration/net11'
# Conflicts:
#	docs/architecting-and-developing-containerized-and-microservice-based-net-applications-ebook-early-draft.pdf
#	src/Services/Ordering/Ordering.API/Startup.cs
2017-02-14 16:16:42 +01:00
CESARDELATORRE
e4d02995a7 Updated Guide .PDF 2017-02-13 18:28:12 -08:00
CESARDL
834bc46b93 Updated Guide .PDF 2017-02-13 18:26:58 -08:00
CESARDL
46534d5688 Minor refactoring 2017-02-13 14:03:21 -08:00
etomas
289d15b79a Removed unwanted style for solving #31 2017-02-10 16:08:10 +01:00
etomas
5771f6ddd3 Solves error on order detail. Related to #4 2017-02-10 12:42:57 +01:00
unai
b60ac953d8 Solve issue with latest commit commenting code 2017-02-09 19:33:15 +01:00
unai
e991060a51 Set adddress as value object with workaround about Id and Hashkey 2017-02-08 19:26:05 +01:00