Merge fixes/detect-enterprise-host into release/1.0.16.1

Author: shana

src/GitHub.Api/SimpleApiClient.cs

@@ -71,10 +71,10 @@ async Task<Repository> GetRepositoryInternal()
                 }
             }
             // it'll throw if it's private or an enterprise instance requiring authentication
-            catch (ApiException)
+            catch (ApiException apiex)
             {
                 if (!HostAddress.IsGitHubDotComUri(OriginalUrl.ToRepositoryUrl()))
-                    isEnterprise = true;
+                    isEnterprise = apiex.HttpResponse?.Headers.ContainsKey("X-GitHub-Request-Id");
             }
             catch {}
             finally

src/GitHub.Exports/Services/EnterpriseProbeTask.cs

@@ -37,12 +37,18 @@ public async Task<EnterpriseProbeResult> ProbeAsync(Uri enterpriseBaseUrl)
             };
             request.Headers.Add("User-Agent", productHeader.ToString());
 
+            var success = false;
             var ret = await httpClient
                     .Send(request, CancellationToken.None)
-                    .Catch(ex => null);
+                    .Catch(ex => {
+                        var apiex = ex as ApiException;
+                        if (apiex != null)
+                            success = apiex.HttpResponse?.Headers.ContainsKey("X-GitHub-Request-Id") ?? false;
+                        return null;
+                    });
 
             if (ret == null)
-                return EnterpriseProbeResult.Failed;
+                return success ? EnterpriseProbeResult.Ok : EnterpriseProbeResult.Failed;
             else if (ret.StatusCode == HttpStatusCode.OK)
                 return EnterpriseProbeResult.Ok;
             return EnterpriseProbeResult.NotFound;