Skip to content

Draft: Apply upstream patch to remove TestWindow dependency #187

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
spebl merged 9 commits into from
Jan 28, 2021
Merged

Draft: Apply upstream patch to remove TestWindow dependency #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
092c9b5
Apply upstream patch https://github.com/csoltenborn/GoogleTestAdapter…
benmcmorran Jan 21, 2021
f6f4e41
Merge branch 'dev15' into dev/bemcmorr/testwindow-patch
spebl Jan 27, 2021
64b6e45
Update packages.config.tt
spebl Jan 27, 2021
13c99b0
Update packages.config.tt
spebl Jan 27, 2021
729328c
fix testwindow reference
spebl Jan 28, 2021
b77ffab
fix string resources after moving file
spebl Jan 28, 2021
6411a7b
fix resources overlap
spebl Jan 28, 2021
67a1fed
project didn't save after rename
spebl Jan 28, 2021
b691415
more projects not saved, oops
spebl Jan 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions GoogleTestAdapter/Common.Dynamic.GTA/Resources.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions GoogleTestAdapter/Common.Dynamic.GTA/Resources.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,24 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="CantParseSettings" xml:space="preserve">
<value>Solution test settings file could not be parsed, check file: {0}
Exception: {1}</value>
</data>
<data name="ExtensionName" xml:space="preserve">
<value>Google Test Adapter</value>
</data>
<data name="RunSettingsMissingNode" xml:space="preserve">
<value>RunSettingsDocument does not contain a RunSettings node! Canceling settings merging...</value>
</data>
<data name="SolutionFoundButMissingNode" xml:space="preserve">
<value>Solution test settings file found at '{0}', but does not contain {1} node</value>
<comment>{0} represents the path to a solution test settings file. {1} represents the non-localized name of an XML node.</comment>
</data>
<data name="String1" xml:space="preserve">
<value />
<comment>{0} represents the path to a solution test settings file. {1} represents a textual summary of an exception, likely non-localized.</comment>
</data>
<data name="TestDiscoveryStarting" xml:space="preserve">
<value>Google Test Adapter: Test discovery starting...</value>
</data>
Expand Down
28 changes: 28 additions & 0 deletions GoogleTestAdapter/Common.Dynamic.TAfGT/Resources.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions GoogleTestAdapter/Common.Dynamic.TAfGT/Resources.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,12 +117,24 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="CantParseSettings" xml:space="preserve">
<value>Solution test settings file could not be parsed, check file: {0}
Exception: {1}</value>
<comment>{0} represents the path to a solution test settings file. {1} represents a textual summary of an exception, likely non-localized.</comment>
</data>
<data name="ExtensionDescription" xml:space="preserve">
<value>Enables Visual Studio's testing tools with unit tests written for Google Test.</value>
</data>
<data name="ExtensionName" xml:space="preserve">
<value>Test Adapter for Google Test</value>
</data>
<data name="RunSettingsMissingNode" xml:space="preserve">
<value>RunSettingsDocument does not contain a RunSettings node! Canceling settings merging...</value>
</data>
<data name="SolutionFoundButMissingNode" xml:space="preserve">
<value>Solution test settings file found at '{0}', but does not contain {1} node</value>
<comment>{0} represents the path to a solution test settings file. {1} represents the non-localized name of an XML node.</comment>
</data>
<data name="TestDiscoveryStarting" xml:space="preserve">
<value>Test Adapter for Google Test: Test discovery starting...</value>
</data>
Expand Down
2 changes: 1 addition & 1 deletion GoogleTestAdapter/Common/Common.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<Compile Include="LoggerBase.cs" />
<Compile Include="ProcessWaiter.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Resources.cs" />
<Compile Include="CommonResources.cs" />
</ItemGroup>
<ItemGroup>
<None Include="Key.snk" />
Expand Down
4 changes: 2 additions & 2 deletions GoogleTestAdapter/Common/Resources.cs → GoogleTestAdapter/Common/CommonResources.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
/// <summary>
/// Based on the auto-generated resources file from Common.Dynamic
/// </summary>
public class Resources
public class CommonResources
{

private static global::System.Resources.ResourceManager resourceMan;

private static global::System.Globalization.CultureInfo resourceCulture;

[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
internal Resources()
internal CommonResources()
{
}

Expand Down
2 changes: 1 addition & 1 deletion GoogleTestAdapter/Core/Runners/SequentialTestRunner.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}

Expand Down
10 changes: 0 additions & 10 deletions GoogleTestAdapter/TestAdapter.Tests/TestAdapter.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,6 @@
<HintPath>$(NuGetPackages)Microsoft.TestPlatform.ObjectModel.15.0.0\lib\net46\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.VisualStudio.TestWindow.Interfaces, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" Condition="'$(TestAdapterFlavor)' == 'GTA'">
<HintPath>$(NuGetPackages)Microsoft.VisualStudio.TestWindow.Interfaces.11.0.61030\lib\net45\Microsoft.VisualStudio.TestWindow.Interfaces.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.VisualStudio.TestWindow.Interfaces, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" Condition="'$(TestAdapterFlavor)' == 'TAfGT'">
<HintPath>$(NuGetPackages)Microsoft.VisualStudio.TestWindow.Interfaces.11.0.61030\lib\net45\Microsoft.VisualStudio.TestWindow.Interfaces.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Moq, Version=4.5.30.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
<HintPath>$(NuGetPackages)Moq.4.5.30\lib\net45\Moq.dll</HintPath>
<Private>True</Private>
Expand All @@ -95,7 +87,6 @@
</Choose>
<ItemGroup>
<Compile Include="Settings\RunSettingsContainerTests.cs" />
<Compile Include="Helpers\RunSettingsServiceUnderTest.cs" />
<Compile Include="TestExecutorTestsBase.cs" />
<Compile Include="TestAdapterTestsBase.cs" />
<Compile Include="Framework\DebuggedProcessLauncherTests.cs" />
Expand All @@ -108,7 +99,6 @@
<Compile Include="TestExecutorSequentialTests.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Settings\RunSettingsProviderTests.cs" />
<Compile Include="Settings\RunSettingsServiceTests.cs" />
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
Expand Down
4 changes: 1 addition & 3 deletions GoogleTestAdapter/TestAdapter.Tests/packages.config.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,8 @@
<package id="Moq" version="4.5.30" targetFramework="net452" />
<# if (TestAdapterFlavor == "GTA") { #>
<package id="Microsoft.TestPlatform.ObjectModel" version="11.0.0" targetFramework="net452" />
<package id="Microsoft.VisualStudio.TestWindow.Interfaces" version="11.0.61030" targetFramework="net452" />
<# } else if (TestAdapterFlavor == "TAfGT") { #>
<package id="Microsoft.TestPlatform.ObjectModel" version="15.0.0" targetFramework="net46" />
<package id="Microsoft.VisualStudio.TestWindow.Interfaces" version="11.0.61030" targetFramework="net46" />
<# } #>
<package id="OpenCover" version="4.7.922" targetFramework="net452" />
</packages>
</packages>
9 changes: 0 additions & 9 deletions GoogleTestAdapter/TestAdapter/TestAdapter.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,14 +144,6 @@
<HintPath>$(NuGetPackages)Microsoft.TestPlatform.ObjectModel.15.0.0\lib\net46\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Microsoft.VisualStudio.TestWindow.Interfaces, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" Condition="'$(TestAdapterFlavor)' == 'GTA'">
<HintPath>$(NuGetPackages)Microsoft.VisualStudio.TestWindow.Interfaces.11.0.61030\lib\net45\Microsoft.VisualStudio.TestWindow.Interfaces.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Microsoft.VisualStudio.TestWindow.Interfaces, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" Condition="'$(TestAdapterFlavor)' == 'TAfGT'">
<HintPath>$(NuGetPackages)Microsoft.VisualStudio.TestWindow.Interfaces.11.0.61030\lib\net45\Microsoft.VisualStudio.TestWindow.Interfaces.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Microsoft.VisualStudio.TextManager.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<HintPath Condition="'$(TestAdapterFlavor)' == 'GTA'">$(NuGetPackages)VSSDK.TextManager.Interop.7.0.4\lib\net20\Microsoft.VisualStudio.TextManager.Interop.dll</HintPath>
<Private>True</Private>
Expand Down Expand Up @@ -212,7 +204,6 @@
<Compile Include="Settings\IGlobalRunSettingsInternal.cs" />
<Compile Include="Settings\RunSettingsContainer.cs" />
<Compile Include="Settings\RunSettingsProvider.cs" />
<Compile Include="Settings\RunSettingsService.cs" />
<Compile Include="Settings\TestPropertySettings.cs" />
<Compile Include="Settings\TestPropertySettingsContainer.cs" />
<Compile Include="Settings\TestPropertySettingsProvider.cs" />
Expand Down
6 changes: 3 additions & 3 deletions GoogleTestAdapter/TestAdapter/TestDiscoverer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public void DiscoverTests(IEnumerable<string> executables, IDiscoveryContext dis
return;
CommonFunctions.LogVisualStudioVersion(_logger);

_logger.LogInfo(Common.Resources.TestDiscoveryStarting);
_logger.LogInfo(CommonResources.TestDiscoveryStarting);
_logger.DebugInfo(String.Format(Resources.Settings, _settings));

try
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion GoogleTestAdapter/TestAdapter/TestExecutor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 1 addition & 3 deletions GoogleTestAdapter/TestAdapter/packages.config.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<packages>
<# if (TestAdapterFlavor == "GTA") { #>
<package id="Microsoft.TestPlatform.ObjectModel" version="11.0.0" targetFramework="net45" />
<package id="Microsoft.VisualStudio.TestWindow.Interfaces" version="11.0.61030" targetFramework="net45" />
<package id="VSSDK.DTE" version="7.0.4" targetFramework="net45" />
<package id="VSSDK.DTE.10" version="10.0.4" targetFramework="net45" />
<package id="VSSDK.DTE.8" version="8.0.4" targetFramework="net45" />
Expand All @@ -31,6 +30,5 @@
<package id="VSSDK.TextManager.Interop.9" version="9.0.4" targetFramework="net45" />
<# } else if (TestAdapterFlavor == "TAfGT") { #>
<package id="Microsoft.TestPlatform.ObjectModel" version="15.0.0" targetFramework="net46" />
<package id="Microsoft.VisualStudio.TestWindow.Interfaces" version="11.0.61030" targetFramework="net46" />
<# } #>
</packages>
</packages>
2 changes: 1 addition & 1 deletion ...ts/Helpers/RunSettingsServiceUnderTest.cs → ...it/Helpers/RunSettingsServiceUnderTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using GoogleTestAdapter.TestAdapter.Settings;

namespace GoogleTestAdapter.TestAdapter.Helpers
namespace GoogleTestAdapter.VsPackage.Helpers
{
public class RunSettingsServiceUnderTest : RunSettingsService
{
Expand Down
5 changes: 3 additions & 2 deletions ...Tests/Settings/RunSettingsServiceTests.cs → ....Unit/Settings/RunSettingsServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,17 @@
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;
using Moq;
using static GoogleTestAdapter.Tests.Common.TestMetadata.TestCategories;
// ReSharper disable PossibleNullReferenceException

namespace GoogleTestAdapter.TestAdapter.Settings
namespace GoogleTestAdapter.VsPackage.Settings
{

[TestClass]
Expand Down
12 changes: 11 additions & 1 deletion GoogleTestAdapter/VsPackage.GTA.Tests.Unit/VsPackage.GTA.Tests.Unit.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,12 @@
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.VisualStudio.TestPlatform.ObjectModel, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>$(NuGetPackages)Microsoft.TestPlatform.ObjectModel.11.0.0\lib\net35\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualStudio.TestWindow.Interfaces, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>$(NuGetPackages)Microsoft.VisualStudio.TestWindow.Interfaces.11.0.61030\lib\net45\Microsoft.VisualStudio.TestWindow.Interfaces.dll</HintPath>
</Reference>
<Reference Include="Moq, Version=4.5.30.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
<HintPath>$(NuGetPackages)Moq.4.5.30\lib\net45\Moq.dll</HintPath>
</Reference>
Expand All @@ -76,9 +82,11 @@
<ItemGroup>
<Compile Include="Debugging\MessageBasedDebuggerAttacherTests.cs" />
<Compile Include="Debugging\DebuggerAttacherServiceTests.cs" />
<Compile Include="Helpers\RunSettingsServiceUnderTest.cs" />
<Compile Include="ReleaseNotes\HistoryTests.cs" />
<Compile Include="ReleaseNotes\ReleaseNotesCreatorTests.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Settings\RunSettingsServiceTests.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Common\Common.csproj">
Expand All @@ -105,7 +113,9 @@
<ItemGroup>
<None Include="app.config" />
<None Include="Key.snk" />
<None Include="packages.config" />
<None Include="packages.config">
<SubType>Designer</SubType>
</None>
</ItemGroup>
<Choose>
<When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
Expand Down
2 changes: 2 additions & 0 deletions GoogleTestAdapter/VsPackage.GTA.Tests.Unit/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,7 @@
<packages>
<package id="Castle.Core" version="4.0.0" targetFramework="net45" />
<package id="FluentAssertions" version="4.19.0" targetFramework="net45" />
<package id="Microsoft.TestPlatform.ObjectModel" version="11.0.0" targetFramework="net45" />
<package id="Microsoft.VisualStudio.TestWindow.Interfaces" version="11.0.61030" targetFramework="net45" />
<package id="Moq" version="4.5.30" targetFramework="net45" />
</packages>
4 changes: 4 additions & 0 deletions GoogleTestAdapter/VsPackage.GTA/VsPackage.GTA.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,10 @@
<Reference Include="WindowsBase" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Common.Dynamic.GTA\Common.Dynamic.GTA.csproj">
<Project>{17f4b73f-e4d3-4e40-98fc-788b1d0f8225}</Project>
<Name>Common.Dynamic.GTA</Name>
</ProjectReference>
<ProjectReference Include="..\Common\Common.csproj">
<Project>{bc05d210-68cd-47d0-ae8c-0f3168d1be73}</Project>
<Name>Common</Name>
Expand Down
1 change: 0 additions & 1 deletion GoogleTestAdapter/VsPackage.Shared/Helpers/ActivityLogLogger.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

using System;
using GoogleTestAdapter.Common;
using GoogleTestAdapter.Settings;
using Microsoft.VisualStudio.Shell.Interop;

namespace GoogleTestAdapter.VsPackage.Helpers
Expand Down
Loading