Skip to content

Create ArcadeServicing.md #7540

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
markwilkie merged 1 commit into from
Jun 18, 2021
Merged

Create ArcadeServicing.md #7540

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions Documentation/Policy/ArcadeServicing.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,22 @@ Mechanically, this is done in two ways:
- Branch our tools (Arcade) with the product.
- Rev the APIs of our services as needed.

**For those inserting into Visual Studio, careful consideration should be given to which Arcade to take a dependency on. If latest features are needed, then 'n' (or master) might make sense, otherwise 'n-1' (servicing) will be more stable and have much less churn.**
**For those inserting into Visual Studio, careful consideration should be given to which Arcade to take a dependency on. If latest features are needed, then 'n' (or main) might make sense, otherwise 'n-1' (servicing) will be more stable and have much less churn.**

**It's important to note that we *must* continue to validate any supported versions
of Arcade or services.**

## Details

### Where do we do work on Arcade SDK?
- `master` for future releases
- `main` for future releases
- `release/<NET Core Major Version Number>` for servicing

### How do I get my servicing fix into master?
- Fixes that apply to both master as well as servicing releases must be first checked into
master and then cherry picked into the appropriate servicing branches.
- Code flow happens from servicing branches back into master for the purposes of completeness,
but developers must **not** rely on this to get fixes into master.
### How do I get my servicing fix into main?
- Fixes that apply to both main as well as servicing releases must be first checked into
main and then cherry picked into the appropriate servicing branches.
- Code flow happens from servicing branches back into main for the purposes of completeness,
but developers must **not** rely on this to get fixes into main.

### When do we branch?
- Major releases of .NET Core, not minor
Expand Down