Skip to content

Commit

Permalink
Merge pull request #127 from ee61re/patch-4
Browse files Browse the repository at this point in the history
typos
  • Loading branch information
KelvinTegelaar authored Oct 26, 2021
2 parents 2f5d98b + 6471895 commit f23c794
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions Documentation/Contributions.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ When contributing, or planning to contribute, please create an issue in the trac

# Feature requests

Feature requests that request integration with anything but M365 will be closed. We're not intergrating directly with third party products until version 2.0. Pull requests that have integration components will be discussed and evaluated on a case-by-case basis.
Feature requests that request integration with anything but M365 will be closed. We're not integrating directly with third party products until version 2.0. Pull requests that have integration components will be discussed and evaluated on a case-by-case basis.
# Pull Requests

We do not accept PRs or commits against Master. Master is always the final version. For both CIPP and CIPP-API we have two brances. Dev and Master. Please make any PR against Dev, when Dev is promoted to final we'll PR that against master.
We do not accept PRs or commits against Master. Master is always the final version. For both CIPP and CIPP-API we have two branches. Dev and Master. Please make any PR against Dev, when Dev is promoted to final we'll PR that against master.
## Creating two instances

- Make a clone of your forked repo
Expand Down Expand Up @@ -61,7 +61,7 @@ jobs:
# Local development guide
So you want to jump in on helping us make this awesome? You'll need a local development environment. I'm assuming you have *some* programming experience. You'll need a couple of tools to get start
So you want to jump in on helping us make this awesome? You'll need a local development environment. I'm assuming you have *some* programming experience. You'll need a couple of tools to get started
- Install [node.js](https://nodejs.org/en/)
- Install .NET Core 2 and .NET Core 5
Expand All @@ -76,14 +76,14 @@ Starting only the frontend:
```
swa start "C:\PathToYourLocallyDownloadedFrontEn" --swa-config-location "C:\AnyInvalidPath"
```
We use an invalid path on purpose, because our config in the CIPP folder on works for cloud engines and not the local emulator.
We use an invalid path on purpose, because our config in the CIPP folder only works for cloud engines and not the local emulator.

Starting only the APIs:
```
func start --script-root "C:\FolderTo\CIPP-API"
```

For starting both, we recommend two seperate instances. You can also have the SWA utility start the API but this brings in some added difficulties because you can't see the API logs directly in the console.
For starting both, we recommend two separate instances. You can also have the SWA utility start the API but this brings in some added difficulties because you can't see the API logs directly in the console.
```
func start --script-root "C:\FolderTo\CIPP-API"
swa start "C:\PathToYourLocallyDownloadedFrontEn" --swa-config-location "C:\AnyInvalidPath" --api-location http://localhost:7071/
Expand All @@ -106,4 +106,4 @@ Local.settings.json example:
"tenantid":"tenantid"
}
}
```
```

0 comments on commit f23c794

Please sign in to comment.