Merge branch 'master' into patch-1

Author: neuroKip

docs/process/release-process.md

@@ -0,0 +1,68 @@
+# Release process
+
+## Release information
+
+### Tag name format
+
+***Alpha releases***: `v[major].[minor]-alpha`
+
+***Beta releases***: `v[major].[minor]-beta`
+
+***Releases***: `v[major].[minor]`
+
+## The process
+
+#### TL;DR
+
+1. Dev branches to a release branch every week, create draft release with release notes
+2. QA tests release branch for up to a week
+3. Dev continues work on master
+4. Dev fixes shipblockers on release branch and updates build on draft release page, and makes sure fixes are also sent to master
+5. QA publishes release by tagging the release branch and hitting "Publish"
+6. Goto 1
+
+#### The long explanation
+
+Every week:
+
+1. Create a release branch from master with the name `release/[Major].[Minor]`, where `[Major].[Minor]` are the current major and minor parts of the version set on master.
+1. Bump the version on master
+1. Create a draft release with the release notes, following the format below
+1. Upload a build created from the release branch
+1. QA tests the release and logs any issues found in it. Issues are fixed on the next release unless they are related to the issues that are reported as fixed in the current release, and they are shipblockers.
+1. If the release requires fixes:
+   1. If the fix is reverting a PR, that doesn't have to be done on master, only on the release branch. Otherwise:
+   1. Create a branch from the release branch fork point (the commit that the release branch is based on)
+   1. Push the fix to this branch and create a PR targetting the release branch
+   1. Upload a new build from the release branch
+   1. Create another branch from master, merge the fix branch into it and create a PR targetting master
+1. QA approves release by:
+   1. Filling out the tag name, in the format shown above
+   1. Selecting the release branch corresponding to the build
+   1. Clicking `Publish release`
+
+
+## Template for release notes
+
+The https://github.com/github-for-unity/unity-release-notes node project generates draft release notes by outputting all issues labeled `Feature`, `Enhancement` and `Bug` closed since the last release in the correct format for release notes, and also outputs all PRs closed since the last release, in case some issues might not have been correctly labeled and/or created.
+
+The markdown format for release notes is below. This is what the project above generates (more or less).
+
+```
+# Release notes
+
+[any special notes and/or funny/relevant image for the release here, if needed]
+
+## Features
+
+- #XXX - Title of issue (adjust for user consumption if needed)
+
+## Enhancements
+
+- #XXX - Title of issue (adjust for user consumption if needed)
+
+## Fixes
+
+- #XXX - Title of issue (adjust for user consumption if needed)
+
+```

docs/readme.md

@@ -24,8 +24,9 @@ Details about how the team is organizing and shipping GitHub for Unity:
 
  - **[Issue Triage](process/issue-triage.md)** - how we address issues reported
     by users
- - **[Review Process](process/reviews.md)** - how we review contributions
+ - **[Review](process/reviews.md)** - how we review contributions
  - **[Roadmap](process/roadmap.md)** - how we plan for the future
+ - **[Release](process/release-process.md)** - how we review contributions
 
 ## Technical
 

src/UnityExtension/Assets/Editor/GitHub.Unity/GitHub.Unity.csproj

@@ -91,8 +91,6 @@
     <Compile Include="Misc\Utility.cs" />
     <Compile Include="Services\AuthenticationService.cs" />
     <Compile Include="Services\StatusService.cs" />
-    <Compile Include="Tasks\EvaluateProjectConfigurationTask.cs" />
-    <Compile Include="Tasks\TaskException.cs" />
     <Compile Include="Tools\MozRoots.cs" />
     <Compile Include="UI\AuthenticationView.cs" />
     <Compile Include="UI\BranchesView.cs" />

src/UnityExtension/Assets/Editor/GitHub.Unity/Misc/Utility.cs

