WIP - Update Shared Project to Properly Include Files for Intellisense/VS to work

michael-hawker · michael-hawker · commit ec9d0c924713 · 2020-11-20T15:58:36.000-08:00
Fix some StyleCop Issues
Apply XAML Styler

TODO: Page xbfs aren't dropping to the right location to build UWP app now.
diff --git a/UITests/UITests.Tests.MSTest/MSTestInterop.cs b/UITests/UITests.Tests.MSTest/MSTestInterop.cs
@@ -11,6 +11,7 @@ namespace UITests.Tests
     // TAEF has a different terms for the same concepts as compared with MSTest.
     // In order to allow both to use the same test files, we'll define these helper classes
     // to translate TAEF into MSTest.
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1649:File name should match first type name", Justification = "Shim helpers")]
     public static class Log
     {
         public static void Comment(string format, params object[] args)
@@ -41,6 +42,7 @@ private static void LogMessage(string format, object[] args)
         }
     }
 
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1402:File may only contain a single type", Justification = "Shim helpers.")]
     public static class LogController
     {
         public static void InitializeLogging()
@@ -49,6 +51,7 @@ public static void InitializeLogging()
         }
     }
 
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1402:File may only contain a single type", Justification = "Shim helpers.")]
     public static class Verify
     {
         // TODO: implement
diff --git a/UITests/UITests.Tests.Shared/Controls/TextBoxMaskTest.cs b/UITests/UITests.Tests.Shared/Controls/TextBoxMaskTest.cs
@@ -17,7 +17,7 @@
 namespace UITests.Tests
 {
     [TestClass]
-    public class TextBoxMask : UITest
+    public class TextBoxMaskTest : UITestBase
     {
         [ClassInitialize]
         [TestProperty("RunAs", "User")]
diff --git a/UITests/UITests.Tests.Shared/Controls/TextBoxMaskTestPage.xaml b/UITests/UITests.Tests.Shared/Controls/TextBoxMaskTestPage.xaml
@@ -1,51 +1,47 @@
-﻿<Page
-    x:Class="UITests.App.Pages.TextBoxMaskTestPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:extensions="using:Microsoft.Toolkit.Uwp.UI.Extensions"
-    mc:Ignorable="d"
-    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-    <Grid HorizontalAlignment="Center" VerticalAlignment="Center">
+﻿<Page x:Class="UITests.App.Pages.TextBoxMaskTestPage"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+      xmlns:extensions="using:Microsoft.Toolkit.Uwp.UI.Extensions"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+      Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
+      mc:Ignorable="d">
+    <Grid HorizontalAlignment="Center"
+          VerticalAlignment="Center">
         <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="10"/>
-            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="10" />
+            <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="10"/>
-            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="10" />
+            <ColumnDefinition Width="Auto" />
         </Grid.ColumnDefinitions>
-        <Button 
-            x:Name="ChangeButton" 
-            Content="Change Target Value"
-            Click="ChangeButton_Click"
-            Grid.Column="0" Grid.Row="0"
-            />
-        <TextBox 
-            x:Name="TextBox"
-            Width="120"
-	        Padding="0,4,0,0"
-            VerticalAlignment="Center"
-            extensions:TextBoxMask.CustomMask="5:[0-5]"
-            extensions:TextBoxMask.Mask="99:59:59"
-            TextAlignment="Center"
-            Text="{x:Bind Value, Mode=OneWay}"
-            Grid.Column="2" Grid.Row="0"
-            />
-        <TextBlock 
-            x:Name="InitialValueTextBlock"
-            Text="{x:Bind InitialValue}"
-            HorizontalAlignment="Center"
-            Grid.Column="0" Grid.Row="2"
-            />
-        <TextBlock
-            x:Name="NewValueTextBlock"
-            Text="{x:Bind NewValue}"
-            HorizontalAlignment="Center"
-            Grid.Column="2" Grid.Row="2"
-            />
+        <Button x:Name="ChangeButton"
+                Grid.Row="0"
+                Grid.Column="0"
+                Click="ChangeButton_Click"
+                Content="Change Target Value" />
+        <TextBox x:Name="TextBox"
+                 Grid.Row="0"
+                 Grid.Column="2"
+                 Width="120"
+                 Padding="0,4,0,0"
+                 VerticalAlignment="Center"
+                 extensions:TextBoxMask.CustomMask="5:[0-5]"
+                 extensions:TextBoxMask.Mask="99:59:59"
+                 Text="{x:Bind Value, Mode=OneWay}"
+                 TextAlignment="Center" />
+        <TextBlock x:Name="InitialValueTextBlock"
+                   Grid.Row="2"
+                   Grid.Column="0"
+                   HorizontalAlignment="Center"
+                   Text="{x:Bind InitialValue}" />
+        <TextBlock x:Name="NewValueTextBlock"
+                   Grid.Row="2"
+                   Grid.Column="2"
+                   HorizontalAlignment="Center"
+                   Text="{x:Bind NewValue}" />
     </Grid>
 </Page>
diff --git a/UITests/UITests.Tests.Shared/Examples/SimpleTest.cs b/UITests/UITests.Tests.Shared/Examples/SimpleTest.cs
@@ -17,7 +17,7 @@
 namespace UITests.Tests
 {
     [TestClass]
-    public class SimpleTest : UITest
+    public class SimpleTest : UITestBase
     {
         [ClassInitialize]
         [TestProperty("RunAs", "User")]
diff --git a/UITests/UITests.Tests.Shared/Examples/SimpleTestPage.xaml b/UITests/UITests.Tests.Shared/Examples/SimpleTestPage.xaml
@@ -1,4 +1,4 @@
-﻿<Page x:Class="UITests.App.Pages.SimpleTest"
+﻿<Page x:Class="UITests.App.Pages.SimpleTestPage"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
diff --git a/UITests/UITests.Tests.Shared/Examples/SimpleTestPage.xaml.cs b/UITests/UITests.Tests.Shared/Examples/SimpleTestPage.xaml.cs
@@ -12,7 +12,7 @@ namespace UITests.App.Pages
     /// </summary>
     public sealed partial class SimpleTestPage : Page
     {
-        public SimpleTest()
+        public SimpleTestPage()
         {
             this.InitializeComponent();
         }
diff --git a/UITests/UITests.Tests.Shared/UITestBase.cs b/UITests/UITests.Tests.Shared/UITestBase.cs
@@ -20,10 +20,8 @@
 
 namespace UITests.Tests
 {
-    public abstract class UITest
+    public abstract class UITestBase
     {
-        public TestContext TestContext { get; set; }
-
         public static TestApplicationInfo WinUICsUWPSampleApp
         {
             get
@@ -78,6 +76,7 @@ public static TestSetupHelper.TestSetupHelperOptions TestSetupHelperOptions
             }
         }
 
+        public TestContext TestContext { get; set; }
 
         [TestInitialize]
         public void TestInitalize()
diff --git a/UITests/UITests.Tests.Shared/UITests.Tests.Shared.projitems b/UITests/UITests.Tests.Shared/UITests.Tests.Shared.projitems
@@ -13,9 +13,9 @@
     <!-- When we're in the test harness include all '*Test.cs' files -->
     <When Condition="'$(IsTestHarness)' == 'true'">
       <ItemGroup>
-        <Compile Include="**\*Test.cs" Exclude="**\bin\**\*Test.cs;**\obj\**\*Test.cs"/>
+        <Compile Include="$(MSBuildThisFileDirectory)**\*Test.cs" Exclude="**\bin\**\*Test.cs;**\obj\**\*Test.cs"/>
         <!-- Base test helpers -->
-        <Compile Include="$(MSBuildThisFileDirectory)UITest.cs" />
+        <Compile Include="$(MSBuildThisFileDirectory)UITestBase.cs" />
         <Compile Include="$(MSBuildThisFileDirectory)TestAssembly.cs" />
         <Compile Include="$(MSBuildThisFileDirectory)TestPageAttribute.cs" />
       </ItemGroup>
@@ -26,19 +26,19 @@
     <!-- When we're in the UI app used by the test harness, include all the pages -->
     <When Condition="'$(IsTestHost)' == 'true'">
       <ItemGroup>
-        <Page Include="**\*Page.xaml" Exclude="**\bin\**\*Page.xaml;**\obj\**\*Page.xaml" SubType="Designer" Generator="MSBuild:Compile" />
-        <Compile Include="**\*Page.xaml.cs" DependentUpon="%(Filename)" />
+        <Page Include="$(MSBuildThisFileDirectory)**\*Page.xaml" Exclude="**\bin\**\*Page.xaml;**\obj\**\*Page.xaml" SubType="Designer" Generator="MSBuild:Compile" />
+        <Compile Include="$(MSBuildThisFileDirectory)**\*Page.xaml.cs" DependentUpon="%(Filename)" />
       </ItemGroup>
     </When>
   </Choose>
 
   <!-- Have a None Include as well to make all items visible in VS in the Shared Project -->
   <ItemGroup>
-    <None Include="**\*Test.cs" Exclude="**\bin\**\*Test.cs;**\obj\**\*Test.cs"/>
-    <None Include="**\*Page.xaml" Exclude="**\bin\**\*Page.xaml;**\obj\**\*Page.xaml" SubType="Designer" Generator="MSBuild:Compile" />
-    <None Include="**\*Page.xaml.cs" DependentUpon="%(Filename)" />
+    <None Include="$(MSBuildThisFileDirectory)**\*Test.cs" Exclude="**\bin\**\*Test.cs;**\obj\**\*Test.cs"/>
+    <None Include="$(MSBuildThisFileDirectory)**\*Page.xaml" Exclude="**\bin\**\*Page.xaml;**\obj\**\*Page.xaml" SubType="Designer" Generator="MSBuild:Compile" />
+    <None Include="$(MSBuildThisFileDirectory)**\*Page.xaml.cs" DependentUpon="%(Filename)" />
     <!-- Base test helpers -->
-    <None Include="$(MSBuildThisFileDirectory)UITest.cs" />
+    <None Include="$(MSBuildThisFileDirectory)UITestBase.cs" />
     <None Include="$(MSBuildThisFileDirectory)TestAssembly.cs" />
     <None Include="$(MSBuildThisFileDirectory)TestPageAttribute.cs" />
   </ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ namespace UITests.Tests`
`11`	`11`	`// TAEF has a different terms for the same concepts as compared with MSTest.`
`12`	`12`	`// In order to allow both to use the same test files, we'll define these helper classes`
`13`	`13`	`// to translate TAEF into MSTest.`
	`14`	`+ [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1649:File name should match first type name", Justification = "Shim helpers")]`
`14`	`15`	`public static class Log`
`15`	`16`	`{`
`16`	`17`	`public static void Comment(string format, params object[] args)`
`@@ -41,6 +42,7 @@ private static void LogMessage(string format, object[] args)`
`41`	`42`	`}`
`42`	`43`	`}`
`43`	`44`
	`45`	`+ [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1402:File may only contain a single type", Justification = "Shim helpers.")]`
`44`	`46`	`public static class LogController`
`45`	`47`	`{`
`46`	`48`	`public static void InitializeLogging()`
`@@ -49,6 +51,7 @@ public static void InitializeLogging()`
`49`	`51`	`}`
`50`	`52`	`}`
`51`	`53`
	`54`	`+ [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1402:File may only contain a single type", Justification = "Shim helpers.")]`
`52`	`55`	`public static class Verify`
`53`	`56`	`{`
`54`	`57`	`// TODO: implement`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`namespace UITests.Tests`
`18`	`18`	`{`
`19`	`19`	`[TestClass]`
`20`		`- public class TextBoxMask : UITest`
	`20`	`+ public class TextBoxMaskTest : UITestBase`
`21`	`21`	`{`
`22`	`22`	`[ClassInitialize]`
`23`	`23`	`[TestProperty("RunAs", "User")]`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<Page x:Class="UITests.App.Pages.SimpleTest"`
	`1`	`+<Page x:Class="UITests.App.Pages.SimpleTestPage"`
`2`	`2`	`xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"`
`3`	`3`	`xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"`
`4`	`4`	`xmlns:d="http://schemas.microsoft.com/expression/blend/2008"`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ namespace UITests.App.Pages`
`12`	`12`	`/// </summary>`
`13`	`13`	`public sealed partial class SimpleTestPage : Page`
`14`	`14`	`{`
`15`		`- public SimpleTest()`
	`15`	`+ public SimpleTestPage()`
`16`	`16`	`{`
`17`	`17`	`this.InitializeComponent();`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,10 +20,8 @@`
`20`	`20`
`21`	`21`	`namespace UITests.Tests`
`22`	`22`	`{`
`23`		`- public abstract class UITest`
	`23`	`+ public abstract class UITestBase`
`24`	`24`	`{`
`25`		`- public TestContext TestContext { get; set; }`
`26`		`-`
`27`	`25`	`public static TestApplicationInfo WinUICsUWPSampleApp`
`28`	`26`	`{`
`29`	`27`	`get`
`@@ -78,6 +76,7 @@ public static TestSetupHelper.TestSetupHelperOptions TestSetupHelperOptions`
`78`	`76`	`}`
`79`	`77`	`}`
`80`	`78`
	`79`	`+ public TestContext TestContext { get; set; }`
`81`	`80`
`82`	`81`	`[TestInitialize]`
`83`	`82`	`public void TestInitalize()`