fixing packaging and runtests.ps1

Author: stevenbrix

eng/WpfArcadeSdk/tools/CreateTestPayload.targets

@@ -12,7 +12,7 @@
     <PayloadDrtLocation>$(WpfTestBasePayloadPath)DRT\</PayloadDrtLocation>
     <MicrosoftDotNetWpfTestPath>$(ArtifactsPackagingDir)\Microsoft.DotNet.Wpf.GitHub.Test\tools\</MicrosoftDotNetWpfTestPath>
   </PropertyGroup>
-
+  
   <!-- 
   Internal repo use only. When we package the infrastructure and DRTs over to dotnet-wpf-int. Allow that repo to add
   more DRTs to run. 
@@ -22,22 +22,20 @@
   <!-- List of DRTs to include that come from dotnet/wpf -->
   <Import Project="$(WpfArcadeSdkToolsDir)DrtsToRun.props"/>
 
-   <Choose>
-      <When Condition="!Exists('$(MicrosoftDotNetWpfTestPath)')">
-        <!-- Building in the external branch, we need to reference the test package-->
-        <ItemGroup>
-          <PackageReference Include="Microsoft.DotNet.Wpf.GitHub.Test" Version="$(MicrosoftDotNetWpfGitHubTestVersion)" GeneratePathProperty="true" />
-        </ItemGroup>
-
-        <PropertyGroup>
-          <MicrosoftDotNetWpfTestPath>$(PkgMicrosoft_DotNet_Wpf_GitHub_Test)\tools\</MicrosoftDotNetWpfTestPath>
-        </PropertyGroup>
-      </When>
-    </Choose>
-
-  <ItemGroup>
-  </ItemGroup>
-  
+  <Choose>
+    <When Condition="!Exists('$(MicrosoftDotNetWpfTestPath)')">
+      <!-- 
+        Building from internal repo where the test package must be consumed from the nuget package. We can't restore the package here because the Restore
+        targets aren't run for AfterSolutionBuild.proj. So instead we restore the package in Tools.props. And since only the Restore targets are run for Tools.proj,
+        the path property to the package isn't generated for us so we can't copy it to a well known location there. Instead we generate the path ourselves using
+        well known MSBuild properties available to the entire Build.proj project.
+      -->
+      <PropertyGroup>
+        <MicrosoftDotNetWpfTestPath>$(NuGetPackageRoot)\runtime.win-$(Platform).$(MicrosoftDotNetWpfGitHubTestPackage)\$(MicrosoftDotNetWpfGitHubTestVersion)\tools\</MicrosoftDotNetWpfTestPath>
+      </PropertyGroup>      
+    </When>
+  </Choose>
+
   <Target Name="CreateTestPayload" BeforeTargets="Test" AfterTargets="Build;CopyPackageAssets">
     <ItemGroup>
       <MicrosoftDotNetWpfTestContents Include="$(MicrosoftDotNetWpfTestPath)**\*.*" />
@@ -61,3 +59,4 @@
           DestinationFiles="@(DrtPayloadContents->'$(PayloadDrtLocation)%(RecursiveDir)%(Filename)%(Extension)')"  />
   </Target>
 </Project>
+  

eng/WpfArcadeSdk/tools/Packaging.targets

@@ -282,6 +282,13 @@ $(PreparePackageAssetsDependsOn):
         <Pack>true</Pack>
         <PackagePath>$(LibFolder)</PackagePath>
       </Content>
+      
+      <Content Include="$(ArtifactsPackagingDir)$(NormalizedPackageName)\$(LibFolder)\**\*.json"
+         Condition="('$(CreateArchNeutralPackage)'!='true' Or '$(IncludeAssembliesInArchNeutralPackage)'== 'true') and Exists('$(ArtifactsPackagingDir)$(NormalizedPackageName)\$(LibFolder)\')" >
+        <Pack>true</Pack>
+        <PackagePath>$(LibFolder)</PackagePath>
+      </Content>
+     
       <Content Include="$(ArtifactsPackagingDir)$(NormalizedPackageName)\$(LibFolder)\**\*.pdb"
          Condition="('$(CreateArchNeutralPackage)'!='true' Or '$(IncludeAssembliesInArchNeutralPackage)'== 'true') and Exists('$(ArtifactsPackagingDir)$(NormalizedPackageName)\$(LibFolder)\')" >
         <Pack>true</Pack>

