Merge branch 'master' into fixes/new-branch-name-validation

StanleyGoldman · web-flow · commit 28862049a2c0 · 2017-07-06T15:09:31.000-04:00
diff --git a/common/SolutionInfo.cs b/common/SolutionInfo.cs
@@ -31,6 +31,6 @@
 namespace System
 {
     internal static class AssemblyVersionInformation {
-        internal const string Version = "0.14.0.0";
+        internal const string Version = "0.15.0.0";
     }
 }
diff --git a/common/build.targets b/common/build.targets
@@ -1,17 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <!-- Build flags -->
-  <PropertyGroup>
-    <SolutionType Condition="'$(SolutionName)' == 'GitHub.Unity.OctokitDebugging'">OctokitDebugging</SolutionType>
-    <BuildType Condition="Exists('$(SolutionDir)\script\src\MetricsService.cs')">Internal</BuildType>
-
-    <UnityDir Condition="$(UnityDir) == '' and Exists('$(SolutionDir)\script\lib\UnityEditor.dll')">$(SolutionDir)\script\lib\</UnityDir>
-    <UnityDir Condition="$(UnityDir) == '' and Exists('$(SolutionDir)\lib\UnityEditor.dll')">$(SolutionDir)\lib\</UnityDir>
-    <UnityDir Condition="$(UnityDir) == '' and Exists('C:\Program Files (x86)\Unity\Editor\Data\Managed\UnityEditor.dll')">C:\Program Files (x86)\Unity\Editor\Data\Managed\</UnityDir>
-    <UnityDir Condition="$(UnityDir) == '' and Exists('\Applications\Unity\Unity.app\Contents\Managed\UnityEditor.dll')">\Applications\Unity\Unity.app\Contents\Managed\</UnityDir>
-    <BuildConfig Condition=" '$(BuildConfig)' == '' ">Debug</BuildConfig>
-  </PropertyGroup>
-
   <!-- Common assembly properties (versioning) -->
   <ItemGroup>
     <Compile Include="$(SolutionDir)common\SolutionInfo.cs">
@@ -24,7 +12,7 @@
 
   <!-- Common includes and references -->
   <Choose>
-    <When Condition="$(SolutionType) == 'OctokitDebugging'">
+    <When Condition="'$(SolutionType)' == 'OctokitDebugging'">
       <ItemGroup>
         <ProjectReference Include="$(SolutionDir)..\dotnet-httpclient35\System.Net.Http\System.Net.Http-net_3_5.csproj">
           <Project>{9862694d-e4fa-418b-8692-a0280feddf36}</Project>
@@ -42,16 +30,19 @@
           <HintPath>$(SolutionDir)lib\octokit.net\Octokit.dll</HintPath>
         </Reference>
         <Reference Include="System.Net.Http">
-          <HintPath>$(SolutionDir)lib\system.net.http_35\System.Net.Http.dll</HintPath>
+          <HintPath>$(SolutionDir)lib\dotnet-httpclient35\System.Net.Http.dll</HintPath>
         </Reference>
       </ItemGroup>
     </Otherwise>
   </Choose>
 
   <Target Name="BeforeBuild">
     <PropertyGroup>
-      <ErrorText>Location of Unity dlls is not set. You'll need to install Unity in a known location (the default installation directory for your system), or copy UnityEngine.dll and UnityEditor.dll to the {0}lib folder</ErrorText>
+      <UnityDLLsMissingErrorText>Location of Unity dlls is not set. You'll need to install Unity in a known location (the default installation directory for your system), or copy UnityEngine.dll and UnityEditor.dll to the {0}lib folder</UnityDLLsMissingErrorText>
+      <MissingOctokitProject>To build the OctokitDebugging solution you need to have https://github.com/github-for-unity/octokit.net checked out in {0}</MissingOctokitProject>
+      <MissingHttpProject>To build the OctokitDebugging solution you need to have https://github.com/github-for-unity/dotnet-httpclient35 checked out in {0}</MissingHttpProject>
     </PropertyGroup>
