From 092c9b59d41458a4e22a4750d4b49c4b95813451 Mon Sep 17 00:00:00 2001 From: Ben McMorran Date: Thu, 21 Jan 2021 13:16:04 -0800 Subject: [PATCH 1/8] Apply upstream patch https://github.com/csoltenborn/GoogleTestAdapter/pull/222 --- .../TestAdapter.Tests/TestAdapter.Tests.csproj | 10 ---------- .../TestAdapter.Tests/packages.config.tt | 2 -- GoogleTestAdapter/TestAdapter/TestAdapter.csproj | 9 --------- GoogleTestAdapter/TestAdapter/packages.config.tt | 2 -- .../Helpers/RunSettingsServiceUnderTest.cs | 2 +- .../Settings/RunSettingsServiceTests.cs | 5 +++-- .../VsPackage.GTA.Tests.Unit.csproj | 12 +++++++++++- .../VsPackage.GTA.Tests.Unit/packages.config | 2 ++ .../VsPackage.Shared/Helpers/ActivityLogLogger.cs | 1 - .../Settings/RunSettingsService.cs | 0 .../VsPackage.Shared/VsPackage.Shared.projitems | 1 + 11 files changed, 18 insertions(+), 28 deletions(-) rename GoogleTestAdapter/{TestAdapter.Tests => VsPackage.GTA.Tests.Unit}/Helpers/RunSettingsServiceUnderTest.cs (92%) rename GoogleTestAdapter/{TestAdapter.Tests => VsPackage.GTA.Tests.Unit}/Settings/RunSettingsServiceTests.cs (99%) rename GoogleTestAdapter/{TestAdapter => VsPackage.Shared}/Settings/RunSettingsService.cs (100%) diff --git a/GoogleTestAdapter/TestAdapter.Tests/TestAdapter.Tests.csproj b/GoogleTestAdapter/TestAdapter.Tests/TestAdapter.Tests.csproj index 32791190b..136d5f465 100644 --- a/GoogleTestAdapter/TestAdapter.Tests/TestAdapter.Tests.csproj +++ b/GoogleTestAdapter/TestAdapter.Tests/TestAdapter.Tests.csproj @@ -63,14 +63,6 @@ $(NuGetPackages)Microsoft.TestPlatform.ObjectModel.15.0.1\lib\net46\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll True - - $(NuGetPackages)Microsoft.VisualStudio.TestWindow.Interfaces.11.0.61030\lib\net45\Microsoft.VisualStudio.TestWindow.Interfaces.dll - True - - - $(NuGetPackages)Microsoft.VisualStudio.TestWindow.Interfaces.15.0.26510-d15rel\lib\net45\Microsoft.VisualStudio.TestWindow.Interfaces.dll - True - $(NuGetPackages)Moq.4.5.30\lib\net45\Moq.dll True @@ -95,7 +87,6 @@ - @@ -108,7 +99,6 @@ - diff --git a/GoogleTestAdapter/TestAdapter.Tests/packages.config.tt b/GoogleTestAdapter/TestAdapter.Tests/packages.config.tt index 359d9adf7..dac2392b3 100644 --- a/GoogleTestAdapter/TestAdapter.Tests/packages.config.tt +++ b/GoogleTestAdapter/TestAdapter.Tests/packages.config.tt @@ -8,10 +8,8 @@ <# if (TestAdapterFlavor == "GTA") { #> - <# } else if (TestAdapterFlavor == "TAfGT") { #> - <# } #> \ No newline at end of file diff --git a/GoogleTestAdapter/TestAdapter/TestAdapter.csproj b/GoogleTestAdapter/TestAdapter/TestAdapter.csproj index b74f57aef..3398645a2 100644 --- a/GoogleTestAdapter/TestAdapter/TestAdapter.csproj +++ b/GoogleTestAdapter/TestAdapter/TestAdapter.csproj @@ -144,14 +144,6 @@ $(NuGetPackages)Microsoft.TestPlatform.ObjectModel.15.0.1\lib\net46\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll False - - $(NuGetPackages)Microsoft.VisualStudio.TestWindow.Interfaces.11.0.61030\lib\net45\Microsoft.VisualStudio.TestWindow.Interfaces.dll - False - - - $(NuGetPackages)Microsoft.VisualStudio.TestWindow.Interfaces.15.0.26510-d15rel\lib\net45\Microsoft.VisualStudio.TestWindow.Interfaces.dll - False - $(NuGetPackages)VSSDK.TextManager.Interop.7.0.4\lib\net20\Microsoft.VisualStudio.TextManager.Interop.dll True @@ -212,7 +204,6 @@ - diff --git a/GoogleTestAdapter/TestAdapter/packages.config.tt b/GoogleTestAdapter/TestAdapter/packages.config.tt index 732cda6be..9822b5c96 100644 --- a/GoogleTestAdapter/TestAdapter/packages.config.tt +++ b/GoogleTestAdapter/TestAdapter/packages.config.tt @@ -5,7 +5,6 @@ <# if (TestAdapterFlavor == "GTA") { #> - @@ -31,6 +30,5 @@ <# } else if (TestAdapterFlavor == "TAfGT") { #> - <# } #> \ No newline at end of file diff --git a/GoogleTestAdapter/TestAdapter.Tests/Helpers/RunSettingsServiceUnderTest.cs b/GoogleTestAdapter/VsPackage.GTA.Tests.Unit/Helpers/RunSettingsServiceUnderTest.cs similarity index 92% rename from GoogleTestAdapter/TestAdapter.Tests/Helpers/RunSettingsServiceUnderTest.cs rename to GoogleTestAdapter/VsPackage.GTA.Tests.Unit/Helpers/RunSettingsServiceUnderTest.cs index 275b77c19..bff7c3c5a 100644 --- a/GoogleTestAdapter/TestAdapter.Tests/Helpers/RunSettingsServiceUnderTest.cs +++ b/GoogleTestAdapter/VsPackage.GTA.Tests.Unit/Helpers/RunSettingsServiceUnderTest.cs @@ -1,6 +1,6 @@ using GoogleTestAdapter.TestAdapter.Settings; -namespace GoogleTestAdapter.TestAdapter.Helpers +namespace GoogleTestAdapter.VsPackage.Helpers { public class RunSettingsServiceUnderTest : RunSettingsService { diff --git a/GoogleTestAdapter/TestAdapter.Tests/Settings/RunSettingsServiceTests.cs b/GoogleTestAdapter/VsPackage.GTA.Tests.Unit/Settings/RunSettingsServiceTests.cs similarity index 99% rename from GoogleTestAdapter/TestAdapter.Tests/Settings/RunSettingsServiceTests.cs rename to GoogleTestAdapter/VsPackage.GTA.Tests.Unit/Settings/RunSettingsServiceTests.cs index 773567c89..66acfbc1e 100644 --- a/GoogleTestAdapter/TestAdapter.Tests/Settings/RunSettingsServiceTests.cs +++ b/GoogleTestAdapter/VsPackage.GTA.Tests.Unit/Settings/RunSettingsServiceTests.cs @@ -7,8 +7,9 @@ using System.Xml.XPath; using FluentAssertions; using GoogleTestAdapter.Settings; -using GoogleTestAdapter.TestAdapter.Helpers; +using GoogleTestAdapter.TestAdapter.Settings; using GoogleTestAdapter.Tests.Common; +using GoogleTestAdapter.VsPackage.Helpers; using Microsoft.VisualStudio.TestPlatform.ObjectModel; using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestWindow.Extensibility; @@ -16,7 +17,7 @@ using static GoogleTestAdapter.Tests.Common.TestMetadata.TestCategories; // ReSharper disable PossibleNullReferenceException -namespace GoogleTestAdapter.TestAdapter.Settings +namespace GoogleTestAdapter.VsPackage.Settings { [TestClass] diff --git a/GoogleTestAdapter/VsPackage.GTA.Tests.Unit/VsPackage.GTA.Tests.Unit.csproj b/GoogleTestAdapter/VsPackage.GTA.Tests.Unit/VsPackage.GTA.Tests.Unit.csproj index 2b3a43e10..6cc7f139d 100644 --- a/GoogleTestAdapter/VsPackage.GTA.Tests.Unit/VsPackage.GTA.Tests.Unit.csproj +++ b/GoogleTestAdapter/VsPackage.GTA.Tests.Unit/VsPackage.GTA.Tests.Unit.csproj @@ -53,6 +53,12 @@ True + + $(NuGetPackages)Microsoft.TestPlatform.ObjectModel.11.0.0\lib\net35\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll + + + $(NuGetPackages)Microsoft.VisualStudio.TestWindow.Interfaces.11.0.61030\lib\net45\Microsoft.VisualStudio.TestWindow.Interfaces.dll + $(NuGetPackages)Moq.4.5.30\lib\net45\Moq.dll @@ -76,9 +82,11 @@ + + @@ -105,7 +113,9 @@ - + + Designer + diff --git a/GoogleTestAdapter/VsPackage.GTA.Tests.Unit/packages.config b/GoogleTestAdapter/VsPackage.GTA.Tests.Unit/packages.config index fe8e4fd7c..0c2db86b4 100644 --- a/GoogleTestAdapter/VsPackage.GTA.Tests.Unit/packages.config +++ b/GoogleTestAdapter/VsPackage.GTA.Tests.Unit/packages.config @@ -2,5 +2,7 @@ + + \ No newline at end of file diff --git a/GoogleTestAdapter/VsPackage.Shared/Helpers/ActivityLogLogger.cs b/GoogleTestAdapter/VsPackage.Shared/Helpers/ActivityLogLogger.cs index a40c39076..35a44d683 100644 --- a/GoogleTestAdapter/VsPackage.Shared/Helpers/ActivityLogLogger.cs +++ b/GoogleTestAdapter/VsPackage.Shared/Helpers/ActivityLogLogger.cs @@ -2,7 +2,6 @@ using System; using GoogleTestAdapter.Common; -using GoogleTestAdapter.Settings; using Microsoft.VisualStudio.Shell.Interop; namespace GoogleTestAdapter.VsPackage.Helpers diff --git a/GoogleTestAdapter/TestAdapter/Settings/RunSettingsService.cs b/GoogleTestAdapter/VsPackage.Shared/Settings/RunSettingsService.cs similarity index 100% rename from GoogleTestAdapter/TestAdapter/Settings/RunSettingsService.cs rename to GoogleTestAdapter/VsPackage.Shared/Settings/RunSettingsService.cs diff --git a/GoogleTestAdapter/VsPackage.Shared/VsPackage.Shared.projitems b/GoogleTestAdapter/VsPackage.Shared/VsPackage.Shared.projitems index ba789921c..2a0bbae4f 100644 --- a/GoogleTestAdapter/VsPackage.Shared/VsPackage.Shared.projitems +++ b/GoogleTestAdapter/VsPackage.Shared/VsPackage.Shared.projitems @@ -34,6 +34,7 @@ Component + From 64b6e45404579622793ec54a5a340b817d1dd252 Mon Sep 17 00:00:00 2001 From: Spencer Bloom Date: Wed, 27 Jan 2021 15:49:45 -0800 Subject: [PATCH 2/8] Update packages.config.tt --- GoogleTestAdapter/TestAdapter/packages.config.tt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/GoogleTestAdapter/TestAdapter/packages.config.tt b/GoogleTestAdapter/TestAdapter/packages.config.tt index 9822b5c96..b42060716 100644 --- a/GoogleTestAdapter/TestAdapter/packages.config.tt +++ b/GoogleTestAdapter/TestAdapter/packages.config.tt @@ -29,6 +29,6 @@ <# } else if (TestAdapterFlavor == "TAfGT") { #> - + <# } #> - \ No newline at end of file + From 13c99b035f89733e2cf7b16d1a754c0f0d70f85b Mon Sep 17 00:00:00 2001 From: Spencer Bloom Date: Wed, 27 Jan 2021 15:50:00 -0800 Subject: [PATCH 3/8] Update packages.config.tt --- GoogleTestAdapter/TestAdapter.Tests/packages.config.tt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/GoogleTestAdapter/TestAdapter.Tests/packages.config.tt b/GoogleTestAdapter/TestAdapter.Tests/packages.config.tt index dac2392b3..821f7c294 100644 --- a/GoogleTestAdapter/TestAdapter.Tests/packages.config.tt +++ b/GoogleTestAdapter/TestAdapter.Tests/packages.config.tt @@ -9,7 +9,7 @@ <# if (TestAdapterFlavor == "GTA") { #> <# } else if (TestAdapterFlavor == "TAfGT") { #> - + <# } #> - \ No newline at end of file + From 729328c1677ba4ab7a668a4b01cf62a1b2ebdbba Mon Sep 17 00:00:00 2001 From: Spencer Bloom Date: Wed, 27 Jan 2021 16:54:06 -0800 Subject: [PATCH 4/8] fix testwindow reference --- GoogleTestAdapter/VsPackage.TAfGT/VsPackage.TAfGT.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GoogleTestAdapter/VsPackage.TAfGT/VsPackage.TAfGT.csproj b/GoogleTestAdapter/VsPackage.TAfGT/VsPackage.TAfGT.csproj index af7f25e49..104df654b 100644 --- a/GoogleTestAdapter/VsPackage.TAfGT/VsPackage.TAfGT.csproj +++ b/GoogleTestAdapter/VsPackage.TAfGT/VsPackage.TAfGT.csproj @@ -189,7 +189,7 @@ $(NuGetPackages)Microsoft.TestPlatform.ObjectModel.15.0.0\lib\net46\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll False - + $(NuGetPackages)Microsoft.VisualStudio.TestWindow.Interfaces.11.0.61030\lib\net45\Microsoft.VisualStudio.TestWindow.Interfaces.dll False From b77ffab4b154bb81d10b4af638cd84123b2dbaba Mon Sep 17 00:00:00 2001 From: Spencer Bloom Date: Wed, 27 Jan 2021 17:19:47 -0800 Subject: [PATCH 5/8] fix string resources after moving file --- .../Common.Dynamic.GTA/Resources.Designer.cs | 37 +++++++++++++++++++ .../Common.Dynamic.GTA/Resources.resx | 15 ++++++++ .../Resources.Designer.cs | 28 ++++++++++++++ .../Common.Dynamic.TAfGT/Resources.resx | 12 ++++++ .../Settings/RunSettingsService.cs | 6 +-- 5 files changed, 95 insertions(+), 3 deletions(-) diff --git a/GoogleTestAdapter/Common.Dynamic.GTA/Resources.Designer.cs b/GoogleTestAdapter/Common.Dynamic.GTA/Resources.Designer.cs index 624ae434c..40459c2fd 100644 --- a/GoogleTestAdapter/Common.Dynamic.GTA/Resources.Designer.cs +++ b/GoogleTestAdapter/Common.Dynamic.GTA/Resources.Designer.cs @@ -60,6 +60,16 @@ internal Resources() { } } + /// + /// Looks up a localized string similar to Solution test settings file could not be parsed, check file: {0} + ///Exception: {1}. + /// + public static string CantParseSettings { + get { + return ResourceManager.GetString("CantParseSettings", resourceCulture); + } + } + /// /// Looks up a localized string similar to Google Test Adapter. /// @@ -69,6 +79,33 @@ public static string ExtensionName { } } + /// + /// Looks up a localized string similar to RunSettingsDocument does not contain a RunSettings node! Canceling settings merging.... + /// + public static string RunSettingsMissingNode { + get { + return ResourceManager.GetString("RunSettingsMissingNode", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Solution test settings file found at '{0}', but does not contain {1} node. + /// + public static string SolutionFoundButMissingNode { + get { + return ResourceManager.GetString("SolutionFoundButMissingNode", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to . + /// + public static string String1 { + get { + return ResourceManager.GetString("String1", resourceCulture); + } + } + /// /// Looks up a localized string similar to Google Test Adapter: Test discovery starting.... /// diff --git a/GoogleTestAdapter/Common.Dynamic.GTA/Resources.resx b/GoogleTestAdapter/Common.Dynamic.GTA/Resources.resx index 049878359..772ef0b16 100644 --- a/GoogleTestAdapter/Common.Dynamic.GTA/Resources.resx +++ b/GoogleTestAdapter/Common.Dynamic.GTA/Resources.resx @@ -117,9 +117,24 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Solution test settings file could not be parsed, check file: {0} +Exception: {1} + Google Test Adapter + + RunSettingsDocument does not contain a RunSettings node! Canceling settings merging... + + + Solution test settings file found at '{0}', but does not contain {1} node + {0} represents the path to a solution test settings file. {1} represents the non-localized name of an XML node. + + + + {0} represents the path to a solution test settings file. {1} represents a textual summary of an exception, likely non-localized. + Google Test Adapter: Test discovery starting... diff --git a/GoogleTestAdapter/Common.Dynamic.TAfGT/Resources.Designer.cs b/GoogleTestAdapter/Common.Dynamic.TAfGT/Resources.Designer.cs index 42c4d4f59..ff0a33157 100644 --- a/GoogleTestAdapter/Common.Dynamic.TAfGT/Resources.Designer.cs +++ b/GoogleTestAdapter/Common.Dynamic.TAfGT/Resources.Designer.cs @@ -60,6 +60,16 @@ internal Resources() { } } + /// + /// Looks up a localized string similar to Solution test settings file could not be parsed, check file: {0} + ///Exception: {1}. + /// + public static string CantParseSettings { + get { + return ResourceManager.GetString("CantParseSettings", resourceCulture); + } + } + /// /// Looks up a localized string similar to Enables Visual Studio's testing tools with unit tests written for Google Test.. /// @@ -78,6 +88,24 @@ public static string ExtensionName { } } + /// + /// Looks up a localized string similar to RunSettingsDocument does not contain a RunSettings node! Canceling settings merging.... + /// + public static string RunSettingsMissingNode { + get { + return ResourceManager.GetString("RunSettingsMissingNode", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Solution test settings file found at '{0}', but does not contain {1} node. + /// + public static string SolutionFoundButMissingNode { + get { + return ResourceManager.GetString("SolutionFoundButMissingNode", resourceCulture); + } + } + /// /// Looks up a localized string similar to Test Adapter for Google Test: Test discovery starting.... /// diff --git a/GoogleTestAdapter/Common.Dynamic.TAfGT/Resources.resx b/GoogleTestAdapter/Common.Dynamic.TAfGT/Resources.resx index 41de6cb29..279c91399 100644 --- a/GoogleTestAdapter/Common.Dynamic.TAfGT/Resources.resx +++ b/GoogleTestAdapter/Common.Dynamic.TAfGT/Resources.resx @@ -117,12 +117,24 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Solution test settings file could not be parsed, check file: {0} +Exception: {1} + {0} represents the path to a solution test settings file. {1} represents a textual summary of an exception, likely non-localized. + Enables Visual Studio's testing tools with unit tests written for Google Test. Test Adapter for Google Test + + RunSettingsDocument does not contain a RunSettings node! Canceling settings merging... + + + Solution test settings file found at '{0}', but does not contain {1} node + {0} represents the path to a solution test settings file. {1} represents the non-localized name of an XML node. + Test Adapter for Google Test: Test discovery starting... diff --git a/GoogleTestAdapter/VsPackage.Shared/Settings/RunSettingsService.cs b/GoogleTestAdapter/VsPackage.Shared/Settings/RunSettingsService.cs index 7aae9a108..100440649 100644 --- a/GoogleTestAdapter/VsPackage.Shared/Settings/RunSettingsService.cs +++ b/GoogleTestAdapter/VsPackage.Shared/Settings/RunSettingsService.cs @@ -37,7 +37,7 @@ public IXPathNavigable AddRunSettings(IXPathNavigable runSettingDocument, Debug.Assert(runSettingsNavigator != null, "userRunSettingsNavigator == null!"); if (!runSettingsNavigator.MoveToChild(Constants.RunSettingsName, "")) { - logger.Log(MessageLevel.Warning, Resources.RunSettingsMissingNode); + logger.Log(MessageLevel.Warning, Common.Resources.RunSettingsMissingNode); return runSettingsNavigator; } @@ -72,7 +72,7 @@ public IXPathNavigable AddRunSettings(IXPathNavigable runSettingDocument, } else { - logger.Log(MessageLevel.Warning, string.Format(Resources.SolutionFoundButMissingNode, solutionRunSettingsFile, Constants.RunSettingsName)); + logger.Log(MessageLevel.Warning, string.Format(Common.Resources.SolutionFoundButMissingNode, solutionRunSettingsFile, Constants.RunSettingsName)); } } } @@ -80,7 +80,7 @@ public IXPathNavigable AddRunSettings(IXPathNavigable runSettingDocument, catch (Exception e) { logger.Log(MessageLevel.Warning, - string.Format(Resources.CantParseSettings, solutionRunSettingsFile, e)); + string.Format(Common.Resources.CantParseSettings, solutionRunSettingsFile, e)); } foreach (var projectSettings in settingsContainer.ProjectSettings) From 6411a7b0216e3e4d1f2c37a0937add62a96c83fa Mon Sep 17 00:00:00 2001 From: Spencer Bloom Date: Wed, 27 Jan 2021 18:17:54 -0800 Subject: [PATCH 6/8] fix resources overlap --- .../Common/{Resources.cs => CommonResources.cs} | 4 ++-- GoogleTestAdapter/Core/Runners/SequentialTestRunner.cs | 2 +- GoogleTestAdapter/TestAdapter/TestDiscoverer.cs | 6 +++--- GoogleTestAdapter/TestAdapter/TestExecutor.cs | 2 +- GoogleTestAdapter/VsPackage.GTA/VsPackage.GTA.csproj | 6 +++--- .../VsPackage.Shared/Settings/RunSettingsService.cs | 2 +- GoogleTestAdapter/VsPackage.TAfGT/VsPackage.TAfGT.csproj | 6 +++--- 7 files changed, 14 insertions(+), 14 deletions(-) rename GoogleTestAdapter/Common/{Resources.cs => CommonResources.cs} (98%) diff --git a/GoogleTestAdapter/Common/Resources.cs b/GoogleTestAdapter/Common/CommonResources.cs similarity index 98% rename from GoogleTestAdapter/Common/Resources.cs rename to GoogleTestAdapter/Common/CommonResources.cs index bc07d0c01..913b44045 100644 --- a/GoogleTestAdapter/Common/Resources.cs +++ b/GoogleTestAdapter/Common/CommonResources.cs @@ -6,7 +6,7 @@ /// /// Based on the auto-generated resources file from Common.Dynamic /// - public class Resources + public class CommonResources { private static global::System.Resources.ResourceManager resourceMan; @@ -14,7 +14,7 @@ public class Resources private static global::System.Globalization.CultureInfo resourceCulture; [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() + internal CommonResources() { } diff --git a/GoogleTestAdapter/Core/Runners/SequentialTestRunner.cs b/GoogleTestAdapter/Core/Runners/SequentialTestRunner.cs index ecb429963..2150c248e 100644 --- a/GoogleTestAdapter/Core/Runners/SequentialTestRunner.cs +++ b/GoogleTestAdapter/Core/Runners/SequentialTestRunner.cs @@ -171,7 +171,7 @@ public static void LogExecutionError(ILogger logger, string executable, string w { logger.LogError(String.Format(Resources.RunExecutableError, threadName, executable, exception.Message)); logger.DebugError(String.Format(Resources.StackTrace, threadName, Environment.NewLine, exception.StackTrace)); - logger.LogError(String.Format(Common.Resources.TroubleShootingLink, threadName)); + logger.LogError(String.Format(CommonResources.TroubleShootingLink, threadName)); logger.LogError(String.Format(Resources.ExecuteSteps, threadName, workingDir, Environment.NewLine, executable, arguments)); } diff --git a/GoogleTestAdapter/TestAdapter/TestDiscoverer.cs b/GoogleTestAdapter/TestAdapter/TestDiscoverer.cs index e7dd5bfb0..4dfef1789 100644 --- a/GoogleTestAdapter/TestAdapter/TestDiscoverer.cs +++ b/GoogleTestAdapter/TestAdapter/TestDiscoverer.cs @@ -46,7 +46,7 @@ public void DiscoverTests(IEnumerable executables, IDiscoveryContext dis return; CommonFunctions.LogVisualStudioVersion(_logger); - _logger.LogInfo(Common.Resources.TestDiscoveryStarting); + _logger.LogInfo(CommonResources.TestDiscoveryStarting); _logger.DebugInfo(String.Format(Resources.Settings, _settings)); try @@ -71,10 +71,10 @@ private bool IsSupportedVisualStudioVersion() switch (version) { case VsVersion.Unknown: - _logger.LogWarning(String.Format(Resources.IdentifyVSError, Common.Resources.ExtensionName)); + _logger.LogWarning(String.Format(Resources.IdentifyVSError, CommonResources.ExtensionName)); return true; case VsVersion.VS2012: - _logger.LogError(String.Format(Resources.VS2012Error, Common.Resources.ExtensionName)); + _logger.LogError(String.Format(Resources.VS2012Error, CommonResources.ExtensionName)); return false; default: return true; diff --git a/GoogleTestAdapter/TestAdapter/TestExecutor.cs b/GoogleTestAdapter/TestAdapter/TestExecutor.cs index dec15155e..e214cd8d8 100644 --- a/GoogleTestAdapter/TestAdapter/TestExecutor.cs +++ b/GoogleTestAdapter/TestAdapter/TestExecutor.cs @@ -133,7 +133,7 @@ private Stopwatch StartStopWatchAndInitEnvironment(IRunContext runContext, IFram CommonFunctions.LogVisualStudioVersion(_logger); - _logger.LogInfo(Common.Resources.TestExecutionStarting); + _logger.LogInfo(CommonResources.TestExecutionStarting); _logger.DebugInfo(String.Format(Resources.Settings, _settings)); return stopwatch; diff --git a/GoogleTestAdapter/VsPackage.GTA/VsPackage.GTA.csproj b/GoogleTestAdapter/VsPackage.GTA/VsPackage.GTA.csproj index 3f6da46b6..c44f6f2fd 100644 --- a/GoogleTestAdapter/VsPackage.GTA/VsPackage.GTA.csproj +++ b/GoogleTestAdapter/VsPackage.GTA/VsPackage.GTA.csproj @@ -279,9 +279,9 @@ - - {bc05d210-68cd-47d0-ae8c-0f3168d1be73} - Common + + {17f4b73f-e4d3-4e40-98fc-788b1d0f8225} + Common.Dynamic.GTA {7f4372da-70e2-48d0-bee2-8043528428d0} diff --git a/GoogleTestAdapter/VsPackage.Shared/Settings/RunSettingsService.cs b/GoogleTestAdapter/VsPackage.Shared/Settings/RunSettingsService.cs index 100440649..7dea8596a 100644 --- a/GoogleTestAdapter/VsPackage.Shared/Settings/RunSettingsService.cs +++ b/GoogleTestAdapter/VsPackage.Shared/Settings/RunSettingsService.cs @@ -1,4 +1,4 @@ -// This file has been modified by Microsoft on 9/2017. +// This file has been modified by Microsoft on 1/2021. using EnvDTE; using GoogleTestAdapter.Settings; diff --git a/GoogleTestAdapter/VsPackage.TAfGT/VsPackage.TAfGT.csproj b/GoogleTestAdapter/VsPackage.TAfGT/VsPackage.TAfGT.csproj index 104df654b..105b5f30c 100644 --- a/GoogleTestAdapter/VsPackage.TAfGT/VsPackage.TAfGT.csproj +++ b/GoogleTestAdapter/VsPackage.TAfGT/VsPackage.TAfGT.csproj @@ -237,9 +237,9 @@ - - {bc05d210-68cd-47d0-ae8c-0f3168d1be73} - Common + + {9041bded-fa1b-4c17-b7ea-7b750c470c23} + Common.Dynamic.TAfGT {7f4372da-70e2-48d0-bee2-8043528428d0} From 67a1fed73a38fa7cd57b6607007dd9b4b8548290 Mon Sep 17 00:00:00 2001 From: Spencer Bloom Date: Thu, 28 Jan 2021 11:36:09 -0800 Subject: [PATCH 7/8] project didn't save after rename --- GoogleTestAdapter/Common/Common.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GoogleTestAdapter/Common/Common.csproj b/GoogleTestAdapter/Common/Common.csproj index 7a147b77e..c1836b820 100644 --- a/GoogleTestAdapter/Common/Common.csproj +++ b/GoogleTestAdapter/Common/Common.csproj @@ -57,7 +57,7 @@ - + From b6914158eb2eb7c70f9e0dc935f62713f62702d7 Mon Sep 17 00:00:00 2001 From: Spencer Bloom Date: Thu, 28 Jan 2021 12:00:35 -0800 Subject: [PATCH 8/8] more projects not saved, oops --- GoogleTestAdapter/VsPackage.GTA/VsPackage.GTA.csproj | 4 ++++ GoogleTestAdapter/VsPackage.TAfGT/VsPackage.TAfGT.csproj | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/GoogleTestAdapter/VsPackage.GTA/VsPackage.GTA.csproj b/GoogleTestAdapter/VsPackage.GTA/VsPackage.GTA.csproj index c44f6f2fd..4f32cefeb 100644 --- a/GoogleTestAdapter/VsPackage.GTA/VsPackage.GTA.csproj +++ b/GoogleTestAdapter/VsPackage.GTA/VsPackage.GTA.csproj @@ -283,6 +283,10 @@ {17f4b73f-e4d3-4e40-98fc-788b1d0f8225} Common.Dynamic.GTA + + {bc05d210-68cd-47d0-ae8c-0f3168d1be73} + Common + {7f4372da-70e2-48d0-bee2-8043528428d0} Core diff --git a/GoogleTestAdapter/VsPackage.TAfGT/VsPackage.TAfGT.csproj b/GoogleTestAdapter/VsPackage.TAfGT/VsPackage.TAfGT.csproj index 105b5f30c..bf7396a67 100644 --- a/GoogleTestAdapter/VsPackage.TAfGT/VsPackage.TAfGT.csproj +++ b/GoogleTestAdapter/VsPackage.TAfGT/VsPackage.TAfGT.csproj @@ -241,6 +241,10 @@ {9041bded-fa1b-4c17-b7ea-7b750c470c23} Common.Dynamic.TAfGT + + {bc05d210-68cd-47d0-ae8c-0f3168d1be73} + Common + {7f4372da-70e2-48d0-bee2-8043528428d0} Core