eng/WpfArcadeSdk/tools/TestProjects.targets

@@ -40,7 +40,7 @@
           Include="$(Pkgruntime_win-x64_Microsoft_DotNet_Wpf_DncEng)\runtimes\$(RuntimeIdentifier)\native\*.dll"
           CopyToOutputDirectory="PreserveNewest"/>
     <None Condition="'$(RuntimeIdentifier)'=='win-x86'"
-           Include="$(Pkgruntime_win-x86_Microsoft_DotNet_Wpf_DncEng)\runtimes\$(RuntimeIdentifier)\native\*.dll"
+          Include="$(Pkgruntime_win-x86_Microsoft_DotNet_Wpf_DncEng)\runtimes\$(RuntimeIdentifier)\native\*.dll"
           CopyToOutputDirectory="PreserveNewest"/>
 
     <_wpfProjectsNotWindowsBaseNotNative Include="@(WpfProjectPath)" Exclude="WindowsBase;PresentationNative_cor3;WpfGfx_cor3;PenImc_cor3" />
@@ -68,15 +68,12 @@
       <OutputItemType>_windowsBaseAssemblyLocallyBuiltPath</OutputItemType>
     </ProjectReference>
 
-    <!-- 
-    ProjectReference to a native project fails from a .csproj
     <ProjectReference Include="@(_wpfNativeProjects->'%(ProjectPath)')" >
       <Private>True</Private>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <OutputItemType>Content</OutputItemType>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </ProjectReference>
-    -->
   </ItemGroup>
 
   <PropertyGroup Condition="'$(WpfTest)'=='true' or '$(IsTestProject)'=='true'">

eng/WpfArcadeSdk/tools/WpfProjectReference.targets

@@ -42,11 +42,9 @@
     <WpfProjectPath Include="UIAutomationClient" ProjectPath="$(WpfSourceDir)UIAutomation\UIAutomationClient\UIAutomationClient.csproj" />
     <WpfProjectPath Include="UIAutomationClientSideProviders" ProjectPath="$(WpfSourceDir)UIAutomation\UIAutomationClientSideProviders\UIAutomationClientSideProviders.csproj" />
 
-<!--
     <WpfProjectPath Include="PresentationNative_cor3" ProjectPath="$(WpfSourceDir)PresentationNative\dll\PresentationNative.vcxproj" />
     <WpfProjectPath Include="WpfGfx_cor3" ProjectPath="$(WpfSourceDir)WpfGfx\core\dll\WpfGfx.vcxproj" />
     <WpfProjectPath Include="PenImc_cor3" ProjectPath="$(WpfSourceDir)PenImc\dll\PenImc.vcxproj" />
-  -->
   </ItemGroup>
 
   <PropertyGroup>

eng/WpfArcadeSdk/tools/runtests.ps1

@@ -24,8 +24,8 @@ $testLocation = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Pat
 if (Test-Path "$testLocation\QV.cmd")
 {
     $args = if ($waitForDebugger) { "/debugtests /waitForDebugger"}
-    $args += if ($debugSti) { "/debugSti" }
-    $args += if ($debugQV) { "/debugQV" }
+    $args += if ($debugSti) { " /debugSti" }
+    $args += if ($debugQV) { " /debugQV" }
     # We invoke QV directly instead of rundrts to prevent the "RunDrtReport" script being generated. 
     Invoke-Expression "$testLocation\QV.cmd Run /DiscoveryInfoPath=$testLocation\DiscoveryInfoDrts.xml /RunDirectory=$env:AppData\QualityVault\Run $command $args"
 }