Skip to content
This repository was archived by the owner on Nov 17, 2023. It is now read-only.

Commit c0d496e

Browse files
authored
Merge pull request #1 from dotnet-architecture/dev
Update Fork.
2 parents 5831c91 + 976ef98 commit c0d496e

File tree

1,391 files changed

+79202
-80525
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,391 files changed

+79202
-80525
lines changed

.dockerignore

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
.dockerignore
2+
.env
3+
.git
4+
.gitignore
5+
.vs
6+
.vscode
7+
docker-compose*.yml
8+
docker-compose.dcproj
9+
*.sln
10+
!eShopOnContainers-ServicesAndWebApps.sln
11+
*.md
12+
hosts
13+
LICENSE
14+
*.testsettings
15+
vsts-docs
16+
test
17+
ServiceFabric
18+
readme
19+
k8s
20+
img
21+
docs
22+
deploy
23+
Components
24+
cli-windows
25+
cli-mac
26+
cli-linux
27+
**/bin/
28+
**/obj/
29+
**/node_modules/
30+
**/bower_components/
31+
**/wwwroot/lib/*
32+
global.json
33+
**/appsettings.localhost.json
34+
src/Web/WebSPA/wwwroot/

.env

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# The IP below should be swapped to your real IP or DNS name, like 192.168.88.248, etc. if testing from remote browsers or mobile devices
66

77
ESHOP_EXTERNAL_DNS_NAME_OR_IP=localhost
8-
ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP=10.121.122.92
8+
ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP=10.121.122.162
99

1010
#ESHOP_AZURE_REDIS_BASKET_DB=<YourAzureRedisBasketInfo>
1111
#ESHOP_AZURE_STORAGE_CATALOG_URL=<YourAzureStorage_Catalog_BLOB_URL>
@@ -23,3 +23,5 @@ ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP=10.121.122.92
2323
#ESHOP_AZURE_STORAGE_MARKETING_KEY=<YourAzureStorageMarketingKey>
2424
#ESHOP_SERVICE_BUS_USERNAME=<ServiceBusUserName-OnlyUsedIfUsingRabbitMQUnderwindows>
2525
#ESHOP_SERVICE_BUS_PASSWORD=<ServiceBusUserPassword-OnlyUsedIfUsingRabbitMQUnderwindows>
26+
#INSTRUMENTATION_KEY=
27+
#USE_LOADTEST=<True/False>

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ bld/
2727
.vs/
2828
# Uncomment if you have tasks that create the project's static files in wwwroot
2929
**/wwwroot/lib/
30+
!/wwwroot/lib/signalr
31+
!/wwwroot/lib/toastr
3032

3133
# MSTest test Results
3234
[Tt]est[Rr]esult*/
@@ -260,3 +262,4 @@ pub/
260262
/src/Web/WebMVC/wwwroot/lib
261263
/src/Web/WebMVC/wwwroot/css/site.min.css
262264
**/.kube/**
265+
.mfractor

CONTRIBUTING.md

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
# How to contribute to eShopOnContainers
2+
3+
This repo is a reference and learning resource and everyone is invited to contribute, however not all PRs will be accepted into the main branch (**`dev`**).
4+
5+
There's a general development strategy that's driven by @CESARDELATORRE, who chooses, or defines criteria for choosing, the issues to include in the codebase, given a bunch of constraints and other guidelines.
6+
7+
However you can always get in touch with him, if you want to implement some general-interest feature in your repo and have it referenced from the [documentation](https://docs.microsoft.com/dotnet/standard/microservices-architecture/) or the [Microservices eBook](https://aka.ms/microservicesebook/).
8+
9+
## Coding Standards
10+
11+
There are no explicit coding standards so pay attention to the general coding style, that's (mostly) used everywhere.
12+
13+
However, there's only one **REALLY** important rule: **use spaces for indenting** 😉.
14+
15+
## Development Process
16+
17+
In order to help manage community contributions and avoid conflicts, there's a [Development project](https://github.com/dotnet-architecture/eShopOnContainers/projects/3) in this repo, to track assignments to any significant development effort.
18+
19+
Great but... **what's "significant"**?
20+
21+
That's not too easy to define and there are no clear criteria right now but, probably, changing "a couple" lines of code in one file would not qualify while changing "a bunch" of files would.
22+
23+
We'll all be learning in the process so we'll figure it out somehow.
24+
25+
### General Steps
26+
27+
1. Issues are managed as usual with the regular issues list, just like any other repo.
28+
29+
2. Once an issue is marked as a bug, enhancement, new feature or whatever needs development work, it will be labeled as a **backlog-item** and included as the last item in the Backlog project column.
30+
31+
3. Community members can propose themselves to code an issue.
32+
33+
4. @CESARDELATORRE/collaborators will prioritize the backlog items and arrange them in the **Backlog** column, so that the items in the top of the list are implemented first.
34+
35+
5. @CESARDELATORRE/collaborators will review the issues and select the ones approved to begin development with, and move them to the **Approved** column.
36+
37+
6. Issues in the **Approved** column can be assigned to a **collaborator** or to a **community member** who would then begin working on the issue and submit a PR as usual.
38+
39+
## Tests
40+
41+
There's not a tests policy in the project at this moment, but it'll be greatly appreciated if you include them within the [updated test structure](./test/readme.md).
42+
43+
## Forks and Branches
44+
45+
All contributions must be submitted as a [Pull Request (PR)](https://help.github.com/articles/about-pull-requests/) so you need to [fork this repo](https://help.github.com/articles/fork-a-repo/) on your GitHub account.
46+
47+
The main branches are **`dev`** and **`master`**:
48+
49+
- **`dev`**: Contains the latest code **and it is the branch actively developed**.
50+
**All PRs must be against `dev` branch to be considered**. This branch is developed using .NET Core 2.x
51+
52+
- **`master`**: Synced from time to time from **`dev`**. It contains "stable" code.
53+
(**Keep in mind "stable" does not mean PRODUCTION-READY!**)
54+
55+
- Any other branch is considered temporary and could be deleted at any time. Do not submit any PR to them!
56+
57+
## DISCLAIMER - This is not a PRODUCTION-READY TEMPLATE for microservices
58+
eShopOnContainers is a reference application to **showcase architectural patterns** for developing microservices applications on .NET Core. **IT IS NOT A PRODUCTION-READY TEMPLATE** to start real-world application. In fact, the application is in a **permanent beta state**, as it’s also used to test new potentially interesting technologies as they show up.
59+
60+
Since this is a learning resource, some design decisions have favored simplicity to convey a pattern, over production-grade robustness.
61+
62+
## Suggestions
63+
64+
We hope this helps us all to work better and avoid some of the problems/frustrations of working in such a large community.
65+
66+
We'd also appreciate any comments or ideas to improve this.
67+

NuGet.config

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3+
<config>
4+
<add key="repositoryPath" value="packages" />
5+
</config>
36
<packageSources>
47
<add key="AspNetCore" value="https://dotnet.myget.org/F/aspnet-feb2017-patch/api/v3/index.json" />
58
<add key="NuGet" value="https://api.nuget.org/v3/index.json" />

0 commit comments

Comments
 (0)