@@ -1,75 +1,14 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
-using System.Text.RegularExpressions;
 using UnityEditor;
 using UnityEngine;
 
 namespace GitHub.Unity
 {
     class Utility : ScriptableObject
     {
-        private static readonly ILogging logger = Logging.GetLogger<Utility>();
-
-        public const string StatusRenameDivider = "->";
-        public static readonly Regex ListBranchesRegex =
-            new Regex(@"^(?<active>\*)?\s+(?<name>[\w\d\/\-_]+)\s*(?:[a-z|0-9]{7} \[(?<tracking>[\w\d\/\-\_]+)\])?");
-        public static readonly Regex ListRemotesRegex =
-            new Regex(@"(?<name>[\w\d\-_]+)\s+(?<url>https?:\/\/(?<login>(?<user>[\w\d]+)(?::(?<token>[\w\d]+))?)@(?<host>[\w\d\.\/\%]+))\s+\((?<function>fetch|push)\)");
-        public static readonly Regex LogCommitRegex = new Regex(@"commit\s(\S+)");
-        public static readonly Regex LogMergeRegex = new Regex(@"Merge:\s+(\S+)\s+(\S+)");
-        public static readonly Regex LogAuthorRegex = new Regex(@"Author:\s+(.+)\s<(.+)>");
-        public static readonly Regex LogTimeRegex = new Regex(@"Date:\s+(.+)");
-        public static readonly Regex LogDescriptionRegex = new Regex(@"^\s+(.+)");
-        public static readonly Regex StatusStartRegex = new Regex(@"(?<status>[AMRDC]|\?\?)(?:\d*)\s+(?<path>[\w\d\/\.\-_ \@]+)");
-        public static readonly Regex StatusEndRegex = new Regex(@"->\s(?<path>[\w\d\/\.\-_ ]+)");
-        public static readonly Regex StatusBranchLineValidRegex = new Regex(@"\#\#\s+(?:[\w\d\/\-_\.]+)");
-        public static readonly Regex StatusAheadBehindRegex =
-                                         new Regex(
-                                             @"\[ahead (?<ahead>\d+), behind (?<behind>\d+)\]|\[ahead (?<ahead>\d+)\]|\[behind (?<behind>\d+>)\]");
-
-        private static bool ready;
-        private static Action onReady;
-
-        public static void RegisterReadyCallback(Action callback)
-        {
-            if (!ready)
-            {
-                onReady += callback;
-            }
-            else
-            {
-                try
-                {
-                    callback();
-                }
-                catch (Exception ex)
-                {
-                    Debug.LogException(ex);
-                }
-
-            }
-        }
-
-        public static void UnregisterReadyCallback(Action callback)
-        {
-            onReady -= callback;
-        }
-
-        public static void Initialize()
-        {
-            // Evaluate project settings
-            Issues = new List<ProjectConfigurationIssue>();
-        }
-
-        public static void Run()
-        {
-            ready = true;
-            onReady.SafeInvoke();
-        }
-
         public static Texture2D GetIcon(string filename, string filename2x = "")
         {
             if (EditorGUIUtility.pixelsPerPoint > 1f && !string.IsNullOrEmpty(filename2x))
@@ -81,73 +20,9 @@ public static Texture2D GetIcon(string filename, string filename2x = "")
             if (stream != null)
                 return stream.ToTexture2D();
 
-            var iconPath = ExtensionInstallPath.ToNPath().Combine("IconsAndLogos", filename).ToString(SlashMode.Forward);
+            var iconPath = EntryPoint.Environment.ExtensionInstallPath.Combine("IconsAndLogos", filename).ToString(SlashMode.Forward);
             return AssetDatabase.LoadAssetAtPath<Texture2D>(iconPath);
         }
-
-        public static Texture2D CreateTextureFromColor(Color color)
-        {
-            Texture2D backgroundTexture = new Texture2D(1, 1);
-            Color c = color;
-            backgroundTexture.SetPixel(1, 1, c);
-            backgroundTexture.Apply();
-
-            return backgroundTexture;
-        }
-
-        public static string GitInstallPath
-        {
-            get { return EntryPoint.Environment.GitExecutablePath; }
-        }
-
-        public static string GitRoot
-        {
-            get { return EntryPoint.Environment.RepositoryPath; }
-        }
-
-        public static string UnityAssetsPath
-        {
-            get { return EntryPoint.Environment.UnityAssetsPath; }
-        }
-
-        public static string UnityProjectPath
-        {
-            get { return EntryPoint.Environment.UnityProjectPath; }
-        }
-
-        public static string ExtensionInstallPath
-        {
-            get { return EntryPoint.Environment.ExtensionInstallPath; }
-        }
-
-        public static List<ProjectConfigurationIssue> Issues { get; protected set; }
-
-        public static bool GitFound
-        {
-            get { return !string.IsNullOrEmpty(GitInstallPath); }
-        }
-
-        public static bool ActiveRepository
-        {
-            get { return !string.IsNullOrEmpty(GitRoot); }
-        }
-
-        public static bool IsDevelopmentBuild
-        {
-            get { return File.Exists(Path.Combine(UnityProjectPath.Replace('/', Path.DirectorySeparatorChar), ".devroot")); }
-        }
-
-        public static Texture2D GetTextureFromColor(Color color)
-        {
-            Color[] pix = new Color[1];
-            pix[0] = color;
-
-            Texture2D result = new Texture2D(1, 1);
-            result.SetPixels(pix);
-            result.Apply();
-
-            return result;
-        }
     }
 
     static class StreamExtensions