-    <Error Condition="'$(UnityDir)' == ''" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)'))" />
+    <Error Condition="'$(UnityDir)' == ''" Text="$([System.String]::Format('$(UnityDLLsMissingErrorText)', '$(SolutionDir)'))" />
+    <Error Condition="$(SolutionType) == 'OctokitDebugging' and !Exists('$(SolutionDir)..\dotnet-httpclient35\System.Net.Http\System.Net.Http-net_3_5.csproj')" Text="$([System.String]::Format('$(MissingOctokitProject)', '$(SolutionDir)..\dotnet-httpclient35'))" />
   </Target>
 </Project>
diff --git a/common/properties.props b/common/properties.props
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- Build flags -->
+  <PropertyGroup>
+    <SolutionType Condition="'$(SolutionName)' == 'GitHub.Unity.OctokitDebugging'">OctokitDebugging</SolutionType>
+    <BuildType Condition="Exists('$(SolutionDir)script\src\MetricsService.cs')">Internal</BuildType>
+
+    <UnityDir Condition="$(UnityDir) == '' and Exists('$(SolutionDir)\script\lib\UnityEditor.dll')">$(SolutionDir)\script\lib\</UnityDir>
+    <UnityDir Condition="$(UnityDir) == '' and Exists('$(SolutionDir)\lib\UnityEditor.dll')">$(SolutionDir)\lib\</UnityDir>
+    <UnityDir Condition="$(UnityDir) == '' and Exists('C:\Program Files (x86)\Unity\Editor\Data\Managed\UnityEditor.dll')">C:\Program Files (x86)\Unity\Editor\Data\Managed\</UnityDir>
+    <UnityDir Condition="$(UnityDir) == '' and Exists('\Applications\Unity\Unity.app\Contents\Managed\UnityEditor.dll')">\Applications\Unity\Unity.app\Contents\Managed\</UnityDir>
+    <BuildConfig Condition=" '$(BuildConfig)' == '' ">Debug</BuildConfig>
+  </PropertyGroup>
+</Project>
diff --git a/lib/dotnet-httpClient35/System.Net.Http.dll b/lib/dotnet-httpClient35/System.Net.Http.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:420bdc3fdd9b3022f1a9a800a4e42709565ee64c0c88534259a6ea29f04f44ac
+size 123904
diff --git a/lib/dotnet-httpClient35/System.Net.Http.dll.mdb b/lib/dotnet-httpClient35/System.Net.Http.dll.mdb
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:88304fa5cbd985a284e69e1c01effd5dfb1cdfcd0b773925c2a77a88849e8d62
+size 46996
diff --git a/lib/dotnet-httpClient35/md5sums.txt b/lib/dotnet-httpClient35/md5sums.txt
@@ -0,0 +1,2 @@
+e15a0894ef162ec53566fa9c8211e583 *System.Net.Http.dll
+161847a9a61eb3cdab7a7706e83265a1 *System.Net.Http.dll.mdb
diff --git a/lib/dotnet-httpClient35/version.txt b/lib/dotnet-httpClient35/version.txt
@@ -0,0 +1 @@
+3.5.0.0 3.5.22000.2-gfu 43d89b670547006521c95fc150d9b79506c208ca
diff --git a/lib/octokit.net/Octokit.dll b/lib/octokit.net/Octokit.dll
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b8505b576308d2e03e825f94c9e9877c2f264e0ed4ecd8660e11cdcc91833e7b
+oid sha256:5d7e1ac6cbe61853a11fd3acd9e9a9de263bcba30cbd9af9dca65df15166495c
 size 741888
diff --git a/lib/octokit.net/Octokit.dll.mdb b/lib/octokit.net/Octokit.dll.mdb
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:284a267af8d47b2025e235fab86efbf9d96a4e985885283a5a3a65f27ca32aba
+oid sha256:4a8e19686a5a3cbfb76d26e08e07aa6faccb6218da946227a86a57f359fed25d
 size 283050
