Merge branch 'master' into fixes/locks-in-usage-tracker

# Conflicts:
#	src/GitHub.Api/Metrics/UsageTracker.cs

Author: StanleyGoldman

README.md

@@ -6,7 +6,6 @@ You can reach the team right here by opening a [new issue](https://github.com/gi
 
 [![Build Status](https://ci.appveyor.com/api/projects/status/github/github-for-unity/Unity?branch=master&svg=true)](https://ci.appveyor.com/project/github-windows/unity)
 
-[![Join the chat at https://gitter.im/github-for-unity/Unity](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)
 [![Join the chat at https://discord.gg/5zH8hVx](https://img.shields.io/badge/discord-join%20chat-7289DA.svg)](https://discord.gg/5zH8hVx)
 [![GitHub for Unity live coding on Twitch](https://img.shields.io/badge/twitch-live%20coding-6441A4.svg)](https://www.twitch.tv/sh4na)
 

common/SolutionInfo.cs

@@ -34,6 +34,6 @@ internal static class AssemblyVersionInformation {
         // this is for the AssemblyVersion and AssemblyVersion attributes, which can't handle alphanumerics
         internal const string VersionForAssembly = "1.0.0";
         // Actual real version
-        internal const string Version = "1.0.0rc2";
+        internal const string Version = "1.0.0rc3";
     }
 }

octorun/src/bin/app-usage.js

@@ -1,5 +1,6 @@
 var commander = require("commander");
 var package = require('../../package.json')
+var config = require("../configuration");
 var endOfLine = require('os').EOL;
 var fs = require('fs');
 var util = require('util');
@@ -45,6 +46,9 @@ if (fileContents && host) {
             'Content-Type': 'application/json'
         }
     };
+    if (config.token) {
+        options.headers['Authorization'] = 'token ' + config.token;
+    }
 
     var req = https.request(options, function (res) {
         var success = res.statusCode == 200;

octorun/version

@@ -1 +1 @@
-9fcd9faa
+b4b80eb4ac

src/GitHub.Api/Application/ApplicationManagerBase.cs

@@ -47,6 +47,16 @@ protected void Initialize()
             ApplicationConfiguration.WebTimeout = UserSettings.Get(Constants.WebTimeoutKey, ApplicationConfiguration.WebTimeout);
             Platform.Initialize(ProcessManager, TaskManager);
             progress.OnProgress += progressReporter.UpdateProgress;
+            UsageTracker = new UsageTracker(UserSettings, Environment, InstanceId.ToString());
+
+#if ENABLE_METRICS
+            var metricsService = new MetricsService(ProcessManager,
+                TaskManager,
+                Environment.FileSystem,
+                Environment.NodeJsExecutablePath,
+                Environment.OctorunScriptPath);
+            UsageTracker.MetricsService = metricsService;
+#endif
         }
 
         public void Run()
@@ -59,8 +69,7 @@ public void Run()
                 GitInstallationState state = new GitInstallationState();
                 try
                 {
-                    SetupMetrics(Environment.UnityVersion);
-
+                    SetupMetrics();
                     if (Environment.IsMac)
                     {
                         var getEnvPath = new SimpleProcessTask(TaskManager.Token, "bash".ToNPath(), "-c \"/usr/libexec/path_helper\"")
@@ -301,35 +310,14 @@ public void RestartRepository()
             Logger.Trace($"Got a repository? {(Environment.Repository != null ? Environment.Repository.LocalPath : "null")}");
         }
 
-        protected void SetupMetrics(string unityVersion)
+        protected void SetupMetrics()
         {
-            string userId = null;
-            if (UserSettings.Exists(Constants.GuidKey))
-            {
-                userId = UserSettings.Get(Constants.GuidKey);
-            }
-
-            if (String.IsNullOrEmpty(userId))
-            {
-                userId = Guid.NewGuid().ToString();
-                UserSettings.Set(Constants.GuidKey, userId);
-            }
-
-#if ENABLE_METRICS
-            var metricsService = new MetricsService(ProcessManager,
-                TaskManager,
-                Environment.FileSystem,
-                Environment.NodeJsExecutablePath,
-                Environment.OctorunScriptPath);
-
-            UsageTracker = new UsageTracker(metricsService, UserSettings, Environment, userId, unityVersion, InstanceId.ToString());
-
             if (firstRun)
             {
                 UsageTracker.IncrementNumberOfStartups();
             }
-#endif
         }
+
         protected abstract void InitializeUI();
         protected abstract void InitializationComplete();
 

src/GitHub.Api/IO/NiceIO.cs

@@ -688,20 +688,27 @@ public void Delete(DeleteMode deleteMode = DeleteMode.Normal)
             if (IsRoot)
                 throw new NotSupportedException("Delete is not supported on a root level directory because it would be dangerous:" + ToString());
 
-            if (FileExists())
-                FileSystem.FileDelete(ToString());
-            else if (DirectoryExists())
-                try
+            var isFile = FileExists();
+            var isDir = DirectoryExists();
+            if (!isFile && !isDir)
+                throw new InvalidOperationException("Trying to delete a path that does not exist: " + ToString());
+
+            try
+            {
+                if (isFile)
                 {
-                    FileSystem.DirectoryDelete(ToString(), true);
+                    FileSystem.FileDelete(ToString());
                 }
-                catch (IOException)
+                else
                 {
-                    if (deleteMode == DeleteMode.Normal)
-                        throw;
+                    FileSystem.DirectoryDelete(ToString(), true);
                 }
-            else
-                throw new InvalidOperationException("Trying to delete a path that does not exist: " + ToString());
+            }
+            catch (IOException)
+            {
+                if (deleteMode == DeleteMode.Normal)
+                    throw;
+            }
         }
 
         public void DeleteIfExists(DeleteMode deleteMode = DeleteMode.Normal)

src/GitHub.Api/Installer/OctorunInstaller.cs

@@ -85,7 +85,7 @@ public class OctorunInstallDetails
             public const string DefaultZipMd5Url = "http://github-vs.s3.amazonaws.com/unity/octorun/octorun.zip.md5";
             public const string DefaultZipUrl = "http://github-vs.s3.amazonaws.com/unity/octorun/octorun.zip";
 
-            public const string PackageVersion = "9fcd9faa";
+            public const string PackageVersion = "b4b80eb4ac";
             private const string PackageName = "octorun";
             private const string zipFile = "octorun.zip";