Merge branch 'master' into fixes/334-backport-regex-compilation-bleh

Author: StanleyGoldman

GitHub.Unity.sln.DotSettings

@@ -343,4 +343,5 @@
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/UnitTesting/ShadowCopy/@EntryValue">False</s:Boolean>
+	<s:String x:Key="/Default/Housekeeping/UnitTestingMru/UnitTestSessionDefault/PlatformType/@EntryValue">x64</s:String>
 	</wpf:ResourceDictionary>

build.sh

@@ -1,4 +1,4 @@
-#!/bin/sh -eux
+#!/bin/sh -eu
 Configuration="dev"
 if [ $# -gt 0 ]; then
 	Configuration=$1
@@ -32,7 +32,7 @@ else
 	nuget restore GitHub.Unity.sln
 fi
 
-xbuild GitHub.Unity.sln /verbosity:normal /property:Configuration=$Configuration /target:$Target || true
+xbuild GitHub.Unity.sln /verbosity:minimal /property:Configuration=$Configuration /target:$Target || true
 
 rm -f unity/PackageProject/Assets/Plugins/GitHub/Editor/deleteme*
 rm -f unity/PackageProject/Assets/Plugins/GitHub/Editor/deleteme*

common/SolutionInfo.cs

@@ -31,6 +31,6 @@
 namespace System
 {
     internal static class AssemblyVersionInformation {
-        internal const string Version = "0.21.0";
+        internal const string Version = "0.22.0";
     }
 }

src/GitHub.Api/Application/ApplicationManagerBase.cs

@@ -17,7 +17,7 @@ public ApplicationManagerBase(SynchronizationContext synchronizationContext)
         {
             SynchronizationContext = synchronizationContext;
             SynchronizationContext.SetSynchronizationContext(SynchronizationContext);
-            ThreadingHelper.SetMainThread();
+            ThreadingHelper.SetUIThread();
             UIScheduler = TaskScheduler.FromCurrentSynchronizationContext();
             ThreadingHelper.MainThreadScheduler = UIScheduler;
             TaskManager = new TaskManager(UIScheduler);

src/GitHub.Api/Threading/ThreadingHelper.cs

@@ -10,14 +10,14 @@ static class ThreadingHelper
         public static TaskScheduler MainThreadScheduler { get; set; }
 
         public static int MainThread { get; set; }
-        public static bool InMainThread { get { return MainThread == 0 || Thread.CurrentThread.ManagedThreadId == MainThread; } }
+        static bool InMainThread { get { return MainThread == 0 || Thread.CurrentThread.ManagedThreadId == MainThread; } }
 
-        public static void SetMainThread()
+        public static void SetUIThread()
         {
             MainThread = Thread.CurrentThread.ManagedThreadId;
         }
 
-        public static bool InUIThread => (!Guard.InUnitTestRunner && InMainThread) || !(Guard.InUnitTestRunner);
+        public static bool InUIThread => InMainThread || Guard.InUnitTestRunner;
 
         /// <summary>
         /// Switch to the UI thread
@@ -97,7 +97,7 @@ public bool IsCompleted
             {
                 get
                 {
-                    return (this.scheduler == TaskManager.Instance.UIScheduler && InMainThread) || (this.scheduler != TaskManager.Instance.UIScheduler && !InMainThread);
+                    return (this.scheduler == TaskManager.Instance.UIScheduler && InUIThread) || (this.scheduler != TaskManager.Instance.UIScheduler && !InUIThread);
                 }
             }
 

src/UnityExtension/Assets/Editor/GitHub.Unity/EntryPoint.cs

@@ -37,8 +37,6 @@ private static void Initialize()
 
             if (ApplicationCache.Instance.FirstRun)
             {
-                Debug.Log("Initialized GitHub for Unity version " + ApplicationInfo.Version);
-
                 var oldLogPath = logPath.Parent.Combine(logPath.FileNameWithoutExtension + "-old" + logPath.ExtensionWithDot);
                 try
                 {
@@ -53,8 +51,9 @@ private static void Initialize()
                     Logging.Error(ex, "Error rotating log files");
                 }
 
-                Debug.Log("Initialized GitHub for Unity log file: " + logPath);
+                Debug.LogFormat("Initialized GitHub for Unity version {0}{1}Log file: {2}", ApplicationInfo.Version, Environment.NewLine, logPath);
             }
+
             Logging.LogAdapter = new FileLogAdapter(logPath);
             Logging.Info("Initializing GitHub for Unity version " + ApplicationInfo.Version);
 

src/tests/IntegrationTests/IntegrationTests.csproj

@@ -122,8 +122,8 @@
       <Link>sfw_x64.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="$(SolutionDir)\lib\sfw\win\x64\sfw_x64.dll.meta">
-      <Link>sfw_x64.dll.meta</Link>
+    <None Include="$(SolutionDir)\lib\sfw\win\x64\pthreadVC2.dll">
+      <Link>pthreadVC2.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>