Skip to content

Commit a3b3af4

Browse files
committed
update build config, bump package version and document process
1 parent 46fcc98 commit a3b3af4

File tree

2 files changed

+39
-0
lines changed

2 files changed

+39
-0
lines changed

.github/CONTRIBUTING.MD

+26
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,29 @@ I have chosen to loosely follow the [Angular Commit Guidelines](https://github.c
1313
# Documentation
1414

1515
If you'd like to help us improve our documentation, please checkout our [GitHub pages repository](https://github.com/json-api-dotnet/json-api-dotnet.github.io) where we host our documentation.
16+
17+
# Backporting Features To Prior Releases
18+
19+
To backport a feature that has been approved and merged into `master`:
20+
21+
## Requester
22+
23+
Open an issue requesting the feature you would like backported. The change will be reviewed based on:
24+
25+
- compatibility
26+
- difficulty in porting the change
27+
- the added value the feature provides for users on the older versions
28+
- how difficult it is for users to migrate from the older version to the newer version
29+
30+
## Maintainer
31+
32+
- Checkout the version you want to apply the feature on top of and create a new branch to release the new version:
33+
```
34+
git checkout tags/v2.5.1 -b release/2.5.2
35+
```
36+
- Cherrypick the merge commit: `git cherry-pick {git commit SHA}`
37+
- Bump the package version in the csproj
38+
- Make any other compatibility, documentation or tooling related changes
39+
- Push the branch to origin and verify the build
40+
- Once the build is verified, create a GitHub release, tagging the release branch
41+
- Open a PR back to master with any other additions

appveyor.yml

+13
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ branches:
1818
- master
1919
- develop
2020
- unstable
21+
- /release\/.+/
2122

2223
nuget:
2324
disable_publish_on_pr: true
@@ -38,6 +39,7 @@ test: off
3839
artifacts:
3940
- path: .\**\artifacts\**\*.nupkg
4041
name: NuGet
42+
4143
deploy:
4244
- provider: NuGet
4345
server: https://www.myget.org/F/research-institute/api/v2/package
@@ -47,17 +49,28 @@ deploy:
4749
symbol_server: https://www.myget.org/F/research-institute/symbols/api/v2/package
4850
on:
4951
branch: develop
52+
5053
- provider: NuGet
5154
server: https://www.myget.org/F/jadnc/api/v2/package
5255
api_key:
5356
secure: 6CeYcZ4Ze+57gxfeuHzqP6ldbUkPtF6pfpVM1Gw/K2jExFrAz763gNAQ++tiacq3
5457
skip_symbols: false
5558
on:
5659
branch: unstable
60+
5761
- provider: NuGet
5862
name: production
63+
skip_symbols: false
5964
api_key:
6065
secure: /fsEOgG4EdtNd6DPmko9h3NxQwx1IGDcFreGTKd2KA56U2KEkpX/L/pCGpCIEf2s
6166
on:
6267
branch: master
6368
appveyor_repo_tag: true
69+
70+
- provider: NuGet
71+
skip_symbols: false
72+
api_key:
73+
secure: /fsEOgG4EdtNd6DPmko9h3NxQwx1IGDcFreGTKd2KA56U2KEkpX/L/pCGpCIEf2s
74+
on:
75+
branch: /release\/.+/
76+
appveyor_repo_tag: true

0 commit comments

Comments
 (0)