Merge branch 'master' into copyhelper-fixes

Author: StanleyGoldman

.github/ISSUE_TEMPLATE.md

@@ -10,6 +10,7 @@ Have you read GitHub for Unity's Code of Conduct? By filing an Issue, you are ex
 - Include the log file in the PR.
   - On Windows, the extension log file is at `%LOCALAPPDATA%\GitHubUnity\github-unity.log`
   - On macOS, the extension log file is at `~/Library/Logs/GitHubUnity/github-unity.log`
+  - On linux, the extension log file is at `~/.local/share/GitHubUnity/github-unity.log`
 
 ### Description
 

GitHub.Unity.sln

@@ -37,6 +37,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnityTests", "src\UnityExte
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExtensionLoader", "src\UnityExtension\Assets\Editor\GitHub.Unity\ExtensionLoader\ExtensionLoader.csproj", "{6B0EAB30-511A-44C1-87FE-D9AB7E34D115}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnityShim", "src\UnityShim\UnityShim.csproj", "{F94F8AE1-C171-4A83-89E8-6557CA91A188}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -161,6 +163,14 @@ Global
 		{6B0EAB30-511A-44C1-87FE-D9AB7E34D115}.dev|Any CPU.Build.0 = dev|Any CPU
 		{6B0EAB30-511A-44C1-87FE-D9AB7E34D115}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6B0EAB30-511A-44C1-87FE-D9AB7E34D115}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F94F8AE1-C171-4A83-89E8-6557CA91A188}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F94F8AE1-C171-4A83-89E8-6557CA91A188}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F94F8AE1-C171-4A83-89E8-6557CA91A188}.DebugNoUnity|Any CPU.ActiveCfg = Debug|Any CPU
+		{F94F8AE1-C171-4A83-89E8-6557CA91A188}.DebugNoUnity|Any CPU.Build.0 = Debug|Any CPU
+		{F94F8AE1-C171-4A83-89E8-6557CA91A188}.dev|Any CPU.ActiveCfg = dev|Any CPU
+		{F94F8AE1-C171-4A83-89E8-6557CA91A188}.dev|Any CPU.Build.0 = dev|Any CPU
+		{F94F8AE1-C171-4A83-89E8-6557CA91A188}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F94F8AE1-C171-4A83-89E8-6557CA91A188}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

common/SolutionInfo.cs

@@ -32,8 +32,8 @@ namespace System
 {
     internal static class AssemblyVersionInformation {
         // this is for the AssemblyVersion and AssemblyVersion attributes, which can't handle alphanumerics
-        internal const string VersionForAssembly = "1.1.1";
+        internal const string VersionForAssembly = "1.2.0";
         // Actual real version
-        internal const string Version = "1.1.1";
+        internal const string Version = "1.2.0";
     }
 }

create-unitypackage.sh

@@ -0,0 +1,9 @@
+#!/bin/sh -eu
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+version=$(sed -En 's,.*Version = "(.*)".*,\1,p' common/SolutionInfo.cs)
+commitcount=$(git rev-list  --count HEAD)
+commit=$(git log -n1 --pretty=format:%h)
+version="${version}.${commitcount}-${commit}"
+
+$DIR/submodules/packaging/unitypackage/run.sh --path $DIR/unity/PackageProject --out $DIR --file github-for-unity-$version

docs/contributing/how-to-build.md

@@ -13,7 +13,7 @@ This repository is LFS-enabled. To clone it, you should use a git client that su
 
 ### MacOS
 
-- Mono 4.x required. You can install it via brew with `brew tap shana/mono && brew install mono@4.8`
+- [Mono 4.x](https://download.mono-project.com/archive/4.8.1/macos-10-universal/) required. You can install it via brew with `brew tap shana/mono && brew install mono@4.8`
   - Mono 5.x will not work
 - `UnityEngine.dll` and `UnityEditor.dll`.
   - 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 `[Unity installation path]/Unity.app/Contents/Managed` into the `lib` directory in order for the build to work

octorun/bin/octorun-meta

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+
+require('../src/bin/app-meta.js');

octorun/bin/octorun-token

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+
+require('../src/bin/app-token.js');

octorun/src/api.js

@@ -1,7 +1,7 @@
 var config = require("./configuration");
 var octokitWrapper = require("./octokit");
 
-function ApiWrapper() {
+function ApiWrapper(host) {
     if (!config.appName) {
         throw "appName missing";
     }
@@ -10,7 +10,7 @@ function ApiWrapper() {
         throw "token missing";
     }
 
-    this.octokit = octokitWrapper.createOctokit(config.appName);
+    this.octokit = octokitWrapper.createOctokit(config.appName, host);
 
     this.octokit.authenticate({
         type: "oauth",

octorun/src/authentication.js

@@ -5,7 +5,7 @@ var twoFactorRegex = new RegExp("must specify two-factor authentication otp code
 
 var scopes = ["user", "repo"];
 
-var handleAuthentication = function (username, password, onSuccess, onFailure, twoFactor) {
+var handleAuthentication = function (username, password, onSuccess, onFailure, twoFactor, host) {
     if (!config.clientId || !config.clientSecret) {
         throw "clientId and/or clientSecret missing";
     }
@@ -14,7 +14,7 @@ var handleAuthentication = function (username, password, onSuccess, onFailure, t
         throw "appName missing";
     }
 
-    var octokit = octokitWrapper.createOctokit(config.appName);
+    var octokit = octokitWrapper.createOctokit(config.appName, host);
 
     octokit.authenticate({
         type: "basic",

octorun/src/bin/app-login.js

@@ -6,6 +6,7 @@ var output = require('../output');
 commander
     .version(package.version)
     .option('-t, --twoFactor')
+    .option('-h, --host <host>')
     .parse(process.argv);
 
 var handleAuthentication = function (username, password, twoFactor) {
@@ -18,7 +19,7 @@ var handleAuthentication = function (username, password, twoFactor) {
         }
     }, function (error) {
         output.error(error);
-    }, twoFactor);
+    }, twoFactor, commander.host);
 }
 
 var encoding = 'utf-8';