diff --git a/lib/octokit.net/md5sums.txt b/lib/octokit.net/md5sums.txt
@@ -0,0 +1,2 @@
+ecb6930236469c41a36dee6d84fcab7a *Octokit.dll
+2a41d96c1ad9229d8ff2f46b8847ec6a *Octokit.dll.mdb
diff --git a/lib/octokit.net/version.txt b/lib/octokit.net/version.txt
@@ -1 +1 @@
-0.23.0.1 0.23.0.1-gfu ec0882345e0a2ee4743b84e8471dfa6fa7219ca3
+0.23.0.1 0.23.0.2-gfu 9784094cdd6192887dc97180918565c036c6b62c
diff --git a/lib/system.net.http_35/System.Net.Http.dll b/lib/system.net.http_35/System.Net.Http.dll
diff --git a/lib/system.net.http_35/System.Net.Http.dll.mdb b/lib/system.net.http_35/System.Net.Http.dll.mdb
diff --git a/lib/system.net.http_35/version.txt b/lib/system.net.http_35/version.txt
diff --git a/src/GitHub.Api/Git/IRepository.cs b/src/GitHub.Api/Git/IRepository.cs
@@ -12,6 +12,7 @@ interface IRepository : IEquatable<IRepository>
         ITask SetupRemote(string remoteName, string remoteUrl);
         ITask Pull();
         ITask Push();
+        ITask Fetch();
         ITask Revert(string changeset);
         ITask ListLocks();
         ITask RequestLock(string file);
diff --git a/src/GitHub.Api/Git/Repository.cs b/src/GitHub.Api/Git/Repository.cs
@@ -88,6 +88,11 @@ public ITask Push()
             return repositoryManager.Push(CurrentRemote.Value.Name, CurrentBranch);
         }
 
+        public ITask Fetch()
+        {
+            return repositoryManager.Fetch(CurrentRemote.Value.Name);
+        }
+        
         public ITask Revert(string changeset)
         {
             return repositoryManager.Revert(changeset);
diff --git a/src/GitHub.Api/GitHub.Api.csproj b/src/GitHub.Api/GitHub.Api.csproj
@@ -1,7 +1,6 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <Import Project="..\..\common\build.targets" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -19,6 +18,7 @@
     </NuGetPackageImportStamp>
     <OutputPath>..\UnityExtension\Assets\Editor\build\</OutputPath>
   </PropertyGroup>
+  <Import Project="..\..\common\properties.props" />
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
@@ -285,4 +285,5 @@
   <Target Name="AfterBuild">
   </Target>
   -->
+  <Import Project="..\..\common\build.targets" />
 </Project>
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/GitHub.Unity.csproj b/src/UnityExtension/Assets/Editor/GitHub.Unity/GitHub.Unity.csproj
@@ -14,6 +14,7 @@
     <OutputPath>$(SolutionDir)\unity\TestProject\Assets\Editor\</OutputPath>
     <IntermediateOutputPath>..\..\..\obj\</IntermediateOutputPath>
   </PropertyGroup>
+  <Import Project="..\..\..\..\..\common\properties.props" />
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
@@ -44,7 +45,6 @@
     <CodeAnalysisRuleSet>$(SolutionDir)common\GitHub.ruleset</CodeAnalysisRuleSet>
     <LangVersion>4</LangVersion>
   </PropertyGroup>
-  <Import Project="..\..\..\..\..\common\build.targets" />
   <ItemGroup>
     <Reference Include="Mono.Security, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -239,4 +239,5 @@
   <Target Name="AfterBuild">
   </Target>
   -->
+  <Import Project="..\..\..\..\..\common\build.targets" />
 </Project>
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/HistoryView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/HistoryView.cs
@@ -30,6 +30,9 @@ class HistoryView : Subview
         private const string ClearSelectionButton = "×";
         private const string NoRepoTitle = "No Git repository found for this project";
         private const string NoRepoDescription = "Initialize a Git repository to track changes and collaborate with others.";
+        private const string FetchActionTitle = "Fetch Changes";
+        private const string FetchButtonText = "Fetch";
+        private const string FetchFailureDescription = "Could not fetch changes";
         private const int HistoryExtraItemCount = 10;
         private const float MaxChangelistHeightRatio = .2f;
 
@@ -316,8 +319,14 @@ public void OnEmbeddedGUI()
 
                 GUILayout.FlexibleSpace();
 
+                GUI.enabled = currentRemote != null;
+                var fetchClicked = GUILayout.Button(FetchButtonText, Styles.HistoryToolbarButtonStyle);
+                GUI.enabled = true;
+                if (fetchClicked)
+                {
+                    Fetch();
+                }
 
-                // Pull / Push buttons
                 var pullButtonText = statusBehind > 0 ? String.Format(PullButtonCount, statusBehind) : PullButton;
                 GUI.enabled = currentRemote != null;
                 var pullClicked = GUILayout.Button(pullButtonText, Styles.HistoryToolbarButtonStyle);
@@ -733,6 +742,21 @@ private void Push()
                 .Start();
         }
 
