Remove unused Shared Project property and use None include to display.

Author: michael-hawker

UITests/UITests.App/UITests.App.csproj

@@ -27,6 +27,7 @@
     <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
     <GenerateAppxPackageOnBuild>true</GenerateAppxPackageOnBuild>
     <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
+    <IsTestHost>true</IsTestHost>
   </PropertyGroup>
   <Target Name="Pack">
   </Target>

UITests/UITests.Tests.Shared/UITests.Tests.Shared.projitems

@@ -11,7 +11,7 @@
 
   <Choose>
     <!-- When we're in the test harness include all '*Test.cs' files -->
-    <When Condition="'$(IsTestHarness)' == 'true' or '$(IsSharedProject)' == 'true'">
+    <When Condition="'$(IsTestHarness)' == 'true'">
       <ItemGroup>
         <Compile Include="**\*Test.cs" Exclude="**\bin\**\*Test.cs;**\obj\**\*Test.cs"/>
         <!-- Base test helpers -->
@@ -24,11 +24,22 @@
 
   <Choose>
     <!-- When we're in the UI app used by the test harness, include all the pages -->
-    <When Condition="'$(IsTestHarness)' != 'true' or '$(IsSharedProject)' == 'true'">
+    <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)" />
       </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)" />
+    <!-- Base test helpers -->
+    <None Include="$(MSBuildThisFileDirectory)UITest.cs" />
+    <None Include="$(MSBuildThisFileDirectory)TestAssembly.cs" />
+    <None Include="$(MSBuildThisFileDirectory)TestPageAttribute.cs" />
+  </ItemGroup>
 </Project>

UITests/UITests.Tests.Shared/UITests.Tests.Shared.shproj

@@ -3,8 +3,6 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>1d8b0260-5c17-41da-9c38-1e37441b3925</ProjectGuid>
     <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
-
-    <IsSharedProject>true</IsSharedProject>
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />