Skip to content

Commit

Permalink
MUXTestInfra refactor (#3212)
Browse files Browse the repository at this point in the history 
Co-authored-by: kmahone <kmahone@microsoft.com>
  • Loading branch information
@azchohfi @kmahone
azchohfi and kmahone committed Sep 10, 2020
1 parent dc08d9b commit c46d28b
Show file tree
Hide file tree
Showing 96 changed files with 2,284 additions and 2,710 deletions.
3 changes: 2 additions & 1 deletion Directory.Build.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@

<OutputPath>$(OutDir)\$(MSBuildProjectName)\</OutputPath>

<BaseIntermediateOutputPath>$(MSBuildThisFileDirectory)BuildOutput\Intermediates\$(MSBuildProjectName)\obj\</BaseIntermediateOutputPath>
<BaseIntermediateOutputPath>$(MSBuildThisFileDirectory)BuildOutput\Intermediates\$(Platform)\$(MSBuildProjectName)\obj\</BaseIntermediateOutputPath>
<MSBuildProjectExtensionsPath>$(MSBuildThisFileDirectory)BuildOutput\Intermediates\$(MSBuildProjectName)\obj\</MSBuildProjectExtensionsPath>
<IntDir>$(BaseIntermediateOutputPath)</IntDir>
<IntermediateOutputPath>$(BaseIntermediateOutputPath)</IntermediateOutputPath>
<GeneratedFilesDir>$(BaseIntermediateOutputPath)Generated Files\</GeneratedFilesDir>
Expand Down
112 changes: 88 additions & 24 deletions MUXControls.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{5EF3865D
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.UI.Xaml", "dev\dll\Microsoft.UI.Xaml.vcxproj", "{AD0C90B0-4845-4D4B-88F1-86F653F8171B}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MUXTestUtilities", "test\MUXTestUtilities\MUXTestUtilities.vcxproj", "{E7D6B510-3761-478A-8E22-72558DAD924E}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{D3327F36-E161-4FED-A0F4-56F2B735827E}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NavigationView", "NavigationView", "{05CB5DBD-A481-4DFF-B1A3-642F049D165C}"
Expand Down Expand Up @@ -644,6 +642,16 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "InfoBar_InteractionTests",
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "InfoBar_TestUI", "dev\InfoBar\TestUI\InfoBar_TestUI.shproj", "{ABBC2446-9B41-4400-8CF6-AF2CF8C597B2}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestInfra", "TestInfra", "{C0215617-A17B-45DB-9CDA-C46C0923DA55}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AppTestAutomationHelpers", "test\testinfra\AppTestAutomationHelpers\AppTestAutomationHelpers.vcxproj", "{128E6F7A-578C-48DC-BD3F-750EC662C268}"
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "MUXTestInfra.Shared", "test\testinfra\MUXTestInfra\MUXTestInfra.Shared.shproj", "{107794D7-4BE0-407E-A76C-EFA46D1E9F93}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MUXTestInfra.TAEF", "test\testinfra\MUXTestInfra\TAEF\MUXTestInfra.TAEF.csproj", "{DB2DBB48-C807-4F7C-943E-385E77DF7BDE}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MUXTestInfra.MSTest", "test\testinfra\MUXTestInfra\MSTest\MUXTestInfra.MSTest.csproj", "{6B4C9F2E-6A2C-48AD-944B-49B9E9BF028D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{10183D43-1785-443E-AEB7-C426FDF14964}"
ProjectSection(SolutionItems) = preProject
dev\NavigationView\docs\NavigationViewItem.md = dev\NavigationView\docs\NavigationViewItem.md
Expand All @@ -668,6 +676,7 @@ Global
dev\ScrollPresenter\TestUI\ScrollPresenter_TestUI.projitems*{0ec52fd5-42fe-3eb4-84e0-79ec9b5a014e}*SharedItemsImports = 13
dev\ProgressBar\ProgressBar.vcxitems*{0f61c8bd-d066-4812-a02b-e95ce18a985d}*SharedItemsImports = 9
dev\ContentDialog\TestUI\ContentDialog_TestUI.projitems*{104de67f-bf5e-4ce0-a204-82a4fd85209a}*SharedItemsImports = 13
test\testinfra\MUXTestInfra\MUXTestInfra.Shared.projitems*{107794d7-4be0-407e-a76c-efa46d1e9f93}*SharedItemsImports = 13
dev\RatingControl\TestUI\RatingControl_TestUI.projitems*{10c52fd4-52fc-43b3-94af-895c9b5a014c}*SharedItemsImports = 13
dev\Interactions\ButtonInteraction\TestUI\ButtonInteraction_TestUI.projitems*{11b35f24-72b2-4228-9960-0d1ea283e1af}*SharedItemsImports = 13
dev\CommandBarFlyout\CommandBarFlyout.vcxitems*{11c085ff-8f68-48ee-9949-6eecbd0cbe6c}*SharedItemsImports = 9
Expand Down Expand Up @@ -1093,27 +1102,6 @@ Global
{AD0C90B0-4845-4D4B-88F1-86F653F8171B}.Release|x64.Build.0 = Release|x64
{AD0C90B0-4845-4D4B-88F1-86F653F8171B}.Release|x86.ActiveCfg = Release|Win32
{AD0C90B0-4845-4D4B-88F1-86F653F8171B}.Release|x86.Build.0 = Release|Win32
{E7D6B510-3761-478A-8E22-72558DAD924E}.Debug_test|ARM.ActiveCfg = Debug|ARM
{E7D6B510-3761-478A-8E22-72558DAD924E}.Debug_test|ARM.Build.0 = Debug|ARM
{E7D6B510-3761-478A-8E22-72558DAD924E}.Debug_test|arm64.ActiveCfg = Debug|arm64
{E7D6B510-3761-478A-8E22-72558DAD924E}.Debug_test|x64.ActiveCfg = Debug|x64
{E7D6B510-3761-478A-8E22-72558DAD924E}.Debug_test|x64.Build.0 = Debug|x64
{E7D6B510-3761-478A-8E22-72558DAD924E}.Debug_test|x86.ActiveCfg = Debug|Win32
{E7D6B510-3761-478A-8E22-72558DAD924E}.Debug_test|x86.Build.0 = Debug|Win32
{E7D6B510-3761-478A-8E22-72558DAD924E}.Debug|ARM.ActiveCfg = Debug|ARM
{E7D6B510-3761-478A-8E22-72558DAD924E}.Debug|ARM.Build.0 = Debug|ARM
{E7D6B510-3761-478A-8E22-72558DAD924E}.Debug|arm64.ActiveCfg = Debug|arm64
{E7D6B510-3761-478A-8E22-72558DAD924E}.Debug|x64.ActiveCfg = Debug|x64
{E7D6B510-3761-478A-8E22-72558DAD924E}.Debug|x64.Build.0 = Debug|x64
{E7D6B510-3761-478A-8E22-72558DAD924E}.Debug|x86.ActiveCfg = Debug|Win32
{E7D6B510-3761-478A-8E22-72558DAD924E}.Debug|x86.Build.0 = Debug|Win32
{E7D6B510-3761-478A-8E22-72558DAD924E}.Release|ARM.ActiveCfg = Release|ARM
{E7D6B510-3761-478A-8E22-72558DAD924E}.Release|ARM.Build.0 = Release|ARM
{E7D6B510-3761-478A-8E22-72558DAD924E}.Release|arm64.ActiveCfg = Release|arm64
{E7D6B510-3761-478A-8E22-72558DAD924E}.Release|x64.ActiveCfg = Release|x64
{E7D6B510-3761-478A-8E22-72558DAD924E}.Release|x64.Build.0 = Release|x64
{E7D6B510-3761-478A-8E22-72558DAD924E}.Release|x86.ActiveCfg = Release|Win32
{E7D6B510-3761-478A-8E22-72558DAD924E}.Release|x86.Build.0 = Release|Win32
{92081F61-98BB-4105-A90F-B6D524B4F5C9}.Debug_test|ARM.ActiveCfg = Debug|ARM
{92081F61-98BB-4105-A90F-B6D524B4F5C9}.Debug_test|ARM.Build.0 = Debug|ARM
{92081F61-98BB-4105-A90F-B6D524B4F5C9}.Debug_test|ARM.Deploy.0 = Debug|ARM
Expand Down Expand Up @@ -1352,6 +1340,78 @@ Global
{9638BF0D-2AA8-4642-A9F1-790BF7FBECF2}.Release|x64.Build.0 = Release|Any CPU
{9638BF0D-2AA8-4642-A9F1-790BF7FBECF2}.Release|x86.ActiveCfg = Release|Any CPU
{9638BF0D-2AA8-4642-A9F1-790BF7FBECF2}.Release|x86.Build.0 = Release|Any CPU
{128E6F7A-578C-48DC-BD3F-750EC662C268}.Debug_test|ARM.ActiveCfg = Debug|ARM
{128E6F7A-578C-48DC-BD3F-750EC662C268}.Debug_test|ARM.Build.0 = Debug|ARM
{128E6F7A-578C-48DC-BD3F-750EC662C268}.Debug_test|arm64.ActiveCfg = Debug|ARM64
{128E6F7A-578C-48DC-BD3F-750EC662C268}.Debug_test|arm64.Build.0 = Debug|ARM64
{128E6F7A-578C-48DC-BD3F-750EC662C268}.Debug_test|x64.ActiveCfg = Debug|x64
{128E6F7A-578C-48DC-BD3F-750EC662C268}.Debug_test|x64.Build.0 = Debug|x64
{128E6F7A-578C-48DC-BD3F-750EC662C268}.Debug_test|x86.ActiveCfg = Debug|Win32
{128E6F7A-578C-48DC-BD3F-750EC662C268}.Debug_test|x86.Build.0 = Debug|Win32
{128E6F7A-578C-48DC-BD3F-750EC662C268}.Debug|ARM.ActiveCfg = Debug|ARM
{128E6F7A-578C-48DC-BD3F-750EC662C268}.Debug|ARM.Build.0 = Debug|ARM
{128E6F7A-578C-48DC-BD3F-750EC662C268}.Debug|arm64.ActiveCfg = Debug|ARM64
{128E6F7A-578C-48DC-BD3F-750EC662C268}.Debug|arm64.Build.0 = Debug|ARM64
{128E6F7A-578C-48DC-BD3F-750EC662C268}.Debug|x64.ActiveCfg = Debug|x64
{128E6F7A-578C-48DC-BD3F-750EC662C268}.Debug|x64.Build.0 = Debug|x64
{128E6F7A-578C-48DC-BD3F-750EC662C268}.Debug|x86.ActiveCfg = Debug|Win32
{128E6F7A-578C-48DC-BD3F-750EC662C268}.Debug|x86.Build.0 = Debug|Win32
{128E6F7A-578C-48DC-BD3F-750EC662C268}.Release|ARM.ActiveCfg = Release|ARM
{128E6F7A-578C-48DC-BD3F-750EC662C268}.Release|ARM.Build.0 = Release|ARM
{128E6F7A-578C-48DC-BD3F-750EC662C268}.Release|arm64.ActiveCfg = Release|ARM64
{128E6F7A-578C-48DC-BD3F-750EC662C268}.Release|arm64.Build.0 = Release|ARM64
{128E6F7A-578C-48DC-BD3F-750EC662C268}.Release|x64.ActiveCfg = Release|x64
{128E6F7A-578C-48DC-BD3F-750EC662C268}.Release|x64.Build.0 = Release|x64
{128E6F7A-578C-48DC-BD3F-750EC662C268}.Release|x86.ActiveCfg = Release|Win32
{128E6F7A-578C-48DC-BD3F-750EC662C268}.Release|x86.Build.0 = Release|Win32
{DB2DBB48-C807-4F7C-943E-385E77DF7BDE}.Debug_test|ARM.ActiveCfg = Debug|Any CPU
{DB2DBB48-C807-4F7C-943E-385E77DF7BDE}.Debug_test|ARM.Build.0 = Debug|Any CPU
{DB2DBB48-C807-4F7C-943E-385E77DF7BDE}.Debug_test|arm64.ActiveCfg = Debug|Any CPU
{DB2DBB48-C807-4F7C-943E-385E77DF7BDE}.Debug_test|arm64.Build.0 = Debug|Any CPU
{DB2DBB48-C807-4F7C-943E-385E77DF7BDE}.Debug_test|x64.ActiveCfg = Debug|Any CPU
{DB2DBB48-C807-4F7C-943E-385E77DF7BDE}.Debug_test|x64.Build.0 = Debug|Any CPU
{DB2DBB48-C807-4F7C-943E-385E77DF7BDE}.Debug_test|x86.ActiveCfg = Debug|Any CPU
{DB2DBB48-C807-4F7C-943E-385E77DF7BDE}.Debug_test|x86.Build.0 = Debug|Any CPU
{DB2DBB48-C807-4F7C-943E-385E77DF7BDE}.Debug|ARM.ActiveCfg = Debug|Any CPU
{DB2DBB48-C807-4F7C-943E-385E77DF7BDE}.Debug|ARM.Build.0 = Debug|Any CPU
{DB2DBB48-C807-4F7C-943E-385E77DF7BDE}.Debug|arm64.ActiveCfg = Debug|Any CPU
{DB2DBB48-C807-4F7C-943E-385E77DF7BDE}.Debug|arm64.Build.0 = Debug|Any CPU
{DB2DBB48-C807-4F7C-943E-385E77DF7BDE}.Debug|x64.ActiveCfg = Debug|Any CPU
{DB2DBB48-C807-4F7C-943E-385E77DF7BDE}.Debug|x64.Build.0 = Debug|Any CPU
{DB2DBB48-C807-4F7C-943E-385E77DF7BDE}.Debug|x86.ActiveCfg = Debug|Any CPU
{DB2DBB48-C807-4F7C-943E-385E77DF7BDE}.Debug|x86.Build.0 = Debug|Any CPU
{DB2DBB48-C807-4F7C-943E-385E77DF7BDE}.Release|ARM.ActiveCfg = Release|Any CPU
{DB2DBB48-C807-4F7C-943E-385E77DF7BDE}.Release|ARM.Build.0 = Release|Any CPU
{DB2DBB48-C807-4F7C-943E-385E77DF7BDE}.Release|arm64.ActiveCfg = Release|Any CPU
{DB2DBB48-C807-4F7C-943E-385E77DF7BDE}.Release|arm64.Build.0 = Release|Any CPU
{DB2DBB48-C807-4F7C-943E-385E77DF7BDE}.Release|x64.ActiveCfg = Release|Any CPU
{DB2DBB48-C807-4F7C-943E-385E77DF7BDE}.Release|x64.Build.0 = Release|Any CPU
{DB2DBB48-C807-4F7C-943E-385E77DF7BDE}.Release|x86.ActiveCfg = Release|Any CPU
{DB2DBB48-C807-4F7C-943E-385E77DF7BDE}.Release|x86.Build.0 = Release|Any CPU
{6B4C9F2E-6A2C-48AD-944B-49B9E9BF028D}.Debug_test|ARM.ActiveCfg = Debug|Any CPU
{6B4C9F2E-6A2C-48AD-944B-49B9E9BF028D}.Debug_test|ARM.Build.0 = Debug|Any CPU
{6B4C9F2E-6A2C-48AD-944B-49B9E9BF028D}.Debug_test|arm64.ActiveCfg = Debug|Any CPU
{6B4C9F2E-6A2C-48AD-944B-49B9E9BF028D}.Debug_test|arm64.Build.0 = Debug|Any CPU
{6B4C9F2E-6A2C-48AD-944B-49B9E9BF028D}.Debug_test|x64.ActiveCfg = Debug|Any CPU
{6B4C9F2E-6A2C-48AD-944B-49B9E9BF028D}.Debug_test|x64.Build.0 = Debug|Any CPU
{6B4C9F2E-6A2C-48AD-944B-49B9E9BF028D}.Debug_test|x86.ActiveCfg = Debug|Any CPU
{6B4C9F2E-6A2C-48AD-944B-49B9E9BF028D}.Debug_test|x86.Build.0 = Debug|Any CPU
{6B4C9F2E-6A2C-48AD-944B-49B9E9BF028D}.Debug|ARM.ActiveCfg = Debug|Any CPU
{6B4C9F2E-6A2C-48AD-944B-49B9E9BF028D}.Debug|ARM.Build.0 = Debug|Any CPU
{6B4C9F2E-6A2C-48AD-944B-49B9E9BF028D}.Debug|arm64.ActiveCfg = Debug|Any CPU
{6B4C9F2E-6A2C-48AD-944B-49B9E9BF028D}.Debug|arm64.Build.0 = Debug|Any CPU
{6B4C9F2E-6A2C-48AD-944B-49B9E9BF028D}.Debug|x64.ActiveCfg = Debug|Any CPU
{6B4C9F2E-6A2C-48AD-944B-49B9E9BF028D}.Debug|x64.Build.0 = Debug|Any CPU
{6B4C9F2E-6A2C-48AD-944B-49B9E9BF028D}.Debug|x86.ActiveCfg = Debug|Any CPU
{6B4C9F2E-6A2C-48AD-944B-49B9E9BF028D}.Debug|x86.Build.0 = Debug|Any CPU
{6B4C9F2E-6A2C-48AD-944B-49B9E9BF028D}.Release|ARM.ActiveCfg = Release|Any CPU
{6B4C9F2E-6A2C-48AD-944B-49B9E9BF028D}.Release|ARM.Build.0 = Release|Any CPU
{6B4C9F2E-6A2C-48AD-944B-49B9E9BF028D}.Release|arm64.ActiveCfg = Release|Any CPU
{6B4C9F2E-6A2C-48AD-944B-49B9E9BF028D}.Release|arm64.Build.0 = Release|Any CPU
{6B4C9F2E-6A2C-48AD-944B-49B9E9BF028D}.Release|x64.ActiveCfg = Release|Any CPU
{6B4C9F2E-6A2C-48AD-944B-49B9E9BF028D}.Release|x64.Build.0 = Release|Any CPU
{6B4C9F2E-6A2C-48AD-944B-49B9E9BF028D}.Release|x86.ActiveCfg = Release|Any CPU
{6B4C9F2E-6A2C-48AD-944B-49B9E9BF028D}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -1368,7 +1428,6 @@ Global
{10C52FD4-52FC-43B3-94AF-895C9B5A014C} = {3B0C114B-AC74-4BB1-975D-26FE5D505BD1}
{20C52FD5-62FD-53B4-A4A0-995C9B5A014D} = {4B0C114C-BC75-5BB2-A75E-36FE5D505BD2}
{AD0C90B0-4845-4D4B-88F1-86F653F8171B} = {67599AD5-51EC-44CB-85CE-B60CD8CBA270}
{E7D6B510-3761-478A-8E22-72558DAD924E} = {D3327F36-E161-4FED-A0F4-56F2B735827E}
{05CB5DBD-A481-4DFF-B1A3-642F049D165C} = {67599AD5-51EC-44CB-85CE-B60CD8CBA270}
{1B8EF049-A38E-43E4-B88E-F1EBFCEF07D2} = {05CB5DBD-A481-4DFF-B1A3-642F049D165C}
{395A71A1-4327-477B-85D4-AF0851732CCB} = {5654F115-F01A-495B-91C7-09408ABF14F0}
Expand Down Expand Up @@ -1615,6 +1674,11 @@ Global
{4F935F95-BCD6-4DEF-B897-7F5D8799206A} = {67599AD5-51EC-44CB-85CE-B60CD8CBA270}
{8CA62B44-3673-4037-8D9C-934D42904BB9} = {4F935F95-BCD6-4DEF-B897-7F5D8799206A}
{ABBC2446-9B41-4400-8CF6-AF2CF8C597B2} = {4F935F95-BCD6-4DEF-B897-7F5D8799206A}
{C0215617-A17B-45DB-9CDA-C46C0923DA55} = {D3327F36-E161-4FED-A0F4-56F2B735827E}
{128E6F7A-578C-48DC-BD3F-750EC662C268} = {C0215617-A17B-45DB-9CDA-C46C0923DA55}
{107794D7-4BE0-407E-A76C-EFA46D1E9F93} = {C0215617-A17B-45DB-9CDA-C46C0923DA55}
{DB2DBB48-C807-4F7C-943E-385E77DF7BDE} = {C0215617-A17B-45DB-9CDA-C46C0923DA55}
{6B4C9F2E-6A2C-48AD-944B-49B9E9BF028D} = {C0215617-A17B-45DB-9CDA-C46C0923DA55}
{10183D43-1785-443E-AEB7-C426FDF14964} = {05CB5DBD-A481-4DFF-B1A3-642F049D165C}
{804CD8D0-F381-4E1B-A5FD-E9D7CE788F55} = {67599AD5-51EC-44CB-85CE-B60CD8CBA270}
{675121BF-CABC-48E7-9C9D-4571BC507406} = {804CD8D0-F381-4E1B-A5FD-E9D7CE788F55}
Expand Down
Loading

0 comments on commit c46d28b

Please sign in to comment.