Skip to content
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

Jump to bottom

Stage WinAppDriver into its own folder #15953

Merged
merged 2 commits into from
Sep 15, 2023
Merged

Stage WinAppDriver into its own folder #15953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
41ae513
Stage WinAppDriver into its own folder
DHowett Sep 11, 2023
5bbbb32
Okay I am just bad at CMD
DHowett Sep 13, 2023
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
7 changes: 6 additions & 1 deletion src/cascadia/WindowsTerminal_UIATests/Init.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,12 @@ class Init
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}");
Expand Down
4 changes: 2 additions & 2 deletions src/cascadia/WindowsTerminal_UIATests/WindowsTerminal.UIA.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
</Project>
4 changes: 2 additions & 2 deletions src/host/ft_uia/Host.Tests.UIA.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
</Project>
7 changes: 6 additions & 1 deletion src/host/ft_uia/Init.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,12 @@ class Init
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}");
Expand Down
Loading