Merge fix-ups

Author: Lukasz Mendakiewicz

GoogleTestAdapter/Core/GoogleTestDiscoverer.cs

@@ -98,7 +98,7 @@ public static bool IsGoogleTestExecutable(string executable, string customRegex,
             string googleTestIndicatorFile = $"{executable}{GoogleTestIndicator}";
             if (File.Exists(googleTestIndicatorFile))
             {
-                _logger.DebugInfo(String.Format(Resources.FileFound, executable));
+                logger.DebugInfo(String.Format(Resources.FileFound, executable));
                 return true;
             }
 
@@ -143,7 +143,7 @@ private static bool SafeMatches(string executable, string regex, ILogger logger)
 
         private static bool VerifyExecutableTrust(string executable, ILogger logger)
         {
-            var zone = Zone.CreateFromUrl(executable);
+            var zone = Zone.CreateFromUrl(Path.GetFullPath(executable));
             if (zone.SecurityZone != System.Security.SecurityZone.MyComputer)
             {
                 logger.LogError(String.Format(Resources.ExecutableError, executable));

GoogleTestAdapter/Core/Settings/SettingsWrapper.cs

@@ -243,7 +243,7 @@ public static string ReplacePlaceholders(string userParameters, string executabl
 
         public static readonly string OptionTestDiscoveryRegex = Resources.OptionTestDiscoveryRegex;
         public const string OptionTestDiscoveryRegexDefaultValue = "";
-        public static readonly string OptionTestDiscoveryRegexDescription = string.Format(Resources.OptionTestDiscoveryRegexDescription, TestFinderRegex);
+        public static readonly string OptionTestDiscoveryRegexDescription = string.Format(Resources.OptionTestDiscoveryRegexDescription, String.Empty);
 
         public virtual string TestDiscoveryRegex => _currentSettings.TestDiscoveryRegex ?? OptionTestDiscoveryRegexDefaultValue;
 

GoogleTestAdapter/Tests.Common/TestResources.cs

@@ -34,7 +34,7 @@ public static class TestResources
         public const string Tests_DebugX86 = SampleTestsBuildDir + @"Debug\Tests_gta.exe";
         public const string Tests_ReleaseX86 = SampleTestsBuildDir + @"Release\Tests_gta.exe";
         public const string Tests_DebugX86_Gtest170 = SampleTestsBuildDir + @"Debug\Tests_1.7.0_gta.exe";
-        public const string Tests_DebugX64 = SampleTestsSolutionDir + @"Debug-x64\Tests_gta.exe";
+        public const string Tests_DebugX64 = SampleTestsBuildDir + @"Debug-x64\Tests_gta.exe";
         public const string Tests_ReleaseX64 = SampleTestsBuildDir + @"Release-x64\Tests_gta.exe";
         public const string Tests_ReleaseX64_Output = TestdataDir + @"Tests_gta_exe_output.txt";
         public const int NrOfTests = 94;