Skip to content
This repository was archived by the owner on Dec 5, 2024. It is now read-only.

Commit 86d3139

Browse files
Merge branch 'master' into fixes/secure-keychain-adapter
2 parents 8264777 + fc0cbdd commit 86d3139

Some content is hidden

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

52 files changed

+1170
-491
lines changed

.github/ISSUE_TEMPLATE.md

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<!--
2+
3+
Have you read GitHub for Unity's Code of Conduct? By filing an Issue, you are expected to comply with it, including treating everyone with respect: https://github.com/github-for-unity/Unity/blob/master/CODE_OF_CONDUCT.md
4+
5+
-->
6+
7+
### Prerequisites
8+
9+
- Be sure to run with tracing enabled to capture runtime details in the log file
10+
- Include the log file in the PR.
11+
- On Windows, the extension log file is at `%LOCALAPPDATA%\GitHubUnity\github-unity.log`
12+
- On macOS, the extension log file is at `~/.local/share/GitHubUnity/github-unity.log`
13+
14+
### Description
15+
16+
<!-- Description of the issue -->
17+
18+
### Steps to Reproduce
19+
20+
1. [First Step]
21+
2. [Second Step]
22+
3. [and so on...]
23+
24+
**Expected behavior:** [What you expect to happen]
25+
26+
**Actual behavior:** [What actually happens]
27+
28+
**Reproduces how often:** [What percentage of the time does it reproduce?]
29+
30+
### Additional Information
31+
32+
Any additional information, configuration or data that might be necessary to reproduce the issue.

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
### Requirements
2+
3+
* Filling out the template is required. Any pull request that does not include enough information to be reviewed in a timely manner may be closed at the maintainers' discretion.
4+
* All new code requires tests to ensure against regressions
5+
6+
### Description of the Change
7+
8+
<!--
9+
10+
We must be able to understand the design of your change from this description. If we can't get a good idea of what the code will be doing from the description here, the pull request may be closed at the maintainers' discretion. Keep in mind that the maintainer reviewing this PR may not be familiar with or have worked with the code here recently, so please walk us through the concepts.
11+
12+
-->
13+
14+
### Alternate Designs
15+
16+
<!-- Explain what other alternates were considered and why the proposed version was selected -->
17+
18+
### Benefits
19+
20+
<!-- What benefits will be realized by the code change? -->
21+
22+
### Possible Drawbacks
23+
24+
<!-- What are the possible side-effects or negative impacts of the code change? -->
25+
26+
### Applicable Issues
27+
28+
<!-- Enter any applicable Issues here -->

CONTRIBUTING.md

