Skip to content

Commit 8875f62

Browse files
committed
Merge branch 'next/master'
2 parents 700b440 + 47e2aa8 commit 8875f62

File tree

3 files changed

+31
-21
lines changed

3 files changed

+31
-21
lines changed

.buginfo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
system: jira
2-
system: jira.unity3d.com
2+
server: jira.unity3d.com
33
issuetype: Bug
44
package: Visual Studio
55
project: VS

Internal/README.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Repositories
2+
3+
- Public repository: https://github.com/Unity-Technologies/com.unity.ide.visualstudio is a mirror of the internal repository
4+
- Internal repository: https://github.cds.internal.unity3d.com/unity/com.unity.ide.visualstudio
5+
6+
# How to contribute (for everyone)
7+
8+
- Please create a PR against the latest `version-x.y.z` branch.
9+
- In the [`.scripts`](.scripts) folder, you should find how to build IDE integrations with VS and VS for Mac. Make sure to remove all build artifacts if needed, given we do not want Unity to import unwanted files. You can find as well extra notes regarding building the MacOS part [here](Packages/com.unity.ide.visualstudio/Editor/AppleEventIntegration~/howtobuild.txt), and the Windows part [here](https://github.cds.internal.unity3d.com/unity/com.unity.ide.visualstudio/blob/next/master/Packages/com.unity.ide.visualstudio/Editor/COMIntegration/COMIntegration~/howtobuild.txt).
10+
- Please add Microsoft folks on all PRs.
11+
12+
# How to publish new version (for Microsoft)
13+
14+
All you have to do is create a PR that targets *next/master*. The important part is to make the PR title the version number i.e. `2.0.3` or the target version. Also to add the changelog to the description of the PR. Then add the unity employee as a reviewer. Once we have reviewed it, and all tests are passing we will merge it to next/master (a real merge commit must be used, and not a squash!).
15+
16+
`next/master` is a CI branch that will update the source code as following:
17+
18+
- Update the package.json files with the PR title. I.e. `2.0.3` or the target version. This has to obide by the SEMVER rules for major, minor, and patch versions. The CI will otherwise fail to validate the new version.
19+
- Update the changelog of packages/com.unity.ide.visualstudio/ with the content of the PR description.
20+
21+
The changelog will get the date stamp of when the PR was merged to next/master followed by the description.
22+
23+
When the files has been modified the branch is then merged to publish-release. Here we do a full test for all platforms (Windows, OSx, and Linux), as well as all supported version of Unity from first release to current trunk (newest alpha/beta).
24+
25+
If all test pass, the package will be published to an internal repo we call candidates. Here the package is accessible for all Unity developers behind our VPN.
26+
27+
The next step is that we merge it to the master branch. Here the CI will create a PR targeting our internal repo. This is done in order to make the new version a verified package. Verified means that it is shipped with Unity, and subjugated to our QA department and our internal test suite.

README.md

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,5 @@
1-
# How to contribute (for everyone)
1+
# com.unity.ide.visualstudio
22

3-
- Please create a PR against the latest `version-x.y.z` branch.
4-
- In the [`.scripts`](.scripts) folder, you should find how to build IDE integrations with VS and VS for Mac. Make sure to remove all build artifacts if needed, given we do not want Unity to import unwanted files. You can find as well extra notes regarding building the MacOS part [here](Packages/com.unity.ide.visualstudio/Editor/AppleEventIntegration~/howtobuild.txt), and the Windows part [here](https://github.cds.internal.unity3d.com/unity/com.unity.ide.visualstudio/blob/next/master/Packages/com.unity.ide.visualstudio/Editor/COMIntegration/COMIntegration~/howtobuild.txt).
5-
- Please add Microsoft folks on all PRs.
3+
This is a mirror of the `com.unity.ide.visualstudio` package. This repository on GitHub is readonly.
64

7-
# How to publish new version (for Microsoft)
8-
9-
All you have to do is create a PR that targets *next/master*. The important part is to make the PR title the version number i.e. `2.0.3` or the target version. Also to add the changelog to the description of the PR. Then add the unity employee as a reviewer. Once we have reviewed it, and all tests are passing we will merge it to next/master (a real merge commit must be used, and not a squash!).
10-
11-
`next/master` is a CI branch that will update the source code as following:
12-
13-
- Update the package.json files with the PR title. I.e. `2.0.3` or the target version. This has to obide by the SEMVER rules for major, minor, and patch versions. The CI will otherwise fail to validate the new version.
14-
- Update the changelog of packages/com.unity.ide.visualstudio/ with the content of the PR description.
15-
16-
The changelog will get the date stamp of when the PR was merged to next/master followed by the description.
17-
18-
When the files has been modified the branch is then merged to publish-release. Here we do a full test for all platforms (Windows, OSx, and Linux), as well as all supported version of Unity from first release to current trunk (newest alpha/beta).
19-
20-
If all test pass, the package will be published to an internal repo we call candidates. Here the package is accessible for all Unity developers behind our VPN.
21-
22-
The next step is that we merge it to the master branch. Here the CI will create a PR targeting our internal repo. This is done in order to make the new version a verified package. Verified means that it is shipped with Unity, and subjugated to our QA department and our internal test suite.
5+
The readme for internal Unity developers is accessible [here](Internal/README.md).

0 commit comments

Comments
 (0)