+        private void Fetch()
+        {
+            var remote = Repository.CurrentRemote.HasValue ? Repository.CurrentRemote.Value.Name : String.Empty;
+            Repository
+                .Fetch()
+                .FinallyInUI((success, e) => {
+                    if (!success)
+                    {
+                        EditorUtility.DisplayDialog(FetchActionTitle, FetchFailureDescription,
+                            Localization.Ok);
+                    }
+                })
+                .Start();
+        }
+
         void drawTimelineRectAroundIconRect(Rect parentRect, Rect iconRect)
         {
             Color timelineBarColor = new Color(0.51F, 0.51F, 0.51F, 0.2F);
diff --git a/src/tests/IntegrationTests/IntegrationTests.csproj b/src/tests/IntegrationTests/IntegrationTests.csproj
@@ -1,7 +1,6 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <Import Project="..\..\..\common\build.targets" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -15,6 +14,7 @@
     <TargetFrameworkProfile />
     <OutputPath>$(SolutionDir)build\$(AssemblyName)</OutputPath>
   </PropertyGroup>
+  <Import Project="..\..\..\common\properties.props" />
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
@@ -138,4 +138,5 @@
   <Target Name="AfterBuild">
   </Target>
   -->
+  <Import Project="..\..\..\common\build.targets" />
 </Project>
diff --git a/src/tests/UnitTests/UnitTests.csproj b/src/tests/UnitTests/UnitTests.csproj
@@ -1,7 +1,6 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <Import Project="..\..\..\common\build.targets" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -15,6 +14,7 @@
     <TargetFrameworkProfile />
     <OutputPath>$(SolutionDir)build\$(AssemblyName)</OutputPath>
   </PropertyGroup>
+  <Import Project="..\..\..\common\properties.props" />
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
@@ -154,4 +154,5 @@
   <Target Name="AfterBuild">
   </Target>
   -->
+  <Import Project="..\..\..\common\build.targets" />
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,6 @@`
`31`	`31`	`namespace System`
`32`	`32`	`{`
`33`	`33`	`internal static class AssemblyVersionInformation {`
`34`		`- internal const string Version = "0.14.0.0";`
	`34`	`+ internal const string Version = "0.15.0.0";`
`35`	`35`	`}`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+version https://git-lfs.github.com/spec/v1`
	`2`	`+oid sha256:420bdc3fdd9b3022f1a9a800a4e42709565ee64c0c88534259a6ea29f04f44ac`
	`3`	`+size 123904`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+version https://git-lfs.github.com/spec/v1`
	`2`	`+oid sha256:88304fa5cbd985a284e69e1c01effd5dfb1cdfcd0b773925c2a77a88849e8d62`
	`3`	`+size 46996`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+e15a0894ef162ec53566fa9c8211e583 *System.Net.Http.dll`
	`2`	`+161847a9a61eb3cdab7a7706e83265a1 *System.Net.Http.dll.mdb`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+3.5.0.0 3.5.22000.2-gfu 43d89b670547006521c95fc150d9b79506c208ca`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+ecb6930236469c41a36dee6d84fcab7a *Octokit.dll`
	`2`	`+2a41d96c1ad9229d8ff2f46b8847ec6a *Octokit.dll.mdb`