Lines changed: 171 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,171 @@
1+
# Contributing to GitHub for Unity
2+
3+
:+1: :tada: :sparkling_heart: Thanks for your interest! :sparkling_heart: :tada: :+1:
4+
5+
The following is a set of guidelines for contributing to GitHub for Unity and its
6+
related projects, which are hosted in the [GitHub for Unity Organization](https://github.com/github-for-unity)
7+
on GitHub. These are just guidelines, not rules. Use your best judgment, and
8+
feel free to propose changes to this document in a pull request.
9+
10+
Note that GitHub for Unity is currently a public alpha, so everything is likely to
11+
change over time as we learn and refine how we work with the community.
12+
13+
#### Table Of Contents
14+
15+
[What should I know before I get started?](#what-should-i-know-before-i-get-started)
16+
* [Code of Conduct](#code-of-conduct)
17+
* [The Roadmap](#the-roadmap)
18+
19+
[How Can I Contribute?](#how-can-i-contribute)
20+
* [Reporting Bugs](#reporting-bugs)
21+
* [Suggesting Enhancements](#suggesting-enhancements)
22+
* [Up for Grabs](#up-for-grabs)
23+
24+
[Additional Notes](#additional-notes)
25+
* [Issue and Pull Request Labels](#issue-and-pull-request-labels)
26+
27+
## What should I know before I get started?
28+
29+
### Code of Conduct
30+
31+
This project adheres to the Contributor Covenant [code of conduct](CODE_OF_CONDUCT.md).
32+
By participating, you are expected to uphold this code.
33+
Please report unacceptable behavior to [[email protected]](mailto:[email protected]).
34+
35+
### The Roadmap
36+
37+
Currently GitHub for Unity is in a public alpha, and the team is focused on
38+
triaging reported issues and working towards a 1.0 milestone.
39+
You can follow this progress under the [Milestones](https://github.com/github-for-unity/Unity/milestones)
40+
tab.
41+
42+
We're still thinking about where we want to take GitHub for Unity after we reach
43+
this 1.0 milestone. If you have ideas or suggestions please read the [Suggesting Enhancements](#suggesting-enhancements)
44+
section below to understand how to contribute your feedback.
45+
46+
## How Can I Contribute?
47+
48+
### Reporting Bugs
49+
50+
This section guides you through submitting a bug report for GitHub for Unity.
51+
Following these guidelines helps maintainers and the community understand your
52+
report :pencil:, reproduce the behavior :computer: :computer:, and find related
53+
reports :mag_right:.
54+
55+
Before creating bug reports, please check [this list](#before-submitting-a-bug-report)
56+
as you might find out that you don't need to create one. When you are creating
57+
a bug report, please [include as many details as possible](#how-do-i-submit-a-good-bug-report).
58+
Fill out [the required template](./.github/ISSUE_TEMPLATE.md), the information
59+
it asks for helps us resolve issues faster.
60+
61+
#### Before Submitting A Bug Report
62+
63+
**Perform a [cursory search](https://github.com/github-for-unity/Unity/labels/bug)**
64+
to see if the problem has already been reported. If it does exist, add a
65+
[reaction](https://help.github.com/articles/about-discussions-in-issues-and-pull-requests/#reacting-to-ideas-in-issues-and-pull-requests)
66+
to the issue to indicate this is also an issue for you, and add a
67+
comment to the existing issue if there is extra information you can contribute.
68+
69+
#### How Do I Submit A (Good) Bug Report?
70+
71+
Bugs are tracked as [GitHub issues](https://guides.github.com/features/issues/).
72+
73+
Simply create an issue on the [GitHub for Unity issue tracker](https://github.com/github-for-unity/Unity/issues)
74+
and fill out the provided [issue template](./.github/ISSUE_TEMPLATE.md).
75+
76+
The information we are interested in includes:
77+
78+
- details about your environment - which build, which operating system
79+
- details about reproducing the issue - what steps to take, what happens, how
80+
often it happens
81+
- other relevant information - log files, screenshots, etc.
82+
83+
### Suggesting Enhancements
84+
85+
This section guides you through submitting an enhancement suggestion for
86+
GitHub for Unity, including completely new features and minor improvements to
87+
existing functionality. Following these guidelines helps maintainers and the
88+
community understand your suggestion :pencil: and find related suggestions
89+
:mag_right:.
90+
91+
Before creating enhancement suggestions, please check [this list](#before-submitting-an-enhancement-suggestion)
92+
as you might find out that you don't need to create one. When you are creating
93+
an enhancement suggestion, please [include as many details as possible](#how-do-i-submit-a-good-enhancement-suggestion).
94+
Fill in [the template](./.github/ISSUE_TEMPLATE.md), including the steps
95+
that you imagine you would take if the feature you're requesting existed.
96+
97+
#### Before Submitting An Enhancement Suggestion
98+
99+
**Perform a [cursory search](https://github.com/github-for-unity/Unity/labels/enhancement)**
100+
to see if the enhancement has already been suggested. If it has, add a
101+
:thumbsup: to indicate your interest in it, or comment if there is additional
102+
information you would like to add.
103+
104+
#### How Do I Submit A (Good) Enhancement Suggestion?
105+
106+
Enhancement suggestions are tracked as [GitHub issues](https://guides.github.com/features/issues/).
107+
108+
Simply create an issue on the [GitHub for Unity issue tracker](https://github.com/github-for-unity/Unity/issues)
109+
and provide the following information:
110+
111+
* **Use a clear and descriptive title** for the issue to identify the
112+
suggestion.
113+
* **Provide a step-by-step description of the suggested enhancement** in as
114+
much detail as possible. This additional context helps the maintainers to
115+
understand the enhancement from your perspective
116+
* **Explain why this enhancement would be useful** to GitHub for Unity users.
117+
* **Include screenshots and animated GIFs** if relevant to help you demonstrate
118+
the steps or point out the part of GitHub for Unity which the suggestion is
119+
related to. You can use [this tool](http://www.cockos.com/licecap/) to record
120+
GIFs on macOS and Windows.
121+
* **List some other applications where this enhancement exists, if applicable.**
122+
123+
### Up For Grabs
124+
125+
As the team is working towards the 1.0 release, we'll identify enhancements or
126+
bugs that can be categorized as tasks that:
127+
128+
- have low impact, or have a known workaround
129+
- should be fixed
130+
- have a narrow scope and/or easy reproduction steps
131+
- can be worked on independent of other tasks
132+
133+
These issues will be labelled as [`up-for-grabs`](https://github.com/github-for-unity/Unity/labels/up-for-grabs)
134+
in the repository. If you are interested in contributing to the project, please
135+
comment on the issue to let the maintainers (and community) know you are
136+
interested in picking this up.
137+
138+
## Additional Notes
139+
140+
### Issue and Pull Request Labels
141+
142+
This section lists the labels we use to help us track and manage issues and
143+
pull requests.
144+
145+
#### Type of Issue and Issue State
146+
147+
| Label name | :mag_right: | Description |
148+
| --- | --- | --- |
149+
| `enhancement` | [search](https://github.com/github-for-unity/Unity/labels/enhancement) | Feature requests. |
150+
| `bug` | [search](https://github.com/github-for-unity/Unity/labels/bug) | Confirmed bugs or reports that are very likely to be bugs. |
151+
| `question` | [search](https://github.com/github-for-unity/Unity/labels/question) | Questions more than bug reports or feature requests (e.g. how do I do X). |
152+
| `more-information-needed` | [search](https://github.com/github-for-unity/Unity/labels/more-information-needed) | More information needs to be collected about these problems or feature requests (e.g. steps to reproduce). |
153+
| `needs-reproduction` | [search](https://github.com/github-for-unity/Unity/labels/needs-reproduction) | Likely bugs, but haven't been reliably reproduced. |
154+
| `macOS` | [search](https://github.com/github-for-unity/Unity/labels/macOS) | Issues specific to macOS users. |
155+
| `Windows` | [search](https://github.com/github-for-unity/Unity/labels/Windows) | Issues specific to Windows users. |
156+
| `Linux` | [search](https://github.com/github-for-unity/Unity/labels/Linux) | Issues specific to Linux users. |
157+
158+
#### Topics
159+
160+
| Label name | :mag_right: | Description |
161+
| --- | --- | --- |
162+
| `up-for-grabs` | [search](https://github.com/github-for-unity/Unity/labels/up-for-grabs) | Issues marked as ideal for external contributors. |
163+
| `polish` | [search](https://github.com/github-for-unity/Unity/labels/polish) | Issues not critical to the application but would provide a better experience if resolved. |
164+
| `tech-debt` | [search](https://github.com/github-for-unity/Unity/labels/tech-debt) | Issues related to code or architecture decisions. |
165+
| `design` | [search](https://github.com/github-for-unity/Unity/labels/design) | Issues that require some design input from the maintainers as part of completing the work. |
166+
167+
#### Workflow
168+
169+
| Label name | :mag_right: | Description |
170+
| --- | --- | --- |
171+
| `ready-for-review` | [search](https://github.com/github-for-unity/Unity/labels/ready-for-review) | Pull Requests that are ready to be reviewed by the maintainers. |

README.md

Lines changed: 56 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,61 @@
1-
# GitHub for Unity
1+
# [GitHub for Unity](https://unity.github.com)
22

3-
The GitHub for Unity extension brings Git and GitHub into Unity, integrating source control into your work with friendly and accessible tools and workflows.
3+
![Build Status](https://ci.appveyor.com/api/projects/status/github/github-for-unity/Unity?branch=master&svg=true)
44

5-
[Install](docs/install.md)
5+
[![Join the chat at https://gitter.im/github/VisualStudio](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/github-for-unity/Unity?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
66

7-
[Features](docs/features.md)
7+
The GitHub for Unity extension brings [Git](https://git-scm.com/) and GitHub into [Unity](https://unity3d.com/), integrating source control into your work with friendly and accessible tools and workflows.
88

9-
[Known Issues](docs/known-issues.md)
9+
**Please note:** this software is currently alpha quality. Please refer to the [list of known issues](https://github.com/github-for-unity/Unity/issues?q=is%3Aissue+is%3Aopen+label%3Abug), and make sure you have backups of your work before trying it out.
1010

11-
[Contributing](docs/contributing/readme.md)
11+
![GitHub for Unity screenshot](https://unity.github.com/assets/unity-screenshot.png)
12+
13+
## Where can I get it?
14+
15+
[Releases](https://github.com/github-for-unity/Unity/releases)
16+
17+
## Installing GitHub for Unity
18+
19+
### Requirements
20+
21+
- [Unity 5.4 or higher](https://store.unity.com/download). Personal edition is fine.
22+
23+
### Installation
24+
25+
- Create a new Unity project.
26+
- Download the latest release from the [releases page](https://github.com/github-for-unity/Unity/releases) and double-click the unitypackage file. The package will install itself into the project currently opened in Unity, and Unity will automatically load it once all the files are in the project.
27+
28+
## I have a problem with GitHub for Unity
29+
30+
First, please search the [open issues](https://github.com/github-for-unity/Unity/issues?q=is%3Aopen)
31+
and [closed issues](https://github.com/github-for-unity/Unity/issues?q=is%3Aclosed)
32+
to see if your issue hasn't already been reported (it may also be fixed).
33+
34+
If you can't find an issue that matches what you're seeing, open a [new issue](https://github.com/github-for-unity/Unity/issues/new)
35+
and fill out the template to provide us with enough information to investigate
36+
further.
37+
38+
## How can I contribute to GitHub for Unity?
39+
40+
The [CONTRIBUTING.md](./CONTRIBUTING.md) document will help you get setup and
41+
familiar with the source. The [documentation](docs/) folder also contains more
42+
resources relevant to the project.
43+
44+
If you're looking for something to work on, check out the [up-for-grabs](https://github.com/github-for-unity/Unity/issues?q=is%3Aopen+is%3Aissue+label%3Aup-for-grabs) label.
45+
46+
## More Resources
47+
48+
See [unity.github.com](https://unity.github.com) for more product-oriented
49+
information about GitHub for Unity.
50+
51+
## License
52+
53+
**[MIT](LICENSE)**
54+
55+
The MIT license grant is not for GitHub's trademarks, which include the logo
56+
designs. GitHub reserves all trademark and copyright rights in and to all
57+
GitHub trademarks. GitHub's logos include, for instance, the stylized
58+
Invertocat designs that include "logo" in the file title in the following
59+
folder: [IconsAndLogos](https://github.com/github-for-unity/Unity/tree/master/src/UnityExtension/Assets/Editor/GitHub.Unity/IconsAndLogos).
60+
61+
Copyright 2015 - 2017 GitHub, Inc.

common/SolutionInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@
3131
namespace System
3232
{
3333
internal static class AssemblyVersionInformation {
34-
internal const string Version = "0.11.0.0";
34+
internal const string Version = "0.12.0.0";
3535
}
3636
}

docs/contributing/how-to-build.md

Lines changed: 42 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,56 @@
11
# Contributing to GitHub for Unity
22

33
## Build Requirements
4-
To build GitHub for Unity we recommend using Visual Studio 2015 or Mono 4.x and bash.
4+
5+
This repository is LFS-enabled. To clone it, you should use a git client that supports git LFS 2.x and submodules.
6+
7+
### Windows
8+
9+
- Visual Studio 2015+ or Mono 4.x + bash shell (git bash). Mono 5.x will not work
10+
- `UnityEngine.dll` and `UnityEditor.dll`.
11+
- If you've installed Unity in the default location of `C:\Program Files\Unity` or `C:\Program Files (x86)\Unity`, the build will be able to reference these DLLs automatically. Otherwise, you'll need to copy these DLLs from your Unity installation into the `lib` directory in order for the build to work
12+
13+
### MacOS
14+
15+
- Mono 4.x. Mono 5.x will likely not work
16+
- `UnityEngine.dll` and `UnityEditor.dll`.
17+
- If you've installed Unity in the default location of `/Applications/Unity`, the build will be able to reference these DLLs automatically. Otherwise, you'll need to copy these DLLs from your Unity installation into the `lib` directory in order for the build to work
18+
19+
## Solution organization
20+
21+
The `GitHub.Unity.sln` solution includes several projects:
22+
23+
- dotnet-httpclient35 and octokit: external dependencies for threading and github api support, respectively. These are the submodules.
24+
- packaging: empty projects with build rules that copy DLLs to various locations for testing
25+
- Tests: unit and integration test projects
26+
- GitHub.Logging: A logging helper library
27+
- GitHub.Api: The core of the extension. This project is C#6 and includes async/await threading and other features that Unity cannot currently compile.
28+
- GitHub.Unity: Unity-specific code. This project is compilable by Unity
529

630
## How to Build
7-
31+
32+
Clone the repository and its submodules in a git GUI client that supports Git LFS or via the command line with the following commands
33+
34+
```
35+
git lfs clone https://github.com/github-for-unity/Unity
36+
cd Unity
37+
git submodule init
38+
git submodule deinit script
39+
git submodule update
40+
```
41+
842
### Visual Studio
943

1044
To build with Visual Studio 2015 open the solution file `GitHub.Unity.sln`. Select `Build Solution` in the `Build` menu.
1145

12-
### Mono and Bash
46+
### Mono and Bash (windows and mac)
1347

1448
To build with Mono 4.x and Bash execute `build.sh` in a bash shell.
1549

1650
## Build Output
1751

18-
Building the project creates an output folder named `github-unity-test` that is a sibling to the cloned repository. For instance, if the solution is located at `c:\Projects\Unity` the test output can be foud at `c:\Projects\github-unity-test`. The output folder contains a blank Unity project folder named `GitHubExtensionProject`. This folder is a blank Unity 5.5 project with GitHub for Unity installed.
52+
Once you've built the solution for the first time, you can open `src/UnityExtension/Assets/Editor/GitHub.Unity` in Unity. This folder contains the `GitHub.Unity` project and all the Unity UI and other Unity-specific code that you can have Unity compile as normal for quick testing and prototyping.
53+
54+
The build also creates a Unity test project called `GitHubExtension` inside a directory called `github-unity-test` next to your local clone. For instance, if the repository is located at `c:\Projects\Unity` the test project will be at `c:\Projects\github-unity-test\GitHubExtension`. You can use this project to test binary builds of the extension in a clean environment (all needed DLLs will be copied to it every time you build).
55+
56+
Note: some files might be locked by Unity if have one of the build output projects open when you compile from VS or the command line. This is expected and shouldn't cause issues with your builds.

docs/contributing/setup.md

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# Development Environment Setup
2+
3+
## Setup
4+
5+
You will need to install these tools on your machine:
6+
7+
### macOS
8+
9+
### Windows
10+
11+
## Verification
12+
13+
## Building GitHub for Unity
14+
15+
## Running tests
16+
17+
## Debugging
18+
19+
## The Next Steps
20+
21+
You're almost there! Here's a couple of things we recommend you read next:
22+
23+
- [Up for Grabs](../../CONTRIBUTING.md#up-for-grabs) - we've marked some tasks in
24+
the backlog that are ideal for external contributors
25+
- [Code Reviews](../process/reviews.md) - some notes on how the team does
26+
code reviews

0 commit comments

Comments
 (0)