microsoft/terminal
1
0
Fork 0
mirror of https://github.com/microsoft/terminal.git synced 2025-12-11 04:38:24 -06:00
Code Issues Packages Projects Releases 138 Wiki Activity

Stage WinAppDriver into its own folder (#15953)

Browse Source 
WinAppDriver depends on a bunch of .NET assemblies that collide *big time*. Let's just quarantine it.

I kept the fallback to $TESTDIR\WinAppDriver.exe because there's a chance that the Windows build depends on it.
This commit is contained in:
Dustin L. Howett 2023-09-15 12:59:00 -07:00 committed by GitHub
parent 4bc34e490c
commit 2fa8e766bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/cascadia/WindowsTerminal_UIATests/Init.cs
View File

@ -22,7 +22,12 @@ namespace Host.Tests.UIA
public static void SetupAll(TestContext context)
{
Log.Comment("Searching for WinAppDriver in the same directory where this test was launched from...");
string winAppDriver = Path.Combine(context.TestDeploymentDir, "WinAppDriver.exe");
string winAppDriver = Path.Combine(context.TestDeploymentDir, "WinAppDriver", "WinAppDriver.exe");
if (!File.Exists(winAppDriver))
{
winAppDriver = Path.Combine(context.TestDeploymentDir, "WinAppDriver.exe");
}
Log.Comment($"Attempting to launch WinAppDriver at: {winAppDriver}");
Log.Comment($"Working directory: {Environment.CurrentDirectory}");

2
src/cascadia/WindowsTerminal_UIATests/WindowsTerminal.UIA.Tests.csproj
View File

@ -126,7 +126,7 @@
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>copy &quot;$(SolutionDir)\dep\WinAppDriver\*&quot; &quot;$(OutDir)\&quot;</PostBuildEvent>
<PostBuildEvent>mkdir &quot;$(OutDir)\WinAppDriver&quot; 2&gt;nul &amp; copy &quot;$(SolutionDir)\dep\WinAppDriver\*&quot; &quot;$(OutDir)\WinAppDriver\&quot;</PostBuildEvent>
</PropertyGroup>
<Import Project="..\..\common.nugetversions.targets" />
</Project>

2
src/host/ft_uia/Host.Tests.UIA.csproj
View File

@ -149,7 +149,7 @@
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>copy "$(SolutionDir)\dep\WinAppDriver\*" "$(OutDir)\"</PostBuildEvent>
<PostBuildEvent>mkdir &quot;$(OutDir)\WinAppDriver&quot; 2&gt;nul &amp; copy &quot;$(SolutionDir)\dep\WinAppDriver\*&quot; &quot;$(OutDir)\WinAppDriver\&quot;</PostBuildEvent>
</PropertyGroup>
<Import Project="..\..\common.nugetversions.targets" />
</Project>

7
src/host/ft_uia/Init.cs
View File

@ -28,7 +28,12 @@ namespace Host.Tests.UIA
public static void SetupAll(TestContext context)
{
Log.Comment("Searching for WinAppDriver in the same directory where this test was launched from...");
string winAppDriver = Path.Combine(context.TestDeploymentDir, "WinAppDriver.exe");
string winAppDriver = Path.Combine(context.TestDeploymentDir, "WinAppDriver", "WinAppDriver.exe");
if (!File.Exists(winAppDriver))
{
winAppDriver = Path.Combine(context.TestDeploymentDir, "WinAppDriver.exe");
}
Log.Comment($"Attempting to launch WinAppDriver at: {winAppDriver}");
Log.Comment($"Working directory: {Environment.CurrentDirectory}");