From de9098a7c4619c66f8c2a0cdb5d25bc74462b2b3 Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Tue, 23 Apr 2019 15:24:54 -0700
Subject: [PATCH 01/72] adding initial helix support

note: this definitely won't work, it's just some basic initial infrastructure for us to build on once we have a better idea of what to do

use dummy HelixWorkItem initially

updating pipeline.yml

fix Release only condition
---
 eng/Build.props                       |   8 ++
 eng/Version.Details.xml               |   4 +
 eng/helix/configure-helix-machine.ps1 |  18 ++++
 eng/helix/helixpublish.proj           | 127 ++++++++++++++++++++++++++
 eng/helix/prepare-helix-payload.ps1   |  51 +++++++++++
 eng/helix/runtests.cmd                |   5 +
 eng/pipeline.yml                      |  66 ++++++++++++-
 eng/pre-build.ps1                     |   7 ++
 global.json                           |   3 +-
 9 files changed, 287 insertions(+), 2 deletions(-)
 create mode 100644 eng/Build.props
 create mode 100644 eng/helix/configure-helix-machine.ps1
 create mode 100644 eng/helix/helixpublish.proj
 create mode 100644 eng/helix/prepare-helix-payload.ps1
 create mode 100644 eng/helix/runtests.cmd
 create mode 100644 eng/pre-build.ps1

diff --git a/eng/Build.props b/eng/Build.props
new file mode 100644
index 00000000000..da83de21674
--- /dev/null
+++ b/eng/Build.props
@@ -0,0 +1,8 @@
+<Project>
+    <!-- Workarounds for Arcade bug: https://github.com/dotnet/arcade/issues/2641 -->
+    <PropertyGroup Condition="'$(_HelixSource)'!=''">
+        <_NuGetRestoreTargets>$(MSBuildToolsPath32)\..\..\..\Common7\IDE\CommonExtensions\Microsoft\NuGet\NuGet.targets</_NuGetRestoreTargets>
+        <NuGetRestoreTargets>true</NuGetRestoreTargets>
+        <DisableImplicitNETCorePlatformsReference>true</DisableImplicitNETCorePlatformsReference>
+    </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 75c429b0092..4fe84c9faec 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -95,5 +95,9 @@
       <Uri>https://github.com/dotnet/coreclr</Uri>
       <Sha>89df4b9d928c7f21550d487328f5db000a498bdf</Sha>
     </Dependency>
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19222.2">
+      <Uri>https://github.com/dotnet/arcade</Uri>
+      <Sha>851e36df83d3361e4bd8a70a2a8a89f762469f9a</Sha>
+    </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/helix/configure-helix-machine.ps1 b/eng/helix/configure-helix-machine.ps1
new file mode 100644
index 00000000000..3790623965a
--- /dev/null
+++ b/eng/helix/configure-helix-machine.ps1
@@ -0,0 +1,18 @@
+# This file prepares the helix machine for our tests runs
+
+$dotnetLocation = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "dotnet"
+
+Write-Output "Adding dotnet location to path: $dotnetLocation"
+Write-Output "Path before: $env:path"
+# Prepend the path to ensure that dotnet.exe is called from there.
+$env:path="$dotnetLocation;$env:path"
+
+Write-Output "Path after: $env:path"
+# Don't look outside the TestHost to resolve best match SDKs.
+$env:DOTNET_MULTILEVEL_LOOKUP = 0
+
+# Disable first run since we do not need all ASP.NET packages restored.
+$env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
+
+# Ensure that the dotnet installed at our dotnetLocation is used
+$env:DOTNET_ROOT=$dotnetLocation
\ No newline at end of file
diff --git a/eng/helix/helixpublish.proj b/eng/helix/helixpublish.proj
new file mode 100644
index 00000000000..819ddbc4a93
--- /dev/null
+++ b/eng/helix/helixpublish.proj
@@ -0,0 +1,127 @@
+
+<Project Sdk="Microsoft.DotNet.Helix.Sdk" DefaultTargets="Test">
+  <PropertyGroup>
+    <!-- These properties help ensure proper and consistent restore behavior -->
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <RestorePackagesPath>$(MSBuildThisFileDirectory)packages</RestorePackagesPath>
+    
+    
+    <!-- We copy our own dotnet payload over to the machine, so we don't want/need a different dotnet install -->
+    <IncludeDotNetCli>false</IncludeDotNetCli>
+    <EnableXUnitReporter>true</EnableXUnitReporter>
+    <EnableAzurePipelinesReporter>true</EnableAzurePipelinesReporter>
+    <FailOnMissionControlTestFailure>true</FailOnMissionControlTestFailure>
+    <HelixPreCommands>$(HelixPreCommands);</HelixPreCommands>
+
+    <!-- These help ensure proper restore behavior for Microsoft.NETCore.Platforms -->
+    <DisableImplicitNETCorePlatformsReference>true</DisableImplicitNETCorePlatformsReference>
+    <RestoreSources>
+      $(RestoreSources);
+      https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json
+    </RestoreSources>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <!--<PackageReference Include="QV.Wpf.Test" Version="1.0.0" /> -->
+    <HelixCorrelationPayload Include="..\..\HelixPayload\$(Configuration)\$(Platform)" /> 
+    <HelixWorkItem Include="HelloHelix">
+      <Timeout>00:20:00</Timeout>
+      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd</Command>
+    </HelixWorkItem>
+    <!--<HelixWorkItem Include="Ping stevenki">
+      <Timeout>00:20:00</Timeout>
+      <Command>ping \\stevenki1\public</Command>
+    </HelixWorkItem>
+    -->
+   <!-- 
+   <HelixWorkItem Include="Annotations">
+      <Timeout>00:20:00</Timeout>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=Annotations</Command>
+    </HelixWorkItem>
+    <HelixWorkItem Include="AppModel">
+      <Timeout>00:20:00</Timeout>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=AppModel</Command>
+    </HelixWorkItem>
+    <HelixWorkItem Include="DigitalDocuments">
+      <Timeout>00:20:00</Timeout>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=DigitalDocuments</Command>
+    </HelixWorkItem>
+    <HelixWorkItem Include="Media">
+      <Timeout>00:20:00</Timeout>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=Media</Command>
+    </HelixWorkItem>
+    <HelixWorkItem Include="Editing">
+      <Timeout>00:20:00</Timeout>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=Editing</Command>
+    </HelixWorkItem>
+    <HelixWorkItem Include="ElementServices">
+      <Timeout>00:20:00</Timeout>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=ElementServices</Command>
+    </HelixWorkItem>
+    <HelixWorkItem Include="Text">
+      <Timeout>00:20:00</Timeout>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=Text</Command>
+    </HelixWorkItem>
+    <HelixWorkItem Include="Animation">
+      <Timeout>00:20:00</Timeout>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=Animation</Command>
+    </HelixWorkItem>
+    <HelixWorkItem Include="3D">
+      <Timeout>00:20:00</Timeout>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=3D</Command>
+    </HelixWorkItem>
+    <HelixWorkItem Include="2D">
+      <Timeout>00:20:00</Timeout>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=2D</Command>
+    </HelixWorkItem>
+    <HelixWorkItem Include="Controls">
+      <Timeout>00:20:00</Timeout>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=Controls</Command>
+    </HelixWorkItem>
+    <HelixWorkItem Include="Imaging">
+      <Timeout>00:20:00</Timeout>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=Imaging</Command>
+    </HelixWorkItem>
+    <HelixWorkItem Include="FlowLayout">
+      <Timeout>00:20:00</Timeout>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=FlowLayout</Command>
+    </HelixWorkItem>
+    <HelixWorkItem Include="DataServices">
+      <Timeout>00:20:00</Timeout>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=DataServices</Command>
+    </HelixWorkItem>
+    <HelixWorkItem Include="ElementLayout">
+      <Timeout>00:20:00</Timeout>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=ElementLayout</Command>
+    </HelixWorkItem>
+    <HelixWorkItem Include="Xaml">
+      <Timeout>00:20:00</Timeout>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=Xaml</Command>
+    </HelixWorkItem>
+    <HelixWorkItem Include="Globalization">
+      <Timeout>00:20:00</Timeout>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=Globalization</Command>
+    </HelixWorkItem>
+    <HelixWorkItem Include="Tablet">
+      <Timeout>00:20:00</Timeout>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=Tablet</Command>
+    </HelixWorkItem>
+    <HelixWorkItem Include="Integration">
+      <Timeout>00:20:00</Timeout>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=Integration</Command>
+    </HelixWorkItem>
+    <HelixWorkItem Include="XET">
+      <Timeout>00:20:00</Timeout>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=XET</Command>
+    </HelixWorkItem>
+    <HelixWorkItem Include="Printing">
+      <Timeout>00:20:00</Timeout>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=Printing</Command>
+    </HelixWorkItem>
+    <HelixWorkItem Include="WindowsFormsIntegration">
+      <Timeout>00:20:00</Timeout>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=WindowsFormsIntegration</Command>
+    </HelixWorkItem>
+    -->
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/eng/helix/prepare-helix-payload.ps1 b/eng/helix/prepare-helix-payload.ps1
new file mode 100644
index 00000000000..8339d9a6782
--- /dev/null
+++ b/eng/helix/prepare-helix-payload.ps1
@@ -0,0 +1,51 @@
+[CmdLetBinding()]
+Param(
+    [string]$platform,
+    [string]$configuration
+)
+
+$payloadDir = "HelixPayload\$configuration\$platform"
+
+$nugetPackagesDir = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "packages"
+
+# TODO: Once we have the nuget package from the dotnet-wpf-test, we can better understand what we 
+# need to do here.
+# Create the payload directory. Remove it if it already exists.
+if(Test-Path $payloadDir)
+{
+    Remove-Item $payloadDir -Recurse
+}
+New-Item -ItemType Directory -Force -Path $payloadDir
+
+function CopyFolderStructure($from, $to)
+{
+    if(Test-Path $to)
+    {
+        Remove-Item $to -Recurse
+    }
+    New-Item -ItemType Directory -Force -Path $to
+
+    if (Test-Path $from)
+    {
+        Get-ChildItem $from | Copy-Item -Destination $to -Recurse 
+    }
+    else
+    {
+        Write-Output "Location doesn't exist: $from"
+    }
+
+}
+
+# Copy files from nuget packages
+$testNugetLocation = Join-Path $nugetPackagesDir "qv.wpf.test\1.0.0\tools\win-$platform\"
+$testPayloadLocation = Join-Path $payloadDir "Test"
+CopyFolderStructure $testNugetLocation $testPayloadLocation
+
+# Copy local dotnet install
+$localDotnetInstall = Join-Path $env:BUILD_SOURCESDIRECTORY '.dotnet'
+$dotnetPayloadLocation = Join-Path $payloadDir "dotnet"
+CopyFolderStructure $localDotnetInstall $dotnetPayloadLocation
+
+# Copy scripts
+Copy-Item "eng\helix\configure-helix-machine.ps1" $payloadDir
+Copy-Item "eng\helix\runtests.cmd" $payloadDir
\ No newline at end of file
diff --git a/eng/helix/runtests.cmd b/eng/helix/runtests.cmd
new file mode 100644
index 00000000000..ef3923df0df
--- /dev/null
+++ b/eng/helix/runtests.cmd
@@ -0,0 +1,5 @@
+@echo off
+powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0configure-helix-machine.ps1""" "
+exit /b %ErrorLevel%
+
+dotnet --info
\ No newline at end of file
diff --git a/eng/pipeline.yml b/eng/pipeline.yml
index 0a0d445c293..e2f05cb5eda 100644
--- a/eng/pipeline.yml
+++ b/eng/pipeline.yml
@@ -11,6 +11,7 @@ parameters:
   # Needed because runAsPublic is used in template expressions, which can't read from user-defined variables
   # Defaults to true
   runAsPublic: true
+  repoName: dotnet/wpf
 
 jobs:
 - template: /eng/common/templates/jobs/jobs.yml
@@ -21,7 +22,7 @@ jobs:
     enablePublishBuildAssets: true
     enablePublishUsingPipelines: $(_PublishUsingPipelines)
     enableTelemetry: true
-    helixRepo: dnceng/wpf
+    helixRepo: $(repoName)
 
     jobs:
     - job: Windows_NT
@@ -48,6 +49,16 @@ jobs:
           value: x86
         - name: _PlatformArgs
           value: /p:Platform=$(_Platform)
+        - name: _TestHelixAgentPool
+          value: 'Windows.10.Amd64.Open'
+        - name: _HelixStagingDir
+          value: $(BUILD.STAGINGDIRECTORY)\helix\functests
+        - name: _HelixSource
+          value: ${{ parameters.repoName }}/$(Build.SourceBranch)
+        - name: _HelixToken
+          value: ''
+        - name: _HelixCreator
+          value: ${{ parameters.repoName }}
 
         # Override some values if we're building internally
         - ${{ if eq(parameters.runAsPublic, 'false') }}:
@@ -60,6 +71,7 @@ jobs:
             value: true
           - group: DotNet-Blob-Feed
           - group: DotNet-Symbol-Server-Pats
+          - group: DotNet-HelixApi-Access
           - name: _PublishBlobFeedUrl
             value: https://dotnetfeed.blob.core.windows.net/dotnet-windowsdesktop/index.json
 
@@ -78,6 +90,12 @@ jobs:
               /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat)
           - name: _OfficialBuildIdArgs
             value: /p:OfficialBuildId=$(BUILD.BUILDNUMBER)
+          - name: _HelixSource
+            value: official/${{ parameters.repoName }}/$(Build.SourceBranch)
+          - name: _HelixToken
+            value: '$(HelixApiAccessToken)' # from DotNet-HelixApi-Access group
+          - name: _HelixCreator
+            value: '' #if _HelixToken is set, Creator must be empty
       strategy:
         matrix:
           Build_Debug_x86:
@@ -101,6 +119,11 @@ jobs:
       steps:
       - checkout: self
         clean: true
+      
+      # Set VSO Variable(s)
+      - powershell: eng\pre-build.ps1
+        displayName: Pre-Build - Set VSO Variables
+
       # Use utility script to run script command dependent on agent OS.
       - script: eng\common\cibuild.cmd
           -configuration $(_BuildConfig) 
@@ -110,3 +133,44 @@ jobs:
           $(_OfficialBuildIdArgs)
           $(_PlatformArgs)
         displayName: Windows Build / Publish
+
+      - powershell: eng\common\build.ps1
+          -restore
+          -configuration $(_BuildConfig) 
+          $(_OfficialBuildIdArgs)
+          $(_PlatformArgs)
+          -projects $(Build.SourcesDirectory)\eng\helix\helixpublish.proj
+        displayName: Restoring Nuget Dependencies for Helix
+        env:
+          SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+          HelixSource: $(_HelixSource)
+          HelixType: 'tests/drt'
+          HelixBuild: $(Build.BuildNumber)
+          HelixTargetQueues: $(_TestHelixAgentPool)
+          HelixAccessToken: $(_HelixToken)              # only defined for internal CI
+          Creator: $(_HelixCreator)
+        condition: and(succeeded(), eq(variables['_BuildConfig'], 'Release')) # on helix machine (with real signing)
+
+      # Prepare the helix payload
+      - powershell: eng\helix\prepare-helix-payload.ps1
+         -configuration $(_BuildConfig) -platform $(_Platform)
+        displayName: Preparing Helix Payload
+        condition: and(succeeded(), eq(variables['_BuildConfig'], 'Release')) # on helix machine (with real signing)
+
+      # Run DRTs
+      - powershell: eng\common\cibuild.cmd
+          -configuration $(_BuildConfig)
+          $(_OfficialBuildIdArgs) 
+          $(_PlatformArgs)
+          -projects $(Build.SourcesDirectory)\eng\helix\helixpublish.proj
+          /bl:$(BUILD.SOURCESDIRECTORY)\artifacts\log\$(_BuildConfig)\HelixUnit.binlog
+        displayName: Run Developer Regression Tests on Helix Machine (Release)
+        env:
+          HelixSource: $(_HelixSource)
+          HelixType: 'tests/drt'
+          HelixBuild: $(Build.BuildNumber)
+          HelixTargetQueues: $(_TestHelixAgentPool)
+          HelixAccessToken: $(_HelixToken)              # only defined for internal CI
+          Creator: $(_HelixCreator)
+          SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+        condition: and(succeeded(), eq(variables['_BuildConfig'], 'Release')) # on helix machine (with real signing)
diff --git a/eng/pre-build.ps1 b/eng/pre-build.ps1
new file mode 100644
index 00000000000..baad60ccbd9
--- /dev/null
+++ b/eng/pre-build.ps1
@@ -0,0 +1,7 @@
+# Open global.json
+$globaljsonpath = Join-Path $env:BUILD_SOURCESDIRECTORY 'global.json'
+$jsondata = Get-Content -Raw -Path $globaljsonpath | ConvertFrom-Json
+
+# Set DotNetCliVersion to global.json.tools.dotnet
+$dotnetcliver = $jsondata.tools.dotnet
+Write-Host "##vso[task.setvariable variable=DotNetCliVersion;]$dotnetcliver"
\ No newline at end of file
diff --git a/global.json b/global.json
index e355737c6e8..cdb96d0bd38 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,8 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19304.23"
+    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19304.23",
+    "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19222.2"
   },
   "native-tools": {
     "strawberry-perl": "5.28.1.1-1"

From 70a4fb28b6ede65f1deedc70d28960656ffeda43 Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Thu, 2 May 2019 15:43:07 -0700
Subject: [PATCH 02/72] move to using Microsoft.DotNet.Wpf.DncEng.Test package
 name

---
 eng/helix/configure-helix-machine.ps1 | 11 +++++------
 eng/helix/helixpublish.proj           | 26 ++++++++++----------------
 eng/helix/helixrun.cmd                | 12 ++++++++++++
 eng/helix/prepare-helix-payload.ps1   |  4 ++--
 eng/helix/runtests.cmd                |  5 -----
 5 files changed, 29 insertions(+), 29 deletions(-)
 create mode 100644 eng/helix/helixrun.cmd
 delete mode 100644 eng/helix/runtests.cmd

diff --git a/eng/helix/configure-helix-machine.ps1 b/eng/helix/configure-helix-machine.ps1
index 3790623965a..4074e20679f 100644
--- a/eng/helix/configure-helix-machine.ps1
+++ b/eng/helix/configure-helix-machine.ps1
@@ -3,16 +3,15 @@
 $dotnetLocation = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "dotnet"
 
 Write-Output "Adding dotnet location to path: $dotnetLocation"
-Write-Output "Path before: $env:path"
+
 # Prepend the path to ensure that dotnet.exe is called from there.
-$env:path="$dotnetLocation;$env:path"
+[System.Environment]::SetEnvironmentVariable("PATH", "$dotnetLocation;$env:path", [System.EnvironmentVariableTarget]::User)
 
-Write-Output "Path after: $env:path"
 # Don't look outside the TestHost to resolve best match SDKs.
-$env:DOTNET_MULTILEVEL_LOOKUP = 0
+[System.Environment]::SetEnvironmentVariable("DOTNET_MULTILEVEL_LOOKUP", "0", [System.EnvironmentVariableTarget]::User)
 
 # Disable first run since we do not need all ASP.NET packages restored.
-$env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
+[System.Environment]::SetEnvironmentVariable("DOTNET_SKIP_FIRST_TIME_EXPERIENCE", "1", [System.EnvironmentVariableTarget]::User)
 
 # Ensure that the dotnet installed at our dotnetLocation is used
-$env:DOTNET_ROOT=$dotnetLocation
\ No newline at end of file
+[System.Environment]::SetEnvironmentVariable("DOTNET_SKIP_FIRST_TIME_EXPERIENCE", "$dotnetLocation", [System.EnvironmentVariableTarget]::User)
diff --git a/eng/helix/helixpublish.proj b/eng/helix/helixpublish.proj
index 819ddbc4a93..4cf69645c6d 100644
--- a/eng/helix/helixpublish.proj
+++ b/eng/helix/helixpublish.proj
@@ -4,35 +4,29 @@
     <!-- These properties help ensure proper and consistent restore behavior -->
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <RestorePackagesPath>$(MSBuildThisFileDirectory)packages</RestorePackagesPath>
-    
-    
+    <DisableImplicitNETCorePlatformsReference>true</DisableImplicitNETCorePlatformsReference>
+    <RestoreSources>
+      $(RestoreSources);
+      https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json
+    </RestoreSources>
+
     <!-- We copy our own dotnet payload over to the machine, so we don't want/need a different dotnet install -->
     <IncludeDotNetCli>false</IncludeDotNetCli>
     <EnableXUnitReporter>true</EnableXUnitReporter>
     <EnableAzurePipelinesReporter>true</EnableAzurePipelinesReporter>
     <FailOnMissionControlTestFailure>true</FailOnMissionControlTestFailure>
-    <HelixPreCommands>$(HelixPreCommands);</HelixPreCommands>
 
-    <!-- These help ensure proper restore behavior for Microsoft.NETCore.Platforms -->
-    <DisableImplicitNETCorePlatformsReference>true</DisableImplicitNETCorePlatformsReference>
-    <RestoreSources>
-      $(RestoreSources);
-      https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json
-    </RestoreSources>
+    <!-- Semi-colon delimited list of commands that are executed before every test.-->
+    <HelixPreCommands>$(HelixPreCommands); powershell %HELIX_CORRELATION_PAYLOAD%\configure-helix-machine.ps1;</HelixPreCommands>
   </PropertyGroup>
 
   <ItemGroup>
-    <!--<PackageReference Include="QV.Wpf.Test" Version="1.0.0" /> -->
+    <!--<PackageReference Include="Microsoft.DotNet.Wpf.DncEng.Test" Version="1.0.0" /> -->
     <HelixCorrelationPayload Include="..\..\HelixPayload\$(Configuration)\$(Platform)" /> 
     <HelixWorkItem Include="HelloHelix">
       <Timeout>00:20:00</Timeout>
-      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd</Command>
     </HelixWorkItem>
-    <!--<HelixWorkItem Include="Ping stevenki">
-      <Timeout>00:20:00</Timeout>
-      <Command>ping \\stevenki1\public</Command>
-    </HelixWorkItem>
-    -->
    <!-- 
    <HelixWorkItem Include="Annotations">
       <Timeout>00:20:00</Timeout>
diff --git a/eng/helix/helixrun.cmd b/eng/helix/helixrun.cmd
new file mode 100644
index 00000000000..1dd2d3d4e98
--- /dev/null
+++ b/eng/helix/helixrun.cmd
@@ -0,0 +1,12 @@
+@echo off
+setlocal ENABLEDELAYEDEXPANSION
+
+REM Run the tests
+dotnet --info
+
+REM We can use %HELIX_PYTHONPATH% %HELIX_SCRIPT_ROOT%\upload_result.py to upload any QV specific logs and/or screenshots that we are interested in.
+REM For example: %HELIX_PYTHONPATH% %HELIX_SCRIPT_ROOT%\upload_result.py -result screenshot.jpg -result_name screenshot.jpg
+REM Then, links to these artifacts can then be included in the xUnit logs.
+
+REM Need to copy the xUnit log to a known location that helix can understand
+REM copy Test\Drts\testResults.xml ..\testResults.xml
\ No newline at end of file
diff --git a/eng/helix/prepare-helix-payload.ps1 b/eng/helix/prepare-helix-payload.ps1
index 8339d9a6782..ea2d9aed842 100644
--- a/eng/helix/prepare-helix-payload.ps1
+++ b/eng/helix/prepare-helix-payload.ps1
@@ -37,7 +37,7 @@ function CopyFolderStructure($from, $to)
 }
 
 # Copy files from nuget packages
-$testNugetLocation = Join-Path $nugetPackagesDir "qv.wpf.test\1.0.0\tools\win-$platform\"
+$testNugetLocation = Join-Path $nugetPackagesDir "Microsoft.DotNet.Wpf.DncEng.Test\1.0.0\tools\win-$platform\"
 $testPayloadLocation = Join-Path $payloadDir "Test"
 CopyFolderStructure $testNugetLocation $testPayloadLocation
 
@@ -48,4 +48,4 @@ CopyFolderStructure $localDotnetInstall $dotnetPayloadLocation
 
 # Copy scripts
 Copy-Item "eng\helix\configure-helix-machine.ps1" $payloadDir
-Copy-Item "eng\helix\runtests.cmd" $payloadDir
\ No newline at end of file
+Copy-Item "eng\helix\helixrun.cmd" $payloadDir
\ No newline at end of file
diff --git a/eng/helix/runtests.cmd b/eng/helix/runtests.cmd
deleted file mode 100644
index ef3923df0df..00000000000
--- a/eng/helix/runtests.cmd
+++ /dev/null
@@ -1,5 +0,0 @@
-@echo off
-powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0configure-helix-machine.ps1""" "
-exit /b %ErrorLevel%
-
-dotnet --info
\ No newline at end of file

From 407e32fa638bab511d7f745eb0822b019dd523c4 Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Thu, 2 May 2019 16:38:22 -0700
Subject: [PATCH 03/72] Add target queues

---
 eng/helix/configure-helix-machine.ps1 |  8 ++---
 eng/helix/helixpublish.proj           | 49 ++++++++++++++-------------
 eng/helix/helixrun.cmd                |  1 +
 3 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/eng/helix/configure-helix-machine.ps1 b/eng/helix/configure-helix-machine.ps1
index 4074e20679f..ac8d4f5f3de 100644
--- a/eng/helix/configure-helix-machine.ps1
+++ b/eng/helix/configure-helix-machine.ps1
@@ -5,13 +5,13 @@ $dotnetLocation = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.P
 Write-Output "Adding dotnet location to path: $dotnetLocation"
 
 # Prepend the path to ensure that dotnet.exe is called from there.
-[System.Environment]::SetEnvironmentVariable("PATH", "$dotnetLocation;$env:path", [System.EnvironmentVariableTarget]::User)
+$env:path="$dotnetLocation;$env:path"
 
 # Don't look outside the TestHost to resolve best match SDKs.
-[System.Environment]::SetEnvironmentVariable("DOTNET_MULTILEVEL_LOOKUP", "0", [System.EnvironmentVariableTarget]::User)
+$env:DOTNET_MULTILEVEL_LOOKUP = 0
 
 # Disable first run since we do not need all ASP.NET packages restored.
-[System.Environment]::SetEnvironmentVariable("DOTNET_SKIP_FIRST_TIME_EXPERIENCE", "1", [System.EnvironmentVariableTarget]::User)
+$env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
 
 # Ensure that the dotnet installed at our dotnetLocation is used
-[System.Environment]::SetEnvironmentVariable("DOTNET_SKIP_FIRST_TIME_EXPERIENCE", "$dotnetLocation", [System.EnvironmentVariableTarget]::User)
+$env:DOTNET_ROOT=$dotnetLocation
\ No newline at end of file
diff --git a/eng/helix/helixpublish.proj b/eng/helix/helixpublish.proj
index 4cf69645c6d..4bc641568af 100644
--- a/eng/helix/helixpublish.proj
+++ b/eng/helix/helixpublish.proj
@@ -17,7 +17,10 @@
     <FailOnMissionControlTestFailure>true</FailOnMissionControlTestFailure>
 
     <!-- Semi-colon delimited list of commands that are executed before every test.-->
-    <HelixPreCommands>$(HelixPreCommands); powershell %HELIX_CORRELATION_PAYLOAD%\configure-helix-machine.ps1;</HelixPreCommands>
+    <HelixPreCommands>$(HelixPreCommands);</HelixPreCommands>
+
+    <!-- These are the list of Windows versions that we run tests on-->
+    <HelixTargetQueues>Windows.10.Amd64.Open;Windows.7.Amd64.Open;Windows.10.Amd64.ServerRS5.Open</HelixTargetQueues>
   </PropertyGroup>
 
   <ItemGroup>
@@ -30,91 +33,91 @@
    <!-- 
    <HelixWorkItem Include="Annotations">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=Annotations</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=Annotations</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="AppModel">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=AppModel</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=AppModel</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="DigitalDocuments">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=DigitalDocuments</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=DigitalDocuments</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Media">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=Media</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=Media</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Editing">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=Editing</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=Editing</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="ElementServices">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=ElementServices</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=ElementServices</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Text">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=Text</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=Text</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Animation">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=Animation</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=Animation</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="3D">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=3D</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=3D</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="2D">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=2D</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=2D</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Controls">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=Controls</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=Controls</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Imaging">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=Imaging</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=Imaging</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="FlowLayout">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=FlowLayout</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=FlowLayout</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="DataServices">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=DataServices</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=DataServices</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="ElementLayout">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=ElementLayout</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=ElementLayout</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Xaml">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=Xaml</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=Xaml</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Globalization">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=Globalization</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=Globalization</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Tablet">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=Tablet</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=Tablet</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Integration">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=Integration</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=Integration</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="XET">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=XET</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=XET</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Printing">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=Printing</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=Printing</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="WindowsFormsIntegration">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=WindowsFormsIntegration</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=WindowsFormsIntegration</Command>
     </HelixWorkItem>
     -->
   </ItemGroup>
diff --git a/eng/helix/helixrun.cmd b/eng/helix/helixrun.cmd
index 1dd2d3d4e98..de4ef5db581 100644
--- a/eng/helix/helixrun.cmd
+++ b/eng/helix/helixrun.cmd
@@ -1,5 +1,6 @@
 @echo off
 setlocal ENABLEDELAYEDEXPANSION
+powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0configure-helix-machine.ps1""" "
 
 REM Run the tests
 dotnet --info

From 8d3c7b67e7933d46de741049c9b872fbba15ca5c Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Thu, 2 May 2019 20:53:29 -0700
Subject: [PATCH 04/72] run test in powershell script

---
 eng/helix/helixpublish.proj         | 48 ++++++++++++++---------------
 eng/helix/helixrun.cmd              | 13 --------
 eng/helix/prepare-helix-payload.ps1 |  2 +-
 eng/helix/runtests.ps1              | 13 ++++++++
 4 files changed, 38 insertions(+), 38 deletions(-)
 delete mode 100644 eng/helix/helixrun.cmd
 create mode 100644 eng/helix/runtests.ps1

diff --git a/eng/helix/helixpublish.proj b/eng/helix/helixpublish.proj
index 4bc641568af..75037efd768 100644
--- a/eng/helix/helixpublish.proj
+++ b/eng/helix/helixpublish.proj
@@ -28,96 +28,96 @@
     <HelixCorrelationPayload Include="..\..\HelixPayload\$(Configuration)\$(Platform)" /> 
     <HelixWorkItem Include="HelloHelix">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd</Command>
+      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1"</Command>
     </HelixWorkItem>
    <!-- 
    <HelixWorkItem Include="Annotations">
-      <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=Annotations</Command>
+      <Timeout>00:20:00</Timeout> 
+      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=Annotations"</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="AppModel">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=AppModel</Command>
+      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=AppModel"</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="DigitalDocuments">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=DigitalDocuments</Command>
+      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=DigitalDocuments"</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Media">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=Media</Command>
+      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=Media"</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Editing">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=Editing</Command>
+      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=Editing"</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="ElementServices">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=ElementServices</Command>
+      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=ElementServices"</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Text">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=Text</Command>
+      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=Text"</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Animation">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=Animation</Command>
+      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=Animation"</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="3D">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=3D</Command>
+      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=3D"</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="2D">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=2D</Command>
+      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=2D"</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Controls">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=Controls</Command>
+      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=Controls"</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Imaging">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=Imaging</Command>
+      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=Imaging"</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="FlowLayout">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=FlowLayout</Command>
+      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=FlowLayout"</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="DataServices">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=DataServices</Command>
+      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=DataServices"</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="ElementLayout">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=ElementLayout</Command>
+      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=ElementLayout"</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Xaml">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=Xaml</Command>
+      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=Xaml"</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Globalization">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=Globalization</Command>
+      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=Globalization"</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Tablet">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=Tablet</Command>
+      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=Tablet"</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Integration">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=Integration</Command>
+      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=Integration"</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="XET">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=XET</Command>
+      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=XET"</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Printing">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=Printing</Command>
+      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=Printing"</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="WindowsFormsIntegration">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=WindowsFormsIntegration</Command>
+      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=WindowsFormsIntegration"</Command>
     </HelixWorkItem>
     -->
   </ItemGroup>
diff --git a/eng/helix/helixrun.cmd b/eng/helix/helixrun.cmd
deleted file mode 100644
index de4ef5db581..00000000000
--- a/eng/helix/helixrun.cmd
+++ /dev/null
@@ -1,13 +0,0 @@
-@echo off
-setlocal ENABLEDELAYEDEXPANSION
-powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0configure-helix-machine.ps1""" "
-
-REM Run the tests
-dotnet --info
-
-REM We can use %HELIX_PYTHONPATH% %HELIX_SCRIPT_ROOT%\upload_result.py to upload any QV specific logs and/or screenshots that we are interested in.
-REM For example: %HELIX_PYTHONPATH% %HELIX_SCRIPT_ROOT%\upload_result.py -result screenshot.jpg -result_name screenshot.jpg
-REM Then, links to these artifacts can then be included in the xUnit logs.
-
-REM Need to copy the xUnit log to a known location that helix can understand
-REM copy Test\Drts\testResults.xml ..\testResults.xml
\ No newline at end of file
diff --git a/eng/helix/prepare-helix-payload.ps1 b/eng/helix/prepare-helix-payload.ps1
index ea2d9aed842..675a95ddb74 100644
--- a/eng/helix/prepare-helix-payload.ps1
+++ b/eng/helix/prepare-helix-payload.ps1
@@ -48,4 +48,4 @@ CopyFolderStructure $localDotnetInstall $dotnetPayloadLocation
 
 # Copy scripts
 Copy-Item "eng\helix\configure-helix-machine.ps1" $payloadDir
-Copy-Item "eng\helix\helixrun.cmd" $payloadDir
\ No newline at end of file
+Copy-Item "eng\helix\runtests.ps1" $payloadDir
\ No newline at end of file
diff --git a/eng/helix/runtests.ps1 b/eng/helix/runtests.ps1
new file mode 100644
index 00000000000..29ec11c15e3
--- /dev/null
+++ b/eng/helix/runtests.ps1
@@ -0,0 +1,13 @@
+
+# Configure the machine before running tests
+& "$PSScriptRoot\configure-helix-machine.ps1"
+
+# Run the tests
+dotnet --info
+
+# We can use $env:HELIX_PYTHONPATH $env:HELIX_SCRIPT_ROOT\upload_result.py to upload any QV specific logs and/or screenshots that we are interested in.
+# For example: $env:HELIX_PYTHONPATH $env:HELIX_SCRIPT_ROOT%\upload_result.py -result screenshot.jpg -result_name screenshot.jpg
+# Then, links to these artifacts can then be included in the xUnit logs.
+
+# Need to copy the xUnit log to a known location that helix can understand
+# Copy-Item .\Test\Drts\testResults.xml ..\testResults.xml
\ No newline at end of file

From 688c35109b8e5fb0bb493a525fe7174f9f4f8cf8 Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Fri, 3 May 2019 10:05:52 -0700
Subject: [PATCH 05/72] updating dependencies and removing workaround

---
 eng/Build.props         | 8 --------
 eng/Version.Details.xml | 4 ++--
 2 files changed, 2 insertions(+), 10 deletions(-)
 delete mode 100644 eng/Build.props

diff --git a/eng/Build.props b/eng/Build.props
deleted file mode 100644
index da83de21674..00000000000
--- a/eng/Build.props
+++ /dev/null
@@ -1,8 +0,0 @@
-<Project>
-    <!-- Workarounds for Arcade bug: https://github.com/dotnet/arcade/issues/2641 -->
-    <PropertyGroup Condition="'$(_HelixSource)'!=''">
-        <_NuGetRestoreTargets>$(MSBuildToolsPath32)\..\..\..\Common7\IDE\CommonExtensions\Microsoft\NuGet\NuGet.targets</_NuGetRestoreTargets>
-        <NuGetRestoreTargets>true</NuGetRestoreTargets>
-        <DisableImplicitNETCorePlatformsReference>true</DisableImplicitNETCorePlatformsReference>
-    </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 4fe84c9faec..f0ab04e2ca5 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -95,9 +95,9 @@
       <Uri>https://github.com/dotnet/coreclr</Uri>
       <Sha>89df4b9d928c7f21550d487328f5db000a498bdf</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19222.2">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19253.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>851e36df83d3361e4bd8a70a2a8a89f762469f9a</Sha>
+      <Sha>e31dd0f6fd12a136a2310a308d235c360703b221</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>

From 80df343978154d353abe1107fe38d862ead35f75 Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Fri, 3 May 2019 10:46:37 -0700
Subject: [PATCH 06/72] adding documentation

---
 Documentation/developer-guide.md  |  1 +
 Documentation/testing-in-helix.md | 13 +++++++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 Documentation/testing-in-helix.md

diff --git a/Documentation/developer-guide.md b/Documentation/developer-guide.md
index 5ad54ab8041..b8386a38cc3 100644
--- a/Documentation/developer-guide.md
+++ b/Documentation/developer-guide.md
@@ -162,3 +162,4 @@ Follow the steps defined [here](https://github.com/dotnet/arcade/blob/master/Doc
 * [up-for-grabs WPF issues](https://github.com/dotnet/wpf/issues?q=is%3Aopen+is%3Aissue+label%3Aup-for-grabs)
 * [easy WPF issues](https://github.com/dotnet/wpf/issues?utf8=%E2%9C%93&q=is%3Aopen+is%3Aissue+label%3Aeasy)
 * [Code generation in dotnet/wpf](codegen.md)
+* [Testing in Helix](testing-in-helix.md)
diff --git a/Documentation/testing-in-helix.md b/Documentation/testing-in-helix.md
new file mode 100644
index 00000000000..5cbd402f7ad
--- /dev/null
+++ b/Documentation/testing-in-helix.md
@@ -0,0 +1,13 @@
+# Testing in Helix
+
+I'd recommend seeing the official Helix [readme](https://github.com/dotnet/arcade/blob/master/src/Microsoft.DotNet.Helix/Sdk/Readme.md) if you are interested in some of the general Helix concepts. I'll briefly outline what we are doing that is a bit unique:
+
+1. Helix has built-in support for running xUnit tests. Since we are not using xUnit, we have to manually setup our machines so that they work with QualityVault and STI.
+We manually restore the helixpublish.proj project during CI builds; this is done in `pipeline.yml`. This allows us to package reference the `Microsoft.DotNet.Wpf.DncEng.Test` package to pull down the binaries that we need. We can extract them into a local folder using the MSBuild property `RestorePackagesPath`, so that when the project is restored, we know the exact relative location of the packages.
+2. We need to create a "TestHost" installation of dotnet on the Helix machine. The default Helix support for installing dotnet only installs version 2.x, and only installs the `Microsoft.NETCore.App` runtime, and not the M`icrosoft.WindowsDesktop.App` or `Microsoft.AspNetCore.App` runtimes. I opted to doing this manually and copy it out of the `.dotnet` folder that gets created as part of ci builds, rather than running an installer on the Helix machine. I figured reducing the number of dependencies on making external network calls and downloading items from the internet the better.
+3. We copy both the nuget packages we care care about and the dotnet install in the `prepare-helix-payload.ps1` script. This gets invoked before we actually run tests in the `pipeline-yml` file located in the `eng` directory. Helix allows you to specify a `HelixCorrelationPayload` directory, where this directory gets deployed to the Helix machine, and is made available in your various helix commands with the `HELIX_CORRELATION_PAYLOAD` environment variable.
+4. Helix and Azure Pipelines can report xUnit logs, so we will be updating QualityVault to produce an xUnit compatible log. We will then need to copy that log to a known location for it to be picked up.
+
+## How we are running tests
+1. Currently, the `HelixQueues` that we selected are Windows.10.Amd64.Open;Windows.7.Amd64.Open;Windows.10.Amd64.ServerRS5.Open. Essentially, this translates to: "Latest Windows 10", "Windows 7", and "Windows 10 RS5 Server" addition. This enables tests to run on some of the most interesting and important SKUs, without overloading the Helix servers and/or making CI runs take an unnecessarily long time to run.
+2. In similar vain, we only run test passes for Release builds, mainly to save time and resources running duplicate tests in a near-identical environment.
\ No newline at end of file

From d7c04b997a979a153f0c416e7da79485a0bfd553 Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Fri, 3 May 2019 10:59:08 -0700
Subject: [PATCH 07/72] reverting dependency update

---
 eng/Version.Details.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index f0ab04e2ca5..4fe84c9faec 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -95,9 +95,9 @@
       <Uri>https://github.com/dotnet/coreclr</Uri>
       <Sha>89df4b9d928c7f21550d487328f5db000a498bdf</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19253.2">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19222.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>e31dd0f6fd12a136a2310a308d235c360703b221</Sha>
+      <Sha>851e36df83d3361e4bd8a70a2a8a89f762469f9a</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>

From 3e9542a9cc4ad793c8f24ac984b650f33e560ec4 Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Fri, 10 May 2019 15:52:53 -0700
Subject: [PATCH 08/72] switching back to true DrtXaml

---
 .../test/Common/DRT/dirs.proj                 |   19 +
 .../test/Common/Directory.Build.props         |    6 +
 .../test/Common/TestServices/DrtBase.cs       |    5 -
 .../test/Common/keys/TestTrusted.snk          |  Bin 0 -> 596 bytes
 .../test/Common/keys/TestUntrusted.snk        |  Bin 0 -> 596 bytes
 src/Microsoft.DotNet.Wpf/test/DRT.Build.props |    5 +
 .../test/DRT/Directory.Build.props            |    6 +
 .../BamlAvoidXmlTest/BamlAvoidXmlTest.csproj  |   10 +-
 .../BamlTestClasses40/BCMarkupExtension.cs    |    3 -
 .../test/DRT/DrtXaml/Directory.Build.props    |    4 +
 .../test/DRT/DrtXaml/DrtXaml/DrtXamlBase.cs   |   77 --
 .../XamlTestClasses.FriendWithKey.csproj      |   12 +
 .../XamlTestClasses.FriendWithoutKey.csproj   |   13 +
 .../DrtXaml.PartialTrustTests.csproj          |   20 +
 .../XamlTestClasses/XamlTestClasses.csproj    |    2 +-
 .../test/DRT/DrtXaml/dirs.proj                |   18 +
 .../test/Directory.Build.props                |   59 +-
 .../test/Directory.Build.targets              |    6 +
 src/Microsoft.DotNet.Wpf/test/Publish.props   |   12 +
 .../test/PublishAfterBuild.targets            |   11 +
 .../test/SourceLocations.props                | 1072 +++++++++++++++++
 .../test/StrongName.props                     |   17 +
 .../test/StrongName.targets                   |   12 +
 23 files changed, 1293 insertions(+), 96 deletions(-)
 create mode 100644 src/Microsoft.DotNet.Wpf/test/Common/DRT/dirs.proj
 create mode 100644 src/Microsoft.DotNet.Wpf/test/Common/Directory.Build.props
 create mode 100644 src/Microsoft.DotNet.Wpf/test/Common/keys/TestTrusted.snk
 create mode 100644 src/Microsoft.DotNet.Wpf/test/Common/keys/TestUntrusted.snk
 create mode 100644 src/Microsoft.DotNet.Wpf/test/DRT.Build.props
 create mode 100644 src/Microsoft.DotNet.Wpf/test/DRT/Directory.Build.props
 create mode 100644 src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/Directory.Build.props
 create mode 100644 src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/FriendWithKey/XamlTestClasses.FriendWithKey.csproj
 create mode 100644 src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/FriendWithoutKey/XamlTestClasses.FriendWithoutKey.csproj
 create mode 100644 src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/PartialTrustTests/DrtXaml.PartialTrustTests.csproj
 create mode 100644 src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/dirs.proj
 create mode 100644 src/Microsoft.DotNet.Wpf/test/Directory.Build.targets
 create mode 100644 src/Microsoft.DotNet.Wpf/test/Publish.props
 create mode 100644 src/Microsoft.DotNet.Wpf/test/PublishAfterBuild.targets
 create mode 100644 src/Microsoft.DotNet.Wpf/test/SourceLocations.props
 create mode 100644 src/Microsoft.DotNet.Wpf/test/StrongName.props
 create mode 100644 src/Microsoft.DotNet.Wpf/test/StrongName.targets

diff --git a/src/Microsoft.DotNet.Wpf/test/Common/DRT/dirs.proj b/src/Microsoft.DotNet.Wpf/test/Common/DRT/dirs.proj
new file mode 100644
index 00000000000..72dcacf30b3
--- /dev/null
+++ b/src/Microsoft.DotNet.Wpf/test/Common/DRT/dirs.proj
@@ -0,0 +1,19 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Project="$(_NTDRIVE)$(_NTROOT)\wpf\test\Microsoft.Wpf.Test.Native.Settings.Targets" />
+
+
+  <ItemGroup Condition="'$(BuildExePhase)' == '' ">
+
+    <ProjectFile Include="TestServices\TestServices.csproj" />
+    <ProjectFile Include="WPFSetup\wpfSetup.csproj" />
+    <ProjectFile Include="Tools\DrtTools.csproj" />
+
+    <!-- Broken for 3.5 Build in recent Dev11 WPF migration.  Since DRTs are NEVER run in 3.X, disable there -->
+    <ProjectFile Include="rundrt\rundrts.nativeproj" Condition="'$(WPF_TESTBUILD_TARGETVERSION)' != 'v3.5' AND '$(WPF_TESTBUILD_TARGETVERSION)' != 'v3.0'"/>
+
+  </ItemGroup>
+
+  <Import Project="$(_NTDRIVE)$(_NTROOT)\tools\Microsoft.DevDiv.Traversal.targets" />
+
+</Project>
diff --git a/src/Microsoft.DotNet.Wpf/test/Common/Directory.Build.props b/src/Microsoft.DotNet.Wpf/test/Common/Directory.Build.props
new file mode 100644
index 00000000000..7e783514db2
--- /dev/null
+++ b/src/Microsoft.DotNet.Wpf/test/Common/Directory.Build.props
@@ -0,0 +1,6 @@
+<Project>
+  <Import Condition="Exists('../Directory.Build.props')" Project="../Directory.Build.props" />
+  <PropertyGroup>
+    <PublishDir>$(WpfTestBasePublishPath)\Common</PublishDir>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Wpf/test/Common/TestServices/DrtBase.cs b/src/Microsoft.DotNet.Wpf/test/Common/TestServices/DrtBase.cs
index 59d384c5013..37bd98942c6 100644
--- a/src/Microsoft.DotNet.Wpf/test/Common/TestServices/DrtBase.cs
+++ b/src/Microsoft.DotNet.Wpf/test/Common/TestServices/DrtBase.cs
@@ -22,7 +22,6 @@
 using System.Text;
 
 using Microsoft.Win32;
-using Xunit.Abstractions;
 using MS.Internal;
 
 /************************************************************************
@@ -422,7 +421,6 @@ protected virtual bool HandleCommandLineArgument(string arg, bool option, string
                     case "help":
                         PrintUsage();
 
-                        Xunit.Assert.True(true);
                         Environment.Exit(0);
                         break;
 
@@ -1138,7 +1136,6 @@ public void Assert(bool cond, string message, params object[] arg)
 
                 // Write any delayed output for debugging purposes
                 WriteDelayedOutput();
-                Xunit.Assert.True(cond, s);
 
                 if (_loudAsserts)
                 {
@@ -2051,7 +2048,6 @@ void RunNextTest()
                         _testIndex++;
                     }
 
-                    Xunit.Assert.False(aborting);
 
                     // Schedule the next test.
                     // Special situation: The current test may have called Suspend() and then
@@ -2099,7 +2095,6 @@ private void ReportException(object o)
 
             ReportDrtInfo();
 
-            Xunit.Assert.True(_retcode == 0);
             Environment.Exit(_retcode);
         }
 
diff --git a/src/Microsoft.DotNet.Wpf/test/Common/keys/TestTrusted.snk b/src/Microsoft.DotNet.Wpf/test/Common/keys/TestTrusted.snk
new file mode 100644
index 0000000000000000000000000000000000000000..425dc4d7c7b74af91147890c2c856ee5e3a457b5
GIT binary patch
literal 596
zcmV-a0;~N80ssI2Bme+XQ$aES1ONa50097h+Xr;b{``olreQNO<-QW38`CP=elD#{
z1f2iOVubpaT-93wk#mAam`wci2T5?mOdX<|2Ot{{ko$WqVA7@p#H*?M!3M287&zM0
zmUs&eMHtXU{&2+JPL^XeNr}&zE>D`>LBH>ULw%!MiyRsaZLGB+MQls4i>;!*bO*x?
z-<x|FP}|CK&|y9_frm(uCscy3!1EMf!2Np-WtgOv2(`ei#{3VlytPRIghx*4_7Oeb
z1j6Q2O_P}X%S-FKVMtbxmPk!3Bb(m)6G&%tMoU@646(GyDTeU9M2CFJ{xYoCT13c9
z)Vh+inJ)4t>ZT!EJnN1o04^45o-ow$iKKx<%b7#VJuo`O*}9wM?waJmD$Fr(%Q0))
z4@9WjxvBK;>;E<njfe}L9JpPLO=bO0tcm?iZy*AevOt<AQe2645!|a9q__L}|B-F-
z)De$-jH3kPqpixHTp#thZ||gT0W%yWon}`YTlUuz$8elrnN+cPy#Dyu<6t9;ZhOeU
z@-~o+k>nL8w%^)}u&d0H8y1F&-4*@5&sNR%ghvl%*)kq3)B>+#U=jbs2V|#Trv)<q
znSbJ<-FO>;Tgx#BS`SQ$#&t6!4)PXAJYvnK)T%gSX4Xo-H`n!CT)S7kEqTm?_?}^X
zJDZ|h<FmW!ESNPZ#fKU?rTv9kc}sPG4xQ3d%fgn>;dEe9W4t%dt2UJ3TlGjuXjLXK
i<jZ2=39|pS{JNEB+BNe~zYkSaL<N*?&T_(2H(qt7eJ3RV

literal 0
HcmV?d00001

diff --git a/src/Microsoft.DotNet.Wpf/test/Common/keys/TestUntrusted.snk b/src/Microsoft.DotNet.Wpf/test/Common/keys/TestUntrusted.snk
new file mode 100644
index 0000000000000000000000000000000000000000..b36f71bca81fc21b4e98af110794c646097405eb
GIT binary patch
literal 596
zcmV-a0;~N80ssI2Bme+XQ$aES1ONa50098OyxF&eOw(5-u@iz8?OqS7kw$jafQAom
z2po(KgSjn(U;5{7sc83OeoJmL*MIID2tbI==Qhq*on@^Lrf&#rFJE<9Zz&1Ud}KRC
z$10F&s>T<;)^w4m{N+c4%9t^F>L|ceMMnRTBlh`DS$RJwbVGZ?(Ke(2mC*TM=BA{b
zEF|Gv%>7a>On-1vKUNU+)v^?qTZkdYS>|vVrpckXVSwhwH`$D{T;=}-`<_*6pTz6S
zla(S_@?`a3cyZNr?bQF)bhR69cAMP!vb5CG|FWbqYE4873?Yib>(5m{c5^a512o=S
zespg_F-va8{NBnY<J7`Cy?#lm2z$kS{0lUgoL&AL|3r{bzXC;3afewR=0s#}r?u9h
zIB9M2gH^e&p2vGd+^S&;T_|SC{-T`q8@$(`v&aaO@e&3Rk<l{Iuq`6-ev5?~mQ451
zzW{BMRvQ*1qxZ*b(Q@Cj?|gx$MT6Z@?X^TDDc@>CF%u9R&*>&N)5$g3Zw<YOFDKM;
zX9=h4(($M1M2tIlgOz(MYmnGc&gfDWykcFFVKH@7VlH2sC`7xgjeJ90?bZ&b<#HC(
z#N+}uGafP_{Np9e@vhS=u!fm838!XKLa)-RO128&a8P@veo94MLghI-VpK>Vl<b;r
z5czRe8G#oMN!r2ilfuXl_{G;*P}ED9+}S?A|JLVPu&5yvy=}Pgb%U?*eD%5JFdrAa
ildD3R1jvE4=eCwhx#_OQ`Ju-FrH9TXQCrr0yzgPHh$(si

literal 0
HcmV?d00001

diff --git a/src/Microsoft.DotNet.Wpf/test/DRT.Build.props b/src/Microsoft.DotNet.Wpf/test/DRT.Build.props
new file mode 100644
index 00000000000..de0b61a8185
--- /dev/null
+++ b/src/Microsoft.DotNet.Wpf/test/DRT.Build.props
@@ -0,0 +1,5 @@
+<Project>
+  <PropertyGroup>
+    <PublishDir>$(WpfDrtTestBasePublishPath)</PublishDir>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/Directory.Build.props b/src/Microsoft.DotNet.Wpf/test/DRT/Directory.Build.props
new file mode 100644
index 00000000000..7e783514db2
--- /dev/null
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/Directory.Build.props
@@ -0,0 +1,6 @@
+<Project>
+  <Import Condition="Exists('../Directory.Build.props')" Project="../Directory.Build.props" />
+  <PropertyGroup>
+    <PublishDir>$(WpfTestBasePublishPath)\Common</PublishDir>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlAvoidXmlTest/BamlAvoidXmlTest.csproj b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlAvoidXmlTest/BamlAvoidXmlTest.csproj
index e5778ec5e8f..288c956924a 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlAvoidXmlTest/BamlAvoidXmlTest.csproj
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlAvoidXmlTest/BamlAvoidXmlTest.csproj
@@ -1,6 +1,13 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyName>BamlAvoidXmlTest</AssemblyName>
+    <LinkSubsystem>console</LinkSubsystem>
+    <AssemblyIdentityVersionName>WCP</AssemblyIdentityVersionName>
+    <GenerateAssemblyAttribute>false</GenerateAssemblyAttribute>
+    <AddTargetFrameworkAttributeToWpfTestExe>true</AddTargetFrameworkAttributeToWpfTestExe>
+
+    <!-- Avoid auto-generating a main -->
+    <InternalMarkupCompilation>true</InternalMarkupCompilation>
     <RootNamespace>BamlAvoidXmlTest</RootNamespace>
     <Platforms>AnyCPU;x64</Platforms>
   </PropertyGroup>
@@ -12,6 +19,7 @@
 
   <ItemGroup>
     <Folder Include="Properties\" />
+    <Compile Include="BamlAvoidXmlTest.cs" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlTestClasses40/BCMarkupExtension.cs b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlTestClasses40/BCMarkupExtension.cs
index 90e3c53b5bc..d0f514bfc81 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlTestClasses40/BCMarkupExtension.cs
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlTestClasses40/BCMarkupExtension.cs
@@ -32,7 +32,6 @@ public override object ProvideValue(
         {
             return string.Format("Path: {0} , Mode: {1}", Path, Mode);
         }
-        [CLSCompliant(false)]
         [MarkupExtensionBracketCharacters('(',')')]
         [MarkupExtensionBracketCharacters('[',']')]
         [ConstructorArgument("value")]
@@ -44,7 +43,6 @@ public string Path
             set { _value = value; }
         }
 
-        [CLSCompliant(false)]
         [ConstructorArgument("value2")]
         [MarkupExtensionBracketCharacters('$','^')]
 #pragma warning disable CS3021 // Type or member does not need a CLSCompliant attribute because the assembly does not have a CLSCompliant attribute
@@ -71,7 +69,6 @@ public override object ProvideValue(
             return Path;
         }
 
-        [CLSCompliant(false)]
         [MarkupExtensionBracketCharacters('[',']')]
         [MarkupExtensionBracketCharacters('(', ')')]
 #pragma warning disable CS3021 // Type or member does not need a CLSCompliant attribute because the assembly does not have a CLSCompliant attribute
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/Directory.Build.props b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/Directory.Build.props
new file mode 100644
index 00000000000..319f7c13864
--- /dev/null
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/Directory.Build.props
@@ -0,0 +1,4 @@
+<Project>
+  <Import Condition="Exists('../Directory.Build.props')" Project="../Directory.Build.props" />
+  <Import Condition="Exists('$(WpfTestBasePath)/DRT.Build.props')" Project="$(WpfTestBasePath)/DRT.Build.props" />
+</Project>
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/DrtXamlBase.cs b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/DrtXamlBase.cs
index 71b3191ccef..2feeead35e0 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/DrtXamlBase.cs
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/DrtXamlBase.cs
@@ -12,86 +12,9 @@
 using System.IO;
 using DrtXaml.XamlTestFramework;
 using System.Xml;
-using Xunit;
-using Xunit.Abstractions;
-using System.Threading.Tasks;
-using System.Threading;
 
 namespace DrtXaml
 {
-    public class TestFrontEnd
-    {
-        public TestFrontEnd(ITestOutputHelper testOutputHelper)
-        {
-            _testOutputHelper = testOutputHelper;
-        }
-
-        [Theory]
-        [InlineData("ValueSerializerSerializationTests")]
-        [InlineData("ValueSerializerDeserializationAndRoundtripTest")]
-        [InlineData("NameReferenceTests")]
-        [InlineData("AdvXamlFeatureTests")]
-        [InlineData("AttachablePropertyServicesTests")]
-        [InlineData("AvoidSystemXmlTest")]
-        [InlineData("BamlTests")]
-        [InlineData("BasicXamlTests")]
-        [InlineData("CollectionTests")]
-        [InlineData("EventTests")]
-        [InlineData("FactoryArgumentTests")]
-        [InlineData("LoadPermissionTests")]
-        [InlineData("MarkupExtensionTests")]
-        [InlineData("NodeStreamTests")]
-        [InlineData("ObjectReaderTests")]
-        [InlineData("ObjectWriterBasicTests")]
-        [InlineData("SavedContextTests")]
-        [InlineData("SchemaTests")]
-        [InlineData("SubreaderTests")]
-        [InlineData("TypeArgumentTests")]
-        [InlineData("WpfUsageTests")]
-        [InlineData("XamlMarkupExtensionWriterTests")]
-        [InlineData("XamlXmlWriterTests")]
-        [InlineData("XamlXmlReaderTests")]
-        [InlineData("XamlTemplateTests")]
-        [InlineData("XamlServicesTests")]
-        public async Task RunSuite(params string[] data)
-        {
-            string[] switches = new[] { "-verbose", "-catchexceptions", "-quietasserts" };
-
-            var args = new List<string>(switches);
-            foreach (var arg in data)
-            {
-                if (!arg.StartsWith("-"))
-                {
-                    args.Add("-suite");
-                }
-                args.Add(arg);
-            }
-
-            await StartSTATask(() => new XamlDrt(_testOutputHelper).RunTests(args.ToArray()));
-        }
-
-        private static Task StartSTATask(Action action)
-        {
-            var tcs = new TaskCompletionSource<object>();
-            var thread = new Thread(() =>
-            {
-                try
-                {
-                    action();
-                    tcs.SetResult(new object());
-                }
-                catch (Exception e)
-                {
-                    tcs.SetException(e);
-                }
-            });
-            thread.SetApartmentState(ApartmentState.STA);
-            thread.Start();
-            return tcs.Task;
-        }
-
-        private ITestOutputHelper _testOutputHelper;
-    }
     public sealed class XamlDrt : DrtBase
     {
         public void RunTests(params string[] args)
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/FriendWithKey/XamlTestClasses.FriendWithKey.csproj b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/FriendWithKey/XamlTestClasses.FriendWithKey.csproj
new file mode 100644
index 00000000000..0d96d982242
--- /dev/null
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/FriendWithKey/XamlTestClasses.FriendWithKey.csproj
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+    <PropertyGroup>
+    <AssemblyName>XamlTestClasses.FriendWithKey</AssemblyName>
+    <OutputType>Library</OutputType>
+    <DefineConstants>$(DefineConstants);OLDRESOURCES</DefineConstants>
+    <TestCode>true</TestCode>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="FriendWithKey.cs" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/FriendWithoutKey/XamlTestClasses.FriendWithoutKey.csproj b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/FriendWithoutKey/XamlTestClasses.FriendWithoutKey.csproj
new file mode 100644
index 00000000000..b3ad111fa7f
--- /dev/null
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/FriendWithoutKey/XamlTestClasses.FriendWithoutKey.csproj
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+    <PropertyGroup>
+    <AssemblyName>XamlTestClasses.FriendWithoutKey</AssemblyName>
+    <OutputType>Library</OutputType>
+    <DefineConstants>$(DefineConstants);OLDRESOURCES</DefineConstants>
+    <TestCode>true</TestCode>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <SignAssembly>false</SignAssembly>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="FriendWithoutKey.cs" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/PartialTrustTests/DrtXaml.PartialTrustTests.csproj b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/PartialTrustTests/DrtXaml.PartialTrustTests.csproj
new file mode 100644
index 00000000000..22e6c73fbf0
--- /dev/null
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/PartialTrustTests/DrtXaml.PartialTrustTests.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+    <PropertyGroup>
+    <AssemblyName>DrtXaml.PartialTrustTests</AssemblyName>
+    <OutputType>Library</OutputType>
+    <DefineConstants>$(DefineConstants);OLDRESOURCES</DefineConstants>
+    <TestCode>true</TestCode>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <AssemblyAttributeClsCompliant>false</AssemblyAttributeClsCompliant>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="NonPublicEvents.cs" />
+    <Compile Include="ObjectWriterNonPublic.cs" />
+    <!--<Compile Include="SystemXamlInternal.cs" />-->
+    <!-- Need our own local copy of this file, because DrtXaml is not APTCA -->
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\DrtXaml\DrtXaml.csproj"/>
+    <ProjectReference Include="..\XamlTestClasses\XamlTestClasses.csproj"/>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/XamlTestClasses/XamlTestClasses.csproj b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/XamlTestClasses/XamlTestClasses.csproj
index 72ccaf787f5..faf81e73e6e 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/XamlTestClasses/XamlTestClasses.csproj
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/XamlTestClasses/XamlTestClasses.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
   
   <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
+    <SignAssembly>false</SignAssembly>
     <AssemblyOriginatorKeyFile>DrtXaml.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/dirs.proj b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/dirs.proj
new file mode 100644
index 00000000000..a74471c0709
--- /dev/null
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/dirs.proj
@@ -0,0 +1,18 @@
+<Project ToolsVersion="dogfood" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!--Import the settings-->
+  <Import Project="$(_NTDRIVE)$(_NTROOT)\wpf\test\Microsoft.Wpf.Test.Native.Settings.Targets" />
+
+  <ItemGroup Condition="'$(BuildExePhase)' == '' AND '$(WPF_TESTBUILD_TARGETVERSION)' != 'v3.0' AND '$(WPF_TESTBUILD_TARGETVERSION)' != 'v3.5' ">
+    <ProjectFile Include="DrtXaml\DrtXaml.csproj" />
+    <ProjectFile Include="PartialTrustTests\DrtXaml.PartialTrustTests.csproj" />
+    <ProjectFile Include="XamlTestClasses\XamlTestClasses.csproj" />
+    <ProjectFile Include="BamlTestClasses35\BamlTestClasses35.csproj" />
+    <ProjectFile Include="BamlTestClasses40\BamlTestClasses40.csproj" />
+    <ProjectFile Include="BamlAvoidXmlTest\BamlAvoidXmlTest.csproj" />
+    <ProjectFile Include="FriendWithKey\XamlTestClasses.FriendWithKey.csproj" />
+    <ProjectFile Include="FriendWithoutKey\XamlTestClasses.FriendWithoutKey.csproj" />
+  </ItemGroup>
+
+  <!--Import the targets-->
+  <Import Project="$(_NTDRIVE)$(_NTROOT)\tools\Microsoft.DevDiv.Traversal.targets" />
+</Project>
diff --git a/src/Microsoft.DotNet.Wpf/test/Directory.Build.props b/src/Microsoft.DotNet.Wpf/test/Directory.Build.props
index 4ca582bca1e..730df2169f9 100644
--- a/src/Microsoft.DotNet.Wpf/test/Directory.Build.props
+++ b/src/Microsoft.DotNet.Wpf/test/Directory.Build.props
@@ -1,20 +1,61 @@
 <Project>
+  <Import Condition="Exists('../Directory.Build.props')" Project="../Directory.Build.props" />
+  
   <PropertyGroup>
-    <WpfTest>true</WpfTest>
+    <PublishRoot>$(WpfIntRootDirectory)publish\</PublishRoot>
+    <PlatformFolder>x86</PlatformFolder>
+    <PlatformFolder Condition="'$(Platform)' == 'x64'">x64</PlatformFolder>
   </PropertyGroup>
-  <Import Condition="Exists('../Directory.Build.props')" Project="../Directory.Build.props" />
+  
   <PropertyGroup>
-    <WpfTestsDir>$(MsBuildThisFileDirectory)</WpfTestsDir>
-    <SignAssembly>false</SignAssembly>
-    <IsTestProject>true</IsTestProject>
-    <IsShipping>false</IsShipping>
-    <EnableXlfLocalization>false</EnableXlfLocalization>
-    <CLSCompliant>false</CLSCompliant>
+    <WpfTestBasePath>$(MsBuildThisFileDirectory)</WpfTestBasePath>
+    <DrtCommonRoot>$(WpfTestBasePath)\Common\DRT</DrtCommonRoot>
+    <WpfSharedRoot>$(WpfTestBasePath)\Shared</WpfSharedRoot>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <Platforms>AnyCPU;x64</Platforms>
+    <RuntimeIdentifiers>win-x64;win-x86</RuntimeIdentifiers>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
+  
+  <Import Project="$(MsBuildThisFileDirectory)\Publish.props"/>
+  <Import Project="$(MsBuildThisFileDirectory)\StrongName.props"/>
+
   <ItemDefinitionGroup>
     <EmbeddedResource>
       <GenerateSource>false</GenerateSource>
     </EmbeddedResource>
+    
+    <PackageReference>
+      <PrivateAssets>contentfiles;analyzers;build</PrivateAssets>
+    </PackageReference>
   </ItemDefinitionGroup>
-  <Import Project="$(WpfTestsDir)MultiTargeting.props" />
+
+  <PropertyGroup>
+    <InternalUtilitiesProject>$(WpfTestBasePath)\Infra\TestUtilities\InternalUtilities\InternalUtilities.csproj</InternalUtilitiesProject>
+    <TestContractsProject>$(WpfTestBasePath)\Infra\CommunityChest\TestContracts\TestContracts.csproj</TestContractsProject>
+    <TestApiCoreProject>$(WpfTestBasePath)\Infra\TestApi\TestApiCore\Code\TestApiCore.csproj</TestApiCoreProject>
+    <TestRuntimeProject>$(WpfTestBasePath)\Common\TestRuntime\TestRuntime.csproj</TestRuntimeProject>
+    <TestServicesProject>$(WpfTestBasePath)\Common\Drt\TestServices\TestServices.csproj</TestServicesProject>
+    <QualityVaultUtilitiesProject>$(WpfTestBasePath)\Infra\QualityVault\QualityVaultUtilities\QualityVaultUtilities.csproj</QualityVaultUtilitiesProject>
+    <DrtToolsProject>$(WpfTestBasePath)\Common\DRT\Tools\DrtTools.csproj</DrtToolsProject>
+  </PropertyGroup>
+
+  <Import Project="$(MsBuildThisFileDirectory)\SourceLocations.props"/>
+
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <EnableDefaultItems>false</EnableDefaultItems>
+  </PropertyGroup>
+
+
+  <PropertyGroup>
+    <!-- CS0618 - UnmanagedType.Struct usage -->
+    <!-- VSTHRD002 - Synchronous awaits from IPC since we can't convert the entire logging/IPC mechanism to async -->
+    <!-- VSTHRD001 - Legacy sync code -->
+    <NoWarn>CS0618;VSTHRD002;VSTHRD001</NoWarn>
+    
+    <!-- Remove these when open sourcing -->
+    <NoWarn>$(NoWarn);CS3005;CS3001;CS3002;CS3003;CS0169</NoWarn>
+  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Wpf/test/Directory.Build.targets b/src/Microsoft.DotNet.Wpf/test/Directory.Build.targets
new file mode 100644
index 00000000000..c42bcba8ce7
--- /dev/null
+++ b/src/Microsoft.DotNet.Wpf/test/Directory.Build.targets
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <Import Condition="Exists('../Directory.Build.targets')" Project="../Directory.Build.targets" />
+  <Import Project="StrongName.targets" />
+  <Import Project="PublishAfterBuild.targets" />
+</Project>
diff --git a/src/Microsoft.DotNet.Wpf/test/Publish.props b/src/Microsoft.DotNet.Wpf/test/Publish.props
new file mode 100644
index 00000000000..d1401f44259
--- /dev/null
+++ b/src/Microsoft.DotNet.Wpf/test/Publish.props
@@ -0,0 +1,12 @@
+<Project>
+    <PropertyGroup>
+        <_IsPortable >true</_IsPortable>
+        <SelfContained >false</SelfContained>
+        <RuntimeIdentifier >win-x86</RuntimeIdentifier>
+        <RuntimeIdentifier Condition="'$(Platform)' == 'x64'">win-x64</RuntimeIdentifier>
+        <PublishDir>$(PublishRoot)$(Configuration)\$(PlatformFolder)</PublishDir>
+        <WpfTestBasePublishPath>$(PublishDir)\Test</WpfTestBasePublishPath>
+        <WpfFeatureTestBasePublishPath>$(WpfTestBasePublishPath)\FeatureTests</WpfFeatureTestBasePublishPath>
+        <WpfDrtTestBasePublishPath>$(WpfTestBasePublishPath)\DRT</WpfDrtTestBasePublishPath>
+    </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Wpf/test/PublishAfterBuild.targets b/src/Microsoft.DotNet.Wpf/test/PublishAfterBuild.targets
new file mode 100644
index 00000000000..32916f86819
--- /dev/null
+++ b/src/Microsoft.DotNet.Wpf/test/PublishAfterBuild.targets
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+   <Target Name="AfterBuild" DependsOnTargets="PublishPropertySetup;Publish"/> 
+  
+   <Target
+       Name="PublishPropertySetup">
+     <PropertyGroup>
+         <NoBuild>true</NoBuild>
+     </PropertyGroup>
+   </Target>
+</Project>
diff --git a/src/Microsoft.DotNet.Wpf/test/SourceLocations.props b/src/Microsoft.DotNet.Wpf/test/SourceLocations.props
new file mode 100644
index 00000000000..8b669d5ffd5
--- /dev/null
+++ b/src/Microsoft.DotNet.Wpf/test/SourceLocations.props
@@ -0,0 +1,1072 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <PropertyGroup>
+    <CommonCodeLocation>$(WpfTestBasePath)\Common\Code\Microsoft\Test</CommonCodeLocation>
+    <CommonCriticalCodeLocation>$(WpfTestBasePath)\Common\Code\Critical\Microsoft\Test</CommonCriticalCodeLocation>
+    <CommonDataLocation>$(WpfTestBasePath)\Common\Data</CommonDataLocation>
+  </PropertyGroup>
+
+  <!-- ClickOnce Helper -->
+  <ItemGroup>
+    <SourcesClickonceHelper Include="$(CommonCodeLocation)\Deployment\ClickOnceHelper.cs"> <Link>Test\Deployment\ClickOnceHelper.cs</Link> </SourcesClickonceHelper>
+  </ItemGroup>
+
+  <!-- Container -->
+  <ItemGroup>
+    <SourcesContainer Include="$(CommonCodeLocation)\Container\StorageRootWrapper.cs"> <Link>Test\Container\StorageRootWrapper.cs</Link> </SourcesContainer>
+  </ItemGroup>
+
+  <!-- Exception Validation -->
+  <ItemGroup>
+    <SourcesExceptionValidation Include="$(CommonCodeLocation)\Globalization\Exceptions.cs"> <Link>Test\Globalization\Exceptions.cs</Link> </SourcesExceptionValidation>
+  </ItemGroup>
+
+  <!-- MSBuild -->
+  <ItemGroup>
+    <SourcesMSBuildEngine Include="$(CommonCodeLocation)\MSBuildEngine\Compiler.cs"> <Link>Test\MSBuildEngine\Compiler.cs</Link> </SourcesMSBuildEngine>
+    <SourcesMSBuildEngine Include="$(CommonCodeLocation)\MSBuildEngine\ErrorCodes.cs"> <Link>Test\MSBuildEngine\ErrorCodes.cs</Link> </SourcesMSBuildEngine>
+    <SourcesMSBuildEngine Include="$(CommonCodeLocation)\MSBuildEngine\ErrorWarningParser.cs"> <Link>Test\MSBuildEngine\ErrorWarningParser.cs</Link> </SourcesMSBuildEngine>
+    <SourcesMSBuildEngine Include="$(CommonCodeLocation)\MSBuildEngine\IMSBuildLogger.cs"> <Link>Test\MSBuildEngine\IMSBuildLogger.cs</Link> </SourcesMSBuildEngine>
+    <SourcesMSBuildEngine Include="$(CommonCodeLocation)\MSBuildEngine\MSBuildCommonHelper.cs"> <Link>Test\MSBuildEngine\MSBuildCommonHelper.cs</Link> </SourcesMSBuildEngine>
+    <SourcesMSBuildEngine Include="$(CommonCodeLocation)\MSBuildEngine\MSBuildLogger.cs"> <Link>Test\MSBuildEngine\MSBuildLogger.cs</Link> </SourcesMSBuildEngine>
+    <SourcesMSBuildEngine Include="$(CommonCodeLocation)\MSBuildEngine\MSBuildPerf.cs"> <Link>Test\MSBuildEngine\MSBuildPerf.cs</Link> </SourcesMSBuildEngine>
+    <SourcesMSBuildEngine Include="$(CommonCodeLocation)\MSBuildEngine\MSBuildPerfLogger.cs"> <Link>Test\MSBuildEngine\MSBuildPerfLogger.cs</Link> </SourcesMSBuildEngine>
+    <SourcesMSBuildEngine Include="$(CommonCodeLocation)\MSBuildEngine\MSBuildProjExecutor.cs"> <Link>Test\MSBuildEngine\MSBuildProjExecutor.cs</Link> </SourcesMSBuildEngine>
+    <SourcesMSBuildEngine Include="$(CommonCodeLocation)\MSBuildEngine\CompilerHelper.cs"> <Link>Test\MSBuildEngine\CompilerHelper.cs</Link> </SourcesMSBuildEngine>
+  </ItemGroup>
+
+  <!-- AutoData -->
+  <ItemGroup>
+    <SourcesAutoData Include="$(CommonCodeLocation)\Globalization\AutoDataEnums.cs"> <Link>Test\Globalization\AutoDataEnums.cs</Link> </SourcesAutoData>
+    <SourcesAutoData Include="$(CommonCodeLocation)\Globalization\extract.cs"> <Link>Test\Globalization\extract.cs</Link> </SourcesAutoData>
+    <SourcesAutoData Include="$(CommonCodeLocation)\Globalization\generate.cs"> <Link>Test\Globalization\generate.cs</Link> </SourcesAutoData>
+    <SourcesAutoData Include="$(CommonCodeLocation)\Globalization\LangPackHelper.cs"> <Link>Test\Globalization\LangPackHelper.cs</Link> </SourcesAutoData>
+  </ItemGroup>
+
+  <!-- ETW Logging Code -->
+  <ItemGroup>
+    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\ClrTraceEventParser.cs"> <Link>Test\EventTracing\ClrTraceEventParser.cs</Link> </SourcesETWLogging >
+    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\DynamicTraceEventParser.cs"> <Link>Test\EventTracing\DynamicTraceEventParser.cs</Link> </SourcesETWLogging >
+    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\ETWTraceEventSource.cs"> <Link>Test\EventTracing\ETWTraceEventSource.cs</Link> </SourcesETWLogging >
+    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\KernelTraceEventParser.cs"> <Link>Test\EventTracing\KernelTraceEventParser.cs</Link> </SourcesETWLogging >
+    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\Manifest.cs"> <Link>Test\EventTracing\Manifest.cs</Link> </SourcesETWLogging >
+    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\SymbolEventParser.cs"> <Link>Test\EventTracing\SymbolEventParser.cs</Link> </SourcesETWLogging >
+    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\SymbolResolver.cs"> <Link>Test\EventTracing\SymbolResolver.cs</Link> </SourcesETWLogging >
+    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\TraceEvent.cs"> <Link>Test\EventTracing\TraceEvent.cs</Link> </SourcesETWLogging >
+    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\TraceEventNativeMethods.cs"> <Link>Test\TraceEventNativeMethods.cs</Link> </SourcesETWLogging >
+    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\TraceEventSession.cs"> <Link>Test\EventTracing\TraceEventSession.cs</Link> </SourcesETWLogging >
+    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\TraceLog.cs"> <Link>Test\EventTracing\TraceLog.cs</Link> </SourcesETWLogging >
+    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\Utility.cs"> <Link>Test\EventTracing\Utility.cs</Link> </SourcesETWLogging >
+    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\WPFTraceEventParser.cs"> <Link>Test\EventTracing\WPFTraceEventParser.cs</Link> </SourcesETWLogging >
+
+    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\Utilities\CompressedStream.cs"> <Link>Test\EventTracing\Utilities\CompressedStream.cs</Link> </SourcesETWLogging >
+    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\Utilities\FastSerialization.cs"> <Link>Test\EventTracing\Utilities\FastSerialization.cs</Link> </SourcesETWLogging >
+    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\Utilities\GrowableArray.cs"> <Link>Test\EventTracing\Utilities\GrowableArray.cs</Link> </SourcesETWLogging >
+    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\Utilities\StreamReaderWriter.cs"> <Link>Test\EventTracing\Utilities\StreamReaderWriter.cs</Link> </SourcesETWLogging >
+    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\Utilities\StreamUtilities.cs"> <Link>Test\EventTracing\Utilities\StreamUtilities.cs</Link> </SourcesETWLogging >
+    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\Utilities\XmlUtilities.cs"> <Link>Test\EventTracing\Utilities\XmlUtilities.cs</Link> </SourcesETWLogging >
+  </ItemGroup>
+
+  <!-- Managed Resources AutoData  -->
+  <ItemGroup>
+    <ManagedResourcesAutoData Include="$(CommonCodeLocation)\Globalization\ChineseSimplified.txt">
+      <LogicalName>ChineseSimplified.txt</LogicalName>
+      <Link>Resources\Globalization\ChineseSimplified.txt</Link>
+    </ManagedResourcesAutoData>
+    <ManagedResourcesAutoData Include="$(CommonCodeLocation)\Globalization\ChineseTraditional.txt">
+      <LogicalName>ChineseTraditional.txt</LogicalName>
+      <Link>Resources\Globalization\ChineseTraditional.txt</Link>
+    </ManagedResourcesAutoData>
+    <ManagedResourcesAutoData Include="$(CommonCodeLocation)\Globalization\Japanese.txt">
+      <LogicalName>Japanese.txt</LogicalName>
+      <Link>Resources\Globalization\Japanese.txt</Link>
+    </ManagedResourcesAutoData>
+    <ManagedResourcesAutoData Include="$(CommonCodeLocation)\Globalization\Korean.txt">
+      <LogicalName>Korean.txt</LogicalName>
+      <Link>Resources\Globalization\Korean.txt</Link>
+    </ManagedResourcesAutoData>
+    <ManagedResourcesAutoData Include="$(CommonCodeLocation)\Globalization\ProblemDate.xml">
+      <LogicalName>ProblemDate.xml</LogicalName>
+      <Link>Resources\Globalization\ProblemDate.xml</Link>
+    </ManagedResourcesAutoData>
+    <ManagedResourcesAutoData Include="$(CommonCodeLocation)\Globalization\ProblemString.xml">
+      <LogicalName>ProblemString.xml</LogicalName>
+      <Link>Resources\Globalization\ProblemString.xml</Link>
+    </ManagedResourcesAutoData>
+  </ItemGroup>
+
+  <!-- Markup -->
+  <ItemGroup>
+    <SourcesMarkup Include="$(CommonCodeLocation)\Markup\ModifyXaml.cs"> <Link>Test\Markup\ModifyXaml.cs</Link> </SourcesMarkup>
+    <SourcesMarkup Include="$(CommonCodeLocation)\Markup\WPFLibraryGenerator.cs"> <Link>Test\Markup\WPFLibraryGenerator.cs</Link> </SourcesMarkup>
+    <SourcesMarkup Include="$(CommonCodeLocation)\Markup\WPFTreeGenerator.cs"> <Link>Test\Markup\WPFTreeGenerator.cs</Link> </SourcesMarkup>
+    <SourcesMarkup Include="$(CommonCodeLocation)\Markup\WPFXamlGenerator.cs"> <Link>Test\Markup\WPFXamlGenerator.cs</Link> </SourcesMarkup>
+    <SourcesMarkup Include="$(CommonCodeLocation)\Markup\XamlGenerator.cs"> <Link>Test\Markup\XamlGenerator.cs</Link> </SourcesMarkup>
+    <SourcesMarkup Include="$(CommonCodeLocation)\Markup\XmlGenerator.cs"> <Link>Test\Markup\XmlGenerator.cs</Link> </SourcesMarkup>
+    <SourcesMarkup Include="$(CommonCodeLocation)\Markup\XamlComparer.cs"> <Link>Test\Markup\XamlComparer.cs</Link> </SourcesMarkup>
+    <SourcesMarkup Include="$(CommonCodeLocation)\Markup\XamlTestDocument.cs"> <Link>Test\Markup\XamlTestDocument.cs</Link> </SourcesMarkup>
+  </ItemGroup>
+
+  <!-- Windows Forms -->
+  <ItemGroup>
+    <SourcesWindowsForms Include="$(CommonCodeLocation)\WindowsForms\Application.cs"> <Link>Test\WindowsForms\Application.cs</Link> </SourcesWindowsForms>
+    <SourcesWindowsForms Include="$(CommonCodeLocation)\WindowsForms\WindowsFormsSource.cs"> <Link>Test\WindowsForms\WindowsFormsSource.cs</Link> </SourcesWindowsForms>
+  </ItemGroup>
+
+  <!-- AppMonitor -->
+  <ItemGroup>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\ApplicationDeploymentHelper.cs"> <Link>Test\Loaders\ApplicationDeploymentHelper.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\ApplicationMonitorTest.cs"> <Link>Test\Loaders\ApplicationMonitorTest.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\ApplicationMonitor.cs"> <Link>Test\Loaders\ApplicationMonitor.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\ApplicationMonitorConfig.cs"> <Link>Test\Loaders\ApplicationMonitorConfig.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\FileHost.cs"> <Link>Test\Loaders\FileHost.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\IXamlLauncher.cs"> <Link>Test\Loaders\IXamlLauncher.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\LoaderStep.cs"> <Link>Test\Loaders\LoaderStep.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\ResourceHelper.cs"> <Link>Test\Loaders\ResourceHelper.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\FireFoxAutomationHelper.cs"> <Link>Test\Loaders\FireFoxAutomationHelper.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\UIHandler.cs"> <Link>Test\Loaders\UIHandler.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\ActivationStep.cs"> <Link>Test\Loaders\Steps\ActivationStep.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\FileHostStep.cs"> <Link>Test\Loaders\Steps\FileHostStep.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\HostingRuntimePolicyHelper.cs"> <Link>Test\Loaders\Steps\HostingRuntimePolicyHelper.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\LoggingSteps.cs"> <Link>Test\Loaders\Steps\LoggingSteps.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\VersionHelper.cs"> <Link>Test\Loaders\Steps\VersionHelper.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\RegistryStep.cs"> <Link>Test\Loaders\Steps\RegistryStep.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\UIHandlers\DefaultHandlers.cs"> <Link>Test\Loaders\UIHandlers\DefaultHandlers.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\Scripter.cs"> <Link>Test\Loaders\Steps\Scripter.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\String.cs"> <Link>Test\Loaders\Steps\String.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\Win32.cs"> <Link>Test\Loaders\Steps\Win32.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\Resources.cs"> <Link>Test\Loaders\Steps\Resources.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\Registry.cs"> <Link>Test\Loaders\Steps\Registry.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\Tests.cs"> <Link>Test\Loaders\Steps\Tests.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\Diagnostics.cs"> <Link>Test\Loaders\Steps\Diagnostics.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\IO.cs"> <Link>Test\Loaders\Steps\IO.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\UI.cs"> <Link>Test\Loaders\Steps\UI.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\XML.cs"> <Link>Test\Loaders\Steps\XML.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\Input.cs"> <Link>Test\Loaders\Steps\Input.cs</Link> </SourcesAppMonitor>
+    <!--<SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\Security.cs"> <Link>Test\Loaders\Steps\Security.cs</Link> </SourcesAppMonitor>-->
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\Reflection.cs"> <Link>Test\Loaders\Steps\Reflection.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\Avalon.cs"> <Link>Test\Loaders\Steps\Avalon.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\Collections.cs"> <Link>Test\Loaders\Steps\Collections.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\Environment.cs"> <Link>Test\Loaders\Steps\Environment.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\ScripterStep.cs"> <Link>Test\Loaders\Steps\ScripterStep.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\UIHandlers\CustomUIHandler.cs"> <Link>Test\Loaders\UIHandlers\CustomUIHandler.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\ConfigFileStep.cs"> <Link>Test\Loaders\Steps\ConfigFileStep.cs</Link> </SourcesAppMonitor>
+    <!--<SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\BrowserStateStep.cs"> <Link>Test\Loaders\Steps\BrowserStateStep.cs</Link> </SourcesAppMonitor>-->
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\IENavigationHelper.cs"> <Link>Test\Loaders\IENavigationHelper.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\MachineInfoStepDisabler.cs"> <Link>Test\Loaders\Steps\MachineInfoStepDisabler.cs</Link> </SourcesAppMonitor>
+  </ItemGroup>
+
+  <!-- Managed Resources AppMonitor -->
+  <ItemGroup>
+    <!--<ManagedResourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\clickoncetest.pfx">
+      <LogicalName>clickoncetest.pfx</LogicalName>
+      <Link>Resources\Loaders\clickoncetest.pfx</Link>
+    </ManagedResourcesAppMonitor>-->
+    <ManagedResourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\NamedRegistrations.xml">
+      <LogicalName>NamedRegistrations.xml</LogicalName>
+      <Link>Resources\Loaders\NamedRegistrations.xml</Link>
+    </ManagedResourcesAppMonitor>
+    <ManagedResourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\ErrorCodes.xml">
+      <LogicalName>ErrorCodes.xml</LogicalName>
+      <Link>Resources\Loaders\ErrorCodes.xml</Link>
+    </ManagedResourcesAppMonitor>
+  </ItemGroup>
+
+  <!-- Threading -->
+  <ItemGroup>
+    <SourcesThreading Include="$(CommonCodeLocation)\Threading\DispatcherHelper.cs"> <Link>Test\Threading\DispatcherHelper.cs</Link> </SourcesThreading>
+    <SourcesThreading Include="$(CommonCodeLocation)\Threading\DispatcherQueueWrapper.cs"> <Link>Test\Threading\DispatcherQueueWrapper.cs</Link> </SourcesThreading>
+    <SourcesThreading Include="$(CommonCodeLocation)\Threading\DispatcherTimerHelper.cs"> <Link>Test\Threading\DispatcherTimerHelper.cs</Link> </SourcesThreading>
+    <SourcesThreading Include="$(CommonCodeLocation)\Threading\DispatcherPriorityHelper.cs"> <Link>Test\Threading\DispatcherPriorityHelper.cs</Link> </SourcesThreading>
+    <SourcesThreading Include="$(CommonCodeLocation)\Threading\DispatcherSignalHelper.cs"> <Link>Test\Threading\DispatcherSignalHelper.cs</Link> </SourcesThreading>
+  </ItemGroup>
+
+  <!-- Security -->
+  <ItemGroup>
+    <SourcesSecurity Include="$(CommonCodeLocation)\Security\Secure.cs"> <Link>Test\Security\Secure.cs</Link> </SourcesSecurity>
+  </ItemGroup>
+
+  <!-- Security Wrappers -->
+  <ItemGroup>
+    <SourcesSecurityWrappers Include="$(CommonCodeLocation)\Security\Wrappers\TestAPISw.cs"> <Link>Test\Security\Wrappers\TestAPISw.cs</Link> </SourcesSecurityWrappers>
+    <SourcesSecurityWrappers Include="$(CommonCodeLocation)\Security\Wrappers\AvalonWrappers.cs"> <Link>Test\Security\Wrappers\AvalonWrappers.cs</Link> </SourcesSecurityWrappers>
+    <SourcesSecurityWrappers Include="$(CommonCodeLocation)\Security\Wrappers\WrapperClasses.cs"> <Link>Test\Security\Wrappers\WrapperClasses.cs</Link> </SourcesSecurityWrappers>
+    <!-- Include 4.0 Wrappers based on build target version -->
+    <SourcesSecurityWrappers Include="$(CommonCodeLocation)\Security\Wrappers\WrapperClasses40.cs" Condition="'$(WPF_TESTBUILD_TARGETVERSION)' != 'v3.0' AND '$(WPF_TESTBUILD_TARGETVERSION)' != 'v3.5'"> <Link>Test\Security\Wrappers\WrapperClasses40.cs</Link> </SourcesSecurityWrappers>
+  </ItemGroup>
+
+  <!-- Display Minimal -->
+  <ItemGroup>
+    <SourcesDisplayMinimal Include="$(CommonCodeLocation)\Display\DisplayConfiguration.cs"> <Link>Test\Display\DisplayConfiguration.cs</Link> </SourcesDisplayMinimal>
+    <SourcesDisplayMinimal Include="$(CommonCodeLocation)\Display\DisplaySettings.cs"> <Link>Test\Display\DisplaySettings.cs</Link> </SourcesDisplayMinimal>
+    <SourcesDisplayMinimal Include="$(CommonCodeLocation)\Display\DisplaySettingsInfo.cs"> <Link>Test\Display\DisplaySettingsInfo.cs</Link> </SourcesDisplayMinimal>
+    <SourcesDisplayMinimal Include="$(CommonCodeLocation)\Display\DwmApi.cs"> <Link>Test\Display\DwmApi.cs</Link> </SourcesDisplayMinimal>
+    <SourcesDisplayMinimal Include="$(CommonCodeLocation)\Display\Monitor.cs"> <Link>Test\Display\Monitor.cs</Link> </SourcesDisplayMinimal>
+  </ItemGroup>
+
+  <!-- Display -->
+  <ItemGroup>
+    <SourcesDisplay Include="$(CommonCodeLocation)\Display\Desktop.cs"> <Link>Test\Display\Desktop.cs</Link> </SourcesDisplay>
+    <SourcesDisplay Include="@(SourcesDisplayMinimal)" />
+  </ItemGroup>
+
+  <!-- Leak Testing -->
+  <ItemGroup>
+    <SourcesLeak Include="$(CommonCodeLocation)\Leak\LeakTest.cs"> <Link>Test\Leak\LeakTest.cs</Link> </SourcesLeak>    
+  </ItemGroup>
+
+  <!-- Test Types -->
+  <ItemGroup>
+    <SourcesTestTypes Include="$(CommonCodeLocation)\TestTypes\AvalonModel.cs"> <Link>Test\TestTypes\AvalonModel.cs</Link> </SourcesTestTypes>
+    <SourcesTestTypes Include="$(CommonCodeLocation)\TestTypes\AvalonTest.cs"> <Link>Test\TestTypes\AvalonTest.cs</Link> </SourcesTestTypes>
+    <SourcesTestTypes Include="$(CommonCodeLocation)\TestTypes\ETWVerificationTest.cs"> <Link>Test\TestTypes\ETWVerificationTest.cs</Link> </SourcesTestTypes>
+    <SourcesTestTypes Include="$(CommonCodeLocation)\TestTypes\StepsTest.cs"> <Link>Test\TestTypes\StepsTest.cs</Link> </SourcesTestTypes>
+    <SourcesTestTypes Include="$(CommonCodeLocation)\TestTypes\WindowModel.cs"> <Link>Test\TestTypes\WindowModel.cs</Link> </SourcesTestTypes>
+    <SourcesTestTypes Include="$(CommonCodeLocation)\TestTypes\WindowTest.cs"> <Link>Test\TestTypes\WindowTest.cs</Link> </SourcesTestTypes>
+    <SourcesTestTypes Include="$(CommonCodeLocation)\TestTypes\WindowUtil.cs"> <Link>Test\TestTypes\WindowUtil.cs</Link> </SourcesTestTypes>
+    <SourcesTestTypes Include="$(CommonCodeLocation)\TestTypes\XamlModel.cs"> <Link>Test\TestTypes\XamlModel.cs</Link> </SourcesTestTypes>
+    <SourcesTestTypes Include="$(CommonCodeLocation)\TestTypes\XamlTest.cs"> <Link>Test\TestTypes\XamlTest.cs</Link> </SourcesTestTypes>
+    <SourcesTestTypes Include="$(CommonCodeLocation)\TestTypes\XamlVisualVerificationTest.cs"> <Link>Test\TestTypes\XamlVisualVerificationTest.cs</Link> </SourcesTestTypes>
+  </ItemGroup>
+
+  <!-- Drt -->
+  <ItemGroup>
+    <SourcesDrt Include="$(CommonCodeLocation)\Drt\DrtRunner.cs"> <Link>Test\Drt\DrtRunner.cs</Link> </SourcesDrt>
+  </ItemGroup>
+
+  <!-- Verification -->
+  <ItemGroup>
+    <SourcesVerification Include="$(CommonCodeLocation)\Verification\IVerifier.cs"> <Link>Test\Verification\IVerifier.cs</Link> </SourcesVerification>
+    <SourcesVerification Include="$(CommonCodeLocation)\Verification\IVerifyResult.cs"> <Link>Test\Verification\IVerifyResult.cs</Link> </SourcesVerification>
+    <SourcesVerification Include="$(CommonCodeLocation)\Verification\VerifyResult.cs"> <Link>Test\Verification\VerifyResult.cs</Link> </SourcesVerification>
+  </ItemGroup>
+
+  <!-- Input Minimal -->
+  <ItemGroup>
+    <SourcesInputMinimal Include="$(CommonCodeLocation)\Input\InputHelper.cs"> <Link>Test\Input\InputHelper.cs</Link> </SourcesInputMinimal>
+  </ItemGroup>
+
+  <!-- Input -->
+  <ItemGroup>
+    <SourcesInput Include="$(CommonCodeLocation)\Input\Input.cs"> <Link>Test\Input\Input.cs</Link> </SourcesInput>
+    <SourcesInput Include="$(CommonCodeLocation)\Input\NativeMethods.cs"> <Link>Test\Input\NativeMethods.cs</Link> </SourcesInput>
+    <SourcesInput Include="$(CommonCodeLocation)\Input\SafeNativeMethods.cs"> <Link>Test\Input\SafeNativeMethods.cs</Link> </SourcesInput>
+    <SourcesInput Include="$(CommonCodeLocation)\Input\UnsafeNativeMethods.cs"> <Link>Test\Input\UnsafeNativeMethods.cs</Link> </SourcesInput>
+    <SourcesInput Include="$(CommonCodeLocation)\Input\InputManagerWrapper.cs"> <Link>Test\Input\InputManagerWrapper.cs</Link> </SourcesInput>
+    <SourcesInput Include="$(CommonCodeLocation)\Input\KeyboardRecorder.cs"> <Link>Test\Input\KeyboardRecorder.cs</Link> </SourcesInput>
+    <SourcesInput Include="$(CommonCodeLocation)\Input\RawMouseActions.cs"> <Link>Test\Input\RawMouseActions.cs</Link> </SourcesInput>
+    <SourcesInput Include="$(CommonCodeLocation)\Input\InputReportEventArgsWrapper.cs"> <Link>Test\Input\InputReportEventArgsWrapper.cs</Link> </SourcesInput>
+    <SourcesInput Include="$(CommonCodeLocation)\Input\RawKeyboardActions.cs"> <Link>Test\Input\RawKeyboardActions.cs</Link> </SourcesInput>
+    <SourcesInput Include="$(CommonCodeLocation)\Input\RawMouseInputReportWrapper.cs"> <Link>Test\Input\RawMouseInputReportWrapper.cs</Link> </SourcesInput>
+    <SourcesInput Include="$(CommonCodeLocation)\Input\RawMouseState.cs"> <Link>Test\Input\RawMouseState.cs</Link> </SourcesInput>
+    <SourcesInput Include="$(CommonCodeLocation)\Input\RawKeyboardInputReportWrapper.cs"> <Link>Test\Input\RawKeyboardInputReportWrapper.cs</Link> </SourcesInput>
+    <SourcesInput Include="$(CommonCodeLocation)\Input\InputReportWrapper.cs"> <Link>Test\Input\InputReportWrapper.cs</Link> </SourcesInput>
+    <SourcesInput Include="$(CommonCodeLocation)\Input\KeyboardPlayer.cs"> <Link>Test\Input\KeyboardPlayer.cs</Link> </SourcesInput>
+    <SourcesInput Include="$(CommonCodeLocation)\Input\RawKeyboardState.cs"> <Link>Test\Input\RawKeyboardState.cs</Link> </SourcesInput>
+    <SourcesInput Include="$(CommonCodeLocation)\Input\RawTextInputReportWrapper.cs"> <Link>Test\Input\RawTextInputReportWrapper.cs</Link> </SourcesInput>
+    <SourcesInput Include="$(CommonCodeLocation)\Input\MultiMonitorHelper.cs"> <Link>Test\Input\MultiMonitorHelper.cs</Link> </SourcesInput>
+    <SourcesInput Include="$(CommonCodeLocation)\Input\UserInput.cs"> <Link>Test\Input\UserInput.cs</Link> </SourcesInput>
+    <SourcesInput Include="@(SourcesInputMinimal)" />
+  </ItemGroup>
+
+  <!-- Hosting/Xaml Browser Host- TODO: the name should be fixed. -->
+  <ItemGroup>
+    <SourcesXamlBrowserHost Include="$(CommonCodeLocation)\Hosting\UiaDistributedStepInfo.cs"> <Link>Test\Hosting\UiaDistributedStepInfo.cs</Link> </SourcesXamlBrowserHost>
+    <SourcesXamlBrowserHost Include="$(CommonCodeLocation)\Hosting\UiaDistributedStepTarget.cs"> <Link>Test\Hosting\UiaDistributedStepTarget.cs</Link> </SourcesXamlBrowserHost>
+    <SourcesXamlBrowserHost Include="$(CommonCodeLocation)\Hosting\UiaDistributedTestcase.cs"> <Link>Test\Hosting\UiaDistributedTestcase.cs</Link> </SourcesXamlBrowserHost>
+    <SourcesXamlBrowserHost Include="$(CommonCodeLocation)\Hosting\UiaDistributedTestCaseHost.cs"> <Link>Test\Hosting\UiaDistributedTestCaseHost.cs</Link> </SourcesXamlBrowserHost>
+    <SourcesXamlBrowserHost Include="$(CommonCodeLocation)\Hosting\UiaSimpleTestCase.cs"> <Link>Test\Hosting\UiaSimpleTestCase.cs</Link> </SourcesXamlBrowserHost>
+    <SourcesXamlBrowserHost Include="$(CommonCodeLocation)\Hosting\UiaTestState.cs"> <Link>Test\Hosting\UiaTestState.cs</Link> </SourcesXamlBrowserHost>
+
+    <SourcesXamlBrowserHost Include="$(CommonCodeLocation)\Hosting\XamlBrowserHost.cs"> <Link>Test\Hosting\XamlBrowserHost.cs</Link> </SourcesXamlBrowserHost>
+  </ItemGroup>
+
+  <!-- Object Serializer -->
+  <ItemGroup>
+    <SourcesObjectserializer Include="$(CommonCriticalCodeLocation)\Serialization\ObjectSerializer.cs"> <Link>Critical\Test\Serialization\ObjectSerializer.cs</Link> </SourcesObjectserializer>
+    <SourcesObjectserializer Include="$(CommonCriticalCodeLocation)\Serialization\DefaultObjectSerializer.cs"> <Link>Critical\Test\Serialization\DefaultObjectSerializer.cs</Link> </SourcesObjectserializer>
+  </ItemGroup>
+
+ <!-- Runtime Logging Sources -->
+  <ItemGroup>
+    <SharedRuntimeLoggingSources Include="$(CommonCriticalCodeLocation)\Logging\TestResult.cs"> <Link>Critical\Test\Logging\TestResult.cs</Link> </SharedRuntimeLoggingSources>
+    <SharedRuntimeLoggingSources Include="$(CommonCriticalCodeLocation)\Logging\IHarnessLoggingContract.cs"> <Link>Critical\Test\Logging\IHarnessLoggingContract.cs</Link> </SharedRuntimeLoggingSources>
+  </ItemGroup>
+
+  <!-- Logging -->
+  <ItemGroup>
+    <SourcesLogging Include="@(SharedRuntimeLoggingSources)" />
+    <SourcesLogging Include="$(CommonCodeLocation)\Logging\TestLog.cs"> <Link>Test\Logging\TestLog.cs</Link> </SourcesLogging>
+    <SourcesLogging Include="$(CommonCodeLocation)\Logging\TestStage.cs"> <Link>Test\Logging\TestStage.cs</Link> </SourcesLogging>
+    <SourcesLogging Include="$(CommonCodeLocation)\Logging\GlobalLog.cs"> <Link>Test\Logging\GlobalLog.cs</Link> </SourcesLogging>
+  </ItemGroup>
+
+  <!-- System Information -->
+  <ItemGroup>
+    <SourcesSystemInfo Include="$(CommonCodeLocation)\Diagnostics\SystemInformation.cs"> <Link>Test\Diagnostics\SystemInformation.cs</Link> </SourcesSystemInfo>
+    <SourcesSystemInfo Include="$(CommonCodeLocation)\Diagnostics\ProcessorInformation.cs"> <Link>Test\Diagnostics\ProcessorInformation.cs</Link> </SourcesSystemInfo>
+    <SourcesSystemInfo Include="$(CommonCodeLocation)\Diagnostics\SystemMetrics.cs"> <Link>Test\Diagnostics\SystemMetrics.cs</Link> </SourcesSystemInfo>
+  </ItemGroup>
+
+  <!-- System Information WPF-->
+  <ItemGroup>
+    <SourcesSystemInfoWpf Include="$(CommonCodeLocation)\Diagnostics\SystemInformation_Wpf.cs"> <Link>Test\Diagnostics\SystemInformation_Wpf.cs</Link> </SourcesSystemInfoWpf>
+  </ItemGroup>
+
+  <!-- System Information WindowsMediaPlayer-->
+  <ItemGroup>
+    <SourcesSystemInfoMediaPlayer Include="$(CommonCodeLocation)\Diagnostics\SystemInformation_WindowsMediaPlayer.cs"> <Link>Test\Diagnostics\SystemInformation_WindowsMediaPlayer.cs</Link> </SourcesSystemInfoMediaPlayer>
+  </ItemGroup>
+
+  <!-- Process Monitor -->
+  <ItemGroup>
+    <SourcesProcessmonitor Include="$(CommonCodeLocation)\Diagnostics\ProcessMonitor.cs"> <Link>Test\Diagnostics\ProcessMonitor.cs</Link> </SourcesProcessmonitor>
+  </ItemGroup>
+
+  <!-- Process Helper -->
+  <ItemGroup>
+    <SourcesProcessHelper Include="$(CommonCodeLocation)\Diagnostics\ProcessHelper.cs"> <Link>Test\Diagnostics\ProcessHelper.cs</Link> </SourcesProcessHelper>
+    <SourcesProcessHelper Include="$(CommonCodeLocation)\Diagnostics\ProcessGroup.cs"> <Link>Test\Diagnostics\ProcessGroup.cs</Link> </SourcesProcessHelper>
+    <SourcesProcessHelper Include="$(CommonCodeLocation)\Diagnostics\ManifestHelper.cs"> <Link>Test\Diagnostics\ManifestHelper.cs</Link> </SourcesProcessHelper>
+  </ItemGroup>
+
+  <!-- Loaders -->
+  <ItemGroup>
+    <SourcesLoaders Include="@(SourcesProcessMonitor)" />
+  </ItemGroup>
+
+  <!-- Debugging -->
+  <ItemGroup>
+    <SourcesDebugging Include="$(CommonCodeLocation)\Diagnostics\CdbSession.cs"><Link>Test\Diagnostics\CdbSession.cs</Link> </SourcesDebugging>
+  </ItemGroup>
+
+  <!-- State Management Runtime -->
+  <ItemGroup>
+    <SourcesStateManagementRuntime Include="$(CommonCodeLocation)\Configuration\MachineStateManager.cs"> <Link>Test\Configuration\MachineStateManager.cs</Link> </SourcesStateManagementRuntime>
+  </ItemGroup>
+
+  <!-- State Management -->
+  <ItemGroup>
+    <SourcesStateManagement Include="$(CommonCodeLocation)\StateManagement\StateManager.cs"> <Link>Test\StateManagement\StateManager.cs</Link> </SourcesStateManagement>
+    <SourcesStateManagement Include="$(CommonCodeLocation)\StateManagement\State.cs"> <Link>Test\StateManagement\State.cs</Link> </SourcesStateManagement>
+    <SourcesStateManagement Include="$(CommonCodeLocation)\StateManagement\RegistryState.cs"> <Link>Test\StateManagement\RegistryState.cs</Link> </SourcesStateManagement>
+    <SourcesStateManagement Include="$(CommonCodeLocation)\StateManagement\UserSessionState.cs"> <Link>Test\StateManagement\UserSessionState.cs</Link> </SourcesStateManagement>
+    <SourcesStateManagement Include="$(CommonCodeLocation)\StateManagement\SystemInformationState.cs"> <Link>Test\StateManagement\SystemInformationState.cs</Link> </SourcesStateManagement>
+    <SourcesStateManagement Include="$(CommonCodeLocation)\StateManagement\MonitorState.cs"> <Link>Test\StateManagement\MonitorState.cs</Link> </SourcesStateManagement>
+    <SourcesStateManagement Include="$(CommonCodeLocation)\StateManagement\DisplayThemeState.cs"> <Link>Test\StateManagement\DisplayThemeState.cs</Link> </SourcesStateManagement>
+    <SourcesStateManagement Include="$(CommonCodeLocation)\StateManagement\BrowserState.cs"> <Link>Test\StateManagement\BrowserState.cs</Link> </SourcesStateManagement>
+    <SourcesStateManagement Include="$(CommonCodeLocation)\StateManagement\FirewallExceptionState.cs"> <Link>Test\StateManagement\FirewallExceptionState.cs</Link> </SourcesStateManagement>
+    <SourcesStateManagement Include="$(CommonCodeLocation)\StateManagement\ComServerState.cs"> <Link>Test\StateManagement\ComServerState.cs</Link> </SourcesStateManagement>
+  </ItemGroup>
+
+  <!-- Execution Service Client -->
+  <ItemGroup>
+    <SourcesExecutionServiceClient Include="$(CommonCodeLocation)\Diagnostics\IExecutionService.cs"> <Link>Test\Diagnostics\IExecutionService.cs</Link> </SourcesExecutionServiceClient>
+    <SourcesExecutionServiceClient Include="$(CommonCodeLocation)\Diagnostics\ExecutionServiceClient.cs"> <Link>Test\Diagnostics\ExecutionServiceClient.cs</Link> </SourcesExecutionServiceClient>
+    <SourcesExecutionServiceClient Include="$(CommonCodeLocation)\Diagnostics\ExecutionServiceClientConnection.cs"> <Link>Test\Diagnostics\ExecutionServiceClientConnection.cs</Link> </SourcesExecutionServiceClient>
+    <SourcesExecutionServiceClient Include="$(CommonCodeLocation)\Diagnostics\FirefoxHelper.cs"> <Link>Test\Diagnostics\FirefoxHelper.cs</Link> </SourcesExecutionServiceClient>
+    <SourcesExecutionServiceClient Include="$(CommonCodeLocation)\Diagnostics\FirewallHelper.cs"> <Link>Test\Diagnostics\FirewallHelper.cs</Link> </SourcesExecutionServiceClient>
+    <SourcesExecutionServiceClient Include="$(CommonCodeLocation)\Diagnostics\RegistrationHelper.cs"> <Link>Test\Diagnostics\RegistrationHelper.cs</Link> </SourcesExecutionServiceClient>
+    <SourcesExecutionServiceClient Include="$(CommonCodeLocation)\Diagnostics\UserSessionHelper.cs"> <Link>Test\Diagnostics\UserSessionHelper.cs</Link> </SourcesExecutionServiceClient>
+    <SourcesExecutionServiceClient Include="$(CommonCodeLocation)\Diagnostics\UserInfo.cs"> <Link>Test\Diagnostics\UserInfo.cs</Link> </SourcesExecutionServiceClient>
+    <SourcesExecutionServiceClient Include="$(CommonCodeLocation)\Diagnostics\WttHelper.cs"> <Link>Test\Diagnostics\WttHelper.cs</Link> </SourcesExecutionServiceClient>
+    <SourcesExecutionServiceClient Include="$(CommonCodeLocation)\Diagnostics\ImpersonateUserHelper.cs"> <Link>Test\Diagnostics\ImpersonateUserHelper.cs</Link> </SourcesExecutionServiceClient>
+    <SourcesExecutionServiceClient Include="$(CommonCriticalCodeLocation)\Deployment\RuntimeDeploymentHelper.cs"> <Link>Critical\Test\Deployment\RuntimeDeploymentHelper.cs</Link> </SourcesExecutionServiceClient>
+  </ItemGroup>
+
+  <!-- Execution Service -->
+  <ItemGroup>
+    <SourcesExecutionservice Include="$(CommonCodeLocation)\Diagnostics\ExecutionServiceProxyClient.cs"> <Link>Test\Diagnostics\ExecutionServiceProxyClient.cs</Link> </SourcesExecutionservice>
+    <SourcesExecutionservice Include="$(CommonCodeLocation)\Diagnostics\ExecutionServiceProxy.cs"> <Link>Test\Diagnostics\ExecutionServiceProxy.cs</Link> </SourcesExecutionservice>
+  </ItemGroup>
+
+  <!-- Win32 Minimal -->
+  <ItemGroup>
+    <SourcesWin32Minimal Include="$(CommonCodeLocation)\Win32\NativeStructs.cs"> <Link>Test\Win32\NativeStructs.cs</Link> </SourcesWin32Minimal>
+    <SourcesWin32Minimal Include="$(CommonCodeLocation)\Win32\NativeConstants.cs"> <Link>Test\Win32\NativeConstants.cs</Link> </SourcesWin32Minimal>
+    <SourcesWin32Minimal Include="$(CommonCodeLocation)\Win32\Gdi32.cs"> <Link>Test\Win32\Gdi32.cs</Link> </SourcesWin32Minimal>
+    <SourcesWin32Minimal Include="$(CommonCodeLocation)\Win32\User32.cs"> <Link>Test\Win32\User32.cs</Link> </SourcesWin32Minimal>
+    <SourcesWin32Minimal Include="$(CommonCodeLocation)\Win32\Kernel32.cs"> <Link>Test\Win32\Kernel32.cs</Link> </SourcesWin32Minimal>
+    <SourcesWin32Minimal Include="$(CommonCodeLocation)\Win32\WindowEnumerator.cs"> <Link>Test\Win32\WindowEnumerator.cs</Link> </SourcesWin32Minimal>
+    <SourcesWin32Minimal Include="$(CommonCodeLocation)\Win32\Ntdll.cs"> <Link>Test\Win32\Ntdll.cs</Link> </SourcesWin32Minimal>
+  </ItemGroup>
+
+  <!-- Win32 -->
+  <ItemGroup>
+    <SourcesWin32 Include="$(CommonCodeLocation)\Win32\HwndSubClass.cs"> <Link>Test\Win32\HwndSubClass.cs</Link> </SourcesWin32>
+    <SourcesWin32 Include="$(CommonCodeLocation)\Win32\HwndWrapper.cs"> <Link>Test\Win32\HwndWrapper.cs</Link> </SourcesWin32>
+    <SourcesWin32 Include="$(CommonCodeLocation)\Win32\ManagedWndProcTracker.cs"> <Link>Test\Win32\ManagedWndProcTracker.cs</Link> </SourcesWin32>
+    <SourcesWin32 Include="$(CommonCodeLocation)\Win32\NativeMethods.cs"> <Link>Test\Win32\NativeMethods.cs</Link> </SourcesWin32>
+    <SourcesWin32 Include="$(CommonCodeLocation)\Win32\WeakReferenceList.cs"> <Link>Test\Win32\WeakReferenceList.cs</Link> </SourcesWin32>
+    <SourcesWin32 Include="$(CommonCodeLocation)\Win32\WeakReferenceListEnumerator.cs"> <Link>Test\Win32\WeakReferenceListEnumerator.cs</Link> </SourcesWin32>
+    <SourcesWin32 Include="$(CommonCodeLocation)\Win32\AcceleratorTable.cs"> <Link>Test\Win32\AcceleratorTable.cs</Link> </SourcesWin32>
+    <SourcesWin32 Include="@(SourcesWin32Minimal)" />
+  </ItemGroup>
+
+  <!-- Modeling -->
+  <ItemGroup>
+    <SourcesModeling Include="$(CommonCodeLocation)\Modeling\AsyncActionManager.cs"> <Link>Test\Modeling\AsyncActionManager.cs</Link> </SourcesModeling>
+    <SourcesModeling Include="$(CommonCodeLocation)\Modeling\Model.cs"> <Link>Test\Modeling\Model.cs</Link> </SourcesModeling>
+    <SourcesModeling Include="$(CommonCodeLocation)\Modeling\ModelingBaseObject.cs"> <Link>Test\Modeling\ModelingBaseObject.cs</Link> </SourcesModeling>
+    <SourcesModeling Include="$(CommonCodeLocation)\Modeling\TestLoader.cs"> <Link>Test\Modeling\TestLoader.cs</Link> </SourcesModeling>
+    <SourcesModeling Include="$(CommonCodeLocation)\Modeling\XamlTransformer.cs"> <Link>Test\Modeling\XamlTransformer.cs</Link> </SourcesModeling>
+    <SourcesModeling Include="$(CommonCodeLocation)\Modeling\XtcParser.cs"> <Link>Test\Modeling\XtcParser.cs</Link> </SourcesModeling>
+    <SourcesModeling Include="$(CommonCodeLocation)\Modeling\XtcTestCaseLoader.cs"> <Link>Test\Modeling\XtcTestCaseLoader.cs</Link> </SourcesModeling>
+  </ItemGroup>
+
+  <!-- Windows -->
+  <ItemGroup>
+    <SourcesWindows Include="$(CommonCodeLocation)\Windows\ActionForTypeHelper.cs"> <Link>Test\Windows\ActionForTypeHelper.cs</Link> </SourcesWindows>
+    <SourcesWindows Include="$(CommonCodeLocation)\Windows\TreeComparer.cs"> <Link>Test\Windows\TreeComparer.cs</Link> </SourcesWindows>
+  </ItemGroup>
+
+  <!-- Managed Resources Windows -->
+  <ItemGroup>
+    <ManagedResourcesWindows Include="$(CommonDataLocation)\Windows\PropertiesToSkip.xml">
+      <LogicalName>PropertiesToSkip.xml</LogicalName>
+      <Link>Resources\Windows\PropertiesToSkip.xml</Link>
+    </ManagedResourcesWindows>
+  </ItemGroup>
+
+  <!-- Test -->
+  <ItemGroup>
+    <SourcesTest Include="$(CommonCodeLocation)\EventHelper.cs"> <Link>Test\EventHelper.cs</Link> </SourcesTest>
+    <SourcesTest Include="$(CommonCodeLocation)\ExceptionHelper.cs"> <Link>Test\ExceptionHelper.cs</Link> </SourcesTest>
+    <SourcesTest Include="$(CommonCodeLocation)\TestException.cs"> <Link>Test\TestException.cs</Link> </SourcesTest>
+    <SourcesTest Include="$(CommonCodeLocation)\TestSetupException.cs"> <Link>Test\TestSetupException.cs</Link> </SourcesTest>
+    <SourcesTest Include="$(CommonCodeLocation)\TestValidationException.cs"> <Link>Test\TestValidationException.cs</Link> </SourcesTest>
+  </ItemGroup>
+
+  <!-- Serialization -->
+  <ItemGroup>
+    <SourcesSerialization Include="$(CommonCodeLocation)\Serialization\BamlHelper.cs"> <Link>Test\Serialization\BamlHelper.cs</Link> </SourcesSerialization>
+    <SourcesSerialization Include="$(CommonCodeLocation)\Serialization\BamlReaderWrapper.cs"> <Link>Test\Serialization\BamlReaderWrapper.cs</Link> </SourcesSerialization>
+    <SourcesSerialization Include="$(CommonCodeLocation)\Serialization\BamlWriterWrapper.cs"> <Link>Test\Serialization\BamlWriterWrapper.cs</Link> </SourcesSerialization>
+    <SourcesSerialization Include="$(CommonCodeLocation)\Serialization\IOHelper.cs"> <Link>Test\Serialization\IOHelper.cs</Link> </SourcesSerialization>
+    <SourcesSerialization Include="$(CommonCodeLocation)\Serialization\SerializationHelper.cs"> <Link>Test\Serialization\SerializationHelper.cs</Link> </SourcesSerialization>
+    <SourcesSerialization Include="$(CommonCodeLocation)\Serialization\WrapperUtil.cs"> <Link>Test\Serialization\WrapperUtil.cs</Link> </SourcesSerialization>
+    <SourcesSerialization Include="$(CommonCodeLocation)\Serialization\XamlRoundTrip.cs"> <Link>Test\Serialization\XamlRoundTrip.cs</Link> </SourcesSerialization>
+  </ItemGroup>
+
+  <!-- Serialization Custom Elements -->
+  <ItemGroup>
+    <SourcesSerializationCustomElements Include="$(CommonCodeLocation)\Serialization\CustomElements\CustomBorder.cs"> <Link>Test\Serialization\CustomElements\CustomBorder.cs</Link> </SourcesSerializationCustomElements>
+    <SourcesSerializationCustomElements Include="$(CommonCodeLocation)\Serialization\CustomElements\CustomButton.cs"> <Link>Test\Serialization\CustomElements\CustomButton.cs</Link> </SourcesSerializationCustomElements>
+    <SourcesSerializationCustomElements Include="$(CommonCodeLocation)\Serialization\CustomElements\CustomCanvas.cs"> <Link>Test\Serialization\CustomElements\CustomCanvas.cs</Link> </SourcesSerializationCustomElements>
+    <SourcesSerializationCustomElements Include="$(CommonCodeLocation)\Serialization\CustomElements\CustomDockPanel.cs"> <Link>Test\Serialization\CustomElements\CustomDockPanel.cs</Link> </SourcesSerializationCustomElements>
+    <SourcesSerializationCustomElements Include="$(CommonCodeLocation)\Serialization\CustomElements\CustomElementHelper.cs"> <Link>Test\Serialization\CustomElements\CustomElementHelper.cs</Link> </SourcesSerializationCustomElements>
+    <SourcesSerializationCustomElements Include="$(CommonCodeLocation)\Serialization\CustomElements\CustomPage.cs"> <Link>Test\Serialization\CustomElements\CustomPage.cs</Link> </SourcesSerializationCustomElements>
+    <SourcesSerializationCustomElements Include="$(CommonCodeLocation)\Serialization\CustomElements\CustomStackPanel.cs"> <Link>Test\Serialization\CustomElements\CustomStackPanel.cs</Link> </SourcesSerializationCustomElements>
+    <SourcesSerializationCustomElements Include="$(CommonCodeLocation)\Serialization\CustomElements\CustomTextPanel.cs"> <Link>Test\Serialization\CustomElements\CustomTextPanel.cs</Link> </SourcesSerializationCustomElements>
+    <SourcesSerializationCustomElements Include="$(CommonCodeLocation)\Serialization\CustomElements\CustomWindow.cs"> <Link>Test\Serialization\CustomElements\CustomWindow.cs</Link> </SourcesSerializationCustomElements>
+    <SourcesSerializationCustomElements Include="$(CommonCodeLocation)\Serialization\CustomElements\ICustomElement.cs"> <Link>Test\Serialization\CustomElements\ICustomElement.cs</Link> </SourcesSerializationCustomElements>
+  </ItemGroup>
+
+  <!-- Integration TXR -->
+  <ItemGroup>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\ActionForXamlInfo.cs"> <Link>Test\Integration\ActionForXamlInfo.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\FileVariationGenerator.cs"> <Link>Test\Integration\FileVariationGenerator.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\FileVariationItem.cs"> <Link>Test\Integration\FileVariationItem.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\BaseTestContract.cs"> <Link>Test\Integration\BaseTestContract.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\BaseVariationGenerator.cs"> <Link>Test\Integration\BaseVariationGenerator.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\CallbackVariationGenerator.cs"> <Link>Test\Integration\CallbackVariationGenerator.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\CallbackVariationItem.cs"> <Link>Test\Integration\CallbackVariationItem.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\CollectionsXamlHelper.cs"> <Link>Test\Integration\CollectionsXamlHelper.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\CombinationGenerator.cs"> <Link>Test\Integration\CombinationGenerator.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\GeneratorReference.cs"> <Link>Test\Integration\GeneratorReference.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\Helper.cs"> <Link>Test\Integration\Helper.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\ITestContract.cs"> <Link>Test\Integration\ITestContract.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\IVariationGenerator.cs"> <Link>Test\Integration\IVariationGenerator.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\MDEVariationGenerator.cs"> <Link>Test\Integration\MDEVariationGenerator.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\MDEVariationItem.cs"> <Link>Test\Integration\MDEVariationItem.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\NotificationList.cs"> <Link>Test\Integration\NotificationList.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\StorageItem.cs"> <Link>Test\Integration\StorageItem.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\TestExtenderGraph.cs"> <Link>Test\Integration\TestExtenderGraph.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\TestExtenderOutput.cs"> <Link>Test\Integration\TestExtenderOutput.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\VariationItem.cs"> <Link>Test\Integration\VariationItem.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\VariationItemGroup.cs"> <Link>Test\Integration\VariationItemGroup.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\CommonStorage.cs"> <Link>Test\Integration\CommonStorage.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\SelectorGenerator.cs"> <Link>Test\Integration\SelectorGenerator.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\ContentItem.cs"> <Link>Test\Integration\ContentItem.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\AssemblyDesc.cs"> <Link>Test\Integration\AssemblyDesc.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\WPF3Helper.cs"> <Link>Test\Integration\WPF3Helper.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\Windows\TypeVariationGenerator.cs"> <Link>Test\Integration\Windows\TypeVariationGenerator.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\Windows\TypeVariationItem.cs"> <Link>Test\Integration\Windows\TypeVariationItem.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\Windows\ContainerVariationGenerator.cs"> <Link>Test\Integration\Windows\ContainerVariationGenerator.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\Windows\ContainerVariationItem.cs"> <Link>Test\Integration\Windows\ContainerVariationItem.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\Windows\ActionSequenceVariationGenerator.cs"> <Link>Test\Integration\Windows\ActionSequenceVariationGenerator.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\Windows\ControllerProxy.cs"> <Link>Test\Integration\Windows\ControllerProxy.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\Windows\Controller.cs"> <Link>Test\Integration\Windows\Controller.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\Windows\ThreadController.cs"> <Link>Test\Integration\Windows\ThreadController.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\Windows\ApplicationController.cs"> <Link>Test\Integration\Windows\ApplicationController.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\Windows\WinFormsController.cs"> <Link>Test\Integration\Windows\WinFormsController.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\TestExtenderHelper.cs"> <Link>Test\Integration\TestExtenderHelper.cs</Link> </SourcesIntegrationTxr>
+  </ItemGroup>
+
+  <!-- Pict -->
+  <ItemGroup>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\ObjectArrays\AllPossibleObjectArrayCollection.cs"> <Link>Test\PICT\ObjectArrays\AllPossibleObjectArrayCollection.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\ObjectArrays\AllPossibleObjectArrayEnumerator.cs"> <Link>Test\PICT\ObjectArrays\AllPossibleObjectArrayEnumerator.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\ObjectArrays\AllPossibleObjectArrayGenerationStrategy.cs"> <Link>Test\PICT\ObjectArrays\AllPossibleObjectArrayGenerationStrategy.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\ObjectArrays\IObjectArrayCollection.cs"> <Link>Test\PICT\ObjectArrays\IObjectArrayCollection.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\ObjectArrays\IObjectArrayEnumerator.cs"> <Link>Test\PICT\ObjectArrays\IObjectArrayEnumerator.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\ObjectArrays\IObjectArrayGenerationStrategy.cs"> <Link>Test\PICT\ObjectArrays\IObjectArrayGenerationStrategy.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\ObjectArrays\ObjectArrayGeneration.cs"> <Link>Test\PICT\ObjectArrays\ObjectArrayGeneration.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\ObjectArrays\ObjectArrayGenerator.cs"> <Link>Test\PICT\ObjectArrays\ObjectArrayGenerator.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\ObjectArrays\ObjectArrayPairwiseGeneration.cs"> <Link>Test\PICT\ObjectArrays\ObjectArrayPairwiseGeneration.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\ObjectArrays\PairwiseObjectArrayCollection.cs"> <Link>Test\PICT\ObjectArrays\PairwiseObjectArrayCollection.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\ObjectArrays\PairwiseObjectArrayEnumerator.cs"> <Link>Test\PICT\ObjectArrays\PairwiseObjectArrayEnumerator.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\ObjectArrays\PairwiseObjectArrayGenerationStrategy.cs"> <Link>Test\PICT\ObjectArrays\PairwiseObjectArrayGenerationStrategy.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\IPairwiseComment.cs"> <Link>Test\PICT\IPairwiseComment.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\IPairwiseVisitable.cs"> <Link>Test\PICT\IPairwiseVisitable.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseAliasCollection.cs"> <Link>Test\PICT\PairwiseAliasCollection.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseAndClause.cs"> <Link>Test\PICT\PairwiseAndClause.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseComparison.cs"> <Link>Test\PICT\PairwiseComparison.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseComparisonTerm.cs"> <Link>Test\PICT\PairwiseComparisonTerm.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseCondition.cs"> <Link>Test\PICT\PairwiseCondition.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseConditionCollection.cs"> <Link>Test\PICT\PairwiseConditionCollection.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseEqualTerm.cs"> <Link>Test\PICT\PairwiseEqualTerm.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseException.cs"> <Link>Test\PICT\PairwiseException.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseGreaterThanOrEqualTerm.cs"> <Link>Test\PICT\PairwiseGreaterThanOrEqualTerm.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseGreaterThanTerm.cs"> <Link>Test\PICT\PairwiseGreaterThanTerm.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseIfThenConstraint.cs"> <Link>Test\PICT\PairwiseIfThenConstraint.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseIfThenConstraintCollection.cs"> <Link>Test\PICT\PairwiseIfThenConstraintCollection.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseInTerm.cs"> <Link>Test\PICT\PairwiseInTerm.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseLessThanOrEqualTerm.cs"> <Link>Test\PICT\PairwiseLessThanOrEqualTerm.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseLessThanTerm.cs"> <Link>Test\PICT\PairwiseLessThanTerm.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseLikeTerm.cs"> <Link>Test\PICT\PairwiseLikeTerm.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseLogicalClause.cs"> <Link>Test\PICT\PairwiseLogicalClause.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseLogicalRelationship.cs"> <Link>Test\PICT\PairwiseLogicalRelationship.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseModel.cs"> <Link>Test\PICT\PairwiseModel.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseNotClause.cs"> <Link>Test\PICT\PairwiseNotClause.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseNotEqualTerm.cs"> <Link>Test\PICT\PairwiseNotEqualTerm.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseNotInTerm.cs"> <Link>Test\PICT\PairwiseNotInTerm.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseOrClause.cs"> <Link>Test\PICT\PairwiseOrClause.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseParameter.cs"> <Link>Test\PICT\PairwiseParameter.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseParameterCollection.cs"> <Link>Test\PICT\PairwiseParameterCollection.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseParameterConstraint.cs"> <Link>Test\PICT\PairwiseParameterConstraint.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseParameterConstraintCollection.cs"> <Link>Test\PICT\PairwiseParameterConstraintCollection.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwisePICTCache.cs"> <Link>Test\PICT\PairwisePICTCache.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseSettings.cs"> <Link>Test\PICT\PairwiseSettings.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseSubModel.cs"> <Link>Test\PICT\PairwiseSubModel.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseSubModelCollection.cs"> <Link>Test\PICT\PairwiseSubModelCollection.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseTerm.cs"> <Link>Test\PICT\PairwiseTerm.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseTuple.cs"> <Link>Test\PICT\PairwiseTuple.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseValue.cs"> <Link>Test\PICT\PairwiseValue.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseValueCollection.cs"> <Link>Test\PICT\PairwiseValueCollection.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseValueType.cs"> <Link>Test\PICT\PairwiseValueType.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseVisitor.cs"> <Link>Test\PICT\PairwiseVisitor.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PICTConstants.cs"> <Link>Test\PICT\PICTConstants.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PICTExecutionInformation.cs"> <Link>Test\PICT\PICTExecutionInformation.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PICTPairwiseVisitor.cs"> <Link>Test\PICT\PICTPairwiseVisitor.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PICTRunner.cs"> <Link>Test\PICT\PICTRunner.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PICTWarningBehaviors.cs"> <Link>Test\PICT\PICTWarningBehaviors.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PICTWarningEventArgs.cs"> <Link>Test\PICT\PICTWarningEventArgs.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PICTWarningEventHandler.cs"> <Link>Test\PICT\PICTWarningEventHandler.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\MatrixOutput\PairwiseTestCase.cs"> <Link>Test\PICT\MatrixOutput\PairwiseTestCase.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\MatrixOutput\PairwiseTestMatrix.cs"> <Link>Test\PICT\MatrixOutput\PairwiseTestMatrix.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\MatrixOutput\PairwiseTestParameter.cs"> <Link>Test\PICT\MatrixOutput\PairwiseTestParameter.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\MatrixOutput\PairwiseHelper.cs"> <Link>Test\PICT\MatrixOutput\PairwiseTestParameter.cs</Link> </SourcesPict>
+  </ItemGroup>
+  
+  <!-- Imaging -->
+  <ItemGroup>
+    <SourcesImaging Include="$(CommonCodeLocation)\Imaging\BitmapCapture.cs"> <Link>Test\Imaging\BitmapCapture.cs</Link> </SourcesImaging>
+    <SourcesImaging Include="$(CommonCodeLocation)\Imaging\BitmapUtils.cs"> <Link>Test\Imaging\BitmapUtils.cs</Link> </SourcesImaging>
+    <SourcesImaging Include="$(CommonCodeLocation)\Imaging\ColorUtils.cs"> <Link>Test\Imaging\ColorUtils.cs</Link> </SourcesImaging>
+    <SourcesImaging Include="$(CommonCodeLocation)\Imaging\ComparisonAlgorithm.cs"> <Link>Test\Imaging\ComparisonAlgorithm.cs</Link> </SourcesImaging>
+    <SourcesImaging Include="$(CommonCodeLocation)\Imaging\ComparisonCriteria.cs"> <Link>Test\Imaging\ComparisonCriteria.cs</Link> </SourcesImaging>
+    <SourcesImaging Include="$(CommonCodeLocation)\Imaging\ComparisonOperation.cs"> <Link>Test\Imaging\ComparisonOperation.cs</Link> </SourcesImaging>
+    <SourcesImaging Include="$(CommonCodeLocation)\Imaging\ComparisonOperationUtils.cs"> <Link>Test\Imaging\ComparisonOperationUtils.cs</Link> </SourcesImaging>
+    <SourcesImaging Include="$(CommonCodeLocation)\Imaging\ComparisonResult.cs"> <Link>Test\Imaging\ComparisonResult.cs</Link> </SourcesImaging>
+    <SourcesImaging Include="$(CommonCodeLocation)\Imaging\ElementUtils.cs"> <Link>Test\Imaging\ElementUtils.cs</Link> </SourcesImaging>
+    <SourcesImaging Include="$(CommonCodeLocation)\Imaging\PixelData.cs"> <Link>Test\Imaging\PixelData.cs</Link> </SourcesImaging>
+  </ItemGroup>
+
+  <!-- Animation -->
+  <ItemGroup>
+    <SourcesAnimation Include="$(CommonCodeLocation)\Animation\AnimationSideBySide.cs"> <Link>Test\Animation\AnimationSideBySide.cs</Link> </SourcesAnimation>
+    <SourcesAnimation Include="$(CommonCodeLocation)\Animation\AnimationUtils.cs"> <Link>Test\Animation\AnimationUtils.cs</Link> </SourcesAnimation>
+    <SourcesAnimation Include="$(CommonCodeLocation)\Animation\AnimationValidator.cs"> <Link>Test\Animation\AnimationValidator.cs</Link> </SourcesAnimation>
+    <SourcesAnimation Include="$(CommonCodeLocation)\Animation\TimeManagerCommon.cs"> <Link>Test\Animation\TimeManagerCommon.cs</Link> </SourcesAnimation>
+  </ItemGroup>
+
+  <!-- Rendering VScan -->
+  <ItemGroup>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\ColorByte.cs"> <Link>Test\RenderingVerification\ColorByte.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\ColorDouble.cs"> <Link>Test\RenderingVerification\ColorDouble.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Color_Avalon.cs"> <Link>Test\RenderingVerification\Color_Avalon.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Curve.cs"> <Link>Test\RenderingVerification\Curve.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\CurveTolerance.cs"> <Link>Test\RenderingVerification\CurveTolerance.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\DisplayConfiguration.cs"> <Link>Test\RenderingVerification\DisplayConfiguration.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\DisplayConfigurationMinimal.cs"> <Link>Test\RenderingVerification\DisplayConfigurationMinimal.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Exceptions.cs"> <Link>Test\RenderingVerification\Exceptions.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\ImageAdapter.cs"> <Link>Test\RenderingVerification\ImageAdapter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\ImageComparator.cs"> <Link>Test\RenderingVerification\ImageComparator.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\ImageUtility.cs"> <Link>Test\RenderingVerification\ImageUtility.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\ImageUtilityProxy.cs"> <Link>Test\RenderingVerification\ImageUtilityProxy.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\ImageUtility_Avalon.cs"> <Link>Test\RenderingVerification\ImageUtility_Avalon.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Interfaces.cs"> <Link>Test\RenderingVerification\Interfaces.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\IPUtil.cs"> <Link>Test\RenderingVerification\IPUtil.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\KeepGreaterKey.cs"> <Link>Test\RenderingVerification\KeepGreaterKey.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\MetaDataInfo.cs"> <Link>Test\RenderingVerification\MetaDataInfo.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\MismatchingPoints.cs"> <Link>Test\RenderingVerification\MismatchingPoints.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Package.cs"> <Link>Test\RenderingVerification\Package.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Pixel.cs"> <Link>Test\RenderingVerification\Pixel.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\PInvoke.cs"> <Link>Test\RenderingVerification\PInvoke.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\PropertyItemWrapper.cs"> <Link>Test\RenderingVerification\PropertyItemWrapper.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\RuntimeInfo.cs"> <Link>Test\RenderingVerification\RuntimeInfo.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\RenderRect.cs"> <Link>Test\RenderingVerification\RenderRect.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\VideoCapture.cs"> <Link>Test\RenderingVerification\VideoCapture.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\XamlLauncherReflect.cs"> <Link>Test\RenderingVerification\XamlLauncherReflect.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\AffineFilter.cs"> <Link>Test\RenderingVerification\Filters\AffineFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\AttractorFilter.cs"> <Link>Test\RenderingVerification\Filters\AttractorFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\BlurFilter.cs"> <Link>Test\RenderingVerification\Filters\BlurFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\BrightnessContrastFilter.cs"> <Link>Test\RenderingVerification\Filters\BrightnessContrastFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\ChannelOperationFilter.cs"> <Link>Test\RenderingVerification\Filters\ChannelOperationFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\ColorFilter.cs"> <Link>Test\RenderingVerification\Filters\ColorFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\ColorSpaceConversion.cs"> <Link>Test\RenderingVerification\Filters\ColorSpaceConversion.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\ColorTransformFilter.cs"> <Link>Test\RenderingVerification\Filters\ColorTransformFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\ContrastFilter.cs"> <Link>Test\RenderingVerification\Filters\ContrastFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\ConvolutionFilter.cs"> <Link>Test\RenderingVerification\Filters\ConvolutionFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\EqualizeFilter.cs"> <Link>Test\RenderingVerification\Filters\EqualizeFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\Filter.cs"> <Link>Test\RenderingVerification\Filters\Filter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\FilterParameter.cs"> <Link>Test\RenderingVerification\Filters\FilterParameter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\FlipRotateFilter.cs"> <Link>Test\RenderingVerification\Filters\FlipRotateFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\GammaCorrectFilter.cs"> <Link>Test\RenderingVerification\Filters\GammaCorrectFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\GaussianFilter.cs"> <Link>Test\RenderingVerification\Filters\GaussianFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\GlowFilter.cs"> <Link>Test\RenderingVerification\Filters\GlowFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\GrayscaleFilter.cs"> <Link>Test\RenderingVerification\Filters\GrayscaleFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\IColorConverter.cs"> <Link>Test\RenderingVerification\Filters\IColorConverter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\Image2DTransforms.cs"> <Link>Test\RenderingVerification\Filters\Image2DTransforms.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\Interpolator.cs"> <Link>Test\RenderingVerification\Filters\Interpolator.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\LogicalOperationFilter.cs"> <Link>Test\RenderingVerification\Filters\LogicalOperationFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\Matrix2D.cs"> <Link>Test\RenderingVerification\Filters\Matrix2D.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\Matrix2DConverter.cs"> <Link>Test\RenderingVerification\Filters\Matrix2DConverter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\MorphologicalFilter.cs"> <Link>Test\RenderingVerification\Filters\MorphologicalFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\MorphShapeFilter.cs"> <Link>Test\RenderingVerification\Filters\MorphShapeFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\NegateFilter.cs"> <Link>Test\RenderingVerification\Filters\NegateFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\OpacityPointsFilter.cs"> <Link>Test\RenderingVerification\Filters\OpacityPointsFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\OrderStatisticFilter.cs"> <Link>Test\RenderingVerification\Filters\OrderStatisticFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\PixelizeFilter.cs"> <Link>Test\RenderingVerification\Filters\PixelizeFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\ProcessXmlFilter.cs"> <Link>Test\RenderingVerification\Filters\ProcessXmlFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\RenderingColorConverter.cs"> <Link>Test\RenderingVerification\Filters\RenderingColorConverter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\SaturateEdgeFilter.cs"> <Link>Test\RenderingVerification\Filters\SaturateEdgeFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\SchematizationFilter.cs"> <Link>Test\RenderingVerification\Filters\SchematizationFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\SharpenFilter.cs"> <Link>Test\RenderingVerification\Filters\SharpenFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\SpatialTransformFilter.cs"> <Link>Test\RenderingVerification\Filters\SpatialTransformFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\TintFilter.cs"> <Link>Test\RenderingVerification\Filters\TintFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\TintShadeFilter.cs"> <Link>Test\RenderingVerification\Filters\TintShadeFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\VMorph.cs"> <Link>Test\RenderingVerification\Filters\VMorph.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\WaveletTransformFilter.cs"> <Link>Test\RenderingVerification\Filters\WaveletTransformFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\WVMorph.cs"> <Link>Test\RenderingVerification\Filters\WVMorph.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Analytical\CartesianMomentDescriptor.cs"> <Link>Test\RenderingVerification\Models\Analytical\CartesianMomentDescriptor.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Analytical\Criterion.cs"> <Link>Test\RenderingVerification\Models\Analytical\Criterion.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Analytical\DescriptorBase.cs"> <Link>Test\RenderingVerification\Models\Analytical\DescriptorBase.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Analytical\DescriptorInfo.cs"> <Link>Test\RenderingVerification\Models\Analytical\DescriptorInfo.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Analytical\DescriptorManager.cs"> <Link>Test\RenderingVerification\Models\Analytical\DescriptorManager.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Analytical\DescriptorSquareMatrix.cs"> <Link>Test\RenderingVerification\Models\Analytical\DescriptorSquareMatrix.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Analytical\ImageToShapeIDMapping.cs"> <Link>Test\RenderingVerification\Models\Analytical\ImageToShapeIDMapping.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Analytical\Interfaces.cs"> <Link>Test\RenderingVerification\Models\Analytical\Interfaces.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Analytical\ModelManager2.cs"> <Link>Test\RenderingVerification\Models\Analytical\ModelManager2.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Analytical\MomentDescriptorBase.cs"> <Link>Test\RenderingVerification\Models\Analytical\MomentDescriptorBase.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Analytical\PolarMomentDescriptor.cs"> <Link>Test\RenderingVerification\Models\Analytical\PolarMomentDescriptor.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Analytical\VScan.cs"> <Link>Test\RenderingVerification\Models\Analytical\VScan.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\AnimatedProperty.cs"> <Link>Test\RenderingVerification\Models\Synthetical\AnimatedProperty.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\Animator.cs"> <Link>Test\RenderingVerification\Models\Synthetical\Animator.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\AvalonTypographer.cs"> <Link>Test\RenderingVerification\Models\Synthetical\AvalonTypographer.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\DeltaImageComparator.cs"> <Link>Test\RenderingVerification\Models\Synthetical\DeltaImageComparator.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\GeometryFilter.cs"> <Link>Test\RenderingVerification\Models\Synthetical\GeometryFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\GlyphBase.cs"> <Link>Test\RenderingVerification\Models\Synthetical\GlyphBase.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\GlyphChar.cs"> <Link>Test\RenderingVerification\Models\Synthetical\GlyphChar.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\GlyphColorChooser.cs"> <Link>Test\RenderingVerification\Models\Synthetical\GlyphColorChooser.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\GlyphComparator.cs"> <Link>Test\RenderingVerification\Models\Synthetical\GlyphComparator.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\GlyphCompareInfo.cs"> <Link>Test\RenderingVerification\Models\Synthetical\GlyphCompareInfo.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\GlyphContainer.cs"> <Link>Test\RenderingVerification\Models\Synthetical\GlyphContainer.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\GlyphFont.cs"> <Link>Test\RenderingVerification\Models\Synthetical\GlyphFont.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\GlyphImage.cs"> <Link>Test\RenderingVerification\Models\Synthetical\GlyphImage.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\GlyphLayout.cs"> <Link>Test\RenderingVerification\Models\Synthetical\GlyphLayout.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\GlyphModel.cs"> <Link>Test\RenderingVerification\Models\Synthetical\GlyphModel.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\GlyphPanel.cs"> <Link>Test\RenderingVerification\Models\Synthetical\GlyphPanel.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\GlyphResource.cs"> <Link>Test\RenderingVerification\Models\Synthetical\GlyphResource.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\GlyphShape.cs"> <Link>Test\RenderingVerification\Models\Synthetical\GlyphShape.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\GlyphText.cs"> <Link>Test\RenderingVerification\Models\Synthetical\GlyphText.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\Interfaces.cs"> <Link>Test\RenderingVerification\Models\Synthetical\Interfaces.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\LayoutContainer.cs"> <Link>Test\RenderingVerification\Models\Synthetical\LayoutContainer.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\MatchingInfo.cs"> <Link>Test\RenderingVerification\Models\Synthetical\MatchingInfo.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\MatchingInfoEditor.cs"> <Link>Test\RenderingVerification\Models\Synthetical\MatchingInfoEditor.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\StandardTypographer.cs"> <Link>Test\RenderingVerification\Models\Synthetical\StandardTypographer.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\TypographBroker.cs"> <Link>Test\RenderingVerification\Models\Synthetical\TypographBroker.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\XenoSymbolBroker.cs"> <Link>Test\RenderingVerification\Models\Synthetical\XenoSymbolBroker.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\LayoutEngine\CanvasLayoutEngine.cs"> <Link>Test\RenderingVerification\Models\Synthetical\LayoutEngine\CanvasLayoutEngine.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\LayoutEngine\FlowLayoutEngine.cs"> <Link>Test\RenderingVerification\Models\Synthetical\LayoutEngine\FlowLayoutEngine.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\ResourceFetcher\EmbeddedResourceKey.cs"> <Link>Test\RenderingVerification\ResourceFetcher\EmbeddedResourceKey.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\ResourceFetcher\EmbeddedResourceProvider.cs"> <Link>Test\RenderingVerification\ResourceFetcher\EmbeddedResourceProvider.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\ResourceFetcher\ResourceProvider.cs"> <Link>Test\RenderingVerification\ResourceFetcher\ResourceProvider.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\ResourceFetcher\Resourcestripper.cs"> <Link>Test\RenderingVerification\ResourceFetcher\Resourcestripper.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\UnmanagedProxies\UnmanagedInterfaces.cs"> <Link>Test\RenderingVerification\UnmanagedProxies\UnmanagedInterfaces.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\AsyncData.cs"> <Link>Test\RenderingVerification\AsyncData.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\AsyncHelper.cs"> <Link>Test\RenderingVerification\AsyncHelper.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\ImageComparisonResult.cs"> <Link>Test\RenderingVerification\ImageComparisonResult.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\ImageComparisonSettings.cs"> <Link>Test\RenderingVerification\ImageComparisonSettings.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\ImageMetadata.cs"> <Link>Test\RenderingVerification\ImageMetadata.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\MasterDimensions.cs"> <Link>Test\RenderingVerification\MasterDimensions.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\MasterImageComparer.cs"> <Link>Test\RenderingVerification\MasterImageComparer.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\MasterIndex.cs"> <Link>Test\RenderingVerification\MasterIndex.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\MasterMetadata.cs"> <Link>Test\RenderingVerification\MasterMetadata.cs</Link> </SourcesRenderingverification>
+  </ItemGroup>
+
+  <!-- Managed Resource Vscan -->
+  <ItemGroup>
+    <ManagedResourcesVscan Include="$(CommonCodeLocation)\RenderingVerification\DefaultTolerance.xml">
+      <LogicalName>Microsoft.Test.RenderingVerification.RenderingVerification.DefaultTolerance.xml</LogicalName>
+      <Link>Resources\VScan\DefaultTolerance.xml</Link>
+    </ManagedResourcesVscan>
+  </ItemGroup>
+
+  <!-- Compression -->
+  <ItemGroup>
+    <SourcesCompression Include="$(CommonCodeLocation)\Compression\Archiver.cs"> <Link>Test\Compression\Archiver.cs</Link> </SourcesCompression>
+    <SourcesCompression Include="$(CommonCodeLocation)\Compression\Cab\Cab.cs"> <Link>Test\Compression\Cab\Cab.cs</Link> </SourcesCompression>
+    <SourcesCompression Include="$(CommonCodeLocation)\Compression\Cab\CabApi.cs"> <Link>Test\Compression\Cab\CabApi.cs</Link> </SourcesCompression>
+    <SourcesCompression Include="$(CommonCodeLocation)\Compression\Cab\CabBase.cs"> <Link>Test\Compression\Cab\CabBase.cs</Link> </SourcesCompression>
+    <SourcesCompression Include="$(CommonCodeLocation)\Compression\Cab\CabCreator.cs"> <Link>Test\Compression\Cab\CabCreator.cs</Link> </SourcesCompression>
+    <SourcesCompression Include="$(CommonCodeLocation)\Compression\Cab\CabException.cs"> <Link>Test\Compression\Cab\CabException.cs</Link> </SourcesCompression>
+    <SourcesCompression Include="$(CommonCodeLocation)\Compression\Cab\CabExtractor.cs"> <Link>Test\Compression\Cab\CabExtractor.cs</Link> </SourcesCompression>
+    <SourcesCompression Include="$(CommonCodeLocation)\Compression\Cab\CabInfo.cs"> <Link>Test\Compression\Cab\CabInfo.cs</Link> </SourcesCompression>
+    <SourcesCompression Include="$(CommonCodeLocation)\Compression\Cab\CabStatus.cs"> <Link>Test\Compression\Cab\CabStatus.cs</Link> </SourcesCompression>
+    <SourcesCompression Include="$(CommonCodeLocation)\Compression\Cab\DuplicateStream.cs"> <Link>Test\Compression\Cab\DuplicateStream.cs</Link> </SourcesCompression>
+    <SourcesCompression Include="$(CommonCodeLocation)\Compression\Cab\HandleManager.cs"> <Link>Test\Compression\Cab\HandleManager.cs</Link> </SourcesCompression>
+    <SourcesCompression Include="$(CommonCodeLocation)\Compression\Cab\OffsetStream.cs"> <Link>Test\Compression\Cab\OffsetStream.cs</Link> </SourcesCompression>
+  </ItemGroup>
+
+  <!-- Graphics Base -->
+  <ItemGroup>
+    <SourcesGraphicsBase Include="$(CommonCodeLocation)\Graphics\ColorOperations.cs"> <Link>Test\Graphics\ColorOperations.cs</Link> </SourcesGraphicsBase>
+    <SourcesGraphicsBase Include="$(CommonCodeLocation)\Graphics\DiscreteAnimation.cs"> <Link>Test\Graphics\DiscreteAnimation.cs</Link> </SourcesGraphicsBase>
+    <SourcesGraphicsBase Include="$(CommonCodeLocation)\Graphics\MathEx.cs"> <Link>Test\Graphics\MathEx.cs</Link> </SourcesGraphicsBase>
+    <SourcesGraphicsBase Include="$(CommonCodeLocation)\Graphics\Matrix3DAnimation.cs"> <Link>Test\Graphics\Matrix3DAnimation.cs</Link> </SourcesGraphicsBase>
+    <SourcesGraphicsBase Include="$(CommonCodeLocation)\Graphics\MatrixUtils.cs"> <Link>Test\Graphics\MatrixUtils.cs</Link> </SourcesGraphicsBase>
+    <SourcesGraphicsBase Include="$(CommonCodeLocation)\Graphics\MeshOperations.cs"> <Link>Test\Graphics\MeshOperations.cs</Link> </SourcesGraphicsBase>
+    <SourcesGraphicsBase Include="$(CommonCodeLocation)\Graphics\ObjectUtils.cs"> <Link>Test\Graphics\ObjectUtils.cs</Link> </SourcesGraphicsBase>
+    <SourcesGraphicsBase Include="$(CommonCodeLocation)\Graphics\StringConverter.cs"> <Link>Test\Graphics\StringConverter.cs</Link> </SourcesGraphicsBase>
+    <SourcesGraphicsBase Include="$(CommonCodeLocation)\Graphics\VisualUtils.cs"> <Link>Test\Graphics\VisualUtils.cs</Link> </SourcesGraphicsBase>
+    <SourcesGraphicsBase Include="$(CommonCodeLocation)\Graphics\DpiScalingHelper.cs"> <Link>Test\Graphics\DpiScalingHelper.cs</Link> </SourcesGraphicsBase>
+    <SourcesGraphicsBase Include="$(CommonCodeLocation)\Graphics\RenderingModeHelper.cs"> <Link>Test\Graphics\RenderingModeHelper.cs</Link> </SourcesGraphicsBase>
+    <SourcesGraphicsBase Include="$(CommonCodeLocation)\Graphics\RenderingMode.cs"> <Link>Test\Graphics\RenderingMode.cs</Link> </SourcesGraphicsBase>
+  </ItemGroup>
+
+  <!-- Graphics Factories -->
+  <ItemGroup>
+    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\BrushFactory.cs"> <Link>Test\Graphics\Factories\BrushFactory.cs</Link> </SourcesGraphicsFactories>
+    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\CameraFactory.cs"> <Link>Test\Graphics\Factories\CameraFactory.cs</Link> </SourcesGraphicsFactories>
+    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\Const.cs"> <Link>Test\Graphics\Factories\Const.cs</Link> </SourcesGraphicsFactories>
+    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\Const2D.cs"> <Link>Test\Graphics\Factories\Const2D.cs</Link> </SourcesGraphicsFactories>
+    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\DrawingFactory.cs"> <Link>Test\Graphics\Factories\DrawingFactory.cs</Link> </SourcesGraphicsFactories>
+    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\EffectFactory.cs"> <Link>Test\Graphics\Factories\EffectFactory.cs</Link> </SourcesGraphicsFactories>
+    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\EffectInputFactory.cs"> <Link>Test\Graphics\Factories\EffectInputFactory.cs</Link> </SourcesGraphicsFactories>
+    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\GeometryFactory.cs"> <Link>Test\Graphics\Factories\GeometryFactory.cs</Link> </SourcesGraphicsFactories>
+    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\HitTestFilterFactory.cs"> <Link>Test\Graphics\Factories\HitTestFilterFactory.cs</Link> </SourcesGraphicsFactories>
+    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\LightFactory.cs"> <Link>Test\Graphics\Factories\LightFactory.cs</Link> </SourcesGraphicsFactories>
+    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\MaterialFactory.cs"> <Link>Test\Graphics\Factories\MaterialFactory.cs</Link> </SourcesGraphicsFactories>
+    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\MeshFactory.cs"> <Link>Test\Graphics\Factories\MeshFactory.cs</Link> </SourcesGraphicsFactories>
+    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\ModelFactory.cs"> <Link>Test\Graphics\Factories\ModelFactory.cs</Link> </SourcesGraphicsFactories>
+    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\ObjectFactory.cs"> <Link>Test\Graphics\Factories\ObjectFactory.cs</Link> </SourcesGraphicsFactories>
+    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\PenFactory.cs"> <Link>Test\Graphics\Factories\PenFactory.cs</Link> </SourcesGraphicsFactories>
+    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\SceneFactory.cs"> <Link>Test\Graphics\Factories\SceneFactory.cs</Link> </SourcesGraphicsFactories>
+    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\ShapeFactory.cs"> <Link>Test\Graphics\Factories\ShapeFactory.cs</Link> </SourcesGraphicsFactories>
+    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\Transform2DFactory.cs"> <Link>Test\Graphics\Factories\Transform2DFactory.cs</Link> </SourcesGraphicsFactories>
+    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\TransformFactory.cs"> <Link>Test\Graphics\Factories\TransformFactory.cs</Link> </SourcesGraphicsFactories>
+    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\Visual3DFactory.cs"> <Link>Test\Graphics\Factories\Visual3DFactory.cs</Link> </SourcesGraphicsFactories>
+    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\VisualFactory.cs"> <Link>Test\Graphics\Factories\VisualFactory.cs</Link> </SourcesGraphicsFactories>
+  </ItemGroup>
+
+  <!-- Graphics Reference Renderer -->
+  <ItemGroup>
+    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\BiLinearTextureFilter.cs"> <Link>Test\Graphics\ReferenceRender\BiLinearTextureFilter.cs</Link> </SourcesGraphicsReferenceRender>
+    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\Edge.cs"> <Link>Test\Graphics\ReferenceRender\Edge.cs</Link> </SourcesGraphicsReferenceRender>
+    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\GouraudShader.cs"> <Link>Test\Graphics\ReferenceRender\GouraudShader.cs</Link> </SourcesGraphicsReferenceRender>
+    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\HdrColor.cs"> <Link>Test\Graphics\ReferenceRender\HdrColor.cs</Link> </SourcesGraphicsReferenceRender>
+    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\Interpolators.cs"> <Link>Test\Graphics\ReferenceRender\Interpolators.cs</Link> </SourcesGraphicsReferenceRender>
+    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\LightEquations.cs"> <Link>Test\Graphics\ReferenceRender\LightEquations.cs</Link> </SourcesGraphicsReferenceRender>
+    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\MeshProjectedGeometry.cs"> <Link>Test\Graphics\ReferenceRender\MeshProjectedGeometry.cs</Link> </SourcesGraphicsReferenceRender>
+    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\ModelBounder.cs"> <Link>Test\Graphics\ReferenceRender\ModelBounder.cs</Link> </SourcesGraphicsReferenceRender>
+    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\ModelRenderer.cs"> <Link>Test\Graphics\ReferenceRender\ModelRenderer.cs</Link> </SourcesGraphicsReferenceRender>
+    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\NearestNeighbourTextureFilter.cs"> <Link>Test\Graphics\ReferenceRender\NearestNeighbourTextureFilter.cs</Link> </SourcesGraphicsReferenceRender>
+    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\PhongShader.cs"> <Link>Test\Graphics\ReferenceRender\PhongShader.cs</Link> </SourcesGraphicsReferenceRender>
+    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\ProjectedGeometry.cs"> <Link>Test\Graphics\ReferenceRender\ProjectedGeometry.cs</Link> </SourcesGraphicsReferenceRender>
+    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\RenderBuffer.cs"> <Link>Test\Graphics\ReferenceRender\RenderBuffer.cs</Link> </SourcesGraphicsReferenceRender>
+    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\RenderTolerance.cs"> <Link>Test\Graphics\ReferenceRender\RenderTolerance.cs</Link> </SourcesGraphicsReferenceRender>
+    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\RenderToToleranceShader.cs"> <Link>Test\Graphics\ReferenceRender\RenderToToleranceShader.cs</Link> </SourcesGraphicsReferenceRender>
+    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\RenderVerifier.cs"> <Link>Test\Graphics\ReferenceRender\RenderVerifier.cs</Link> </SourcesGraphicsReferenceRender>
+    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\SceneRenderer.cs"> <Link>Test\Graphics\ReferenceRender\SceneRenderer.cs</Link> </SourcesGraphicsReferenceRender>
+    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\Shader.cs"> <Link>Test\Graphics\ReferenceRender\Shader.cs</Link> </SourcesGraphicsReferenceRender>
+    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\SolidColorTextureFilter.cs"> <Link>Test\Graphics\ReferenceRender\SolidColorTextureFilter.cs</Link> </SourcesGraphicsReferenceRender>
+    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\SSLProjectedGeometry.cs"> <Link>Test\Graphics\ReferenceRender\SSLProjectedGeometry.cs</Link> </SourcesGraphicsReferenceRender>
+    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\TextureFilter.cs"> <Link>Test\Graphics\ReferenceRender\TextureFilter.cs</Link> </SourcesGraphicsReferenceRender>
+    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\TextureGenerator.cs"> <Link>Test\Graphics\ReferenceRender\TextureGenerator.cs</Link> </SourcesGraphicsReferenceRender>
+    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\Triangle.cs"> <Link>Test\Graphics\ReferenceRender\Triangle.cs</Link> </SourcesGraphicsReferenceRender>
+    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\TriLinearTextureFilter.cs"> <Link>Test\Graphics\ReferenceRender\TriLinearTextureFilter.cs</Link> </SourcesGraphicsReferenceRender>
+    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\Vertex.cs"> <Link>Test\Graphics\ReferenceRender\Vertex.cs</Link> </SourcesGraphicsReferenceRender>
+    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\VisualBounder.cs"> <Link>Test\Graphics\ReferenceRender\VisualBounder.cs</Link> </SourcesGraphicsReferenceRender>
+  </ItemGroup>
+
+  <!-- Graphics Test Types -->
+  <ItemGroup>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\AnimationAPITest.cs"> <Link>Test\Graphics\TestTypes\AnimationAPITest.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\AnimationAPITestBase.cs"> <Link>Test\Graphics\TestTypes\AnimationAPITestBase.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\ClassGenerator.cs"> <Link>Test\Graphics\TestTypes\ClassGenerator.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\CodeGenerator.cs"> <Link>Test\Graphics\TestTypes\CodeGenerator.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\ConstructorGenerator.cs"> <Link>Test\Graphics\TestTypes\ConstructorGenerator.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\CoreGraphicsTest.cs"> <Link>Test\Graphics\TestTypes\CoreGraphicsTest.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\EnvironmentWrapper.cs"> <Link>Test\Graphics\TestTypes\EnvironmentWrapper.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\ExceptionCatchingTest.cs"> <Link>Test\Graphics\TestTypes\ExceptionCatchingTest.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\Exceptions.cs"> <Link>Test\Graphics\TestTypes\Exceptions.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\FactoryParser.cs"> <Link>Test\Graphics\TestTypes\FactoryParser.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\InfoOrganizer.cs"> <Link>Test\Graphics\TestTypes\InfoOrganizer.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\InheritanceChecker.cs"> <Link>Test\Graphics\TestTypes\InheritanceChecker.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\Interop.cs"> <Link>Test\Graphics\TestTypes\Interop.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\Logger.cs"> <Link>Test\Graphics\TestTypes\Logger.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\MethodGenerator.cs"> <Link>Test\Graphics\TestTypes\MethodGenerator.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\MethodGeneratorBase.cs"> <Link>Test\Graphics\TestTypes\MethodGeneratorBase.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\PartialTrust.cs"> <Link>Test\Graphics\TestTypes\PartialTrust.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\PhotoConverter.cs"> <Link>Test\Graphics\TestTypes\PhotoConverter.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\Photographer.cs"> <Link>Test\Graphics\TestTypes\Photographer.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\PropertyGenerator.cs"> <Link>Test\Graphics\TestTypes\PropertyGenerator.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\ReferenceTest.cs"> <Link>Test\Graphics\TestTypes\ReferenceTest.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\RenderingTest.cs"> <Link>Test\Graphics\TestTypes\RenderingTest.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\RenderingWindow.cs"> <Link>Test\Graphics\TestTypes\RenderingWindow.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\RunAllTester.cs"> <Link>Test\Graphics\TestTypes\RunAllTester.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\RunScriptTester.cs"> <Link>Test\Graphics\TestTypes\RunScriptTester.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\SerializationTest.cs"> <Link>Test\Graphics\TestTypes\SerializationTest.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\Tester.cs"> <Link>Test\Graphics\TestTypes\Tester.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\TestLauncher.cs"> <Link>Test\Graphics\TestTypes\TestLauncher.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\TestObjects.cs"> <Link>Test\Graphics\TestTypes\TestObjects.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\Tokens.cs"> <Link>Test\Graphics\TestTypes\Tokens.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\Variation.cs"> <Link>Test\Graphics\TestTypes\Variation.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\ViewportWindow.cs"> <Link>Test\Graphics\TestTypes\ViewportWindow.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\VisualObjects.cs"> <Link>Test\Graphics\TestTypes\VisualObjects.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\VisualVerificationTest.cs"> <Link>Test\Graphics\TestTypes\VisualVerificationTest.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\VisualWindow.cs"> <Link>Test\Graphics\TestTypes\VisualWindow.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\VisualWrapper.cs"> <Link>Test\Graphics\TestTypes\VisualWrapper.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\XAMLTest.cs"> <Link>Test\Graphics\TestTypes\XAMLTest.cs</Link> </SourcesGraphicsTestTypes>
+  </ItemGroup>
+
+  <!-- Graphics -->
+  <ItemGroup>
+    <SourcesGraphics Include="@(SourcesGraphicsBase)" />
+    <SourcesGraphics Include="@(SourcesGraphicsFactories)" />
+    <SourcesGraphics Include="@(SourcesGraphicsReferenceRender)" />
+    <SourcesGraphics Include="@(SourcesGraphicsTestTypes)" />
+  </ItemGroup>
+
+  <!-- Layout Common -->
+  <ItemGroup>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\Common\Common.cs"> <Link>Test\Layout\Common\Common.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\Common\LayoutTestWindows.cs"> <Link>Test\Layout\Common\LayoutTestWindows.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\Common\LayoutUtility.cs"> <Link>Test\Layout\Common\LayoutUtility.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\Common\DoubleUtil.cs"> <Link>Test\Layout\Common\DoubleUtil.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\Common\VisualScan.cs"> <Link>Test\Layout\Common\VisualScan.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\TestTypes\LayoutTest.cs"> <Link>Test\Layout\TestTypes\LayoutTest.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\TestTypes\CodeTest.cs"> <Link>Test\Layout\TestTypes\CodeTest.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\TestTypes\PropertyDumpTest.cs"> <Link>Test\Layout\TestTypes\PropertyDumpTest.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\TestTypes\VisualScanTest.cs"> <Link>Test\Layout\TestTypes\VisualScanTest.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\Arguments.cs"> <Link>Test\Layout\PropertyDump\Arguments.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\DiffPackage.cs"> <Link>Test\Layout\PropertyDump\DiffPackage.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\Filter.cs"> <Link>Test\Layout\PropertyDump\Filter.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\FrameworkElements.cs"> <Link>Test\Layout\PropertyDump\FrameworkElements.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\Package.cs"> <Link>Test\Layout\PropertyDump\Package.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\PropertyDumpCore.cs"> <Link>Test\Layout\PropertyDump\PropertyDumpCore.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\PropertyDumpHelper.cs"> <Link>Test\Layout\PropertyDump\PropertyDumpHelper.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\ColumnResultW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\ColumnResultW.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\ContainerParagraphResultW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\ContainerParagraphResultW.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\DocumentPageTextViewW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\DocumentPageTextViewW.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\FloaterParagraphResultW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\FloaterParagraphResultW.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\FigureParagraphResultW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\FigureParagraphResultW.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\FlowDocumentPageW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\FlowDocumentPageW.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\IEnumerableW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\IEnumerableW.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\LineResultDetailsW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\LineResultDetailsW.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\LineResultW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\LineResultW.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\OrientedTextPositionW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\OrientedTextPositionW.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\ParagraphResultW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\ParagraphResultW.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\ReflectionHelper.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\ReflectionHelper.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\RowParagraphResultW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\RowParagraphResultW.cs</Link> </SourcesLayoutCommon>    
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\SubpageParagraphResultW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\SubpageParagraphResultW.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\TableParagraphResultW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\TableParagraphResultW.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\TextDocumentViewW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\TextDocumentViewW.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\TextParagraphResultW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\TextParagraphResultW.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\TextParagraphViewW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\TextParagraphViewW.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\UIElementParagraphResultW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\UIElementParagraphResultW.cs</Link> </SourcesLayoutCommon>
+  </ItemGroup>
+
+  <!-- Stress Framework -->
+  <ItemGroup>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\DistributionFactory.cs"> <Link>Test\Stability\Stress\DistributionFactory.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\RandDist.cs"> <Link>Test\Stability\Stress\RandDist.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\RandomGenerator.cs"> <Link>Test\Stability\Stress\RandomGenerator.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Invariant.cs"> <Link>Test\Stability\Stress\Invariant.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\StressFrameWorkHelper.cs"> <Link>Test\Stability\Stress\StressFrameWorkHelper.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\WeightedList.cs"> <Link>Test\Stability\Stress\WeightedList.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Action\ActionManager.cs"> <Link>Test\Stability\Stress\Action\ActionManager.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Action\Attributes.cs"> <Link>Test\Stability\Stress\Action\Attributes.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Action\IAction.cs"> <Link>Test\Stability\Stress\Action\IAction.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Action\IActionFactory.cs"> <Link>Test\Stability\Stress\Action\IActionFactory.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Action\WeightedActionFactory.cs"> <Link>Test\Stability\Stress\Action\WeightedActionFactory.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\ConfigReader\ConfigReader.cs"> <Link>Test\Stability\Stress\ConfigReader\ConfigReader.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\ConfigReader\IConfigReader.cs"> <Link>Test\Stability\Stress\ConfigReader\IConfigReader.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\ConfigReader\MultipleTagSectionHandler.cs"> <Link>Test\Stability\Stress\ConfigReader\MultipleTagSectionHandler.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Context\ActionHandlers.cs"> <Link>Test\Stability\Stress\Context\ActionHandlers.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Context\EventHandlers.cs"> <Link>Test\Stability\Stress\Context\EventHandlers.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Context\EventArgs.cs"> <Link>Test\Stability\Stress\Context\EventArgs.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Context\Handlers.cs"> <Link>Test\Stability\Stress\Context\Handlers.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Context\IStressContext.cs"> <Link>Test\Stability\Stress\Context\IStressContext.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Context\IStressContextManager.cs"> <Link>Test\Stability\Stress\Context\IStressContextManager.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Context\StressContext.cs"> <Link>Test\Stability\Stress\Context\StressContext.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Context\StressContextManager.cs"> <Link>Test\Stability\Stress\Context\StressContextManager.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Context\IObjectFactory.cs"> <Link>Test\Stability\Stress\Context\IObjectFactory.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Context\EnumerationObjectFactory.cs"> <Link>Test\Stability\Stress\Context\EnumerationObjectFactory.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Context\ReflectionObjectFactory.cs"> <Link>Test\Stability\Stress\Context\ReflectionObjectFactory.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\CoreServices\CoreServices.cs"> <Link>Test\Stability\Stress\CoreServices\CoreServices.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\CoreServices\ICoreServices.cs"> <Link>Test\Stability\Stress\CoreServices\ICoreServices.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\CoreServices\IStressManager.cs"> <Link>Test\Stability\Stress\CoreServices\IStressManager.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\CoreServices\StressManager.cs"> <Link>Test\Stability\Stress\CoreServices\StressManager.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\CoreServices\EventLogger.cs"> <Link>Test\Stability\Stress\CoreServices\EventLogger.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Exceptions\ExceptionEventArgs.cs"> <Link>Test\Stability\Stress\Exceptions\ExceptionEventArgs.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Exceptions\ExceptionEventHandlers.cs"> <Link>Test\Stability\Stress\Exceptions\ExceptionEventHandlers.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\PropertyEngine\PropertyEngine.cs"> <Link>Test\Stability\Stress\PropertyEngine\PropertyEngine.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Storage\ContextStorage.cs"> <Link>Test\Stability\Stress\Storage\ContextStorage.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Storage\EventArgs.cs"> <Link>Test\Stability\Stress\Storage\EventArgs.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Storage\IStorage.cs"> <Link>Test\Stability\Stress\Storage\IStorage.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\StressFrameworkObject\IStressFrameworkObject.cs"> <Link>Test\Stability\Stress\StressFrameworkObject\IStressFrameworkObject.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\StressFrameworkObject\StressFrameworkObject.cs"> <Link>Test\Stability\Stress\StressFrameworkObject\StressFrameworkObject.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Security\SecurityHelper.cs"> <Link>Test\Stability\Stress\Security\SecurityHelper.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Thread\EventArgs.cs"> <Link>Test\Stability\Stress\Thread\EventArgs.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Thread\EventHandlers.cs"> <Link>Test\Stability\Stress\Thread\EventHandlers.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Thread\IStressThread.cs"> <Link>Test\Stability\Stress\Thread\IStressThread.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Thread\IStressThreadManager.cs"> <Link>Test\Stability\Stress\Thread\IStressThreadManager.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Thread\StressThread.cs"> <Link>Test\Stability\Stress\Thread\StressThread.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Thread\StressThreadManager.cs"> <Link>Test\Stability\Stress\Thread\StressThreadManager.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Utils\ProcessShutdownMonitor.cs"> <Link>Test\Stability\Stress\Utils\ProcessShutdownMonitor.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Utils\Win32NativeInterop.cs"> <Link>Test\Stability\Stress\Utils\Win32NativeInterop.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Utils\CommandlineParser.cs"> <Link>Test\Stability\Stress\Utils\CommandlineParser.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Utils\XmlParser.cs"> <Link>Test\Stability\Stress\Utils\XmlParser.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\IEHelper\DISPIDs.cs"> <Link>Test\Stability\Stress\IEHelper\DISPIDs.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\IEHelper\IEInterop.cs"> <Link>Test\Stability\Stress\IEHelper\IEInterop.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\IEHelper\Rtl.cs"> <Link>Test\Stability\Stress\IEHelper\Rtl.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Collections\Generics\WeightedList.cs"> <Link>Test\Collections\Generics\WeightedList.cs</Link> </SourcesStressFramework>
+  </ItemGroup>
+
+  <!-- Stress Framework -->
+  <ItemGroup>
+    <SourcesStressFrameworkAvalonProxy Include="$(CommonCodeLocation)\Stability\Stress\AvalonProxy\AssemblyCacheEnum.cs"> <Link>Test\Stability\Stress\AvalonProxy\AssemblyCacheEnum.cs</Link> </SourcesStressFrameworkAvalonProxy>
+    <SourcesStressFrameworkAvalonProxy Include="$(CommonCodeLocation)\Stability\Stress\AvalonProxy\AvalonActionManager.cs"> <Link>Test\Stability\Stress\AvalonProxy\AvalonActionManager.cs</Link> </SourcesStressFrameworkAvalonProxy>
+    <SourcesStressFrameworkAvalonProxy Include="$(CommonCodeLocation)\Stability\Stress\AvalonProxy\AvalonStressContext.cs"> <Link>Test\Stability\Stress\AvalonProxy\AvalonStressContext.cs</Link> </SourcesStressFrameworkAvalonProxy>
+    <SourcesStressFrameworkAvalonProxy Include="$(CommonCodeLocation)\Stability\Stress\AvalonProxy\AvalonStressContextManager.cs"> <Link>Test\Stability\Stress\AvalonProxy\AvalonStressContextManager.cs</Link> </SourcesStressFrameworkAvalonProxy>
+    <SourcesStressFrameworkAvalonProxy Include="$(CommonCodeLocation)\Stability\Stress\AvalonProxy\AvalonStressThreadManager.cs"> <Link>Test\Stability\Stress\AvalonProxy\AvalonStressThreadManager.cs</Link> </SourcesStressFrameworkAvalonProxy>
+    <SourcesStressFrameworkAvalonProxy Include="$(CommonCodeLocation)\Stability\Stress\AvalonProxy\MemoryChecker.cs"> <Link>Test\Stability\Stress\AvalonProxy\MemoryChecker.cs</Link> </SourcesStressFrameworkAvalonProxy>
+    <SourcesStressFrameworkAvalonProxy Include="$(CommonCodeLocation)\Stability\Stress\AvalonProxy\AvalonStressFrameworkHelper.cs"> <Link>Test\Stability\Stress\AvalonProxy\AvalonStressFrameworkHelper.cs</Link> </SourcesStressFrameworkAvalonProxy>
+    <SourcesStressFrameworkAvalonProxy Include="$(CommonCodeLocation)\Stability\Stress\AvalonProxy\BrowserStressContext.cs"> <Link>Test\Stability\Stress\AvalonProxy\BrowserStressContext.cs</Link> </SourcesStressFrameworkAvalonProxy>
+    <SourcesStressFrameworkAvalonProxy Include="$(CommonCodeLocation)\Stability\Stress\AvalonProxy\BrowserStressContextManager.cs"> <Link>Test\Stability\Stress\AvalonProxy\BrowserStressContextManager.cs</Link> </SourcesStressFrameworkAvalonProxy>
+    <SourcesStressFrameworkAvalonProxy Include="$(CommonCodeLocation)\Stability\Stress\AvalonProxy\BrowserStressThreadManager.cs"> <Link>Test\Stability\Stress\AvalonProxy\BrowserStressThreadManager.cs</Link> </SourcesStressFrameworkAvalonProxy>
+  </ItemGroup>
+
+  <!-- Stress Framework -->
+  <ItemGroup>
+    <SourcesStressFrameworkLonghaulProxy Include="$(CommonCodeLocation)\Stability\Stress\LonghaulProxy\LonghaulSQLConnect.cs"> <Link>Test\Stability\Stress\LonghaulProxy\LonghaulSQLConnect.cs</Link> </SourcesStressFrameworkLonghaulProxy>
+    <SourcesStressFrameworkLonghaulProxy Include="$(CommonCodeLocation)\Stability\Stress\LonghaulProxy\LonghaulCommon.cs"> <Link>Test\Stability\Stress\LonghaulProxy\LonghaulCommon.cs</Link> </SourcesStressFrameworkLonghaulProxy>
+    <SourcesStressFrameworkLonghaulProxy Include="$(CommonCodeLocation)\Stability\Stress\LonghaulProxy\LonghaulStateObjects.cs"> <Link>Test\Stability\Stress\LonghaulProxy\LonghaulStateObjects.cs</Link> </SourcesStressFrameworkLonghaulProxy>
+    <SourcesStressFrameworkLonghaulProxy Include="$(CommonCodeLocation)\Stability\Stress\LonghaulProxy\LonghaulStressContext.cs"> <Link>Test\Stability\Stress\LonghaulProxy\LonghaulStressContext.cs</Link> </SourcesStressFrameworkLonghaulProxy>
+    <SourcesStressFrameworkLonghaulProxy Include="$(CommonCodeLocation)\Stability\Stress\LonghaulProxy\LonghaulStressContextManager.cs"> <Link>Test\Stability\Stress\LonghaulProxy\LonghaulStressContextManager.cs</Link> </SourcesStressFrameworkLonghaulProxy>
+    <SourcesStressFrameworkLonghaulProxy Include="$(CommonCodeLocation)\Stability\Stress\LonghaulProxy\LonghaulStressThreadManager.cs"> <Link>Test\Stability\Stress\LonghaulProxy\LonghaulStressThreadManager.cs</Link> </SourcesStressFrameworkLonghaulProxy>
+    <SourcesStressFrameworkLonghaulProxy Include="$(CommonCodeLocation)\Stability\Stress\LonghaulProxy\LonghaulEventLog.cs"> <Link>Test\Stability\Stress\LonghaulProxy\LonghaulEventLog.cs</Link> </SourcesStressFrameworkLonghaulProxy>
+  </ItemGroup>
+
+  <!-- Stability Leak -->
+  <ItemGroup>
+    <SourcesStabilityLeak Include="$(CommonCodeLocation)\Stability\LeakUtility.cs"> <Link>Test\Stability\LeakUtility.cs</Link> </SourcesStabilityLeak>
+    <SourcesStabilityLeak Include="$(CommonCodeLocation)\Stability\Input.cs"> <Link>Test\Stability\Input.cs</Link> </SourcesStabilityLeak>
+  </ItemGroup>
+
+  <!-- Stress Graphics -->
+  <ItemGroup>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\AddNodes.cs"> <Link>Test\Stability\Stress\Graphics\AddNodes.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\AnimationFactory.cs"> <Link>Test\Stability\Stress\Graphics\AnimationFactory.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\Channel.cs"> <Link>Test\Stability\Stress\Graphics\Channel.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\ChannelFactory.cs"> <Link>Test\Stability\Stress\Graphics\ChannelFactory.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\CompositionActorFactory.cs"> <Link>Test\Stability\Stress\Graphics\CompositionActorFactory.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\ConnectDisconnect.cs"> <Link>Test\Stability\Stress\Graphics\ConnectDisconnect.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\ConnectDisconnectActorFactory.cs"> <Link>Test\Stability\Stress\Graphics\ConnectDisconnectActorFactory.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\ContainerVisual.cs"> <Link>Test\Stability\Stress\Graphics\ContainerVisual.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\DrawContextProvider.cs"> <Link>Test\Stability\Stress\Graphics\DrawContextProvider.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\GetHwndSources.cs"> <Link>Test\Stability\Stress\Graphics\GetHwndSources.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\GetProperties.cs"> <Link>Test\Stability\Stress\Graphics\GetProperties.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\GetPropertiesFactory.cs"> <Link>Test\Stability\Stress\Graphics\GetPropertiesFactory.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\HelperClass.cs"> <Link>Test\Stability\Stress\Graphics\HelperClass.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\HitTest.cs"> <Link>Test\Stability\Stress\Graphics\HitTest.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\HitTestFactory.cs"> <Link>Test\Stability\Stress\Graphics\HitTestFactory.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\HostVisual.cs"> <Link>Test\Stability\Stress\Graphics\HostVisual.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\HwndSourceCreator.cs"> <Link>Test\Stability\Stress\Graphics\HwndSourceCreator.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\IDrawContextProvider.cs"> <Link>Test\Stability\Stress\Graphics\IDrawContextProvider.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\IRootVisualHolder.cs"> <Link>Test\Stability\Stress\Graphics\IRootVisualHolder.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\ISurface.cs"> <Link>Test\Stability\Stress\Graphics\ISurface.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\IVisual.cs"> <Link>Test\Stability\Stress\Graphics\IVisual.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\IVisualProperties.cs"> <Link>Test\Stability\Stress\Graphics\IVisualProperties.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\Magnifier.cs"> <Link>Test\Stability\Stress\Graphics\Magnifier.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\MagnifierFactory.cs"> <Link>Test\Stability\Stress\Graphics\MagnifierFactory.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\MoveNode.cs"> <Link>Test\Stability\Stress\Graphics\MoveNode.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\NodeActor.cs"> <Link>Test\Stability\Stress\Graphics\NodeActor.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\NodeCreator.cs"> <Link>Test\Stability\Stress\Graphics\NodeCreator.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\R3DVisual.cs"> <Link>Test\Stability\Stress\Graphics\R3DVisual.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\Random.cs"> <Link>Test\Stability\Stress\Graphics\Random.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\RemoveNode.cs"> <Link>Test\Stability\Stress\Graphics\RemoveNode.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\RenderTargetBitmap.cs"> <Link>Test\Stability\Stress\Graphics\RenderTargetBitmap.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\RenderTargetBitmapFactory.cs"> <Link>Test\Stability\Stress\Graphics\RenderTargetBitmapFactory.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\RootVisualHolder.cs"> <Link>Test\Stability\Stress\Graphics\RootVisualHolder.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\RootVisualHolderActor.cs"> <Link>Test\Stability\Stress\Graphics\RootVisualHolderActor.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\SharedObjects.cs"> <Link>Test\Stability\Stress\Graphics\SharedObjects.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\TransformCreatorFactory.cs"> <Link>Test\Stability\Stress\Graphics\TransformCreatorFactory.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\TreeActor.cs"> <Link>Test\Stability\Stress\Graphics\TreeActor.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\TreeCreator.cs"> <Link>Test\Stability\Stress\Graphics\TreeCreator.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\TreeCreatorInitFactory.cs"> <Link>Test\Stability\Stress\Graphics\TreeCreatorInitFactory.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\TreeInitActor.cs"> <Link>Test\Stability\Stress\Graphics\TreeInitActor.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\UpdateProperties.cs"> <Link>Test\Stability\Stress\Graphics\UpdateProperties.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\UpdatePropertiesFactory.cs"> <Link>Test\Stability\Stress\Graphics\UpdatePropertiesFactory.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\VisualTarget.cs"> <Link>Test\Stability\Stress\Graphics\VisualTarget.cs</Link> </SourcesStressGraphics>
+  </ItemGroup>
+
+  <!-- Performance  -->
+  <ItemGroup>
+    <SourcesPerformanceTesting Include="$(CommonCodeLocation)\Performance\CLRProfilerControl.cs"> <Link>Test\Performance\CLRProfilerControl.cs</Link> </SourcesPerformanceTesting>
+    <SourcesPerformanceTesting Include="$(CommonCodeLocation)\Performance\CustomTestAction.cs"> <Link>Test\Performance\CustomTestAction.cs</Link> </SourcesPerformanceTesting>
+    <SourcesPerformanceTesting Include="$(CommonCodeLocation)\Performance\InputPerf.cs"> <Link>Test\Performance\InputPerf.cs</Link> </SourcesPerformanceTesting>
+    <SourcesPerformanceTesting Include="$(CommonCodeLocation)\Performance\PerfActionHelper.cs"> <Link>Test\Performance\PerfActionHelper.cs</Link> </SourcesPerformanceTesting>
+    <SourcesPerformanceTesting Include="$(CommonCodeLocation)\Performance\TraceProvider.cs"> <Link>Test\Performance\TraceProvider.cs</Link> </SourcesPerformanceTesting>
+    <SourcesPerformanceTesting Include="$(CommonCodeLocation)\Performance\EventTrace.cs"> <Link>Test\Performance\EventTrace.cs</Link> </SourcesPerformanceTesting>
+    <SourcesPerformanceTesting Include="$(CommonCodeLocation)\Performance\EventType.cs"> <Link>Test\Performance\EventType.cs</Link> </SourcesPerformanceTesting>
+  </ItemGroup>
+
+  <!-- Performance Partial Trust -->
+  <ItemGroup>
+    <SourcesPerformanceTestingPartialTrust Include="$(CommonCodeLocation)\Performance\CLRProfilerControl.cs"> <Link>Test\Performance\CLRProfilerControl.cs</Link> </SourcesPerformanceTestingPartialTrust>
+    <SourcesPerformanceTestingPartialTrust Include="$(CommonCodeLocation)\Performance\CustomTestAction.cs"> <Link>Test\Performance\CustomTestAction.cs</Link> </SourcesPerformanceTestingPartialTrust>
+    <SourcesPerformanceTestingPartialTrust Include="$(CommonCodeLocation)\Performance\InputPerf_PartialTrust.cs"> <Link>Test\Performance\InputPerf_PartialTrust.cs</Link> </SourcesPerformanceTestingPartialTrust>
+    <SourcesPerformanceTestingPartialTrust Include="$(CommonCodeLocation)\Performance\PerfActionHelper.cs"> <Link>Test\Performance\PerfActionHelper.cs</Link> </SourcesPerformanceTestingPartialTrust>
+    <SourcesPerformanceTestingPartialTrust Include="$(CommonCodeLocation)\Performance\PerfTestTraceProvider.cs"> <Link>Test\Performance\PerfTestTraceProvider.cs</Link> </SourcesPerformanceTestingPartialTrust>
+  </ItemGroup>
+
+  <!-- Annotations -->
+  <ItemGroup>
+    <SourcesAnnotations Include="$(CommonCodeLocation)\Annotations\AnnotationsTestSettings.cs"> <Link>Test\Annotations\AnnotationsTestSettings.cs</Link> </SourcesAnnotations>
+    <SourcesAnnotations Include="$(CommonCodeLocation)\Annotations\Attributes.cs"> <Link>Test\Annotations\Attributes.cs</Link> </SourcesAnnotations>
+    <SourcesAnnotations Include="$(CommonCodeLocation)\Annotations\FastTestSuite.cs"> <Link>Test\Annotations\FastTestSuite.cs</Link> </SourcesAnnotations>
+    <SourcesAnnotations Include="$(CommonCodeLocation)\Annotations\TestSuite.cs"> <Link>Test\Annotations\TestSuite.cs</Link> </SourcesAnnotations>
+    <SourcesAnnotations Include="$(CommonCodeLocation)\Annotations\TestSuiteRunner.cs"> <Link>Test\Annotations\TestSuiteRunner.cs</Link> </SourcesAnnotations>
+    <SourcesAnnotations Include="$(CommonCodeLocation)\Annotations\UIAutomationModule.cs"> <Link>Test\Annotations\UIAutomationModule.cs</Link> </SourcesAnnotations>
+    <SourcesAnnotations Include="$(CommonCodeLocation)\Annotations\VisualAutomationTestSuite.cs"> <Link>Test\Annotations\VisualAutomationTestSuite.cs</Link> </SourcesAnnotations>
+    <SourcesAnnotations Include="$(CommonCodeLocation)\Annotations\VScanModule.cs"> <Link>Test\Annotations\VScanModule.cs</Link> </SourcesAnnotations>
+    <SourcesAnnotations Include="$(CommonCodeLocation)\Annotations\Internal\ALogger.cs"> <Link>Test\Annotations\Internal\ALogger.cs</Link> </SourcesAnnotations>
+    <SourcesAnnotations Include="$(CommonCodeLocation)\Annotations\Internal\TestCase.cs"> <Link>Test\Annotations\Internal\TestCase.cs</Link> </SourcesAnnotations>
+    <SourcesAnnotations Include="$(CommonCodeLocation)\Annotations\Internal\TestVariation.cs"> <Link>Test\Annotations\Internal\TestVariation.cs</Link> </SourcesAnnotations>
+  </ItemGroup>
+
+</Project>
diff --git a/src/Microsoft.DotNet.Wpf/test/StrongName.props b/src/Microsoft.DotNet.Wpf/test/StrongName.props
new file mode 100644
index 00000000000..9d7644845c8
--- /dev/null
+++ b/src/Microsoft.DotNet.Wpf/test/StrongName.props
@@ -0,0 +1,17 @@
+<Project>
+    <PropertyGroup>
+        <SignAssembly>false</SignAssembly>
+        <TestUntrustedKey>$(WpfTestBasePath)\Common\keys\TestUntrusted.snk</TestUntrustedKey>
+        <TestUntrustedPublicKey>0024000004800000940000000602000000240000525341310004000001000100C1BCD9B7844CD35725B1138216ED5E0FAB914676D580860F6F081C8C0E83B92D835FFAE76FA968F7637E4B6E32D77FEE1C084088CEE736CE589D65AD0FA66F086C2F5F755A6F2909D17C643B45C72A906AAAC617BFD67491A8FCE54784CA98317AEA28C0544546FF9123F6F94E59793F2874437BC3D136A40095D0F960E6A6A4</TestUntrustedPublicKey>
+        <TestUntrustedPublicKeyToken>A069DEE354D95F76</TestUntrustedPublicKeyToken>
+
+        <TestTrustedKey>$(WpfTestBasePath)\Common\keys\TestTrusted.snk</TestTrustedKey>
+        <TestTrustedPublicKey>00240000048000009400000006020000002400005253413100040000010001007FDB0774CDFEFC88AAA6613332E5BE12A11BD32ADB7E2EAD4C049CFFCC6284FA975CD55B0291738247984CFCF4074970C44C1DA29B07201B0F90FB7B2C60D2A604C4ABA9FBC106AD3D1838DAD496780B0E4518D045FE70C4DE4E9663354989CF9A2E4F9ADD41BFEF82437DA35C8B1C1A0D6DACB521456C4BB18BADA2BE7407C3</TestTrustedPublicKey>
+        <TestTrustedPublicKeyToken>e1e6160fdd198bb1</TestTrustedPublicKeyToken>
+        
+        <!-- Sign with the test key and ensure that we do not delay sign test code -->
+        <DelaySign>false</DelaySign>
+        <AssemblyOriginatorKeyFile>$(TestUntrustedKey)</AssemblyOriginatorKeyFile>
+        <StrongNameKeyId>custom</StrongNameKeyId>
+    </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Wpf/test/StrongName.targets b/src/Microsoft.DotNet.Wpf/test/StrongName.targets
new file mode 100644
index 00000000000..cfc73c73f7b
--- /dev/null
+++ b/src/Microsoft.DotNet.Wpf/test/StrongName.targets
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <PropertyGroup Condition="'$(SignAssembly)' == 'true' AND '$(AssemblyOriginatorKeyFile)' == '$(TestTrustedKey)'" >
+        <PublicKey>$(TestTrustedPublicKey)</PublicKey>
+        <PublicKeyToken>$(TestTrustedPublicKeyToken)</PublicKeyToken>
+  </PropertyGroup>
+  
+  <PropertyGroup Condition="'$(SignAssembly)' == 'true' AND '$(AssemblyOriginatorKeyFile)' == '$(TestUntrustedKey)'" >
+        <PublicKey>$(TestUntrustedPublicKey)</PublicKey>
+        <PublicKeyToken>$(TestUntrustedPublicKeyToken)</PublicKeyToken>
+  </PropertyGroup>
+</Project>

From 7c9221bff9d1742d06eb3ab6b7a69d7845eced30 Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Fri, 10 May 2019 16:13:51 -0700
Subject: [PATCH 09/72] prepare helix payload with DRT

---
 eng/helix/helixpublish.proj                     |  2 +-
 eng/helix/prepare-helix-payload.ps1             | 17 ++++++++++++++---
 eng/helix/runtests.ps1                          |  2 +-
 .../test/Directory.Build.props                  |  2 +-
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/eng/helix/helixpublish.proj b/eng/helix/helixpublish.proj
index 75037efd768..3792f934aaa 100644
--- a/eng/helix/helixpublish.proj
+++ b/eng/helix/helixpublish.proj
@@ -24,7 +24,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <!--<PackageReference Include="Microsoft.DotNet.Wpf.DncEng.Test" Version="1.0.0" /> -->
+    <PackageReference Include="runtime.win-$(Platform).Microsoft.DotNet.Wpf.Test" Version="1.0.0-beta.19260.5" />
     <HelixCorrelationPayload Include="..\..\HelixPayload\$(Configuration)\$(Platform)" /> 
     <HelixWorkItem Include="HelloHelix">
       <Timeout>00:20:00</Timeout>
diff --git a/eng/helix/prepare-helix-payload.ps1 b/eng/helix/prepare-helix-payload.ps1
index 675a95ddb74..7181d004d07 100644
--- a/eng/helix/prepare-helix-payload.ps1
+++ b/eng/helix/prepare-helix-payload.ps1
@@ -37,12 +37,23 @@ function CopyFolderStructure($from, $to)
 }
 
 # Copy files from nuget packages
-$testNugetLocation = Join-Path $nugetPackagesDir "Microsoft.DotNet.Wpf.DncEng.Test\1.0.0\tools\win-$platform\"
+$testNugetLocation = Join-Path $nugetPackagesDir "runtime.win-$platform.Microsoft.DotNet.Wpf.DncEng.Test\1.0.0-beta.19260.5\tools\win-$platform\"
 $testPayloadLocation = Join-Path $payloadDir "Test"
 CopyFolderStructure $testNugetLocation $testPayloadLocation
 
-# Copy local dotnet install
-$localDotnetInstall = Join-Path $env:BUILD_SOURCESDIRECTORY '.dotnet'
+# Copy local DRT assemblies to test location
+CopyFolderStructure $testNugetLocation $testPayloadLocation
+$drtArtifactsLocation = [System.IO.Path]::Combine($env:BUILD_SOURCESDIRECTORY, "artifacts\test", $configuration, $platform, "Test\DRT")
+$drtPayloadLocation = Join-Path $payloadDir "Test\DRT"
+CopyFolderStructure $drtArtifactsLocation $drtPayloadLocation
+
+# Copy built assemblies to dotnet install location
+$eng = Join-Path $env:BUILD_SOURCESDIRECTORY "eng"
+$configArgs = if ($configuration == "Release") { "-release" } else { }
+& "$eng\copy-wpf.ps1 -local -arch $platform $configArgs"
+
+# Copy local dotnet install to payload
+$localDotnetInstall = Join-Path $env:BUILD_SOURCESDIRECTORY ".dotnet"
 $dotnetPayloadLocation = Join-Path $payloadDir "dotnet"
 CopyFolderStructure $localDotnetInstall $dotnetPayloadLocation
 
diff --git a/eng/helix/runtests.ps1 b/eng/helix/runtests.ps1
index 29ec11c15e3..90dff99c810 100644
--- a/eng/helix/runtests.ps1
+++ b/eng/helix/runtests.ps1
@@ -3,7 +3,7 @@
 & "$PSScriptRoot\configure-helix-machine.ps1"
 
 # Run the tests
-dotnet --info
+Get-ChildItem -Recurse
 
 # We can use $env:HELIX_PYTHONPATH $env:HELIX_SCRIPT_ROOT\upload_result.py to upload any QV specific logs and/or screenshots that we are interested in.
 # For example: $env:HELIX_PYTHONPATH $env:HELIX_SCRIPT_ROOT%\upload_result.py -result screenshot.jpg -result_name screenshot.jpg
diff --git a/src/Microsoft.DotNet.Wpf/test/Directory.Build.props b/src/Microsoft.DotNet.Wpf/test/Directory.Build.props
index 730df2169f9..5f0070737bf 100644
--- a/src/Microsoft.DotNet.Wpf/test/Directory.Build.props
+++ b/src/Microsoft.DotNet.Wpf/test/Directory.Build.props
@@ -2,7 +2,7 @@
   <Import Condition="Exists('../Directory.Build.props')" Project="../Directory.Build.props" />
   
   <PropertyGroup>
-    <PublishRoot>$(WpfIntRootDirectory)publish\</PublishRoot>
+    <PublishRoot>$(RepoRoot)artifacts\test\</PublishRoot>
     <PlatformFolder>x86</PlatformFolder>
     <PlatformFolder Condition="'$(Platform)' == 'x64'">x64</PlatformFolder>
   </PropertyGroup>

From 6901ece2d45f300474ddd59765eaee4a84562b7c Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Sun, 12 May 2019 07:40:56 -0700
Subject: [PATCH 10/72] add source link for deterministic source path issue

---
 src/Microsoft.DotNet.Wpf/test/Directory.Build.props | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Microsoft.DotNet.Wpf/test/Directory.Build.props b/src/Microsoft.DotNet.Wpf/test/Directory.Build.props
index 5f0070737bf..bff1c6bee77 100644
--- a/src/Microsoft.DotNet.Wpf/test/Directory.Build.props
+++ b/src/Microsoft.DotNet.Wpf/test/Directory.Build.props
@@ -5,8 +5,13 @@
     <PublishRoot>$(RepoRoot)artifacts\test\</PublishRoot>
     <PlatformFolder>x86</PlatformFolder>
     <PlatformFolder Condition="'$(Platform)' == 'x64'">x64</PlatformFolder>
+    <MicrosoftSourceLinkVersion>1.0.0-beta2-18618-05</MicrosoftSourceLinkVersion>
   </PropertyGroup>
   
+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="$(MicrosoftSourceLinkVersion)" PrivateAssets="all"/>
+  </ItemGroup>
+
   <PropertyGroup>
     <WpfTestBasePath>$(MsBuildThisFileDirectory)</WpfTestBasePath>
     <DrtCommonRoot>$(WpfTestBasePath)\Common\DRT</DrtCommonRoot>

From 97a0e0b8bebab87a75e0e10541b1ba87cb9e0847 Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Sun, 12 May 2019 08:13:59 -0700
Subject: [PATCH 11/72] remove explicit platform and extra file added

---
 .../test/DRT/DrtXaml/dirs.proj                | 18 ----------
 .../test/Directory.Build.props                | 35 ++++++++++++-------
 2 files changed, 22 insertions(+), 31 deletions(-)
 delete mode 100644 src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/dirs.proj

diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/dirs.proj b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/dirs.proj
deleted file mode 100644
index a74471c0709..00000000000
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/dirs.proj
+++ /dev/null
@@ -1,18 +0,0 @@
-<Project ToolsVersion="dogfood" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <!--Import the settings-->
-  <Import Project="$(_NTDRIVE)$(_NTROOT)\wpf\test\Microsoft.Wpf.Test.Native.Settings.Targets" />
-
-  <ItemGroup Condition="'$(BuildExePhase)' == '' AND '$(WPF_TESTBUILD_TARGETVERSION)' != 'v3.0' AND '$(WPF_TESTBUILD_TARGETVERSION)' != 'v3.5' ">
-    <ProjectFile Include="DrtXaml\DrtXaml.csproj" />
-    <ProjectFile Include="PartialTrustTests\DrtXaml.PartialTrustTests.csproj" />
-    <ProjectFile Include="XamlTestClasses\XamlTestClasses.csproj" />
-    <ProjectFile Include="BamlTestClasses35\BamlTestClasses35.csproj" />
-    <ProjectFile Include="BamlTestClasses40\BamlTestClasses40.csproj" />
-    <ProjectFile Include="BamlAvoidXmlTest\BamlAvoidXmlTest.csproj" />
-    <ProjectFile Include="FriendWithKey\XamlTestClasses.FriendWithKey.csproj" />
-    <ProjectFile Include="FriendWithoutKey\XamlTestClasses.FriendWithoutKey.csproj" />
-  </ItemGroup>
-
-  <!--Import the targets-->
-  <Import Project="$(_NTDRIVE)$(_NTROOT)\tools\Microsoft.DevDiv.Traversal.targets" />
-</Project>
diff --git a/src/Microsoft.DotNet.Wpf/test/Directory.Build.props b/src/Microsoft.DotNet.Wpf/test/Directory.Build.props
index bff1c6bee77..471b0be1781 100644
--- a/src/Microsoft.DotNet.Wpf/test/Directory.Build.props
+++ b/src/Microsoft.DotNet.Wpf/test/Directory.Build.props
@@ -2,25 +2,35 @@
   <Import Condition="Exists('../Directory.Build.props')" Project="../Directory.Build.props" />
   
   <PropertyGroup>
+    <WpfTestBasePath>$(MsBuildThisFileDirectory)</WpfTestBasePath>
+    <DrtCommonRoot>$(WpfTestBasePath)\Common\DRT</DrtCommonRoot>
+    <WpfSharedRoot>$(WpfTestBasePath)\Shared</WpfSharedRoot>
     <PublishRoot>$(RepoRoot)artifacts\test\</PublishRoot>
-    <PlatformFolder>x86</PlatformFolder>
-    <PlatformFolder Condition="'$(Platform)' == 'x64'">x64</PlatformFolder>
+
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+
     <MicrosoftSourceLinkVersion>1.0.0-beta2-18618-05</MicrosoftSourceLinkVersion>
   </PropertyGroup>
   
+  <Choose>
+    <When Condition="'$(Platform)' == 'x64'">
+      <PropertyGroup>
+        <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+        <PlatformFolder>x64</PlatformFolder>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup>
+        <RuntimeIdentifier>win-x86</RuntimeIdentifier>
+        <PlatformFolder>x86</PlatformFolder>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="$(MicrosoftSourceLinkVersion)" PrivateAssets="all"/>
   </ItemGroup>
-
-  <PropertyGroup>
-    <WpfTestBasePath>$(MsBuildThisFileDirectory)</WpfTestBasePath>
-    <DrtCommonRoot>$(WpfTestBasePath)\Common\DRT</DrtCommonRoot>
-    <WpfSharedRoot>$(WpfTestBasePath)\Shared</WpfSharedRoot>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
-    <Platforms>AnyCPU;x64</Platforms>
-    <RuntimeIdentifiers>win-x64;win-x86</RuntimeIdentifiers>
-    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-  </PropertyGroup>
   
   <Import Project="$(MsBuildThisFileDirectory)\Publish.props"/>
   <Import Project="$(MsBuildThisFileDirectory)\StrongName.props"/>
@@ -53,7 +63,6 @@
     <EnableDefaultItems>false</EnableDefaultItems>
   </PropertyGroup>
 
-
   <PropertyGroup>
     <!-- CS0618 - UnmanagedType.Struct usage -->
     <!-- VSTHRD002 - Synchronous awaits from IPC since we can't convert the entire logging/IPC mechanism to async -->

From 263db4214a4359103f8cdd25412724b351361fd0 Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Sun, 12 May 2019 10:59:12 -0700
Subject: [PATCH 12/72] fixing up targets/props so we can build with -test

---
 Microsoft.Dotnet.Wpf.sln                      |   4 +-
 .../WpfArcadeSdk/tools}/DRT.Build.props       |   2 +
 .../WpfArcadeSdk/tools}/Publish.props         |   2 +-
 .../tools/PublishAfterBuild.targets           |  18 +
 .../WpfArcadeSdk/tools}/SourceLocations.props |   0
 .../WpfArcadeSdk/tools}/StrongName.props      |   2 +-
 .../WpfArcadeSdk/tools}/StrongName.targets    |   0
 eng/copy-wpf.ps1                              |   5 +-
 eng/helix/configure-helix-machine.ps1         |  16 -
 eng/helix/helixpublish.proj                   |  22 +-
 eng/helix/prepare-helix-payload.ps1           |  18 +-
 eng/helix/runtests.ps1                        |  19 +-
 .../test/BranchCommon/data/CommonData.csproj  |  20 +
 .../BranchCommon/data/Directory.Build.props   |   3 +
 .../test/BranchCommon/data/DrtList.xml        | 587 ++++++++++++++++++
 .../Common/{ => DRT}/TestServices/DrtBase.cs  |   0
 .../TestServices/DrtBaseGlobalInput.cs        |   0
 .../{ => DRT}/TestServices/DrtBaseInput.cs    |   0
 .../MS/Internal/MultiTargetUtilities.cs       |   0
 .../TestServices/MS/Internal/PointUtil.cs     |   0
 .../MS/Internal/SecurityCriticalDataForSet.cs |   0
 .../TestServices/MS/Win32/ExternDll.cs        |   0
 .../TestServices/MS/Win32/HandleCollector.cs  |   0
 .../TestServices/MS/Win32/NativeMethodsCLR.cs |   0
 .../MS/Win32/NativeMethodsOther.cs            |   0
 .../MS/Win32/NativeMethodsSetLastError.cs     |   0
 .../MS/Win32/SafeNativeMethodsCLR.cs          |   0
 .../MS/Win32/SafeNativeMethodsOther.cs        |   0
 .../MS/Win32/UnsafeNativeMethodsCLR.cs        |   0
 .../MS/Win32/UnsafeNativeMethodsOther.cs      |   0
 .../TestServices/TestServices.csproj          |   0
 .../test/Common/DRT/dirs.proj                 |  19 -
 src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml.sln |   4 +-
 .../BamlAvoidXmlTest/BamlAvoidXmlTest.csproj  |  25 +
 .../BamlTestClasses40.csproj                  |   6 +-
 .../BamlTestClasses40/TempDPSetOrder1.xaml.cs |  43 --
 .../TempDPSetOrder1ListBox.cs                 |  54 ++
 .../test/DRT/DrtXaml/Directory.Build.props    |   2 +-
 .../{DrtXaml.Tests.csproj => DrtXaml.csproj}  |  11 +-
 .../XamlTestClasses.FriendWithKey.csproj      |   1 -
 .../XamlTestClasses.FriendWithoutKey.csproj   |   1 -
 .../DrtXaml.PartialTrustTests.csproj          |   1 -
 .../test/Directory.Build.props                |  37 +-
 .../test/Directory.Build.targets              |   7 +-
 .../test/MultiTargeting.props                 |  61 --
 .../test/PublishAfterBuild.targets            |  11 -
 46 files changed, 778 insertions(+), 223 deletions(-)
 rename {src/Microsoft.DotNet.Wpf/test => eng/WpfArcadeSdk/tools}/DRT.Build.props (61%)
 rename {src/Microsoft.DotNet.Wpf/test => eng/WpfArcadeSdk/tools}/Publish.props (91%)
 create mode 100644 eng/WpfArcadeSdk/tools/PublishAfterBuild.targets
 rename {src/Microsoft.DotNet.Wpf/test => eng/WpfArcadeSdk/tools}/SourceLocations.props (100%)
 rename {src/Microsoft.DotNet.Wpf/test => eng/WpfArcadeSdk/tools}/StrongName.props (91%)
 rename {src/Microsoft.DotNet.Wpf/test => eng/WpfArcadeSdk/tools}/StrongName.targets (100%)
 create mode 100644 src/Microsoft.DotNet.Wpf/test/BranchCommon/data/CommonData.csproj
 create mode 100644 src/Microsoft.DotNet.Wpf/test/BranchCommon/data/Directory.Build.props
 create mode 100644 src/Microsoft.DotNet.Wpf/test/BranchCommon/data/DrtList.xml
 rename src/Microsoft.DotNet.Wpf/test/Common/{ => DRT}/TestServices/DrtBase.cs (100%)
 rename src/Microsoft.DotNet.Wpf/test/Common/{ => DRT}/TestServices/DrtBaseGlobalInput.cs (100%)
 rename src/Microsoft.DotNet.Wpf/test/Common/{ => DRT}/TestServices/DrtBaseInput.cs (100%)
 rename src/Microsoft.DotNet.Wpf/test/Common/{ => DRT}/TestServices/MS/Internal/MultiTargetUtilities.cs (100%)
 rename src/Microsoft.DotNet.Wpf/test/Common/{ => DRT}/TestServices/MS/Internal/PointUtil.cs (100%)
 rename src/Microsoft.DotNet.Wpf/test/Common/{ => DRT}/TestServices/MS/Internal/SecurityCriticalDataForSet.cs (100%)
 rename src/Microsoft.DotNet.Wpf/test/Common/{ => DRT}/TestServices/MS/Win32/ExternDll.cs (100%)
 rename src/Microsoft.DotNet.Wpf/test/Common/{ => DRT}/TestServices/MS/Win32/HandleCollector.cs (100%)
 rename src/Microsoft.DotNet.Wpf/test/Common/{ => DRT}/TestServices/MS/Win32/NativeMethodsCLR.cs (100%)
 rename src/Microsoft.DotNet.Wpf/test/Common/{ => DRT}/TestServices/MS/Win32/NativeMethodsOther.cs (100%)
 rename src/Microsoft.DotNet.Wpf/test/Common/{ => DRT}/TestServices/MS/Win32/NativeMethodsSetLastError.cs (100%)
 rename src/Microsoft.DotNet.Wpf/test/Common/{ => DRT}/TestServices/MS/Win32/SafeNativeMethodsCLR.cs (100%)
 rename src/Microsoft.DotNet.Wpf/test/Common/{ => DRT}/TestServices/MS/Win32/SafeNativeMethodsOther.cs (100%)
 rename src/Microsoft.DotNet.Wpf/test/Common/{ => DRT}/TestServices/MS/Win32/UnsafeNativeMethodsCLR.cs (100%)
 rename src/Microsoft.DotNet.Wpf/test/Common/{ => DRT}/TestServices/MS/Win32/UnsafeNativeMethodsOther.cs (100%)
 rename src/Microsoft.DotNet.Wpf/test/Common/{ => DRT}/TestServices/TestServices.csproj (100%)
 delete mode 100644 src/Microsoft.DotNet.Wpf/test/Common/DRT/dirs.proj
 create mode 100644 src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlTestClasses40/TempDPSetOrder1ListBox.cs
 rename src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/{DrtXaml.Tests.csproj => DrtXaml.csproj} (86%)
 delete mode 100644 src/Microsoft.DotNet.Wpf/test/MultiTargeting.props
 delete mode 100644 src/Microsoft.DotNet.Wpf/test/PublishAfterBuild.targets

diff --git a/Microsoft.Dotnet.Wpf.sln b/Microsoft.Dotnet.Wpf.sln
index 4ee3b158701..e2d296bd014 100644
--- a/Microsoft.Dotnet.Wpf.sln
+++ b/Microsoft.Dotnet.Wpf.sln
@@ -81,9 +81,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Printing-ref", "src\
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{B0EFDB12-C931-4E7F-A6C2-D4AC111D7EDF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DrtXaml.Tests", "src\Microsoft.DotNet.Wpf\test\DRT\DrtXaml\DrtXaml\DrtXaml.Tests.csproj", "{FAB114A2-2C6C-4372-A6BB-BC087B646E3A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DrtXaml", "src\Microsoft.DotNet.Wpf\test\DRT\DrtXaml\DrtXaml\DrtXaml.csproj", "{FAB114A2-2C6C-4372-A6BB-BC087B646E3A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestServices", "src\Microsoft.DotNet.Wpf\test\Common\TestServices\TestServices.csproj", "{387F3700-8C0B-4CEC-A68A-1725F656A249}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestServices", "src\Microsoft.DotNet.Wpf\test\Common\DRT\TestServices\TestServices.csproj", "{387F3700-8C0B-4CEC-A68A-1725F656A249}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XamlTestClasses", "src\Microsoft.DotNet.Wpf\test\DRT\DrtXaml\XamlTestClasses\XamlTestClasses.csproj", "{3C1FC36C-E3E6-4EED-9ECA-CFF2EB950486}"
 EndProject
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT.Build.props b/eng/WpfArcadeSdk/tools/DRT.Build.props
similarity index 61%
rename from src/Microsoft.DotNet.Wpf/test/DRT.Build.props
rename to eng/WpfArcadeSdk/tools/DRT.Build.props
index de0b61a8185..047ab6efe2d 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT.Build.props
+++ b/eng/WpfArcadeSdk/tools/DRT.Build.props
@@ -1,5 +1,7 @@
 <Project>
   <PropertyGroup>
     <PublishDir>$(WpfDrtTestBasePublishPath)</PublishDir>
+    <IsTestProject>true</IsTestProject>
+    <SkipTests>true</SkipTests>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Wpf/test/Publish.props b/eng/WpfArcadeSdk/tools/Publish.props
similarity index 91%
rename from src/Microsoft.DotNet.Wpf/test/Publish.props
rename to eng/WpfArcadeSdk/tools/Publish.props
index d1401f44259..767506adb52 100644
--- a/src/Microsoft.DotNet.Wpf/test/Publish.props
+++ b/eng/WpfArcadeSdk/tools/Publish.props
@@ -2,7 +2,7 @@
     <PropertyGroup>
         <_IsPortable >true</_IsPortable>
         <SelfContained >false</SelfContained>
-        <RuntimeIdentifier >win-x86</RuntimeIdentifier>
+        <RuntimeIdentifier>win-x86</RuntimeIdentifier>
         <RuntimeIdentifier Condition="'$(Platform)' == 'x64'">win-x64</RuntimeIdentifier>
         <PublishDir>$(PublishRoot)$(Configuration)\$(PlatformFolder)</PublishDir>
         <WpfTestBasePublishPath>$(PublishDir)\Test</WpfTestBasePublishPath>
diff --git a/eng/WpfArcadeSdk/tools/PublishAfterBuild.targets b/eng/WpfArcadeSdk/tools/PublishAfterBuild.targets
new file mode 100644
index 00000000000..6e84793f7a0
--- /dev/null
+++ b/eng/WpfArcadeSdk/tools/PublishAfterBuild.targets
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+   <Target Name="AfterBuild" DependsOnTargets="PublishPropertySetup;Publish"/> 
+  
+   <Target Name="PublishPropertySetup">
+     <PropertyGroup>
+         <NoBuild>true</NoBuild>
+     </PropertyGroup>
+   </Target>
+
+  <!-- 
+  Don't copy the code coverage artifacts. These are always trying to be copied to the 
+  same location and so we get errors trying to overwrite files that are locked by a parallel
+  instance of MSBuild. We don't currently need these files. If we do, we can come up with a better
+  solution.
+  -->
+  <Target Name="CopyTraceDataCollectorArtifacts" />
+</Project>
diff --git a/src/Microsoft.DotNet.Wpf/test/SourceLocations.props b/eng/WpfArcadeSdk/tools/SourceLocations.props
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/test/SourceLocations.props
rename to eng/WpfArcadeSdk/tools/SourceLocations.props
diff --git a/src/Microsoft.DotNet.Wpf/test/StrongName.props b/eng/WpfArcadeSdk/tools/StrongName.props
similarity index 91%
rename from src/Microsoft.DotNet.Wpf/test/StrongName.props
rename to eng/WpfArcadeSdk/tools/StrongName.props
index 9d7644845c8..39b1310704d 100644
--- a/src/Microsoft.DotNet.Wpf/test/StrongName.props
+++ b/eng/WpfArcadeSdk/tools/StrongName.props
@@ -11,7 +11,7 @@
         
         <!-- Sign with the test key and ensure that we do not delay sign test code -->
         <DelaySign>false</DelaySign>
-        <AssemblyOriginatorKeyFile>$(TestUntrustedKey)</AssemblyOriginatorKeyFile>
+        <AssemblyOriginatorKeyFile Condition="'$(AssemblyOriginatorKeyFile)'==''">$(TestUntrustedKey)</AssemblyOriginatorKeyFile>
         <StrongNameKeyId>custom</StrongNameKeyId>
     </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Wpf/test/StrongName.targets b/eng/WpfArcadeSdk/tools/StrongName.targets
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/test/StrongName.targets
rename to eng/WpfArcadeSdk/tools/StrongName.targets
diff --git a/eng/copy-wpf.ps1 b/eng/copy-wpf.ps1
index dc4a5a51a67..59dd14bdfb7 100644
--- a/eng/copy-wpf.ps1
+++ b/eng/copy-wpf.ps1
@@ -60,7 +60,10 @@ function CopyPackagedBinaries($location, $localBinLocation, $packageName, $binar
 {
     $ArchFolder = if ($arch -eq "x86") { "" } else { "x64" }
     $BinLocation = [System.IO.Path]::Combine($localBinLocation, $Config, $ArchFolder, $packageName, "lib", $binaryLocationInPackage, "*")
-    Copy-Item -path $BinLocation -include "*.dll","*.pdb" -Destination $location
+    if (Test-Path $BinLocation)
+    {
+        Copy-Item -path $BinLocation -include "*.dll","*.pdb" -Destination $location
+    }
 }
 
 if ($help -or ([string]::IsNullOrEmpty($destination) -and !$local))
diff --git a/eng/helix/configure-helix-machine.ps1 b/eng/helix/configure-helix-machine.ps1
index ac8d4f5f3de..85403ad23fa 100644
--- a/eng/helix/configure-helix-machine.ps1
+++ b/eng/helix/configure-helix-machine.ps1
@@ -1,17 +1 @@
 # This file prepares the helix machine for our tests runs
-
-$dotnetLocation = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "dotnet"
-
-Write-Output "Adding dotnet location to path: $dotnetLocation"
-
-# Prepend the path to ensure that dotnet.exe is called from there.
-$env:path="$dotnetLocation;$env:path"
-
-# Don't look outside the TestHost to resolve best match SDKs.
-$env:DOTNET_MULTILEVEL_LOOKUP = 0
-
-# Disable first run since we do not need all ASP.NET packages restored.
-$env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
-
-# Ensure that the dotnet installed at our dotnetLocation is used
-$env:DOTNET_ROOT=$dotnetLocation
\ No newline at end of file
diff --git a/eng/helix/helixpublish.proj b/eng/helix/helixpublish.proj
index 3792f934aaa..aac15376b1f 100644
--- a/eng/helix/helixpublish.proj
+++ b/eng/helix/helixpublish.proj
@@ -1,4 +1,3 @@
-
 <Project Sdk="Microsoft.DotNet.Helix.Sdk" DefaultTargets="Test">
   <PropertyGroup>
     <!-- These properties help ensure proper and consistent restore behavior -->
@@ -10,25 +9,32 @@
       https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json
     </RestoreSources>
 
-    <!-- We copy our own dotnet payload over to the machine, so we don't want/need a different dotnet install -->
-    <IncludeDotNetCli>false</IncludeDotNetCli>
+    <IncludeDotNetCli>true</IncludeDotNetCli>
+    <DotNetCliPackageType>sdk</DotNetCliPackageType>
+    <!-- Set to match global.json.tools.dotnet by pre-build.ps1 -->
+    <DotNetCliVersion>$(DotNetCliVersion)</DotNetCliVersion>
+    
     <EnableXUnitReporter>true</EnableXUnitReporter>
     <EnableAzurePipelinesReporter>true</EnableAzurePipelinesReporter>
     <FailOnMissionControlTestFailure>true</FailOnMissionControlTestFailure>
 
     <!-- Semi-colon delimited list of commands that are executed before every test.-->
-    <HelixPreCommands>$(HelixPreCommands);</HelixPreCommands>
+    <HelixPreCommands>$(HelixPreCommands);powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\configure-helix-machine.ps1 -version Xaml"</HelixPreCommands>
 
     <!-- These are the list of Windows versions that we run tests on-->
-    <HelixTargetQueues>Windows.10.Amd64.Open;Windows.7.Amd64.Open;Windows.10.Amd64.ServerRS5.Open</HelixTargetQueues>
+    <!--<HelixTargetQueues>Windows.10.Amd64.Open;Windows.7.Amd64.Open;Windows.10.Amd64.ServerRS5.Open</HelixTargetQueues>-->
+    <!-- Just cutting down the total queues while bootstrapping to speed things up-->
+    <HelixTargetQueues>Windows.10.Amd64.Open</HelixTargetQueues>
+
+    <MicrosoftDotNetWpfTestPackageVersion>1.0.0-beta.19263.1</MicrosoftDotNetWpfTestPackageVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="runtime.win-$(Platform).Microsoft.DotNet.Wpf.Test" Version="1.0.0-beta.19260.5" />
+    <PackageReference Include="runtime.win-$(Platform).Microsoft.DotNet.Wpf.Test" Version="$(MicrosoftDotNetWpfTestPackageVersion)" />
     <HelixCorrelationPayload Include="..\..\HelixPayload\$(Configuration)\$(Platform)" /> 
-    <HelixWorkItem Include="HelloHelix">
+    <HelixWorkItem Include="Xaml">
       <Timeout>00:20:00</Timeout>
-      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1"</Command>
+      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 -area Xaml"</Command>
     </HelixWorkItem>
    <!-- 
    <HelixWorkItem Include="Annotations">
diff --git a/eng/helix/prepare-helix-payload.ps1 b/eng/helix/prepare-helix-payload.ps1
index 7181d004d07..efe24c50ec6 100644
--- a/eng/helix/prepare-helix-payload.ps1
+++ b/eng/helix/prepare-helix-payload.ps1
@@ -1,7 +1,8 @@
 [CmdLetBinding()]
 Param(
     [string]$platform,
-    [string]$configuration
+    [string]$configuration,
+    [string]$testPackageVersion
 )
 
 $payloadDir = "HelixPayload\$configuration\$platform"
@@ -34,10 +35,11 @@ function CopyFolderStructure($from, $to)
         Write-Output "Location doesn't exist: $from"
     }
 
+    Get-ChildItem $to -Recurse
 }
 
-# Copy files from nuget packages
-$testNugetLocation = Join-Path $nugetPackagesDir "runtime.win-$platform.Microsoft.DotNet.Wpf.DncEng.Test\1.0.0-beta.19260.5\tools\win-$platform\"
+# Copy files from nuget packages.
+$testNugetLocation = Resolve-Path (Join-Path $nugetPackagesDir "runtime.win-$platform.Microsoft.DotNet.Wpf.Test\*\tools\win-$platform\Test")
 $testPayloadLocation = Join-Path $payloadDir "Test"
 CopyFolderStructure $testNugetLocation $testPayloadLocation
 
@@ -47,16 +49,6 @@ $drtArtifactsLocation = [System.IO.Path]::Combine($env:BUILD_SOURCESDIRECTORY, "
 $drtPayloadLocation = Join-Path $payloadDir "Test\DRT"
 CopyFolderStructure $drtArtifactsLocation $drtPayloadLocation
 
-# Copy built assemblies to dotnet install location
-$eng = Join-Path $env:BUILD_SOURCESDIRECTORY "eng"
-$configArgs = if ($configuration == "Release") { "-release" } else { }
-& "$eng\copy-wpf.ps1 -local -arch $platform $configArgs"
-
-# Copy local dotnet install to payload
-$localDotnetInstall = Join-Path $env:BUILD_SOURCESDIRECTORY ".dotnet"
-$dotnetPayloadLocation = Join-Path $payloadDir "dotnet"
-CopyFolderStructure $localDotnetInstall $dotnetPayloadLocation
-
 # Copy scripts
 Copy-Item "eng\helix\configure-helix-machine.ps1" $payloadDir
 Copy-Item "eng\helix\runtests.ps1" $payloadDir
\ No newline at end of file
diff --git a/eng/helix/runtests.ps1 b/eng/helix/runtests.ps1
index 90dff99c810..241505851c1 100644
--- a/eng/helix/runtests.ps1
+++ b/eng/helix/runtests.ps1
@@ -1,13 +1,26 @@
+[CmdLetBinding()]
+Param(
+    [string]$area
+)
 
 # Configure the machine before running tests
-& "$PSScriptRoot\configure-helix-machine.ps1"
+. "$PSScriptRoot\configure-helix-machine.ps1"
+
+dotnet --info
 
 # Run the tests
-Get-ChildItem -Recurse
+$testLocation = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "Test"
+if (Test-Path "$testLocation\rundrts.cmd")
+{
+    Invoke-Expression "$testLocation\rundrts.cmd /Area=$area"
+}
 
 # We can use $env:HELIX_PYTHONPATH $env:HELIX_SCRIPT_ROOT\upload_result.py to upload any QV specific logs and/or screenshots that we are interested in.
 # For example: $env:HELIX_PYTHONPATH $env:HELIX_SCRIPT_ROOT%\upload_result.py -result screenshot.jpg -result_name screenshot.jpg
 # Then, links to these artifacts can then be included in the xUnit logs.
 
 # Need to copy the xUnit log to a known location that helix can understand
-# Copy-Item .\Test\Drts\testResults.xml ..\testResults.xml
\ No newline at end of file
+if (Test-Path "$env:AppData\QualityVault\Run\Report\testResults.xml")
+{
+    Copy-Item "$env:AppData\QualityVault\Run\Report\testResults.xml" "..\testResults.xml"
+}
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Wpf/test/BranchCommon/data/CommonData.csproj b/src/Microsoft.DotNet.Wpf/test/BranchCommon/data/CommonData.csproj
new file mode 100644
index 00000000000..ed8277f8958
--- /dev/null
+++ b/src/Microsoft.DotNet.Wpf/test/BranchCommon/data/CommonData.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <NoTargets>true</NoTargets>
+    <EnableDefaultItems>false</EnableDefaultItems>
+    <PublishDir>$(WpfTestBasePublishPath)</PublishDir>
+    <_IsPortable>true</_IsPortable>
+    <SelfContained>false</SelfContained>
+    <RuntimeIdentifier></RuntimeIdentifier>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Include="DrtList.xml">
+      <Link>DRT\%(Filename)%(Extension)</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  
+  </ItemGroup>
+
+</Project>
diff --git a/src/Microsoft.DotNet.Wpf/test/BranchCommon/data/Directory.Build.props b/src/Microsoft.DotNet.Wpf/test/BranchCommon/data/Directory.Build.props
new file mode 100644
index 00000000000..12d9ad073ec
--- /dev/null
+++ b/src/Microsoft.DotNet.Wpf/test/BranchCommon/data/Directory.Build.props
@@ -0,0 +1,3 @@
+<Project>
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+</Project>
diff --git a/src/Microsoft.DotNet.Wpf/test/BranchCommon/data/DrtList.xml b/src/Microsoft.DotNet.Wpf/test/BranchCommon/data/DrtList.xml
new file mode 100644
index 00000000000..1e94bca0882
--- /dev/null
+++ b/src/Microsoft.DotNet.Wpf/test/BranchCommon/data/DrtList.xml
@@ -0,0 +1,587 @@
+<!--
+Rundrtlist
+
+ Specifies the list of DRTs to run.
+
+
+ format:
+       name,archList,osList,team[,args]
+
+ name - filename of the drt.  e.g. DrtFooTest.exe
+ archList - architectures to run the drt for.
+   archList : arch [|arch ]
+   Possible values for arch, separated by |, use no blanks
+       all     - all architectures
+       x86     - run for x86
+       ia64    - run for IA64
+       amd64   - run for amd64
+ osList - operating systems to run the drt on.
+   osList : os [|os ]
+   Possible values for os, separated by |, use no blanks
+       all     - all operating systems
+       xp      - Windows Xp
+       vista   - Windows Vista
+ team - name of the Avalon FT that owns the drt
+ args - optional command line to send to the drt
+    - DRT is offline
+-->
+<Drts>
+  <Drt Executable="DrtAnnotations.exe" Architecture="x86|amd64" OS="all" Team="Annotations" />
+  <Drt Executable="DrtAppModelSuites.exe" Architecture="all" OS="all" Team="AppModel" >
+    <SupportFiles>
+      <SupportFile>newloadersuitehelperproject.exe</SupportFile>
+      <SupportFile>newloadersuitehelperproject1\newloadersuitehelperproject.exe</SupportFile>
+      <SupportFile>DrtFiles\loader_tulip.jpg</SupportFile>
+      <SupportFile>DrtFiles\PageA.xaml</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <!--<Drt Executable="DrtNativeEntryPoint.exe" Architecture="all" OS="all" Team="AppModel" >
+    <SupportFiles>
+      <SupportFile>LoaderTest.dll</SupportFile>
+      <SupportFile>DrtThirdPartyThemes.exe</SupportFile>
+    </SupportFiles>
+  </Drt>-->
+  <Drt Executable="DrtDocumentViewerSuite.exe" Architecture="all" OS="all" Team="DigitalDocuments" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\DocumentViewerSuite\Commanding</SupportFile>
+      <SupportFile>DrtFiles\DocumentViewerSuite\Stress</SupportFile>
+      <SupportFile>DrtFiles\DocumentViewerSuite\Styling</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtDigitalSignature.cmd" Architecture="all" OS="all" Team="DigitalDocuments" >
+    <SupportFiles>
+      <SupportFile>DrtDigitalSignature.exe</SupportFile>
+      <SupportFile>DrtFiles\digitalsignature</SupportFile>
+      <SupportFile>DelCertNoUI.exe</SupportFile>
+      <SupportFile>MakeCert.exe</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtPackScheme.exe" Architecture="all" OS="all" Team="DigitalDocuments" />
+  <Drt Executable="DrtMediaAPI.exe" Architecture="all" OS="all" Team="Media" />
+  <Drt Executable="DrtEditing.exe" Architecture="x86|amd64" OS="all" Team="Editing" >
+    <SupportFiles>
+      <SupportFile>DrtEditing.*</SupportFile>
+      <SupportFile>DrtFiles\Editing\CustomDict2.lex</SupportFile>
+      <SupportFile>DrtFiles\Editing\cut.png</SupportFile>
+      <SupportFile>DrtFiles\Editing\rtfsimple.rtf</SupportFile>
+      <SupportFile>DrtFiles\Editing\rtfsimple_expect.rtf.xaml</SupportFile>
+      <SupportFile>DrtFiles\Editing\rtfsimple_expect.rtf.xaml.rtf</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DRTPropertyEngine.exe" Architecture="all" OS="all" Team="ElementServices" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\PropertyEngine\TestInheritanceContext.xaml</SupportFile>
+      <SupportFile>DrtFiles\PropertyEngine\TestValueSource.xaml</SupportFile>
+      <SupportFile>DrtFiles\PropertyEngine\TestVisualTransforms.xaml</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtWindow.exe" Architecture="all" OS="all" Team="AppModel" >
+    <SupportFiles>
+      <SupportFile>DrtWindowSecure.cmd</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtWindowDragMove.exe" Architecture="all" OS="all" Team="AppModel" />
+  <Drt Executable="DrtWindowScroll.exe" Architecture="all" OS="all" Team="AppModel" />
+  <Drt Executable="DrtWindowAutoSize.exe" Architecture="all" OS="all" Team="AppModel" />-->
+  <Drt Executable="DrtDialog.exe" Architecture="all" OS="all" Team="AppModel" />
+  <Drt Executable="DrtIcon.exe" Architecture="all" OS="all" Team="AppModel">
+    <SupportFiles>
+      <SupportFile>DrtFiles\Icon</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtWindowMinMaxContentSize.exe" Architecture="all" OS="all" Team="AppModel" >
+    <SupportFiles>
+      <SupportFile>DrtWindowMinMaxContentSizeSecure.cmd</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtText.exe" Architecture="x86|amd64" OS="all" Team="Text" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\Text</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtApplicationEvents.cmd" Architecture="all" OS="all" Team="AppModel" >
+    <SupportFiles>
+      <SupportFile>DrtApplicationEvents.exe</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtAppThreadingModel.exe" Architecture="all" OS="all" Team="AppModel" />
+  <Drt Executable="DrtStartupUriXamlNavigationWindow.exe" Architecture="all" OS="all" Team="AppModel" />
+  <Drt Executable="DrtWindowFunctionality.exe" Architecture="all" OS="all" Team="AppModel" />
+  <Drt Executable="DrtWindowHeightWidthTopLeft.exe" Architecture="all" OS="all" Team="AppModel" />
+  <Drt Executable="DrtWindowResizeGripFlowDirection.exe" Architecture="x86|amd64" OS="all" Team="AppModel" />
+  <Drt Executable="DrtPage.exe" Architecture="x86|amd64" OS="all" Team="AppModel" />
+  <Drt Executable="DrtWindowAutoLocation.exe" Architecture="all" OS="all" Team="AppModel" />
+  <Drt Executable="DrtDRXSerialization.exe" Architecture="all" OS="all" Team="DigitalDocuments" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\DRXSerialization\DocumentViewerDefault.xaml</SupportFile>
+      <SupportFile>DrtFiles\DRXSerialization\DocumentViewerDefaultInput.xaml</SupportFile>
+      <SupportFile>DrtFiles\DRXSerialization\DocumentViewerNonDefault.xaml</SupportFile>
+      <SupportFile>DrtFiles\DRXSerialization\DocumentViewerNonDefaultInput.xaml</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtAnimation.exe" Architecture="all" OS="all" Team="Animation" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\DrtAnimation\DRTEasing.xaml</SupportFile>
+      <SupportFile>DrtFiles\DrtAnimation\DRTMarkupAnimation.xaml</SupportFile>
+      <SupportFile>DrtFiles\DrtAnimation\angels.jpg</SupportFile>
+      <SupportFile>DrtAnimationRDP.cmd</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtTiming.exe" Architecture="all" OS="all" Team="Animation" />
+  <Drt Executable="DrtBasic3D.exe" Architecture="x86|amd64" OS="all" Team="3D" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\DrtBasic3D\ambient.png</SupportFile>
+      <SupportFile>DrtFiles\DrtBasic3D\combined.png</SupportFile>
+      <SupportFile>DrtFiles\DrtBasic3D\diffuse.png</SupportFile>
+      <SupportFile>DrtFiles\DrtBasic3D\emissive.png</SupportFile>
+      <SupportFile>DrtFiles\DrtBasic3D\specular.png</SupportFile>
+      <SupportFile>DrtFiles\DrtBasic3D\msnbackground.bmp</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtElement3D.exe" Architecture="x86|amd64" OS="all" Team="3D" />
+  <Drt Executable="DrtMil2D.exe" Architecture="all" OS="all" Team="2D" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\DrtMil2D\cut.png</SupportFile>
+      <SupportFile>DrtFiles\DrtMil2D\tulip.jpg</SupportFile>
+      <SupportFile>DrtFiles\DrtMil2D\tulip48dpi.jpg</SupportFile>
+      <SupportFile>DrtFiles\DrtMil2D\tulip96x192dpi.png</SupportFile>
+      <SupportFile>DrtFiles\DrtMil2D\tile_checkered.PNG</SupportFile>
+      <SupportFile>DrtFiles\DrtMil2D\tiny_checkered.PNG</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtInput.exe" Architecture="all" OS="all" Team="ElementServices" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\Input\DrtInput.xml</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtUIContext.exe" Architecture="x86|amd64" OS="all" Team="ElementServices" />
+  <Drt Executable="DrtHwndSource.exe" Architecture="all" OS="all" Team="ElementServices" />
+  <Drt Executable="DrtControls.exe" Architecture="x86|amd64" OS="all" Team="Controls" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\Controls</SupportFile>
+      <SupportFile>DrtThemeDictionaryExtension.*</SupportFile>
+      <SupportFile>DrtThirdPartyThemes.dll</SupportFile>
+      <SupportFile>DrtThirdPartyThemes.pdb</SupportFile>
+      <SupportFile>ListView2App.*</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtMultiTouch.exe" Architecture="all" OS="all" Team="ElementServices" />
+  <Drt Executable="DrtImaging.exe" Architecture="x86|amd64" OS="all" Team="Imaging" >
+    <SupportFiles>
+      <SupportFile>DrtImagingD3D.dll</SupportFile>
+      <SupportFile>DrtFiles\DrtImaging</SupportFile>
+    </SupportFiles>
+  </Drt>
+<!-- disabling amd64 until bug 1845378 is fixed --><!--
+  --><!--<Drt Executable="DrtUImaging" Architecture="x86" OS="all" Team="Imaging" />
+  <Drt Executable="DrtUMetadata.exe" Architecture="x86|amd64" OS="all" Team="Imaging" />-->
+  <Drt Executable="DrtPageFunction.exe" Architecture="all" OS="all" Team="AppModel" />
+  <Drt Executable="DrtNavigationApplication.exe" Architecture="all" OS="all" Team="AppModel" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\NavigationApplication\NavAppBar.xaml</SupportFile>
+      <SupportFile>DrtFiles\NavigationApplication\NavAppFoo.xaml</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtNavigationEvents.exe" Architecture="all" OS="all" Team="AppModel" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\NavigationEvents</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtNavigationWindow.exe" Architecture="x86|amd64" OS="all" Team="AppModel" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\NavigationWindow\NavWindowBar.xaml</SupportFile>
+      <SupportFile>DrtFiles\NavigationWindow\NavWindowFoo.xaml</SupportFile>
+      <SupportFile>DrtFiles\NavigationWindow\NavWindowBar2.xaml</SupportFile>
+      <SupportFile>DrtFiles\NavigationWindow\NavWindowFoo2.xaml</SupportFile>
+    </SupportFiles>6
+  </Drt>
+  <Drt Executable="DrtNavMemPerf.exe" Architecture="x86|amd64" OS="all" Team="AppModel" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\navmemperf</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtReparentNavigator.exe" Architecture="x86|amd64" OS="all" Team="AppModel" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\ReparentNavigator\ReparentFrame.xaml</SupportFile>
+      <SupportFile>DrtFiles\ReparentNavigator\ReparentPage1.xaml</SupportFile>
+      <SupportFile>DrtFiles\ReparentNavigator\ReparentPage2.xaml</SupportFile>
+      <SupportFile>DrtFiles\ReparentNavigator\ReparentPage3.xaml</SupportFile>
+      <SupportFile>DrtFiles\ReparentNavigator\ReparentStart.xaml</SupportFile>
+      <SupportFile>DrtReparentNavigatorSecure.cmd</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtHyperlinkTargeting.exe" Architecture="x86|amd64" OS="all" Team="AppModel" />
+  <Drt Executable="DrtFrameJournaling.exe" Architecture="x86|amd64" OS="all" Team="AppModel" />
+  <Drt Executable="DrtJournal.exe" Architecture="x86|amd64" OS="all" Team="AppModel" />
+  <Drt Executable="DrtJournalMode.exe" Architecture="all" OS="all" Team="AppModel" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\JournalMode\DrtJournalModeDefault.xaml</SupportFile>
+      <SupportFile>DrtJournalModeSecure.cmd</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtXamlContainer.exe" Architecture="x86|amd64" OS="all" Team="AppModel" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\XamlContainer\NavByElement.xaml</SupportFile>
+      <SupportFile>DrtFiles\XamlContainer\NavByUri.xaml</SupportFile>
+      <SupportFile>DrtFiles\XamlContainer\SetContent.xaml</SupportFile>
+      <SupportFile>DrtFiles\XamlContainer\SetUri.xaml</SupportFile>
+      <SupportFile>DrtFiles\XamlContainer\DrtXamlContainer.Permissions</SupportFile>
+      <SupportFile>DrtXamlContainerSecure.cmd</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtNavigationToObject.exe" Architecture="x86|amd64" OS="all" Team="AppModel" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\NavigationToObject\FlowDocument.xaml</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtNavError.exe" Architecture="all" OS="all" Team="AppModel" />
+  <Drt Executable="DrtChangeable.exe" Architecture="all" OS="all" Team="2D" />
+  <Drt Executable="DrtVisualTarget.exe" Architecture="all" OS="all" Team="2D" />
+  <Drt Executable="DrtFlowLayout.exe" Architecture="x86|amd64" OS="all" Team="FlowLayout" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\FlowLayout</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="AvaCop.exe" Architecture="x86|amd64" OS="all" Team="DataServices" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\AvaCop</SupportFile>
+      <SupportFile>DrtFiles\DocumentViewerSuite\Commanding</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtDataSrv.exe" Architecture="x86|amd64" OS="all" Team="DataServices" Timeout="360">
+    <SupportFiles>
+      <SupportFile>DrtFiles\DataSrv</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtDataSrvMSB.exe" Architecture="all" OS="all" Team="DataServices" >
+    <SupportFiles>
+      <SupportFile>en-us\DrtDataSrvMSB.*</SupportFile>
+      <SupportFile>DrtFiles\DataSrvMSB\Content.JPG</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtLayout.exe" Architecture="x86|amd64" OS="all" Team="ElementLayout" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\Layout</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtTextFind.exe" Architecture="x86|amd64" OS="all" Team="ElementLayout" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\TextFind</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DRTInputMethod.exe" Architecture="all" OS="all" Team="Editing" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\DrtInputMethod</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DRTTextComposition.cmd" Architecture="x86|amd64" OS="all" Team="Editing" >
+    <SupportFiles>
+      <SupportFile>DRTTextComposition.exe</SupportFile>
+    </SupportFiles>
+  </Drt>
+<!-- 
+  <Drt Executable="Drtparser.exe" Architecture="all" OS="all" Team="Xaml" >
+    <SupportFiles>
+      <SupportFile>testclasses.dll</SupportFile>
+      <SupportFile>DrtFiles\Parser</SupportFile>
+    </SupportFiles>
+  </Drt>
+-->
+<!--Drt Executable="Drtserializer.exe" Architecture="x86|amd64" OS="all" Team="ElementServices" /-->
+  <Drt Executable="DrtMarkupSerializer.exe" Architecture="x86|amd64" OS="all" Team="ElementServices" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\MarkupSerializer</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtEvents.exe" Architecture="all" OS="all" Team="ElementServices" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\Events\DRTEvents_1.xaml</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtCommanding.exe" Architecture="all" OS="all" Team="ElementServices" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\Commanding</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtLocalization.exe" Architecture="all" OS="all" Team="Globalization" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\Localization</SupportFile>
+      <SupportFile>DrtFiles\Baml</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtPackagingApis.exe" Architecture="all" OS="all" Team="DigitalDocuments" />
+  <Drt Executable="DRTStoryboards.exe" Architecture="x86|amd64" OS="all" Team="Animation" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\DRTStoryboards\DRTStoryboards.xaml</SupportFile>
+      <SupportFile>DrtFiles\DRTStoryboards\ding.wav</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtInk.exe" Architecture="all" OS="all" Team="Tablet" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\Ink</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DRTColorAPI.exe" Architecture="all" OS="all" Team="Imaging" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\DrtColorAPI</SupportFile>
+    </SupportFiles>
+  </Drt>
+
+  <!--
+  <Drt Executable="drtbaml.exe" Architecture="all" OS="all" Team="Xaml" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\Baml</SupportFile>
+      <SupportFile>DrtFiles\Parser</SupportFile>
+      <SupportFile>testclasses.dll</SupportFile>
+      <SupportFile>drtparser.exe</SupportFile>
+    </SupportFiles>
+  </Drt>
+  -->
+
+  <Drt Executable="DrtStickyNoteControl.exe" Architecture="x86|amd64" OS="all" Team="Annotations" />
+  <Drt Executable="DrtInkCanvas.exe" Architecture="all" OS="all" Team="Tablet" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\InkCanvas</SupportFile>
+      <SupportFile>RunInkCanvasSpeedTests.cmd</SupportFile>
+      <SupportFile>RunInkCanvasAllocationTests.cmd</SupportFile>
+    </SupportFiles>
+  </Drt><!--
+
+  --><!-- Reenabled  9/2/09.  Contact mattgal for any crashes --><!--
+  <Drt Executable="DrtHosting.exe" Architecture="x86|amd64" OS="all" Team="AppModel" Args="-verbose" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\BrowserHosting</SupportFile>
+      <SupportFile>BrowserHostedDeployApp.*</SupportFile>
+      <SupportFile>BrowserHostedDeployApp35.*</SupportFile>
+    </SupportFiles>
+  </Drt>
+
+  --><!-- Disabled 1/07, failing consistently on Cinch --><!--
+  --><!--Drt Executable="DrtDrxAutomationLocal.cmd" Architecture="x86|amd64" OS="all" Team="DigitalDocuments" >
+    <SupportFiles>
+      <SupportFile>DrtDrxAutomation.exe</SupportFile>
+      <SupportFile>MakeCert.exe</SupportFile>
+    </SupportFiles>
+  </Drt--><!--
+  --><!-- Broken (again) by ClickOnce, different issues. Tracking work item on our side Dev10.521850.
+  <Drt Executable="DrtStandAloneApp.exe" Architecture="x86|amd64" OS="all" Team="AppModel" >
+    <SupportFiles>
+      <SupportFile>StandAloneDeployApp.*</SupportFile>
+    </SupportFiles>
+  </Drt>
+  -->
+  <Drt Executable="DrtPageContent.exe" Architecture="all" OS="all" Team="DigitalDocuments" >
+    <SupportFiles>
+      <SupportFile>FixedDocViewer.dll</SupportFile>
+      <SupportFile>DrtFiles\Payloads</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtFixedPanel.exe" Architecture="all" OS="all" Team="DigitalDocuments" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\Layout</SupportFile>
+      <SupportFile>DrtFiles\Payloads</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtFixedEdit.exe" Architecture="all" OS="all" Team="DigitalDocuments" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\FixedEdit</SupportFile>
+      <SupportFile>DrtFiles\Payloads</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtSequence.exe" Architecture="all" OS="all" Team="DigitalDocuments" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\Payloads</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtMetroTest.cmd" Architecture="x86|amd64" OS="all" Team="DigitalDocuments" >
+    <SupportFiles>
+      <SupportFile>DrtNGCTest.exe</SupportFile>
+      <SupportFile>DrtFiles\Payloads</SupportFile>
+      <SupportFile>DrtFiles\NGCTest\constitution.xaml</SupportFile>
+      <SupportFile>DrtAddDocStructure.exe</SupportFile>
+      <SupportFile>DrtFixedTest.exe</SupportFile>
+    </SupportFiles>
+  </Drt>
+
+  <!--<Drt Executable="DrtSeeScenario1.cmd" Architecture="all" OS="all" Team="PartialTrust">
+    <SupportFiles>
+      <SupportFile>Secure.exe</SupportFile>
+      <SupportFile>DrtSeeScenario1.exe</SupportFile>
+    </SupportFiles>
+  </Drt>
+
+  <Drt Executable="DrtSeeScenario6.cmd" Architecture="all" OS="all" Team="PartialTrust">
+    <SupportFiles>
+      <SupportFile>Secure.exe</SupportFile>
+      <SupportFile>drtpermissiontest.cmd</SupportFile>
+      <SupportFile>DrtFiles\Permissions</SupportFile>
+      <SupportFile>DrtPermissionTest.exe</SupportFile>
+      <SupportFile>DrtSeeScenario6.exe</SupportFile>
+    </SupportFiles>
+  </Drt>
+
+  --><!--Drt Executable="DrtAutomation.exe" Architecture="all" OS="all" Team="UIAutomation" /
+  <Drt Executable="DrtPrinterDriverMarkup.exe" Architecture="all" OS="all" Team="DigitalDocuments" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\PrinterDriverMarkup\</SupportFile>
+    </SupportFiles>
+  </Drt>-->
+  <!--  Leaving this one disabled for now... Mattgal 9-2-09
+  <Drt Executable="drtseescenario7.cmd" Architecture="all" OS="all" Team="PartialTrust" >
+    <SupportFiles>
+      <SupportFile>drtseescenario7.exe</SupportFile>
+      <SupportFile>Secure.exe</SupportFile>
+    </SupportFiles>
+  </Drt>
+  --><!--
+
+  <Drt Executable="DrtSeeExpressApp.exe" Architecture="x86|amd64" OS="all" Team="PartialTrust" >
+    <SupportFiles>
+      <SupportFile>TestSeeExpressApp*</SupportFile>
+      <SupportFile>DrtFiles\ExpressApp\Intro2Loose.jpg</SupportFile>
+    </SupportFiles>
+  </Drt>
+
+  <Drt Executable="DrtBrowserHostedMediaApp.exe" Architecture="x86" OS="all" Team="PartialTrust" >
+    <SupportFiles>
+      <SupportFile>DrtTools.dll</SupportFile>
+      <SupportFile>BrowserHostedMediaApp.*</SupportFile>
+      <SupportFile>DrtFiles\BrowserHostedMediaApp</SupportFile>
+    </SupportFiles>
+  </Drt>-->
+
+  <Drt Executable="DrtContainer.exe" Architecture="all" OS="all" Team="ElementServices" />
+  <Drt Executable="DrtCompressionXform.exe" Architecture="all" OS="all" Team="DigitalDocuments" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\compressionXform</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtPackageCompression.exe" Architecture="all" OS="all" Team="DigitalDocuments" />
+  <Drt Executable="DrtEncryptedPackageCoreProperties.exe" Architecture="all" OS="all" Team="DigitalDocuments" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\EncryptedPackageCoreProperties</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtZipIO.exe" Architecture="all" OS="all" Team="DigitalDocuments" />
+  <Drt Executable="DrtPackageCoreProperties.exe" Architecture="all" OS="all" Team="DigitalDocuments" />
+
+  <Drt Executable="DrtIndexing.exe" Architecture="all" OS="all" Team="DigitalDocuments">
+    <SupportFiles>
+      <SupportFile>BuildContainer.exe</SupportFile>
+      <SupportFile>IndexingFilterTool.exe</SupportFile>
+      <SupportFile>CompareChunkLists.exe</SupportFile>
+      <SupportFile>EncryptedPackageBuilder.exe</SupportFile>
+      <SupportFile>DrtFiles\Indexing</SupportFile>
+    </SupportFiles>
+  </Drt>
+
+     <!-- 12/29/06 - not enabled in Orcas yet. --><!--
+  --><!--<Drt Executable="DrtIndexingElementDictionary.exe" Architecture="all" OS="all" Team="DigitalDocuments" >
+    <SupportFiles>
+      <SupportFile>IndexingFilterTool</SupportFile>
+    </SupportFiles>
+  </Drt>-->
+  <Drt Executable="DrtInterleavedPackage.exe" Architecture="all" OS="all" Team="DigitalDocuments" />
+  <Drt Executable="DrtAppWindowList.exe" Architecture="all" OS="all" Team="AppModel" />
+  <Drt Executable="DrtAppShutdown.exe" Architecture="all" OS="all" Team="AppModel" />
+  <Drt Executable="DrtFlowLayoutExt.exe" Architecture="x86|amd64" OS="all" Team="FlowLayout" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\FlowLayoutExt</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtSelection.exe" Architecture="x86|amd64" OS="all" Team="FlowLayout" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\Selection</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtFlow.exe" Architecture="x86|amd64" OS="all" Team="FlowLayout" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\Flow</SupportFile>
+    </SupportFiles>
+  </Drt>
+<!--<Drt Executable="RunMILTest.cmd" Architecture="x86" OS="all" Team="2D" Args=" > RunMILTest.log">
+    <SupportFiles>
+      <SupportFile>RunMILTest.exe</SupportFile>
+    </SupportFiles>
+  </Drt>-->
+  <Drt Executable="DrtMedia.exe" Architecture="all" OS="all" Team="Media" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\DrtMedia\DrtMedia.xaml</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <!--
+  <Drt Executable="DrtEffects.exe" Architecture="x86|amd64" OS="all" Team="Effects" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\DrtEffects</SupportFile>
+    </SupportFiles>
+  </Drt>
+-->
+  <Drt Executable="WarmupOpt.cmd" Architecture="x86|amd64" OS="all" Team="Integration" >
+    <SupportFiles>
+      <SupportFile>WarmupOpt.exe</SupportFile>
+      <SupportFile>DrtFiles\WarmupOpt</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="MSNBamlOpt.exe" Architecture="x86|amd64" OS="all" Team="Integration" >
+    <SupportFiles>
+      <SupportFile>MSNBamlOpt*</SupportFile>
+      <SupportFile>en-us\MSNBamlOpt.resources.dll</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="SprinkleOpt.exe" Architecture="x86|amd64" OS="all" Team="Integration" />
+  <Drt Executable="HBROpt.exe" Architecture="x86|amd64" OS="all" Team="Integration" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\HBROpt</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtXaml.exe" Architecture="x86|amd64" OS="all" Team="Xaml" >
+    <SupportFiles>
+      <SupportFile>XamlTestClasses.dll</SupportFile>
+      <SupportFile>BamlTestClasses40.dll</SupportFile>
+      <SupportFile>BamlAvoidXmlTest.exe</SupportFile>
+      <SupportFile>XamlTestClasses.FriendWithKey.dll</SupportFile>
+      <SupportFile>XamlTestClasses.FriendWithoutKey.dll</SupportFile>
+      <SupportFile>DrtXaml.PartialTrustTests.dll</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtXpsApi.cmd" Architecture="all" OS="all" Team="DigitalDocuments" >
+    <SupportFiles>
+      <SupportFile>DrtXpsApi.exe</SupportFile>
+      <SupportFile>DrtFiles\XpsApi</SupportFile>
+      <SupportFile>DelCertNoUI.exe</SupportFile>
+      <SupportFile>MakeCert.exe</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtVisualSerialization.exe" Architecture="all" OS="all" Team="DigitalDocuments" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\VisualSerialization\testCMYK1.icc</SupportFile>
+      <SupportFile>DrtFiles\drtimaging\avalon.png</SupportFile>
+      <SupportFile>DrtFiles\drtimaging\tulip.jpg</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtNgcTest.exe" Architecture="all" OS="all" Team="DigitalDocuments" />
+  <Drt Executable="DrtVisualTreeChange.exe" Architecture="all" OS="all" Team="XET" />
+  <Drt Executable="DrtXamlSourceInfo.exe" Architecture="all" OS="all" Team="XET">
+    <SupportFiles>
+      <SupportFile>DrtFiles\XamlSourceInfoTest.Debug.dll</SupportFile>
+      <SupportFile>DrtFiles\XamlSourceInfoTest.Release.dll</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtPrinting.exe" Architecture="all" OS="all" Team="Printing" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\Printing</SupportFile>
+    </SupportFiles>
+  </Drt>
+
+  <!--
+  <Drt Executable="DrtReachSerialization.exe" Architecture="all" OS="all" Team="DigitalDocuments" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\DrtReachSerialization</SupportFile>
+    </SupportFiles>
+  </Drt>
+  --><!--
+
+  --><!-- DrtMediaBasic doesn't run on Vista - bug #1588743 --><!--
+  --><!--<Drt Executable="DrtMediaBasic.exe" Architecture="all" OS="xp" Team="Media" />-->
+  <Drt Executable="DrtWindowsFormsIntegration.exe" Architecture="all" OS="all" Team="WindowsFormsIntegration" />
+</Drts>
diff --git a/src/Microsoft.DotNet.Wpf/test/Common/TestServices/DrtBase.cs b/src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/DrtBase.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/test/Common/TestServices/DrtBase.cs
rename to src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/DrtBase.cs
diff --git a/src/Microsoft.DotNet.Wpf/test/Common/TestServices/DrtBaseGlobalInput.cs b/src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/DrtBaseGlobalInput.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/test/Common/TestServices/DrtBaseGlobalInput.cs
rename to src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/DrtBaseGlobalInput.cs
diff --git a/src/Microsoft.DotNet.Wpf/test/Common/TestServices/DrtBaseInput.cs b/src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/DrtBaseInput.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/test/Common/TestServices/DrtBaseInput.cs
rename to src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/DrtBaseInput.cs
diff --git a/src/Microsoft.DotNet.Wpf/test/Common/TestServices/MS/Internal/MultiTargetUtilities.cs b/src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/MS/Internal/MultiTargetUtilities.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/test/Common/TestServices/MS/Internal/MultiTargetUtilities.cs
rename to src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/MS/Internal/MultiTargetUtilities.cs
diff --git a/src/Microsoft.DotNet.Wpf/test/Common/TestServices/MS/Internal/PointUtil.cs b/src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/MS/Internal/PointUtil.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/test/Common/TestServices/MS/Internal/PointUtil.cs
rename to src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/MS/Internal/PointUtil.cs
diff --git a/src/Microsoft.DotNet.Wpf/test/Common/TestServices/MS/Internal/SecurityCriticalDataForSet.cs b/src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/MS/Internal/SecurityCriticalDataForSet.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/test/Common/TestServices/MS/Internal/SecurityCriticalDataForSet.cs
rename to src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/MS/Internal/SecurityCriticalDataForSet.cs
diff --git a/src/Microsoft.DotNet.Wpf/test/Common/TestServices/MS/Win32/ExternDll.cs b/src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/MS/Win32/ExternDll.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/test/Common/TestServices/MS/Win32/ExternDll.cs
rename to src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/MS/Win32/ExternDll.cs
diff --git a/src/Microsoft.DotNet.Wpf/test/Common/TestServices/MS/Win32/HandleCollector.cs b/src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/MS/Win32/HandleCollector.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/test/Common/TestServices/MS/Win32/HandleCollector.cs
rename to src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/MS/Win32/HandleCollector.cs
diff --git a/src/Microsoft.DotNet.Wpf/test/Common/TestServices/MS/Win32/NativeMethodsCLR.cs b/src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/MS/Win32/NativeMethodsCLR.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/test/Common/TestServices/MS/Win32/NativeMethodsCLR.cs
rename to src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/MS/Win32/NativeMethodsCLR.cs
diff --git a/src/Microsoft.DotNet.Wpf/test/Common/TestServices/MS/Win32/NativeMethodsOther.cs b/src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/MS/Win32/NativeMethodsOther.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/test/Common/TestServices/MS/Win32/NativeMethodsOther.cs
rename to src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/MS/Win32/NativeMethodsOther.cs
diff --git a/src/Microsoft.DotNet.Wpf/test/Common/TestServices/MS/Win32/NativeMethodsSetLastError.cs b/src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/MS/Win32/NativeMethodsSetLastError.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/test/Common/TestServices/MS/Win32/NativeMethodsSetLastError.cs
rename to src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/MS/Win32/NativeMethodsSetLastError.cs
diff --git a/src/Microsoft.DotNet.Wpf/test/Common/TestServices/MS/Win32/SafeNativeMethodsCLR.cs b/src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/MS/Win32/SafeNativeMethodsCLR.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/test/Common/TestServices/MS/Win32/SafeNativeMethodsCLR.cs
rename to src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/MS/Win32/SafeNativeMethodsCLR.cs
diff --git a/src/Microsoft.DotNet.Wpf/test/Common/TestServices/MS/Win32/SafeNativeMethodsOther.cs b/src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/MS/Win32/SafeNativeMethodsOther.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/test/Common/TestServices/MS/Win32/SafeNativeMethodsOther.cs
rename to src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/MS/Win32/SafeNativeMethodsOther.cs
diff --git a/src/Microsoft.DotNet.Wpf/test/Common/TestServices/MS/Win32/UnsafeNativeMethodsCLR.cs b/src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/MS/Win32/UnsafeNativeMethodsCLR.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/test/Common/TestServices/MS/Win32/UnsafeNativeMethodsCLR.cs
rename to src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/MS/Win32/UnsafeNativeMethodsCLR.cs
diff --git a/src/Microsoft.DotNet.Wpf/test/Common/TestServices/MS/Win32/UnsafeNativeMethodsOther.cs b/src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/MS/Win32/UnsafeNativeMethodsOther.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/test/Common/TestServices/MS/Win32/UnsafeNativeMethodsOther.cs
rename to src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/MS/Win32/UnsafeNativeMethodsOther.cs
diff --git a/src/Microsoft.DotNet.Wpf/test/Common/TestServices/TestServices.csproj b/src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/TestServices.csproj
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/test/Common/TestServices/TestServices.csproj
rename to src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/TestServices.csproj
diff --git a/src/Microsoft.DotNet.Wpf/test/Common/DRT/dirs.proj b/src/Microsoft.DotNet.Wpf/test/Common/DRT/dirs.proj
deleted file mode 100644
index 72dcacf30b3..00000000000
--- a/src/Microsoft.DotNet.Wpf/test/Common/DRT/dirs.proj
+++ /dev/null
@@ -1,19 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <Import Project="$(_NTDRIVE)$(_NTROOT)\wpf\test\Microsoft.Wpf.Test.Native.Settings.Targets" />
-
-
-  <ItemGroup Condition="'$(BuildExePhase)' == '' ">
-
-    <ProjectFile Include="TestServices\TestServices.csproj" />
-    <ProjectFile Include="WPFSetup\wpfSetup.csproj" />
-    <ProjectFile Include="Tools\DrtTools.csproj" />
-
-    <!-- Broken for 3.5 Build in recent Dev11 WPF migration.  Since DRTs are NEVER run in 3.X, disable there -->
-    <ProjectFile Include="rundrt\rundrts.nativeproj" Condition="'$(WPF_TESTBUILD_TARGETVERSION)' != 'v3.5' AND '$(WPF_TESTBUILD_TARGETVERSION)' != 'v3.0'"/>
-
-  </ItemGroup>
-
-  <Import Project="$(_NTDRIVE)$(_NTROOT)\tools\Microsoft.DevDiv.Traversal.targets" />
-
-</Project>
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml.sln b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml.sln
index 37c61ec0292..e9c83d048ac 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml.sln
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml.sln
@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.28010.2026
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DrtXaml.Tests", "DrtXaml\DrtXaml\DrtXaml.Tests.csproj", "{FAB114A2-2C6C-4372-A6BB-BC087B646E3A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DrtXaml", "DrtXaml\DrtXaml\DrtXaml.csproj", "{FAB114A2-2C6C-4372-A6BB-BC087B646E3A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestServices", "..\Common\TestServices\TestServices.csproj", "{387F3700-8C0B-4CEC-A68A-1725F656A249}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestServices", "..\Common\DRT\TestServices\TestServices.csproj", "{387F3700-8C0B-4CEC-A68A-1725F656A249}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XamlTestClasses", "DrtXaml\XamlTestClasses\XamlTestClasses.csproj", "{3C1FC36C-E3E6-4EED-9ECA-CFF2EB950486}"
 EndProject
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlAvoidXmlTest/BamlAvoidXmlTest.csproj b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlAvoidXmlTest/BamlAvoidXmlTest.csproj
index 288c956924a..c744feb3be1 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlAvoidXmlTest/BamlAvoidXmlTest.csproj
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlAvoidXmlTest/BamlAvoidXmlTest.csproj
@@ -25,4 +25,29 @@
   <ItemGroup>
     <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />
   </ItemGroup>
+
+  <ItemGroup>
+    <NetCoreReference Include="mscorlib" />
+    <NetCoreReference Include="netstandard" />
+    <NetCoreReference Include="System.Console" />
+    <NetCoreReference Include="System.Diagnostics.Debug" />
+    <NetCoreReference Include="System.Diagnostics.Tools" />
+    <NetCoreReference Include="System.Runtime.Extensions" />
+    <NetCoreReference Include="System.Runtime.InteropServices" />
+    <NetCoreReference Include="System.Resources.ResourceManager" />
+    <NetCoreReference Include="System.Linq" />
+    <NetCoreReference Include="System.ObjectModel" />
+    <NetCoreReference Include="System.ComponentModel" />
+    <NetCoreReference Include="System.ComponentModel.Primitives" />
+    <NetCoreReference Include="System.Collections" />
+    <NetCoreReference Include="System.Collections.Generic" />
+    <NetCoreReference Include="System.Collections.NonGeneric" />
+    <NetCoreReference Include="System.Collections.Concurrent" />
+    <NetCoreReference Include="System.Reflection.Primitives" />
+    <NetCoreReference Include="System.Text.Encoding.Extensions" />
+    <NetCoreReference Include="System.Threading" />
+    <NetCoreReference Include="System.Threading.Thread" />
+    <NetCoreReference Include="System.Threading.Tasks" />
+    <NetCoreReference Include="System.Xml.ReaderWriter" />
+  </ItemGroup>
 </Project>
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlTestClasses40/BamlTestClasses40.csproj b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlTestClasses40/BamlTestClasses40.csproj
index 39d1b6fedcd..3c4d5a8d8b5 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlTestClasses40/BamlTestClasses40.csproj
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlTestClasses40/BamlTestClasses40.csproj
@@ -62,12 +62,16 @@
     <Page Include="XmlSpace3.xaml">
       <Generator>MSBuild:Compile</Generator>
     </Page>
-
+    <Compile Include="BCMarkupExtension.cs" />
+    <Compile Include="TempDPSetOrder1ListBox.cs" />
     <None Remove="@(Page)" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)WindowsBase\WindowsBase.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)PresentationFramework\PresentationFramework.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlTestClasses40/TempDPSetOrder1.xaml.cs b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlTestClasses40/TempDPSetOrder1.xaml.cs
index ba75f9a5345..0ddeeb78a63 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlTestClasses40/TempDPSetOrder1.xaml.cs
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlTestClasses40/TempDPSetOrder1.xaml.cs
@@ -16,47 +16,4 @@ public TempDPSetOrder1()
             InitializeComponent();
         }
     }
-
-    public enum Property
-    {
-        IsSynchronizedWithCurrentItem,
-        ItemsSource,
-        SelectedIndex
-    }
-
-    public class TempDPSetOrder1ListBox : ListBox
-    {
-        public static List<Property> Order { get; private set; }
-
-        static TempDPSetOrder1ListBox()
-        {
-            Order = new List<Property>();
-        }
-
-        protected override void OnPropertyChanged(DependencyPropertyChangedEventArgs e)
-        {
-            base.OnPropertyChanged(e);
-            if (e.Property.OwnerType.Equals(typeof(Selector)))
-            {
-                switch (e.Property.Name)
-                {
-                    case "IsSynchronizedWithCurrentItem":
-                        Order.Add(Property.IsSynchronizedWithCurrentItem);
-                        break;
-                    case "SelectedIndex":
-                        Order.Add(Property.SelectedIndex);
-                        break;
-                }
-            }
-            else if (e.Property.OwnerType.Equals(typeof(ItemsControl)))
-            {
-                switch (e.Property.Name)
-                {
-                    case "ItemsSource":
-                        Order.Add(Property.ItemsSource);
-                        break;
-                }
-            }
-        }
-    }
 }
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlTestClasses40/TempDPSetOrder1ListBox.cs b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlTestClasses40/TempDPSetOrder1ListBox.cs
new file mode 100644
index 00000000000..f9debdad8ce
--- /dev/null
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlTestClasses40/TempDPSetOrder1ListBox.cs
@@ -0,0 +1,54 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Collections.Generic;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+
+namespace BamlTestClasses40
+{
+    public enum Property
+    {
+        IsSynchronizedWithCurrentItem,
+        ItemsSource,
+        SelectedIndex
+    }
+    
+    public class TempDPSetOrder1ListBox : ListBox
+    {
+        public static List<Property> Order { get; private set; }
+
+        static TempDPSetOrder1ListBox()
+        {
+            Order = new List<Property>();
+        }
+
+        protected override void OnPropertyChanged(DependencyPropertyChangedEventArgs e)
+        {
+            base.OnPropertyChanged(e);
+            if (e.Property.OwnerType.Equals(typeof(Selector)))
+            {
+                switch (e.Property.Name)
+                {
+                    case "IsSynchronizedWithCurrentItem":
+                        Order.Add(Property.IsSynchronizedWithCurrentItem);
+                        break;
+                    case "SelectedIndex":
+                        Order.Add(Property.SelectedIndex);
+                        break;
+                }
+            }
+            else if (e.Property.OwnerType.Equals(typeof(ItemsControl)))
+            {
+                switch (e.Property.Name)
+                {
+                    case "ItemsSource":
+                        Order.Add(Property.ItemsSource);
+                        break;
+                }
+            }
+        }
+    }
+}
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/Directory.Build.props b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/Directory.Build.props
index 319f7c13864..4d1dc3791be 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/Directory.Build.props
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/Directory.Build.props
@@ -1,4 +1,4 @@
 <Project>
-  <Import Condition="Exists('../Directory.Build.props')" Project="../Directory.Build.props" />
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
   <Import Condition="Exists('$(WpfTestBasePath)/DRT.Build.props')" Project="$(WpfTestBasePath)/DRT.Build.props" />
 </Project>
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/DrtXaml.Tests.csproj b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/DrtXaml.csproj
similarity index 86%
rename from src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/DrtXaml.Tests.csproj
rename to src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/DrtXaml.csproj
index 47569961283..822d08b97c9 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/DrtXaml.Tests.csproj
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/DrtXaml.csproj
@@ -1,21 +1,20 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyName>DrtXaml</AssemblyName>
     <RootNamespace>DrtXaml</RootNamespace>
-    <ApplicationIcon />
-    <OutputType>Library</OutputType>
-    <StartupObject />
+    <LinkSubsystem>console</LinkSubsystem>
+    <OutputType>WinExe</OutputType>
     <Platforms>AnyCPU;x64</Platforms>
   </PropertyGroup>
 
   <PropertyGroup>
     <IsTestProject>true</IsTestProject>
-    <IsIntegrationTestProject>true</IsIntegrationTestProject>
+    <IsIntegrationTestProject>false</IsIntegrationTestProject>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
   
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Common\TestServices\TestServices.csproj" />
+    <ProjectReference Include="..\..\..\Common\DRT\TestServices\TestServices.csproj" />
     <ProjectReference Include="..\BamlAvoidXmlTest\BamlAvoidXmlTest.csproj" />
     <ProjectReference Include="..\BamlTestClasses40\BamlTestClasses40.csproj" />
     <ProjectReference Include="..\XamlTestClasses.FriendWithKey\XamlTestClasses.FriendWithKey.csproj" />
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/FriendWithKey/XamlTestClasses.FriendWithKey.csproj b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/FriendWithKey/XamlTestClasses.FriendWithKey.csproj
index 0d96d982242..b50c80cd7b3 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/FriendWithKey/XamlTestClasses.FriendWithKey.csproj
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/FriendWithKey/XamlTestClasses.FriendWithKey.csproj
@@ -3,7 +3,6 @@
     <AssemblyName>XamlTestClasses.FriendWithKey</AssemblyName>
     <OutputType>Library</OutputType>
     <DefineConstants>$(DefineConstants);OLDRESOURCES</DefineConstants>
-    <TestCode>true</TestCode>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/FriendWithoutKey/XamlTestClasses.FriendWithoutKey.csproj b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/FriendWithoutKey/XamlTestClasses.FriendWithoutKey.csproj
index b3ad111fa7f..0d902aa8960 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/FriendWithoutKey/XamlTestClasses.FriendWithoutKey.csproj
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/FriendWithoutKey/XamlTestClasses.FriendWithoutKey.csproj
@@ -3,7 +3,6 @@
     <AssemblyName>XamlTestClasses.FriendWithoutKey</AssemblyName>
     <OutputType>Library</OutputType>
     <DefineConstants>$(DefineConstants);OLDRESOURCES</DefineConstants>
-    <TestCode>true</TestCode>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <SignAssembly>false</SignAssembly>
   </PropertyGroup>
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/PartialTrustTests/DrtXaml.PartialTrustTests.csproj b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/PartialTrustTests/DrtXaml.PartialTrustTests.csproj
index 22e6c73fbf0..05472880300 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/PartialTrustTests/DrtXaml.PartialTrustTests.csproj
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/PartialTrustTests/DrtXaml.PartialTrustTests.csproj
@@ -3,7 +3,6 @@
     <AssemblyName>DrtXaml.PartialTrustTests</AssemblyName>
     <OutputType>Library</OutputType>
     <DefineConstants>$(DefineConstants);OLDRESOURCES</DefineConstants>
-    <TestCode>true</TestCode>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AssemblyAttributeClsCompliant>false</AssemblyAttributeClsCompliant>
   </PropertyGroup>
diff --git a/src/Microsoft.DotNet.Wpf/test/Directory.Build.props b/src/Microsoft.DotNet.Wpf/test/Directory.Build.props
index 471b0be1781..12c3872c4d5 100644
--- a/src/Microsoft.DotNet.Wpf/test/Directory.Build.props
+++ b/src/Microsoft.DotNet.Wpf/test/Directory.Build.props
@@ -1,39 +1,20 @@
 <Project>
-  <Import Condition="Exists('../Directory.Build.props')" Project="../Directory.Build.props" />
-  
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+
   <PropertyGroup>
     <WpfTestBasePath>$(MsBuildThisFileDirectory)</WpfTestBasePath>
     <DrtCommonRoot>$(WpfTestBasePath)\Common\DRT</DrtCommonRoot>
     <WpfSharedRoot>$(WpfTestBasePath)\Shared</WpfSharedRoot>
     <PublishRoot>$(RepoRoot)artifacts\test\</PublishRoot>
-
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-
-    <MicrosoftSourceLinkVersion>1.0.0-beta2-18618-05</MicrosoftSourceLinkVersion>
+    <RuntimeIdentifiers>win-x64;win-x86</RuntimeIdentifiers>
+    <PlatformFolder>x86</PlatformFolder>
+    <PlatformFolder Condition="'$(Platform)' == 'x64'">x64</PlatformFolder>
   </PropertyGroup>
-  
-  <Choose>
-    <When Condition="'$(Platform)' == 'x64'">
-      <PropertyGroup>
-        <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-        <PlatformFolder>x64</PlatformFolder>
-      </PropertyGroup>
-    </When>
-    <Otherwise>
-      <PropertyGroup>
-        <RuntimeIdentifier>win-x86</RuntimeIdentifier>
-        <PlatformFolder>x86</PlatformFolder>
-      </PropertyGroup>
-    </Otherwise>
-  </Choose>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="$(MicrosoftSourceLinkVersion)" PrivateAssets="all"/>
-  </ItemGroup>
-  
-  <Import Project="$(MsBuildThisFileDirectory)\Publish.props"/>
-  <Import Project="$(MsBuildThisFileDirectory)\StrongName.props"/>
+ 
+  <Import Project="$(WpfArcadeSdkToolsDir)\Publish.props"/>
+  <Import Project="$(WpfArcadeSdkToolsDir)\StrongName.props"/>
 
   <ItemDefinitionGroup>
     <EmbeddedResource>
@@ -55,7 +36,7 @@
     <DrtToolsProject>$(WpfTestBasePath)\Common\DRT\Tools\DrtTools.csproj</DrtToolsProject>
   </PropertyGroup>
 
-  <Import Project="$(MsBuildThisFileDirectory)\SourceLocations.props"/>
+  <Import Project="$(WpfArcadeSdkToolsDir)\SourceLocations.props"/>
 
   <PropertyGroup>
     <SignAssembly>true</SignAssembly>
diff --git a/src/Microsoft.DotNet.Wpf/test/Directory.Build.targets b/src/Microsoft.DotNet.Wpf/test/Directory.Build.targets
index c42bcba8ce7..2181cf771d7 100644
--- a/src/Microsoft.DotNet.Wpf/test/Directory.Build.targets
+++ b/src/Microsoft.DotNet.Wpf/test/Directory.Build.targets
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
-  <Import Condition="Exists('../Directory.Build.targets')" Project="../Directory.Build.targets" />
-  <Import Project="StrongName.targets" />
-  <Import Project="PublishAfterBuild.targets" />
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
+  <Import Project="$(WpfArcadeSdkToolsDir)StrongName.targets" />
+  <Import Project="$(WpfArcadeSdkToolsDir)PublishAfterBuild.targets" />
 </Project>
+  
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Wpf/test/MultiTargeting.props b/src/Microsoft.DotNet.Wpf/test/MultiTargeting.props
deleted file mode 100644
index 2f9f5d9b14f..00000000000
--- a/src/Microsoft.DotNet.Wpf/test/MultiTargeting.props
+++ /dev/null
@@ -1,61 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.0</TargetFrameworks>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <DefineConstants Condition="$(TargetFramework.StartsWith('net4'))">$(DefineConstants);NET4X</DefineConstants>
-    <DefineConstants Condition="$(TargetFramework.StartsWith('netcoreapp3'))">$(DefineConstants);NETCOREAPP3_X</DefineConstants>
-
-    <DefineConstants Condition="$(TargetFramework.Equals('net40'))">$(DefineConstants);NET40</DefineConstants>
-    <DefineConstants Condition="$(TargetFramework.Equals('net45'))">$(DefineConstants);NET45</DefineConstants>
-    <DefineConstants Condition="$(TargetFramework.Equals('net451'))">$(DefineConstants);NET451</DefineConstants>
-    <DefineConstants Condition="$(TargetFramework.Equals('net452'))">$(DefineConstants);NET452</DefineConstants>
-    <DefineConstants Condition="$(TargetFramework.Equals('net453'))">$(DefineConstants);NET453</DefineConstants>
-    <DefineConstants Condition="$(TargetFramework.Equals('net46'))">$(DefineConstants);NET46</DefineConstants>
-    <DefineConstants Condition="$(TargetFramework.Equals('net461'))">$(DefineConstants);NET461</DefineConstants>
-    <DefineConstants Condition="$(TargetFramework.Equals('net462'))">$(DefineConstants);NET462</DefineConstants>
-    <DefineConstants Condition="$(TargetFramework.Equals('net47'))">$(DefineConstants);NET47</DefineConstants>
-    <DefineConstants Condition="$(TargetFramework.Equals('net471'))">$(DefineConstants);NET471</DefineConstants>
-    <DefineConstants Condition="$(TargetFramework.Equals('net472'))">$(DefineConstants);NET472</DefineConstants>
-    
-    <DefineConstants Condition="$(TargetFramework.Equals('netcoreapp3.0'))">$(DefineConstants);NETCOREAPP3_0</DefineConstants>
-  </PropertyGroup>
-  
-  <ItemGroup Condition="'$(TargetFramework)'!='net35'">
-    <PackageReference Include="System.Reflection.Emit" Version="$(SystemReflectionEmitPackageVersion)" />
-  </ItemGroup>
-  
-  <!-- When IsUnitTestProject is set by Arcade, these ProjectReferences are implicitly included -->
-  <ItemGroup Condition="'$(TargetFramework)'!='net35' and '$(IsUnitTestProject)'!='true'">
-    <PackageReference Include="xunit" Version="$(XUnitVersion)" />
-    <PackageReference Include="xunit.runner.console" Version="$(XUnitRunnerConsoleVersion)">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitRunnerVisualStudioVersion)">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-
-  <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">   
-    <Reference Include="System.Xaml" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-    <Reference Include="UIAutomationClient" />
-    <Reference Include="UIAutomationProvider" />
-    <Reference Include="UIAutomationTypes" />
-    <Reference Include="WindowsBase" />
-    <Reference Include="Accessibility" />
-  </ItemGroup>
-  
-  <ItemGroup Condition="'$(TargetFramework)'=='net35'">
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-    <Reference Include="UIAutomationClient" />
-    <Reference Include="UIAutomationProvider" />
-    <Reference Include="UIAutomationTypes" />
-    <Reference Include="WindowsBase" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Wpf/test/PublishAfterBuild.targets b/src/Microsoft.DotNet.Wpf/test/PublishAfterBuild.targets
deleted file mode 100644
index 32916f86819..00000000000
--- a/src/Microsoft.DotNet.Wpf/test/PublishAfterBuild.targets
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project>
-   <Target Name="AfterBuild" DependsOnTargets="PublishPropertySetup;Publish"/> 
-  
-   <Target
-       Name="PublishPropertySetup">
-     <PropertyGroup>
-         <NoBuild>true</NoBuild>
-     </PropertyGroup>
-   </Target>
-</Project>

From a6f098a631f6db078ea8167d7ad19a34c3764b28 Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Mon, 27 May 2019 12:03:47 -0700
Subject: [PATCH 13/72] tests properly running and reporting results

---
 eng/helix/prepare-helix-payload.ps1                   | 11 +++++------
 eng/helix/runtests.ps1                                |  2 +-
 .../test/BranchCommon/data/DrtList.xml                |  1 -
 .../test/DRT/Directory.Build.props                    |  2 +-
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/eng/helix/prepare-helix-payload.ps1 b/eng/helix/prepare-helix-payload.ps1
index efe24c50ec6..0591a2b6e31 100644
--- a/eng/helix/prepare-helix-payload.ps1
+++ b/eng/helix/prepare-helix-payload.ps1
@@ -1,11 +1,10 @@
 [CmdLetBinding()]
 Param(
     [string]$platform,
-    [string]$configuration,
-    [string]$testPackageVersion
+    [string]$configuration
 )
 
-$payloadDir = "HelixPayload\$configuration\$platform"
+$payloadDir = "$PSScriptRoot\HelixPayload\$configuration\$platform"
 
 $nugetPackagesDir = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "packages"
 
@@ -39,7 +38,7 @@ function CopyFolderStructure($from, $to)
 }
 
 # Copy files from nuget packages.
-$testNugetLocation = Resolve-Path (Join-Path $nugetPackagesDir "runtime.win-$platform.Microsoft.DotNet.Wpf.Test\*\tools\win-$platform\Test")
+$testNugetLocation = Resolve-Path (Join-Path $nugetPackagesDir "runtime.win-$platform.Microsoft.DotNet.Wpf.Test.*\tools\win-$platform\Test")
 $testPayloadLocation = Join-Path $payloadDir "Test"
 CopyFolderStructure $testNugetLocation $testPayloadLocation
 
@@ -50,5 +49,5 @@ $drtPayloadLocation = Join-Path $payloadDir "Test\DRT"
 CopyFolderStructure $drtArtifactsLocation $drtPayloadLocation
 
 # Copy scripts
-Copy-Item "eng\helix\configure-helix-machine.ps1" $payloadDir
-Copy-Item "eng\helix\runtests.ps1" $payloadDir
\ No newline at end of file
+Copy-Item "$PSScriptRoot\configure-helix-machine.ps1" $payloadDir
+Copy-Item "$PSScriptRoot\runtests.ps1" $payloadDir
\ No newline at end of file
diff --git a/eng/helix/runtests.ps1 b/eng/helix/runtests.ps1
index 241505851c1..d47f9f15f96 100644
--- a/eng/helix/runtests.ps1
+++ b/eng/helix/runtests.ps1
@@ -22,5 +22,5 @@ if (Test-Path "$testLocation\rundrts.cmd")
 # Need to copy the xUnit log to a known location that helix can understand
 if (Test-Path "$env:AppData\QualityVault\Run\Report\testResults.xml")
 {
-    Copy-Item "$env:AppData\QualityVault\Run\Report\testResults.xml" "..\testResults.xml"
+    Copy-Item "$env:AppData\QualityVault\Run\Report\testResults.xml" ".\testResults.xml"
 }
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Wpf/test/BranchCommon/data/DrtList.xml b/src/Microsoft.DotNet.Wpf/test/BranchCommon/data/DrtList.xml
index 1e94bca0882..e28c5f4a76b 100644
--- a/src/Microsoft.DotNet.Wpf/test/BranchCommon/data/DrtList.xml
+++ b/src/Microsoft.DotNet.Wpf/test/BranchCommon/data/DrtList.xml
@@ -541,7 +541,6 @@ Rundrtlist
       <SupportFile>BamlAvoidXmlTest.exe</SupportFile>
       <SupportFile>XamlTestClasses.FriendWithKey.dll</SupportFile>
       <SupportFile>XamlTestClasses.FriendWithoutKey.dll</SupportFile>
-      <SupportFile>DrtXaml.PartialTrustTests.dll</SupportFile>
     </SupportFiles>
   </Drt>
   <Drt Executable="DrtXpsApi.cmd" Architecture="all" OS="all" Team="DigitalDocuments" >
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/Directory.Build.props b/src/Microsoft.DotNet.Wpf/test/DRT/Directory.Build.props
index 7e783514db2..7167d0c5112 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT/Directory.Build.props
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <Import Condition="Exists('../Directory.Build.props')" Project="../Directory.Build.props" />
   <PropertyGroup>
-    <PublishDir>$(WpfTestBasePublishPath)\Common</PublishDir>
+    <PublishDir>$(WpfTestBasePublishPath)\DRT</PublishDir>
   </PropertyGroup>
 </Project>
\ No newline at end of file

From b3c32c2deedbde6086b0b6e6dbf8d6c6bad17e8f Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Mon, 27 May 2019 12:57:57 -0700
Subject: [PATCH 14/72] a little cleaning up

---
 eng/helix/helixpublish.proj         | 2 +-
 eng/helix/prepare-helix-payload.ps1 | 5 +++--
 eng/helix/runtests.ps1              | 2 --
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/eng/helix/helixpublish.proj b/eng/helix/helixpublish.proj
index aac15376b1f..8fa7d9a29ef 100644
--- a/eng/helix/helixpublish.proj
+++ b/eng/helix/helixpublish.proj
@@ -19,7 +19,7 @@
     <FailOnMissionControlTestFailure>true</FailOnMissionControlTestFailure>
 
     <!-- Semi-colon delimited list of commands that are executed before every test.-->
-    <HelixPreCommands>$(HelixPreCommands);powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\configure-helix-machine.ps1 -version Xaml"</HelixPreCommands>
+    <HelixPreCommands>$(HelixPreCommands);</HelixPreCommands>
 
     <!-- These are the list of Windows versions that we run tests on-->
     <!--<HelixTargetQueues>Windows.10.Amd64.Open;Windows.7.Amd64.Open;Windows.10.Amd64.ServerRS5.Open</HelixTargetQueues>-->
diff --git a/eng/helix/prepare-helix-payload.ps1 b/eng/helix/prepare-helix-payload.ps1
index 0591a2b6e31..f0f726c294d 100644
--- a/eng/helix/prepare-helix-payload.ps1
+++ b/eng/helix/prepare-helix-payload.ps1
@@ -19,6 +19,9 @@ New-Item -ItemType Directory -Force -Path $payloadDir
 
 function CopyFolderStructure($from, $to)
 {
+    Write-Output "Copying from: $from"
+    Write-Output "          to: $to"
+    
     if(Test-Path $to)
     {
         Remove-Item $to -Recurse
@@ -33,8 +36,6 @@ function CopyFolderStructure($from, $to)
     {
         Write-Output "Location doesn't exist: $from"
     }
-
-    Get-ChildItem $to -Recurse
 }
 
 # Copy files from nuget packages.
diff --git a/eng/helix/runtests.ps1 b/eng/helix/runtests.ps1
index d47f9f15f96..c902dfd14e9 100644
--- a/eng/helix/runtests.ps1
+++ b/eng/helix/runtests.ps1
@@ -6,8 +6,6 @@ Param(
 # Configure the machine before running tests
 . "$PSScriptRoot\configure-helix-machine.ps1"
 
-dotnet --info
-
 # Run the tests
 $testLocation = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "Test"
 if (Test-Path "$testLocation\rundrts.cmd")

From 3d1efd8fa67f5fc46d71d5f78e0eeaeabada2b99 Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Mon, 27 May 2019 13:07:23 -0700
Subject: [PATCH 15/72] fix creating payload directory

---
 eng/helix/prepare-helix-payload.ps1 | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/eng/helix/prepare-helix-payload.ps1 b/eng/helix/prepare-helix-payload.ps1
index f0f726c294d..ac29459d060 100644
--- a/eng/helix/prepare-helix-payload.ps1
+++ b/eng/helix/prepare-helix-payload.ps1
@@ -4,12 +4,10 @@ Param(
     [string]$configuration
 )
 
-$payloadDir = "$PSScriptRoot\HelixPayload\$configuration\$platform"
+$payloadDir = "HelixPayload\$configuration\$platform"
 
 $nugetPackagesDir = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "packages"
 
-# TODO: Once we have the nuget package from the dotnet-wpf-test, we can better understand what we 
-# need to do here.
 # Create the payload directory. Remove it if it already exists.
 if(Test-Path $payloadDir)
 {
@@ -19,9 +17,6 @@ New-Item -ItemType Directory -Force -Path $payloadDir
 
 function CopyFolderStructure($from, $to)
 {
-    Write-Output "Copying from: $from"
-    Write-Output "          to: $to"
-    
     if(Test-Path $to)
     {
         Remove-Item $to -Recurse
@@ -50,5 +45,5 @@ $drtPayloadLocation = Join-Path $payloadDir "Test\DRT"
 CopyFolderStructure $drtArtifactsLocation $drtPayloadLocation
 
 # Copy scripts
-Copy-Item "$PSScriptRoot\configure-helix-machine.ps1" $payloadDir
-Copy-Item "$PSScriptRoot\runtests.ps1" $payloadDir
\ No newline at end of file
+Copy-Item "eng\helix\configure-helix-machine.ps1" $payloadDir
+Copy-Item "eng\helix\runtests.ps1" $payloadDir
\ No newline at end of file

From 66cc44cddecc8244c273043a2c886ebf84ce5d5f Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Mon, 27 May 2019 13:25:50 -0700
Subject: [PATCH 16/72] put test directory back to how it is when restoring via
 msbuild

---
 eng/Versions.props                            |  1 +
 eng/helix/configure-helix-machine.ps1         | 29 +++++++++++
 eng/helix/helixpublish.proj                   | 51 ++++++++++---------
 eng/helix/prepare-helix-payload.ps1           |  6 +--
 eng/helix/runtests.cmd                        |  3 ++
 eng/helix/runtests.ps1                        |  8 +--
 eng/pipeline.yml                              |  2 +-
 .../test/BranchCommon/data/CommonData.csproj  |  2 +-
 8 files changed, 69 insertions(+), 33 deletions(-)
 create mode 100644 eng/helix/runtests.cmd

diff --git a/eng/Versions.props b/eng/Versions.props
index ee819bd9b05..a8e3eaf1695 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -58,6 +58,7 @@
     <XUnitVersion>2.4.0</XUnitVersion>
     <XUnitRunnerConsoleVersion>$(XUnitVersion)</XUnitRunnerConsoleVersion>
     <XUnitRunnerVisualStudioVersion>$(XUnitVersion)</XUnitRunnerVisualStudioVersion>
+    <MicrosoftDotNetWpfTestPackageVersion>1.0.0-beta.19263.1</MicrosoftDotNetWpfTestPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <RestoreSources>
diff --git a/eng/helix/configure-helix-machine.ps1 b/eng/helix/configure-helix-machine.ps1
index 85403ad23fa..4f20fb2866a 100644
--- a/eng/helix/configure-helix-machine.ps1
+++ b/eng/helix/configure-helix-machine.ps1
@@ -1 +1,30 @@
 # This file prepares the helix machine for our tests runs
+$dotnetLocation = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "dotnet"
+
+# Set DOTNET_ROOT variables so the host can find it
+Set-Item -Path "env:DOTNET_ROOT(x86)" -Value $dotnetLocation
+Set-Item -Path "env:DOTNET_ROOT" -Value $dotnetLocation
+
+$runtimes = dotnet --list-runtimes
+foreach ($rt in $runtimes)
+{
+    if ($rt.StartsWith("Microsoft.WindowsDesktop.App"))
+    {
+        $version = $rt.Split(" ")[1]
+    }
+}
+
+# Rewrite the *.runtimeconfig.json files to match the version of the runtime on the machine
+$infraLocation = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "Test\Infra"
+$stiConfigFile = Join-Path $infraLocation "Sti.runtimeconfig.json"
+$qvConfigFile = Join-Path $infraLocation "QualityVaultFrontEnd.runtimeconfig.json"
+$configFiles = $stiConfigFile, $qvConfigFile
+foreach ($config in $configFiles)
+{
+    # Read current config file
+    $jsondata = Get-Content -Raw -Path $config | ConvertFrom-Json
+    # Update version
+    $jsondata.runtimeOptions.framework.version = $version
+    # Write data back
+    $jsondata | ConvertTo-Json -depth 100 | Set-Content $config
+}
\ No newline at end of file
diff --git a/eng/helix/helixpublish.proj b/eng/helix/helixpublish.proj
index 8fa7d9a29ef..9d4a8cdc9d1 100644
--- a/eng/helix/helixpublish.proj
+++ b/eng/helix/helixpublish.proj
@@ -13,7 +13,9 @@
     <DotNetCliPackageType>sdk</DotNetCliPackageType>
     <!-- Set to match global.json.tools.dotnet by pre-build.ps1 -->
     <DotNetCliVersion>$(DotNetCliVersion)</DotNetCliVersion>
-    
+    <DotNetCliRuntime>win-x86</DotNetCliRuntime>
+    <DotNetCliRuntime Condition="'$(Platform)' == 'x64'">win-x64</DotNetCliRuntime>
+
     <EnableXUnitReporter>true</EnableXUnitReporter>
     <EnableAzurePipelinesReporter>true</EnableAzurePipelinesReporter>
     <FailOnMissionControlTestFailure>true</FailOnMissionControlTestFailure>
@@ -26,7 +28,6 @@
     <!-- Just cutting down the total queues while bootstrapping to speed things up-->
     <HelixTargetQueues>Windows.10.Amd64.Open</HelixTargetQueues>
 
-    <MicrosoftDotNetWpfTestPackageVersion>1.0.0-beta.19263.1</MicrosoftDotNetWpfTestPackageVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -34,96 +35,96 @@
     <HelixCorrelationPayload Include="..\..\HelixPayload\$(Configuration)\$(Platform)" /> 
     <HelixWorkItem Include="Xaml">
       <Timeout>00:20:00</Timeout>
-      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 -area Xaml"</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Xaml</Command>
     </HelixWorkItem>
    <!-- 
    <HelixWorkItem Include="Annotations">
       <Timeout>00:20:00</Timeout> 
-      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=Annotations"</Command>
+      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Annotations</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="AppModel">
       <Timeout>00:20:00</Timeout>
-      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=AppModel"</Command>
+      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=AppModel</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="DigitalDocuments">
       <Timeout>00:20:00</Timeout>
-      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=DigitalDocuments"</Command>
+      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=DigitalDocuments</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Media">
       <Timeout>00:20:00</Timeout>
-      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=Media"</Command>
+      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Media</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Editing">
       <Timeout>00:20:00</Timeout>
-      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=Editing"</Command>
+      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Editing</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="ElementServices">
       <Timeout>00:20:00</Timeout>
-      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=ElementServices"</Command>
+      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=ElementServices</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Text">
       <Timeout>00:20:00</Timeout>
-      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=Text"</Command>
+      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Text</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Animation">
       <Timeout>00:20:00</Timeout>
-      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=Animation"</Command>
+      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Animation</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="3D">
       <Timeout>00:20:00</Timeout>
-      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=3D"</Command>
+      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=3D</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="2D">
       <Timeout>00:20:00</Timeout>
-      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=2D"</Command>
+      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=2D</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Controls">
       <Timeout>00:20:00</Timeout>
-      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=Controls"</Command>
+      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Controls</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Imaging">
       <Timeout>00:20:00</Timeout>
-      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=Imaging"</Command>
+      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Imaging</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="FlowLayout">
       <Timeout>00:20:00</Timeout>
-      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=FlowLayout"</Command>
+      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=FlowLayout</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="DataServices">
       <Timeout>00:20:00</Timeout>
-      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=DataServices"</Command>
+      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=DataServices</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="ElementLayout">
       <Timeout>00:20:00</Timeout>
-      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=ElementLayout"</Command>
+      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=ElementLayout</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Xaml">
       <Timeout>00:20:00</Timeout>
-      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=Xaml"</Command>
+      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Xaml</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Globalization">
       <Timeout>00:20:00</Timeout>
-      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=Globalization"</Command>
+      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Globalization</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Tablet">
       <Timeout>00:20:00</Timeout>
-      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=Tablet"</Command>
+      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Tablet</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Integration">
       <Timeout>00:20:00</Timeout>
-      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=Integration"</Command>
+      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Integration</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="XET">
       <Timeout>00:20:00</Timeout>
-      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=XET"</Command>
+      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=XET</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Printing">
       <Timeout>00:20:00</Timeout>
-      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=Printing"</Command>
+      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Printing</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="WindowsFormsIntegration">
       <Timeout>00:20:00</Timeout>
-      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=WindowsFormsIntegration"</Command>
+      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=WindowsFormsIntegration</Command>
     </HelixWorkItem>
     -->
   </ItemGroup>
diff --git a/eng/helix/prepare-helix-payload.ps1 b/eng/helix/prepare-helix-payload.ps1
index ac29459d060..9f382820f4a 100644
--- a/eng/helix/prepare-helix-payload.ps1
+++ b/eng/helix/prepare-helix-payload.ps1
@@ -34,16 +34,16 @@ function CopyFolderStructure($from, $to)
 }
 
 # Copy files from nuget packages.
-$testNugetLocation = Resolve-Path (Join-Path $nugetPackagesDir "runtime.win-$platform.Microsoft.DotNet.Wpf.Test.*\tools\win-$platform\Test")
+$testNugetLocation = Resolve-Path (Join-Path $nugetPackagesDir "runtime.win-$platform.Microsoft.DotNet.Wpf.Test\*\tools\win-$platform\Test")
 $testPayloadLocation = Join-Path $payloadDir "Test"
 CopyFolderStructure $testNugetLocation $testPayloadLocation
 
 # Copy local DRT assemblies to test location
-CopyFolderStructure $testNugetLocation $testPayloadLocation
 $drtArtifactsLocation = [System.IO.Path]::Combine($env:BUILD_SOURCESDIRECTORY, "artifacts\test", $configuration, $platform, "Test\DRT")
 $drtPayloadLocation = Join-Path $payloadDir "Test\DRT"
 CopyFolderStructure $drtArtifactsLocation $drtPayloadLocation
 
 # Copy scripts
 Copy-Item "eng\helix\configure-helix-machine.ps1" $payloadDir
-Copy-Item "eng\helix\runtests.ps1" $payloadDir
\ No newline at end of file
+Copy-Item "eng\helix\runtests.ps1" $payloadDir
+Copy-Item "eng\helix\runtests.cmd" $payloadDir
diff --git a/eng/helix/runtests.cmd b/eng/helix/runtests.cmd
new file mode 100644
index 00000000000..c7b6190b9f2
--- /dev/null
+++ b/eng/helix/runtests.cmd
@@ -0,0 +1,3 @@
+@echo off
+
+powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0runtests.ps1"""  %*"
\ No newline at end of file
diff --git a/eng/helix/runtests.ps1 b/eng/helix/runtests.ps1
index c902dfd14e9..55d4395441a 100644
--- a/eng/helix/runtests.ps1
+++ b/eng/helix/runtests.ps1
@@ -1,6 +1,6 @@
 [CmdLetBinding()]
 Param(
-    [string]$area
+    [string]$command
 )
 
 # Configure the machine before running tests
@@ -10,7 +10,7 @@ Param(
 $testLocation = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "Test"
 if (Test-Path "$testLocation\rundrts.cmd")
 {
-    Invoke-Expression "$testLocation\rundrts.cmd /Area=$area"
+    Invoke-Expression "$testLocation\rundrts.cmd $command"
 }
 
 # We can use $env:HELIX_PYTHONPATH $env:HELIX_SCRIPT_ROOT\upload_result.py to upload any QV specific logs and/or screenshots that we are interested in.
@@ -20,5 +20,7 @@ if (Test-Path "$testLocation\rundrts.cmd")
 # Need to copy the xUnit log to a known location that helix can understand
 if (Test-Path "$env:AppData\QualityVault\Run\Report\testResults.xml")
 {
-    Copy-Item "$env:AppData\QualityVault\Run\Report\testResults.xml" ".\testResults.xml"
+    $resultLocation = $PSScriptRoot
+    Write-Output "Copying test results to $resultLocation"
+    Copy-Item "$env:AppData\QualityVault\Run\Report\testResults.xml" $resultLocation
 }
\ No newline at end of file
diff --git a/eng/pipeline.yml b/eng/pipeline.yml
index e2f05cb5eda..7ea3b6cdacc 100644
--- a/eng/pipeline.yml
+++ b/eng/pipeline.yml
@@ -18,7 +18,7 @@ jobs:
   parameters:
     enableMicrobuild: true
     enablePublishBuildArtifacts: true
-    enablePublishTestResults: true
+    enablePublishTestResults: false # tests run in helix
     enablePublishBuildAssets: true
     enablePublishUsingPipelines: $(_PublishUsingPipelines)
     enableTelemetry: true
diff --git a/src/Microsoft.DotNet.Wpf/test/BranchCommon/data/CommonData.csproj b/src/Microsoft.DotNet.Wpf/test/BranchCommon/data/CommonData.csproj
index ed8277f8958..9a963ba3405 100644
--- a/src/Microsoft.DotNet.Wpf/test/BranchCommon/data/CommonData.csproj
+++ b/src/Microsoft.DotNet.Wpf/test/BranchCommon/data/CommonData.csproj
@@ -14,7 +14,7 @@
       <Link>DRT\%(Filename)%(Extension)</Link>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-  
+ 
   </ItemGroup>
 
 </Project>

From bd197d439be3c84aad56724ea34b35909ba64d36 Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Wed, 29 May 2019 11:11:57 -0700
Subject: [PATCH 17/72] updating dependencies

---
 eng/Version.Details.xml                       |  4 ++--
 eng/helix/helixpublish.proj                   |  4 ++--
 eng/pipeline.yml                              |  4 ----
 eng/pre-build.ps1                             |  7 -------
 global.json                                   |  2 +-
 .../DrtXaml.PartialTrustTests.csproj          | 19 -------------------
 6 files changed, 5 insertions(+), 35 deletions(-)
 delete mode 100644 eng/pre-build.ps1
 delete mode 100644 src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/PartialTrustTests/DrtXaml.PartialTrustTests.csproj

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 4fe84c9faec..7ea564be024 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -95,9 +95,9 @@
       <Uri>https://github.com/dotnet/coreclr</Uri>
       <Sha>89df4b9d928c7f21550d487328f5db000a498bdf</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19222.2">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19278.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>851e36df83d3361e4bd8a70a2a8a89f762469f9a</Sha>
+      <Sha>11f90a2a260422201895de58e57170131ab4efe7</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/helix/helixpublish.proj b/eng/helix/helixpublish.proj
index 9d4a8cdc9d1..59d6c21b45a 100644
--- a/eng/helix/helixpublish.proj
+++ b/eng/helix/helixpublish.proj
@@ -10,9 +10,9 @@
     </RestoreSources>
 
     <IncludeDotNetCli>true</IncludeDotNetCli>
-    <DotNetCliPackageType>sdk</DotNetCliPackageType>
+    <DotNetCliPackageType>runtime</DotNetCliPackageType>
     <!-- Set to match global.json.tools.dotnet by pre-build.ps1 -->
-    <DotNetCliVersion>$(DotNetCliVersion)</DotNetCliVersion>
+    <DotNetCliVersion>$(MicrosoftNetCoreAppVersion)</DotNetCliVersion>
     <DotNetCliRuntime>win-x86</DotNetCliRuntime>
     <DotNetCliRuntime Condition="'$(Platform)' == 'x64'">win-x64</DotNetCliRuntime>
 
diff --git a/eng/pipeline.yml b/eng/pipeline.yml
index 7ea3b6cdacc..286a1b2020d 100644
--- a/eng/pipeline.yml
+++ b/eng/pipeline.yml
@@ -120,10 +120,6 @@ jobs:
       - checkout: self
         clean: true
       
-      # Set VSO Variable(s)
-      - powershell: eng\pre-build.ps1
-        displayName: Pre-Build - Set VSO Variables
-
       # Use utility script to run script command dependent on agent OS.
       - script: eng\common\cibuild.cmd
           -configuration $(_BuildConfig) 
diff --git a/eng/pre-build.ps1 b/eng/pre-build.ps1
deleted file mode 100644
index baad60ccbd9..00000000000
--- a/eng/pre-build.ps1
+++ /dev/null
@@ -1,7 +0,0 @@
-# Open global.json
-$globaljsonpath = Join-Path $env:BUILD_SOURCESDIRECTORY 'global.json'
-$jsondata = Get-Content -Raw -Path $globaljsonpath | ConvertFrom-Json
-
-# Set DotNetCliVersion to global.json.tools.dotnet
-$dotnetcliver = $jsondata.tools.dotnet
-Write-Host "##vso[task.setvariable variable=DotNetCliVersion;]$dotnetcliver"
\ No newline at end of file
diff --git a/global.json b/global.json
index cdb96d0bd38..a03a8bcbcdc 100644
--- a/global.json
+++ b/global.json
@@ -13,7 +13,7 @@
   },
   "msbuild-sdks": {
     "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19304.23",
-    "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19222.2"
+    "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19278.1"
   },
   "native-tools": {
     "strawberry-perl": "5.28.1.1-1"
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/PartialTrustTests/DrtXaml.PartialTrustTests.csproj b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/PartialTrustTests/DrtXaml.PartialTrustTests.csproj
deleted file mode 100644
index 05472880300..00000000000
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/PartialTrustTests/DrtXaml.PartialTrustTests.csproj
+++ /dev/null
@@ -1,19 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
-    <PropertyGroup>
-    <AssemblyName>DrtXaml.PartialTrustTests</AssemblyName>
-    <OutputType>Library</OutputType>
-    <DefineConstants>$(DefineConstants);OLDRESOURCES</DefineConstants>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <AssemblyAttributeClsCompliant>false</AssemblyAttributeClsCompliant>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="NonPublicEvents.cs" />
-    <Compile Include="ObjectWriterNonPublic.cs" />
-    <!--<Compile Include="SystemXamlInternal.cs" />-->
-    <!-- Need our own local copy of this file, because DrtXaml is not APTCA -->
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\DrtXaml\DrtXaml.csproj"/>
-    <ProjectReference Include="..\XamlTestClasses\XamlTestClasses.csproj"/>
-  </ItemGroup>
-</Project>
\ No newline at end of file

From 4a5584f222f9c467ca34c5b31ab1f2c63943c6c5 Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Wed, 29 May 2019 14:02:28 -0700
Subject: [PATCH 18/72] adding all helix queues

---
 eng/helix/helixpublish.proj | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/eng/helix/helixpublish.proj b/eng/helix/helixpublish.proj
index 59d6c21b45a..3bf2ce66467 100644
--- a/eng/helix/helixpublish.proj
+++ b/eng/helix/helixpublish.proj
@@ -24,10 +24,7 @@
     <HelixPreCommands>$(HelixPreCommands);</HelixPreCommands>
 
     <!-- These are the list of Windows versions that we run tests on-->
-    <!--<HelixTargetQueues>Windows.10.Amd64.Open;Windows.7.Amd64.Open;Windows.10.Amd64.ServerRS5.Open</HelixTargetQueues>-->
-    <!-- Just cutting down the total queues while bootstrapping to speed things up-->
-    <HelixTargetQueues>Windows.10.Amd64.Open</HelixTargetQueues>
-
+    <HelixTargetQueues>Windows.10.Amd64.Open;Windows.7.Amd64.Open;Windows.10.Amd64.ServerRS5.Open</HelixTargetQueues>
   </PropertyGroup>
 
   <ItemGroup>

From affa6615f50f2ddd4e84360fb420471d60c8e4c0 Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Thu, 30 May 2019 11:12:37 -0700
Subject: [PATCH 19/72] running tests with build -test

this creates the payload as part of msbuild
---
 eng/AfterSolutionBuild.targets                |   3 +
 eng/WpfArcadeSdk/Sdk/Sdk.targets              |   1 +
 .../tools/CreateTestPayload.targets           |  39 ++
 eng/WpfArcadeSdk/tools/RunDrtsLocal.targets   |   5 +
 .../tools/configure-helix-machine.ps1         |  30 +
 eng/WpfArcadeSdk/tools/runtests.cmd           |   3 +
 eng/WpfArcadeSdk/tools/runtests.ps1           |  29 +
 eng/helix/helixpublish.proj                   |  52 +-
 eng/pipeline.yml                              |  23 -
 ...t.DotNet.Arcade.Wpf.Sdk.ArchNeutral.csproj |   2 +
 .../test/BranchCommon/data/DrtList.xml        | 548 ------------------
 11 files changed, 139 insertions(+), 596 deletions(-)
 create mode 100644 eng/AfterSolutionBuild.targets
 create mode 100644 eng/WpfArcadeSdk/tools/CreateTestPayload.targets
 create mode 100644 eng/WpfArcadeSdk/tools/RunDrtsLocal.targets
 create mode 100644 eng/WpfArcadeSdk/tools/configure-helix-machine.ps1
 create mode 100644 eng/WpfArcadeSdk/tools/runtests.cmd
 create mode 100644 eng/WpfArcadeSdk/tools/runtests.ps1

diff --git a/eng/AfterSolutionBuild.targets b/eng/AfterSolutionBuild.targets
new file mode 100644
index 00000000000..3b6300aec90
--- /dev/null
+++ b/eng/AfterSolutionBuild.targets
@@ -0,0 +1,3 @@
+<Project>
+    <Import Project="$(MSBuildThisFileDirectory)WpfArcadeSdk\tools\RunDrtsLocal.targets" Condition="'$(Test)'=='True'" />
+</Project>
\ No newline at end of file
diff --git a/eng/WpfArcadeSdk/Sdk/Sdk.targets b/eng/WpfArcadeSdk/Sdk/Sdk.targets
index 88a2a498f5d..d035888e2ac 100644
--- a/eng/WpfArcadeSdk/Sdk/Sdk.targets
+++ b/eng/WpfArcadeSdk/Sdk/Sdk.targets
@@ -22,6 +22,7 @@
   <Import Project="$(NoTargetsTargets)" Condition="'$(NoTargets)'=='true'"/>
   <Import Project="$(WpfArcadeSdkToolsDir)InjectModuleInitializer.targets" Condition="'$(InjectModuleInitializer)'=='true'"/>
   <Import Project="$(WpfArcadeSdkToolsDir)TestProjects.targets" />
+  <Import Project="$(WpfArcadeSdkToolsDir)CreateTestPayload.targets" Condition="'$(CreateTestPayload)'=='true'"/>
   
   <!-- PresentationBuildTasks related targets files -->
   <Import Project="$(WpfArcadeSdkToolsDir)Pbt.targets" Condition="'$(InternalMarkupCompilation)'=='true'"/>
diff --git a/eng/WpfArcadeSdk/tools/CreateTestPayload.targets b/eng/WpfArcadeSdk/tools/CreateTestPayload.targets
new file mode 100644
index 00000000000..b53e478dad4
--- /dev/null
+++ b/eng/WpfArcadeSdk/tools/CreateTestPayload.targets
@@ -0,0 +1,39 @@
+<Project>
+
+    <!-- We use a local RID here since we don't want to change the build layout by setting the actual RID. -->
+  <PropertyGroup>
+    <LocalRuntimeIdentifier Condition="'$(Platform)'=='x64' or '$(Platform)'=='x86' or '$(Platform)'=='arm' or '$(Platform)'=='arm64'">win-$(Platform)</LocalRuntimeIdentifier>
+    <LocalRuntimeIdentifier Condition="'$(Platform)'=='Win32' or '$(Platform)'=='AnyCPU'">win-x86</LocalRuntimeIdentifier>
+
+    <NoWarn>$(NoWarn);NU3027;NU3018</NoWarn>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="runtime.$(LocalRuntimeIdentifier).Microsoft.DotNet.Wpf.Test" Version="$(MicrosoftDotNetWpfTestPackageVersion)" GeneratePathProperty="true" />
+  </ItemGroup>
+
+  <PropertyGroup Condition="'$(LocalRuntimeIdentifier)'=='win-x86'">
+    <MicrosoftDotNetWpfTestPath>$(Pkgruntime_win-x86_Microsoft_DotNet_Wpf_Test)\tools\$(LocalRuntimeIdentifier)\Test\</MicrosoftDotNetWpfTestPath>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(LocalRuntimeIdentifier)'=='win-x64'">
+    <MicrosoftDotNetWpfTestPath>$(Pkgruntime_win-x64_Microsoft_DotNet_Wpf_Test)\tools\$(LocalRuntimeIdentifier)\Test\</MicrosoftDotNetWpfTestPath>
+  </PropertyGroup>
+
+  <Target Name="CreateTestPayload" BeforeTargets="Test">
+    <ItemGroup>
+      <MicrosoftDotNetWpfTestContents Include="$(MicrosoftDotNetWpfTestPath)\**\*.*" />
+      <OtherPayloadContents Include="$(WpfArcadeSdkToolsDir)runtests.cmd" />
+      <OtherPayloadContents Include="$(WpfArcadeSdkToolsDir)runtests.ps1" />
+      <OtherPayloadContents Include="$(WpfArcadeSdkToolsDir)configure-helix-machine.ps1" Condition="'$(ContinousIntegrationBuild)'=='True'" />
+    </ItemGroup>
+
+    <Copy SourceFiles="@(MicrosoftDotNetWpfTestContents)"
+          DestinationFiles="@(MicrosoftDotNetWpfTestContents->'$(WpfTestBasePublishPath)\%(RecursiveDir)%(Filename)%(Extension)')"  />
+
+    <Copy SourceFiles="@(OtherPayloadContents)"
+          DestinationFolder="$(PublishDir)"  />
+
+  </Target>
+
+</Project>
diff --git a/eng/WpfArcadeSdk/tools/RunDrtsLocal.targets b/eng/WpfArcadeSdk/tools/RunDrtsLocal.targets
new file mode 100644
index 00000000000..376c35bb846
--- /dev/null
+++ b/eng/WpfArcadeSdk/tools/RunDrtsLocal.targets
@@ -0,0 +1,5 @@
+<Project>
+  <Target Name="RunDrts" AfterTargets="Build" Condition="'$(ContinuousIntegrationBuild)'!='True'">
+    <Exec Command="$(RepoRoot)\artifacts\test\$(Configuration)\$(Platform)\runtests.cmd"/>
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/eng/WpfArcadeSdk/tools/configure-helix-machine.ps1 b/eng/WpfArcadeSdk/tools/configure-helix-machine.ps1
new file mode 100644
index 00000000000..4f20fb2866a
--- /dev/null
+++ b/eng/WpfArcadeSdk/tools/configure-helix-machine.ps1
@@ -0,0 +1,30 @@
+# This file prepares the helix machine for our tests runs
+$dotnetLocation = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "dotnet"
+
+# Set DOTNET_ROOT variables so the host can find it
+Set-Item -Path "env:DOTNET_ROOT(x86)" -Value $dotnetLocation
+Set-Item -Path "env:DOTNET_ROOT" -Value $dotnetLocation
+
+$runtimes = dotnet --list-runtimes
+foreach ($rt in $runtimes)
+{
+    if ($rt.StartsWith("Microsoft.WindowsDesktop.App"))
+    {
+        $version = $rt.Split(" ")[1]
+    }
+}
+
+# Rewrite the *.runtimeconfig.json files to match the version of the runtime on the machine
+$infraLocation = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "Test\Infra"
+$stiConfigFile = Join-Path $infraLocation "Sti.runtimeconfig.json"
+$qvConfigFile = Join-Path $infraLocation "QualityVaultFrontEnd.runtimeconfig.json"
+$configFiles = $stiConfigFile, $qvConfigFile
+foreach ($config in $configFiles)
+{
+    # Read current config file
+    $jsondata = Get-Content -Raw -Path $config | ConvertFrom-Json
+    # Update version
+    $jsondata.runtimeOptions.framework.version = $version
+    # Write data back
+    $jsondata | ConvertTo-Json -depth 100 | Set-Content $config
+}
\ No newline at end of file
diff --git a/eng/WpfArcadeSdk/tools/runtests.cmd b/eng/WpfArcadeSdk/tools/runtests.cmd
new file mode 100644
index 00000000000..c7b6190b9f2
--- /dev/null
+++ b/eng/WpfArcadeSdk/tools/runtests.cmd
@@ -0,0 +1,3 @@
+@echo off
+
+powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0runtests.ps1"""  %*"
\ No newline at end of file
diff --git a/eng/WpfArcadeSdk/tools/runtests.ps1 b/eng/WpfArcadeSdk/tools/runtests.ps1
new file mode 100644
index 00000000000..b3cda8665db
--- /dev/null
+++ b/eng/WpfArcadeSdk/tools/runtests.ps1
@@ -0,0 +1,29 @@
+[CmdLetBinding()]
+Param(
+    [string]$command
+)
+
+# Configure the machine before running tests
+if (Test-Path "$PSScriptRoot\configure-helix-machine.ps1")
+{
+    . "$PSScriptRoot\configure-helix-machine.ps1"
+}
+
+# Run the tests
+$testLocation = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "Test"
+if (Test-Path "$testLocation\rundrts.cmd")
+{
+    Invoke-Expression "$testLocation\rundrts.cmd $command"
+}
+
+# We can use $env:HELIX_PYTHONPATH $env:HELIX_SCRIPT_ROOT\upload_result.py to upload any QV specific logs and/or screenshots that we are interested in.
+# For example: $env:HELIX_PYTHONPATH $env:HELIX_SCRIPT_ROOT%\upload_result.py -result screenshot.jpg -result_name screenshot.jpg
+# Then, links to these artifacts can then be included in the xUnit logs.
+
+# Need to copy the xUnit log to a known location that helix can understand
+if (Test-Path "$env:AppData\QualityVault\Run\Report\testResults.xml")
+{
+    $resultLocation = $PSScriptRoot
+    Write-Output "Copying test results to $resultLocation"
+    Copy-Item "$env:AppData\QualityVault\Run\Report\testResults.xml" $resultLocation
+}
\ No newline at end of file
diff --git a/eng/helix/helixpublish.proj b/eng/helix/helixpublish.proj
index 3bf2ce66467..6869d5b7bbc 100644
--- a/eng/helix/helixpublish.proj
+++ b/eng/helix/helixpublish.proj
@@ -28,100 +28,102 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="runtime.win-$(Platform).Microsoft.DotNet.Wpf.Test" Version="$(MicrosoftDotNetWpfTestPackageVersion)" />
-    <HelixCorrelationPayload Include="..\..\HelixPayload\$(Configuration)\$(Platform)" /> 
+    <HelixCorrelationPayload Include="artifacts\test\$(Configuration)\$(Platform)" /> 
     <HelixWorkItem Include="Xaml">
       <Timeout>00:20:00</Timeout>
       <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Xaml</Command>
     </HelixWorkItem>
-   <!-- 
+   
+   <!--
+   Uncomment when bringing appropriate DRTs out into the open
+   
    <HelixWorkItem Include="Annotations">
       <Timeout>00:20:00</Timeout> 
-      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Annotations</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Annotations</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="AppModel">
       <Timeout>00:20:00</Timeout>
-      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=AppModel</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=AppModel</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="DigitalDocuments">
       <Timeout>00:20:00</Timeout>
-      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=DigitalDocuments</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=DigitalDocuments</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Media">
       <Timeout>00:20:00</Timeout>
-      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Media</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Media</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Editing">
       <Timeout>00:20:00</Timeout>
-      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Editing</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Editing</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="ElementServices">
       <Timeout>00:20:00</Timeout>
-      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=ElementServices</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=ElementServices</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Text">
       <Timeout>00:20:00</Timeout>
-      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Text</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Text</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Animation">
       <Timeout>00:20:00</Timeout>
-      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Animation</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Animation</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="3D">
       <Timeout>00:20:00</Timeout>
-      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=3D</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=3D</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="2D">
       <Timeout>00:20:00</Timeout>
-      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=2D</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=2D</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Controls">
       <Timeout>00:20:00</Timeout>
-      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Controls</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Controls</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Imaging">
       <Timeout>00:20:00</Timeout>
-      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Imaging</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Imaging</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="FlowLayout">
       <Timeout>00:20:00</Timeout>
-      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=FlowLayout</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=FlowLayout</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="DataServices">
       <Timeout>00:20:00</Timeout>
-      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=DataServices</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=DataServices</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="ElementLayout">
       <Timeout>00:20:00</Timeout>
-      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=ElementLayout</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=ElementLayout</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Xaml">
       <Timeout>00:20:00</Timeout>
-      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Xaml</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Xaml</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Globalization">
       <Timeout>00:20:00</Timeout>
-      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Globalization</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Globalization</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Tablet">
       <Timeout>00:20:00</Timeout>
-      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Tablet</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Tablet</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Integration">
       <Timeout>00:20:00</Timeout>
-      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Integration</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Integration</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="XET">
       <Timeout>00:20:00</Timeout>
-      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=XET</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=XET</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Printing">
       <Timeout>00:20:00</Timeout>
-      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Printing</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Printing</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="WindowsFormsIntegration">
       <Timeout>00:20:00</Timeout>
-      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=WindowsFormsIntegration</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=WindowsFormsIntegration</Command>
     </HelixWorkItem>
     -->
   </ItemGroup>
diff --git a/eng/pipeline.yml b/eng/pipeline.yml
index 286a1b2020d..a7cfb192b5f 100644
--- a/eng/pipeline.yml
+++ b/eng/pipeline.yml
@@ -130,29 +130,6 @@ jobs:
           $(_PlatformArgs)
         displayName: Windows Build / Publish
 
-      - powershell: eng\common\build.ps1
-          -restore
-          -configuration $(_BuildConfig) 
-          $(_OfficialBuildIdArgs)
-          $(_PlatformArgs)
-          -projects $(Build.SourcesDirectory)\eng\helix\helixpublish.proj
-        displayName: Restoring Nuget Dependencies for Helix
-        env:
-          SYSTEM_ACCESSTOKEN: $(System.AccessToken)
-          HelixSource: $(_HelixSource)
-          HelixType: 'tests/drt'
-          HelixBuild: $(Build.BuildNumber)
-          HelixTargetQueues: $(_TestHelixAgentPool)
-          HelixAccessToken: $(_HelixToken)              # only defined for internal CI
-          Creator: $(_HelixCreator)
-        condition: and(succeeded(), eq(variables['_BuildConfig'], 'Release')) # on helix machine (with real signing)
-
-      # Prepare the helix payload
-      - powershell: eng\helix\prepare-helix-payload.ps1
-         -configuration $(_BuildConfig) -platform $(_Platform)
-        displayName: Preparing Helix Payload
-        condition: and(succeeded(), eq(variables['_BuildConfig'], 'Release')) # on helix machine (with real signing)
-
       # Run DRTs
       - powershell: eng\common\cibuild.cmd
           -configuration $(_BuildConfig)
diff --git a/packaging/Microsoft.DotNet.Arcade.Wpf.Sdk/Microsoft.DotNet.Arcade.Wpf.Sdk.ArchNeutral.csproj b/packaging/Microsoft.DotNet.Arcade.Wpf.Sdk/Microsoft.DotNet.Arcade.Wpf.Sdk.ArchNeutral.csproj
index cce7486b2a3..9a6c924a2f5 100644
--- a/packaging/Microsoft.DotNet.Arcade.Wpf.Sdk/Microsoft.DotNet.Arcade.Wpf.Sdk.ArchNeutral.csproj
+++ b/packaging/Microsoft.DotNet.Arcade.Wpf.Sdk/Microsoft.DotNet.Arcade.Wpf.Sdk.ArchNeutral.csproj
@@ -3,6 +3,8 @@
     <ProjectGuid>{B73BB4AB-68DE-4B91-BBB0-AB4F2D504AC3}</ProjectGuid>
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <Platforms>AnyCPU;x64</Platforms>
+    <!-- We ignore this warning because we want to pack powershell scripts that won't be executed as part of installing this package. -->
+    <NoWarn>NU5111</NoWarn>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/src/Microsoft.DotNet.Wpf/test/BranchCommon/data/DrtList.xml b/src/Microsoft.DotNet.Wpf/test/BranchCommon/data/DrtList.xml
index e28c5f4a76b..a3178d03618 100644
--- a/src/Microsoft.DotNet.Wpf/test/BranchCommon/data/DrtList.xml
+++ b/src/Microsoft.DotNet.Wpf/test/BranchCommon/data/DrtList.xml
@@ -26,514 +26,6 @@ Rundrtlist
     - DRT is offline
 -->
 <Drts>
-  <Drt Executable="DrtAnnotations.exe" Architecture="x86|amd64" OS="all" Team="Annotations" />
-  <Drt Executable="DrtAppModelSuites.exe" Architecture="all" OS="all" Team="AppModel" >
-    <SupportFiles>
-      <SupportFile>newloadersuitehelperproject.exe</SupportFile>
-      <SupportFile>newloadersuitehelperproject1\newloadersuitehelperproject.exe</SupportFile>
-      <SupportFile>DrtFiles\loader_tulip.jpg</SupportFile>
-      <SupportFile>DrtFiles\PageA.xaml</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <!--<Drt Executable="DrtNativeEntryPoint.exe" Architecture="all" OS="all" Team="AppModel" >
-    <SupportFiles>
-      <SupportFile>LoaderTest.dll</SupportFile>
-      <SupportFile>DrtThirdPartyThemes.exe</SupportFile>
-    </SupportFiles>
-  </Drt>-->
-  <Drt Executable="DrtDocumentViewerSuite.exe" Architecture="all" OS="all" Team="DigitalDocuments" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\DocumentViewerSuite\Commanding</SupportFile>
-      <SupportFile>DrtFiles\DocumentViewerSuite\Stress</SupportFile>
-      <SupportFile>DrtFiles\DocumentViewerSuite\Styling</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtDigitalSignature.cmd" Architecture="all" OS="all" Team="DigitalDocuments" >
-    <SupportFiles>
-      <SupportFile>DrtDigitalSignature.exe</SupportFile>
-      <SupportFile>DrtFiles\digitalsignature</SupportFile>
-      <SupportFile>DelCertNoUI.exe</SupportFile>
-      <SupportFile>MakeCert.exe</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtPackScheme.exe" Architecture="all" OS="all" Team="DigitalDocuments" />
-  <Drt Executable="DrtMediaAPI.exe" Architecture="all" OS="all" Team="Media" />
-  <Drt Executable="DrtEditing.exe" Architecture="x86|amd64" OS="all" Team="Editing" >
-    <SupportFiles>
-      <SupportFile>DrtEditing.*</SupportFile>
-      <SupportFile>DrtFiles\Editing\CustomDict2.lex</SupportFile>
-      <SupportFile>DrtFiles\Editing\cut.png</SupportFile>
-      <SupportFile>DrtFiles\Editing\rtfsimple.rtf</SupportFile>
-      <SupportFile>DrtFiles\Editing\rtfsimple_expect.rtf.xaml</SupportFile>
-      <SupportFile>DrtFiles\Editing\rtfsimple_expect.rtf.xaml.rtf</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DRTPropertyEngine.exe" Architecture="all" OS="all" Team="ElementServices" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\PropertyEngine\TestInheritanceContext.xaml</SupportFile>
-      <SupportFile>DrtFiles\PropertyEngine\TestValueSource.xaml</SupportFile>
-      <SupportFile>DrtFiles\PropertyEngine\TestVisualTransforms.xaml</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtWindow.exe" Architecture="all" OS="all" Team="AppModel" >
-    <SupportFiles>
-      <SupportFile>DrtWindowSecure.cmd</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtWindowDragMove.exe" Architecture="all" OS="all" Team="AppModel" />
-  <Drt Executable="DrtWindowScroll.exe" Architecture="all" OS="all" Team="AppModel" />
-  <Drt Executable="DrtWindowAutoSize.exe" Architecture="all" OS="all" Team="AppModel" />-->
-  <Drt Executable="DrtDialog.exe" Architecture="all" OS="all" Team="AppModel" />
-  <Drt Executable="DrtIcon.exe" Architecture="all" OS="all" Team="AppModel">
-    <SupportFiles>
-      <SupportFile>DrtFiles\Icon</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtWindowMinMaxContentSize.exe" Architecture="all" OS="all" Team="AppModel" >
-    <SupportFiles>
-      <SupportFile>DrtWindowMinMaxContentSizeSecure.cmd</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtText.exe" Architecture="x86|amd64" OS="all" Team="Text" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\Text</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtApplicationEvents.cmd" Architecture="all" OS="all" Team="AppModel" >
-    <SupportFiles>
-      <SupportFile>DrtApplicationEvents.exe</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtAppThreadingModel.exe" Architecture="all" OS="all" Team="AppModel" />
-  <Drt Executable="DrtStartupUriXamlNavigationWindow.exe" Architecture="all" OS="all" Team="AppModel" />
-  <Drt Executable="DrtWindowFunctionality.exe" Architecture="all" OS="all" Team="AppModel" />
-  <Drt Executable="DrtWindowHeightWidthTopLeft.exe" Architecture="all" OS="all" Team="AppModel" />
-  <Drt Executable="DrtWindowResizeGripFlowDirection.exe" Architecture="x86|amd64" OS="all" Team="AppModel" />
-  <Drt Executable="DrtPage.exe" Architecture="x86|amd64" OS="all" Team="AppModel" />
-  <Drt Executable="DrtWindowAutoLocation.exe" Architecture="all" OS="all" Team="AppModel" />
-  <Drt Executable="DrtDRXSerialization.exe" Architecture="all" OS="all" Team="DigitalDocuments" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\DRXSerialization\DocumentViewerDefault.xaml</SupportFile>
-      <SupportFile>DrtFiles\DRXSerialization\DocumentViewerDefaultInput.xaml</SupportFile>
-      <SupportFile>DrtFiles\DRXSerialization\DocumentViewerNonDefault.xaml</SupportFile>
-      <SupportFile>DrtFiles\DRXSerialization\DocumentViewerNonDefaultInput.xaml</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtAnimation.exe" Architecture="all" OS="all" Team="Animation" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\DrtAnimation\DRTEasing.xaml</SupportFile>
-      <SupportFile>DrtFiles\DrtAnimation\DRTMarkupAnimation.xaml</SupportFile>
-      <SupportFile>DrtFiles\DrtAnimation\angels.jpg</SupportFile>
-      <SupportFile>DrtAnimationRDP.cmd</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtTiming.exe" Architecture="all" OS="all" Team="Animation" />
-  <Drt Executable="DrtBasic3D.exe" Architecture="x86|amd64" OS="all" Team="3D" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\DrtBasic3D\ambient.png</SupportFile>
-      <SupportFile>DrtFiles\DrtBasic3D\combined.png</SupportFile>
-      <SupportFile>DrtFiles\DrtBasic3D\diffuse.png</SupportFile>
-      <SupportFile>DrtFiles\DrtBasic3D\emissive.png</SupportFile>
-      <SupportFile>DrtFiles\DrtBasic3D\specular.png</SupportFile>
-      <SupportFile>DrtFiles\DrtBasic3D\msnbackground.bmp</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtElement3D.exe" Architecture="x86|amd64" OS="all" Team="3D" />
-  <Drt Executable="DrtMil2D.exe" Architecture="all" OS="all" Team="2D" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\DrtMil2D\cut.png</SupportFile>
-      <SupportFile>DrtFiles\DrtMil2D\tulip.jpg</SupportFile>
-      <SupportFile>DrtFiles\DrtMil2D\tulip48dpi.jpg</SupportFile>
-      <SupportFile>DrtFiles\DrtMil2D\tulip96x192dpi.png</SupportFile>
-      <SupportFile>DrtFiles\DrtMil2D\tile_checkered.PNG</SupportFile>
-      <SupportFile>DrtFiles\DrtMil2D\tiny_checkered.PNG</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtInput.exe" Architecture="all" OS="all" Team="ElementServices" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\Input\DrtInput.xml</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtUIContext.exe" Architecture="x86|amd64" OS="all" Team="ElementServices" />
-  <Drt Executable="DrtHwndSource.exe" Architecture="all" OS="all" Team="ElementServices" />
-  <Drt Executable="DrtControls.exe" Architecture="x86|amd64" OS="all" Team="Controls" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\Controls</SupportFile>
-      <SupportFile>DrtThemeDictionaryExtension.*</SupportFile>
-      <SupportFile>DrtThirdPartyThemes.dll</SupportFile>
-      <SupportFile>DrtThirdPartyThemes.pdb</SupportFile>
-      <SupportFile>ListView2App.*</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtMultiTouch.exe" Architecture="all" OS="all" Team="ElementServices" />
-  <Drt Executable="DrtImaging.exe" Architecture="x86|amd64" OS="all" Team="Imaging" >
-    <SupportFiles>
-      <SupportFile>DrtImagingD3D.dll</SupportFile>
-      <SupportFile>DrtFiles\DrtImaging</SupportFile>
-    </SupportFiles>
-  </Drt>
-<!-- disabling amd64 until bug 1845378 is fixed --><!--
-  --><!--<Drt Executable="DrtUImaging" Architecture="x86" OS="all" Team="Imaging" />
-  <Drt Executable="DrtUMetadata.exe" Architecture="x86|amd64" OS="all" Team="Imaging" />-->
-  <Drt Executable="DrtPageFunction.exe" Architecture="all" OS="all" Team="AppModel" />
-  <Drt Executable="DrtNavigationApplication.exe" Architecture="all" OS="all" Team="AppModel" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\NavigationApplication\NavAppBar.xaml</SupportFile>
-      <SupportFile>DrtFiles\NavigationApplication\NavAppFoo.xaml</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtNavigationEvents.exe" Architecture="all" OS="all" Team="AppModel" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\NavigationEvents</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtNavigationWindow.exe" Architecture="x86|amd64" OS="all" Team="AppModel" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\NavigationWindow\NavWindowBar.xaml</SupportFile>
-      <SupportFile>DrtFiles\NavigationWindow\NavWindowFoo.xaml</SupportFile>
-      <SupportFile>DrtFiles\NavigationWindow\NavWindowBar2.xaml</SupportFile>
-      <SupportFile>DrtFiles\NavigationWindow\NavWindowFoo2.xaml</SupportFile>
-    </SupportFiles>6
-  </Drt>
-  <Drt Executable="DrtNavMemPerf.exe" Architecture="x86|amd64" OS="all" Team="AppModel" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\navmemperf</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtReparentNavigator.exe" Architecture="x86|amd64" OS="all" Team="AppModel" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\ReparentNavigator\ReparentFrame.xaml</SupportFile>
-      <SupportFile>DrtFiles\ReparentNavigator\ReparentPage1.xaml</SupportFile>
-      <SupportFile>DrtFiles\ReparentNavigator\ReparentPage2.xaml</SupportFile>
-      <SupportFile>DrtFiles\ReparentNavigator\ReparentPage3.xaml</SupportFile>
-      <SupportFile>DrtFiles\ReparentNavigator\ReparentStart.xaml</SupportFile>
-      <SupportFile>DrtReparentNavigatorSecure.cmd</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtHyperlinkTargeting.exe" Architecture="x86|amd64" OS="all" Team="AppModel" />
-  <Drt Executable="DrtFrameJournaling.exe" Architecture="x86|amd64" OS="all" Team="AppModel" />
-  <Drt Executable="DrtJournal.exe" Architecture="x86|amd64" OS="all" Team="AppModel" />
-  <Drt Executable="DrtJournalMode.exe" Architecture="all" OS="all" Team="AppModel" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\JournalMode\DrtJournalModeDefault.xaml</SupportFile>
-      <SupportFile>DrtJournalModeSecure.cmd</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtXamlContainer.exe" Architecture="x86|amd64" OS="all" Team="AppModel" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\XamlContainer\NavByElement.xaml</SupportFile>
-      <SupportFile>DrtFiles\XamlContainer\NavByUri.xaml</SupportFile>
-      <SupportFile>DrtFiles\XamlContainer\SetContent.xaml</SupportFile>
-      <SupportFile>DrtFiles\XamlContainer\SetUri.xaml</SupportFile>
-      <SupportFile>DrtFiles\XamlContainer\DrtXamlContainer.Permissions</SupportFile>
-      <SupportFile>DrtXamlContainerSecure.cmd</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtNavigationToObject.exe" Architecture="x86|amd64" OS="all" Team="AppModel" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\NavigationToObject\FlowDocument.xaml</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtNavError.exe" Architecture="all" OS="all" Team="AppModel" />
-  <Drt Executable="DrtChangeable.exe" Architecture="all" OS="all" Team="2D" />
-  <Drt Executable="DrtVisualTarget.exe" Architecture="all" OS="all" Team="2D" />
-  <Drt Executable="DrtFlowLayout.exe" Architecture="x86|amd64" OS="all" Team="FlowLayout" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\FlowLayout</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="AvaCop.exe" Architecture="x86|amd64" OS="all" Team="DataServices" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\AvaCop</SupportFile>
-      <SupportFile>DrtFiles\DocumentViewerSuite\Commanding</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtDataSrv.exe" Architecture="x86|amd64" OS="all" Team="DataServices" Timeout="360">
-    <SupportFiles>
-      <SupportFile>DrtFiles\DataSrv</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtDataSrvMSB.exe" Architecture="all" OS="all" Team="DataServices" >
-    <SupportFiles>
-      <SupportFile>en-us\DrtDataSrvMSB.*</SupportFile>
-      <SupportFile>DrtFiles\DataSrvMSB\Content.JPG</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtLayout.exe" Architecture="x86|amd64" OS="all" Team="ElementLayout" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\Layout</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtTextFind.exe" Architecture="x86|amd64" OS="all" Team="ElementLayout" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\TextFind</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DRTInputMethod.exe" Architecture="all" OS="all" Team="Editing" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\DrtInputMethod</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DRTTextComposition.cmd" Architecture="x86|amd64" OS="all" Team="Editing" >
-    <SupportFiles>
-      <SupportFile>DRTTextComposition.exe</SupportFile>
-    </SupportFiles>
-  </Drt>
-<!-- 
-  <Drt Executable="Drtparser.exe" Architecture="all" OS="all" Team="Xaml" >
-    <SupportFiles>
-      <SupportFile>testclasses.dll</SupportFile>
-      <SupportFile>DrtFiles\Parser</SupportFile>
-    </SupportFiles>
-  </Drt>
--->
-<!--Drt Executable="Drtserializer.exe" Architecture="x86|amd64" OS="all" Team="ElementServices" /-->
-  <Drt Executable="DrtMarkupSerializer.exe" Architecture="x86|amd64" OS="all" Team="ElementServices" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\MarkupSerializer</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtEvents.exe" Architecture="all" OS="all" Team="ElementServices" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\Events\DRTEvents_1.xaml</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtCommanding.exe" Architecture="all" OS="all" Team="ElementServices" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\Commanding</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtLocalization.exe" Architecture="all" OS="all" Team="Globalization" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\Localization</SupportFile>
-      <SupportFile>DrtFiles\Baml</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtPackagingApis.exe" Architecture="all" OS="all" Team="DigitalDocuments" />
-  <Drt Executable="DRTStoryboards.exe" Architecture="x86|amd64" OS="all" Team="Animation" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\DRTStoryboards\DRTStoryboards.xaml</SupportFile>
-      <SupportFile>DrtFiles\DRTStoryboards\ding.wav</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtInk.exe" Architecture="all" OS="all" Team="Tablet" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\Ink</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DRTColorAPI.exe" Architecture="all" OS="all" Team="Imaging" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\DrtColorAPI</SupportFile>
-    </SupportFiles>
-  </Drt>
-
-  <!--
-  <Drt Executable="drtbaml.exe" Architecture="all" OS="all" Team="Xaml" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\Baml</SupportFile>
-      <SupportFile>DrtFiles\Parser</SupportFile>
-      <SupportFile>testclasses.dll</SupportFile>
-      <SupportFile>drtparser.exe</SupportFile>
-    </SupportFiles>
-  </Drt>
-  -->
-
-  <Drt Executable="DrtStickyNoteControl.exe" Architecture="x86|amd64" OS="all" Team="Annotations" />
-  <Drt Executable="DrtInkCanvas.exe" Architecture="all" OS="all" Team="Tablet" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\InkCanvas</SupportFile>
-      <SupportFile>RunInkCanvasSpeedTests.cmd</SupportFile>
-      <SupportFile>RunInkCanvasAllocationTests.cmd</SupportFile>
-    </SupportFiles>
-  </Drt><!--
-
-  --><!-- Reenabled  9/2/09.  Contact mattgal for any crashes --><!--
-  <Drt Executable="DrtHosting.exe" Architecture="x86|amd64" OS="all" Team="AppModel" Args="-verbose" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\BrowserHosting</SupportFile>
-      <SupportFile>BrowserHostedDeployApp.*</SupportFile>
-      <SupportFile>BrowserHostedDeployApp35.*</SupportFile>
-    </SupportFiles>
-  </Drt>
-
-  --><!-- Disabled 1/07, failing consistently on Cinch --><!--
-  --><!--Drt Executable="DrtDrxAutomationLocal.cmd" Architecture="x86|amd64" OS="all" Team="DigitalDocuments" >
-    <SupportFiles>
-      <SupportFile>DrtDrxAutomation.exe</SupportFile>
-      <SupportFile>MakeCert.exe</SupportFile>
-    </SupportFiles>
-  </Drt--><!--
-  --><!-- Broken (again) by ClickOnce, different issues. Tracking work item on our side Dev10.521850.
-  <Drt Executable="DrtStandAloneApp.exe" Architecture="x86|amd64" OS="all" Team="AppModel" >
-    <SupportFiles>
-      <SupportFile>StandAloneDeployApp.*</SupportFile>
-    </SupportFiles>
-  </Drt>
-  -->
-  <Drt Executable="DrtPageContent.exe" Architecture="all" OS="all" Team="DigitalDocuments" >
-    <SupportFiles>
-      <SupportFile>FixedDocViewer.dll</SupportFile>
-      <SupportFile>DrtFiles\Payloads</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtFixedPanel.exe" Architecture="all" OS="all" Team="DigitalDocuments" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\Layout</SupportFile>
-      <SupportFile>DrtFiles\Payloads</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtFixedEdit.exe" Architecture="all" OS="all" Team="DigitalDocuments" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\FixedEdit</SupportFile>
-      <SupportFile>DrtFiles\Payloads</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtSequence.exe" Architecture="all" OS="all" Team="DigitalDocuments" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\Payloads</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtMetroTest.cmd" Architecture="x86|amd64" OS="all" Team="DigitalDocuments" >
-    <SupportFiles>
-      <SupportFile>DrtNGCTest.exe</SupportFile>
-      <SupportFile>DrtFiles\Payloads</SupportFile>
-      <SupportFile>DrtFiles\NGCTest\constitution.xaml</SupportFile>
-      <SupportFile>DrtAddDocStructure.exe</SupportFile>
-      <SupportFile>DrtFixedTest.exe</SupportFile>
-    </SupportFiles>
-  </Drt>
-
-  <!--<Drt Executable="DrtSeeScenario1.cmd" Architecture="all" OS="all" Team="PartialTrust">
-    <SupportFiles>
-      <SupportFile>Secure.exe</SupportFile>
-      <SupportFile>DrtSeeScenario1.exe</SupportFile>
-    </SupportFiles>
-  </Drt>
-
-  <Drt Executable="DrtSeeScenario6.cmd" Architecture="all" OS="all" Team="PartialTrust">
-    <SupportFiles>
-      <SupportFile>Secure.exe</SupportFile>
-      <SupportFile>drtpermissiontest.cmd</SupportFile>
-      <SupportFile>DrtFiles\Permissions</SupportFile>
-      <SupportFile>DrtPermissionTest.exe</SupportFile>
-      <SupportFile>DrtSeeScenario6.exe</SupportFile>
-    </SupportFiles>
-  </Drt>
-
-  --><!--Drt Executable="DrtAutomation.exe" Architecture="all" OS="all" Team="UIAutomation" /
-  <Drt Executable="DrtPrinterDriverMarkup.exe" Architecture="all" OS="all" Team="DigitalDocuments" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\PrinterDriverMarkup\</SupportFile>
-    </SupportFiles>
-  </Drt>-->
-  <!--  Leaving this one disabled for now... Mattgal 9-2-09
-  <Drt Executable="drtseescenario7.cmd" Architecture="all" OS="all" Team="PartialTrust" >
-    <SupportFiles>
-      <SupportFile>drtseescenario7.exe</SupportFile>
-      <SupportFile>Secure.exe</SupportFile>
-    </SupportFiles>
-  </Drt>
-  --><!--
-
-  <Drt Executable="DrtSeeExpressApp.exe" Architecture="x86|amd64" OS="all" Team="PartialTrust" >
-    <SupportFiles>
-      <SupportFile>TestSeeExpressApp*</SupportFile>
-      <SupportFile>DrtFiles\ExpressApp\Intro2Loose.jpg</SupportFile>
-    </SupportFiles>
-  </Drt>
-
-  <Drt Executable="DrtBrowserHostedMediaApp.exe" Architecture="x86" OS="all" Team="PartialTrust" >
-    <SupportFiles>
-      <SupportFile>DrtTools.dll</SupportFile>
-      <SupportFile>BrowserHostedMediaApp.*</SupportFile>
-      <SupportFile>DrtFiles\BrowserHostedMediaApp</SupportFile>
-    </SupportFiles>
-  </Drt>-->
-
-  <Drt Executable="DrtContainer.exe" Architecture="all" OS="all" Team="ElementServices" />
-  <Drt Executable="DrtCompressionXform.exe" Architecture="all" OS="all" Team="DigitalDocuments" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\compressionXform</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtPackageCompression.exe" Architecture="all" OS="all" Team="DigitalDocuments" />
-  <Drt Executable="DrtEncryptedPackageCoreProperties.exe" Architecture="all" OS="all" Team="DigitalDocuments" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\EncryptedPackageCoreProperties</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtZipIO.exe" Architecture="all" OS="all" Team="DigitalDocuments" />
-  <Drt Executable="DrtPackageCoreProperties.exe" Architecture="all" OS="all" Team="DigitalDocuments" />
-
-  <Drt Executable="DrtIndexing.exe" Architecture="all" OS="all" Team="DigitalDocuments">
-    <SupportFiles>
-      <SupportFile>BuildContainer.exe</SupportFile>
-      <SupportFile>IndexingFilterTool.exe</SupportFile>
-      <SupportFile>CompareChunkLists.exe</SupportFile>
-      <SupportFile>EncryptedPackageBuilder.exe</SupportFile>
-      <SupportFile>DrtFiles\Indexing</SupportFile>
-    </SupportFiles>
-  </Drt>
-
-     <!-- 12/29/06 - not enabled in Orcas yet. --><!--
-  --><!--<Drt Executable="DrtIndexingElementDictionary.exe" Architecture="all" OS="all" Team="DigitalDocuments" >
-    <SupportFiles>
-      <SupportFile>IndexingFilterTool</SupportFile>
-    </SupportFiles>
-  </Drt>-->
-  <Drt Executable="DrtInterleavedPackage.exe" Architecture="all" OS="all" Team="DigitalDocuments" />
-  <Drt Executable="DrtAppWindowList.exe" Architecture="all" OS="all" Team="AppModel" />
-  <Drt Executable="DrtAppShutdown.exe" Architecture="all" OS="all" Team="AppModel" />
-  <Drt Executable="DrtFlowLayoutExt.exe" Architecture="x86|amd64" OS="all" Team="FlowLayout" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\FlowLayoutExt</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtSelection.exe" Architecture="x86|amd64" OS="all" Team="FlowLayout" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\Selection</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtFlow.exe" Architecture="x86|amd64" OS="all" Team="FlowLayout" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\Flow</SupportFile>
-    </SupportFiles>
-  </Drt>
-<!--<Drt Executable="RunMILTest.cmd" Architecture="x86" OS="all" Team="2D" Args=" > RunMILTest.log">
-    <SupportFiles>
-      <SupportFile>RunMILTest.exe</SupportFile>
-    </SupportFiles>
-  </Drt>-->
-  <Drt Executable="DrtMedia.exe" Architecture="all" OS="all" Team="Media" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\DrtMedia\DrtMedia.xaml</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <!--
-  <Drt Executable="DrtEffects.exe" Architecture="x86|amd64" OS="all" Team="Effects" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\DrtEffects</SupportFile>
-    </SupportFiles>
-  </Drt>
--->
-  <Drt Executable="WarmupOpt.cmd" Architecture="x86|amd64" OS="all" Team="Integration" >
-    <SupportFiles>
-      <SupportFile>WarmupOpt.exe</SupportFile>
-      <SupportFile>DrtFiles\WarmupOpt</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="MSNBamlOpt.exe" Architecture="x86|amd64" OS="all" Team="Integration" >
-    <SupportFiles>
-      <SupportFile>MSNBamlOpt*</SupportFile>
-      <SupportFile>en-us\MSNBamlOpt.resources.dll</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="SprinkleOpt.exe" Architecture="x86|amd64" OS="all" Team="Integration" />
-  <Drt Executable="HBROpt.exe" Architecture="x86|amd64" OS="all" Team="Integration" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\HBROpt</SupportFile>
-    </SupportFiles>
-  </Drt>
   <Drt Executable="DrtXaml.exe" Architecture="x86|amd64" OS="all" Team="Xaml" >
     <SupportFiles>
       <SupportFile>XamlTestClasses.dll</SupportFile>
@@ -543,44 +35,4 @@ Rundrtlist
       <SupportFile>XamlTestClasses.FriendWithoutKey.dll</SupportFile>
     </SupportFiles>
   </Drt>
-  <Drt Executable="DrtXpsApi.cmd" Architecture="all" OS="all" Team="DigitalDocuments" >
-    <SupportFiles>
-      <SupportFile>DrtXpsApi.exe</SupportFile>
-      <SupportFile>DrtFiles\XpsApi</SupportFile>
-      <SupportFile>DelCertNoUI.exe</SupportFile>
-      <SupportFile>MakeCert.exe</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtVisualSerialization.exe" Architecture="all" OS="all" Team="DigitalDocuments" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\VisualSerialization\testCMYK1.icc</SupportFile>
-      <SupportFile>DrtFiles\drtimaging\avalon.png</SupportFile>
-      <SupportFile>DrtFiles\drtimaging\tulip.jpg</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtNgcTest.exe" Architecture="all" OS="all" Team="DigitalDocuments" />
-  <Drt Executable="DrtVisualTreeChange.exe" Architecture="all" OS="all" Team="XET" />
-  <Drt Executable="DrtXamlSourceInfo.exe" Architecture="all" OS="all" Team="XET">
-    <SupportFiles>
-      <SupportFile>DrtFiles\XamlSourceInfoTest.Debug.dll</SupportFile>
-      <SupportFile>DrtFiles\XamlSourceInfoTest.Release.dll</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtPrinting.exe" Architecture="all" OS="all" Team="Printing" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\Printing</SupportFile>
-    </SupportFiles>
-  </Drt>
-
-  <!--
-  <Drt Executable="DrtReachSerialization.exe" Architecture="all" OS="all" Team="DigitalDocuments" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\DrtReachSerialization</SupportFile>
-    </SupportFiles>
-  </Drt>
-  --><!--
-
-  --><!-- DrtMediaBasic doesn't run on Vista - bug #1588743 --><!--
-  --><!--<Drt Executable="DrtMediaBasic.exe" Architecture="all" OS="xp" Team="Media" />-->
-  <Drt Executable="DrtWindowsFormsIntegration.exe" Architecture="all" OS="all" Team="WindowsFormsIntegration" />
 </Drts>

From 43e467c6b7327737dd3710e1679deca92d1f56a5 Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Fri, 31 May 2019 11:23:33 -0700
Subject: [PATCH 20/72] fixing DrtXaml

This is very close, we are just missing native wpf assemblies from being added to the deps.json
---
 .../tools/CreateTestPayload.targets           |    6 +-
 eng/WpfArcadeSdk/tools/DRT.Build.props        |    7 -
 .../tools/GenerateProgramFileForTests.targets |    2 +-
 eng/WpfArcadeSdk/tools/Publish.props          |   12 -
 .../tools/PublishAfterBuild.targets           |    7 -
 eng/WpfArcadeSdk/tools/SourceLocations.props  | 1072 -----------------
 eng/WpfArcadeSdk/tools/StrongName.props       |   17 -
 eng/WpfArcadeSdk/tools/StrongName.targets     |   12 -
 eng/WpfArcadeSdk/tools/TestProjects.targets   |   26 +-
 eng/helix/configure-helix-machine.ps1         |   30 -
 eng/helix/prepare-helix-payload.ps1           |   49 -
 eng/helix/runtests.cmd                        |    3 -
 eng/helix/runtests.ps1                        |   26 -
 eng/{helix => }/helixpublish.proj             |   10 +-
 eng/pipeline.yml                              |    4 +-
 .../test/BranchCommon/data/CommonData.csproj  |   20 -
 .../BranchCommon/data/Directory.Build.props   |    3 -
 .../test/Common/DRT/TestServices/DrtBase.cs   |   34 +-
 .../DRT/TestServices/TestServices.csproj      |   14 +-
 .../BamlAvoidXmlTest/BamlAvoidXmlTest.csproj  |   30 -
 .../BamlTestClasses40.csproj                  |    2 -
 .../test/DRT/DrtXaml/Directory.Build.props    |    1 -
 .../test/DRT/DrtXaml/DrtXaml/DrtXaml.csproj   |   10 +-
 .../test/DRT/DrtXaml/DrtXaml/DrtXamlBase.cs   |    8 +-
 .../DRT/DrtXaml/DrtXaml/Tests/SchemaTests.cs  |    2 -
 .../DrtXaml/XamlTestFrameWork/Assert.cs       |  246 ++--
 .../XamlTestClasses.FriendWithKey.csproj      |   11 -
 .../XamlTestClasses.FriendWithoutKey.csproj   |   12 -
 .../XamlTestClasses.FriendWithKey.csproj      |    1 +
 .../XamlTestClasses.FriendWithoutKey.csproj   |    1 +
 .../XamlTestClasses/XamlTestClasses.csproj    |    1 -
 .../test/Directory.Build.props                |   59 +-
 .../test/Directory.Build.targets              |    3 +-
 33 files changed, 223 insertions(+), 1518 deletions(-)
 delete mode 100644 eng/WpfArcadeSdk/tools/DRT.Build.props
 delete mode 100644 eng/WpfArcadeSdk/tools/Publish.props
 delete mode 100644 eng/WpfArcadeSdk/tools/SourceLocations.props
 delete mode 100644 eng/WpfArcadeSdk/tools/StrongName.props
 delete mode 100644 eng/WpfArcadeSdk/tools/StrongName.targets
 delete mode 100644 eng/helix/configure-helix-machine.ps1
 delete mode 100644 eng/helix/prepare-helix-payload.ps1
 delete mode 100644 eng/helix/runtests.cmd
 delete mode 100644 eng/helix/runtests.ps1
 rename eng/{helix => }/helixpublish.proj (91%)
 delete mode 100644 src/Microsoft.DotNet.Wpf/test/BranchCommon/data/CommonData.csproj
 delete mode 100644 src/Microsoft.DotNet.Wpf/test/BranchCommon/data/Directory.Build.props
 delete mode 100644 src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/FriendWithKey/XamlTestClasses.FriendWithKey.csproj
 delete mode 100644 src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/FriendWithoutKey/XamlTestClasses.FriendWithoutKey.csproj

diff --git a/eng/WpfArcadeSdk/tools/CreateTestPayload.targets b/eng/WpfArcadeSdk/tools/CreateTestPayload.targets
index b53e478dad4..c7872ca0772 100644
--- a/eng/WpfArcadeSdk/tools/CreateTestPayload.targets
+++ b/eng/WpfArcadeSdk/tools/CreateTestPayload.targets
@@ -1,5 +1,4 @@
 <Project>
-
     <!-- We use a local RID here since we don't want to change the build layout by setting the actual RID. -->
   <PropertyGroup>
     <LocalRuntimeIdentifier Condition="'$(Platform)'=='x64' or '$(Platform)'=='x86' or '$(Platform)'=='arm' or '$(Platform)'=='arm64'">win-$(Platform)</LocalRuntimeIdentifier>
@@ -32,7 +31,10 @@
           DestinationFiles="@(MicrosoftDotNetWpfTestContents->'$(WpfTestBasePublishPath)\%(RecursiveDir)%(Filename)%(Extension)')"  />
 
     <Copy SourceFiles="@(OtherPayloadContents)"
-          DestinationFolder="$(PublishDir)"  />
+          DestinationFolder="$(PublishRoot)"  />
+
+    <Copy SourceFiles="$(WpfTestsDir)BranchCommon\data\DrtList.xml"
+          DestinationFolder="$(WpfTestBasePublishPath)\DRT"  />
 
   </Target>
 
diff --git a/eng/WpfArcadeSdk/tools/DRT.Build.props b/eng/WpfArcadeSdk/tools/DRT.Build.props
deleted file mode 100644
index 047ab6efe2d..00000000000
--- a/eng/WpfArcadeSdk/tools/DRT.Build.props
+++ /dev/null
@@ -1,7 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <PublishDir>$(WpfDrtTestBasePublishPath)</PublishDir>
-    <IsTestProject>true</IsTestProject>
-    <SkipTests>true</SkipTests>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/eng/WpfArcadeSdk/tools/GenerateProgramFileForTests.targets b/eng/WpfArcadeSdk/tools/GenerateProgramFileForTests.targets
index 1ff69760a46..7542aab1a7a 100644
--- a/eng/WpfArcadeSdk/tools/GenerateProgramFileForTests.targets
+++ b/eng/WpfArcadeSdk/tools/GenerateProgramFileForTests.targets
@@ -1,6 +1,6 @@
 <Project>
   <Target Name="EnsureProgramFileIsGeneratedOnlyForTests"
-          Condition="'$(IsTestProject)'=='true' And '$(GenerateProgramFile)'!='true'"
+          Condition="'$(IsTestProject)'=='true' And '$(GenerateProgramFile)'!='false'"
           BeforeTargets="CoreCompile">
     <PropertyGroup>
       <GenerateProgramFile Condition="'$(InternalMarkupCompilation)'!='true'">true</GenerateProgramFile>
diff --git a/eng/WpfArcadeSdk/tools/Publish.props b/eng/WpfArcadeSdk/tools/Publish.props
deleted file mode 100644
index 767506adb52..00000000000
--- a/eng/WpfArcadeSdk/tools/Publish.props
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project>
-    <PropertyGroup>
-        <_IsPortable >true</_IsPortable>
-        <SelfContained >false</SelfContained>
-        <RuntimeIdentifier>win-x86</RuntimeIdentifier>
-        <RuntimeIdentifier Condition="'$(Platform)' == 'x64'">win-x64</RuntimeIdentifier>
-        <PublishDir>$(PublishRoot)$(Configuration)\$(PlatformFolder)</PublishDir>
-        <WpfTestBasePublishPath>$(PublishDir)\Test</WpfTestBasePublishPath>
-        <WpfFeatureTestBasePublishPath>$(WpfTestBasePublishPath)\FeatureTests</WpfFeatureTestBasePublishPath>
-        <WpfDrtTestBasePublishPath>$(WpfTestBasePublishPath)\DRT</WpfDrtTestBasePublishPath>
-    </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/eng/WpfArcadeSdk/tools/PublishAfterBuild.targets b/eng/WpfArcadeSdk/tools/PublishAfterBuild.targets
index 6e84793f7a0..42f92318850 100644
--- a/eng/WpfArcadeSdk/tools/PublishAfterBuild.targets
+++ b/eng/WpfArcadeSdk/tools/PublishAfterBuild.targets
@@ -8,11 +8,4 @@
      </PropertyGroup>
    </Target>
 
-  <!-- 
-  Don't copy the code coverage artifacts. These are always trying to be copied to the 
-  same location and so we get errors trying to overwrite files that are locked by a parallel
-  instance of MSBuild. We don't currently need these files. If we do, we can come up with a better
-  solution.
-  -->
-  <Target Name="CopyTraceDataCollectorArtifacts" />
 </Project>
diff --git a/eng/WpfArcadeSdk/tools/SourceLocations.props b/eng/WpfArcadeSdk/tools/SourceLocations.props
deleted file mode 100644
index 8b669d5ffd5..00000000000
--- a/eng/WpfArcadeSdk/tools/SourceLocations.props
+++ /dev/null
@@ -1,1072 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <CommonCodeLocation>$(WpfTestBasePath)\Common\Code\Microsoft\Test</CommonCodeLocation>
-    <CommonCriticalCodeLocation>$(WpfTestBasePath)\Common\Code\Critical\Microsoft\Test</CommonCriticalCodeLocation>
-    <CommonDataLocation>$(WpfTestBasePath)\Common\Data</CommonDataLocation>
-  </PropertyGroup>
-
-  <!-- ClickOnce Helper -->
-  <ItemGroup>
-    <SourcesClickonceHelper Include="$(CommonCodeLocation)\Deployment\ClickOnceHelper.cs"> <Link>Test\Deployment\ClickOnceHelper.cs</Link> </SourcesClickonceHelper>
-  </ItemGroup>
-
-  <!-- Container -->
-  <ItemGroup>
-    <SourcesContainer Include="$(CommonCodeLocation)\Container\StorageRootWrapper.cs"> <Link>Test\Container\StorageRootWrapper.cs</Link> </SourcesContainer>
-  </ItemGroup>
-
-  <!-- Exception Validation -->
-  <ItemGroup>
-    <SourcesExceptionValidation Include="$(CommonCodeLocation)\Globalization\Exceptions.cs"> <Link>Test\Globalization\Exceptions.cs</Link> </SourcesExceptionValidation>
-  </ItemGroup>
-
-  <!-- MSBuild -->
-  <ItemGroup>
-    <SourcesMSBuildEngine Include="$(CommonCodeLocation)\MSBuildEngine\Compiler.cs"> <Link>Test\MSBuildEngine\Compiler.cs</Link> </SourcesMSBuildEngine>
-    <SourcesMSBuildEngine Include="$(CommonCodeLocation)\MSBuildEngine\ErrorCodes.cs"> <Link>Test\MSBuildEngine\ErrorCodes.cs</Link> </SourcesMSBuildEngine>
-    <SourcesMSBuildEngine Include="$(CommonCodeLocation)\MSBuildEngine\ErrorWarningParser.cs"> <Link>Test\MSBuildEngine\ErrorWarningParser.cs</Link> </SourcesMSBuildEngine>
-    <SourcesMSBuildEngine Include="$(CommonCodeLocation)\MSBuildEngine\IMSBuildLogger.cs"> <Link>Test\MSBuildEngine\IMSBuildLogger.cs</Link> </SourcesMSBuildEngine>
-    <SourcesMSBuildEngine Include="$(CommonCodeLocation)\MSBuildEngine\MSBuildCommonHelper.cs"> <Link>Test\MSBuildEngine\MSBuildCommonHelper.cs</Link> </SourcesMSBuildEngine>
-    <SourcesMSBuildEngine Include="$(CommonCodeLocation)\MSBuildEngine\MSBuildLogger.cs"> <Link>Test\MSBuildEngine\MSBuildLogger.cs</Link> </SourcesMSBuildEngine>
-    <SourcesMSBuildEngine Include="$(CommonCodeLocation)\MSBuildEngine\MSBuildPerf.cs"> <Link>Test\MSBuildEngine\MSBuildPerf.cs</Link> </SourcesMSBuildEngine>
-    <SourcesMSBuildEngine Include="$(CommonCodeLocation)\MSBuildEngine\MSBuildPerfLogger.cs"> <Link>Test\MSBuildEngine\MSBuildPerfLogger.cs</Link> </SourcesMSBuildEngine>
-    <SourcesMSBuildEngine Include="$(CommonCodeLocation)\MSBuildEngine\MSBuildProjExecutor.cs"> <Link>Test\MSBuildEngine\MSBuildProjExecutor.cs</Link> </SourcesMSBuildEngine>
-    <SourcesMSBuildEngine Include="$(CommonCodeLocation)\MSBuildEngine\CompilerHelper.cs"> <Link>Test\MSBuildEngine\CompilerHelper.cs</Link> </SourcesMSBuildEngine>
-  </ItemGroup>
-
-  <!-- AutoData -->
-  <ItemGroup>
-    <SourcesAutoData Include="$(CommonCodeLocation)\Globalization\AutoDataEnums.cs"> <Link>Test\Globalization\AutoDataEnums.cs</Link> </SourcesAutoData>
-    <SourcesAutoData Include="$(CommonCodeLocation)\Globalization\extract.cs"> <Link>Test\Globalization\extract.cs</Link> </SourcesAutoData>
-    <SourcesAutoData Include="$(CommonCodeLocation)\Globalization\generate.cs"> <Link>Test\Globalization\generate.cs</Link> </SourcesAutoData>
-    <SourcesAutoData Include="$(CommonCodeLocation)\Globalization\LangPackHelper.cs"> <Link>Test\Globalization\LangPackHelper.cs</Link> </SourcesAutoData>
-  </ItemGroup>
-
-  <!-- ETW Logging Code -->
-  <ItemGroup>
-    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\ClrTraceEventParser.cs"> <Link>Test\EventTracing\ClrTraceEventParser.cs</Link> </SourcesETWLogging >
-    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\DynamicTraceEventParser.cs"> <Link>Test\EventTracing\DynamicTraceEventParser.cs</Link> </SourcesETWLogging >
-    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\ETWTraceEventSource.cs"> <Link>Test\EventTracing\ETWTraceEventSource.cs</Link> </SourcesETWLogging >
-    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\KernelTraceEventParser.cs"> <Link>Test\EventTracing\KernelTraceEventParser.cs</Link> </SourcesETWLogging >
-    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\Manifest.cs"> <Link>Test\EventTracing\Manifest.cs</Link> </SourcesETWLogging >
-    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\SymbolEventParser.cs"> <Link>Test\EventTracing\SymbolEventParser.cs</Link> </SourcesETWLogging >
-    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\SymbolResolver.cs"> <Link>Test\EventTracing\SymbolResolver.cs</Link> </SourcesETWLogging >
-    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\TraceEvent.cs"> <Link>Test\EventTracing\TraceEvent.cs</Link> </SourcesETWLogging >
-    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\TraceEventNativeMethods.cs"> <Link>Test\TraceEventNativeMethods.cs</Link> </SourcesETWLogging >
-    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\TraceEventSession.cs"> <Link>Test\EventTracing\TraceEventSession.cs</Link> </SourcesETWLogging >
-    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\TraceLog.cs"> <Link>Test\EventTracing\TraceLog.cs</Link> </SourcesETWLogging >
-    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\Utility.cs"> <Link>Test\EventTracing\Utility.cs</Link> </SourcesETWLogging >
-    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\WPFTraceEventParser.cs"> <Link>Test\EventTracing\WPFTraceEventParser.cs</Link> </SourcesETWLogging >
-
-    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\Utilities\CompressedStream.cs"> <Link>Test\EventTracing\Utilities\CompressedStream.cs</Link> </SourcesETWLogging >
-    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\Utilities\FastSerialization.cs"> <Link>Test\EventTracing\Utilities\FastSerialization.cs</Link> </SourcesETWLogging >
-    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\Utilities\GrowableArray.cs"> <Link>Test\EventTracing\Utilities\GrowableArray.cs</Link> </SourcesETWLogging >
-    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\Utilities\StreamReaderWriter.cs"> <Link>Test\EventTracing\Utilities\StreamReaderWriter.cs</Link> </SourcesETWLogging >
-    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\Utilities\StreamUtilities.cs"> <Link>Test\EventTracing\Utilities\StreamUtilities.cs</Link> </SourcesETWLogging >
-    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\Utilities\XmlUtilities.cs"> <Link>Test\EventTracing\Utilities\XmlUtilities.cs</Link> </SourcesETWLogging >
-  </ItemGroup>
-
-  <!-- Managed Resources AutoData  -->
-  <ItemGroup>
-    <ManagedResourcesAutoData Include="$(CommonCodeLocation)\Globalization\ChineseSimplified.txt">
-      <LogicalName>ChineseSimplified.txt</LogicalName>
-      <Link>Resources\Globalization\ChineseSimplified.txt</Link>
-    </ManagedResourcesAutoData>
-    <ManagedResourcesAutoData Include="$(CommonCodeLocation)\Globalization\ChineseTraditional.txt">
-      <LogicalName>ChineseTraditional.txt</LogicalName>
-      <Link>Resources\Globalization\ChineseTraditional.txt</Link>
-    </ManagedResourcesAutoData>
-    <ManagedResourcesAutoData Include="$(CommonCodeLocation)\Globalization\Japanese.txt">
-      <LogicalName>Japanese.txt</LogicalName>
-      <Link>Resources\Globalization\Japanese.txt</Link>
-    </ManagedResourcesAutoData>
-    <ManagedResourcesAutoData Include="$(CommonCodeLocation)\Globalization\Korean.txt">
-      <LogicalName>Korean.txt</LogicalName>
-      <Link>Resources\Globalization\Korean.txt</Link>
-    </ManagedResourcesAutoData>
-    <ManagedResourcesAutoData Include="$(CommonCodeLocation)\Globalization\ProblemDate.xml">
-      <LogicalName>ProblemDate.xml</LogicalName>
-      <Link>Resources\Globalization\ProblemDate.xml</Link>
-    </ManagedResourcesAutoData>
-    <ManagedResourcesAutoData Include="$(CommonCodeLocation)\Globalization\ProblemString.xml">
-      <LogicalName>ProblemString.xml</LogicalName>
-      <Link>Resources\Globalization\ProblemString.xml</Link>
-    </ManagedResourcesAutoData>
-  </ItemGroup>
-
-  <!-- Markup -->
-  <ItemGroup>
-    <SourcesMarkup Include="$(CommonCodeLocation)\Markup\ModifyXaml.cs"> <Link>Test\Markup\ModifyXaml.cs</Link> </SourcesMarkup>
-    <SourcesMarkup Include="$(CommonCodeLocation)\Markup\WPFLibraryGenerator.cs"> <Link>Test\Markup\WPFLibraryGenerator.cs</Link> </SourcesMarkup>
-    <SourcesMarkup Include="$(CommonCodeLocation)\Markup\WPFTreeGenerator.cs"> <Link>Test\Markup\WPFTreeGenerator.cs</Link> </SourcesMarkup>
-    <SourcesMarkup Include="$(CommonCodeLocation)\Markup\WPFXamlGenerator.cs"> <Link>Test\Markup\WPFXamlGenerator.cs</Link> </SourcesMarkup>
-    <SourcesMarkup Include="$(CommonCodeLocation)\Markup\XamlGenerator.cs"> <Link>Test\Markup\XamlGenerator.cs</Link> </SourcesMarkup>
-    <SourcesMarkup Include="$(CommonCodeLocation)\Markup\XmlGenerator.cs"> <Link>Test\Markup\XmlGenerator.cs</Link> </SourcesMarkup>
-    <SourcesMarkup Include="$(CommonCodeLocation)\Markup\XamlComparer.cs"> <Link>Test\Markup\XamlComparer.cs</Link> </SourcesMarkup>
-    <SourcesMarkup Include="$(CommonCodeLocation)\Markup\XamlTestDocument.cs"> <Link>Test\Markup\XamlTestDocument.cs</Link> </SourcesMarkup>
-  </ItemGroup>
-
-  <!-- Windows Forms -->
-  <ItemGroup>
-    <SourcesWindowsForms Include="$(CommonCodeLocation)\WindowsForms\Application.cs"> <Link>Test\WindowsForms\Application.cs</Link> </SourcesWindowsForms>
-    <SourcesWindowsForms Include="$(CommonCodeLocation)\WindowsForms\WindowsFormsSource.cs"> <Link>Test\WindowsForms\WindowsFormsSource.cs</Link> </SourcesWindowsForms>
-  </ItemGroup>
-
-  <!-- AppMonitor -->
-  <ItemGroup>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\ApplicationDeploymentHelper.cs"> <Link>Test\Loaders\ApplicationDeploymentHelper.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\ApplicationMonitorTest.cs"> <Link>Test\Loaders\ApplicationMonitorTest.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\ApplicationMonitor.cs"> <Link>Test\Loaders\ApplicationMonitor.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\ApplicationMonitorConfig.cs"> <Link>Test\Loaders\ApplicationMonitorConfig.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\FileHost.cs"> <Link>Test\Loaders\FileHost.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\IXamlLauncher.cs"> <Link>Test\Loaders\IXamlLauncher.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\LoaderStep.cs"> <Link>Test\Loaders\LoaderStep.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\ResourceHelper.cs"> <Link>Test\Loaders\ResourceHelper.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\FireFoxAutomationHelper.cs"> <Link>Test\Loaders\FireFoxAutomationHelper.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\UIHandler.cs"> <Link>Test\Loaders\UIHandler.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\ActivationStep.cs"> <Link>Test\Loaders\Steps\ActivationStep.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\FileHostStep.cs"> <Link>Test\Loaders\Steps\FileHostStep.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\HostingRuntimePolicyHelper.cs"> <Link>Test\Loaders\Steps\HostingRuntimePolicyHelper.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\LoggingSteps.cs"> <Link>Test\Loaders\Steps\LoggingSteps.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\VersionHelper.cs"> <Link>Test\Loaders\Steps\VersionHelper.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\RegistryStep.cs"> <Link>Test\Loaders\Steps\RegistryStep.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\UIHandlers\DefaultHandlers.cs"> <Link>Test\Loaders\UIHandlers\DefaultHandlers.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\Scripter.cs"> <Link>Test\Loaders\Steps\Scripter.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\String.cs"> <Link>Test\Loaders\Steps\String.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\Win32.cs"> <Link>Test\Loaders\Steps\Win32.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\Resources.cs"> <Link>Test\Loaders\Steps\Resources.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\Registry.cs"> <Link>Test\Loaders\Steps\Registry.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\Tests.cs"> <Link>Test\Loaders\Steps\Tests.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\Diagnostics.cs"> <Link>Test\Loaders\Steps\Diagnostics.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\IO.cs"> <Link>Test\Loaders\Steps\IO.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\UI.cs"> <Link>Test\Loaders\Steps\UI.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\XML.cs"> <Link>Test\Loaders\Steps\XML.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\Input.cs"> <Link>Test\Loaders\Steps\Input.cs</Link> </SourcesAppMonitor>
-    <!--<SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\Security.cs"> <Link>Test\Loaders\Steps\Security.cs</Link> </SourcesAppMonitor>-->
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\Reflection.cs"> <Link>Test\Loaders\Steps\Reflection.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\Avalon.cs"> <Link>Test\Loaders\Steps\Avalon.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\Collections.cs"> <Link>Test\Loaders\Steps\Collections.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\Environment.cs"> <Link>Test\Loaders\Steps\Environment.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\ScripterStep.cs"> <Link>Test\Loaders\Steps\ScripterStep.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\UIHandlers\CustomUIHandler.cs"> <Link>Test\Loaders\UIHandlers\CustomUIHandler.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\ConfigFileStep.cs"> <Link>Test\Loaders\Steps\ConfigFileStep.cs</Link> </SourcesAppMonitor>
-    <!--<SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\BrowserStateStep.cs"> <Link>Test\Loaders\Steps\BrowserStateStep.cs</Link> </SourcesAppMonitor>-->
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\IENavigationHelper.cs"> <Link>Test\Loaders\IENavigationHelper.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\MachineInfoStepDisabler.cs"> <Link>Test\Loaders\Steps\MachineInfoStepDisabler.cs</Link> </SourcesAppMonitor>
-  </ItemGroup>
-
-  <!-- Managed Resources AppMonitor -->
-  <ItemGroup>
-    <!--<ManagedResourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\clickoncetest.pfx">
-      <LogicalName>clickoncetest.pfx</LogicalName>
-      <Link>Resources\Loaders\clickoncetest.pfx</Link>
-    </ManagedResourcesAppMonitor>-->
-    <ManagedResourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\NamedRegistrations.xml">
-      <LogicalName>NamedRegistrations.xml</LogicalName>
-      <Link>Resources\Loaders\NamedRegistrations.xml</Link>
-    </ManagedResourcesAppMonitor>
-    <ManagedResourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\ErrorCodes.xml">
-      <LogicalName>ErrorCodes.xml</LogicalName>
-      <Link>Resources\Loaders\ErrorCodes.xml</Link>
-    </ManagedResourcesAppMonitor>
-  </ItemGroup>
-
-  <!-- Threading -->
-  <ItemGroup>
-    <SourcesThreading Include="$(CommonCodeLocation)\Threading\DispatcherHelper.cs"> <Link>Test\Threading\DispatcherHelper.cs</Link> </SourcesThreading>
-    <SourcesThreading Include="$(CommonCodeLocation)\Threading\DispatcherQueueWrapper.cs"> <Link>Test\Threading\DispatcherQueueWrapper.cs</Link> </SourcesThreading>
-    <SourcesThreading Include="$(CommonCodeLocation)\Threading\DispatcherTimerHelper.cs"> <Link>Test\Threading\DispatcherTimerHelper.cs</Link> </SourcesThreading>
-    <SourcesThreading Include="$(CommonCodeLocation)\Threading\DispatcherPriorityHelper.cs"> <Link>Test\Threading\DispatcherPriorityHelper.cs</Link> </SourcesThreading>
-    <SourcesThreading Include="$(CommonCodeLocation)\Threading\DispatcherSignalHelper.cs"> <Link>Test\Threading\DispatcherSignalHelper.cs</Link> </SourcesThreading>
-  </ItemGroup>
-
-  <!-- Security -->
-  <ItemGroup>
-    <SourcesSecurity Include="$(CommonCodeLocation)\Security\Secure.cs"> <Link>Test\Security\Secure.cs</Link> </SourcesSecurity>
-  </ItemGroup>
-
-  <!-- Security Wrappers -->
-  <ItemGroup>
-    <SourcesSecurityWrappers Include="$(CommonCodeLocation)\Security\Wrappers\TestAPISw.cs"> <Link>Test\Security\Wrappers\TestAPISw.cs</Link> </SourcesSecurityWrappers>
-    <SourcesSecurityWrappers Include="$(CommonCodeLocation)\Security\Wrappers\AvalonWrappers.cs"> <Link>Test\Security\Wrappers\AvalonWrappers.cs</Link> </SourcesSecurityWrappers>
-    <SourcesSecurityWrappers Include="$(CommonCodeLocation)\Security\Wrappers\WrapperClasses.cs"> <Link>Test\Security\Wrappers\WrapperClasses.cs</Link> </SourcesSecurityWrappers>
-    <!-- Include 4.0 Wrappers based on build target version -->
-    <SourcesSecurityWrappers Include="$(CommonCodeLocation)\Security\Wrappers\WrapperClasses40.cs" Condition="'$(WPF_TESTBUILD_TARGETVERSION)' != 'v3.0' AND '$(WPF_TESTBUILD_TARGETVERSION)' != 'v3.5'"> <Link>Test\Security\Wrappers\WrapperClasses40.cs</Link> </SourcesSecurityWrappers>
-  </ItemGroup>
-
-  <!-- Display Minimal -->
-  <ItemGroup>
-    <SourcesDisplayMinimal Include="$(CommonCodeLocation)\Display\DisplayConfiguration.cs"> <Link>Test\Display\DisplayConfiguration.cs</Link> </SourcesDisplayMinimal>
-    <SourcesDisplayMinimal Include="$(CommonCodeLocation)\Display\DisplaySettings.cs"> <Link>Test\Display\DisplaySettings.cs</Link> </SourcesDisplayMinimal>
-    <SourcesDisplayMinimal Include="$(CommonCodeLocation)\Display\DisplaySettingsInfo.cs"> <Link>Test\Display\DisplaySettingsInfo.cs</Link> </SourcesDisplayMinimal>
-    <SourcesDisplayMinimal Include="$(CommonCodeLocation)\Display\DwmApi.cs"> <Link>Test\Display\DwmApi.cs</Link> </SourcesDisplayMinimal>
-    <SourcesDisplayMinimal Include="$(CommonCodeLocation)\Display\Monitor.cs"> <Link>Test\Display\Monitor.cs</Link> </SourcesDisplayMinimal>
-  </ItemGroup>
-
-  <!-- Display -->
-  <ItemGroup>
-    <SourcesDisplay Include="$(CommonCodeLocation)\Display\Desktop.cs"> <Link>Test\Display\Desktop.cs</Link> </SourcesDisplay>
-    <SourcesDisplay Include="@(SourcesDisplayMinimal)" />
-  </ItemGroup>
-
-  <!-- Leak Testing -->
-  <ItemGroup>
-    <SourcesLeak Include="$(CommonCodeLocation)\Leak\LeakTest.cs"> <Link>Test\Leak\LeakTest.cs</Link> </SourcesLeak>    
-  </ItemGroup>
-
-  <!-- Test Types -->
-  <ItemGroup>
-    <SourcesTestTypes Include="$(CommonCodeLocation)\TestTypes\AvalonModel.cs"> <Link>Test\TestTypes\AvalonModel.cs</Link> </SourcesTestTypes>
-    <SourcesTestTypes Include="$(CommonCodeLocation)\TestTypes\AvalonTest.cs"> <Link>Test\TestTypes\AvalonTest.cs</Link> </SourcesTestTypes>
-    <SourcesTestTypes Include="$(CommonCodeLocation)\TestTypes\ETWVerificationTest.cs"> <Link>Test\TestTypes\ETWVerificationTest.cs</Link> </SourcesTestTypes>
-    <SourcesTestTypes Include="$(CommonCodeLocation)\TestTypes\StepsTest.cs"> <Link>Test\TestTypes\StepsTest.cs</Link> </SourcesTestTypes>
-    <SourcesTestTypes Include="$(CommonCodeLocation)\TestTypes\WindowModel.cs"> <Link>Test\TestTypes\WindowModel.cs</Link> </SourcesTestTypes>
-    <SourcesTestTypes Include="$(CommonCodeLocation)\TestTypes\WindowTest.cs"> <Link>Test\TestTypes\WindowTest.cs</Link> </SourcesTestTypes>
-    <SourcesTestTypes Include="$(CommonCodeLocation)\TestTypes\WindowUtil.cs"> <Link>Test\TestTypes\WindowUtil.cs</Link> </SourcesTestTypes>
-    <SourcesTestTypes Include="$(CommonCodeLocation)\TestTypes\XamlModel.cs"> <Link>Test\TestTypes\XamlModel.cs</Link> </SourcesTestTypes>
-    <SourcesTestTypes Include="$(CommonCodeLocation)\TestTypes\XamlTest.cs"> <Link>Test\TestTypes\XamlTest.cs</Link> </SourcesTestTypes>
-    <SourcesTestTypes Include="$(CommonCodeLocation)\TestTypes\XamlVisualVerificationTest.cs"> <Link>Test\TestTypes\XamlVisualVerificationTest.cs</Link> </SourcesTestTypes>
-  </ItemGroup>
-
-  <!-- Drt -->
-  <ItemGroup>
-    <SourcesDrt Include="$(CommonCodeLocation)\Drt\DrtRunner.cs"> <Link>Test\Drt\DrtRunner.cs</Link> </SourcesDrt>
-  </ItemGroup>
-
-  <!-- Verification -->
-  <ItemGroup>
-    <SourcesVerification Include="$(CommonCodeLocation)\Verification\IVerifier.cs"> <Link>Test\Verification\IVerifier.cs</Link> </SourcesVerification>
-    <SourcesVerification Include="$(CommonCodeLocation)\Verification\IVerifyResult.cs"> <Link>Test\Verification\IVerifyResult.cs</Link> </SourcesVerification>
-    <SourcesVerification Include="$(CommonCodeLocation)\Verification\VerifyResult.cs"> <Link>Test\Verification\VerifyResult.cs</Link> </SourcesVerification>
-  </ItemGroup>
-
-  <!-- Input Minimal -->
-  <ItemGroup>
-    <SourcesInputMinimal Include="$(CommonCodeLocation)\Input\InputHelper.cs"> <Link>Test\Input\InputHelper.cs</Link> </SourcesInputMinimal>
-  </ItemGroup>
-
-  <!-- Input -->
-  <ItemGroup>
-    <SourcesInput Include="$(CommonCodeLocation)\Input\Input.cs"> <Link>Test\Input\Input.cs</Link> </SourcesInput>
-    <SourcesInput Include="$(CommonCodeLocation)\Input\NativeMethods.cs"> <Link>Test\Input\NativeMethods.cs</Link> </SourcesInput>
-    <SourcesInput Include="$(CommonCodeLocation)\Input\SafeNativeMethods.cs"> <Link>Test\Input\SafeNativeMethods.cs</Link> </SourcesInput>
-    <SourcesInput Include="$(CommonCodeLocation)\Input\UnsafeNativeMethods.cs"> <Link>Test\Input\UnsafeNativeMethods.cs</Link> </SourcesInput>
-    <SourcesInput Include="$(CommonCodeLocation)\Input\InputManagerWrapper.cs"> <Link>Test\Input\InputManagerWrapper.cs</Link> </SourcesInput>
-    <SourcesInput Include="$(CommonCodeLocation)\Input\KeyboardRecorder.cs"> <Link>Test\Input\KeyboardRecorder.cs</Link> </SourcesInput>
-    <SourcesInput Include="$(CommonCodeLocation)\Input\RawMouseActions.cs"> <Link>Test\Input\RawMouseActions.cs</Link> </SourcesInput>
-    <SourcesInput Include="$(CommonCodeLocation)\Input\InputReportEventArgsWrapper.cs"> <Link>Test\Input\InputReportEventArgsWrapper.cs</Link> </SourcesInput>
-    <SourcesInput Include="$(CommonCodeLocation)\Input\RawKeyboardActions.cs"> <Link>Test\Input\RawKeyboardActions.cs</Link> </SourcesInput>
-    <SourcesInput Include="$(CommonCodeLocation)\Input\RawMouseInputReportWrapper.cs"> <Link>Test\Input\RawMouseInputReportWrapper.cs</Link> </SourcesInput>
-    <SourcesInput Include="$(CommonCodeLocation)\Input\RawMouseState.cs"> <Link>Test\Input\RawMouseState.cs</Link> </SourcesInput>
-    <SourcesInput Include="$(CommonCodeLocation)\Input\RawKeyboardInputReportWrapper.cs"> <Link>Test\Input\RawKeyboardInputReportWrapper.cs</Link> </SourcesInput>
-    <SourcesInput Include="$(CommonCodeLocation)\Input\InputReportWrapper.cs"> <Link>Test\Input\InputReportWrapper.cs</Link> </SourcesInput>
-    <SourcesInput Include="$(CommonCodeLocation)\Input\KeyboardPlayer.cs"> <Link>Test\Input\KeyboardPlayer.cs</Link> </SourcesInput>
-    <SourcesInput Include="$(CommonCodeLocation)\Input\RawKeyboardState.cs"> <Link>Test\Input\RawKeyboardState.cs</Link> </SourcesInput>
-    <SourcesInput Include="$(CommonCodeLocation)\Input\RawTextInputReportWrapper.cs"> <Link>Test\Input\RawTextInputReportWrapper.cs</Link> </SourcesInput>
-    <SourcesInput Include="$(CommonCodeLocation)\Input\MultiMonitorHelper.cs"> <Link>Test\Input\MultiMonitorHelper.cs</Link> </SourcesInput>
-    <SourcesInput Include="$(CommonCodeLocation)\Input\UserInput.cs"> <Link>Test\Input\UserInput.cs</Link> </SourcesInput>
-    <SourcesInput Include="@(SourcesInputMinimal)" />
-  </ItemGroup>
-
-  <!-- Hosting/Xaml Browser Host- TODO: the name should be fixed. -->
-  <ItemGroup>
-    <SourcesXamlBrowserHost Include="$(CommonCodeLocation)\Hosting\UiaDistributedStepInfo.cs"> <Link>Test\Hosting\UiaDistributedStepInfo.cs</Link> </SourcesXamlBrowserHost>
-    <SourcesXamlBrowserHost Include="$(CommonCodeLocation)\Hosting\UiaDistributedStepTarget.cs"> <Link>Test\Hosting\UiaDistributedStepTarget.cs</Link> </SourcesXamlBrowserHost>
-    <SourcesXamlBrowserHost Include="$(CommonCodeLocation)\Hosting\UiaDistributedTestcase.cs"> <Link>Test\Hosting\UiaDistributedTestcase.cs</Link> </SourcesXamlBrowserHost>
-    <SourcesXamlBrowserHost Include="$(CommonCodeLocation)\Hosting\UiaDistributedTestCaseHost.cs"> <Link>Test\Hosting\UiaDistributedTestCaseHost.cs</Link> </SourcesXamlBrowserHost>
-    <SourcesXamlBrowserHost Include="$(CommonCodeLocation)\Hosting\UiaSimpleTestCase.cs"> <Link>Test\Hosting\UiaSimpleTestCase.cs</Link> </SourcesXamlBrowserHost>
-    <SourcesXamlBrowserHost Include="$(CommonCodeLocation)\Hosting\UiaTestState.cs"> <Link>Test\Hosting\UiaTestState.cs</Link> </SourcesXamlBrowserHost>
-
-    <SourcesXamlBrowserHost Include="$(CommonCodeLocation)\Hosting\XamlBrowserHost.cs"> <Link>Test\Hosting\XamlBrowserHost.cs</Link> </SourcesXamlBrowserHost>
-  </ItemGroup>
-
-  <!-- Object Serializer -->
-  <ItemGroup>
-    <SourcesObjectserializer Include="$(CommonCriticalCodeLocation)\Serialization\ObjectSerializer.cs"> <Link>Critical\Test\Serialization\ObjectSerializer.cs</Link> </SourcesObjectserializer>
-    <SourcesObjectserializer Include="$(CommonCriticalCodeLocation)\Serialization\DefaultObjectSerializer.cs"> <Link>Critical\Test\Serialization\DefaultObjectSerializer.cs</Link> </SourcesObjectserializer>
-  </ItemGroup>
-
- <!-- Runtime Logging Sources -->
-  <ItemGroup>
-    <SharedRuntimeLoggingSources Include="$(CommonCriticalCodeLocation)\Logging\TestResult.cs"> <Link>Critical\Test\Logging\TestResult.cs</Link> </SharedRuntimeLoggingSources>
-    <SharedRuntimeLoggingSources Include="$(CommonCriticalCodeLocation)\Logging\IHarnessLoggingContract.cs"> <Link>Critical\Test\Logging\IHarnessLoggingContract.cs</Link> </SharedRuntimeLoggingSources>
-  </ItemGroup>
-
-  <!-- Logging -->
-  <ItemGroup>
-    <SourcesLogging Include="@(SharedRuntimeLoggingSources)" />
-    <SourcesLogging Include="$(CommonCodeLocation)\Logging\TestLog.cs"> <Link>Test\Logging\TestLog.cs</Link> </SourcesLogging>
-    <SourcesLogging Include="$(CommonCodeLocation)\Logging\TestStage.cs"> <Link>Test\Logging\TestStage.cs</Link> </SourcesLogging>
-    <SourcesLogging Include="$(CommonCodeLocation)\Logging\GlobalLog.cs"> <Link>Test\Logging\GlobalLog.cs</Link> </SourcesLogging>
-  </ItemGroup>
-
-  <!-- System Information -->
-  <ItemGroup>
-    <SourcesSystemInfo Include="$(CommonCodeLocation)\Diagnostics\SystemInformation.cs"> <Link>Test\Diagnostics\SystemInformation.cs</Link> </SourcesSystemInfo>
-    <SourcesSystemInfo Include="$(CommonCodeLocation)\Diagnostics\ProcessorInformation.cs"> <Link>Test\Diagnostics\ProcessorInformation.cs</Link> </SourcesSystemInfo>
-    <SourcesSystemInfo Include="$(CommonCodeLocation)\Diagnostics\SystemMetrics.cs"> <Link>Test\Diagnostics\SystemMetrics.cs</Link> </SourcesSystemInfo>
-  </ItemGroup>
-
-  <!-- System Information WPF-->
-  <ItemGroup>
-    <SourcesSystemInfoWpf Include="$(CommonCodeLocation)\Diagnostics\SystemInformation_Wpf.cs"> <Link>Test\Diagnostics\SystemInformation_Wpf.cs</Link> </SourcesSystemInfoWpf>
-  </ItemGroup>
-
-  <!-- System Information WindowsMediaPlayer-->
-  <ItemGroup>
-    <SourcesSystemInfoMediaPlayer Include="$(CommonCodeLocation)\Diagnostics\SystemInformation_WindowsMediaPlayer.cs"> <Link>Test\Diagnostics\SystemInformation_WindowsMediaPlayer.cs</Link> </SourcesSystemInfoMediaPlayer>
-  </ItemGroup>
-
-  <!-- Process Monitor -->
-  <ItemGroup>
-    <SourcesProcessmonitor Include="$(CommonCodeLocation)\Diagnostics\ProcessMonitor.cs"> <Link>Test\Diagnostics\ProcessMonitor.cs</Link> </SourcesProcessmonitor>
-  </ItemGroup>
-
-  <!-- Process Helper -->
-  <ItemGroup>
-    <SourcesProcessHelper Include="$(CommonCodeLocation)\Diagnostics\ProcessHelper.cs"> <Link>Test\Diagnostics\ProcessHelper.cs</Link> </SourcesProcessHelper>
-    <SourcesProcessHelper Include="$(CommonCodeLocation)\Diagnostics\ProcessGroup.cs"> <Link>Test\Diagnostics\ProcessGroup.cs</Link> </SourcesProcessHelper>
-    <SourcesProcessHelper Include="$(CommonCodeLocation)\Diagnostics\ManifestHelper.cs"> <Link>Test\Diagnostics\ManifestHelper.cs</Link> </SourcesProcessHelper>
-  </ItemGroup>
-
-  <!-- Loaders -->
-  <ItemGroup>
-    <SourcesLoaders Include="@(SourcesProcessMonitor)" />
-  </ItemGroup>
-
-  <!-- Debugging -->
-  <ItemGroup>
-    <SourcesDebugging Include="$(CommonCodeLocation)\Diagnostics\CdbSession.cs"><Link>Test\Diagnostics\CdbSession.cs</Link> </SourcesDebugging>
-  </ItemGroup>
-
-  <!-- State Management Runtime -->
-  <ItemGroup>
-    <SourcesStateManagementRuntime Include="$(CommonCodeLocation)\Configuration\MachineStateManager.cs"> <Link>Test\Configuration\MachineStateManager.cs</Link> </SourcesStateManagementRuntime>
-  </ItemGroup>
-
-  <!-- State Management -->
-  <ItemGroup>
-    <SourcesStateManagement Include="$(CommonCodeLocation)\StateManagement\StateManager.cs"> <Link>Test\StateManagement\StateManager.cs</Link> </SourcesStateManagement>
-    <SourcesStateManagement Include="$(CommonCodeLocation)\StateManagement\State.cs"> <Link>Test\StateManagement\State.cs</Link> </SourcesStateManagement>
-    <SourcesStateManagement Include="$(CommonCodeLocation)\StateManagement\RegistryState.cs"> <Link>Test\StateManagement\RegistryState.cs</Link> </SourcesStateManagement>
-    <SourcesStateManagement Include="$(CommonCodeLocation)\StateManagement\UserSessionState.cs"> <Link>Test\StateManagement\UserSessionState.cs</Link> </SourcesStateManagement>
-    <SourcesStateManagement Include="$(CommonCodeLocation)\StateManagement\SystemInformationState.cs"> <Link>Test\StateManagement\SystemInformationState.cs</Link> </SourcesStateManagement>
-    <SourcesStateManagement Include="$(CommonCodeLocation)\StateManagement\MonitorState.cs"> <Link>Test\StateManagement\MonitorState.cs</Link> </SourcesStateManagement>
-    <SourcesStateManagement Include="$(CommonCodeLocation)\StateManagement\DisplayThemeState.cs"> <Link>Test\StateManagement\DisplayThemeState.cs</Link> </SourcesStateManagement>
-    <SourcesStateManagement Include="$(CommonCodeLocation)\StateManagement\BrowserState.cs"> <Link>Test\StateManagement\BrowserState.cs</Link> </SourcesStateManagement>
-    <SourcesStateManagement Include="$(CommonCodeLocation)\StateManagement\FirewallExceptionState.cs"> <Link>Test\StateManagement\FirewallExceptionState.cs</Link> </SourcesStateManagement>
-    <SourcesStateManagement Include="$(CommonCodeLocation)\StateManagement\ComServerState.cs"> <Link>Test\StateManagement\ComServerState.cs</Link> </SourcesStateManagement>
-  </ItemGroup>
-
-  <!-- Execution Service Client -->
-  <ItemGroup>
-    <SourcesExecutionServiceClient Include="$(CommonCodeLocation)\Diagnostics\IExecutionService.cs"> <Link>Test\Diagnostics\IExecutionService.cs</Link> </SourcesExecutionServiceClient>
-    <SourcesExecutionServiceClient Include="$(CommonCodeLocation)\Diagnostics\ExecutionServiceClient.cs"> <Link>Test\Diagnostics\ExecutionServiceClient.cs</Link> </SourcesExecutionServiceClient>
-    <SourcesExecutionServiceClient Include="$(CommonCodeLocation)\Diagnostics\ExecutionServiceClientConnection.cs"> <Link>Test\Diagnostics\ExecutionServiceClientConnection.cs</Link> </SourcesExecutionServiceClient>
-    <SourcesExecutionServiceClient Include="$(CommonCodeLocation)\Diagnostics\FirefoxHelper.cs"> <Link>Test\Diagnostics\FirefoxHelper.cs</Link> </SourcesExecutionServiceClient>
-    <SourcesExecutionServiceClient Include="$(CommonCodeLocation)\Diagnostics\FirewallHelper.cs"> <Link>Test\Diagnostics\FirewallHelper.cs</Link> </SourcesExecutionServiceClient>
-    <SourcesExecutionServiceClient Include="$(CommonCodeLocation)\Diagnostics\RegistrationHelper.cs"> <Link>Test\Diagnostics\RegistrationHelper.cs</Link> </SourcesExecutionServiceClient>
-    <SourcesExecutionServiceClient Include="$(CommonCodeLocation)\Diagnostics\UserSessionHelper.cs"> <Link>Test\Diagnostics\UserSessionHelper.cs</Link> </SourcesExecutionServiceClient>
-    <SourcesExecutionServiceClient Include="$(CommonCodeLocation)\Diagnostics\UserInfo.cs"> <Link>Test\Diagnostics\UserInfo.cs</Link> </SourcesExecutionServiceClient>
-    <SourcesExecutionServiceClient Include="$(CommonCodeLocation)\Diagnostics\WttHelper.cs"> <Link>Test\Diagnostics\WttHelper.cs</Link> </SourcesExecutionServiceClient>
-    <SourcesExecutionServiceClient Include="$(CommonCodeLocation)\Diagnostics\ImpersonateUserHelper.cs"> <Link>Test\Diagnostics\ImpersonateUserHelper.cs</Link> </SourcesExecutionServiceClient>
-    <SourcesExecutionServiceClient Include="$(CommonCriticalCodeLocation)\Deployment\RuntimeDeploymentHelper.cs"> <Link>Critical\Test\Deployment\RuntimeDeploymentHelper.cs</Link> </SourcesExecutionServiceClient>
-  </ItemGroup>
-
-  <!-- Execution Service -->
-  <ItemGroup>
-    <SourcesExecutionservice Include="$(CommonCodeLocation)\Diagnostics\ExecutionServiceProxyClient.cs"> <Link>Test\Diagnostics\ExecutionServiceProxyClient.cs</Link> </SourcesExecutionservice>
-    <SourcesExecutionservice Include="$(CommonCodeLocation)\Diagnostics\ExecutionServiceProxy.cs"> <Link>Test\Diagnostics\ExecutionServiceProxy.cs</Link> </SourcesExecutionservice>
-  </ItemGroup>
-
-  <!-- Win32 Minimal -->
-  <ItemGroup>
-    <SourcesWin32Minimal Include="$(CommonCodeLocation)\Win32\NativeStructs.cs"> <Link>Test\Win32\NativeStructs.cs</Link> </SourcesWin32Minimal>
-    <SourcesWin32Minimal Include="$(CommonCodeLocation)\Win32\NativeConstants.cs"> <Link>Test\Win32\NativeConstants.cs</Link> </SourcesWin32Minimal>
-    <SourcesWin32Minimal Include="$(CommonCodeLocation)\Win32\Gdi32.cs"> <Link>Test\Win32\Gdi32.cs</Link> </SourcesWin32Minimal>
-    <SourcesWin32Minimal Include="$(CommonCodeLocation)\Win32\User32.cs"> <Link>Test\Win32\User32.cs</Link> </SourcesWin32Minimal>
-    <SourcesWin32Minimal Include="$(CommonCodeLocation)\Win32\Kernel32.cs"> <Link>Test\Win32\Kernel32.cs</Link> </SourcesWin32Minimal>
-    <SourcesWin32Minimal Include="$(CommonCodeLocation)\Win32\WindowEnumerator.cs"> <Link>Test\Win32\WindowEnumerator.cs</Link> </SourcesWin32Minimal>
-    <SourcesWin32Minimal Include="$(CommonCodeLocation)\Win32\Ntdll.cs"> <Link>Test\Win32\Ntdll.cs</Link> </SourcesWin32Minimal>
-  </ItemGroup>
-
-  <!-- Win32 -->
-  <ItemGroup>
-    <SourcesWin32 Include="$(CommonCodeLocation)\Win32\HwndSubClass.cs"> <Link>Test\Win32\HwndSubClass.cs</Link> </SourcesWin32>
-    <SourcesWin32 Include="$(CommonCodeLocation)\Win32\HwndWrapper.cs"> <Link>Test\Win32\HwndWrapper.cs</Link> </SourcesWin32>
-    <SourcesWin32 Include="$(CommonCodeLocation)\Win32\ManagedWndProcTracker.cs"> <Link>Test\Win32\ManagedWndProcTracker.cs</Link> </SourcesWin32>
-    <SourcesWin32 Include="$(CommonCodeLocation)\Win32\NativeMethods.cs"> <Link>Test\Win32\NativeMethods.cs</Link> </SourcesWin32>
-    <SourcesWin32 Include="$(CommonCodeLocation)\Win32\WeakReferenceList.cs"> <Link>Test\Win32\WeakReferenceList.cs</Link> </SourcesWin32>
-    <SourcesWin32 Include="$(CommonCodeLocation)\Win32\WeakReferenceListEnumerator.cs"> <Link>Test\Win32\WeakReferenceListEnumerator.cs</Link> </SourcesWin32>
-    <SourcesWin32 Include="$(CommonCodeLocation)\Win32\AcceleratorTable.cs"> <Link>Test\Win32\AcceleratorTable.cs</Link> </SourcesWin32>
-    <SourcesWin32 Include="@(SourcesWin32Minimal)" />
-  </ItemGroup>
-
-  <!-- Modeling -->
-  <ItemGroup>
-    <SourcesModeling Include="$(CommonCodeLocation)\Modeling\AsyncActionManager.cs"> <Link>Test\Modeling\AsyncActionManager.cs</Link> </SourcesModeling>
-    <SourcesModeling Include="$(CommonCodeLocation)\Modeling\Model.cs"> <Link>Test\Modeling\Model.cs</Link> </SourcesModeling>
-    <SourcesModeling Include="$(CommonCodeLocation)\Modeling\ModelingBaseObject.cs"> <Link>Test\Modeling\ModelingBaseObject.cs</Link> </SourcesModeling>
-    <SourcesModeling Include="$(CommonCodeLocation)\Modeling\TestLoader.cs"> <Link>Test\Modeling\TestLoader.cs</Link> </SourcesModeling>
-    <SourcesModeling Include="$(CommonCodeLocation)\Modeling\XamlTransformer.cs"> <Link>Test\Modeling\XamlTransformer.cs</Link> </SourcesModeling>
-    <SourcesModeling Include="$(CommonCodeLocation)\Modeling\XtcParser.cs"> <Link>Test\Modeling\XtcParser.cs</Link> </SourcesModeling>
-    <SourcesModeling Include="$(CommonCodeLocation)\Modeling\XtcTestCaseLoader.cs"> <Link>Test\Modeling\XtcTestCaseLoader.cs</Link> </SourcesModeling>
-  </ItemGroup>
-
-  <!-- Windows -->
-  <ItemGroup>
-    <SourcesWindows Include="$(CommonCodeLocation)\Windows\ActionForTypeHelper.cs"> <Link>Test\Windows\ActionForTypeHelper.cs</Link> </SourcesWindows>
-    <SourcesWindows Include="$(CommonCodeLocation)\Windows\TreeComparer.cs"> <Link>Test\Windows\TreeComparer.cs</Link> </SourcesWindows>
-  </ItemGroup>
-
-  <!-- Managed Resources Windows -->
-  <ItemGroup>
-    <ManagedResourcesWindows Include="$(CommonDataLocation)\Windows\PropertiesToSkip.xml">
-      <LogicalName>PropertiesToSkip.xml</LogicalName>
-      <Link>Resources\Windows\PropertiesToSkip.xml</Link>
-    </ManagedResourcesWindows>
-  </ItemGroup>
-
-  <!-- Test -->
-  <ItemGroup>
-    <SourcesTest Include="$(CommonCodeLocation)\EventHelper.cs"> <Link>Test\EventHelper.cs</Link> </SourcesTest>
-    <SourcesTest Include="$(CommonCodeLocation)\ExceptionHelper.cs"> <Link>Test\ExceptionHelper.cs</Link> </SourcesTest>
-    <SourcesTest Include="$(CommonCodeLocation)\TestException.cs"> <Link>Test\TestException.cs</Link> </SourcesTest>
-    <SourcesTest Include="$(CommonCodeLocation)\TestSetupException.cs"> <Link>Test\TestSetupException.cs</Link> </SourcesTest>
-    <SourcesTest Include="$(CommonCodeLocation)\TestValidationException.cs"> <Link>Test\TestValidationException.cs</Link> </SourcesTest>
-  </ItemGroup>
-
-  <!-- Serialization -->
-  <ItemGroup>
-    <SourcesSerialization Include="$(CommonCodeLocation)\Serialization\BamlHelper.cs"> <Link>Test\Serialization\BamlHelper.cs</Link> </SourcesSerialization>
-    <SourcesSerialization Include="$(CommonCodeLocation)\Serialization\BamlReaderWrapper.cs"> <Link>Test\Serialization\BamlReaderWrapper.cs</Link> </SourcesSerialization>
-    <SourcesSerialization Include="$(CommonCodeLocation)\Serialization\BamlWriterWrapper.cs"> <Link>Test\Serialization\BamlWriterWrapper.cs</Link> </SourcesSerialization>
-    <SourcesSerialization Include="$(CommonCodeLocation)\Serialization\IOHelper.cs"> <Link>Test\Serialization\IOHelper.cs</Link> </SourcesSerialization>
-    <SourcesSerialization Include="$(CommonCodeLocation)\Serialization\SerializationHelper.cs"> <Link>Test\Serialization\SerializationHelper.cs</Link> </SourcesSerialization>
-    <SourcesSerialization Include="$(CommonCodeLocation)\Serialization\WrapperUtil.cs"> <Link>Test\Serialization\WrapperUtil.cs</Link> </SourcesSerialization>
-    <SourcesSerialization Include="$(CommonCodeLocation)\Serialization\XamlRoundTrip.cs"> <Link>Test\Serialization\XamlRoundTrip.cs</Link> </SourcesSerialization>
-  </ItemGroup>
-
-  <!-- Serialization Custom Elements -->
-  <ItemGroup>
-    <SourcesSerializationCustomElements Include="$(CommonCodeLocation)\Serialization\CustomElements\CustomBorder.cs"> <Link>Test\Serialization\CustomElements\CustomBorder.cs</Link> </SourcesSerializationCustomElements>
-    <SourcesSerializationCustomElements Include="$(CommonCodeLocation)\Serialization\CustomElements\CustomButton.cs"> <Link>Test\Serialization\CustomElements\CustomButton.cs</Link> </SourcesSerializationCustomElements>
-    <SourcesSerializationCustomElements Include="$(CommonCodeLocation)\Serialization\CustomElements\CustomCanvas.cs"> <Link>Test\Serialization\CustomElements\CustomCanvas.cs</Link> </SourcesSerializationCustomElements>
-    <SourcesSerializationCustomElements Include="$(CommonCodeLocation)\Serialization\CustomElements\CustomDockPanel.cs"> <Link>Test\Serialization\CustomElements\CustomDockPanel.cs</Link> </SourcesSerializationCustomElements>
-    <SourcesSerializationCustomElements Include="$(CommonCodeLocation)\Serialization\CustomElements\CustomElementHelper.cs"> <Link>Test\Serialization\CustomElements\CustomElementHelper.cs</Link> </SourcesSerializationCustomElements>
-    <SourcesSerializationCustomElements Include="$(CommonCodeLocation)\Serialization\CustomElements\CustomPage.cs"> <Link>Test\Serialization\CustomElements\CustomPage.cs</Link> </SourcesSerializationCustomElements>
-    <SourcesSerializationCustomElements Include="$(CommonCodeLocation)\Serialization\CustomElements\CustomStackPanel.cs"> <Link>Test\Serialization\CustomElements\CustomStackPanel.cs</Link> </SourcesSerializationCustomElements>
-    <SourcesSerializationCustomElements Include="$(CommonCodeLocation)\Serialization\CustomElements\CustomTextPanel.cs"> <Link>Test\Serialization\CustomElements\CustomTextPanel.cs</Link> </SourcesSerializationCustomElements>
-    <SourcesSerializationCustomElements Include="$(CommonCodeLocation)\Serialization\CustomElements\CustomWindow.cs"> <Link>Test\Serialization\CustomElements\CustomWindow.cs</Link> </SourcesSerializationCustomElements>
-    <SourcesSerializationCustomElements Include="$(CommonCodeLocation)\Serialization\CustomElements\ICustomElement.cs"> <Link>Test\Serialization\CustomElements\ICustomElement.cs</Link> </SourcesSerializationCustomElements>
-  </ItemGroup>
-
-  <!-- Integration TXR -->
-  <ItemGroup>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\ActionForXamlInfo.cs"> <Link>Test\Integration\ActionForXamlInfo.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\FileVariationGenerator.cs"> <Link>Test\Integration\FileVariationGenerator.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\FileVariationItem.cs"> <Link>Test\Integration\FileVariationItem.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\BaseTestContract.cs"> <Link>Test\Integration\BaseTestContract.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\BaseVariationGenerator.cs"> <Link>Test\Integration\BaseVariationGenerator.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\CallbackVariationGenerator.cs"> <Link>Test\Integration\CallbackVariationGenerator.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\CallbackVariationItem.cs"> <Link>Test\Integration\CallbackVariationItem.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\CollectionsXamlHelper.cs"> <Link>Test\Integration\CollectionsXamlHelper.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\CombinationGenerator.cs"> <Link>Test\Integration\CombinationGenerator.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\GeneratorReference.cs"> <Link>Test\Integration\GeneratorReference.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\Helper.cs"> <Link>Test\Integration\Helper.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\ITestContract.cs"> <Link>Test\Integration\ITestContract.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\IVariationGenerator.cs"> <Link>Test\Integration\IVariationGenerator.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\MDEVariationGenerator.cs"> <Link>Test\Integration\MDEVariationGenerator.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\MDEVariationItem.cs"> <Link>Test\Integration\MDEVariationItem.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\NotificationList.cs"> <Link>Test\Integration\NotificationList.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\StorageItem.cs"> <Link>Test\Integration\StorageItem.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\TestExtenderGraph.cs"> <Link>Test\Integration\TestExtenderGraph.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\TestExtenderOutput.cs"> <Link>Test\Integration\TestExtenderOutput.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\VariationItem.cs"> <Link>Test\Integration\VariationItem.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\VariationItemGroup.cs"> <Link>Test\Integration\VariationItemGroup.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\CommonStorage.cs"> <Link>Test\Integration\CommonStorage.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\SelectorGenerator.cs"> <Link>Test\Integration\SelectorGenerator.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\ContentItem.cs"> <Link>Test\Integration\ContentItem.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\AssemblyDesc.cs"> <Link>Test\Integration\AssemblyDesc.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\WPF3Helper.cs"> <Link>Test\Integration\WPF3Helper.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\Windows\TypeVariationGenerator.cs"> <Link>Test\Integration\Windows\TypeVariationGenerator.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\Windows\TypeVariationItem.cs"> <Link>Test\Integration\Windows\TypeVariationItem.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\Windows\ContainerVariationGenerator.cs"> <Link>Test\Integration\Windows\ContainerVariationGenerator.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\Windows\ContainerVariationItem.cs"> <Link>Test\Integration\Windows\ContainerVariationItem.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\Windows\ActionSequenceVariationGenerator.cs"> <Link>Test\Integration\Windows\ActionSequenceVariationGenerator.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\Windows\ControllerProxy.cs"> <Link>Test\Integration\Windows\ControllerProxy.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\Windows\Controller.cs"> <Link>Test\Integration\Windows\Controller.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\Windows\ThreadController.cs"> <Link>Test\Integration\Windows\ThreadController.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\Windows\ApplicationController.cs"> <Link>Test\Integration\Windows\ApplicationController.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\Windows\WinFormsController.cs"> <Link>Test\Integration\Windows\WinFormsController.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\TestExtenderHelper.cs"> <Link>Test\Integration\TestExtenderHelper.cs</Link> </SourcesIntegrationTxr>
-  </ItemGroup>
-
-  <!-- Pict -->
-  <ItemGroup>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\ObjectArrays\AllPossibleObjectArrayCollection.cs"> <Link>Test\PICT\ObjectArrays\AllPossibleObjectArrayCollection.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\ObjectArrays\AllPossibleObjectArrayEnumerator.cs"> <Link>Test\PICT\ObjectArrays\AllPossibleObjectArrayEnumerator.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\ObjectArrays\AllPossibleObjectArrayGenerationStrategy.cs"> <Link>Test\PICT\ObjectArrays\AllPossibleObjectArrayGenerationStrategy.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\ObjectArrays\IObjectArrayCollection.cs"> <Link>Test\PICT\ObjectArrays\IObjectArrayCollection.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\ObjectArrays\IObjectArrayEnumerator.cs"> <Link>Test\PICT\ObjectArrays\IObjectArrayEnumerator.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\ObjectArrays\IObjectArrayGenerationStrategy.cs"> <Link>Test\PICT\ObjectArrays\IObjectArrayGenerationStrategy.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\ObjectArrays\ObjectArrayGeneration.cs"> <Link>Test\PICT\ObjectArrays\ObjectArrayGeneration.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\ObjectArrays\ObjectArrayGenerator.cs"> <Link>Test\PICT\ObjectArrays\ObjectArrayGenerator.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\ObjectArrays\ObjectArrayPairwiseGeneration.cs"> <Link>Test\PICT\ObjectArrays\ObjectArrayPairwiseGeneration.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\ObjectArrays\PairwiseObjectArrayCollection.cs"> <Link>Test\PICT\ObjectArrays\PairwiseObjectArrayCollection.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\ObjectArrays\PairwiseObjectArrayEnumerator.cs"> <Link>Test\PICT\ObjectArrays\PairwiseObjectArrayEnumerator.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\ObjectArrays\PairwiseObjectArrayGenerationStrategy.cs"> <Link>Test\PICT\ObjectArrays\PairwiseObjectArrayGenerationStrategy.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\IPairwiseComment.cs"> <Link>Test\PICT\IPairwiseComment.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\IPairwiseVisitable.cs"> <Link>Test\PICT\IPairwiseVisitable.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseAliasCollection.cs"> <Link>Test\PICT\PairwiseAliasCollection.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseAndClause.cs"> <Link>Test\PICT\PairwiseAndClause.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseComparison.cs"> <Link>Test\PICT\PairwiseComparison.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseComparisonTerm.cs"> <Link>Test\PICT\PairwiseComparisonTerm.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseCondition.cs"> <Link>Test\PICT\PairwiseCondition.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseConditionCollection.cs"> <Link>Test\PICT\PairwiseConditionCollection.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseEqualTerm.cs"> <Link>Test\PICT\PairwiseEqualTerm.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseException.cs"> <Link>Test\PICT\PairwiseException.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseGreaterThanOrEqualTerm.cs"> <Link>Test\PICT\PairwiseGreaterThanOrEqualTerm.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseGreaterThanTerm.cs"> <Link>Test\PICT\PairwiseGreaterThanTerm.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseIfThenConstraint.cs"> <Link>Test\PICT\PairwiseIfThenConstraint.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseIfThenConstraintCollection.cs"> <Link>Test\PICT\PairwiseIfThenConstraintCollection.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseInTerm.cs"> <Link>Test\PICT\PairwiseInTerm.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseLessThanOrEqualTerm.cs"> <Link>Test\PICT\PairwiseLessThanOrEqualTerm.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseLessThanTerm.cs"> <Link>Test\PICT\PairwiseLessThanTerm.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseLikeTerm.cs"> <Link>Test\PICT\PairwiseLikeTerm.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseLogicalClause.cs"> <Link>Test\PICT\PairwiseLogicalClause.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseLogicalRelationship.cs"> <Link>Test\PICT\PairwiseLogicalRelationship.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseModel.cs"> <Link>Test\PICT\PairwiseModel.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseNotClause.cs"> <Link>Test\PICT\PairwiseNotClause.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseNotEqualTerm.cs"> <Link>Test\PICT\PairwiseNotEqualTerm.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseNotInTerm.cs"> <Link>Test\PICT\PairwiseNotInTerm.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseOrClause.cs"> <Link>Test\PICT\PairwiseOrClause.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseParameter.cs"> <Link>Test\PICT\PairwiseParameter.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseParameterCollection.cs"> <Link>Test\PICT\PairwiseParameterCollection.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseParameterConstraint.cs"> <Link>Test\PICT\PairwiseParameterConstraint.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseParameterConstraintCollection.cs"> <Link>Test\PICT\PairwiseParameterConstraintCollection.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwisePICTCache.cs"> <Link>Test\PICT\PairwisePICTCache.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseSettings.cs"> <Link>Test\PICT\PairwiseSettings.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseSubModel.cs"> <Link>Test\PICT\PairwiseSubModel.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseSubModelCollection.cs"> <Link>Test\PICT\PairwiseSubModelCollection.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseTerm.cs"> <Link>Test\PICT\PairwiseTerm.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseTuple.cs"> <Link>Test\PICT\PairwiseTuple.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseValue.cs"> <Link>Test\PICT\PairwiseValue.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseValueCollection.cs"> <Link>Test\PICT\PairwiseValueCollection.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseValueType.cs"> <Link>Test\PICT\PairwiseValueType.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseVisitor.cs"> <Link>Test\PICT\PairwiseVisitor.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PICTConstants.cs"> <Link>Test\PICT\PICTConstants.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PICTExecutionInformation.cs"> <Link>Test\PICT\PICTExecutionInformation.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PICTPairwiseVisitor.cs"> <Link>Test\PICT\PICTPairwiseVisitor.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PICTRunner.cs"> <Link>Test\PICT\PICTRunner.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PICTWarningBehaviors.cs"> <Link>Test\PICT\PICTWarningBehaviors.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PICTWarningEventArgs.cs"> <Link>Test\PICT\PICTWarningEventArgs.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PICTWarningEventHandler.cs"> <Link>Test\PICT\PICTWarningEventHandler.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\MatrixOutput\PairwiseTestCase.cs"> <Link>Test\PICT\MatrixOutput\PairwiseTestCase.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\MatrixOutput\PairwiseTestMatrix.cs"> <Link>Test\PICT\MatrixOutput\PairwiseTestMatrix.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\MatrixOutput\PairwiseTestParameter.cs"> <Link>Test\PICT\MatrixOutput\PairwiseTestParameter.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\MatrixOutput\PairwiseHelper.cs"> <Link>Test\PICT\MatrixOutput\PairwiseTestParameter.cs</Link> </SourcesPict>
-  </ItemGroup>
-  
-  <!-- Imaging -->
-  <ItemGroup>
-    <SourcesImaging Include="$(CommonCodeLocation)\Imaging\BitmapCapture.cs"> <Link>Test\Imaging\BitmapCapture.cs</Link> </SourcesImaging>
-    <SourcesImaging Include="$(CommonCodeLocation)\Imaging\BitmapUtils.cs"> <Link>Test\Imaging\BitmapUtils.cs</Link> </SourcesImaging>
-    <SourcesImaging Include="$(CommonCodeLocation)\Imaging\ColorUtils.cs"> <Link>Test\Imaging\ColorUtils.cs</Link> </SourcesImaging>
-    <SourcesImaging Include="$(CommonCodeLocation)\Imaging\ComparisonAlgorithm.cs"> <Link>Test\Imaging\ComparisonAlgorithm.cs</Link> </SourcesImaging>
-    <SourcesImaging Include="$(CommonCodeLocation)\Imaging\ComparisonCriteria.cs"> <Link>Test\Imaging\ComparisonCriteria.cs</Link> </SourcesImaging>
-    <SourcesImaging Include="$(CommonCodeLocation)\Imaging\ComparisonOperation.cs"> <Link>Test\Imaging\ComparisonOperation.cs</Link> </SourcesImaging>
-    <SourcesImaging Include="$(CommonCodeLocation)\Imaging\ComparisonOperationUtils.cs"> <Link>Test\Imaging\ComparisonOperationUtils.cs</Link> </SourcesImaging>
-    <SourcesImaging Include="$(CommonCodeLocation)\Imaging\ComparisonResult.cs"> <Link>Test\Imaging\ComparisonResult.cs</Link> </SourcesImaging>
-    <SourcesImaging Include="$(CommonCodeLocation)\Imaging\ElementUtils.cs"> <Link>Test\Imaging\ElementUtils.cs</Link> </SourcesImaging>
-    <SourcesImaging Include="$(CommonCodeLocation)\Imaging\PixelData.cs"> <Link>Test\Imaging\PixelData.cs</Link> </SourcesImaging>
-  </ItemGroup>
-
-  <!-- Animation -->
-  <ItemGroup>
-    <SourcesAnimation Include="$(CommonCodeLocation)\Animation\AnimationSideBySide.cs"> <Link>Test\Animation\AnimationSideBySide.cs</Link> </SourcesAnimation>
-    <SourcesAnimation Include="$(CommonCodeLocation)\Animation\AnimationUtils.cs"> <Link>Test\Animation\AnimationUtils.cs</Link> </SourcesAnimation>
-    <SourcesAnimation Include="$(CommonCodeLocation)\Animation\AnimationValidator.cs"> <Link>Test\Animation\AnimationValidator.cs</Link> </SourcesAnimation>
-    <SourcesAnimation Include="$(CommonCodeLocation)\Animation\TimeManagerCommon.cs"> <Link>Test\Animation\TimeManagerCommon.cs</Link> </SourcesAnimation>
-  </ItemGroup>
-
-  <!-- Rendering VScan -->
-  <ItemGroup>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\ColorByte.cs"> <Link>Test\RenderingVerification\ColorByte.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\ColorDouble.cs"> <Link>Test\RenderingVerification\ColorDouble.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Color_Avalon.cs"> <Link>Test\RenderingVerification\Color_Avalon.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Curve.cs"> <Link>Test\RenderingVerification\Curve.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\CurveTolerance.cs"> <Link>Test\RenderingVerification\CurveTolerance.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\DisplayConfiguration.cs"> <Link>Test\RenderingVerification\DisplayConfiguration.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\DisplayConfigurationMinimal.cs"> <Link>Test\RenderingVerification\DisplayConfigurationMinimal.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Exceptions.cs"> <Link>Test\RenderingVerification\Exceptions.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\ImageAdapter.cs"> <Link>Test\RenderingVerification\ImageAdapter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\ImageComparator.cs"> <Link>Test\RenderingVerification\ImageComparator.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\ImageUtility.cs"> <Link>Test\RenderingVerification\ImageUtility.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\ImageUtilityProxy.cs"> <Link>Test\RenderingVerification\ImageUtilityProxy.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\ImageUtility_Avalon.cs"> <Link>Test\RenderingVerification\ImageUtility_Avalon.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Interfaces.cs"> <Link>Test\RenderingVerification\Interfaces.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\IPUtil.cs"> <Link>Test\RenderingVerification\IPUtil.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\KeepGreaterKey.cs"> <Link>Test\RenderingVerification\KeepGreaterKey.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\MetaDataInfo.cs"> <Link>Test\RenderingVerification\MetaDataInfo.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\MismatchingPoints.cs"> <Link>Test\RenderingVerification\MismatchingPoints.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Package.cs"> <Link>Test\RenderingVerification\Package.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Pixel.cs"> <Link>Test\RenderingVerification\Pixel.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\PInvoke.cs"> <Link>Test\RenderingVerification\PInvoke.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\PropertyItemWrapper.cs"> <Link>Test\RenderingVerification\PropertyItemWrapper.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\RuntimeInfo.cs"> <Link>Test\RenderingVerification\RuntimeInfo.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\RenderRect.cs"> <Link>Test\RenderingVerification\RenderRect.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\VideoCapture.cs"> <Link>Test\RenderingVerification\VideoCapture.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\XamlLauncherReflect.cs"> <Link>Test\RenderingVerification\XamlLauncherReflect.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\AffineFilter.cs"> <Link>Test\RenderingVerification\Filters\AffineFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\AttractorFilter.cs"> <Link>Test\RenderingVerification\Filters\AttractorFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\BlurFilter.cs"> <Link>Test\RenderingVerification\Filters\BlurFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\BrightnessContrastFilter.cs"> <Link>Test\RenderingVerification\Filters\BrightnessContrastFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\ChannelOperationFilter.cs"> <Link>Test\RenderingVerification\Filters\ChannelOperationFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\ColorFilter.cs"> <Link>Test\RenderingVerification\Filters\ColorFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\ColorSpaceConversion.cs"> <Link>Test\RenderingVerification\Filters\ColorSpaceConversion.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\ColorTransformFilter.cs"> <Link>Test\RenderingVerification\Filters\ColorTransformFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\ContrastFilter.cs"> <Link>Test\RenderingVerification\Filters\ContrastFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\ConvolutionFilter.cs"> <Link>Test\RenderingVerification\Filters\ConvolutionFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\EqualizeFilter.cs"> <Link>Test\RenderingVerification\Filters\EqualizeFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\Filter.cs"> <Link>Test\RenderingVerification\Filters\Filter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\FilterParameter.cs"> <Link>Test\RenderingVerification\Filters\FilterParameter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\FlipRotateFilter.cs"> <Link>Test\RenderingVerification\Filters\FlipRotateFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\GammaCorrectFilter.cs"> <Link>Test\RenderingVerification\Filters\GammaCorrectFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\GaussianFilter.cs"> <Link>Test\RenderingVerification\Filters\GaussianFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\GlowFilter.cs"> <Link>Test\RenderingVerification\Filters\GlowFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\GrayscaleFilter.cs"> <Link>Test\RenderingVerification\Filters\GrayscaleFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\IColorConverter.cs"> <Link>Test\RenderingVerification\Filters\IColorConverter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\Image2DTransforms.cs"> <Link>Test\RenderingVerification\Filters\Image2DTransforms.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\Interpolator.cs"> <Link>Test\RenderingVerification\Filters\Interpolator.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\LogicalOperationFilter.cs"> <Link>Test\RenderingVerification\Filters\LogicalOperationFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\Matrix2D.cs"> <Link>Test\RenderingVerification\Filters\Matrix2D.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\Matrix2DConverter.cs"> <Link>Test\RenderingVerification\Filters\Matrix2DConverter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\MorphologicalFilter.cs"> <Link>Test\RenderingVerification\Filters\MorphologicalFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\MorphShapeFilter.cs"> <Link>Test\RenderingVerification\Filters\MorphShapeFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\NegateFilter.cs"> <Link>Test\RenderingVerification\Filters\NegateFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\OpacityPointsFilter.cs"> <Link>Test\RenderingVerification\Filters\OpacityPointsFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\OrderStatisticFilter.cs"> <Link>Test\RenderingVerification\Filters\OrderStatisticFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\PixelizeFilter.cs"> <Link>Test\RenderingVerification\Filters\PixelizeFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\ProcessXmlFilter.cs"> <Link>Test\RenderingVerification\Filters\ProcessXmlFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\RenderingColorConverter.cs"> <Link>Test\RenderingVerification\Filters\RenderingColorConverter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\SaturateEdgeFilter.cs"> <Link>Test\RenderingVerification\Filters\SaturateEdgeFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\SchematizationFilter.cs"> <Link>Test\RenderingVerification\Filters\SchematizationFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\SharpenFilter.cs"> <Link>Test\RenderingVerification\Filters\SharpenFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\SpatialTransformFilter.cs"> <Link>Test\RenderingVerification\Filters\SpatialTransformFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\TintFilter.cs"> <Link>Test\RenderingVerification\Filters\TintFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\TintShadeFilter.cs"> <Link>Test\RenderingVerification\Filters\TintShadeFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\VMorph.cs"> <Link>Test\RenderingVerification\Filters\VMorph.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\WaveletTransformFilter.cs"> <Link>Test\RenderingVerification\Filters\WaveletTransformFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\WVMorph.cs"> <Link>Test\RenderingVerification\Filters\WVMorph.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Analytical\CartesianMomentDescriptor.cs"> <Link>Test\RenderingVerification\Models\Analytical\CartesianMomentDescriptor.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Analytical\Criterion.cs"> <Link>Test\RenderingVerification\Models\Analytical\Criterion.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Analytical\DescriptorBase.cs"> <Link>Test\RenderingVerification\Models\Analytical\DescriptorBase.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Analytical\DescriptorInfo.cs"> <Link>Test\RenderingVerification\Models\Analytical\DescriptorInfo.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Analytical\DescriptorManager.cs"> <Link>Test\RenderingVerification\Models\Analytical\DescriptorManager.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Analytical\DescriptorSquareMatrix.cs"> <Link>Test\RenderingVerification\Models\Analytical\DescriptorSquareMatrix.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Analytical\ImageToShapeIDMapping.cs"> <Link>Test\RenderingVerification\Models\Analytical\ImageToShapeIDMapping.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Analytical\Interfaces.cs"> <Link>Test\RenderingVerification\Models\Analytical\Interfaces.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Analytical\ModelManager2.cs"> <Link>Test\RenderingVerification\Models\Analytical\ModelManager2.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Analytical\MomentDescriptorBase.cs"> <Link>Test\RenderingVerification\Models\Analytical\MomentDescriptorBase.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Analytical\PolarMomentDescriptor.cs"> <Link>Test\RenderingVerification\Models\Analytical\PolarMomentDescriptor.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Analytical\VScan.cs"> <Link>Test\RenderingVerification\Models\Analytical\VScan.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\AnimatedProperty.cs"> <Link>Test\RenderingVerification\Models\Synthetical\AnimatedProperty.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\Animator.cs"> <Link>Test\RenderingVerification\Models\Synthetical\Animator.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\AvalonTypographer.cs"> <Link>Test\RenderingVerification\Models\Synthetical\AvalonTypographer.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\DeltaImageComparator.cs"> <Link>Test\RenderingVerification\Models\Synthetical\DeltaImageComparator.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\GeometryFilter.cs"> <Link>Test\RenderingVerification\Models\Synthetical\GeometryFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\GlyphBase.cs"> <Link>Test\RenderingVerification\Models\Synthetical\GlyphBase.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\GlyphChar.cs"> <Link>Test\RenderingVerification\Models\Synthetical\GlyphChar.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\GlyphColorChooser.cs"> <Link>Test\RenderingVerification\Models\Synthetical\GlyphColorChooser.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\GlyphComparator.cs"> <Link>Test\RenderingVerification\Models\Synthetical\GlyphComparator.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\GlyphCompareInfo.cs"> <Link>Test\RenderingVerification\Models\Synthetical\GlyphCompareInfo.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\GlyphContainer.cs"> <Link>Test\RenderingVerification\Models\Synthetical\GlyphContainer.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\GlyphFont.cs"> <Link>Test\RenderingVerification\Models\Synthetical\GlyphFont.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\GlyphImage.cs"> <Link>Test\RenderingVerification\Models\Synthetical\GlyphImage.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\GlyphLayout.cs"> <Link>Test\RenderingVerification\Models\Synthetical\GlyphLayout.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\GlyphModel.cs"> <Link>Test\RenderingVerification\Models\Synthetical\GlyphModel.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\GlyphPanel.cs"> <Link>Test\RenderingVerification\Models\Synthetical\GlyphPanel.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\GlyphResource.cs"> <Link>Test\RenderingVerification\Models\Synthetical\GlyphResource.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\GlyphShape.cs"> <Link>Test\RenderingVerification\Models\Synthetical\GlyphShape.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\GlyphText.cs"> <Link>Test\RenderingVerification\Models\Synthetical\GlyphText.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\Interfaces.cs"> <Link>Test\RenderingVerification\Models\Synthetical\Interfaces.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\LayoutContainer.cs"> <Link>Test\RenderingVerification\Models\Synthetical\LayoutContainer.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\MatchingInfo.cs"> <Link>Test\RenderingVerification\Models\Synthetical\MatchingInfo.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\MatchingInfoEditor.cs"> <Link>Test\RenderingVerification\Models\Synthetical\MatchingInfoEditor.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\StandardTypographer.cs"> <Link>Test\RenderingVerification\Models\Synthetical\StandardTypographer.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\TypographBroker.cs"> <Link>Test\RenderingVerification\Models\Synthetical\TypographBroker.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\XenoSymbolBroker.cs"> <Link>Test\RenderingVerification\Models\Synthetical\XenoSymbolBroker.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\LayoutEngine\CanvasLayoutEngine.cs"> <Link>Test\RenderingVerification\Models\Synthetical\LayoutEngine\CanvasLayoutEngine.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\LayoutEngine\FlowLayoutEngine.cs"> <Link>Test\RenderingVerification\Models\Synthetical\LayoutEngine\FlowLayoutEngine.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\ResourceFetcher\EmbeddedResourceKey.cs"> <Link>Test\RenderingVerification\ResourceFetcher\EmbeddedResourceKey.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\ResourceFetcher\EmbeddedResourceProvider.cs"> <Link>Test\RenderingVerification\ResourceFetcher\EmbeddedResourceProvider.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\ResourceFetcher\ResourceProvider.cs"> <Link>Test\RenderingVerification\ResourceFetcher\ResourceProvider.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\ResourceFetcher\Resourcestripper.cs"> <Link>Test\RenderingVerification\ResourceFetcher\Resourcestripper.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\UnmanagedProxies\UnmanagedInterfaces.cs"> <Link>Test\RenderingVerification\UnmanagedProxies\UnmanagedInterfaces.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\AsyncData.cs"> <Link>Test\RenderingVerification\AsyncData.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\AsyncHelper.cs"> <Link>Test\RenderingVerification\AsyncHelper.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\ImageComparisonResult.cs"> <Link>Test\RenderingVerification\ImageComparisonResult.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\ImageComparisonSettings.cs"> <Link>Test\RenderingVerification\ImageComparisonSettings.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\ImageMetadata.cs"> <Link>Test\RenderingVerification\ImageMetadata.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\MasterDimensions.cs"> <Link>Test\RenderingVerification\MasterDimensions.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\MasterImageComparer.cs"> <Link>Test\RenderingVerification\MasterImageComparer.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\MasterIndex.cs"> <Link>Test\RenderingVerification\MasterIndex.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\MasterMetadata.cs"> <Link>Test\RenderingVerification\MasterMetadata.cs</Link> </SourcesRenderingverification>
-  </ItemGroup>
-
-  <!-- Managed Resource Vscan -->
-  <ItemGroup>
-    <ManagedResourcesVscan Include="$(CommonCodeLocation)\RenderingVerification\DefaultTolerance.xml">
-      <LogicalName>Microsoft.Test.RenderingVerification.RenderingVerification.DefaultTolerance.xml</LogicalName>
-      <Link>Resources\VScan\DefaultTolerance.xml</Link>
-    </ManagedResourcesVscan>
-  </ItemGroup>
-
-  <!-- Compression -->
-  <ItemGroup>
-    <SourcesCompression Include="$(CommonCodeLocation)\Compression\Archiver.cs"> <Link>Test\Compression\Archiver.cs</Link> </SourcesCompression>
-    <SourcesCompression Include="$(CommonCodeLocation)\Compression\Cab\Cab.cs"> <Link>Test\Compression\Cab\Cab.cs</Link> </SourcesCompression>
-    <SourcesCompression Include="$(CommonCodeLocation)\Compression\Cab\CabApi.cs"> <Link>Test\Compression\Cab\CabApi.cs</Link> </SourcesCompression>
-    <SourcesCompression Include="$(CommonCodeLocation)\Compression\Cab\CabBase.cs"> <Link>Test\Compression\Cab\CabBase.cs</Link> </SourcesCompression>
-    <SourcesCompression Include="$(CommonCodeLocation)\Compression\Cab\CabCreator.cs"> <Link>Test\Compression\Cab\CabCreator.cs</Link> </SourcesCompression>
-    <SourcesCompression Include="$(CommonCodeLocation)\Compression\Cab\CabException.cs"> <Link>Test\Compression\Cab\CabException.cs</Link> </SourcesCompression>
-    <SourcesCompression Include="$(CommonCodeLocation)\Compression\Cab\CabExtractor.cs"> <Link>Test\Compression\Cab\CabExtractor.cs</Link> </SourcesCompression>
-    <SourcesCompression Include="$(CommonCodeLocation)\Compression\Cab\CabInfo.cs"> <Link>Test\Compression\Cab\CabInfo.cs</Link> </SourcesCompression>
-    <SourcesCompression Include="$(CommonCodeLocation)\Compression\Cab\CabStatus.cs"> <Link>Test\Compression\Cab\CabStatus.cs</Link> </SourcesCompression>
-    <SourcesCompression Include="$(CommonCodeLocation)\Compression\Cab\DuplicateStream.cs"> <Link>Test\Compression\Cab\DuplicateStream.cs</Link> </SourcesCompression>
-    <SourcesCompression Include="$(CommonCodeLocation)\Compression\Cab\HandleManager.cs"> <Link>Test\Compression\Cab\HandleManager.cs</Link> </SourcesCompression>
-    <SourcesCompression Include="$(CommonCodeLocation)\Compression\Cab\OffsetStream.cs"> <Link>Test\Compression\Cab\OffsetStream.cs</Link> </SourcesCompression>
-  </ItemGroup>
-
-  <!-- Graphics Base -->
-  <ItemGroup>
-    <SourcesGraphicsBase Include="$(CommonCodeLocation)\Graphics\ColorOperations.cs"> <Link>Test\Graphics\ColorOperations.cs</Link> </SourcesGraphicsBase>
-    <SourcesGraphicsBase Include="$(CommonCodeLocation)\Graphics\DiscreteAnimation.cs"> <Link>Test\Graphics\DiscreteAnimation.cs</Link> </SourcesGraphicsBase>
-    <SourcesGraphicsBase Include="$(CommonCodeLocation)\Graphics\MathEx.cs"> <Link>Test\Graphics\MathEx.cs</Link> </SourcesGraphicsBase>
-    <SourcesGraphicsBase Include="$(CommonCodeLocation)\Graphics\Matrix3DAnimation.cs"> <Link>Test\Graphics\Matrix3DAnimation.cs</Link> </SourcesGraphicsBase>
-    <SourcesGraphicsBase Include="$(CommonCodeLocation)\Graphics\MatrixUtils.cs"> <Link>Test\Graphics\MatrixUtils.cs</Link> </SourcesGraphicsBase>
-    <SourcesGraphicsBase Include="$(CommonCodeLocation)\Graphics\MeshOperations.cs"> <Link>Test\Graphics\MeshOperations.cs</Link> </SourcesGraphicsBase>
-    <SourcesGraphicsBase Include="$(CommonCodeLocation)\Graphics\ObjectUtils.cs"> <Link>Test\Graphics\ObjectUtils.cs</Link> </SourcesGraphicsBase>
-    <SourcesGraphicsBase Include="$(CommonCodeLocation)\Graphics\StringConverter.cs"> <Link>Test\Graphics\StringConverter.cs</Link> </SourcesGraphicsBase>
-    <SourcesGraphicsBase Include="$(CommonCodeLocation)\Graphics\VisualUtils.cs"> <Link>Test\Graphics\VisualUtils.cs</Link> </SourcesGraphicsBase>
-    <SourcesGraphicsBase Include="$(CommonCodeLocation)\Graphics\DpiScalingHelper.cs"> <Link>Test\Graphics\DpiScalingHelper.cs</Link> </SourcesGraphicsBase>
-    <SourcesGraphicsBase Include="$(CommonCodeLocation)\Graphics\RenderingModeHelper.cs"> <Link>Test\Graphics\RenderingModeHelper.cs</Link> </SourcesGraphicsBase>
-    <SourcesGraphicsBase Include="$(CommonCodeLocation)\Graphics\RenderingMode.cs"> <Link>Test\Graphics\RenderingMode.cs</Link> </SourcesGraphicsBase>
-  </ItemGroup>
-
-  <!-- Graphics Factories -->
-  <ItemGroup>
-    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\BrushFactory.cs"> <Link>Test\Graphics\Factories\BrushFactory.cs</Link> </SourcesGraphicsFactories>
-    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\CameraFactory.cs"> <Link>Test\Graphics\Factories\CameraFactory.cs</Link> </SourcesGraphicsFactories>
-    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\Const.cs"> <Link>Test\Graphics\Factories\Const.cs</Link> </SourcesGraphicsFactories>
-    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\Const2D.cs"> <Link>Test\Graphics\Factories\Const2D.cs</Link> </SourcesGraphicsFactories>
-    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\DrawingFactory.cs"> <Link>Test\Graphics\Factories\DrawingFactory.cs</Link> </SourcesGraphicsFactories>
-    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\EffectFactory.cs"> <Link>Test\Graphics\Factories\EffectFactory.cs</Link> </SourcesGraphicsFactories>
-    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\EffectInputFactory.cs"> <Link>Test\Graphics\Factories\EffectInputFactory.cs</Link> </SourcesGraphicsFactories>
-    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\GeometryFactory.cs"> <Link>Test\Graphics\Factories\GeometryFactory.cs</Link> </SourcesGraphicsFactories>
-    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\HitTestFilterFactory.cs"> <Link>Test\Graphics\Factories\HitTestFilterFactory.cs</Link> </SourcesGraphicsFactories>
-    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\LightFactory.cs"> <Link>Test\Graphics\Factories\LightFactory.cs</Link> </SourcesGraphicsFactories>
-    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\MaterialFactory.cs"> <Link>Test\Graphics\Factories\MaterialFactory.cs</Link> </SourcesGraphicsFactories>
-    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\MeshFactory.cs"> <Link>Test\Graphics\Factories\MeshFactory.cs</Link> </SourcesGraphicsFactories>
-    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\ModelFactory.cs"> <Link>Test\Graphics\Factories\ModelFactory.cs</Link> </SourcesGraphicsFactories>
-    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\ObjectFactory.cs"> <Link>Test\Graphics\Factories\ObjectFactory.cs</Link> </SourcesGraphicsFactories>
-    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\PenFactory.cs"> <Link>Test\Graphics\Factories\PenFactory.cs</Link> </SourcesGraphicsFactories>
-    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\SceneFactory.cs"> <Link>Test\Graphics\Factories\SceneFactory.cs</Link> </SourcesGraphicsFactories>
-    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\ShapeFactory.cs"> <Link>Test\Graphics\Factories\ShapeFactory.cs</Link> </SourcesGraphicsFactories>
-    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\Transform2DFactory.cs"> <Link>Test\Graphics\Factories\Transform2DFactory.cs</Link> </SourcesGraphicsFactories>
-    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\TransformFactory.cs"> <Link>Test\Graphics\Factories\TransformFactory.cs</Link> </SourcesGraphicsFactories>
-    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\Visual3DFactory.cs"> <Link>Test\Graphics\Factories\Visual3DFactory.cs</Link> </SourcesGraphicsFactories>
-    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\VisualFactory.cs"> <Link>Test\Graphics\Factories\VisualFactory.cs</Link> </SourcesGraphicsFactories>
-  </ItemGroup>
-
-  <!-- Graphics Reference Renderer -->
-  <ItemGroup>
-    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\BiLinearTextureFilter.cs"> <Link>Test\Graphics\ReferenceRender\BiLinearTextureFilter.cs</Link> </SourcesGraphicsReferenceRender>
-    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\Edge.cs"> <Link>Test\Graphics\ReferenceRender\Edge.cs</Link> </SourcesGraphicsReferenceRender>
-    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\GouraudShader.cs"> <Link>Test\Graphics\ReferenceRender\GouraudShader.cs</Link> </SourcesGraphicsReferenceRender>
-    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\HdrColor.cs"> <Link>Test\Graphics\ReferenceRender\HdrColor.cs</Link> </SourcesGraphicsReferenceRender>
-    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\Interpolators.cs"> <Link>Test\Graphics\ReferenceRender\Interpolators.cs</Link> </SourcesGraphicsReferenceRender>
-    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\LightEquations.cs"> <Link>Test\Graphics\ReferenceRender\LightEquations.cs</Link> </SourcesGraphicsReferenceRender>
-    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\MeshProjectedGeometry.cs"> <Link>Test\Graphics\ReferenceRender\MeshProjectedGeometry.cs</Link> </SourcesGraphicsReferenceRender>
-    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\ModelBounder.cs"> <Link>Test\Graphics\ReferenceRender\ModelBounder.cs</Link> </SourcesGraphicsReferenceRender>
-    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\ModelRenderer.cs"> <Link>Test\Graphics\ReferenceRender\ModelRenderer.cs</Link> </SourcesGraphicsReferenceRender>
-    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\NearestNeighbourTextureFilter.cs"> <Link>Test\Graphics\ReferenceRender\NearestNeighbourTextureFilter.cs</Link> </SourcesGraphicsReferenceRender>
-    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\PhongShader.cs"> <Link>Test\Graphics\ReferenceRender\PhongShader.cs</Link> </SourcesGraphicsReferenceRender>
-    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\ProjectedGeometry.cs"> <Link>Test\Graphics\ReferenceRender\ProjectedGeometry.cs</Link> </SourcesGraphicsReferenceRender>
-    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\RenderBuffer.cs"> <Link>Test\Graphics\ReferenceRender\RenderBuffer.cs</Link> </SourcesGraphicsReferenceRender>
-    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\RenderTolerance.cs"> <Link>Test\Graphics\ReferenceRender\RenderTolerance.cs</Link> </SourcesGraphicsReferenceRender>
-    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\RenderToToleranceShader.cs"> <Link>Test\Graphics\ReferenceRender\RenderToToleranceShader.cs</Link> </SourcesGraphicsReferenceRender>
-    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\RenderVerifier.cs"> <Link>Test\Graphics\ReferenceRender\RenderVerifier.cs</Link> </SourcesGraphicsReferenceRender>
-    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\SceneRenderer.cs"> <Link>Test\Graphics\ReferenceRender\SceneRenderer.cs</Link> </SourcesGraphicsReferenceRender>
-    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\Shader.cs"> <Link>Test\Graphics\ReferenceRender\Shader.cs</Link> </SourcesGraphicsReferenceRender>
-    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\SolidColorTextureFilter.cs"> <Link>Test\Graphics\ReferenceRender\SolidColorTextureFilter.cs</Link> </SourcesGraphicsReferenceRender>
-    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\SSLProjectedGeometry.cs"> <Link>Test\Graphics\ReferenceRender\SSLProjectedGeometry.cs</Link> </SourcesGraphicsReferenceRender>
-    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\TextureFilter.cs"> <Link>Test\Graphics\ReferenceRender\TextureFilter.cs</Link> </SourcesGraphicsReferenceRender>
-    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\TextureGenerator.cs"> <Link>Test\Graphics\ReferenceRender\TextureGenerator.cs</Link> </SourcesGraphicsReferenceRender>
-    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\Triangle.cs"> <Link>Test\Graphics\ReferenceRender\Triangle.cs</Link> </SourcesGraphicsReferenceRender>
-    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\TriLinearTextureFilter.cs"> <Link>Test\Graphics\ReferenceRender\TriLinearTextureFilter.cs</Link> </SourcesGraphicsReferenceRender>
-    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\Vertex.cs"> <Link>Test\Graphics\ReferenceRender\Vertex.cs</Link> </SourcesGraphicsReferenceRender>
-    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\VisualBounder.cs"> <Link>Test\Graphics\ReferenceRender\VisualBounder.cs</Link> </SourcesGraphicsReferenceRender>
-  </ItemGroup>
-
-  <!-- Graphics Test Types -->
-  <ItemGroup>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\AnimationAPITest.cs"> <Link>Test\Graphics\TestTypes\AnimationAPITest.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\AnimationAPITestBase.cs"> <Link>Test\Graphics\TestTypes\AnimationAPITestBase.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\ClassGenerator.cs"> <Link>Test\Graphics\TestTypes\ClassGenerator.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\CodeGenerator.cs"> <Link>Test\Graphics\TestTypes\CodeGenerator.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\ConstructorGenerator.cs"> <Link>Test\Graphics\TestTypes\ConstructorGenerator.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\CoreGraphicsTest.cs"> <Link>Test\Graphics\TestTypes\CoreGraphicsTest.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\EnvironmentWrapper.cs"> <Link>Test\Graphics\TestTypes\EnvironmentWrapper.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\ExceptionCatchingTest.cs"> <Link>Test\Graphics\TestTypes\ExceptionCatchingTest.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\Exceptions.cs"> <Link>Test\Graphics\TestTypes\Exceptions.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\FactoryParser.cs"> <Link>Test\Graphics\TestTypes\FactoryParser.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\InfoOrganizer.cs"> <Link>Test\Graphics\TestTypes\InfoOrganizer.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\InheritanceChecker.cs"> <Link>Test\Graphics\TestTypes\InheritanceChecker.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\Interop.cs"> <Link>Test\Graphics\TestTypes\Interop.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\Logger.cs"> <Link>Test\Graphics\TestTypes\Logger.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\MethodGenerator.cs"> <Link>Test\Graphics\TestTypes\MethodGenerator.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\MethodGeneratorBase.cs"> <Link>Test\Graphics\TestTypes\MethodGeneratorBase.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\PartialTrust.cs"> <Link>Test\Graphics\TestTypes\PartialTrust.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\PhotoConverter.cs"> <Link>Test\Graphics\TestTypes\PhotoConverter.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\Photographer.cs"> <Link>Test\Graphics\TestTypes\Photographer.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\PropertyGenerator.cs"> <Link>Test\Graphics\TestTypes\PropertyGenerator.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\ReferenceTest.cs"> <Link>Test\Graphics\TestTypes\ReferenceTest.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\RenderingTest.cs"> <Link>Test\Graphics\TestTypes\RenderingTest.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\RenderingWindow.cs"> <Link>Test\Graphics\TestTypes\RenderingWindow.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\RunAllTester.cs"> <Link>Test\Graphics\TestTypes\RunAllTester.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\RunScriptTester.cs"> <Link>Test\Graphics\TestTypes\RunScriptTester.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\SerializationTest.cs"> <Link>Test\Graphics\TestTypes\SerializationTest.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\Tester.cs"> <Link>Test\Graphics\TestTypes\Tester.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\TestLauncher.cs"> <Link>Test\Graphics\TestTypes\TestLauncher.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\TestObjects.cs"> <Link>Test\Graphics\TestTypes\TestObjects.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\Tokens.cs"> <Link>Test\Graphics\TestTypes\Tokens.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\Variation.cs"> <Link>Test\Graphics\TestTypes\Variation.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\ViewportWindow.cs"> <Link>Test\Graphics\TestTypes\ViewportWindow.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\VisualObjects.cs"> <Link>Test\Graphics\TestTypes\VisualObjects.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\VisualVerificationTest.cs"> <Link>Test\Graphics\TestTypes\VisualVerificationTest.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\VisualWindow.cs"> <Link>Test\Graphics\TestTypes\VisualWindow.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\VisualWrapper.cs"> <Link>Test\Graphics\TestTypes\VisualWrapper.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\XAMLTest.cs"> <Link>Test\Graphics\TestTypes\XAMLTest.cs</Link> </SourcesGraphicsTestTypes>
-  </ItemGroup>
-
-  <!-- Graphics -->
-  <ItemGroup>
-    <SourcesGraphics Include="@(SourcesGraphicsBase)" />
-    <SourcesGraphics Include="@(SourcesGraphicsFactories)" />
-    <SourcesGraphics Include="@(SourcesGraphicsReferenceRender)" />
-    <SourcesGraphics Include="@(SourcesGraphicsTestTypes)" />
-  </ItemGroup>
-
-  <!-- Layout Common -->
-  <ItemGroup>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\Common\Common.cs"> <Link>Test\Layout\Common\Common.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\Common\LayoutTestWindows.cs"> <Link>Test\Layout\Common\LayoutTestWindows.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\Common\LayoutUtility.cs"> <Link>Test\Layout\Common\LayoutUtility.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\Common\DoubleUtil.cs"> <Link>Test\Layout\Common\DoubleUtil.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\Common\VisualScan.cs"> <Link>Test\Layout\Common\VisualScan.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\TestTypes\LayoutTest.cs"> <Link>Test\Layout\TestTypes\LayoutTest.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\TestTypes\CodeTest.cs"> <Link>Test\Layout\TestTypes\CodeTest.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\TestTypes\PropertyDumpTest.cs"> <Link>Test\Layout\TestTypes\PropertyDumpTest.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\TestTypes\VisualScanTest.cs"> <Link>Test\Layout\TestTypes\VisualScanTest.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\Arguments.cs"> <Link>Test\Layout\PropertyDump\Arguments.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\DiffPackage.cs"> <Link>Test\Layout\PropertyDump\DiffPackage.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\Filter.cs"> <Link>Test\Layout\PropertyDump\Filter.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\FrameworkElements.cs"> <Link>Test\Layout\PropertyDump\FrameworkElements.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\Package.cs"> <Link>Test\Layout\PropertyDump\Package.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\PropertyDumpCore.cs"> <Link>Test\Layout\PropertyDump\PropertyDumpCore.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\PropertyDumpHelper.cs"> <Link>Test\Layout\PropertyDump\PropertyDumpHelper.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\ColumnResultW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\ColumnResultW.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\ContainerParagraphResultW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\ContainerParagraphResultW.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\DocumentPageTextViewW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\DocumentPageTextViewW.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\FloaterParagraphResultW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\FloaterParagraphResultW.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\FigureParagraphResultW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\FigureParagraphResultW.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\FlowDocumentPageW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\FlowDocumentPageW.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\IEnumerableW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\IEnumerableW.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\LineResultDetailsW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\LineResultDetailsW.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\LineResultW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\LineResultW.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\OrientedTextPositionW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\OrientedTextPositionW.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\ParagraphResultW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\ParagraphResultW.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\ReflectionHelper.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\ReflectionHelper.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\RowParagraphResultW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\RowParagraphResultW.cs</Link> </SourcesLayoutCommon>    
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\SubpageParagraphResultW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\SubpageParagraphResultW.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\TableParagraphResultW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\TableParagraphResultW.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\TextDocumentViewW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\TextDocumentViewW.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\TextParagraphResultW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\TextParagraphResultW.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\TextParagraphViewW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\TextParagraphViewW.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\UIElementParagraphResultW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\UIElementParagraphResultW.cs</Link> </SourcesLayoutCommon>
-  </ItemGroup>
-
-  <!-- Stress Framework -->
-  <ItemGroup>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\DistributionFactory.cs"> <Link>Test\Stability\Stress\DistributionFactory.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\RandDist.cs"> <Link>Test\Stability\Stress\RandDist.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\RandomGenerator.cs"> <Link>Test\Stability\Stress\RandomGenerator.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Invariant.cs"> <Link>Test\Stability\Stress\Invariant.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\StressFrameWorkHelper.cs"> <Link>Test\Stability\Stress\StressFrameWorkHelper.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\WeightedList.cs"> <Link>Test\Stability\Stress\WeightedList.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Action\ActionManager.cs"> <Link>Test\Stability\Stress\Action\ActionManager.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Action\Attributes.cs"> <Link>Test\Stability\Stress\Action\Attributes.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Action\IAction.cs"> <Link>Test\Stability\Stress\Action\IAction.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Action\IActionFactory.cs"> <Link>Test\Stability\Stress\Action\IActionFactory.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Action\WeightedActionFactory.cs"> <Link>Test\Stability\Stress\Action\WeightedActionFactory.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\ConfigReader\ConfigReader.cs"> <Link>Test\Stability\Stress\ConfigReader\ConfigReader.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\ConfigReader\IConfigReader.cs"> <Link>Test\Stability\Stress\ConfigReader\IConfigReader.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\ConfigReader\MultipleTagSectionHandler.cs"> <Link>Test\Stability\Stress\ConfigReader\MultipleTagSectionHandler.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Context\ActionHandlers.cs"> <Link>Test\Stability\Stress\Context\ActionHandlers.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Context\EventHandlers.cs"> <Link>Test\Stability\Stress\Context\EventHandlers.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Context\EventArgs.cs"> <Link>Test\Stability\Stress\Context\EventArgs.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Context\Handlers.cs"> <Link>Test\Stability\Stress\Context\Handlers.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Context\IStressContext.cs"> <Link>Test\Stability\Stress\Context\IStressContext.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Context\IStressContextManager.cs"> <Link>Test\Stability\Stress\Context\IStressContextManager.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Context\StressContext.cs"> <Link>Test\Stability\Stress\Context\StressContext.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Context\StressContextManager.cs"> <Link>Test\Stability\Stress\Context\StressContextManager.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Context\IObjectFactory.cs"> <Link>Test\Stability\Stress\Context\IObjectFactory.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Context\EnumerationObjectFactory.cs"> <Link>Test\Stability\Stress\Context\EnumerationObjectFactory.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Context\ReflectionObjectFactory.cs"> <Link>Test\Stability\Stress\Context\ReflectionObjectFactory.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\CoreServices\CoreServices.cs"> <Link>Test\Stability\Stress\CoreServices\CoreServices.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\CoreServices\ICoreServices.cs"> <Link>Test\Stability\Stress\CoreServices\ICoreServices.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\CoreServices\IStressManager.cs"> <Link>Test\Stability\Stress\CoreServices\IStressManager.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\CoreServices\StressManager.cs"> <Link>Test\Stability\Stress\CoreServices\StressManager.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\CoreServices\EventLogger.cs"> <Link>Test\Stability\Stress\CoreServices\EventLogger.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Exceptions\ExceptionEventArgs.cs"> <Link>Test\Stability\Stress\Exceptions\ExceptionEventArgs.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Exceptions\ExceptionEventHandlers.cs"> <Link>Test\Stability\Stress\Exceptions\ExceptionEventHandlers.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\PropertyEngine\PropertyEngine.cs"> <Link>Test\Stability\Stress\PropertyEngine\PropertyEngine.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Storage\ContextStorage.cs"> <Link>Test\Stability\Stress\Storage\ContextStorage.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Storage\EventArgs.cs"> <Link>Test\Stability\Stress\Storage\EventArgs.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Storage\IStorage.cs"> <Link>Test\Stability\Stress\Storage\IStorage.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\StressFrameworkObject\IStressFrameworkObject.cs"> <Link>Test\Stability\Stress\StressFrameworkObject\IStressFrameworkObject.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\StressFrameworkObject\StressFrameworkObject.cs"> <Link>Test\Stability\Stress\StressFrameworkObject\StressFrameworkObject.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Security\SecurityHelper.cs"> <Link>Test\Stability\Stress\Security\SecurityHelper.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Thread\EventArgs.cs"> <Link>Test\Stability\Stress\Thread\EventArgs.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Thread\EventHandlers.cs"> <Link>Test\Stability\Stress\Thread\EventHandlers.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Thread\IStressThread.cs"> <Link>Test\Stability\Stress\Thread\IStressThread.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Thread\IStressThreadManager.cs"> <Link>Test\Stability\Stress\Thread\IStressThreadManager.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Thread\StressThread.cs"> <Link>Test\Stability\Stress\Thread\StressThread.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Thread\StressThreadManager.cs"> <Link>Test\Stability\Stress\Thread\StressThreadManager.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Utils\ProcessShutdownMonitor.cs"> <Link>Test\Stability\Stress\Utils\ProcessShutdownMonitor.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Utils\Win32NativeInterop.cs"> <Link>Test\Stability\Stress\Utils\Win32NativeInterop.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Utils\CommandlineParser.cs"> <Link>Test\Stability\Stress\Utils\CommandlineParser.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Utils\XmlParser.cs"> <Link>Test\Stability\Stress\Utils\XmlParser.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\IEHelper\DISPIDs.cs"> <Link>Test\Stability\Stress\IEHelper\DISPIDs.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\IEHelper\IEInterop.cs"> <Link>Test\Stability\Stress\IEHelper\IEInterop.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\IEHelper\Rtl.cs"> <Link>Test\Stability\Stress\IEHelper\Rtl.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Collections\Generics\WeightedList.cs"> <Link>Test\Collections\Generics\WeightedList.cs</Link> </SourcesStressFramework>
-  </ItemGroup>
-
-  <!-- Stress Framework -->
-  <ItemGroup>
-    <SourcesStressFrameworkAvalonProxy Include="$(CommonCodeLocation)\Stability\Stress\AvalonProxy\AssemblyCacheEnum.cs"> <Link>Test\Stability\Stress\AvalonProxy\AssemblyCacheEnum.cs</Link> </SourcesStressFrameworkAvalonProxy>
-    <SourcesStressFrameworkAvalonProxy Include="$(CommonCodeLocation)\Stability\Stress\AvalonProxy\AvalonActionManager.cs"> <Link>Test\Stability\Stress\AvalonProxy\AvalonActionManager.cs</Link> </SourcesStressFrameworkAvalonProxy>
-    <SourcesStressFrameworkAvalonProxy Include="$(CommonCodeLocation)\Stability\Stress\AvalonProxy\AvalonStressContext.cs"> <Link>Test\Stability\Stress\AvalonProxy\AvalonStressContext.cs</Link> </SourcesStressFrameworkAvalonProxy>
-    <SourcesStressFrameworkAvalonProxy Include="$(CommonCodeLocation)\Stability\Stress\AvalonProxy\AvalonStressContextManager.cs"> <Link>Test\Stability\Stress\AvalonProxy\AvalonStressContextManager.cs</Link> </SourcesStressFrameworkAvalonProxy>
-    <SourcesStressFrameworkAvalonProxy Include="$(CommonCodeLocation)\Stability\Stress\AvalonProxy\AvalonStressThreadManager.cs"> <Link>Test\Stability\Stress\AvalonProxy\AvalonStressThreadManager.cs</Link> </SourcesStressFrameworkAvalonProxy>
-    <SourcesStressFrameworkAvalonProxy Include="$(CommonCodeLocation)\Stability\Stress\AvalonProxy\MemoryChecker.cs"> <Link>Test\Stability\Stress\AvalonProxy\MemoryChecker.cs</Link> </SourcesStressFrameworkAvalonProxy>
-    <SourcesStressFrameworkAvalonProxy Include="$(CommonCodeLocation)\Stability\Stress\AvalonProxy\AvalonStressFrameworkHelper.cs"> <Link>Test\Stability\Stress\AvalonProxy\AvalonStressFrameworkHelper.cs</Link> </SourcesStressFrameworkAvalonProxy>
-    <SourcesStressFrameworkAvalonProxy Include="$(CommonCodeLocation)\Stability\Stress\AvalonProxy\BrowserStressContext.cs"> <Link>Test\Stability\Stress\AvalonProxy\BrowserStressContext.cs</Link> </SourcesStressFrameworkAvalonProxy>
-    <SourcesStressFrameworkAvalonProxy Include="$(CommonCodeLocation)\Stability\Stress\AvalonProxy\BrowserStressContextManager.cs"> <Link>Test\Stability\Stress\AvalonProxy\BrowserStressContextManager.cs</Link> </SourcesStressFrameworkAvalonProxy>
-    <SourcesStressFrameworkAvalonProxy Include="$(CommonCodeLocation)\Stability\Stress\AvalonProxy\BrowserStressThreadManager.cs"> <Link>Test\Stability\Stress\AvalonProxy\BrowserStressThreadManager.cs</Link> </SourcesStressFrameworkAvalonProxy>
-  </ItemGroup>
-
-  <!-- Stress Framework -->
-  <ItemGroup>
-    <SourcesStressFrameworkLonghaulProxy Include="$(CommonCodeLocation)\Stability\Stress\LonghaulProxy\LonghaulSQLConnect.cs"> <Link>Test\Stability\Stress\LonghaulProxy\LonghaulSQLConnect.cs</Link> </SourcesStressFrameworkLonghaulProxy>
-    <SourcesStressFrameworkLonghaulProxy Include="$(CommonCodeLocation)\Stability\Stress\LonghaulProxy\LonghaulCommon.cs"> <Link>Test\Stability\Stress\LonghaulProxy\LonghaulCommon.cs</Link> </SourcesStressFrameworkLonghaulProxy>
-    <SourcesStressFrameworkLonghaulProxy Include="$(CommonCodeLocation)\Stability\Stress\LonghaulProxy\LonghaulStateObjects.cs"> <Link>Test\Stability\Stress\LonghaulProxy\LonghaulStateObjects.cs</Link> </SourcesStressFrameworkLonghaulProxy>
-    <SourcesStressFrameworkLonghaulProxy Include="$(CommonCodeLocation)\Stability\Stress\LonghaulProxy\LonghaulStressContext.cs"> <Link>Test\Stability\Stress\LonghaulProxy\LonghaulStressContext.cs</Link> </SourcesStressFrameworkLonghaulProxy>
-    <SourcesStressFrameworkLonghaulProxy Include="$(CommonCodeLocation)\Stability\Stress\LonghaulProxy\LonghaulStressContextManager.cs"> <Link>Test\Stability\Stress\LonghaulProxy\LonghaulStressContextManager.cs</Link> </SourcesStressFrameworkLonghaulProxy>
-    <SourcesStressFrameworkLonghaulProxy Include="$(CommonCodeLocation)\Stability\Stress\LonghaulProxy\LonghaulStressThreadManager.cs"> <Link>Test\Stability\Stress\LonghaulProxy\LonghaulStressThreadManager.cs</Link> </SourcesStressFrameworkLonghaulProxy>
-    <SourcesStressFrameworkLonghaulProxy Include="$(CommonCodeLocation)\Stability\Stress\LonghaulProxy\LonghaulEventLog.cs"> <Link>Test\Stability\Stress\LonghaulProxy\LonghaulEventLog.cs</Link> </SourcesStressFrameworkLonghaulProxy>
-  </ItemGroup>
-
-  <!-- Stability Leak -->
-  <ItemGroup>
-    <SourcesStabilityLeak Include="$(CommonCodeLocation)\Stability\LeakUtility.cs"> <Link>Test\Stability\LeakUtility.cs</Link> </SourcesStabilityLeak>
-    <SourcesStabilityLeak Include="$(CommonCodeLocation)\Stability\Input.cs"> <Link>Test\Stability\Input.cs</Link> </SourcesStabilityLeak>
-  </ItemGroup>
-
-  <!-- Stress Graphics -->
-  <ItemGroup>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\AddNodes.cs"> <Link>Test\Stability\Stress\Graphics\AddNodes.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\AnimationFactory.cs"> <Link>Test\Stability\Stress\Graphics\AnimationFactory.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\Channel.cs"> <Link>Test\Stability\Stress\Graphics\Channel.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\ChannelFactory.cs"> <Link>Test\Stability\Stress\Graphics\ChannelFactory.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\CompositionActorFactory.cs"> <Link>Test\Stability\Stress\Graphics\CompositionActorFactory.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\ConnectDisconnect.cs"> <Link>Test\Stability\Stress\Graphics\ConnectDisconnect.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\ConnectDisconnectActorFactory.cs"> <Link>Test\Stability\Stress\Graphics\ConnectDisconnectActorFactory.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\ContainerVisual.cs"> <Link>Test\Stability\Stress\Graphics\ContainerVisual.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\DrawContextProvider.cs"> <Link>Test\Stability\Stress\Graphics\DrawContextProvider.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\GetHwndSources.cs"> <Link>Test\Stability\Stress\Graphics\GetHwndSources.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\GetProperties.cs"> <Link>Test\Stability\Stress\Graphics\GetProperties.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\GetPropertiesFactory.cs"> <Link>Test\Stability\Stress\Graphics\GetPropertiesFactory.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\HelperClass.cs"> <Link>Test\Stability\Stress\Graphics\HelperClass.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\HitTest.cs"> <Link>Test\Stability\Stress\Graphics\HitTest.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\HitTestFactory.cs"> <Link>Test\Stability\Stress\Graphics\HitTestFactory.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\HostVisual.cs"> <Link>Test\Stability\Stress\Graphics\HostVisual.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\HwndSourceCreator.cs"> <Link>Test\Stability\Stress\Graphics\HwndSourceCreator.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\IDrawContextProvider.cs"> <Link>Test\Stability\Stress\Graphics\IDrawContextProvider.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\IRootVisualHolder.cs"> <Link>Test\Stability\Stress\Graphics\IRootVisualHolder.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\ISurface.cs"> <Link>Test\Stability\Stress\Graphics\ISurface.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\IVisual.cs"> <Link>Test\Stability\Stress\Graphics\IVisual.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\IVisualProperties.cs"> <Link>Test\Stability\Stress\Graphics\IVisualProperties.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\Magnifier.cs"> <Link>Test\Stability\Stress\Graphics\Magnifier.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\MagnifierFactory.cs"> <Link>Test\Stability\Stress\Graphics\MagnifierFactory.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\MoveNode.cs"> <Link>Test\Stability\Stress\Graphics\MoveNode.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\NodeActor.cs"> <Link>Test\Stability\Stress\Graphics\NodeActor.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\NodeCreator.cs"> <Link>Test\Stability\Stress\Graphics\NodeCreator.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\R3DVisual.cs"> <Link>Test\Stability\Stress\Graphics\R3DVisual.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\Random.cs"> <Link>Test\Stability\Stress\Graphics\Random.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\RemoveNode.cs"> <Link>Test\Stability\Stress\Graphics\RemoveNode.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\RenderTargetBitmap.cs"> <Link>Test\Stability\Stress\Graphics\RenderTargetBitmap.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\RenderTargetBitmapFactory.cs"> <Link>Test\Stability\Stress\Graphics\RenderTargetBitmapFactory.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\RootVisualHolder.cs"> <Link>Test\Stability\Stress\Graphics\RootVisualHolder.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\RootVisualHolderActor.cs"> <Link>Test\Stability\Stress\Graphics\RootVisualHolderActor.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\SharedObjects.cs"> <Link>Test\Stability\Stress\Graphics\SharedObjects.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\TransformCreatorFactory.cs"> <Link>Test\Stability\Stress\Graphics\TransformCreatorFactory.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\TreeActor.cs"> <Link>Test\Stability\Stress\Graphics\TreeActor.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\TreeCreator.cs"> <Link>Test\Stability\Stress\Graphics\TreeCreator.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\TreeCreatorInitFactory.cs"> <Link>Test\Stability\Stress\Graphics\TreeCreatorInitFactory.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\TreeInitActor.cs"> <Link>Test\Stability\Stress\Graphics\TreeInitActor.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\UpdateProperties.cs"> <Link>Test\Stability\Stress\Graphics\UpdateProperties.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\UpdatePropertiesFactory.cs"> <Link>Test\Stability\Stress\Graphics\UpdatePropertiesFactory.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\VisualTarget.cs"> <Link>Test\Stability\Stress\Graphics\VisualTarget.cs</Link> </SourcesStressGraphics>
-  </ItemGroup>
-
-  <!-- Performance  -->
-  <ItemGroup>
-    <SourcesPerformanceTesting Include="$(CommonCodeLocation)\Performance\CLRProfilerControl.cs"> <Link>Test\Performance\CLRProfilerControl.cs</Link> </SourcesPerformanceTesting>
-    <SourcesPerformanceTesting Include="$(CommonCodeLocation)\Performance\CustomTestAction.cs"> <Link>Test\Performance\CustomTestAction.cs</Link> </SourcesPerformanceTesting>
-    <SourcesPerformanceTesting Include="$(CommonCodeLocation)\Performance\InputPerf.cs"> <Link>Test\Performance\InputPerf.cs</Link> </SourcesPerformanceTesting>
-    <SourcesPerformanceTesting Include="$(CommonCodeLocation)\Performance\PerfActionHelper.cs"> <Link>Test\Performance\PerfActionHelper.cs</Link> </SourcesPerformanceTesting>
-    <SourcesPerformanceTesting Include="$(CommonCodeLocation)\Performance\TraceProvider.cs"> <Link>Test\Performance\TraceProvider.cs</Link> </SourcesPerformanceTesting>
-    <SourcesPerformanceTesting Include="$(CommonCodeLocation)\Performance\EventTrace.cs"> <Link>Test\Performance\EventTrace.cs</Link> </SourcesPerformanceTesting>
-    <SourcesPerformanceTesting Include="$(CommonCodeLocation)\Performance\EventType.cs"> <Link>Test\Performance\EventType.cs</Link> </SourcesPerformanceTesting>
-  </ItemGroup>
-
-  <!-- Performance Partial Trust -->
-  <ItemGroup>
-    <SourcesPerformanceTestingPartialTrust Include="$(CommonCodeLocation)\Performance\CLRProfilerControl.cs"> <Link>Test\Performance\CLRProfilerControl.cs</Link> </SourcesPerformanceTestingPartialTrust>
-    <SourcesPerformanceTestingPartialTrust Include="$(CommonCodeLocation)\Performance\CustomTestAction.cs"> <Link>Test\Performance\CustomTestAction.cs</Link> </SourcesPerformanceTestingPartialTrust>
-    <SourcesPerformanceTestingPartialTrust Include="$(CommonCodeLocation)\Performance\InputPerf_PartialTrust.cs"> <Link>Test\Performance\InputPerf_PartialTrust.cs</Link> </SourcesPerformanceTestingPartialTrust>
-    <SourcesPerformanceTestingPartialTrust Include="$(CommonCodeLocation)\Performance\PerfActionHelper.cs"> <Link>Test\Performance\PerfActionHelper.cs</Link> </SourcesPerformanceTestingPartialTrust>
-    <SourcesPerformanceTestingPartialTrust Include="$(CommonCodeLocation)\Performance\PerfTestTraceProvider.cs"> <Link>Test\Performance\PerfTestTraceProvider.cs</Link> </SourcesPerformanceTestingPartialTrust>
-  </ItemGroup>
-
-  <!-- Annotations -->
-  <ItemGroup>
-    <SourcesAnnotations Include="$(CommonCodeLocation)\Annotations\AnnotationsTestSettings.cs"> <Link>Test\Annotations\AnnotationsTestSettings.cs</Link> </SourcesAnnotations>
-    <SourcesAnnotations Include="$(CommonCodeLocation)\Annotations\Attributes.cs"> <Link>Test\Annotations\Attributes.cs</Link> </SourcesAnnotations>
-    <SourcesAnnotations Include="$(CommonCodeLocation)\Annotations\FastTestSuite.cs"> <Link>Test\Annotations\FastTestSuite.cs</Link> </SourcesAnnotations>
-    <SourcesAnnotations Include="$(CommonCodeLocation)\Annotations\TestSuite.cs"> <Link>Test\Annotations\TestSuite.cs</Link> </SourcesAnnotations>
-    <SourcesAnnotations Include="$(CommonCodeLocation)\Annotations\TestSuiteRunner.cs"> <Link>Test\Annotations\TestSuiteRunner.cs</Link> </SourcesAnnotations>
-    <SourcesAnnotations Include="$(CommonCodeLocation)\Annotations\UIAutomationModule.cs"> <Link>Test\Annotations\UIAutomationModule.cs</Link> </SourcesAnnotations>
-    <SourcesAnnotations Include="$(CommonCodeLocation)\Annotations\VisualAutomationTestSuite.cs"> <Link>Test\Annotations\VisualAutomationTestSuite.cs</Link> </SourcesAnnotations>
-    <SourcesAnnotations Include="$(CommonCodeLocation)\Annotations\VScanModule.cs"> <Link>Test\Annotations\VScanModule.cs</Link> </SourcesAnnotations>
-    <SourcesAnnotations Include="$(CommonCodeLocation)\Annotations\Internal\ALogger.cs"> <Link>Test\Annotations\Internal\ALogger.cs</Link> </SourcesAnnotations>
-    <SourcesAnnotations Include="$(CommonCodeLocation)\Annotations\Internal\TestCase.cs"> <Link>Test\Annotations\Internal\TestCase.cs</Link> </SourcesAnnotations>
-    <SourcesAnnotations Include="$(CommonCodeLocation)\Annotations\Internal\TestVariation.cs"> <Link>Test\Annotations\Internal\TestVariation.cs</Link> </SourcesAnnotations>
-  </ItemGroup>
-
-</Project>
diff --git a/eng/WpfArcadeSdk/tools/StrongName.props b/eng/WpfArcadeSdk/tools/StrongName.props
deleted file mode 100644
index 39b1310704d..00000000000
--- a/eng/WpfArcadeSdk/tools/StrongName.props
+++ /dev/null
@@ -1,17 +0,0 @@
-<Project>
-    <PropertyGroup>
-        <SignAssembly>false</SignAssembly>
-        <TestUntrustedKey>$(WpfTestBasePath)\Common\keys\TestUntrusted.snk</TestUntrustedKey>
-        <TestUntrustedPublicKey>0024000004800000940000000602000000240000525341310004000001000100C1BCD9B7844CD35725B1138216ED5E0FAB914676D580860F6F081C8C0E83B92D835FFAE76FA968F7637E4B6E32D77FEE1C084088CEE736CE589D65AD0FA66F086C2F5F755A6F2909D17C643B45C72A906AAAC617BFD67491A8FCE54784CA98317AEA28C0544546FF9123F6F94E59793F2874437BC3D136A40095D0F960E6A6A4</TestUntrustedPublicKey>
-        <TestUntrustedPublicKeyToken>A069DEE354D95F76</TestUntrustedPublicKeyToken>
-
-        <TestTrustedKey>$(WpfTestBasePath)\Common\keys\TestTrusted.snk</TestTrustedKey>
-        <TestTrustedPublicKey>00240000048000009400000006020000002400005253413100040000010001007FDB0774CDFEFC88AAA6613332E5BE12A11BD32ADB7E2EAD4C049CFFCC6284FA975CD55B0291738247984CFCF4074970C44C1DA29B07201B0F90FB7B2C60D2A604C4ABA9FBC106AD3D1838DAD496780B0E4518D045FE70C4DE4E9663354989CF9A2E4F9ADD41BFEF82437DA35C8B1C1A0D6DACB521456C4BB18BADA2BE7407C3</TestTrustedPublicKey>
-        <TestTrustedPublicKeyToken>e1e6160fdd198bb1</TestTrustedPublicKeyToken>
-        
-        <!-- Sign with the test key and ensure that we do not delay sign test code -->
-        <DelaySign>false</DelaySign>
-        <AssemblyOriginatorKeyFile Condition="'$(AssemblyOriginatorKeyFile)'==''">$(TestUntrustedKey)</AssemblyOriginatorKeyFile>
-        <StrongNameKeyId>custom</StrongNameKeyId>
-    </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/eng/WpfArcadeSdk/tools/StrongName.targets b/eng/WpfArcadeSdk/tools/StrongName.targets
deleted file mode 100644
index cfc73c73f7b..00000000000
--- a/eng/WpfArcadeSdk/tools/StrongName.targets
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project>
-  <PropertyGroup Condition="'$(SignAssembly)' == 'true' AND '$(AssemblyOriginatorKeyFile)' == '$(TestTrustedKey)'" >
-        <PublicKey>$(TestTrustedPublicKey)</PublicKey>
-        <PublicKeyToken>$(TestTrustedPublicKeyToken)</PublicKeyToken>
-  </PropertyGroup>
-  
-  <PropertyGroup Condition="'$(SignAssembly)' == 'true' AND '$(AssemblyOriginatorKeyFile)' == '$(TestUntrustedKey)'" >
-        <PublicKey>$(TestUntrustedPublicKey)</PublicKey>
-        <PublicKeyToken>$(TestUntrustedPublicKeyToken)</PublicKeyToken>
-  </PropertyGroup>
-</Project>
diff --git a/eng/WpfArcadeSdk/tools/TestProjects.targets b/eng/WpfArcadeSdk/tools/TestProjects.targets
index d5396b3a087..28dcf279bcb 100644
--- a/eng/WpfArcadeSdk/tools/TestProjects.targets
+++ b/eng/WpfArcadeSdk/tools/TestProjects.targets
@@ -7,7 +7,8 @@
   <PropertyGroup Condition="'$(IsTestProject)' == 'true' or '$(WpfTest)'=='true'">
     <TestArchitectures Condition="'$(PlatformTarget)' == '' or '$(PlatformTarget)' == 'AnyCpu'">x86</TestArchitectures>
     <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
-    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+    <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
+    <CopyLocalLockFileAssemblies Condition="'$(CreateTestPayload)'=='true'">true</CopyLocalLockFileAssemblies>
     <IsSelfContained>true</IsSelfContained>
   </PropertyGroup>
 
@@ -18,7 +19,8 @@
     -->
     <PackageReference Include="runtime.$(RuntimeIdentifier).$(MicrosoftDotNetWpfDncEngPackage)"
                       Condition="'$(RepositoryName)'=='wpf'"
-                      Version="$(MicrosoftDotNetWpfDncEngVersion)">
+                      Version="$(MicrosoftDotNetWpfDncEngVersion)"
+                      Publish="$(CreateTestPayload)">
       <CopyLocal>true</CopyLocal>
       <GeneratePathProperty>true</GeneratePathProperty>
     </PackageReference>
@@ -26,24 +28,24 @@
     <!-- 
       PackageReference from individual WPF projects here 
     -->
-    <PackageReference Include="$(SystemIOPackagingPackage)" Version="$(SystemIOPackagingVersion)" CopyLocal="true" />
+    <PackageReference Include="$(SystemIOPackagingPackage)" Version="$(SystemIOPackagingVersion)" Publish="$(CreateTestPayload)" />
     <PackageReference Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryPackageVersion)" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerPackageVersion)" CopyLocal="true"  />
-    <PackageReference Include="System.Diagnostics.EventLog" Version="$(SystemDiagnosticsEventLogPackageVersion)" CopyLocal="true" />
-    <PackageReference Include="System.Security.Cryptography.Xml" Version="$(SystemSecurityCryptographyXmlPackageVersion)" CopyLocal="true" />
-    <PackageReference Include="System.Security.Permissions" Version="$(SystemSecurityPermissionsPackageVersion)" CopyLocal="true" />
-    <PackageReference Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsPackageVersion)" CopyLocal="true" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerPackageVersion)" Publish="$(CreateTestPayload)"  />
+    <PackageReference Include="System.Diagnostics.EventLog" Version="$(SystemDiagnosticsEventLogPackageVersion)" Publish="$(CreateTestPayload)" />
+    <PackageReference Include="System.Security.Cryptography.Xml" Version="$(SystemSecurityCryptographyXmlPackageVersion)" Publish="$(CreateTestPayload)" />
+    <PackageReference Include="System.Security.Permissions" Version="$(SystemSecurityPermissionsPackageVersion)" Publish="$(CreateTestPayload)" />
+    <PackageReference Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsPackageVersion)" Publish="$(CreateTestPayload)" />
 
-    <PackageReference Include="System.Security.AccessControl" Version="$(SystemSecurityAccessControlPackageVersion)" CopyLocal="true" />
-    <PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsPackageVersion)" CopyLocal="true" />
+    <PackageReference Include="System.Security.AccessControl" Version="$(SystemSecurityAccessControlPackageVersion)" Publish="$(CreateTestPayload)" />
+    <PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsPackageVersion)" Publish="$(CreateTestPayload)" />
 
 
 
     <!-- These exist to ensure that dependencies (esp. native ones) are binplaced with tests correctly -->
-    <None Condition="'$(RuntimeIdentifier)'=='win-x64'"
+    <None Condition="'$(RuntimeIdentifier)'=='win-x64' And '$(CreateTestPayload)'=='true'"
           Include="$(Pkgruntime_win-x64_Microsoft_DotNet_Wpf_DncEng)\runtimes\$(RuntimeIdentifier)\native\*.dll"
           CopyToOutputDirectory="PreserveNewest"/>
-    <None Condition="'$(RuntimeIdentifier)'=='win-x86'"
+    <None Condition="'$(RuntimeIdentifier)'=='win-x86' And '$(CreateTestPayload)'=='true'"
            Include="$(Pkgruntime_win-x86_Microsoft_DotNet_Wpf_DncEng)\runtimes\$(RuntimeIdentifier)\native\*.dll"
           CopyToOutputDirectory="PreserveNewest"/>
 
diff --git a/eng/helix/configure-helix-machine.ps1 b/eng/helix/configure-helix-machine.ps1
deleted file mode 100644
index 4f20fb2866a..00000000000
--- a/eng/helix/configure-helix-machine.ps1
+++ /dev/null
@@ -1,30 +0,0 @@
-# This file prepares the helix machine for our tests runs
-$dotnetLocation = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "dotnet"
-
-# Set DOTNET_ROOT variables so the host can find it
-Set-Item -Path "env:DOTNET_ROOT(x86)" -Value $dotnetLocation
-Set-Item -Path "env:DOTNET_ROOT" -Value $dotnetLocation
-
-$runtimes = dotnet --list-runtimes
-foreach ($rt in $runtimes)
-{
-    if ($rt.StartsWith("Microsoft.WindowsDesktop.App"))
-    {
-        $version = $rt.Split(" ")[1]
-    }
-}
-
-# Rewrite the *.runtimeconfig.json files to match the version of the runtime on the machine
-$infraLocation = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "Test\Infra"
-$stiConfigFile = Join-Path $infraLocation "Sti.runtimeconfig.json"
-$qvConfigFile = Join-Path $infraLocation "QualityVaultFrontEnd.runtimeconfig.json"
-$configFiles = $stiConfigFile, $qvConfigFile
-foreach ($config in $configFiles)
-{
-    # Read current config file
-    $jsondata = Get-Content -Raw -Path $config | ConvertFrom-Json
-    # Update version
-    $jsondata.runtimeOptions.framework.version = $version
-    # Write data back
-    $jsondata | ConvertTo-Json -depth 100 | Set-Content $config
-}
\ No newline at end of file
diff --git a/eng/helix/prepare-helix-payload.ps1 b/eng/helix/prepare-helix-payload.ps1
deleted file mode 100644
index 9f382820f4a..00000000000
--- a/eng/helix/prepare-helix-payload.ps1
+++ /dev/null
@@ -1,49 +0,0 @@
-[CmdLetBinding()]
-Param(
-    [string]$platform,
-    [string]$configuration
-)
-
-$payloadDir = "HelixPayload\$configuration\$platform"
-
-$nugetPackagesDir = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "packages"
-
-# Create the payload directory. Remove it if it already exists.
-if(Test-Path $payloadDir)
-{
-    Remove-Item $payloadDir -Recurse
-}
-New-Item -ItemType Directory -Force -Path $payloadDir
-
-function CopyFolderStructure($from, $to)
-{
-    if(Test-Path $to)
-    {
-        Remove-Item $to -Recurse
-    }
-    New-Item -ItemType Directory -Force -Path $to
-
-    if (Test-Path $from)
-    {
-        Get-ChildItem $from | Copy-Item -Destination $to -Recurse 
-    }
-    else
-    {
-        Write-Output "Location doesn't exist: $from"
-    }
-}
-
-# Copy files from nuget packages.
-$testNugetLocation = Resolve-Path (Join-Path $nugetPackagesDir "runtime.win-$platform.Microsoft.DotNet.Wpf.Test\*\tools\win-$platform\Test")
-$testPayloadLocation = Join-Path $payloadDir "Test"
-CopyFolderStructure $testNugetLocation $testPayloadLocation
-
-# Copy local DRT assemblies to test location
-$drtArtifactsLocation = [System.IO.Path]::Combine($env:BUILD_SOURCESDIRECTORY, "artifacts\test", $configuration, $platform, "Test\DRT")
-$drtPayloadLocation = Join-Path $payloadDir "Test\DRT"
-CopyFolderStructure $drtArtifactsLocation $drtPayloadLocation
-
-# Copy scripts
-Copy-Item "eng\helix\configure-helix-machine.ps1" $payloadDir
-Copy-Item "eng\helix\runtests.ps1" $payloadDir
-Copy-Item "eng\helix\runtests.cmd" $payloadDir
diff --git a/eng/helix/runtests.cmd b/eng/helix/runtests.cmd
deleted file mode 100644
index c7b6190b9f2..00000000000
--- a/eng/helix/runtests.cmd
+++ /dev/null
@@ -1,3 +0,0 @@
-@echo off
-
-powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0runtests.ps1"""  %*"
\ No newline at end of file
diff --git a/eng/helix/runtests.ps1 b/eng/helix/runtests.ps1
deleted file mode 100644
index 55d4395441a..00000000000
--- a/eng/helix/runtests.ps1
+++ /dev/null
@@ -1,26 +0,0 @@
-[CmdLetBinding()]
-Param(
-    [string]$command
-)
-
-# Configure the machine before running tests
-. "$PSScriptRoot\configure-helix-machine.ps1"
-
-# Run the tests
-$testLocation = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "Test"
-if (Test-Path "$testLocation\rundrts.cmd")
-{
-    Invoke-Expression "$testLocation\rundrts.cmd $command"
-}
-
-# We can use $env:HELIX_PYTHONPATH $env:HELIX_SCRIPT_ROOT\upload_result.py to upload any QV specific logs and/or screenshots that we are interested in.
-# For example: $env:HELIX_PYTHONPATH $env:HELIX_SCRIPT_ROOT%\upload_result.py -result screenshot.jpg -result_name screenshot.jpg
-# Then, links to these artifacts can then be included in the xUnit logs.
-
-# Need to copy the xUnit log to a known location that helix can understand
-if (Test-Path "$env:AppData\QualityVault\Run\Report\testResults.xml")
-{
-    $resultLocation = $PSScriptRoot
-    Write-Output "Copying test results to $resultLocation"
-    Copy-Item "$env:AppData\QualityVault\Run\Report\testResults.xml" $resultLocation
-}
\ No newline at end of file
diff --git a/eng/helix/helixpublish.proj b/eng/helixpublish.proj
similarity index 91%
rename from eng/helix/helixpublish.proj
rename to eng/helixpublish.proj
index 6869d5b7bbc..8f3aa2ac922 100644
--- a/eng/helix/helixpublish.proj
+++ b/eng/helixpublish.proj
@@ -1,14 +1,6 @@
 <Project Sdk="Microsoft.DotNet.Helix.Sdk" DefaultTargets="Test">
   <PropertyGroup>
-    <!-- These properties help ensure proper and consistent restore behavior -->
     <TargetFramework>netcoreapp3.0</TargetFramework>
-    <RestorePackagesPath>$(MSBuildThisFileDirectory)packages</RestorePackagesPath>
-    <DisableImplicitNETCorePlatformsReference>true</DisableImplicitNETCorePlatformsReference>
-    <RestoreSources>
-      $(RestoreSources);
-      https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json
-    </RestoreSources>
-
     <IncludeDotNetCli>true</IncludeDotNetCli>
     <DotNetCliPackageType>runtime</DotNetCliPackageType>
     <!-- Set to match global.json.tools.dotnet by pre-build.ps1 -->
@@ -28,7 +20,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <HelixCorrelationPayload Include="artifacts\test\$(Configuration)\$(Platform)" /> 
+    <HelixCorrelationPayload Include="$(ArtifactsDir)\test\$(Configuration)\$(Platform)" /> 
     <HelixWorkItem Include="Xaml">
       <Timeout>00:20:00</Timeout>
       <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Xaml</Command>
diff --git a/eng/pipeline.yml b/eng/pipeline.yml
index a7cfb192b5f..f92f5428ee6 100644
--- a/eng/pipeline.yml
+++ b/eng/pipeline.yml
@@ -135,8 +135,8 @@ jobs:
           -configuration $(_BuildConfig)
           $(_OfficialBuildIdArgs) 
           $(_PlatformArgs)
-          -projects $(Build.SourcesDirectory)\eng\helix\helixpublish.proj
-          /bl:$(BUILD.SOURCESDIRECTORY)\artifacts\log\$(_BuildConfig)\HelixUnit.binlog
+          -projects $(Build.SourcesDirectory)\eng\helixpublish.proj
+          /bl:$(BUILD.SOURCESDIRECTORY)\artifacts\log\$(_BuildConfig)\HelixDrt.binlog
         displayName: Run Developer Regression Tests on Helix Machine (Release)
         env:
           HelixSource: $(_HelixSource)
diff --git a/src/Microsoft.DotNet.Wpf/test/BranchCommon/data/CommonData.csproj b/src/Microsoft.DotNet.Wpf/test/BranchCommon/data/CommonData.csproj
deleted file mode 100644
index 9a963ba3405..00000000000
--- a/src/Microsoft.DotNet.Wpf/test/BranchCommon/data/CommonData.csproj
+++ /dev/null
@@ -1,20 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <NoTargets>true</NoTargets>
-    <EnableDefaultItems>false</EnableDefaultItems>
-    <PublishDir>$(WpfTestBasePublishPath)</PublishDir>
-    <_IsPortable>true</_IsPortable>
-    <SelfContained>false</SelfContained>
-    <RuntimeIdentifier></RuntimeIdentifier>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <None Include="DrtList.xml">
-      <Link>DRT\%(Filename)%(Extension)</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
- 
-  </ItemGroup>
-
-</Project>
diff --git a/src/Microsoft.DotNet.Wpf/test/BranchCommon/data/Directory.Build.props b/src/Microsoft.DotNet.Wpf/test/BranchCommon/data/Directory.Build.props
deleted file mode 100644
index 12d9ad073ec..00000000000
--- a/src/Microsoft.DotNet.Wpf/test/BranchCommon/data/Directory.Build.props
+++ /dev/null
@@ -1,3 +0,0 @@
-<Project>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
-</Project>
diff --git a/src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/DrtBase.cs b/src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/DrtBase.cs
index 37bd98942c6..79fa006d094 100644
--- a/src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/DrtBase.cs
+++ b/src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/DrtBase.cs
@@ -213,7 +213,7 @@ static DrtBase()
             Application app = Application.Current;  // runs Application.Init(), which sets up Avalon services
         }
 
-        protected DrtBase(ITestOutputHelper output)
+        protected DrtBase()
         {
             string assertExit = Environment.GetEnvironmentVariable("AVALON_ASSERTEXIT");
             if (assertExit != null && assertExit.Length > 0)
@@ -232,7 +232,6 @@ protected DrtBase(ITestOutputHelper output)
             }
 
             _dispatcher = Dispatcher.CurrentDispatcher;
-            _output = output;
         }
 
         /// <summary>
@@ -249,7 +248,7 @@ protected DrtBase(ITestOutputHelper output)
         /// <returns>DRT exit code -- to be returned from Main()</returns>
         public int Run(string[] args)
         {
-            _delayedConsoleOutput = new StringAndFileWriter(DrtName, _output);
+            _delayedConsoleOutput = new StringAndFileWriter(DrtName);
 
             _retcode = ReadCommandLineArguments(args);
 
@@ -2621,10 +2620,9 @@ private static void Win32BlockInput(bool blockIt)
 
         private class StringAndFileWriter : StringWriter
         {
-            public StringAndFileWriter(string drtName, ITestOutputHelper output) : base(new StringBuilder())
+            public StringAndFileWriter(string drtName) : base(new StringBuilder())
             {
                 _buffer = GetStringBuilder();
-                _output = output;
                 if (string.IsNullOrEmpty(drtName))
                 {
                     throw new ArgumentException("DrtName must be defined");
@@ -2710,14 +2708,6 @@ public override void Write(char value)
                         _logFile.Write(value);
                         _logFile.Flush();
                     }
-
-                    try
-                    {
-                        _output.WriteLine($"{value}");
-                    }
-                    catch
-                    {
-                    }
                 }
             }
 
@@ -2735,14 +2725,6 @@ public override void Write(char[] buffer, int index, int count)
                         _logFile.Write(buffer, index, count);
                         _logFile.Flush();
                     }
-
-                    var sb = new StringBuilder();
-                    sb.Append(buffer, index, count);
-                    try
-                    {
-                        _output.WriteLine(sb.ToString());
-                    }
-                    catch { }
                 }
             }
 
@@ -2772,12 +2754,6 @@ public override void Write(string value)
                         _logFile.Write(value);
                         _logFile.Flush();
                     }
-
-                    try
-                    {
-                        _output.WriteLine(value);
-                    }
-                    catch { }
                 }
             }
 
@@ -2801,8 +2777,6 @@ public void CloseFile()
             private StringBuilder _buffer;
             private bool _isClosed = false;
             private object _instanceLock = new object();
-
-            private ITestOutputHelper _output;
         }
 
         private class DualWriter : StringWriter
@@ -2915,8 +2889,6 @@ public bool TimedOut
         //
 
         private Dispatcher _dispatcher;
-        private ITestOutputHelper _output;
-       
 
         private HwndSource _source = null;
         private Visual _rootElement;
diff --git a/src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/TestServices.csproj b/src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/TestServices.csproj
index c4d5ad2748d..81436587de5 100644
--- a/src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/TestServices.csproj
+++ b/src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/TestServices.csproj
@@ -1,11 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <AssemblyName>TestServices</AssemblyName>
-        <RootNamespace>TestServices</RootNamespace>
-        <DefineConstants>$(DefineConstants);FRAMEWORK_NATIVEMETHODS;CORE_NATIVEMETHODS;DRT</DefineConstants>
-        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-        <NoWarn>$(NoWarn);CS0618;0618</NoWarn>
-        <Platforms>AnyCPU;x64</Platforms>
+      <AssemblyName>TestServices</AssemblyName>
+      <RootNamespace>TestServices</RootNamespace>
+      <DefineConstants>$(DefineConstants);FRAMEWORK_NATIVEMETHODS;CORE_NATIVEMETHODS;DRT</DefineConstants>
+      <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+      <NoWarn>$(NoWarn);CS0618;0618</NoWarn>
+      <Platforms>AnyCPU;x64</Platforms>
+      <CLSCompliant>false</CLSCompliant>
+      <OutputType>Library</OutputType>
     </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlAvoidXmlTest/BamlAvoidXmlTest.csproj b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlAvoidXmlTest/BamlAvoidXmlTest.csproj
index c744feb3be1..dae72c72de6 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlAvoidXmlTest/BamlAvoidXmlTest.csproj
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlAvoidXmlTest/BamlAvoidXmlTest.csproj
@@ -7,7 +7,6 @@
     <AddTargetFrameworkAttributeToWpfTestExe>true</AddTargetFrameworkAttributeToWpfTestExe>
 
     <!-- Avoid auto-generating a main -->
-    <InternalMarkupCompilation>true</InternalMarkupCompilation>
     <RootNamespace>BamlAvoidXmlTest</RootNamespace>
     <Platforms>AnyCPU;x64</Platforms>
   </PropertyGroup>
@@ -17,37 +16,8 @@
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Folder Include="Properties\" />
-    <Compile Include="BamlAvoidXmlTest.cs" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <NetCoreReference Include="mscorlib" />
-    <NetCoreReference Include="netstandard" />
-    <NetCoreReference Include="System.Console" />
-    <NetCoreReference Include="System.Diagnostics.Debug" />
-    <NetCoreReference Include="System.Diagnostics.Tools" />
-    <NetCoreReference Include="System.Runtime.Extensions" />
-    <NetCoreReference Include="System.Runtime.InteropServices" />
-    <NetCoreReference Include="System.Resources.ResourceManager" />
-    <NetCoreReference Include="System.Linq" />
-    <NetCoreReference Include="System.ObjectModel" />
-    <NetCoreReference Include="System.ComponentModel" />
-    <NetCoreReference Include="System.ComponentModel.Primitives" />
-    <NetCoreReference Include="System.Collections" />
-    <NetCoreReference Include="System.Collections.Generic" />
-    <NetCoreReference Include="System.Collections.NonGeneric" />
-    <NetCoreReference Include="System.Collections.Concurrent" />
-    <NetCoreReference Include="System.Reflection.Primitives" />
-    <NetCoreReference Include="System.Text.Encoding.Extensions" />
-    <NetCoreReference Include="System.Threading" />
-    <NetCoreReference Include="System.Threading.Thread" />
-    <NetCoreReference Include="System.Threading.Tasks" />
-    <NetCoreReference Include="System.Xml.ReaderWriter" />
-  </ItemGroup>
 </Project>
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlTestClasses40/BamlTestClasses40.csproj b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlTestClasses40/BamlTestClasses40.csproj
index 3c4d5a8d8b5..8b04041b658 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlTestClasses40/BamlTestClasses40.csproj
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlTestClasses40/BamlTestClasses40.csproj
@@ -62,8 +62,6 @@
     <Page Include="XmlSpace3.xaml">
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Compile Include="BCMarkupExtension.cs" />
-    <Compile Include="TempDPSetOrder1ListBox.cs" />
     <None Remove="@(Page)" />
   </ItemGroup>
 
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/Directory.Build.props b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/Directory.Build.props
index 4d1dc3791be..bf987b61ede 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/Directory.Build.props
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/Directory.Build.props
@@ -1,4 +1,3 @@
 <Project>
   <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
-  <Import Condition="Exists('$(WpfTestBasePath)/DRT.Build.props')" Project="$(WpfTestBasePath)/DRT.Build.props" />
 </Project>
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/DrtXaml.csproj b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/DrtXaml.csproj
index 822d08b97c9..769c148aa6e 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/DrtXaml.csproj
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/DrtXaml.csproj
@@ -5,12 +5,12 @@
     <LinkSubsystem>console</LinkSubsystem>
     <OutputType>WinExe</OutputType>
     <Platforms>AnyCPU;x64</Platforms>
+    <StartupObject>DrtXaml.XamlDrt</StartupObject>
+    <CreateTestPayload>true</CreateTestPayload>
   </PropertyGroup>
 
   <PropertyGroup>
-    <IsTestProject>true</IsTestProject>
     <IsIntegrationTestProject>false</IsIntegrationTestProject>
-    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
   
   <ItemGroup>
@@ -24,12 +24,6 @@
 
   <ItemGroup>
     <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />
-    <PackageReference Include="System.IO.Packaging" Version="$(SystemIOPackagingVersion)" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="System.Security.Permissions" Version="$(SystemSecurityPermissionsPackageVersion)" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerPackageVersion)" />
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/DrtXamlBase.cs b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/DrtXamlBase.cs
index 2feeead35e0..7499fee2047 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/DrtXamlBase.cs
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/DrtXamlBase.cs
@@ -17,12 +17,14 @@ namespace DrtXaml
 {
     public sealed class XamlDrt : DrtBase
     {
-        public void RunTests(params string[] args)
+        [STAThread]
+        public static int Main(string[] args)
         {
-            Run(args);
+            DrtBase drt = new XamlDrt();
+            return drt.Run(args);
         }
 
-        public XamlDrt(ITestOutputHelper output) : base(output)
+        private XamlDrt()
         {
             DrtName = "DrtXaml";
             WindowTitle = "XAML DRT";
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/Tests/SchemaTests.cs b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/Tests/SchemaTests.cs
index 311c4445747..d3fcf564232 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/Tests/SchemaTests.cs
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/Tests/SchemaTests.cs
@@ -1244,9 +1244,7 @@ public void ParsedDynamicAssemblyCollectible()
         }
 
          [TestMethod]
-#if NETCOREAPP3_X
          [TestKnownFailure(Reason = ".NET Core does not support Assembly.ReflectionOnlyLoad. Contact wpfdev for additional details")]
-#endif
         public void ReflectionOnlyTypes()
         {
             XamlSchemaContext oldXsc = _schemaContext;
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/XamlTestFrameWork/Assert.cs b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/XamlTestFrameWork/Assert.cs
index 4b4f422494a..a915c356f47 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/XamlTestFrameWork/Assert.cs
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/XamlTestFrameWork/Assert.cs
@@ -5,111 +5,102 @@
 using System;
 using System.Collections.Generic;
 using System.Collections;
-using Xunit;
-using Xunit.Sdk;
 
 namespace DrtXaml.XamlTestFramework
 {
-    public class EqualException2 : EqualException
+    public static class Assert
     {
-        public EqualException2(object expected, object actual) : base(expected, actual)
+        public static void AreEqual(decimal expected, decimal actual)
         {
+            AreEqual(expected, actual, "Are not equal");
         }
 
-        public EqualException2(string expected, string actual, int expectedIndex, int actualIndex) : base(expected, actual, expectedIndex, actualIndex)
+        public static void AreEqual(int expected, int actual)
         {
+            AreEqual(expected, actual, "Are not equal");
         }
 
-        public EqualException2(object expected, object actual, string message): this(expected, actual)
+        public static void AreEqual(uint expected, uint actual)
         {
-            UserMessage = message;
+            AreEqual(expected, actual, "Are not equal");
         }
-    }
 
-    public class NotEqualException2 : NotEqualException
-    {
-        public NotEqualException2(NotEqualException inner, string message): base(inner.Expected, inner.Actual)
+        public static void AreEqual(string expected, string actual)
         {
-            UserMessage = message;
+            AreEqual(expected, actual, "Are not equal");
         }
-    }
 
-    public class NotNullException2 : NotNullException
-    {
-        public NotNullException2()
+        public static void AreEqual(float expected, float actual)
         {
+            AreEqual(expected, actual, "Are not equal");
         }
 
-        public NotNullException2(string message)
+        public static void AreEqual(double expected, double actual)
         {
-            UserMessage = message;
+            AreEqual(expected, actual, "Are not equal");
         }
-    }
 
-    public class NullException2 : NullException
-    {
-        public NullException2(object actual) : base(actual)
+        public static void AreEqual(object expected, object actual)
         {
+            AreEqual(expected, actual, "Are not equal");
         }
 
-        public NullException2(object actual, string message): this(actual)
+        public static void AreEqual(decimal expected, decimal actual, string message)
         {
-            UserMessage = message;
+            if (expected != actual)
+            {
+                Fail(message);
+            }
         }
-    }
 
-    public class IsAssignableFromException2 : IsAssignableFromException
-    {
-        public IsAssignableFromException2(Type expected, object actual) : base(expected, actual)
+        public static void AreEqual(int expected, int actual, string message)
         {
+            if (expected != actual)
+            {
+                Fail(message);
+            }
         }
 
-        public IsAssignableFromException2(Type expected, object actual, string message) : this(expected, actual)
+        public static void AreEqual(uint expected, uint actual, string message)
         {
-            UserMessage = message;
+            if (expected != actual)
+            {
+                Fail(message);
+            }
         }
-    }
 
-
-    public static class Assert
-    {
-
-        public static void AreEqual<T>(T expected, T actual)
+        public static void AreEqual(string expected, string actual, string message)
         {
-            AreEqual<T>(expected, actual, "Are not equal");
+            if (expected != actual)
+            {
+                Fail(message);
+            }
         }
 
-        public static void AreEqual<T>(T expected, T actual, string message)
+        public static void AreEqual(float expected, float actual, string message)
         {
-            try
-            {
-                Xunit.Assert.Equal<T>(expected, actual);
-            }
-            catch (EqualException)
+            if (expected != actual)
             {
-                throw new EqualException2(expected, actual, message);
+                Fail(message);
             }
         }
 
-        public static void AreNotEqual<T>(T expected, T actual)
+        public static void AreEqual(double expected, double actual, string message)
         {
-            AreNotEqual<T>(expected, actual, "Should not be equal");
+            if (expected != actual)
+            {
+                Fail(message);
+            }
         }
 
-        public static void AreNotEqual<T>(T expected, T actual, string message)
+        public static void AreEqual(object expected, object actual, string message)
         {
-            try
-            {
-                Xunit.Assert.NotEqual<T>(expected, actual);
-            }
-            catch (NotEqualException e)
+            if (!(expected.Equals(actual)))
             {
-                throw new NotEqualException2(e, message);
+                Fail(message);
             }
         }
 
-
-
         public static void AreEqualOrdered<T>(IList<T> actual, params T[] expected)
         {
             Assert.AreEqual(expected.Length, actual.Count);
@@ -128,7 +119,96 @@ public static void AreEqualUnordered<T>(ICollection<T> actual, params T[] expect
             }
         }
         
+        public static void AreNotEqual(decimal expected, decimal actual)
+        {
+            AreNotEqual(expected, actual, "Should not be equal");
+        }
+
+        public static void AreNotEqual(int expected, int actual)
+        {
+            AreNotEqual(expected, actual, "Should not be equal");
+        }
+
+        public static void AreNotEqual(uint expected, uint actual)
+        {
+            AreNotEqual(expected, actual, "Should not be equal");
+        }
+
+        public static void AreNotEqual(string expected, string actual)
+        {
+            AreNotEqual(expected, actual, "Should not be equal");
+        }
+
+        public static void AreNotEqual(float expected, float actual)
+        {
+            AreNotEqual(expected, actual, "Should not be equal");
+        }
         
+        public static void AreNotEqual(double expected, double actual)
+        {
+            AreNotEqual(expected, actual, "Should not be equal");
+        }
+
+        public static void AreNotEqual(object expected, object actual)
+        {
+            AreNotEqual(expected, actual, "Should not be equal");
+        }
+
+        public static void AreNotEqual(decimal expected, decimal actual, string message)
+        {
+            if (expected == actual)
+            {
+                Fail(message);
+            }
+        }
+
+        public static void AreNotEqual(int expected, int actual, string message)
+        {
+            if (expected == actual)
+            {
+                Fail(message);
+            }
+        }
+
+        public static void AreNotEqual(uint expected, uint actual, string message)
+        {
+            if (expected == actual)
+            {
+                Fail(message);
+            }
+        }
+
+        public static void AreNotEqual(string expected, string actual, string message)
+        {
+            if (expected == actual)
+            {
+                Fail(message);
+            }
+        }
+
+        public static void AreNotEqual(float expected, float actual, string message)
+        {
+            if (expected == actual)
+            {
+                Fail(message);
+            }
+        }
+
+        public static void AreNotEqual(double expected, double actual, string message)
+        {
+            if (expected == actual)
+            {
+                Fail(message);
+            }
+        }
+
+        public static void AreNotEqual(object expected, object actual, string message)
+        {
+            if (object.Equals(expected, actual))
+            {
+                Fail(message);
+            }
+        }
 
         public static void AreSame(object expected, object actual)
         {
@@ -137,7 +217,10 @@ public static void AreSame(object expected, object actual)
 
         public static void AreSame(object expected, object actual, string message)
         {
-            Assert.AreEqual<object>(expected, actual, message);
+            if (!(object.ReferenceEquals(expected, actual)))
+            {
+                Assert.Fail(message);
+            }
         }
 
         public static void AreNotSame(object expected, object actual)
@@ -147,7 +230,20 @@ public static void AreNotSame(object expected, object actual)
 
         public static void AreNotSame(object expected, object actual, string message)
         {
-            Assert.AreNotEqual<object>(expected, actual, message);
+            if (object.ReferenceEquals(expected, actual))
+            {
+                Assert.Fail(message);
+            }
+        }
+
+        public static void Fail()
+        {
+            Fail("Please call Fail(message) not Fail()");
+        }
+
+        public static void Fail(string message)
+        {
+            throw new InvalidOperationException(message);
         }
 
         public static void IsEmpty(ICollection collection)
@@ -170,7 +266,10 @@ public static void IsFalse(bool condition)
 
         public static void IsFalse(bool condition, string message)
         {
-            Xunit.Assert.False(condition, message);
+            if (condition)
+            {
+                Assert.Fail(message);
+            }
         }
 
         public static void IsNotNull(object o)
@@ -180,13 +279,9 @@ public static void IsNotNull(object o)
 
         public static void IsNotNull(object o, string message)
         {
-            try
+            if (o == null)
             {
-                Xunit.Assert.NotNull(o);
-            }
-            catch (NotNullException)
-            {
-                throw new NotNullException2(message);
+                Assert.Fail(message);
             }
         }
 
@@ -197,13 +292,9 @@ public static void IsNull(object o)
 
         public static void IsNull(object o, string message)
         {
-            try
-            {
-                Xunit.Assert.Null(o);
-            }
-            catch (NullException)
+            if (o != null)
             {
-                throw new NullException2(o, message);
+                Assert.Fail(message);
             }
         }
 
@@ -214,7 +305,7 @@ public static void IsTrue(bool condition)
 
         public static void IsTrue(bool condition, string message)
         {
-            Xunit.Assert.True(condition, message);
+            AreEqual(true, condition, message);
         }
 
         public static void IsInstanceOfType(Type expected, object actual)
@@ -224,19 +315,10 @@ public static void IsInstanceOfType(Type expected, object actual)
 
         public static void IsInstanceOfType(Type expected, object actual, string message)
         {
-            try
+            if (!(expected.IsInstanceOfType(actual)))
             {
-                Xunit.Assert.IsAssignableFrom(expected, actual);
+                Assert.Fail(message);
             }
-            catch(IsAssignableFromException)
-            {
-                throw new IsAssignableFromException2(expected, actual, message);
-            }
-        }
-
-        public static void Fail(string message)
-        {
-            Xunit.Assert.True(false, message);
         }
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/FriendWithKey/XamlTestClasses.FriendWithKey.csproj b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/FriendWithKey/XamlTestClasses.FriendWithKey.csproj
deleted file mode 100644
index b50c80cd7b3..00000000000
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/FriendWithKey/XamlTestClasses.FriendWithKey.csproj
+++ /dev/null
@@ -1,11 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
-    <PropertyGroup>
-    <AssemblyName>XamlTestClasses.FriendWithKey</AssemblyName>
-    <OutputType>Library</OutputType>
-    <DefineConstants>$(DefineConstants);OLDRESOURCES</DefineConstants>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="FriendWithKey.cs" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/FriendWithoutKey/XamlTestClasses.FriendWithoutKey.csproj b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/FriendWithoutKey/XamlTestClasses.FriendWithoutKey.csproj
deleted file mode 100644
index 0d902aa8960..00000000000
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/FriendWithoutKey/XamlTestClasses.FriendWithoutKey.csproj
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
-    <PropertyGroup>
-    <AssemblyName>XamlTestClasses.FriendWithoutKey</AssemblyName>
-    <OutputType>Library</OutputType>
-    <DefineConstants>$(DefineConstants);OLDRESOURCES</DefineConstants>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <SignAssembly>false</SignAssembly>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="FriendWithoutKey.cs" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/XamlTestClasses.FriendWithKey/XamlTestClasses.FriendWithKey.csproj b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/XamlTestClasses.FriendWithKey/XamlTestClasses.FriendWithKey.csproj
index 53e9006f66f..38ef8c623f8 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/XamlTestClasses.FriendWithKey/XamlTestClasses.FriendWithKey.csproj
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/XamlTestClasses.FriendWithKey/XamlTestClasses.FriendWithKey.csproj
@@ -3,5 +3,6 @@
     <AssemblyName>XamlTestClasses.FriendWithKey</AssemblyName>
     <RootNamespace>XamlTestClasses.FriendWithKey</RootNamespace>
     <Platforms>AnyCPU;x64</Platforms>
+    <OutputType>Library</OutputType>
   </PropertyGroup>
 </Project>
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/XamlTestClasses.FriendWithoutKey/XamlTestClasses.FriendWithoutKey.csproj b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/XamlTestClasses.FriendWithoutKey/XamlTestClasses.FriendWithoutKey.csproj
index 2292641f063..15261c44875 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/XamlTestClasses.FriendWithoutKey/XamlTestClasses.FriendWithoutKey.csproj
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/XamlTestClasses.FriendWithoutKey/XamlTestClasses.FriendWithoutKey.csproj
@@ -3,5 +3,6 @@
     <AssemblyName>XamlTestClasses.FriendWithoutKey</AssemblyName>
     <RootNamespace>XamlTestClasses.FriendWithoutKey</RootNamespace>
     <Platforms>AnyCPU;x64</Platforms>
+    <OutputType>Library</OutputType>
   </PropertyGroup>
 </Project>
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/XamlTestClasses/XamlTestClasses.csproj b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/XamlTestClasses/XamlTestClasses.csproj
index faf81e73e6e..a0d7274219d 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/XamlTestClasses/XamlTestClasses.csproj
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/XamlTestClasses/XamlTestClasses.csproj
@@ -6,7 +6,6 @@
   </PropertyGroup>
   
   <PropertyGroup>
-    <SignAssembly>false</SignAssembly>
     <AssemblyOriginatorKeyFile>DrtXaml.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   
diff --git a/src/Microsoft.DotNet.Wpf/test/Directory.Build.props b/src/Microsoft.DotNet.Wpf/test/Directory.Build.props
index 12c3872c4d5..7c34f925711 100644
--- a/src/Microsoft.DotNet.Wpf/test/Directory.Build.props
+++ b/src/Microsoft.DotNet.Wpf/test/Directory.Build.props
@@ -1,56 +1,29 @@
 <Project>
+  <PropertyGroup>
+    <WpfTest>true</WpfTest>
+  </PropertyGroup>
   <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
-
   <PropertyGroup>
-    <WpfTestBasePath>$(MsBuildThisFileDirectory)</WpfTestBasePath>
-    <DrtCommonRoot>$(WpfTestBasePath)\Common\DRT</DrtCommonRoot>
-    <WpfSharedRoot>$(WpfTestBasePath)\Shared</WpfSharedRoot>
-    <PublishRoot>$(RepoRoot)artifacts\test\</PublishRoot>
+    <WpfTestsDir>$(MsBuildThisFileDirectory)</WpfTestsDir>
+    <SignAssembly>false</SignAssembly>
+    <IsTestProject Condition="'$(IsTestProject)'!='false'">true</IsTestProject>
+    <IsShipping>false</IsShipping>
+    <EnableXlfLocalization>false</EnableXlfLocalization>
+    <CLSCompliant>false</CLSCompliant>
     <TargetFramework>netcoreapp3.0</TargetFramework>
-    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-    <RuntimeIdentifiers>win-x64;win-x86</RuntimeIdentifiers>
+
+    <SelfContained>false</SelfContained>
+
+    <!-- Arcade SDK defaults to AnyCpu ~= x64. In WPF, we will map AnyCpu => x86 instead -->
     <PlatformFolder>x86</PlatformFolder>
     <PlatformFolder Condition="'$(Platform)' == 'x64'">x64</PlatformFolder>
-  </PropertyGroup>
- 
-  <Import Project="$(WpfArcadeSdkToolsDir)\Publish.props"/>
-  <Import Project="$(WpfArcadeSdkToolsDir)\StrongName.props"/>
+    <PublishRoot>$(RepoRoot)artifacts\test\$(Configuration)\$(PlatformFolder)</PublishRoot>
 
+    <WpfTestBasePublishPath>$(PublishRoot)\Test</WpfTestBasePublishPath>
+  </PropertyGroup>
   <ItemDefinitionGroup>
     <EmbeddedResource>
       <GenerateSource>false</GenerateSource>
     </EmbeddedResource>
-    
-    <PackageReference>
-      <PrivateAssets>contentfiles;analyzers;build</PrivateAssets>
-    </PackageReference>
   </ItemDefinitionGroup>
-
-  <PropertyGroup>
-    <InternalUtilitiesProject>$(WpfTestBasePath)\Infra\TestUtilities\InternalUtilities\InternalUtilities.csproj</InternalUtilitiesProject>
-    <TestContractsProject>$(WpfTestBasePath)\Infra\CommunityChest\TestContracts\TestContracts.csproj</TestContractsProject>
-    <TestApiCoreProject>$(WpfTestBasePath)\Infra\TestApi\TestApiCore\Code\TestApiCore.csproj</TestApiCoreProject>
-    <TestRuntimeProject>$(WpfTestBasePath)\Common\TestRuntime\TestRuntime.csproj</TestRuntimeProject>
-    <TestServicesProject>$(WpfTestBasePath)\Common\Drt\TestServices\TestServices.csproj</TestServicesProject>
-    <QualityVaultUtilitiesProject>$(WpfTestBasePath)\Infra\QualityVault\QualityVaultUtilities\QualityVaultUtilities.csproj</QualityVaultUtilitiesProject>
-    <DrtToolsProject>$(WpfTestBasePath)\Common\DRT\Tools\DrtTools.csproj</DrtToolsProject>
-  </PropertyGroup>
-
-  <Import Project="$(WpfArcadeSdkToolsDir)\SourceLocations.props"/>
-
-  <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <EnableDefaultItems>false</EnableDefaultItems>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <!-- CS0618 - UnmanagedType.Struct usage -->
-    <!-- VSTHRD002 - Synchronous awaits from IPC since we can't convert the entire logging/IPC mechanism to async -->
-    <!-- VSTHRD001 - Legacy sync code -->
-    <NoWarn>CS0618;VSTHRD002;VSTHRD001</NoWarn>
-    
-    <!-- Remove these when open sourcing -->
-    <NoWarn>$(NoWarn);CS3005;CS3001;CS3002;CS3003;CS0169</NoWarn>
-  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Wpf/test/Directory.Build.targets b/src/Microsoft.DotNet.Wpf/test/Directory.Build.targets
index 2181cf771d7..55094856dec 100644
--- a/src/Microsoft.DotNet.Wpf/test/Directory.Build.targets
+++ b/src/Microsoft.DotNet.Wpf/test/Directory.Build.targets
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
-  <Import Project="$(WpfArcadeSdkToolsDir)StrongName.targets" />
-  <Import Project="$(WpfArcadeSdkToolsDir)PublishAfterBuild.targets" />
+  <Import Project="$(WpfArcadeSdkToolsDir)PublishAfterBuild.targets"/>
 </Project>
   
\ No newline at end of file

From c51f8525a84aff4ae8cd00e9d4d7989534761188 Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Fri, 31 May 2019 14:08:36 -0700
Subject: [PATCH 21/72] don't use publish

---
 eng/AddDrtsToPayload.targets                  | 26 +++++++++++++++++++
 .../tools/CreateTestPayload.targets           | 22 ++++++++++++++--
 .../tools/PublishAfterBuild.targets           | 11 --------
 eng/WpfArcadeSdk/tools/RunDrtsLocal.targets   |  2 ++
 eng/WpfArcadeSdk/tools/TestProjects.targets   | 26 +++++++++----------
 .../test/Common/Directory.Build.props         |  3 ---
 .../test/DRT/Directory.Build.props            |  3 ---
 .../test/Directory.Build.props                | 10 +------
 .../test/Directory.Build.targets              |  6 -----
 9 files changed, 61 insertions(+), 48 deletions(-)
 create mode 100644 eng/AddDrtsToPayload.targets
 delete mode 100644 eng/WpfArcadeSdk/tools/PublishAfterBuild.targets
 delete mode 100644 src/Microsoft.DotNet.Wpf/test/Directory.Build.targets

diff --git a/eng/AddDrtsToPayload.targets b/eng/AddDrtsToPayload.targets
new file mode 100644
index 00000000000..30f8f09b80a
--- /dev/null
+++ b/eng/AddDrtsToPayload.targets
@@ -0,0 +1,26 @@
+<Project>
+  <PropertyGroup>
+    <!-- AnyCPU/x86 builds don't produce an output folder in artifacts. This only exists for x64 builds. -->
+    <PlatformFolder Condition="'$(Platform)'=='x64'">x64</PlatformFolder>
+
+    <!-- For the test payload, we default to x86 for AnyCPU platform --> 
+    <PayloadPlatformFolder>x86</PayloadPlatformFolder>
+    <PayloadPlatformFolder Condition="'$(Platform)'=='x64'">x64</PayloadPlatformFolder>
+    <PayloadBaseLocation>$(RepoRoot)artifacts\test\$(Configuration)\$(PayloadPlatformFolder)</PayloadBaseLocation>
+    <PayloadDrtLocation>$(PayloadBaseLocation)\Test\DRT</PayloadDrtLocation>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <!-- List of DRTs to include -->
+    <DRT Include="DrtXaml" />
+  </ItemGroup>
+
+  <Target Name="AddDrtsToPayload" BeforeTargets="RunDrts">
+    <ItemGroup>
+      <DrtPayloadContents Include="$(RepoRoot)artifacts\bin\%(DRT.Identity)\$(PlatformFolder)\$(Configuration)\**\*.*"/>
+    </ItemGroup>
+    <Copy SourceFiles="@(DrtPayloadContents)"
+          DestinationFiles="@(DrtPayloadContents->'$(PayloadDrtLocation)\%(RecursiveDir)%(Filename)%(Extension)')"  />
+  </Target>
+
+</Project>
diff --git a/eng/WpfArcadeSdk/tools/CreateTestPayload.targets b/eng/WpfArcadeSdk/tools/CreateTestPayload.targets
index c7872ca0772..958044295b7 100644
--- a/eng/WpfArcadeSdk/tools/CreateTestPayload.targets
+++ b/eng/WpfArcadeSdk/tools/CreateTestPayload.targets
@@ -3,14 +3,24 @@
   <PropertyGroup>
     <LocalRuntimeIdentifier Condition="'$(Platform)'=='x64' or '$(Platform)'=='x86' or '$(Platform)'=='arm' or '$(Platform)'=='arm64'">win-$(Platform)</LocalRuntimeIdentifier>
     <LocalRuntimeIdentifier Condition="'$(Platform)'=='Win32' or '$(Platform)'=='AnyCPU'">win-x86</LocalRuntimeIdentifier>
-
     <NoWarn>$(NoWarn);NU3027;NU3018</NoWarn>
+
+     <!-- Arcade SDK defaults to AnyCpu ~= x64. In WPF, we will map AnyCpu => x86 instead -->
+    <PlatformFolder>x86</PlatformFolder>
+    <PlatformFolder Condition="'$(Platform)' == 'x64'">x64</PlatformFolder>
+    <PublishRoot>$(RepoRoot)artifacts\test\$(Configuration)\$(PlatformFolder)</PublishRoot>
+
+    <WpfTestBasePublishPath>$(PublishRoot)\Test</WpfTestBasePublishPath>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="runtime.$(LocalRuntimeIdentifier).Microsoft.DotNet.Wpf.Test" Version="$(MicrosoftDotNetWpfTestPackageVersion)" GeneratePathProperty="true" />
   </ItemGroup>
 
+  <ItemGroup>
+    <DRT Include="DrtXaml" />
+  </ItemGroup>
+
   <PropertyGroup Condition="'$(LocalRuntimeIdentifier)'=='win-x86'">
     <MicrosoftDotNetWpfTestPath>$(Pkgruntime_win-x86_Microsoft_DotNet_Wpf_Test)\tools\$(LocalRuntimeIdentifier)\Test\</MicrosoftDotNetWpfTestPath>
   </PropertyGroup>
@@ -19,12 +29,15 @@
     <MicrosoftDotNetWpfTestPath>$(Pkgruntime_win-x64_Microsoft_DotNet_Wpf_Test)\tools\$(LocalRuntimeIdentifier)\Test\</MicrosoftDotNetWpfTestPath>
   </PropertyGroup>
 
-  <Target Name="CreateTestPayload" BeforeTargets="Test">
+  <Target Name="CreateTestPayload" BeforeTargets="Test" AfterTargets="Build">
     <ItemGroup>
       <MicrosoftDotNetWpfTestContents Include="$(MicrosoftDotNetWpfTestPath)\**\*.*" />
       <OtherPayloadContents Include="$(WpfArcadeSdkToolsDir)runtests.cmd" />
       <OtherPayloadContents Include="$(WpfArcadeSdkToolsDir)runtests.ps1" />
       <OtherPayloadContents Include="$(WpfArcadeSdkToolsDir)configure-helix-machine.ps1" Condition="'$(ContinousIntegrationBuild)'=='True'" />
+
+      <DrtPayloadContents Include="$(RepoRoot)artifacts\bin\%(DRT.Identity)\$(PlatformFolder)\$(Configuration)\**\*.*"/>
+
     </ItemGroup>
 
     <Copy SourceFiles="@(MicrosoftDotNetWpfTestContents)"
@@ -36,6 +49,11 @@
     <Copy SourceFiles="$(WpfTestsDir)BranchCommon\data\DrtList.xml"
           DestinationFolder="$(WpfTestBasePublishPath)\DRT"  />
 
+    <Copy SourceFiles="$(WpfTestsDir)BranchCommon\data\DrtList.xml"
+          DestinationFolder="$(WpfTestBasePublishPath)\DRT"  />
+
+    <Copy SourceFiles="@(DrtPayloadContents)"
+          DestinationFolder="@(DrtPayloadContents->'$(DrtPayloadContents)\%(RecursiveDir)%(Filename)%(Extension)')"  />
   </Target>
 
 </Project>
diff --git a/eng/WpfArcadeSdk/tools/PublishAfterBuild.targets b/eng/WpfArcadeSdk/tools/PublishAfterBuild.targets
deleted file mode 100644
index 42f92318850..00000000000
--- a/eng/WpfArcadeSdk/tools/PublishAfterBuild.targets
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project>
-   <Target Name="AfterBuild" DependsOnTargets="PublishPropertySetup;Publish"/> 
-  
-   <Target Name="PublishPropertySetup">
-     <PropertyGroup>
-         <NoBuild>true</NoBuild>
-     </PropertyGroup>
-   </Target>
-
-</Project>
diff --git a/eng/WpfArcadeSdk/tools/RunDrtsLocal.targets b/eng/WpfArcadeSdk/tools/RunDrtsLocal.targets
index 376c35bb846..8a73ac96dab 100644
--- a/eng/WpfArcadeSdk/tools/RunDrtsLocal.targets
+++ b/eng/WpfArcadeSdk/tools/RunDrtsLocal.targets
@@ -1,4 +1,6 @@
 <Project>
+  <!-- The internal and external repos each define their own drts to add that need running. -->
+  <Import Project="$(RepoRoot)\eng\AddDrtsToPayload.targets" Condition="Exists('$(RepoRoot)\eng\AddDrtsToPayload.targets')" />
   <Target Name="RunDrts" AfterTargets="Build" Condition="'$(ContinuousIntegrationBuild)'!='True'">
     <Exec Command="$(RepoRoot)\artifacts\test\$(Configuration)\$(Platform)\runtests.cmd"/>
   </Target>
diff --git a/eng/WpfArcadeSdk/tools/TestProjects.targets b/eng/WpfArcadeSdk/tools/TestProjects.targets
index 28dcf279bcb..d5396b3a087 100644
--- a/eng/WpfArcadeSdk/tools/TestProjects.targets
+++ b/eng/WpfArcadeSdk/tools/TestProjects.targets
@@ -7,8 +7,7 @@
   <PropertyGroup Condition="'$(IsTestProject)' == 'true' or '$(WpfTest)'=='true'">
     <TestArchitectures Condition="'$(PlatformTarget)' == '' or '$(PlatformTarget)' == 'AnyCpu'">x86</TestArchitectures>
     <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
-    <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
-    <CopyLocalLockFileAssemblies Condition="'$(CreateTestPayload)'=='true'">true</CopyLocalLockFileAssemblies>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <IsSelfContained>true</IsSelfContained>
   </PropertyGroup>
 
@@ -19,8 +18,7 @@
     -->
     <PackageReference Include="runtime.$(RuntimeIdentifier).$(MicrosoftDotNetWpfDncEngPackage)"
                       Condition="'$(RepositoryName)'=='wpf'"
-                      Version="$(MicrosoftDotNetWpfDncEngVersion)"
-                      Publish="$(CreateTestPayload)">
+                      Version="$(MicrosoftDotNetWpfDncEngVersion)">
       <CopyLocal>true</CopyLocal>
       <GeneratePathProperty>true</GeneratePathProperty>
     </PackageReference>
@@ -28,24 +26,24 @@
     <!-- 
       PackageReference from individual WPF projects here 
     -->
-    <PackageReference Include="$(SystemIOPackagingPackage)" Version="$(SystemIOPackagingVersion)" Publish="$(CreateTestPayload)" />
+    <PackageReference Include="$(SystemIOPackagingPackage)" Version="$(SystemIOPackagingVersion)" CopyLocal="true" />
     <PackageReference Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryPackageVersion)" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerPackageVersion)" Publish="$(CreateTestPayload)"  />
-    <PackageReference Include="System.Diagnostics.EventLog" Version="$(SystemDiagnosticsEventLogPackageVersion)" Publish="$(CreateTestPayload)" />
-    <PackageReference Include="System.Security.Cryptography.Xml" Version="$(SystemSecurityCryptographyXmlPackageVersion)" Publish="$(CreateTestPayload)" />
-    <PackageReference Include="System.Security.Permissions" Version="$(SystemSecurityPermissionsPackageVersion)" Publish="$(CreateTestPayload)" />
-    <PackageReference Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsPackageVersion)" Publish="$(CreateTestPayload)" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerPackageVersion)" CopyLocal="true"  />
+    <PackageReference Include="System.Diagnostics.EventLog" Version="$(SystemDiagnosticsEventLogPackageVersion)" CopyLocal="true" />
+    <PackageReference Include="System.Security.Cryptography.Xml" Version="$(SystemSecurityCryptographyXmlPackageVersion)" CopyLocal="true" />
+    <PackageReference Include="System.Security.Permissions" Version="$(SystemSecurityPermissionsPackageVersion)" CopyLocal="true" />
+    <PackageReference Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsPackageVersion)" CopyLocal="true" />
 
-    <PackageReference Include="System.Security.AccessControl" Version="$(SystemSecurityAccessControlPackageVersion)" Publish="$(CreateTestPayload)" />
-    <PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsPackageVersion)" Publish="$(CreateTestPayload)" />
+    <PackageReference Include="System.Security.AccessControl" Version="$(SystemSecurityAccessControlPackageVersion)" CopyLocal="true" />
+    <PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsPackageVersion)" CopyLocal="true" />
 
 
 
     <!-- These exist to ensure that dependencies (esp. native ones) are binplaced with tests correctly -->
-    <None Condition="'$(RuntimeIdentifier)'=='win-x64' And '$(CreateTestPayload)'=='true'"
+    <None Condition="'$(RuntimeIdentifier)'=='win-x64'"
           Include="$(Pkgruntime_win-x64_Microsoft_DotNet_Wpf_DncEng)\runtimes\$(RuntimeIdentifier)\native\*.dll"
           CopyToOutputDirectory="PreserveNewest"/>
-    <None Condition="'$(RuntimeIdentifier)'=='win-x86' And '$(CreateTestPayload)'=='true'"
+    <None Condition="'$(RuntimeIdentifier)'=='win-x86'"
            Include="$(Pkgruntime_win-x86_Microsoft_DotNet_Wpf_DncEng)\runtimes\$(RuntimeIdentifier)\native\*.dll"
           CopyToOutputDirectory="PreserveNewest"/>
 
diff --git a/src/Microsoft.DotNet.Wpf/test/Common/Directory.Build.props b/src/Microsoft.DotNet.Wpf/test/Common/Directory.Build.props
index 7e783514db2..66ffd0bbef4 100644
--- a/src/Microsoft.DotNet.Wpf/test/Common/Directory.Build.props
+++ b/src/Microsoft.DotNet.Wpf/test/Common/Directory.Build.props
@@ -1,6 +1,3 @@
 <Project>
   <Import Condition="Exists('../Directory.Build.props')" Project="../Directory.Build.props" />
-  <PropertyGroup>
-    <PublishDir>$(WpfTestBasePublishPath)\Common</PublishDir>
-  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/Directory.Build.props b/src/Microsoft.DotNet.Wpf/test/DRT/Directory.Build.props
index 7167d0c5112..66ffd0bbef4 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT/Directory.Build.props
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/Directory.Build.props
@@ -1,6 +1,3 @@
 <Project>
   <Import Condition="Exists('../Directory.Build.props')" Project="../Directory.Build.props" />
-  <PropertyGroup>
-    <PublishDir>$(WpfTestBasePublishPath)\DRT</PublishDir>
-  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Wpf/test/Directory.Build.props b/src/Microsoft.DotNet.Wpf/test/Directory.Build.props
index 7c34f925711..16e1712ef31 100644
--- a/src/Microsoft.DotNet.Wpf/test/Directory.Build.props
+++ b/src/Microsoft.DotNet.Wpf/test/Directory.Build.props
@@ -11,15 +11,7 @@
     <EnableXlfLocalization>false</EnableXlfLocalization>
     <CLSCompliant>false</CLSCompliant>
     <TargetFramework>netcoreapp3.0</TargetFramework>
-
-    <SelfContained>false</SelfContained>
-
-    <!-- Arcade SDK defaults to AnyCpu ~= x64. In WPF, we will map AnyCpu => x86 instead -->
-    <PlatformFolder>x86</PlatformFolder>
-    <PlatformFolder Condition="'$(Platform)' == 'x64'">x64</PlatformFolder>
-    <PublishRoot>$(RepoRoot)artifacts\test\$(Configuration)\$(PlatformFolder)</PublishRoot>
-
-    <WpfTestBasePublishPath>$(PublishRoot)\Test</WpfTestBasePublishPath>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <EmbeddedResource>
diff --git a/src/Microsoft.DotNet.Wpf/test/Directory.Build.targets b/src/Microsoft.DotNet.Wpf/test/Directory.Build.targets
deleted file mode 100644
index 55094856dec..00000000000
--- a/src/Microsoft.DotNet.Wpf/test/Directory.Build.targets
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
-  <Import Project="$(WpfArcadeSdkToolsDir)PublishAfterBuild.targets"/>
-</Project>
-  
\ No newline at end of file

From d5fb705aeb60486fa28a7c03a2d387e2d6a5469c Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Fri, 31 May 2019 14:08:44 -0700
Subject: [PATCH 22/72] updating documentation

---
 Documentation/developer-guide.md  | 22 ++++++++++++++++++++++
 Documentation/testing-in-helix.md | 11 +++++------
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/Documentation/developer-guide.md b/Documentation/developer-guide.md
index b8386a38cc3..3673835a6c1 100644
--- a/Documentation/developer-guide.md
+++ b/Documentation/developer-guide.md
@@ -23,6 +23,28 @@ We use the following workflow for building and testing features and fixes.
 
 You first need to [Fork](https://github.com/dotnet/corefx/wiki/Checking-out-the-code-repository#fork-the-repository) and [Clone](https://github.com/dotnet/corefx/wiki/Checking-out-the-code-repository#clone-the-repository) this WPF repository. This is a one-time task.
 
+
+### Running DRTs locally ###
+In order to run the set of DRTs on your local machine, pass the `-test` parameter to the `build.cmd` script. At the end of the run, you should see something like this:
+
+```
+  A total of 1 test Infos were processed, with the following results.
+   Passed: 1
+   Failed (need to analyze): 0
+   Failed (with BugIDs): 0
+   Ignore: 0
+
+```
+If there were any failures, you can cd into $(RepoRoot)\artifacts\test\$(Configuration)\$(Platform)\Test and run the tests manually with the `/debugtests` flag. This will open a cmd window, where you can open the test executable in Visual Studio and debug it. For example, to debug DrtXaml.exe you would enter this into the command window:
+
+`"%ProgramFiles%\Microsoft Visual Studio\2019\Preview\Common7\IDE\devenv.exe" DrtXaml.exe`
+
+Once Visual Studio is open, you will first need to manually change the debugger type from `Auto` to `Mixed (CoreCLR)`. From there you can F5 and the test will execute.
+
+*Note: To run a specific test, you can pass the name of the test like this: `/name=DrtXaml`.*
+
+**NOTE: This requires being run from an admin window at the moment. This restriction will be removed shortly.**
+
 ### Testing Locally built WPF assemblies (excluding PresentationBuildTasks)
 This section of guide is intended to discuss the different approaches for ad-hoc testing of WPF assemblies,
 and not automated testing. There are a few different ways this can be done, and for the most part,
diff --git a/Documentation/testing-in-helix.md b/Documentation/testing-in-helix.md
index 5cbd402f7ad..58274b9f261 100644
--- a/Documentation/testing-in-helix.md
+++ b/Documentation/testing-in-helix.md
@@ -2,12 +2,11 @@
 
 I'd recommend seeing the official Helix [readme](https://github.com/dotnet/arcade/blob/master/src/Microsoft.DotNet.Helix/Sdk/Readme.md) if you are interested in some of the general Helix concepts. I'll briefly outline what we are doing that is a bit unique:
 
-1. Helix has built-in support for running xUnit tests. Since we are not using xUnit, we have to manually setup our machines so that they work with QualityVault and STI.
-We manually restore the helixpublish.proj project during CI builds; this is done in `pipeline.yml`. This allows us to package reference the `Microsoft.DotNet.Wpf.DncEng.Test` package to pull down the binaries that we need. We can extract them into a local folder using the MSBuild property `RestorePackagesPath`, so that when the project is restored, we know the exact relative location of the packages.
-2. We need to create a "TestHost" installation of dotnet on the Helix machine. The default Helix support for installing dotnet only installs version 2.x, and only installs the `Microsoft.NETCore.App` runtime, and not the M`icrosoft.WindowsDesktop.App` or `Microsoft.AspNetCore.App` runtimes. I opted to doing this manually and copy it out of the `.dotnet` folder that gets created as part of ci builds, rather than running an installer on the Helix machine. I figured reducing the number of dependencies on making external network calls and downloading items from the internet the better.
-3. We copy both the nuget packages we care care about and the dotnet install in the `prepare-helix-payload.ps1` script. This gets invoked before we actually run tests in the `pipeline-yml` file located in the `eng` directory. Helix allows you to specify a `HelixCorrelationPayload` directory, where this directory gets deployed to the Helix machine, and is made available in your various helix commands with the `HELIX_CORRELATION_PAYLOAD` environment variable.
-4. Helix and Azure Pipelines can report xUnit logs, so we will be updating QualityVault to produce an xUnit compatible log. We will then need to copy that log to a known location for it to be picked up.
+1. Helix has built-in support for running xUnit tests. Since we are not using xUnit, we have to manually setup our machines so that they work with QualityVault and STI. During the build, we create a payload directory that contains the infrastructure we need. A single project (in our case `DrtXaml`) is responsible for creating this directory (see instances of the MSBuild property `CreateTestPayload`).
+2. After the build is done, we utilize Arcade's `AfterSolutionBuild.targets` extension point to finish creating the rest of the payload if the `-test` parameter is passed to the build. Here we add the just built DRTs and if `-ci` was **not** passed into to the build, run the tests. 
+3. Helix allows you to specify a `HelixCorrelationPayload` directory, where this directory gets deployed to the Helix machine, and is made available in your various helix commands with the `HELIX_CORRELATION_PAYLOAD` environment variable. We use the payload directory created described above.
+4. Helix and Azure Pipelines can report xUnit logs, so we will be updating QualityVault to produce an xUnit compatible log. We will then need to copy that log to a known location for it to be picked up. This location can be in any subfolder of the `HelixWorkItem` working directory. 
 
 ## How we are running tests
 1. Currently, the `HelixQueues` that we selected are Windows.10.Amd64.Open;Windows.7.Amd64.Open;Windows.10.Amd64.ServerRS5.Open. Essentially, this translates to: "Latest Windows 10", "Windows 7", and "Windows 10 RS5 Server" addition. This enables tests to run on some of the most interesting and important SKUs, without overloading the Helix servers and/or making CI runs take an unnecessarily long time to run.
-2. In similar vain, we only run test passes for Release builds, mainly to save time and resources running duplicate tests in a near-identical environment.
\ No newline at end of file
+2. In a similar fashion, we only run test passes for Release builds, mainly to save time and resources running duplicate tests in a near-identical environment.
\ No newline at end of file

From a0af0d35f778bb52cf32b605139cbceab76690a5 Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Fri, 31 May 2019 14:34:04 -0700
Subject: [PATCH 23/72] fixing typo

---
 eng/WpfArcadeSdk/tools/CreateTestPayload.targets | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/eng/WpfArcadeSdk/tools/CreateTestPayload.targets b/eng/WpfArcadeSdk/tools/CreateTestPayload.targets
index 958044295b7..c92938d61f4 100644
--- a/eng/WpfArcadeSdk/tools/CreateTestPayload.targets
+++ b/eng/WpfArcadeSdk/tools/CreateTestPayload.targets
@@ -17,10 +17,6 @@
     <PackageReference Include="runtime.$(LocalRuntimeIdentifier).Microsoft.DotNet.Wpf.Test" Version="$(MicrosoftDotNetWpfTestPackageVersion)" GeneratePathProperty="true" />
   </ItemGroup>
 
-  <ItemGroup>
-    <DRT Include="DrtXaml" />
-  </ItemGroup>
-
   <PropertyGroup Condition="'$(LocalRuntimeIdentifier)'=='win-x86'">
     <MicrosoftDotNetWpfTestPath>$(Pkgruntime_win-x86_Microsoft_DotNet_Wpf_Test)\tools\$(LocalRuntimeIdentifier)\Test\</MicrosoftDotNetWpfTestPath>
   </PropertyGroup>
@@ -34,10 +30,7 @@
       <MicrosoftDotNetWpfTestContents Include="$(MicrosoftDotNetWpfTestPath)\**\*.*" />
       <OtherPayloadContents Include="$(WpfArcadeSdkToolsDir)runtests.cmd" />
       <OtherPayloadContents Include="$(WpfArcadeSdkToolsDir)runtests.ps1" />
-      <OtherPayloadContents Include="$(WpfArcadeSdkToolsDir)configure-helix-machine.ps1" Condition="'$(ContinousIntegrationBuild)'=='True'" />
-
-      <DrtPayloadContents Include="$(RepoRoot)artifacts\bin\%(DRT.Identity)\$(PlatformFolder)\$(Configuration)\**\*.*"/>
-
+      <OtherPayloadContents Include="$(WpfArcadeSdkToolsDir)configure-helix-machine.ps1" Condition="'$(ContinuousIntegrationBuild)'=='True'" />
     </ItemGroup>
 
     <Copy SourceFiles="@(MicrosoftDotNetWpfTestContents)"
@@ -51,9 +44,6 @@
 
     <Copy SourceFiles="$(WpfTestsDir)BranchCommon\data\DrtList.xml"
           DestinationFolder="$(WpfTestBasePublishPath)\DRT"  />
-
-    <Copy SourceFiles="@(DrtPayloadContents)"
-          DestinationFolder="@(DrtPayloadContents->'$(DrtPayloadContents)\%(RecursiveDir)%(Filename)%(Extension)')"  />
   </Target>
 
 </Project>

From 474920934a0e585f9f61aca372feb2fa6e0f8f52 Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Mon, 3 Jun 2019 09:46:43 -0700
Subject: [PATCH 24/72] responding to pr feedback

---
 Documentation/developer-guide.md              |  12 ++-
 eng/AddDrtsToPayload.targets                  |  26 -----
 eng/WpfArcadeSdk/Sdk/Sdk.props                |   4 +
 .../tools/AddDrtsToPayload.targets            |  35 ++++++
 .../tools/CreateTestPayload.targets           |  23 ++--
 eng/WpfArcadeSdk/tools/DrtsToRun.props        |   9 ++
 eng/WpfArcadeSdk/tools/RunDrtsLocal.targets   |   7 +-
 eng/WpfArcadeSdk/tools/TestProjects.targets   |   3 +-
 eng/helixpublish.proj                         | 100 +-----------------
 9 files changed, 75 insertions(+), 144 deletions(-)
 delete mode 100644 eng/AddDrtsToPayload.targets
 create mode 100644 eng/WpfArcadeSdk/tools/AddDrtsToPayload.targets
 create mode 100644 eng/WpfArcadeSdk/tools/DrtsToRun.props

diff --git a/Documentation/developer-guide.md b/Documentation/developer-guide.md
index 3673835a6c1..3e3ae808a4f 100644
--- a/Documentation/developer-guide.md
+++ b/Documentation/developer-guide.md
@@ -35,15 +35,17 @@ In order to run the set of DRTs on your local machine, pass the `-test` paramete
    Ignore: 0
 
 ```
-If there were any failures, you can cd into $(RepoRoot)\artifacts\test\$(Configuration)\$(Platform)\Test and run the tests manually with the `/debugtests` flag. This will open a cmd window, where you can open the test executable in Visual Studio and debug it. For example, to debug DrtXaml.exe you would enter this into the command window:
+If there were any failures, you can cd into $(RepoRoot)\artifacts\test\$(Configuration)\$(Platform)\Test and run the tests manually with the `/debugtests` flag using the `RunDrts.cmd` script. Note that you do not run the `RunDrtsDebug` script, as this will debug the test infrastructure, `QualityVault`. When you pass the `/debugtests` flag, a cmd window will open where you can open the test executable in Visual Studio and debug it. When the cmd pops up, you will see instructions for debugging using a few different commands, however these commands will enable you to debug the `Simple Test Invocation` executable, `sti.exe`, which simply launches the test executable you are most likely interested in debugging. Using `DrtXaml.exe` as an example, this is how you can debug the test executable:
 
+1. `$(RepoRoot)\artifacts\test\$(Configuration)\$(Platform)\Test\RunDrts.cmd /name=DrtXaml /debugtests`
+2. Enter following command into the cmd window that pops up:
 `"%ProgramFiles%\Microsoft Visual Studio\2019\Preview\Common7\IDE\devenv.exe" DrtXaml.exe`
+3. Once Visual Studio is open, manually change the debugger type from `Auto` to `Mixed (CoreCLR)`.
+4. From there you can F5 and the test will execute.
 
-Once Visual Studio is open, you will first need to manually change the debugger type from `Auto` to `Mixed (CoreCLR)`. From there you can F5 and the test will execute.
+*Note: To run a specific test, you can pass the name of the test like this: `/name=DrtXaml`. The names of these tests are contained in DrtList.xml*
 
-*Note: To run a specific test, you can pass the name of the test like this: `/name=DrtXaml`.*
-
-**NOTE: This requires being run from an admin window at the moment. This restriction will be removed shortly.**
+**NOTE: This requires being run from an admin window at the moment. Removing this restriction is tracked by https://github.com/dotnet/wpf/issues/816. **
 
 ### Testing Locally built WPF assemblies (excluding PresentationBuildTasks)
 This section of guide is intended to discuss the different approaches for ad-hoc testing of WPF assemblies,
diff --git a/eng/AddDrtsToPayload.targets b/eng/AddDrtsToPayload.targets
deleted file mode 100644
index 30f8f09b80a..00000000000
--- a/eng/AddDrtsToPayload.targets
+++ /dev/null
@@ -1,26 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <!-- AnyCPU/x86 builds don't produce an output folder in artifacts. This only exists for x64 builds. -->
-    <PlatformFolder Condition="'$(Platform)'=='x64'">x64</PlatformFolder>
-
-    <!-- For the test payload, we default to x86 for AnyCPU platform --> 
-    <PayloadPlatformFolder>x86</PayloadPlatformFolder>
-    <PayloadPlatformFolder Condition="'$(Platform)'=='x64'">x64</PayloadPlatformFolder>
-    <PayloadBaseLocation>$(RepoRoot)artifacts\test\$(Configuration)\$(PayloadPlatformFolder)</PayloadBaseLocation>
-    <PayloadDrtLocation>$(PayloadBaseLocation)\Test\DRT</PayloadDrtLocation>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <!-- List of DRTs to include -->
-    <DRT Include="DrtXaml" />
-  </ItemGroup>
-
-  <Target Name="AddDrtsToPayload" BeforeTargets="RunDrts">
-    <ItemGroup>
-      <DrtPayloadContents Include="$(RepoRoot)artifacts\bin\%(DRT.Identity)\$(PlatformFolder)\$(Configuration)\**\*.*"/>
-    </ItemGroup>
-    <Copy SourceFiles="@(DrtPayloadContents)"
-          DestinationFiles="@(DrtPayloadContents->'$(PayloadDrtLocation)\%(RecursiveDir)%(Filename)%(Extension)')"  />
-  </Target>
-
-</Project>
diff --git a/eng/WpfArcadeSdk/Sdk/Sdk.props b/eng/WpfArcadeSdk/Sdk/Sdk.props
index 2393ddf03e9..19eec4d0054 100644
--- a/eng/WpfArcadeSdk/Sdk/Sdk.props
+++ b/eng/WpfArcadeSdk/Sdk/Sdk.props
@@ -17,6 +17,10 @@
     <LangVersion Condition="'$(LangVersion)'==''">8.0</LangVersion>
     <CLSCompliant Condition="'$(CLSCompliant)'==''">true</CLSCompliant>
     <IncludeDllSafeSearchPathAttribute Condition="'$(IncludeDllSafeSearchPathAttribute )'==''">true</IncludeDllSafeSearchPathAttribute>
+
+    <!-- Properly calculates the RuntimeIdentifier based on the Platform type. Doesn't actually set the RuntimeIdentifier property. -->
+    <WpfRuntimeIdentifier Condition="('$(Platform)'!='AnyCPU' and '$(Platform)'!='Win32') Or $(Platform.EndsWith('64'))">win-$(Platform)</WpfRuntimeIdentifier>
+    <WpfRuntimeIdentifier Condition="'$(Platform)'=='AnyCPU' or '$(Platform)'=='Win32' or '$(Platform)'=='x86'">win-x86</WpfRuntimeIdentifier>
   </PropertyGroup>
 
   <Import Project="$(WpfArcadeSdkToolsDir)RuntimeFrameworkReference.props"/>
diff --git a/eng/WpfArcadeSdk/tools/AddDrtsToPayload.targets b/eng/WpfArcadeSdk/tools/AddDrtsToPayload.targets
new file mode 100644
index 00000000000..60c1044a63f
--- /dev/null
+++ b/eng/WpfArcadeSdk/tools/AddDrtsToPayload.targets
@@ -0,0 +1,35 @@
+<Project>
+  <!--
+  This .targets file is included by RunDrtsLocal.targets, which is built using the Arcade
+  extension point AfterSolutionBuild.targets. This doesn't include any of the custom MSBuild properties
+  that get set during the regular build. That doesn't matter much to us, there isn't really a whole lot
+  of extra stuff we need to do. We only depend on the $(Platform) and $(Configuration) properties to know
+  where to include the rest of the tests.
+  -->
+  <PropertyGroup>
+    <!-- AnyCPU/x86 builds don't produce an output folder in artifacts. This only exists for x64 builds. -->
+    <PlatformFolder Condition="'$(Platform)'=='x64'">x64</PlatformFolder>
+
+    <!-- For the test payload, we default to x86 for AnyCPU platform. --> 
+    <PayloadBaseLocation>$(RepoRoot)artifacts\test\$(Configuration)\$(Platform)\</PayloadBaseLocation>
+    <PayloadDrtLocation>$(PayloadBaseLocation)Test\DRT\</PayloadDrtLocation>
+  </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. 
+  -->
+  <Import Project="$(RepoRoot)eng\DrtsToRun.props" Condition="Exists('$(RepoRoot)eng\DrtsToRun.props')" />
+
+  <!-- List of DRTs to include that come from dotnet/wpf -->
+  <Import Project="$(MSBuildFileThisDirectory)DrtsToRun.props"/>
+
+  <Target Name="AddDrtsToPayload" BeforeTargets="RunDrts">
+    <ItemGroup>
+      <DrtPayloadContents Include="$(RepoRoot)artifacts\bin\%(DRT.Identity)\$(PlatformFolder)\$(Configuration)\**\*.*"/>
+    </ItemGroup>
+    <Copy SourceFiles="@(DrtPayloadContents)"
+          DestinationFiles="@(DrtPayloadContents->'$(PayloadDrtLocation)%(RecursiveDir)%(Filename)%(Extension)')"  />
+  </Target>
+
+</Project>
diff --git a/eng/WpfArcadeSdk/tools/CreateTestPayload.targets b/eng/WpfArcadeSdk/tools/CreateTestPayload.targets
index c92938d61f4..4f21f19dd24 100644
--- a/eng/WpfArcadeSdk/tools/CreateTestPayload.targets
+++ b/eng/WpfArcadeSdk/tools/CreateTestPayload.targets
@@ -1,8 +1,6 @@
 <Project>
     <!-- We use a local RID here since we don't want to change the build layout by setting the actual RID. -->
   <PropertyGroup>
-    <LocalRuntimeIdentifier Condition="'$(Platform)'=='x64' or '$(Platform)'=='x86' or '$(Platform)'=='arm' or '$(Platform)'=='arm64'">win-$(Platform)</LocalRuntimeIdentifier>
-    <LocalRuntimeIdentifier Condition="'$(Platform)'=='Win32' or '$(Platform)'=='AnyCPU'">win-x86</LocalRuntimeIdentifier>
     <NoWarn>$(NoWarn);NU3027;NU3018</NoWarn>
 
      <!-- Arcade SDK defaults to AnyCpu ~= x64. In WPF, we will map AnyCpu => x86 instead -->
@@ -10,40 +8,37 @@
     <PlatformFolder Condition="'$(Platform)' == 'x64'">x64</PlatformFolder>
     <PublishRoot>$(RepoRoot)artifacts\test\$(Configuration)\$(PlatformFolder)</PublishRoot>
 
-    <WpfTestBasePublishPath>$(PublishRoot)\Test</WpfTestBasePublishPath>
+    <WpfTestBasePublishPath>$(PublishRoot)\Test\</WpfTestBasePublishPath>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="runtime.$(LocalRuntimeIdentifier).Microsoft.DotNet.Wpf.Test" Version="$(MicrosoftDotNetWpfTestPackageVersion)" GeneratePathProperty="true" />
+    <PackageReference Include="runtime.$(WpfRuntimeIdentifier).Microsoft.DotNet.Wpf.Test" Version="$(MicrosoftDotNetWpfTestPackageVersion)" GeneratePathProperty="true" />
   </ItemGroup>
 
-  <PropertyGroup Condition="'$(LocalRuntimeIdentifier)'=='win-x86'">
-    <MicrosoftDotNetWpfTestPath>$(Pkgruntime_win-x86_Microsoft_DotNet_Wpf_Test)\tools\$(LocalRuntimeIdentifier)\Test\</MicrosoftDotNetWpfTestPath>
+  <PropertyGroup Condition="'$(WpfRuntimeIdentifier)'=='win-x86'">
+    <MicrosoftDotNetWpfTestPath>$(Pkgruntime_win-x86_Microsoft_DotNet_Wpf_Test)\tools\$(WpfRuntimeIdentifier)\Test\</MicrosoftDotNetWpfTestPath>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(LocalRuntimeIdentifier)'=='win-x64'">
-    <MicrosoftDotNetWpfTestPath>$(Pkgruntime_win-x64_Microsoft_DotNet_Wpf_Test)\tools\$(LocalRuntimeIdentifier)\Test\</MicrosoftDotNetWpfTestPath>
+  <PropertyGroup Condition="'$(WpfRuntimeIdentifier)'=='win-x64'">
+    <MicrosoftDotNetWpfTestPath>$(Pkgruntime_win-x64_Microsoft_DotNet_Wpf_Test)\tools\$(WpfRuntimeIdentifier)\Test\</MicrosoftDotNetWpfTestPath>
   </PropertyGroup>
 
   <Target Name="CreateTestPayload" BeforeTargets="Test" AfterTargets="Build">
     <ItemGroup>
-      <MicrosoftDotNetWpfTestContents Include="$(MicrosoftDotNetWpfTestPath)\**\*.*" />
+      <MicrosoftDotNetWpfTestContents Include="$(MicrosoftDotNetWpfTestPath)**\*.*" />
       <OtherPayloadContents Include="$(WpfArcadeSdkToolsDir)runtests.cmd" />
       <OtherPayloadContents Include="$(WpfArcadeSdkToolsDir)runtests.ps1" />
       <OtherPayloadContents Include="$(WpfArcadeSdkToolsDir)configure-helix-machine.ps1" Condition="'$(ContinuousIntegrationBuild)'=='True'" />
     </ItemGroup>
 
     <Copy SourceFiles="@(MicrosoftDotNetWpfTestContents)"
-          DestinationFiles="@(MicrosoftDotNetWpfTestContents->'$(WpfTestBasePublishPath)\%(RecursiveDir)%(Filename)%(Extension)')"  />
+          DestinationFiles="@(MicrosoftDotNetWpfTestContents->'$(WpfTestBasePublishPath)%(RecursiveDir)%(Filename)%(Extension)')"  />
 
     <Copy SourceFiles="@(OtherPayloadContents)"
           DestinationFolder="$(PublishRoot)"  />
 
     <Copy SourceFiles="$(WpfTestsDir)BranchCommon\data\DrtList.xml"
-          DestinationFolder="$(WpfTestBasePublishPath)\DRT"  />
-
-    <Copy SourceFiles="$(WpfTestsDir)BranchCommon\data\DrtList.xml"
-          DestinationFolder="$(WpfTestBasePublishPath)\DRT"  />
+          DestinationFolder="$(WpfTestBasePublishPath)DRT"  />
   </Target>
 
 </Project>
diff --git a/eng/WpfArcadeSdk/tools/DrtsToRun.props b/eng/WpfArcadeSdk/tools/DrtsToRun.props
new file mode 100644
index 00000000000..72da7bd3216
--- /dev/null
+++ b/eng/WpfArcadeSdk/tools/DrtsToRun.props
@@ -0,0 +1,9 @@
+<Project>
+  <ItemGroup>
+    <!--
+    List of Drts to run that are built out of dotnet/wpf. Note that this is incredibly
+    similar to DrtList.xml. https://github.com/dotnet/wpf/issues/815 tracks producing this
+    file based on what is in that list. -->
+    <DRT Include="DrtXaml" Area="Xaml"/>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/eng/WpfArcadeSdk/tools/RunDrtsLocal.targets b/eng/WpfArcadeSdk/tools/RunDrtsLocal.targets
index 8a73ac96dab..2c74d3ae3eb 100644
--- a/eng/WpfArcadeSdk/tools/RunDrtsLocal.targets
+++ b/eng/WpfArcadeSdk/tools/RunDrtsLocal.targets
@@ -1,6 +1,11 @@
 <Project>
+  <!--
+  This .targets file is included by the Arcade extension point AfterSolutionBuild.targets. Arcade doesn't
+  include any of the custom MSBuild properties that get set during the regular build. So the $(WpfArcadeSdkPath)
+  properties aren't available to us.
+  -->
   <!-- The internal and external repos each define their own drts to add that need running. -->
-  <Import Project="$(RepoRoot)\eng\AddDrtsToPayload.targets" Condition="Exists('$(RepoRoot)\eng\AddDrtsToPayload.targets')" />
+  <Import Project="$(MSBuildThisFileDirectory)AddDrtsToPayload.targets" Condition="Exists('$(MSBuildThisFileDirectory)AddDrtsToPayload.targets')" />
   <Target Name="RunDrts" AfterTargets="Build" Condition="'$(ContinuousIntegrationBuild)'!='True'">
     <Exec Command="$(RepoRoot)\artifacts\test\$(Configuration)\$(Platform)\runtests.cmd"/>
   </Target>
diff --git a/eng/WpfArcadeSdk/tools/TestProjects.targets b/eng/WpfArcadeSdk/tools/TestProjects.targets
index d5396b3a087..335d9cacf16 100644
--- a/eng/WpfArcadeSdk/tools/TestProjects.targets
+++ b/eng/WpfArcadeSdk/tools/TestProjects.targets
@@ -1,7 +1,6 @@
 <Project>
   <PropertyGroup Condition="'$(WpfTest)'=='true' Or '$(IsTestProject)'=='true'">
-    <RuntimeIdentifier Condition="('$(Platform)'!='AnyCPU' and '$(Platform)'!='Win32') Or $(Platform.EndsWith('64'))">win-$(Platform)</RuntimeIdentifier>
-    <RuntimeIdentifier Condition="'$(Platform)'=='AnyCPU' or '$(Platform)'=='Win32' or '$(Platform)'=='x86'">win-x86</RuntimeIdentifier>
+    <RuntimeIdentifier>$(WpfRuntimeIdentifier)</RuntimeIdentifier>
   </PropertyGroup>
   <!-- Arcade SDK defaults to AnyCpu ~= x64. In WPF, we will map AnyCpu => x86 instead -->
   <PropertyGroup Condition="'$(IsTestProject)' == 'true' or '$(WpfTest)'=='true'">
diff --git a/eng/helixpublish.proj b/eng/helixpublish.proj
index 8f3aa2ac922..a662f8fbc98 100644
--- a/eng/helixpublish.proj
+++ b/eng/helixpublish.proj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.DotNet.Helix.Sdk" DefaultTargets="Test">
+  <Import Project="$(WpfArcadeSdkToolsDir)DrtsToRun.props" />
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <IncludeDotNetCli>true</IncludeDotNetCli>
     <DotNetCliPackageType>runtime</DotNetCliPackageType>
     <!-- Set to match global.json.tools.dotnet by pre-build.ps1 -->
     <DotNetCliVersion>$(MicrosoftNetCoreAppVersion)</DotNetCliVersion>
-    <DotNetCliRuntime>win-x86</DotNetCliRuntime>
-    <DotNetCliRuntime Condition="'$(Platform)' == 'x64'">win-x64</DotNetCliRuntime>
+    <DotNetCliRuntime>$(WpfRuntimeIdentifier)</DotNetCliRuntime>
 
     <EnableXUnitReporter>true</EnableXUnitReporter>
     <EnableAzurePipelinesReporter>true</EnableAzurePipelinesReporter>
@@ -21,102 +21,10 @@
 
   <ItemGroup>
     <HelixCorrelationPayload Include="$(ArtifactsDir)\test\$(Configuration)\$(Platform)" /> 
-    <HelixWorkItem Include="Xaml">
+    <HelixWorkItem Include="@(DRT->'%(Identity)'">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Xaml</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=%(Area)</Command>
     </HelixWorkItem>
    
-   <!--
-   Uncomment when bringing appropriate DRTs out into the open
-   
-   <HelixWorkItem Include="Annotations">
-      <Timeout>00:20:00</Timeout> 
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Annotations</Command>
-    </HelixWorkItem>
-    <HelixWorkItem Include="AppModel">
-      <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=AppModel</Command>
-    </HelixWorkItem>
-    <HelixWorkItem Include="DigitalDocuments">
-      <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=DigitalDocuments</Command>
-    </HelixWorkItem>
-    <HelixWorkItem Include="Media">
-      <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Media</Command>
-    </HelixWorkItem>
-    <HelixWorkItem Include="Editing">
-      <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Editing</Command>
-    </HelixWorkItem>
-    <HelixWorkItem Include="ElementServices">
-      <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=ElementServices</Command>
-    </HelixWorkItem>
-    <HelixWorkItem Include="Text">
-      <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Text</Command>
-    </HelixWorkItem>
-    <HelixWorkItem Include="Animation">
-      <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Animation</Command>
-    </HelixWorkItem>
-    <HelixWorkItem Include="3D">
-      <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=3D</Command>
-    </HelixWorkItem>
-    <HelixWorkItem Include="2D">
-      <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=2D</Command>
-    </HelixWorkItem>
-    <HelixWorkItem Include="Controls">
-      <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Controls</Command>
-    </HelixWorkItem>
-    <HelixWorkItem Include="Imaging">
-      <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Imaging</Command>
-    </HelixWorkItem>
-    <HelixWorkItem Include="FlowLayout">
-      <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=FlowLayout</Command>
-    </HelixWorkItem>
-    <HelixWorkItem Include="DataServices">
-      <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=DataServices</Command>
-    </HelixWorkItem>
-    <HelixWorkItem Include="ElementLayout">
-      <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=ElementLayout</Command>
-    </HelixWorkItem>
-    <HelixWorkItem Include="Xaml">
-      <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Xaml</Command>
-    </HelixWorkItem>
-    <HelixWorkItem Include="Globalization">
-      <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Globalization</Command>
-    </HelixWorkItem>
-    <HelixWorkItem Include="Tablet">
-      <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Tablet</Command>
-    </HelixWorkItem>
-    <HelixWorkItem Include="Integration">
-      <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Integration</Command>
-    </HelixWorkItem>
-    <HelixWorkItem Include="XET">
-      <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=XET</Command>
-    </HelixWorkItem>
-    <HelixWorkItem Include="Printing">
-      <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Printing</Command>
-    </HelixWorkItem>
-    <HelixWorkItem Include="WindowsFormsIntegration">
-      <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=WindowsFormsIntegration</Command>
-    </HelixWorkItem>
-    -->
   </ItemGroup>
 </Project>
\ No newline at end of file

From 3d1f2d81deca5a8bd95eee9ec1bbe9da5351b575 Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Mon, 3 Jun 2019 10:42:15 -0700
Subject: [PATCH 25/72] updating injectmoduleinitializer

---
 eng/WpfArcadeSdk/Sdk/Sdk.props                |  5 +++-
 .../tools/InjectModuleInitializer.targets     | 28 +++++++------------
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/eng/WpfArcadeSdk/Sdk/Sdk.props b/eng/WpfArcadeSdk/Sdk/Sdk.props
index 19eec4d0054..d688f838cfc 100644
--- a/eng/WpfArcadeSdk/Sdk/Sdk.props
+++ b/eng/WpfArcadeSdk/Sdk/Sdk.props
@@ -18,7 +18,10 @@
     <CLSCompliant Condition="'$(CLSCompliant)'==''">true</CLSCompliant>
     <IncludeDllSafeSearchPathAttribute Condition="'$(IncludeDllSafeSearchPathAttribute )'==''">true</IncludeDllSafeSearchPathAttribute>
 
-    <!-- Properly calculates the RuntimeIdentifier based on the Platform type. Doesn't actually set the RuntimeIdentifier property. -->
+    <!--
+    Properly calculates the RuntimeIdentifier based on the Platform type. We don't want to affect the build by actually setting RuntimeIdentifier.
+    Those that are interested in setting the RuntimeIdentifier or having a property that mirrors it can use this one here.
+    -->
     <WpfRuntimeIdentifier Condition="('$(Platform)'!='AnyCPU' and '$(Platform)'!='Win32') Or $(Platform.EndsWith('64'))">win-$(Platform)</WpfRuntimeIdentifier>
     <WpfRuntimeIdentifier Condition="'$(Platform)'=='AnyCPU' or '$(Platform)'=='Win32' or '$(Platform)'=='x86'">win-x86</WpfRuntimeIdentifier>
   </PropertyGroup>
diff --git a/eng/WpfArcadeSdk/tools/InjectModuleInitializer.targets b/eng/WpfArcadeSdk/tools/InjectModuleInitializer.targets
index e1e3ef4a5bf..ca51526a799 100644
--- a/eng/WpfArcadeSdk/tools/InjectModuleInitializer.targets
+++ b/eng/WpfArcadeSdk/tools/InjectModuleInitializer.targets
@@ -1,12 +1,4 @@
 <Project>
-
-  <!-- We use a local RID here since we don't want to change the build layout by setting the actual RID. -->
-  <PropertyGroup>
-    <LocalRuntimeIdentifier Condition="'$(Platform)'=='x64' or '$(Platform)'=='x86' or '$(Platform)'=='arm' or '$(Platform)'=='arm64'">win-$(Platform)</LocalRuntimeIdentifier>
-    <LocalRuntimeIdentifier Condition="'$(Platform)'=='Win32' or '$(Platform)'=='AnyCPU'">win-x86</LocalRuntimeIdentifier>
-    <LocalRuntimeIdentifier Condition="'$(Architecture)'==''">win-x64</LocalRuntimeIdentifier>
-  </PropertyGroup>
-
   <Choose>
     <!-- 
         Use the IL Tools that are compiled and distributed with .NET Core.  WPF doesn't currently use these as default because they do not
@@ -20,16 +12,16 @@
         <PackageReference Include="$(PackageRuntimeIdentifierPrefix).Microsoft.NETCore.Runtime.CoreCLR" Version="MicrosoftNETCoreRuntimeCoreCLRVersion" GeneratePathProperty="true" />
       </ItemGroup>
 
-      <PropertyGroup Condition="'$(LocalRuntimeIdentifier)'=='win-x86'">
-        <ILDAsmPath>$(Pkgruntime_win-x86_Microsoft_NETCore_ILDAsm)\runtimes\$(LocalRuntimeIdentifier)\native\</ILDAsmPath>
-        <ILAsmPath>$(Pkgruntime_win-x86_Microsoft_NETCore_ILAsm)\runtimes\$(LocalRuntimeIdentifier)\native\</ILAsmPath>
-        <CoreCLRPath>$(Pkgruntime_win-x86_Microsoft_NETCore_Runtime_CoreCLR)\runtimes\$(LocalRuntimeIdentifier)\native\</CoreCLRPath>
+      <PropertyGroup Condition="'$(WpfRuntimeIdentifier)'=='win-x86'">
+        <ILDAsmPath>$(Pkgruntime_win-x86_Microsoft_NETCore_ILDAsm)\runtimes\$(WpfRuntimeIdentifier)\native\</ILDAsmPath>
+        <ILAsmPath>$(Pkgruntime_win-x86_Microsoft_NETCore_ILAsm)\runtimes\$(WpfRuntimeIdentifier)\native\</ILAsmPath>
+        <CoreCLRPath>$(Pkgruntime_win-x86_Microsoft_NETCore_Runtime_CoreCLR)\runtimes\$(WpfRuntimeIdentifier)\native\</CoreCLRPath>
       </PropertyGroup>
 
-      <PropertyGroup Condition="'$(LocalRuntimeIdentifier)'=='win-x64'">
-        <ILDAsmPath>$(Pkgruntime_win-x64_Microsoft_NETCore_ILDAsm)\runtimes\$(LocalRuntimeIdentifier)\native\</ILDAsmPath>
-        <ILAsmPath>$(Pkgruntime_win-x64_Microsoft_NETCore_ILAsm)\runtimes\$(LocalRuntimeIdentifier)\native\</ILAsmPath>
-        <CoreCLRPath>$(Pkgruntime_win-x64_Microsoft_NETCore_Runtime_CoreCLR)\runtimes\$(LocalRuntimeIdentifier)\native\</CoreCLRPath>
+      <PropertyGroup Condition="'$(WpfRuntimeIdentifier)'=='win-x64'">
+        <ILDAsmPath>$(Pkgruntime_win-x64_Microsoft_NETCore_ILDAsm)\runtimes\$(WpfRuntimeIdentifier)\native\</ILDAsmPath>
+        <ILAsmPath>$(Pkgruntime_win-x64_Microsoft_NETCore_ILAsm)\runtimes\$(WpfRuntimeIdentifier)\native\</ILAsmPath>
+        <CoreCLRPath>$(Pkgruntime_win-x64_Microsoft_NETCore_Runtime_CoreCLR)\runtimes\$(WpfRuntimeIdentifier)\native\</CoreCLRPath>
 
       </PropertyGroup>
 
@@ -355,8 +347,8 @@
   -->
   <Target Name="FindNetFrameworkILTools" BeforeTargets="DeconstructDll" Condition="'$(UseNetCoreILTools)'!='true'">
     <PropertyGroup>
-      <DotNetFrameworkBitness Condition="'$(LocalRuntimeIdentifier)'=='win-x64'">Bitness64</DotNetFrameworkBitness>
-      <DotNetFrameworkBitness Condition="'$(LocalRuntimeIdentifier)'=='win-x86'">Bitness32</DotNetFrameworkBitness>
+      <DotNetFrameworkBitness Condition="'$(WpfRuntimeIdentifier)'=='win-x64'">Bitness64</DotNetFrameworkBitness>
+      <DotNetFrameworkBitness Condition="'$(WpfRuntimeIdentifier)'=='win-x86'">Bitness32</DotNetFrameworkBitness>
     </PropertyGroup>
     <FindDotNetFrameworkILToolsTask DotNetBitness="$(DotNetFrameworkBitness)">
       <Output TaskParameter="ILDAsm" PropertyName="ILDAsm" />

From 2c91ec50c1749e216f81a3eaabfcc8da0b42ef35 Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Mon, 3 Jun 2019 11:59:48 -0700
Subject: [PATCH 26/72] fix batching

---
 .../tools/configure-helix-machine.ps1         | 26 +------------------
 eng/helixpublish.proj                         |  2 +-
 2 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/eng/WpfArcadeSdk/tools/configure-helix-machine.ps1 b/eng/WpfArcadeSdk/tools/configure-helix-machine.ps1
index 4f20fb2866a..50004a6ef5c 100644
--- a/eng/WpfArcadeSdk/tools/configure-helix-machine.ps1
+++ b/eng/WpfArcadeSdk/tools/configure-helix-machine.ps1
@@ -3,28 +3,4 @@ $dotnetLocation = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.P
 
 # Set DOTNET_ROOT variables so the host can find it
 Set-Item -Path "env:DOTNET_ROOT(x86)" -Value $dotnetLocation
-Set-Item -Path "env:DOTNET_ROOT" -Value $dotnetLocation
-
-$runtimes = dotnet --list-runtimes
-foreach ($rt in $runtimes)
-{
-    if ($rt.StartsWith("Microsoft.WindowsDesktop.App"))
-    {
-        $version = $rt.Split(" ")[1]
-    }
-}
-
-# Rewrite the *.runtimeconfig.json files to match the version of the runtime on the machine
-$infraLocation = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "Test\Infra"
-$stiConfigFile = Join-Path $infraLocation "Sti.runtimeconfig.json"
-$qvConfigFile = Join-Path $infraLocation "QualityVaultFrontEnd.runtimeconfig.json"
-$configFiles = $stiConfigFile, $qvConfigFile
-foreach ($config in $configFiles)
-{
-    # Read current config file
-    $jsondata = Get-Content -Raw -Path $config | ConvertFrom-Json
-    # Update version
-    $jsondata.runtimeOptions.framework.version = $version
-    # Write data back
-    $jsondata | ConvertTo-Json -depth 100 | Set-Content $config
-}
\ No newline at end of file
+Set-Item -Path "env:DOTNET_ROOT" -Value $dotnetLocation
\ No newline at end of file
diff --git a/eng/helixpublish.proj b/eng/helixpublish.proj
index a662f8fbc98..c1c150c4535 100644
--- a/eng/helixpublish.proj
+++ b/eng/helixpublish.proj
@@ -21,7 +21,7 @@
 
   <ItemGroup>
     <HelixCorrelationPayload Include="$(ArtifactsDir)\test\$(Configuration)\$(Platform)" /> 
-    <HelixWorkItem Include="@(DRT->'%(Identity)'">
+    <HelixWorkItem Include="@(DRT)">
       <Timeout>00:20:00</Timeout>
       <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=%(Area)</Command>
     </HelixWorkItem>

From 91725b14c377d2557cbb38094d7c4443a81a8ce5 Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Mon, 3 Jun 2019 14:23:16 -0700
Subject: [PATCH 27/72] add back workaround for missing WindowsDesktop

---
 .../tools/configure-helix-machine.ps1         | 39 ++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/eng/WpfArcadeSdk/tools/configure-helix-machine.ps1 b/eng/WpfArcadeSdk/tools/configure-helix-machine.ps1
index 50004a6ef5c..eae32cb9213 100644
--- a/eng/WpfArcadeSdk/tools/configure-helix-machine.ps1
+++ b/eng/WpfArcadeSdk/tools/configure-helix-machine.ps1
@@ -3,4 +3,41 @@ $dotnetLocation = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.P
 
 # Set DOTNET_ROOT variables so the host can find it
 Set-Item -Path "env:DOTNET_ROOT(x86)" -Value $dotnetLocation
-Set-Item -Path "env:DOTNET_ROOT" -Value $dotnetLocation
\ No newline at end of file
+Set-Item -Path "env:DOTNET_ROOT" -Value $dotnetLocation
+
+# Temporary workaround until https://github.com/dotnet/wpf/issues/816 is addressed.
+# The test infrastructure is built against an older version of Microsoft.WindowsDesktop.App.
+# Here we re-write the infrastructure runtimeconfig files so that they can load
+$runtimes = dotnet --list-runtimes
+foreach ($rt in $runtimes)
+{
+    if ($rt.StartsWith("Microsoft.WindowsDesktop.App"))
+    {
+        $version = $rt.Split(" ")[1]
+    }
+}
+
+if ($null -ne $version)
+{
+    # Rewrite the *.runtimeconfig.json files to match the version of the runtime on the machine
+    $infraLocation = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "Test\Infra"
+    $stiConfigFile = Join-Path $infraLocation "Sti.runtimeconfig.json"
+    $qvConfigFile = Join-Path $infraLocation "QualityVaultFrontEnd.runtimeconfig.json"
+    $configFiles = $stiConfigFile, $qvConfigFile
+    foreach ($config in $configFiles)
+    {
+        # Read current config file
+        $jsondata = Get-Content -Raw -Path $config | ConvertFrom-Json
+        # Update version
+        $jsondata.runtimeOptions.framework.version = $version
+        # Write data back
+        $jsondata | ConvertTo-Json -depth 100 | Set-Content $config
+    } 
+}
+else
+{
+    Write-Error "No WindowsDesktop runtime found on machine!"
+    
+    Write-Output "Runtimes installed:"
+    Write-Output $runtimes
+}

From 42ae287250c62f4371e426bc00cd2cc9ff8c2772 Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Tue, 4 Jun 2019 06:48:36 -0700
Subject: [PATCH 28/72] add WindowsDesktop package to payload for CI builds

QualityVault and STI require the WindowsDesktop package
---
 .../tools/CreateTestPayload.targets           | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/eng/WpfArcadeSdk/tools/CreateTestPayload.targets b/eng/WpfArcadeSdk/tools/CreateTestPayload.targets
index 4f21f19dd24..74ec58027b8 100644
--- a/eng/WpfArcadeSdk/tools/CreateTestPayload.targets
+++ b/eng/WpfArcadeSdk/tools/CreateTestPayload.targets
@@ -6,9 +6,11 @@
      <!-- Arcade SDK defaults to AnyCpu ~= x64. In WPF, we will map AnyCpu => x86 instead -->
     <PlatformFolder>x86</PlatformFolder>
     <PlatformFolder Condition="'$(Platform)' == 'x64'">x64</PlatformFolder>
-    <PublishRoot>$(RepoRoot)artifacts\test\$(Configuration)\$(PlatformFolder)</PublishRoot>
+    <PayloadRoot>$(RepoRoot)artifacts\test\$(Configuration)\$(PlatformFolder)</PayloadRoot>
 
-    <WpfTestBasePublishPath>$(PublishRoot)\Test\</WpfTestBasePublishPath>
+    <WpfTestBasePayloadPath>$(PayloadRoot)\Test\</WpfTestBasePayloadPath>
+
+    <WindowsDesktopPayloadPath>$(PayloadRoot)\dotnet\shared\Microsoft.WindowsDesktop.App\</WindowsDesktopPayloadPath>
   </PropertyGroup>
 
   <ItemGroup>
@@ -29,16 +31,26 @@
       <OtherPayloadContents Include="$(WpfArcadeSdkToolsDir)runtests.cmd" />
       <OtherPayloadContents Include="$(WpfArcadeSdkToolsDir)runtests.ps1" />
       <OtherPayloadContents Include="$(WpfArcadeSdkToolsDir)configure-helix-machine.ps1" Condition="'$(ContinuousIntegrationBuild)'=='True'" />
+
+      <!-- 
+        We have to ship over the WindowsDesktop for our test infrastructure.
+        Once https://github.com/dotnet/wpf/issues/816 is done we can remove this.
+      -->
+      <WindowsDesktopContents Include="$(RepoRoot).dotnet\shared\Microsoft.WindowsDesktop.App\**\*.*" />
     </ItemGroup>
 
     <Copy SourceFiles="@(MicrosoftDotNetWpfTestContents)"
-          DestinationFiles="@(MicrosoftDotNetWpfTestContents->'$(WpfTestBasePublishPath)%(RecursiveDir)%(Filename)%(Extension)')"  />
+          DestinationFiles="@(MicrosoftDotNetWpfTestContents->'$(WpfTestBasePayloadPath)%(RecursiveDir)%(Filename)%(Extension)')"  />
 
     <Copy SourceFiles="@(OtherPayloadContents)"
-          DestinationFolder="$(PublishRoot)"  />
+          DestinationFolder="$(PayloadRoot)"  />
 
     <Copy SourceFiles="$(WpfTestsDir)BranchCommon\data\DrtList.xml"
-          DestinationFolder="$(WpfTestBasePublishPath)DRT"  />
+          DestinationFolder="$(WpfTestBasePayloadPath)DRT"  />
+
+    <Copy SourceFiles="@(WindowsDesktopContents)"
+          DestinationFiles="@(WindowsDesktopContents->'$(WindowsDesktopPayloadPath)%(RecursiveDir)%(Filename)%(Extension)')"
+          Condition="'$(ContinuousIntegrationBuild)'=='True'"/>
   </Target>
 
 </Project>

From 8379bca415b63dc1e150e44013c304c5f1ee8446 Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Tue, 4 Jun 2019 10:59:28 -0700
Subject: [PATCH 29/72] ensure ResolveFrameworkReferences actually works

---
 .../tools/configure-helix-machine.ps1         |  5 --
 eng/WpfArcadeSdk/tools/runtests.ps1           | 24 ++++++-
 eng/helixpublish.proj                         |  2 +-
 .../BamlAvoidXmlTest/BamlAvoidXmlTest.csproj  |  6 --
 .../test/DRT/DrtXaml/DrtXaml/DrtXaml.csproj   |  2 +-
 .../XamlTestClasses/XamlTestClasses.csproj    |  1 +
 .../test/Directory.Build.props                |  2 +-
 .../test/MultiTargeting.props                 | 65 +++++++++++++++++++
 8 files changed, 90 insertions(+), 17 deletions(-)
 create mode 100644 src/Microsoft.DotNet.Wpf/test/MultiTargeting.props

diff --git a/eng/WpfArcadeSdk/tools/configure-helix-machine.ps1 b/eng/WpfArcadeSdk/tools/configure-helix-machine.ps1
index eae32cb9213..63d0db5ed97 100644
--- a/eng/WpfArcadeSdk/tools/configure-helix-machine.ps1
+++ b/eng/WpfArcadeSdk/tools/configure-helix-machine.ps1
@@ -1,9 +1,4 @@
 # This file prepares the helix machine for our tests runs
-$dotnetLocation = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "dotnet"
-
-# Set DOTNET_ROOT variables so the host can find it
-Set-Item -Path "env:DOTNET_ROOT(x86)" -Value $dotnetLocation
-Set-Item -Path "env:DOTNET_ROOT" -Value $dotnetLocation
 
 # Temporary workaround until https://github.com/dotnet/wpf/issues/816 is addressed.
 # The test infrastructure is built against an older version of Microsoft.WindowsDesktop.App.
diff --git a/eng/WpfArcadeSdk/tools/runtests.ps1 b/eng/WpfArcadeSdk/tools/runtests.ps1
index b3cda8665db..f9da1e186ce 100644
--- a/eng/WpfArcadeSdk/tools/runtests.ps1
+++ b/eng/WpfArcadeSdk/tools/runtests.ps1
@@ -1,13 +1,31 @@
 [CmdLetBinding()]
 Param(
-    [string]$command
+    [string]$command,
+    [switch]$ci
 )
 
-# Configure the machine before running tests
-if (Test-Path "$PSScriptRoot\configure-helix-machine.ps1")
+if ($ci)
 {
+    # When running in ci, the dotnet install is located at %HELIX_CORRELATION_PAYLOAD% along with all our test content.
+    $dotnetLocation = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "dotnet"
+    # Only either the x86 or x64 versions of dotnet are installed on the helix machine, and they both go to the same location
+    $x86dotnetLocation = $dotnetLocation
+
+    # Run any extra machine setup required for Helix
     . "$PSScriptRoot\configure-helix-machine.ps1"
 }
+else
+{
+    # When running local, we run out of $(RepoRoot)artifacts\test\$(Configuration)\$(Platform)
+    # The dotnet install is located at $(RepoRoot).dotnet
+    $dotnetLocation =  Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "..\..\..\..\.dotnet" -Resolve
+    # The x86 location installed by Arcade is in the x86 directory
+    $x86dotnetLocation = "$dotnetLocation\x86"
+}
+
+# Set DOTNET_ROOT variables so the host can find it
+Set-Item -Path "env:DOTNET_ROOT(x86)" -Value $x86dotnetLocation
+Set-Item -Path "env:DOTNET_ROOT" -Value $dotnetLocation
 
 # Run the tests
 $testLocation = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "Test"
diff --git a/eng/helixpublish.proj b/eng/helixpublish.proj
index c1c150c4535..1b081126899 100644
--- a/eng/helixpublish.proj
+++ b/eng/helixpublish.proj
@@ -23,7 +23,7 @@
     <HelixCorrelationPayload Include="$(ArtifactsDir)\test\$(Configuration)\$(Platform)" /> 
     <HelixWorkItem Include="@(DRT)">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=%(Area)</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=%(Area) -ci</Command>
     </HelixWorkItem>
    
   </ItemGroup>
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlAvoidXmlTest/BamlAvoidXmlTest.csproj b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlAvoidXmlTest/BamlAvoidXmlTest.csproj
index dae72c72de6..6587485ae36 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlAvoidXmlTest/BamlAvoidXmlTest.csproj
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlAvoidXmlTest/BamlAvoidXmlTest.csproj
@@ -1,12 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyName>BamlAvoidXmlTest</AssemblyName>
-    <LinkSubsystem>console</LinkSubsystem>
-    <AssemblyIdentityVersionName>WCP</AssemblyIdentityVersionName>
-    <GenerateAssemblyAttribute>false</GenerateAssemblyAttribute>
-    <AddTargetFrameworkAttributeToWpfTestExe>true</AddTargetFrameworkAttributeToWpfTestExe>
-
-    <!-- Avoid auto-generating a main -->
     <RootNamespace>BamlAvoidXmlTest</RootNamespace>
     <Platforms>AnyCPU;x64</Platforms>
   </PropertyGroup>
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/DrtXaml.csproj b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/DrtXaml.csproj
index 769c148aa6e..39fdb07e5da 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/DrtXaml.csproj
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/DrtXaml.csproj
@@ -3,7 +3,7 @@
     <AssemblyName>DrtXaml</AssemblyName>
     <RootNamespace>DrtXaml</RootNamespace>
     <LinkSubsystem>console</LinkSubsystem>
-    <OutputType>WinExe</OutputType>
+    <OutputType>Exe</OutputType>
     <Platforms>AnyCPU;x64</Platforms>
     <StartupObject>DrtXaml.XamlDrt</StartupObject>
     <CreateTestPayload>true</CreateTestPayload>
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/XamlTestClasses/XamlTestClasses.csproj b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/XamlTestClasses/XamlTestClasses.csproj
index a0d7274219d..72ccaf787f5 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/XamlTestClasses/XamlTestClasses.csproj
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/XamlTestClasses/XamlTestClasses.csproj
@@ -6,6 +6,7 @@
   </PropertyGroup>
   
   <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>DrtXaml.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   
diff --git a/src/Microsoft.DotNet.Wpf/test/Directory.Build.props b/src/Microsoft.DotNet.Wpf/test/Directory.Build.props
index 16e1712ef31..e7d3f6b26b9 100644
--- a/src/Microsoft.DotNet.Wpf/test/Directory.Build.props
+++ b/src/Microsoft.DotNet.Wpf/test/Directory.Build.props
@@ -10,7 +10,6 @@
     <IsShipping>false</IsShipping>
     <EnableXlfLocalization>false</EnableXlfLocalization>
     <CLSCompliant>false</CLSCompliant>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
   </PropertyGroup>
   <ItemDefinitionGroup>
@@ -18,4 +17,5 @@
       <GenerateSource>false</GenerateSource>
     </EmbeddedResource>
   </ItemDefinitionGroup>
+  <Import Project="$(WpfTestsDir)MultiTargeting.props" />
 </Project>
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Wpf/test/MultiTargeting.props b/src/Microsoft.DotNet.Wpf/test/MultiTargeting.props
new file mode 100644
index 00000000000..f2482461c39
--- /dev/null
+++ b/src/Microsoft.DotNet.Wpf/test/MultiTargeting.props
@@ -0,0 +1,65 @@
+<Project>
+  <PropertyGroup>
+    <TargetFrameworks>netcoreapp3.0</TargetFrameworks>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <DefineConstants Condition="$(TargetFramework.StartsWith('net4'))">$(DefineConstants);NET4X</DefineConstants>
+    <DefineConstants Condition="$(TargetFramework.StartsWith('netcoreapp3'))">$(DefineConstants);NETCOREAPP3_X</DefineConstants>
+
+    <DefineConstants Condition="$(TargetFramework.Equals('net40'))">$(DefineConstants);NET40</DefineConstants>
+    <DefineConstants Condition="$(TargetFramework.Equals('net45'))">$(DefineConstants);NET45</DefineConstants>
+    <DefineConstants Condition="$(TargetFramework.Equals('net451'))">$(DefineConstants);NET451</DefineConstants>
+    <DefineConstants Condition="$(TargetFramework.Equals('net452'))">$(DefineConstants);NET452</DefineConstants>
+    <DefineConstants Condition="$(TargetFramework.Equals('net453'))">$(DefineConstants);NET453</DefineConstants>
+    <DefineConstants Condition="$(TargetFramework.Equals('net46'))">$(DefineConstants);NET46</DefineConstants>
+    <DefineConstants Condition="$(TargetFramework.Equals('net461'))">$(DefineConstants);NET461</DefineConstants>
+    <DefineConstants Condition="$(TargetFramework.Equals('net462'))">$(DefineConstants);NET462</DefineConstants>
+    <DefineConstants Condition="$(TargetFramework.Equals('net47'))">$(DefineConstants);NET47</DefineConstants>
+    <DefineConstants Condition="$(TargetFramework.Equals('net471'))">$(DefineConstants);NET471</DefineConstants>
+    <DefineConstants Condition="$(TargetFramework.Equals('net472'))">$(DefineConstants);NET472</DefineConstants>
+    
+    <DefineConstants Condition="$(TargetFramework.Equals('netcoreapp3.0'))">$(DefineConstants);NETCOREAPP3_0</DefineConstants>
+  </PropertyGroup>
+  
+  <ItemGroup Condition="'$(TargetFramework)'!='net35'">
+    <PackageReference Include="System.Reflection.Emit" Version="$(SystemReflectionEmitPackageVersion)" />
+  </ItemGroup>
+  
+  <!--
+       When IsUnitTestProject is set by Arcade, these ProjectReferences are implicitly included. Many of our
+       tests don't require xUnit. So a non-unit test that does require xUnit has to set the IsXUnitProject property
+       to true.
+  -->
+  <ItemGroup Condition="'$(TargetFramework)'!='net35' and '$(IsUnitTestProject)'!='true' and '$(IsXUnitProject)'=='true'">
+    <PackageReference Include="xunit" Version="$(XUnitVersion)" />
+    <PackageReference Include="xunit.runner.console" Version="$(XUnitRunnerConsoleVersion)">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitRunnerVisualStudioVersion)">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">   
+    <Reference Include="System.Xaml" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+    <Reference Include="UIAutomationClient" />
+    <Reference Include="UIAutomationProvider" />
+    <Reference Include="UIAutomationTypes" />
+    <Reference Include="WindowsBase" />
+    <Reference Include="Accessibility" />
+  </ItemGroup>
+  
+  <ItemGroup Condition="'$(TargetFramework)'=='net35'">
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+    <Reference Include="UIAutomationClient" />
+    <Reference Include="UIAutomationProvider" />
+    <Reference Include="UIAutomationTypes" />
+    <Reference Include="WindowsBase" />
+  </ItemGroup>
+</Project>
\ No newline at end of file

From 95b29c3d28c940195fca4acdf4b355e90c4723a7 Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Tue, 4 Jun 2019 13:04:51 -0700
Subject: [PATCH 30/72] workaround no windowsdesktop install on helix machine

---
 eng/Versions.props                            |  4 ++++
 .../tools/CreateTestPayload.targets           | 19 ++++++++++---------
 eng/helixpublish.proj                         | 14 +++++++++++++-
 eng/pipeline.yml                              |  6 +++++-
 eng/pre-build.ps1                             |  7 +++++++
 5 files changed, 39 insertions(+), 11 deletions(-)
 create mode 100644 eng/pre-build.ps1

diff --git a/eng/Versions.props b/eng/Versions.props
index a8e3eaf1695..c397066c494 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -58,6 +58,10 @@
     <XUnitVersion>2.4.0</XUnitVersion>
     <XUnitRunnerConsoleVersion>$(XUnitVersion)</XUnitRunnerConsoleVersion>
     <XUnitRunnerVisualStudioVersion>$(XUnitVersion)</XUnitRunnerVisualStudioVersion>
+    <!--
+    This is the version of the test infrastructure package is compiled against. This should be
+    removed as part of https://github.com/dotnet/wpf/issues/816 
+    -->
     <MicrosoftDotNetWpfTestPackageVersion>1.0.0-beta.19263.1</MicrosoftDotNetWpfTestPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/eng/WpfArcadeSdk/tools/CreateTestPayload.targets b/eng/WpfArcadeSdk/tools/CreateTestPayload.targets
index 74ec58027b8..935ee0943a7 100644
--- a/eng/WpfArcadeSdk/tools/CreateTestPayload.targets
+++ b/eng/WpfArcadeSdk/tools/CreateTestPayload.targets
@@ -10,7 +10,7 @@
 
     <WpfTestBasePayloadPath>$(PayloadRoot)\Test\</WpfTestBasePayloadPath>
 
-    <WindowsDesktopPayloadPath>$(PayloadRoot)\dotnet\shared\Microsoft.WindowsDesktop.App\</WindowsDesktopPayloadPath>
+    <NETCoreAppPayloadPath>$(PayloadRoot)\dotnet\shared\Microsoft.NETCore.App\$(MicrosoftNETCoreAppVersion)\</NETCoreAppPayloadPath>
   </PropertyGroup>
 
   <ItemGroup>
@@ -31,12 +31,7 @@
       <OtherPayloadContents Include="$(WpfArcadeSdkToolsDir)runtests.cmd" />
       <OtherPayloadContents Include="$(WpfArcadeSdkToolsDir)runtests.ps1" />
       <OtherPayloadContents Include="$(WpfArcadeSdkToolsDir)configure-helix-machine.ps1" Condition="'$(ContinuousIntegrationBuild)'=='True'" />
-
-      <!-- 
-        We have to ship over the WindowsDesktop for our test infrastructure.
-        Once https://github.com/dotnet/wpf/issues/816 is done we can remove this.
-      -->
-      <WindowsDesktopContents Include="$(RepoRoot).dotnet\shared\Microsoft.WindowsDesktop.App\**\*.*" />
+      <MicrosoftNetCoreAppContents Include="$(DotNetRoot)shared\Microsoft.NETCore.App\$(MicrosoftNETCoreAppVersion)\**\*.*" />
     </ItemGroup>
 
     <Copy SourceFiles="@(MicrosoftDotNetWpfTestContents)"
@@ -48,8 +43,14 @@
     <Copy SourceFiles="$(WpfTestsDir)BranchCommon\data\DrtList.xml"
           DestinationFolder="$(WpfTestBasePayloadPath)DRT"  />
 
-    <Copy SourceFiles="@(WindowsDesktopContents)"
-          DestinationFiles="@(WindowsDesktopContents->'$(WindowsDesktopPayloadPath)%(RecursiveDir)%(Filename)%(Extension)')"
+      <!-- 
+        We have to ship over the MicrosoftNetCoreApp that we run against for our tests. This is primarily due to QualityVault
+        being built against WindowsDesktop and there not being a way to install WindowsDesktop via the multi-framework support
+        by arcade due to https://github.com/dotnet/core-setup/issues/6370. Once https://github.com/dotnet/wpf/issues/816
+        is done we can remove this.
+      -->
+    <Copy SourceFiles="@(MicrosoftNetCoreAppContents)"
+          DestinationFiles="@(MicrosoftNetCoreAppContents->'$(NETCoreAppPayloadPath)%(RecursiveDir)%(Filename)%(Extension)')"
           Condition="'$(ContinuousIntegrationBuild)'=='True'"/>
   </Target>
 
diff --git a/eng/helixpublish.proj b/eng/helixpublish.proj
index 1b081126899..81f734141b4 100644
--- a/eng/helixpublish.proj
+++ b/eng/helixpublish.proj
@@ -3,9 +3,21 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <IncludeDotNetCli>true</IncludeDotNetCli>
+
+    <!--
+    Ideally we could use $(MicrosoftNetCoreAppVersion) for DotNetCliVersion and 'runtime' for DotNetCliPackageType.
+    However, we need a full install on the Helix machine that includes the WindowsDesktop SDK since QV is dependent on it.
+    Once we move it into the open we can put these back to how they should be. See https://github.com/dotnet/wpf/issues/816 
+    for any more details.
+
+    Right now, we set it to match global.json.tools.dotnet set by pre-build.ps1. Both of these can be removed once the above
+    issue is fixed.
+
     <DotNetCliPackageType>runtime</DotNetCliPackageType>
-    <!-- Set to match global.json.tools.dotnet by pre-build.ps1 -->
     <DotNetCliVersion>$(MicrosoftNetCoreAppVersion)</DotNetCliVersion>
+    -->
+    <DotNetCliPackageType>sdk</DotNetCliPackageType>
+    <DotNetCliVersion>$(DotNetCliVersion)</DotNetCliVersion>
     <DotNetCliRuntime>$(WpfRuntimeIdentifier)</DotNetCliRuntime>
 
     <EnableXUnitReporter>true</EnableXUnitReporter>
diff --git a/eng/pipeline.yml b/eng/pipeline.yml
index f92f5428ee6..0f70d2be7ae 100644
--- a/eng/pipeline.yml
+++ b/eng/pipeline.yml
@@ -119,7 +119,11 @@ jobs:
       steps:
       - checkout: self
         clean: true
-      
+
+      # Set VSO Variable(s)
+      - powershell: eng\pre-build.ps1
+        displayName: Pre-Build - Set VSO Variables
+
       # Use utility script to run script command dependent on agent OS.
       - script: eng\common\cibuild.cmd
           -configuration $(_BuildConfig) 
diff --git a/eng/pre-build.ps1 b/eng/pre-build.ps1
new file mode 100644
index 00000000000..baad60ccbd9
--- /dev/null
+++ b/eng/pre-build.ps1
@@ -0,0 +1,7 @@
+# Open global.json
+$globaljsonpath = Join-Path $env:BUILD_SOURCESDIRECTORY 'global.json'
+$jsondata = Get-Content -Raw -Path $globaljsonpath | ConvertFrom-Json
+
+# Set DotNetCliVersion to global.json.tools.dotnet
+$dotnetcliver = $jsondata.tools.dotnet
+Write-Host "##vso[task.setvariable variable=DotNetCliVersion;]$dotnetcliver"
\ No newline at end of file

From 4c70764e42e21bd8b96d07e5e7397b933e471877 Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Tue, 4 Jun 2019 13:52:27 -0700
Subject: [PATCH 31/72] updating developer documentation

---
 Documentation/developer-guide.md | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/Documentation/developer-guide.md b/Documentation/developer-guide.md
index 3e3ae808a4f..fae16537f42 100644
--- a/Documentation/developer-guide.md
+++ b/Documentation/developer-guide.md
@@ -35,15 +35,19 @@ In order to run the set of DRTs on your local machine, pass the `-test` paramete
    Ignore: 0
 
 ```
-If there were any failures, you can cd into $(RepoRoot)\artifacts\test\$(Configuration)\$(Platform)\Test and run the tests manually with the `/debugtests` flag using the `RunDrts.cmd` script. Note that you do not run the `RunDrtsDebug` script, as this will debug the test infrastructure, `QualityVault`. When you pass the `/debugtests` flag, a cmd window will open where you can open the test executable in Visual Studio and debug it. When the cmd pops up, you will see instructions for debugging using a few different commands, however these commands will enable you to debug the `Simple Test Invocation` executable, `sti.exe`, which simply launches the test executable you are most likely interested in debugging. Using `DrtXaml.exe` as an example, this is how you can debug the test executable:
+If there were any failures, you can cd into $(RepoRoot)\artifacts\test\$(Configuration)\$(Platform)\Test and run the tests manually with the `/debugtests` flag using the `RunDrts.cmd` script. Note that you do not run the `RunDrtsDebug` script, as this will debug the test infrastructure, `QualityVault`. When you pass the `/debugtests` flag, a cmd window will open where you can open the test executable in Visual Studio and debug it. When the cmd pops up, you will see instructions for debugging using a few different commands, however these commands will enable you to debug the `Simple Test Invocation` executable, `sti.exe`, which simply launches the test executable you are most likely interested in debugging. Using `DrtXaml.exe` as an example, this is how you can debug the test executable. Any MSBuild style properties should be replaced with actual values:
 
 1. `$(RepoRoot)\artifacts\test\$(Configuration)\$(Platform)\Test\RunDrts.cmd /name=DrtXaml /debugtests`
 2. Enter following command into the cmd window that pops up:
 `"%ProgramFiles%\Microsoft Visual Studio\2019\Preview\Common7\IDE\devenv.exe" DrtXaml.exe`
-3. Once Visual Studio is open, manually change the debugger type from `Auto` to `Mixed (CoreCLR)`.
+3. Once Visual Studio is open, go to `Debug-> DrtXaml Properties` and do the following:
+    - Manually change the `Debugger Type` from `Auto` to `Mixed (CoreCLR)`.
+    - Change the `Environment` from `Default` to a custom one that properly defines the `DOTNET_ROOT` variable so that the host is able to locate the install of `Microsoft.NETCore.App`.
+      - x86 (Default): Name: `DOTNET_ROOT(x86)` Value: `$(RepoRoot).dotnet\x86`
+      - x64 (/p:Platform=x64): Name: `DOTNET_ROOT` Value: `$(RepoRoot).dotnet` 
 4. From there you can F5 and the test will execute.
 
-*Note: To run a specific test, you can pass the name of the test like this: `/name=DrtXaml`. The names of these tests are contained in DrtList.xml*
+*Note: To run a specific test, you can pass the name of the test like this: `/name=DrtXaml`. The names of these tests are contained in DrtList.xml.*
 
 **NOTE: This requires being run from an admin window at the moment. Removing this restriction is tracked by https://github.com/dotnet/wpf/issues/816. **
 

From 5792d0db078dd4054f5faa0b3753dafb087b95be Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Tue, 4 Jun 2019 15:59:06 -0700
Subject: [PATCH 32/72] allow for looking outside of local dotnet install

---
 .../tools/CreateTestPayload.targets           |  9 ++-
 .../tools/configure-helix-machine.ps1         | 38 ----------
 eng/WpfArcadeSdk/tools/configure-machine.ps1  | 71 +++++++++++++++++++
 eng/WpfArcadeSdk/tools/runtests.ps1           | 35 ++++-----
 4 files changed, 93 insertions(+), 60 deletions(-)
 delete mode 100644 eng/WpfArcadeSdk/tools/configure-helix-machine.ps1
 create mode 100644 eng/WpfArcadeSdk/tools/configure-machine.ps1

diff --git a/eng/WpfArcadeSdk/tools/CreateTestPayload.targets b/eng/WpfArcadeSdk/tools/CreateTestPayload.targets
index 935ee0943a7..d96c8e11098 100644
--- a/eng/WpfArcadeSdk/tools/CreateTestPayload.targets
+++ b/eng/WpfArcadeSdk/tools/CreateTestPayload.targets
@@ -26,12 +26,17 @@
   </PropertyGroup>
 
   <Target Name="CreateTestPayload" BeforeTargets="Test" AfterTargets="Build">
+    <PropertyGroup>
+      <LocalDotnetLocation>$(DotNetRoot)x86\</LocalDotnetLocation>
+      <LocalDotnetLocation Condition="'$(Platform)' == 'x64'">$(DotNetRoot)</LocalDotnetLocation>
+
+    </PropertyGroup>
     <ItemGroup>
       <MicrosoftDotNetWpfTestContents Include="$(MicrosoftDotNetWpfTestPath)**\*.*" />
       <OtherPayloadContents Include="$(WpfArcadeSdkToolsDir)runtests.cmd" />
       <OtherPayloadContents Include="$(WpfArcadeSdkToolsDir)runtests.ps1" />
-      <OtherPayloadContents Include="$(WpfArcadeSdkToolsDir)configure-helix-machine.ps1" Condition="'$(ContinuousIntegrationBuild)'=='True'" />
-      <MicrosoftNetCoreAppContents Include="$(DotNetRoot)shared\Microsoft.NETCore.App\$(MicrosoftNETCoreAppVersion)\**\*.*" />
+      <OtherPayloadContents Include="$(WpfArcadeSdkToolsDir)configure-machine.ps1" />
+      <MicrosoftNetCoreAppContents Include="$(LocalDotnetLocation)shared\Microsoft.NETCore.App\$(MicrosoftNETCoreAppVersion)\**\*.*" />
     </ItemGroup>
 
     <Copy SourceFiles="@(MicrosoftDotNetWpfTestContents)"
diff --git a/eng/WpfArcadeSdk/tools/configure-helix-machine.ps1 b/eng/WpfArcadeSdk/tools/configure-helix-machine.ps1
deleted file mode 100644
index 63d0db5ed97..00000000000
--- a/eng/WpfArcadeSdk/tools/configure-helix-machine.ps1
+++ /dev/null
@@ -1,38 +0,0 @@
-# This file prepares the helix machine for our tests runs
-
-# Temporary workaround until https://github.com/dotnet/wpf/issues/816 is addressed.
-# The test infrastructure is built against an older version of Microsoft.WindowsDesktop.App.
-# Here we re-write the infrastructure runtimeconfig files so that they can load
-$runtimes = dotnet --list-runtimes
-foreach ($rt in $runtimes)
-{
-    if ($rt.StartsWith("Microsoft.WindowsDesktop.App"))
-    {
-        $version = $rt.Split(" ")[1]
-    }
-}
-
-if ($null -ne $version)
-{
-    # Rewrite the *.runtimeconfig.json files to match the version of the runtime on the machine
-    $infraLocation = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "Test\Infra"
-    $stiConfigFile = Join-Path $infraLocation "Sti.runtimeconfig.json"
-    $qvConfigFile = Join-Path $infraLocation "QualityVaultFrontEnd.runtimeconfig.json"
-    $configFiles = $stiConfigFile, $qvConfigFile
-    foreach ($config in $configFiles)
-    {
-        # Read current config file
-        $jsondata = Get-Content -Raw -Path $config | ConvertFrom-Json
-        # Update version
-        $jsondata.runtimeOptions.framework.version = $version
-        # Write data back
-        $jsondata | ConvertTo-Json -depth 100 | Set-Content $config
-    } 
-}
-else
-{
-    Write-Error "No WindowsDesktop runtime found on machine!"
-    
-    Write-Output "Runtimes installed:"
-    Write-Output $runtimes
-}
diff --git a/eng/WpfArcadeSdk/tools/configure-machine.ps1 b/eng/WpfArcadeSdk/tools/configure-machine.ps1
new file mode 100644
index 00000000000..e8c54acd2a3
--- /dev/null
+++ b/eng/WpfArcadeSdk/tools/configure-machine.ps1
@@ -0,0 +1,71 @@
+[CmdLetBinding()]
+Param(
+    [switch]$ci
+)
+# This file prepares the machine for our tests runs
+
+if ($ci)
+{
+    # When running in ci, the dotnet install is located at %HELIX_CORRELATION_PAYLOAD% along with all our test content.
+    $dotnetLocation = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "dotnet"
+    # Only either the x86 or x64 versions of dotnet are installed on the helix machine, and they both go to the same location
+    $x86dotnetLocation = $dotnetLocation
+}
+else
+{
+    # When running local, we can use the DOTNET_INSTALL_DIR environment variable set by Arcade
+    $dotnetLocation = $env:DOTNET_INSTALL_DIR
+
+    # The x86 location installed by Arcade is in the x86 directory
+    $x86dotnetLocation = "$dotnetLocation\x86"
+    
+    # This is yet one more unfortunate workaround required until https://github.com/dotnet/wpf/issues/816 is addressed, or until
+    # QualityVault and STI don't use WindowsDesktop any longer. Since the multi-framework support only installs the Microsoft.NETCore.App
+    # runtime in the 'x86' dir, we need the ability to look outside that directory for an install of Microsoft.WindowsDesktop.App.
+    $env:DOTNET_MULTILEVEL_LOOKUP=1
+}
+
+# Set DOTNET_ROOT variables so the host can find it
+Set-Item -Path "env:DOTNET_ROOT(x86)" -Value $x86dotnetLocation
+Set-Item -Path "env:DOTNET_ROOT" -Value $dotnetLocation
+
+# Temporary workaround until https://github.com/dotnet/wpf/issues/816 is addressed.
+# The test infrastructure is built against an older version of Microsoft.WindowsDesktop.App.
+# Here we re-write the infrastructure runtimeconfig files so that they can load
+if ($ci)
+{
+    $runtimes = dotnet --list-runtimes
+    foreach ($rt in $runtimes)
+    {
+        if ($rt.StartsWith("Microsoft.WindowsDesktop.App"))
+        {
+            $version = $rt.Split(" ")[1]
+        }
+    }
+    
+    if ($null -ne $version)
+    {
+        # Rewrite the *.runtimeconfig.json files to match the version of the runtime on the machine
+        $infraLocation = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "Test\Infra"
+        $stiConfigFile = Join-Path $infraLocation "Sti.runtimeconfig.json"
+        $qvConfigFile = Join-Path $infraLocation "QualityVaultFrontEnd.runtimeconfig.json"
+        $configFiles = $stiConfigFile, $qvConfigFile
+        foreach ($config in $configFiles)
+        {
+            # Read current config file
+            $jsondata = Get-Content -Raw -Path $config | ConvertFrom-Json
+            # Update version
+            $jsondata.runtimeOptions.framework.version = $version
+            # Write data back
+            $jsondata | ConvertTo-Json -depth 100 | Set-Content $config
+        } 
+    }
+    else
+    {
+        Write-Error "No WindowsDesktop runtime found on machine!"
+        
+        Write-Output "Runtimes installed:"
+        Write-Output $runtimes
+    }
+    
+}
diff --git a/eng/WpfArcadeSdk/tools/runtests.ps1 b/eng/WpfArcadeSdk/tools/runtests.ps1
index f9da1e186ce..7213e388000 100644
--- a/eng/WpfArcadeSdk/tools/runtests.ps1
+++ b/eng/WpfArcadeSdk/tools/runtests.ps1
@@ -4,29 +4,18 @@ Param(
     [switch]$ci
 )
 
-if ($ci)
+# Run any configuration needed for the test pass
+if (Test-Path "$PSScriptRoot\configure-machine.ps1")
 {
-    # When running in ci, the dotnet install is located at %HELIX_CORRELATION_PAYLOAD% along with all our test content.
-    $dotnetLocation = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "dotnet"
-    # Only either the x86 or x64 versions of dotnet are installed on the helix machine, and they both go to the same location
-    $x86dotnetLocation = $dotnetLocation
-
-    # Run any extra machine setup required for Helix
-    . "$PSScriptRoot\configure-helix-machine.ps1"
+    . "$PSScriptRoot\configure-machine.ps1" -ci:$ci
 }
-else
+
+if (Test-Path "$env:AppData\QualityVault")
 {
-    # When running local, we run out of $(RepoRoot)artifacts\test\$(Configuration)\$(Platform)
-    # The dotnet install is located at $(RepoRoot).dotnet
-    $dotnetLocation =  Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "..\..\..\..\.dotnet" -Resolve
-    # The x86 location installed by Arcade is in the x86 directory
-    $x86dotnetLocation = "$dotnetLocation\x86"
+    # Cleanup any QualityVault stuff left behind before executing the tests
+    Remove-Item "$env:AppData\QualityVault" -Recurse
 }
 
-# Set DOTNET_ROOT variables so the host can find it
-Set-Item -Path "env:DOTNET_ROOT(x86)" -Value $x86dotnetLocation
-Set-Item -Path "env:DOTNET_ROOT" -Value $dotnetLocation
-
 # Run the tests
 $testLocation = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "Test"
 if (Test-Path "$testLocation\rundrts.cmd")
@@ -41,7 +30,13 @@ if (Test-Path "$testLocation\rundrts.cmd")
 # Need to copy the xUnit log to a known location that helix can understand
 if (Test-Path "$env:AppData\QualityVault\Run\Report\testResults.xml")
 {
-    $resultLocation = $PSScriptRoot
-    Write-Output "Copying test results to $resultLocation"
+    $resultLocation = Get-Location
+    Write-Output "Copying testResults.xml to $resultLocation"
     Copy-Item "$env:AppData\QualityVault\Run\Report\testResults.xml" $resultLocation
+}
+
+if (Test-Path "$env:AppData\QualityVault")
+{
+    # Cleanup what QualityVault left behind in AppData to save space on Helix machines
+    Remove-Item "$env:AppData\QualityVault" -Recurse
 }
\ No newline at end of file

From 61379083f0cfe2efd8e7e70dc7cc2a332d243ecb Mon Sep 17 00:00:00 2001
From: Rob LaDuca <roladuca@microsoft.com>
Date: Wed, 5 Jun 2019 17:13:57 -0700
Subject: [PATCH 33/72] Suppress all GUI from IL(D)Asm calls. (#877)

* Suppress all GUI from IL(D)Asm calls.
---
 eng/WpfArcadeSdk/tools/InjectModuleInitializer.targets | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/eng/WpfArcadeSdk/tools/InjectModuleInitializer.targets b/eng/WpfArcadeSdk/tools/InjectModuleInitializer.targets
index e1e3ef4a5bf..1e9b0d757cd 100644
--- a/eng/WpfArcadeSdk/tools/InjectModuleInitializer.targets
+++ b/eng/WpfArcadeSdk/tools/InjectModuleInitializer.targets
@@ -381,7 +381,8 @@
                 Assembly="$(InFile)"
                 Condition="Exists('$(InFile)')"
                 LineNum="true"
-                Out="$(OutFile)" />
+                Out="$(OutFile)"
+                NoBar="true" />
 
   </Target>
 
@@ -421,7 +422,8 @@
                SourceFile="$(ILFile)"
                Out="$(TargetFile)"
                Dll="true"
-               Debug="true" />
+               Debug="true"
+               Quiet="true" />
 
   </Target>
 

From 1798ea52f6f12049cb2be6a55132741638bb68b4 Mon Sep 17 00:00:00 2001
From: Ryland <41491307+ryalanms@users.noreply.github.com>
Date: Wed, 5 Jun 2019 19:54:10 -0700
Subject: [PATCH 34/72] Don't generate ref assemblies for WPF extension
 assemblies (#879)

---
 .../PresentationFramework-SystemCore.csproj                      | 1 +
 .../PresentationFramework-SystemData.csproj                      | 1 +
 .../PresentationFramework-SystemDrawing.csproj                   | 1 +
 .../PresentationFramework-SystemXml.csproj                       | 1 +
 .../PresentationFramework-SystemXmlLinq.csproj                   | 1 +
 5 files changed, 5 insertions(+)

diff --git a/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemCore/PresentationFramework-SystemCore.csproj b/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemCore/PresentationFramework-SystemCore.csproj
index ae90fb22271..52a9e041a8d 100644
--- a/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemCore/PresentationFramework-SystemCore.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemCore/PresentationFramework-SystemCore.csproj
@@ -4,6 +4,7 @@
     <Platforms>AnyCPU;x64</Platforms>
     <EnableDefaultItems>false</EnableDefaultItems>
     <GenerateDependencyFile>false</GenerateDependencyFile>
+    <ProduceReferenceAssembly>false</ProduceReferenceAssembly> 
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="SystemCoreExtension.cs" />
diff --git a/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemData/PresentationFramework-SystemData.csproj b/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemData/PresentationFramework-SystemData.csproj
index fca66dfba37..952af945c3f 100644
--- a/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemData/PresentationFramework-SystemData.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemData/PresentationFramework-SystemData.csproj
@@ -4,6 +4,7 @@
     <Platforms>AnyCPU;x64</Platforms>
     <EnableDefaultItems>false</EnableDefaultItems>
     <GenerateDependencyFile>false</GenerateDependencyFile>
+    <ProduceReferenceAssembly>false</ProduceReferenceAssembly> 
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="SystemDataExtension.cs" />
diff --git a/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemDrawing/PresentationFramework-SystemDrawing.csproj b/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemDrawing/PresentationFramework-SystemDrawing.csproj
index 2c2dbc344bd..02c7d8f28b4 100644
--- a/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemDrawing/PresentationFramework-SystemDrawing.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemDrawing/PresentationFramework-SystemDrawing.csproj
@@ -4,6 +4,7 @@
     <Platforms>AnyCPU;x64</Platforms>
     <EnableDefaultItems>false</EnableDefaultItems>
     <GenerateDependencyFile>false</GenerateDependencyFile>
+    <ProduceReferenceAssembly>false</ProduceReferenceAssembly> 
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="SystemDrawingExtension.cs" />
diff --git a/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemXml/PresentationFramework-SystemXml.csproj b/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemXml/PresentationFramework-SystemXml.csproj
index 63b23198ed4..fe6e950307a 100644
--- a/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemXml/PresentationFramework-SystemXml.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemXml/PresentationFramework-SystemXml.csproj
@@ -4,6 +4,7 @@
     <Platforms>AnyCPU;x64</Platforms>
     <EnableDefaultItems>false</EnableDefaultItems>
     <GenerateDependencyFile>false</GenerateDependencyFile>
+    <ProduceReferenceAssembly>false</ProduceReferenceAssembly> 
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="SystemXmlExtension.cs" />
diff --git a/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemXmlLinq/PresentationFramework-SystemXmlLinq.csproj b/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemXmlLinq/PresentationFramework-SystemXmlLinq.csproj
index 922c1cfd2b5..9da2f96d40c 100644
--- a/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemXmlLinq/PresentationFramework-SystemXmlLinq.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemXmlLinq/PresentationFramework-SystemXmlLinq.csproj
@@ -4,6 +4,7 @@
     <Platforms>AnyCPU;x64</Platforms>
     <EnableDefaultItems>false</EnableDefaultItems>
     <GenerateDependencyFile>false</GenerateDependencyFile>
+    <ProduceReferenceAssembly>false</ProduceReferenceAssembly> 
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="SystemXmlLinqExtension.cs" />

From 106bd213e60d960429a5b9f5c8dbbc589ccaa86e Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 6 Jun 2019 12:17:57 +0000
Subject: [PATCH 35/72] Update dependencies from
 https://github.com/dotnet/arcade build 20190605.13 (#883)

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19305.13
- Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19305.13
---
 eng/Version.Details.xml | 8 ++++----
 eng/Versions.props      | 2 +-
 eng/common/tools.ps1    | 4 ++--
 global.json             | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 75c429b0092..f3e708550d0 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -63,13 +63,13 @@
       <Uri>https://github.com/dotnet/core-setup</Uri>
       <Sha>a620d0dba57cd18e49fa686e28e18369be23d067</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19304.23">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19305.13">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>c9ab9c47d6c66fb9ad89e331900e06bed7463904</Sha>
+      <Sha>d05c046913964e880be08b804e7249f297617c2f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.19304.23">
+    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.19305.13">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>c9ab9c47d6c66fb9ad89e331900e06bed7463904</Sha>
+      <Sha>d05c046913964e880be08b804e7249f297617c2f</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview7.19304.7" CoherentParentDependency="Microsoft.NETCore.App">
       <Uri>https://github.com/dotnet/corefx</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index ee819bd9b05..1258b647704 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -40,7 +40,7 @@
   </PropertyGroup>
   <!-- Packages that come from https://github.com/dotnet/arcade -->
   <PropertyGroup>
-    <MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.19304.23</MicrosoftDotNetCodeAnalysisPackageVersion>
+    <MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.19305.13</MicrosoftDotNetCodeAnalysisPackageVersion>
   </PropertyGroup>
   <!-- Packages that come from https://github.com/dotnet/corefxlab -->
   <PropertyGroup>
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index 3983d719be3..538a0262b52 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -107,11 +107,11 @@ function Write-PipelineTaskError {
 
     if(!$ci) {
       if($Type -eq 'error') {
-        Write-Error $Message
+        Write-Host $Message -ForegroundColor Red
         return
       }
       elseif ($Type -eq 'warning') {
-        Write-Warning $Message
+        Write-Host $Message -ForegroundColor Yellow
         return
       }
     }
diff --git a/global.json b/global.json
index e355737c6e8..5be0a7dfa94 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19304.23"
+    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19305.13"
   },
   "native-tools": {
     "strawberry-perl": "5.28.1.1-1"

From fa1e85b0170b74d3c827d8e6a4f98a00d6f50990 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 6 Jun 2019 12:52:58 +0000
Subject: [PATCH 36/72] Update dependencies from
 https://github.com/dotnet/core-setup build 20190605.02 (#884)

- Microsoft.NETCore.App - 3.0.0-preview7-27805-02

Dependency coherency updates

- Microsoft.Win32.Registry - 4.6.0-preview7.19305.9 (parent: Microsoft.NETCore.App)
- System.CodeDom - 4.6.0-preview7.19305.9 (parent: Microsoft.NETCore.App)
- System.Configuration.ConfigurationManager - 4.6.0-preview7.19305.9 (parent: Microsoft.NETCore.App)
- System.Diagnostics.EventLog - 4.6.0-preview7.19305.9 (parent: Microsoft.NETCore.App)
- System.DirectoryServices - 4.6.0-preview7.19305.9 (parent: Microsoft.NETCore.App)
- System.Drawing.Common - 4.6.0-preview7.19305.9 (parent: Microsoft.NETCore.App)
- System.Reflection.Emit - 4.6.0-preview7.19305.9 (parent: Microsoft.NETCore.App)
- System.Reflection.MetadataLoadContext - 4.6.0-preview7.19305.9 (parent: Microsoft.NETCore.App)
- System.Security.AccessControl - 4.6.0-preview7.19305.9 (parent: Microsoft.NETCore.App)
- System.Security.Cryptography.Xml - 4.6.0-preview7.19305.9 (parent: Microsoft.NETCore.App)
- System.Security.Permissions - 4.6.0-preview7.19305.9 (parent: Microsoft.NETCore.App)
- System.Security.Principal.Windows - 4.6.0-preview7.19305.9 (parent: Microsoft.NETCore.App)
- System.Windows.Extensions - 4.6.0-preview7.19305.9 (parent: Microsoft.NETCore.App)
- Microsoft.NETCore.Platforms - 3.0.0-preview7.19305.9 (parent: Microsoft.NETCore.App)
- System.IO.Packaging - 4.6.0-preview7.19305.9 (parent: Microsoft.NETCore.App)
- Microsoft.NETCore.ILDAsm - 3.0.0-preview7.19305.2 (parent: Microsoft.NETCore.Runtime.CoreCLR)
- Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-preview7.19305.2 (parent: Microsoft.NETCore.App)
- Microsoft.NETCore.ILAsm - 3.0.0-preview7.19305.2 (parent: Microsoft.NETCore.Runtime.CoreCLR)
- Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-preview7.19305.2 (parent: Microsoft.NETCore.App)
---
 eng/Version.Details.xml | 76 ++++++++++++++++++++---------------------
 eng/Versions.props      | 38 ++++++++++-----------
 2 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index f3e708550d0..83ad6c3baf3 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -7,61 +7,61 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.Win32.Registry" Version="4.6.0-preview7.19304.7" CoherentParentDependency="Microsoft.NETCore.App">
+    <Dependency Name="Microsoft.Win32.Registry" Version="4.6.0-preview7.19305.9" CoherentParentDependency="Microsoft.NETCore.App">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>2469a91c2aa68f9cb6b0f18f75dffc673a1f7895</Sha>
+      <Sha>5c2ba765f55462dcc5e00179a34398fc70bf37b7</Sha>
     </Dependency>
-    <Dependency Name="System.CodeDom" Version="4.6.0-preview7.19304.7" CoherentParentDependency="Microsoft.NETCore.App">
+    <Dependency Name="System.CodeDom" Version="4.6.0-preview7.19305.9" CoherentParentDependency="Microsoft.NETCore.App">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>2469a91c2aa68f9cb6b0f18f75dffc673a1f7895</Sha>
+      <Sha>5c2ba765f55462dcc5e00179a34398fc70bf37b7</Sha>
     </Dependency>
-    <Dependency Name="System.Configuration.ConfigurationManager" Version="4.6.0-preview7.19304.7" CoherentParentDependency="Microsoft.NETCore.App">
+    <Dependency Name="System.Configuration.ConfigurationManager" Version="4.6.0-preview7.19305.9" CoherentParentDependency="Microsoft.NETCore.App">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>2469a91c2aa68f9cb6b0f18f75dffc673a1f7895</Sha>
+      <Sha>5c2ba765f55462dcc5e00179a34398fc70bf37b7</Sha>
     </Dependency>
-    <Dependency Name="System.Diagnostics.EventLog" Version="4.6.0-preview7.19304.7" CoherentParentDependency="Microsoft.NETCore.App">
+    <Dependency Name="System.Diagnostics.EventLog" Version="4.6.0-preview7.19305.9" CoherentParentDependency="Microsoft.NETCore.App">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>2469a91c2aa68f9cb6b0f18f75dffc673a1f7895</Sha>
+      <Sha>5c2ba765f55462dcc5e00179a34398fc70bf37b7</Sha>
     </Dependency>
-    <Dependency Name="System.DirectoryServices" Version="4.6.0-preview7.19304.7" CoherentParentDependency="Microsoft.NETCore.App">
+    <Dependency Name="System.DirectoryServices" Version="4.6.0-preview7.19305.9" CoherentParentDependency="Microsoft.NETCore.App">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>2469a91c2aa68f9cb6b0f18f75dffc673a1f7895</Sha>
+      <Sha>5c2ba765f55462dcc5e00179a34398fc70bf37b7</Sha>
     </Dependency>
-    <Dependency Name="System.Drawing.Common" Version="4.6.0-preview7.19304.7" CoherentParentDependency="Microsoft.NETCore.App">
+    <Dependency Name="System.Drawing.Common" Version="4.6.0-preview7.19305.9" CoherentParentDependency="Microsoft.NETCore.App">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>2469a91c2aa68f9cb6b0f18f75dffc673a1f7895</Sha>
+      <Sha>5c2ba765f55462dcc5e00179a34398fc70bf37b7</Sha>
     </Dependency>
-    <Dependency Name="System.Reflection.Emit" Version="4.6.0-preview7.19304.7" CoherentParentDependency="Microsoft.NETCore.App">
+    <Dependency Name="System.Reflection.Emit" Version="4.6.0-preview7.19305.9" CoherentParentDependency="Microsoft.NETCore.App">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>2469a91c2aa68f9cb6b0f18f75dffc673a1f7895</Sha>
+      <Sha>5c2ba765f55462dcc5e00179a34398fc70bf37b7</Sha>
     </Dependency>
-    <Dependency Name="System.Reflection.MetadataLoadContext" Version="4.6.0-preview7.19304.7" CoherentParentDependency="Microsoft.NETCore.App">
+    <Dependency Name="System.Reflection.MetadataLoadContext" Version="4.6.0-preview7.19305.9" CoherentParentDependency="Microsoft.NETCore.App">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>2469a91c2aa68f9cb6b0f18f75dffc673a1f7895</Sha>
+      <Sha>5c2ba765f55462dcc5e00179a34398fc70bf37b7</Sha>
     </Dependency>
-    <Dependency Name="System.Security.AccessControl" Version="4.6.0-preview7.19304.7" CoherentParentDependency="Microsoft.NETCore.App">
+    <Dependency Name="System.Security.AccessControl" Version="4.6.0-preview7.19305.9" CoherentParentDependency="Microsoft.NETCore.App">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>2469a91c2aa68f9cb6b0f18f75dffc673a1f7895</Sha>
+      <Sha>5c2ba765f55462dcc5e00179a34398fc70bf37b7</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Cryptography.Xml" Version="4.6.0-preview7.19304.7" CoherentParentDependency="Microsoft.NETCore.App">
+    <Dependency Name="System.Security.Cryptography.Xml" Version="4.6.0-preview7.19305.9" CoherentParentDependency="Microsoft.NETCore.App">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>2469a91c2aa68f9cb6b0f18f75dffc673a1f7895</Sha>
+      <Sha>5c2ba765f55462dcc5e00179a34398fc70bf37b7</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Permissions" Version="4.6.0-preview7.19304.7" CoherentParentDependency="Microsoft.NETCore.App">
+    <Dependency Name="System.Security.Permissions" Version="4.6.0-preview7.19305.9" CoherentParentDependency="Microsoft.NETCore.App">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>2469a91c2aa68f9cb6b0f18f75dffc673a1f7895</Sha>
+      <Sha>5c2ba765f55462dcc5e00179a34398fc70bf37b7</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Principal.Windows" Version="4.6.0-preview7.19304.7" CoherentParentDependency="Microsoft.NETCore.App">
+    <Dependency Name="System.Security.Principal.Windows" Version="4.6.0-preview7.19305.9" CoherentParentDependency="Microsoft.NETCore.App">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>2469a91c2aa68f9cb6b0f18f75dffc673a1f7895</Sha>
+      <Sha>5c2ba765f55462dcc5e00179a34398fc70bf37b7</Sha>
     </Dependency>
-    <Dependency Name="System.Windows.Extensions" Version="4.6.0-preview7.19304.7" CoherentParentDependency="Microsoft.NETCore.App">
+    <Dependency Name="System.Windows.Extensions" Version="4.6.0-preview7.19305.9" CoherentParentDependency="Microsoft.NETCore.App">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>2469a91c2aa68f9cb6b0f18f75dffc673a1f7895</Sha>
+      <Sha>5c2ba765f55462dcc5e00179a34398fc70bf37b7</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview7-27804-03">
+    <Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview7-27805-02">
       <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>a620d0dba57cd18e49fa686e28e18369be23d067</Sha>
+      <Sha>2e54d1f6a6a9126126d6c9f8d730489892acf730</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19305.13">
       <Uri>https://github.com/dotnet/arcade</Uri>
@@ -71,29 +71,29 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>d05c046913964e880be08b804e7249f297617c2f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview7.19304.7" CoherentParentDependency="Microsoft.NETCore.App">
+    <Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview7.19305.9" CoherentParentDependency="Microsoft.NETCore.App">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>2469a91c2aa68f9cb6b0f18f75dffc673a1f7895</Sha>
+      <Sha>5c2ba765f55462dcc5e00179a34398fc70bf37b7</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="4.8.0-preview7.19304.6">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
       <Sha>24fbf672601b7b9c088abed2e850bfe14a69875f</Sha>
     </Dependency>
-    <Dependency Name="System.IO.Packaging" Version="4.6.0-preview7.19304.7" CoherentParentDependency="Microsoft.NETCore.App">
+    <Dependency Name="System.IO.Packaging" Version="4.6.0-preview7.19305.9" CoherentParentDependency="Microsoft.NETCore.App">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>2469a91c2aa68f9cb6b0f18f75dffc673a1f7895</Sha>
+      <Sha>5c2ba765f55462dcc5e00179a34398fc70bf37b7</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.0.0-preview7.19304.2" CoherentParentDependency="Microsoft.NETCore.App">
+    <Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.0.0-preview7.19305.2" CoherentParentDependency="Microsoft.NETCore.App">
       <Uri>https://github.com/dotnet/coreclr</Uri>
-      <Sha>89df4b9d928c7f21550d487328f5db000a498bdf</Sha>
+      <Sha>10df20ed3ff0208b3f16f79d5062662a8827f579</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.ILDAsm" Version="3.0.0-preview7.19304.2" CoherentParentDependency="Microsoft.NETCore.Runtime.CoreCLR">
+    <Dependency Name="Microsoft.NETCore.ILDAsm" Version="3.0.0-preview7.19305.2" CoherentParentDependency="Microsoft.NETCore.Runtime.CoreCLR">
       <Uri>https://github.com/dotnet/coreclr</Uri>
-      <Sha>89df4b9d928c7f21550d487328f5db000a498bdf</Sha>
+      <Sha>10df20ed3ff0208b3f16f79d5062662a8827f579</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.ILAsm" Version="3.0.0-preview7.19304.2" CoherentParentDependency="Microsoft.NETCore.Runtime.CoreCLR">
+    <Dependency Name="Microsoft.NETCore.ILAsm" Version="3.0.0-preview7.19305.2" CoherentParentDependency="Microsoft.NETCore.Runtime.CoreCLR">
       <Uri>https://github.com/dotnet/coreclr</Uri>
-      <Sha>89df4b9d928c7f21550d487328f5db000a498bdf</Sha>
+      <Sha>10df20ed3ff0208b3f16f79d5062662a8827f579</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index 1258b647704..2f3540f027e 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -4,7 +4,7 @@
     <VersionPrefix>4.8.0</VersionPrefix>
     <PreReleaseVersionLabel>preview7</PreReleaseVersionLabel>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
-    <SystemIOPackagingVersion>4.6.0-preview7.19304.7</SystemIOPackagingVersion>
+    <SystemIOPackagingVersion>4.6.0-preview7.19305.9</SystemIOPackagingVersion>
   </PropertyGroup>
   <!-- NuGet Package Versions -->
   <PropertyGroup>
@@ -12,31 +12,31 @@
   </PropertyGroup>
   <!-- Packages that come from https://github.com/dotnet/coreclr -->
   <PropertyGroup>
-    <MicrosoftNETCoreRuntimeCoreCLRVersion>3.0.0-preview7.19304.2</MicrosoftNETCoreRuntimeCoreCLRVersion>
-    <MicrosoftNETCoreILDAsmVersion>3.0.0-preview7.19304.2</MicrosoftNETCoreILDAsmVersion>
-    <MicrosoftNETCoreILAsmVersion>3.0.0-preview7.19304.2</MicrosoftNETCoreILAsmVersion>
+    <MicrosoftNETCoreRuntimeCoreCLRVersion>3.0.0-preview7.19305.2</MicrosoftNETCoreRuntimeCoreCLRVersion>
+    <MicrosoftNETCoreILDAsmVersion>3.0.0-preview7.19305.2</MicrosoftNETCoreILDAsmVersion>
+    <MicrosoftNETCoreILAsmVersion>3.0.0-preview7.19305.2</MicrosoftNETCoreILAsmVersion>
   </PropertyGroup>
   <!-- Packages that come from https://github.com/dotnet/core-setup -->
   <PropertyGroup>
-    <MicrosoftNETCoreAppVersion>3.0.0-preview7-27804-03</MicrosoftNETCoreAppVersion>
-    <MicrosoftNETCorePlatformsVersion>3.0.0-preview7.19304.7</MicrosoftNETCorePlatformsVersion>
-    <SystemDrawingCommonVersion>4.6.0-preview7.19304.7</SystemDrawingCommonVersion>
-    <SystemDirectoryServicesVersion>4.6.0-preview7.19304.7</SystemDirectoryServicesVersion>
-    <SystemReflectionMetadataLoadContextVersion>4.6.0-preview7.19304.7</SystemReflectionMetadataLoadContextVersion>
+    <MicrosoftNETCoreAppVersion>3.0.0-preview7-27805-02</MicrosoftNETCoreAppVersion>
+    <MicrosoftNETCorePlatformsVersion>3.0.0-preview7.19305.9</MicrosoftNETCorePlatformsVersion>
+    <SystemDrawingCommonVersion>4.6.0-preview7.19305.9</SystemDrawingCommonVersion>
+    <SystemDirectoryServicesVersion>4.6.0-preview7.19305.9</SystemDirectoryServicesVersion>
+    <SystemReflectionMetadataLoadContextVersion>4.6.0-preview7.19305.9</SystemReflectionMetadataLoadContextVersion>
   </PropertyGroup>
   <!-- Packages that come from https://github.com/dotnet/corefx via core-setup coherency parent dependency -->
   <PropertyGroup>
-    <MicrosoftWin32RegistryPackageVersion>4.6.0-preview7.19304.7</MicrosoftWin32RegistryPackageVersion>
-    <SystemCodeDomPackageVersion>4.6.0-preview7.19304.7</SystemCodeDomPackageVersion>
-    <SystemConfigurationConfigurationManagerPackageVersion>4.6.0-preview7.19304.7</SystemConfigurationConfigurationManagerPackageVersion>
-    <SystemDiagnosticsEventLogPackageVersion>4.6.0-preview7.19304.7</SystemDiagnosticsEventLogPackageVersion>
-    <SystemReflectionEmitPackageVersion>4.6.0-preview7.19304.7</SystemReflectionEmitPackageVersion>
+    <MicrosoftWin32RegistryPackageVersion>4.6.0-preview7.19305.9</MicrosoftWin32RegistryPackageVersion>
+    <SystemCodeDomPackageVersion>4.6.0-preview7.19305.9</SystemCodeDomPackageVersion>
+    <SystemConfigurationConfigurationManagerPackageVersion>4.6.0-preview7.19305.9</SystemConfigurationConfigurationManagerPackageVersion>
+    <SystemDiagnosticsEventLogPackageVersion>4.6.0-preview7.19305.9</SystemDiagnosticsEventLogPackageVersion>
+    <SystemReflectionEmitPackageVersion>4.6.0-preview7.19305.9</SystemReflectionEmitPackageVersion>
     <SystemReflectionTypeExtensionsPackageVersion>4.6.0-preview4.19176.11</SystemReflectionTypeExtensionsPackageVersion>
-    <SystemSecurityAccessControlPackageVersion>4.6.0-preview7.19304.7</SystemSecurityAccessControlPackageVersion>
-    <SystemSecurityCryptographyXmlPackageVersion>4.6.0-preview7.19304.7</SystemSecurityCryptographyXmlPackageVersion>
-    <SystemSecurityPermissionsPackageVersion>4.6.0-preview7.19304.7</SystemSecurityPermissionsPackageVersion>
-    <SystemSecurityPrincipalWindowsPackageVersion>4.6.0-preview7.19304.7</SystemSecurityPrincipalWindowsPackageVersion>
-    <SystemWindowsExtensionsPackageVersion>4.6.0-preview7.19304.7</SystemWindowsExtensionsPackageVersion>
+    <SystemSecurityAccessControlPackageVersion>4.6.0-preview7.19305.9</SystemSecurityAccessControlPackageVersion>
+    <SystemSecurityCryptographyXmlPackageVersion>4.6.0-preview7.19305.9</SystemSecurityCryptographyXmlPackageVersion>
+    <SystemSecurityPermissionsPackageVersion>4.6.0-preview7.19305.9</SystemSecurityPermissionsPackageVersion>
+    <SystemSecurityPrincipalWindowsPackageVersion>4.6.0-preview7.19305.9</SystemSecurityPrincipalWindowsPackageVersion>
+    <SystemWindowsExtensionsPackageVersion>4.6.0-preview7.19305.9</SystemWindowsExtensionsPackageVersion>
   </PropertyGroup>
   <!-- Packages that come from https://github.com/dotnet/arcade -->
   <PropertyGroup>

From 0c4546907f75f4e48503d60ebbe12a883b3b8b99 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 6 Jun 2019 12:53:57 +0000
Subject: [PATCH 37/72] Update dependencies from
 https://github.com/dotnet/winforms build 20190605.1 (#885)

- Microsoft.Private.Winforms - 4.8.0-preview7.19305.1
---
 eng/Version.Details.xml | 4 ++--
 eng/Versions.props      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 83ad6c3baf3..25edc9d5a5d 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.Private.Winforms" Version="4.8.0-preview7.19304.2">
+    <Dependency Name="Microsoft.Private.Winforms" Version="4.8.0-preview7.19305.1">
       <Uri>https://github.com/dotnet/winforms</Uri>
-      <Sha>f59e9a9dde144098bb58365f210dfdf4acc9e693</Sha>
+      <Sha>e65ecacdf2da06f11c847571b467f632393bd060</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index 2f3540f027e..752b1a17450 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -8,7 +8,7 @@
   </PropertyGroup>
   <!-- NuGet Package Versions -->
   <PropertyGroup>
-    <MicrosoftPrivateWinformsVersion>4.8.0-preview7.19304.2</MicrosoftPrivateWinformsVersion>
+    <MicrosoftPrivateWinformsVersion>4.8.0-preview7.19305.1</MicrosoftPrivateWinformsVersion>
   </PropertyGroup>
   <!-- Packages that come from https://github.com/dotnet/coreclr -->
   <PropertyGroup>

From 49513e13b52ede586a931d90523fa2493351ee4c Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 6 Jun 2019 13:28:25 +0000
Subject: [PATCH 38/72] Update dependencies from
 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20190605.10
 (#886)

- Microsoft.DotNet.Wpf.DncEng - 4.8.0-preview7.19305.10
---
 eng/Version.Details.xml | 4 ++--
 eng/Versions.props      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 25edc9d5a5d..1516246eb0f 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -75,9 +75,9 @@
       <Uri>https://github.com/dotnet/corefx</Uri>
       <Sha>5c2ba765f55462dcc5e00179a34398fc70bf37b7</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="4.8.0-preview7.19304.6">
+    <Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="4.8.0-preview7.19305.10">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
-      <Sha>24fbf672601b7b9c088abed2e850bfe14a69875f</Sha>
+      <Sha>76e5819b43718069ef5710a08032b616de5d754c</Sha>
     </Dependency>
     <Dependency Name="System.IO.Packaging" Version="4.6.0-preview7.19305.9" CoherentParentDependency="Microsoft.NETCore.App">
       <Uri>https://github.com/dotnet/corefx</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 752b1a17450..ec0f112db0b 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -98,6 +98,6 @@
       It is worth reiterating that this package *should not* be consumed to build the product.
   -->
   <PropertyGroup>
-    <MicrosoftDotNetWpfDncEngVersion>4.8.0-preview7.19304.6</MicrosoftDotNetWpfDncEngVersion>
+    <MicrosoftDotNetWpfDncEngVersion>4.8.0-preview7.19305.10</MicrosoftDotNetWpfDncEngVersion>
   </PropertyGroup>
 </Project>

From 3d3a1725d45f9ec908f9abc2264e9b1f8d02d09d Mon Sep 17 00:00:00 2001
From: Rob LaDuca <roladuca@microsoft.com>
Date: Thu, 6 Jun 2019 10:09:53 -0700
Subject: [PATCH 39/72] Remove workaround for
 https://github.com/dotnet/corefx/issues/32641. (#882)

---
 .../SystemXmlLinqExtension.cs                             | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemXmlLinq/SystemXmlLinqExtension.cs b/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemXmlLinq/SystemXmlLinqExtension.cs
index e983d7a60d5..5a0a67b906f 100644
--- a/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemXmlLinq/SystemXmlLinqExtension.cs
+++ b/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemXmlLinq/SystemXmlLinqExtension.cs
@@ -21,10 +21,10 @@ static SystemXmlLinqExtension()
             XElement xelement = new XElement("Dummy");
             PropertyDescriptorCollection pdc = TypeDescriptor.GetProperties(xelement);
 
-            s_XElementElementsPropertyDescriptorType = pdc["Elements"]?.GetType();
-            s_XElementDescendantsPropertyDescriptorType = pdc["Descendants"]?.GetType();
-            s_XElementAttributePropertyDescriptorType = pdc["Attribute"]?.GetType();
-            s_XElementElementPropertyDescriptorType = pdc["Element"]?.GetType();
+            s_XElementElementsPropertyDescriptorType = pdc["Elements"].GetType();
+            s_XElementDescendantsPropertyDescriptorType = pdc["Descendants"].GetType();
+            s_XElementAttributePropertyDescriptorType = pdc["Attribute"].GetType();
+            s_XElementElementPropertyDescriptorType = pdc["Element"].GetType();
         }
 
         // return true if the item is an XElement

From 8fb5dce62b84cbc3ceaa7fe9b457afc0ebf398a5 Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Thu, 6 Jun 2019 12:24:11 -0700
Subject: [PATCH 40/72] upload drt results in helix run

---
 eng/WpfArcadeSdk/tools/runtests.ps1                  | 12 +++++++++---
 .../test/DRT/DrtXaml/DrtXaml/DrtXaml.csproj          |  1 +
 src/Microsoft.DotNet.Wpf/test/Directory.Build.props  |  1 -
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/eng/WpfArcadeSdk/tools/runtests.ps1 b/eng/WpfArcadeSdk/tools/runtests.ps1
index 7213e388000..5931b60f7fa 100644
--- a/eng/WpfArcadeSdk/tools/runtests.ps1
+++ b/eng/WpfArcadeSdk/tools/runtests.ps1
@@ -18,11 +18,16 @@ if (Test-Path "$env:AppData\QualityVault")
 
 # Run the tests
 $testLocation = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "Test"
-if (Test-Path "$testLocation\rundrts.cmd")
+if (Test-Path "$testLocation\QV.cmd")
 {
-    Invoke-Expression "$testLocation\rundrts.cmd $command"
+    # 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"
 }
 
+if ($ci -and (Test-Path "$env:AppData\QualityVault\Run\Report\DrtReport.xml"))
+{
+    Invoke-Expression "$env:HELIX_PYTHONPATH $env:HELIX_SCRIPT_ROOT\upload_result.py -result $env:AppData\QualityVault\Run\Report\DrtReport.xml -result_name DrtReport.xml"
+}
 # We can use $env:HELIX_PYTHONPATH $env:HELIX_SCRIPT_ROOT\upload_result.py to upload any QV specific logs and/or screenshots that we are interested in.
 # For example: $env:HELIX_PYTHONPATH $env:HELIX_SCRIPT_ROOT%\upload_result.py -result screenshot.jpg -result_name screenshot.jpg
 # Then, links to these artifacts can then be included in the xUnit logs.
@@ -30,7 +35,8 @@ if (Test-Path "$testLocation\rundrts.cmd")
 # Need to copy the xUnit log to a known location that helix can understand
 if (Test-Path "$env:AppData\QualityVault\Run\Report\testResults.xml")
 {
-    $resultLocation = Get-Location
+    Get-ChildItem env:
+    $resultLocation = if($ci) { Get-Location } else { $PSScriptRoot }
     Write-Output "Copying testResults.xml to $resultLocation"
     Copy-Item "$env:AppData\QualityVault\Run\Report\testResults.xml" $resultLocation
 }
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/DrtXaml.csproj b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/DrtXaml.csproj
index 39fdb07e5da..028926828d1 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/DrtXaml.csproj
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/DrtXaml.csproj
@@ -10,6 +10,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
+    <IsTestProject>true</IsTestProject>
     <IsIntegrationTestProject>false</IsIntegrationTestProject>
   </PropertyGroup>
   
diff --git a/src/Microsoft.DotNet.Wpf/test/Directory.Build.props b/src/Microsoft.DotNet.Wpf/test/Directory.Build.props
index e7d3f6b26b9..d0922997f6f 100644
--- a/src/Microsoft.DotNet.Wpf/test/Directory.Build.props
+++ b/src/Microsoft.DotNet.Wpf/test/Directory.Build.props
@@ -6,7 +6,6 @@
   <PropertyGroup>
     <WpfTestsDir>$(MsBuildThisFileDirectory)</WpfTestsDir>
     <SignAssembly>false</SignAssembly>
-    <IsTestProject Condition="'$(IsTestProject)'!='false'">true</IsTestProject>
     <IsShipping>false</IsShipping>
     <EnableXlfLocalization>false</EnableXlfLocalization>
     <CLSCompliant>false</CLSCompliant>

From f7fc9f2dcb9b3a318287aac79a1135284eb77b0e Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Tue, 23 Apr 2019 15:24:54 -0700
Subject: [PATCH 41/72] adding initial helix support

note: this definitely won't work, it's just some basic initial infrastructure for us to build on once we have a better idea of what to do

use dummy HelixWorkItem initially

updating pipeline.yml

fix Release only condition
---
 eng/Build.props                       |   8 ++
 eng/Version.Details.xml               |   4 +
 eng/helix/configure-helix-machine.ps1 |  18 ++++
 eng/helix/helixpublish.proj           | 127 ++++++++++++++++++++++++++
 eng/helix/prepare-helix-payload.ps1   |  51 +++++++++++
 eng/helix/runtests.cmd                |   5 +
 eng/pipeline.yml                      |  66 ++++++++++++-
 eng/pre-build.ps1                     |   7 ++
 global.json                           |   3 +-
 9 files changed, 287 insertions(+), 2 deletions(-)
 create mode 100644 eng/Build.props
 create mode 100644 eng/helix/configure-helix-machine.ps1
 create mode 100644 eng/helix/helixpublish.proj
 create mode 100644 eng/helix/prepare-helix-payload.ps1
 create mode 100644 eng/helix/runtests.cmd
 create mode 100644 eng/pre-build.ps1

diff --git a/eng/Build.props b/eng/Build.props
new file mode 100644
index 00000000000..da83de21674
--- /dev/null
+++ b/eng/Build.props
@@ -0,0 +1,8 @@
+<Project>
+    <!-- Workarounds for Arcade bug: https://github.com/dotnet/arcade/issues/2641 -->
+    <PropertyGroup Condition="'$(_HelixSource)'!=''">
+        <_NuGetRestoreTargets>$(MSBuildToolsPath32)\..\..\..\Common7\IDE\CommonExtensions\Microsoft\NuGet\NuGet.targets</_NuGetRestoreTargets>
+        <NuGetRestoreTargets>true</NuGetRestoreTargets>
+        <DisableImplicitNETCorePlatformsReference>true</DisableImplicitNETCorePlatformsReference>
+    </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 1516246eb0f..ad1eac1f472 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -95,5 +95,9 @@
       <Uri>https://github.com/dotnet/coreclr</Uri>
       <Sha>10df20ed3ff0208b3f16f79d5062662a8827f579</Sha>
     </Dependency>
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19222.2">
+      <Uri>https://github.com/dotnet/arcade</Uri>
+      <Sha>851e36df83d3361e4bd8a70a2a8a89f762469f9a</Sha>
+    </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/helix/configure-helix-machine.ps1 b/eng/helix/configure-helix-machine.ps1
new file mode 100644
index 00000000000..3790623965a
--- /dev/null
+++ b/eng/helix/configure-helix-machine.ps1
@@ -0,0 +1,18 @@
+# This file prepares the helix machine for our tests runs
+
+$dotnetLocation = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "dotnet"
+
+Write-Output "Adding dotnet location to path: $dotnetLocation"
+Write-Output "Path before: $env:path"
+# Prepend the path to ensure that dotnet.exe is called from there.
+$env:path="$dotnetLocation;$env:path"
+
+Write-Output "Path after: $env:path"
+# Don't look outside the TestHost to resolve best match SDKs.
+$env:DOTNET_MULTILEVEL_LOOKUP = 0
+
+# Disable first run since we do not need all ASP.NET packages restored.
+$env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
+
+# Ensure that the dotnet installed at our dotnetLocation is used
+$env:DOTNET_ROOT=$dotnetLocation
\ No newline at end of file
diff --git a/eng/helix/helixpublish.proj b/eng/helix/helixpublish.proj
new file mode 100644
index 00000000000..819ddbc4a93
--- /dev/null
+++ b/eng/helix/helixpublish.proj
@@ -0,0 +1,127 @@
+
+<Project Sdk="Microsoft.DotNet.Helix.Sdk" DefaultTargets="Test">
+  <PropertyGroup>
+    <!-- These properties help ensure proper and consistent restore behavior -->
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <RestorePackagesPath>$(MSBuildThisFileDirectory)packages</RestorePackagesPath>
+    
+    
+    <!-- We copy our own dotnet payload over to the machine, so we don't want/need a different dotnet install -->
+    <IncludeDotNetCli>false</IncludeDotNetCli>
+    <EnableXUnitReporter>true</EnableXUnitReporter>
+    <EnableAzurePipelinesReporter>true</EnableAzurePipelinesReporter>
+    <FailOnMissionControlTestFailure>true</FailOnMissionControlTestFailure>
+    <HelixPreCommands>$(HelixPreCommands);</HelixPreCommands>
+
+    <!-- These help ensure proper restore behavior for Microsoft.NETCore.Platforms -->
+    <DisableImplicitNETCorePlatformsReference>true</DisableImplicitNETCorePlatformsReference>
+    <RestoreSources>
+      $(RestoreSources);
+      https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json
+    </RestoreSources>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <!--<PackageReference Include="QV.Wpf.Test" Version="1.0.0" /> -->
+    <HelixCorrelationPayload Include="..\..\HelixPayload\$(Configuration)\$(Platform)" /> 
+    <HelixWorkItem Include="HelloHelix">
+      <Timeout>00:20:00</Timeout>
+      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd</Command>
+    </HelixWorkItem>
+    <!--<HelixWorkItem Include="Ping stevenki">
+      <Timeout>00:20:00</Timeout>
+      <Command>ping \\stevenki1\public</Command>
+    </HelixWorkItem>
+    -->
+   <!-- 
+   <HelixWorkItem Include="Annotations">
+      <Timeout>00:20:00</Timeout>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=Annotations</Command>
+    </HelixWorkItem>
+    <HelixWorkItem Include="AppModel">
+      <Timeout>00:20:00</Timeout>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=AppModel</Command>
+    </HelixWorkItem>
+    <HelixWorkItem Include="DigitalDocuments">
+      <Timeout>00:20:00</Timeout>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=DigitalDocuments</Command>
+    </HelixWorkItem>
+    <HelixWorkItem Include="Media">
+      <Timeout>00:20:00</Timeout>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=Media</Command>
+    </HelixWorkItem>
+    <HelixWorkItem Include="Editing">
+      <Timeout>00:20:00</Timeout>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=Editing</Command>
+    </HelixWorkItem>
+    <HelixWorkItem Include="ElementServices">
+      <Timeout>00:20:00</Timeout>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=ElementServices</Command>
+    </HelixWorkItem>
+    <HelixWorkItem Include="Text">
+      <Timeout>00:20:00</Timeout>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=Text</Command>
+    </HelixWorkItem>
+    <HelixWorkItem Include="Animation">
+      <Timeout>00:20:00</Timeout>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=Animation</Command>
+    </HelixWorkItem>
+    <HelixWorkItem Include="3D">
+      <Timeout>00:20:00</Timeout>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=3D</Command>
+    </HelixWorkItem>
+    <HelixWorkItem Include="2D">
+      <Timeout>00:20:00</Timeout>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=2D</Command>
+    </HelixWorkItem>
+    <HelixWorkItem Include="Controls">
+      <Timeout>00:20:00</Timeout>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=Controls</Command>
+    </HelixWorkItem>
+    <HelixWorkItem Include="Imaging">
+      <Timeout>00:20:00</Timeout>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=Imaging</Command>
+    </HelixWorkItem>
+    <HelixWorkItem Include="FlowLayout">
+      <Timeout>00:20:00</Timeout>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=FlowLayout</Command>
+    </HelixWorkItem>
+    <HelixWorkItem Include="DataServices">
+      <Timeout>00:20:00</Timeout>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=DataServices</Command>
+    </HelixWorkItem>
+    <HelixWorkItem Include="ElementLayout">
+      <Timeout>00:20:00</Timeout>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=ElementLayout</Command>
+    </HelixWorkItem>
+    <HelixWorkItem Include="Xaml">
+      <Timeout>00:20:00</Timeout>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=Xaml</Command>
+    </HelixWorkItem>
+    <HelixWorkItem Include="Globalization">
+      <Timeout>00:20:00</Timeout>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=Globalization</Command>
+    </HelixWorkItem>
+    <HelixWorkItem Include="Tablet">
+      <Timeout>00:20:00</Timeout>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=Tablet</Command>
+    </HelixWorkItem>
+    <HelixWorkItem Include="Integration">
+      <Timeout>00:20:00</Timeout>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=Integration</Command>
+    </HelixWorkItem>
+    <HelixWorkItem Include="XET">
+      <Timeout>00:20:00</Timeout>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=XET</Command>
+    </HelixWorkItem>
+    <HelixWorkItem Include="Printing">
+      <Timeout>00:20:00</Timeout>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=Printing</Command>
+    </HelixWorkItem>
+    <HelixWorkItem Include="WindowsFormsIntegration">
+      <Timeout>00:20:00</Timeout>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=WindowsFormsIntegration</Command>
+    </HelixWorkItem>
+    -->
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/eng/helix/prepare-helix-payload.ps1 b/eng/helix/prepare-helix-payload.ps1
new file mode 100644
index 00000000000..8339d9a6782
--- /dev/null
+++ b/eng/helix/prepare-helix-payload.ps1
@@ -0,0 +1,51 @@
+[CmdLetBinding()]
+Param(
+    [string]$platform,
+    [string]$configuration
+)
+
+$payloadDir = "HelixPayload\$configuration\$platform"
+
+$nugetPackagesDir = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "packages"
+
+# TODO: Once we have the nuget package from the dotnet-wpf-test, we can better understand what we 
+# need to do here.
+# Create the payload directory. Remove it if it already exists.
+if(Test-Path $payloadDir)
+{
+    Remove-Item $payloadDir -Recurse
+}
+New-Item -ItemType Directory -Force -Path $payloadDir
+
+function CopyFolderStructure($from, $to)
+{
+    if(Test-Path $to)
+    {
+        Remove-Item $to -Recurse
+    }
+    New-Item -ItemType Directory -Force -Path $to
+
+    if (Test-Path $from)
+    {
+        Get-ChildItem $from | Copy-Item -Destination $to -Recurse 
+    }
+    else
+    {
+        Write-Output "Location doesn't exist: $from"
+    }
+
+}
+
+# Copy files from nuget packages
+$testNugetLocation = Join-Path $nugetPackagesDir "qv.wpf.test\1.0.0\tools\win-$platform\"
+$testPayloadLocation = Join-Path $payloadDir "Test"
+CopyFolderStructure $testNugetLocation $testPayloadLocation
+
+# Copy local dotnet install
+$localDotnetInstall = Join-Path $env:BUILD_SOURCESDIRECTORY '.dotnet'
+$dotnetPayloadLocation = Join-Path $payloadDir "dotnet"
+CopyFolderStructure $localDotnetInstall $dotnetPayloadLocation
+
+# Copy scripts
+Copy-Item "eng\helix\configure-helix-machine.ps1" $payloadDir
+Copy-Item "eng\helix\runtests.cmd" $payloadDir
\ No newline at end of file
diff --git a/eng/helix/runtests.cmd b/eng/helix/runtests.cmd
new file mode 100644
index 00000000000..ef3923df0df
--- /dev/null
+++ b/eng/helix/runtests.cmd
@@ -0,0 +1,5 @@
+@echo off
+powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0configure-helix-machine.ps1""" "
+exit /b %ErrorLevel%
+
+dotnet --info
\ No newline at end of file
diff --git a/eng/pipeline.yml b/eng/pipeline.yml
index 0a0d445c293..e2f05cb5eda 100644
--- a/eng/pipeline.yml
+++ b/eng/pipeline.yml
@@ -11,6 +11,7 @@ parameters:
   # Needed because runAsPublic is used in template expressions, which can't read from user-defined variables
   # Defaults to true
   runAsPublic: true
+  repoName: dotnet/wpf
 
 jobs:
 - template: /eng/common/templates/jobs/jobs.yml
@@ -21,7 +22,7 @@ jobs:
     enablePublishBuildAssets: true
     enablePublishUsingPipelines: $(_PublishUsingPipelines)
     enableTelemetry: true
-    helixRepo: dnceng/wpf
+    helixRepo: $(repoName)
 
     jobs:
     - job: Windows_NT
@@ -48,6 +49,16 @@ jobs:
           value: x86
         - name: _PlatformArgs
           value: /p:Platform=$(_Platform)
+        - name: _TestHelixAgentPool
+          value: 'Windows.10.Amd64.Open'
+        - name: _HelixStagingDir
+          value: $(BUILD.STAGINGDIRECTORY)\helix\functests
+        - name: _HelixSource
+          value: ${{ parameters.repoName }}/$(Build.SourceBranch)
+        - name: _HelixToken
+          value: ''
+        - name: _HelixCreator
+          value: ${{ parameters.repoName }}
 
         # Override some values if we're building internally
         - ${{ if eq(parameters.runAsPublic, 'false') }}:
@@ -60,6 +71,7 @@ jobs:
             value: true
           - group: DotNet-Blob-Feed
           - group: DotNet-Symbol-Server-Pats
+          - group: DotNet-HelixApi-Access
           - name: _PublishBlobFeedUrl
             value: https://dotnetfeed.blob.core.windows.net/dotnet-windowsdesktop/index.json
 
@@ -78,6 +90,12 @@ jobs:
               /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat)
           - name: _OfficialBuildIdArgs
             value: /p:OfficialBuildId=$(BUILD.BUILDNUMBER)
+          - name: _HelixSource
+            value: official/${{ parameters.repoName }}/$(Build.SourceBranch)
+          - name: _HelixToken
+            value: '$(HelixApiAccessToken)' # from DotNet-HelixApi-Access group
+          - name: _HelixCreator
+            value: '' #if _HelixToken is set, Creator must be empty
       strategy:
         matrix:
           Build_Debug_x86:
@@ -101,6 +119,11 @@ jobs:
       steps:
       - checkout: self
         clean: true
+      
+      # Set VSO Variable(s)
+      - powershell: eng\pre-build.ps1
+        displayName: Pre-Build - Set VSO Variables
+
       # Use utility script to run script command dependent on agent OS.
       - script: eng\common\cibuild.cmd
           -configuration $(_BuildConfig) 
@@ -110,3 +133,44 @@ jobs:
           $(_OfficialBuildIdArgs)
           $(_PlatformArgs)
         displayName: Windows Build / Publish
+
+      - powershell: eng\common\build.ps1
+          -restore
+          -configuration $(_BuildConfig) 
+          $(_OfficialBuildIdArgs)
+          $(_PlatformArgs)
+          -projects $(Build.SourcesDirectory)\eng\helix\helixpublish.proj
+        displayName: Restoring Nuget Dependencies for Helix
+        env:
+          SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+          HelixSource: $(_HelixSource)
+          HelixType: 'tests/drt'
+          HelixBuild: $(Build.BuildNumber)
+          HelixTargetQueues: $(_TestHelixAgentPool)
+          HelixAccessToken: $(_HelixToken)              # only defined for internal CI
+          Creator: $(_HelixCreator)
+        condition: and(succeeded(), eq(variables['_BuildConfig'], 'Release')) # on helix machine (with real signing)
+
+      # Prepare the helix payload
+      - powershell: eng\helix\prepare-helix-payload.ps1
+         -configuration $(_BuildConfig) -platform $(_Platform)
+        displayName: Preparing Helix Payload
+        condition: and(succeeded(), eq(variables['_BuildConfig'], 'Release')) # on helix machine (with real signing)
+
+      # Run DRTs
+      - powershell: eng\common\cibuild.cmd
+          -configuration $(_BuildConfig)
+          $(_OfficialBuildIdArgs) 
+          $(_PlatformArgs)
+          -projects $(Build.SourcesDirectory)\eng\helix\helixpublish.proj
+          /bl:$(BUILD.SOURCESDIRECTORY)\artifacts\log\$(_BuildConfig)\HelixUnit.binlog
+        displayName: Run Developer Regression Tests on Helix Machine (Release)
+        env:
+          HelixSource: $(_HelixSource)
+          HelixType: 'tests/drt'
+          HelixBuild: $(Build.BuildNumber)
+          HelixTargetQueues: $(_TestHelixAgentPool)
+          HelixAccessToken: $(_HelixToken)              # only defined for internal CI
+          Creator: $(_HelixCreator)
+          SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+        condition: and(succeeded(), eq(variables['_BuildConfig'], 'Release')) # on helix machine (with real signing)
diff --git a/eng/pre-build.ps1 b/eng/pre-build.ps1
new file mode 100644
index 00000000000..baad60ccbd9
--- /dev/null
+++ b/eng/pre-build.ps1
@@ -0,0 +1,7 @@
+# Open global.json
+$globaljsonpath = Join-Path $env:BUILD_SOURCESDIRECTORY 'global.json'
+$jsondata = Get-Content -Raw -Path $globaljsonpath | ConvertFrom-Json
+
+# Set DotNetCliVersion to global.json.tools.dotnet
+$dotnetcliver = $jsondata.tools.dotnet
+Write-Host "##vso[task.setvariable variable=DotNetCliVersion;]$dotnetcliver"
\ No newline at end of file
diff --git a/global.json b/global.json
index 5be0a7dfa94..1e111d5600a 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,8 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19305.13"
+    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19305.13",
+    "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19222.2"
   },
   "native-tools": {
     "strawberry-perl": "5.28.1.1-1"

From 29721fd3574cd0f2163ef1785860d9199a825dab Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Thu, 2 May 2019 15:43:07 -0700
Subject: [PATCH 42/72] move to using Microsoft.DotNet.Wpf.DncEng.Test package
 name

---
 eng/helix/configure-helix-machine.ps1 | 11 +++++------
 eng/helix/helixpublish.proj           | 26 ++++++++++----------------
 eng/helix/helixrun.cmd                | 12 ++++++++++++
 eng/helix/prepare-helix-payload.ps1   |  4 ++--
 eng/helix/runtests.cmd                |  5 -----
 5 files changed, 29 insertions(+), 29 deletions(-)
 create mode 100644 eng/helix/helixrun.cmd
 delete mode 100644 eng/helix/runtests.cmd

diff --git a/eng/helix/configure-helix-machine.ps1 b/eng/helix/configure-helix-machine.ps1
index 3790623965a..4074e20679f 100644
--- a/eng/helix/configure-helix-machine.ps1
+++ b/eng/helix/configure-helix-machine.ps1
@@ -3,16 +3,15 @@
 $dotnetLocation = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "dotnet"
 
 Write-Output "Adding dotnet location to path: $dotnetLocation"
-Write-Output "Path before: $env:path"
+
 # Prepend the path to ensure that dotnet.exe is called from there.
-$env:path="$dotnetLocation;$env:path"
+[System.Environment]::SetEnvironmentVariable("PATH", "$dotnetLocation;$env:path", [System.EnvironmentVariableTarget]::User)
 
-Write-Output "Path after: $env:path"
 # Don't look outside the TestHost to resolve best match SDKs.
-$env:DOTNET_MULTILEVEL_LOOKUP = 0
+[System.Environment]::SetEnvironmentVariable("DOTNET_MULTILEVEL_LOOKUP", "0", [System.EnvironmentVariableTarget]::User)
 
 # Disable first run since we do not need all ASP.NET packages restored.
-$env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
+[System.Environment]::SetEnvironmentVariable("DOTNET_SKIP_FIRST_TIME_EXPERIENCE", "1", [System.EnvironmentVariableTarget]::User)
 
 # Ensure that the dotnet installed at our dotnetLocation is used
-$env:DOTNET_ROOT=$dotnetLocation
\ No newline at end of file
+[System.Environment]::SetEnvironmentVariable("DOTNET_SKIP_FIRST_TIME_EXPERIENCE", "$dotnetLocation", [System.EnvironmentVariableTarget]::User)
diff --git a/eng/helix/helixpublish.proj b/eng/helix/helixpublish.proj
index 819ddbc4a93..4cf69645c6d 100644
--- a/eng/helix/helixpublish.proj
+++ b/eng/helix/helixpublish.proj
@@ -4,35 +4,29 @@
     <!-- These properties help ensure proper and consistent restore behavior -->
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <RestorePackagesPath>$(MSBuildThisFileDirectory)packages</RestorePackagesPath>
-    
-    
+    <DisableImplicitNETCorePlatformsReference>true</DisableImplicitNETCorePlatformsReference>
+    <RestoreSources>
+      $(RestoreSources);
+      https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json
+    </RestoreSources>
+
     <!-- We copy our own dotnet payload over to the machine, so we don't want/need a different dotnet install -->
     <IncludeDotNetCli>false</IncludeDotNetCli>
     <EnableXUnitReporter>true</EnableXUnitReporter>
     <EnableAzurePipelinesReporter>true</EnableAzurePipelinesReporter>
     <FailOnMissionControlTestFailure>true</FailOnMissionControlTestFailure>
-    <HelixPreCommands>$(HelixPreCommands);</HelixPreCommands>
 
-    <!-- These help ensure proper restore behavior for Microsoft.NETCore.Platforms -->
-    <DisableImplicitNETCorePlatformsReference>true</DisableImplicitNETCorePlatformsReference>
-    <RestoreSources>
-      $(RestoreSources);
-      https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json
-    </RestoreSources>
+    <!-- Semi-colon delimited list of commands that are executed before every test.-->
+    <HelixPreCommands>$(HelixPreCommands); powershell %HELIX_CORRELATION_PAYLOAD%\configure-helix-machine.ps1;</HelixPreCommands>
   </PropertyGroup>
 
   <ItemGroup>
-    <!--<PackageReference Include="QV.Wpf.Test" Version="1.0.0" /> -->
+    <!--<PackageReference Include="Microsoft.DotNet.Wpf.DncEng.Test" Version="1.0.0" /> -->
     <HelixCorrelationPayload Include="..\..\HelixPayload\$(Configuration)\$(Platform)" /> 
     <HelixWorkItem Include="HelloHelix">
       <Timeout>00:20:00</Timeout>
-      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd</Command>
     </HelixWorkItem>
-    <!--<HelixWorkItem Include="Ping stevenki">
-      <Timeout>00:20:00</Timeout>
-      <Command>ping \\stevenki1\public</Command>
-    </HelixWorkItem>
-    -->
    <!-- 
    <HelixWorkItem Include="Annotations">
       <Timeout>00:20:00</Timeout>
diff --git a/eng/helix/helixrun.cmd b/eng/helix/helixrun.cmd
new file mode 100644
index 00000000000..1dd2d3d4e98
--- /dev/null
+++ b/eng/helix/helixrun.cmd
@@ -0,0 +1,12 @@
+@echo off
+setlocal ENABLEDELAYEDEXPANSION
+
+REM Run the tests
+dotnet --info
+
+REM We can use %HELIX_PYTHONPATH% %HELIX_SCRIPT_ROOT%\upload_result.py to upload any QV specific logs and/or screenshots that we are interested in.
+REM For example: %HELIX_PYTHONPATH% %HELIX_SCRIPT_ROOT%\upload_result.py -result screenshot.jpg -result_name screenshot.jpg
+REM Then, links to these artifacts can then be included in the xUnit logs.
+
+REM Need to copy the xUnit log to a known location that helix can understand
+REM copy Test\Drts\testResults.xml ..\testResults.xml
\ No newline at end of file
diff --git a/eng/helix/prepare-helix-payload.ps1 b/eng/helix/prepare-helix-payload.ps1
index 8339d9a6782..ea2d9aed842 100644
--- a/eng/helix/prepare-helix-payload.ps1
+++ b/eng/helix/prepare-helix-payload.ps1
@@ -37,7 +37,7 @@ function CopyFolderStructure($from, $to)
 }
 
 # Copy files from nuget packages
-$testNugetLocation = Join-Path $nugetPackagesDir "qv.wpf.test\1.0.0\tools\win-$platform\"
+$testNugetLocation = Join-Path $nugetPackagesDir "Microsoft.DotNet.Wpf.DncEng.Test\1.0.0\tools\win-$platform\"
 $testPayloadLocation = Join-Path $payloadDir "Test"
 CopyFolderStructure $testNugetLocation $testPayloadLocation
 
@@ -48,4 +48,4 @@ CopyFolderStructure $localDotnetInstall $dotnetPayloadLocation
 
 # Copy scripts
 Copy-Item "eng\helix\configure-helix-machine.ps1" $payloadDir
-Copy-Item "eng\helix\runtests.cmd" $payloadDir
\ No newline at end of file
+Copy-Item "eng\helix\helixrun.cmd" $payloadDir
\ No newline at end of file
diff --git a/eng/helix/runtests.cmd b/eng/helix/runtests.cmd
deleted file mode 100644
index ef3923df0df..00000000000
--- a/eng/helix/runtests.cmd
+++ /dev/null
@@ -1,5 +0,0 @@
-@echo off
-powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0configure-helix-machine.ps1""" "
-exit /b %ErrorLevel%
-
-dotnet --info
\ No newline at end of file

From 5421acf0f3389db992727465da9983e41ac7cca4 Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Thu, 2 May 2019 16:38:22 -0700
Subject: [PATCH 43/72] Add target queues

---
 eng/helix/configure-helix-machine.ps1 |  8 ++---
 eng/helix/helixpublish.proj           | 49 ++++++++++++++-------------
 eng/helix/helixrun.cmd                |  1 +
 3 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/eng/helix/configure-helix-machine.ps1 b/eng/helix/configure-helix-machine.ps1
index 4074e20679f..ac8d4f5f3de 100644
--- a/eng/helix/configure-helix-machine.ps1
+++ b/eng/helix/configure-helix-machine.ps1
@@ -5,13 +5,13 @@ $dotnetLocation = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.P
 Write-Output "Adding dotnet location to path: $dotnetLocation"
 
 # Prepend the path to ensure that dotnet.exe is called from there.
-[System.Environment]::SetEnvironmentVariable("PATH", "$dotnetLocation;$env:path", [System.EnvironmentVariableTarget]::User)
+$env:path="$dotnetLocation;$env:path"
 
 # Don't look outside the TestHost to resolve best match SDKs.
-[System.Environment]::SetEnvironmentVariable("DOTNET_MULTILEVEL_LOOKUP", "0", [System.EnvironmentVariableTarget]::User)
+$env:DOTNET_MULTILEVEL_LOOKUP = 0
 
 # Disable first run since we do not need all ASP.NET packages restored.
-[System.Environment]::SetEnvironmentVariable("DOTNET_SKIP_FIRST_TIME_EXPERIENCE", "1", [System.EnvironmentVariableTarget]::User)
+$env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
 
 # Ensure that the dotnet installed at our dotnetLocation is used
-[System.Environment]::SetEnvironmentVariable("DOTNET_SKIP_FIRST_TIME_EXPERIENCE", "$dotnetLocation", [System.EnvironmentVariableTarget]::User)
+$env:DOTNET_ROOT=$dotnetLocation
\ No newline at end of file
diff --git a/eng/helix/helixpublish.proj b/eng/helix/helixpublish.proj
index 4cf69645c6d..4bc641568af 100644
--- a/eng/helix/helixpublish.proj
+++ b/eng/helix/helixpublish.proj
@@ -17,7 +17,10 @@
     <FailOnMissionControlTestFailure>true</FailOnMissionControlTestFailure>
 
     <!-- Semi-colon delimited list of commands that are executed before every test.-->
-    <HelixPreCommands>$(HelixPreCommands); powershell %HELIX_CORRELATION_PAYLOAD%\configure-helix-machine.ps1;</HelixPreCommands>
+    <HelixPreCommands>$(HelixPreCommands);</HelixPreCommands>
+
+    <!-- These are the list of Windows versions that we run tests on-->
+    <HelixTargetQueues>Windows.10.Amd64.Open;Windows.7.Amd64.Open;Windows.10.Amd64.ServerRS5.Open</HelixTargetQueues>
   </PropertyGroup>
 
   <ItemGroup>
@@ -30,91 +33,91 @@
    <!-- 
    <HelixWorkItem Include="Annotations">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=Annotations</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=Annotations</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="AppModel">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=AppModel</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=AppModel</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="DigitalDocuments">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=DigitalDocuments</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=DigitalDocuments</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Media">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=Media</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=Media</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Editing">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=Editing</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=Editing</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="ElementServices">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=ElementServices</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=ElementServices</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Text">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=Text</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=Text</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Animation">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=Animation</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=Animation</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="3D">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=3D</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=3D</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="2D">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=2D</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=2D</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Controls">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=Controls</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=Controls</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Imaging">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=Imaging</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=Imaging</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="FlowLayout">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=FlowLayout</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=FlowLayout</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="DataServices">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=DataServices</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=DataServices</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="ElementLayout">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=ElementLayout</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=ElementLayout</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Xaml">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=Xaml</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=Xaml</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Globalization">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=Globalization</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=Globalization</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Tablet">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=Tablet</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=Tablet</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Integration">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=Integration</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=Integration</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="XET">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=XET</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=XET</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Printing">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=Printing</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=Printing</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="WindowsFormsIntegration">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\rundrts.cmd /Area=WindowsFormsIntegration</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=WindowsFormsIntegration</Command>
     </HelixWorkItem>
     -->
   </ItemGroup>
diff --git a/eng/helix/helixrun.cmd b/eng/helix/helixrun.cmd
index 1dd2d3d4e98..de4ef5db581 100644
--- a/eng/helix/helixrun.cmd
+++ b/eng/helix/helixrun.cmd
@@ -1,5 +1,6 @@
 @echo off
 setlocal ENABLEDELAYEDEXPANSION
+powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0configure-helix-machine.ps1""" "
 
 REM Run the tests
 dotnet --info

From 070f0d5426dc743a2861593cda4e51845fdfb595 Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Thu, 2 May 2019 20:53:29 -0700
Subject: [PATCH 44/72] run test in powershell script

---
 eng/helix/helixpublish.proj         | 48 ++++++++++++++---------------
 eng/helix/helixrun.cmd              | 13 --------
 eng/helix/prepare-helix-payload.ps1 |  2 +-
 eng/helix/runtests.ps1              | 13 ++++++++
 4 files changed, 38 insertions(+), 38 deletions(-)
 delete mode 100644 eng/helix/helixrun.cmd
 create mode 100644 eng/helix/runtests.ps1

diff --git a/eng/helix/helixpublish.proj b/eng/helix/helixpublish.proj
index 4bc641568af..75037efd768 100644
--- a/eng/helix/helixpublish.proj
+++ b/eng/helix/helixpublish.proj
@@ -28,96 +28,96 @@
     <HelixCorrelationPayload Include="..\..\HelixPayload\$(Configuration)\$(Platform)" /> 
     <HelixWorkItem Include="HelloHelix">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd</Command>
+      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1"</Command>
     </HelixWorkItem>
    <!-- 
    <HelixWorkItem Include="Annotations">
-      <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=Annotations</Command>
+      <Timeout>00:20:00</Timeout> 
+      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=Annotations"</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="AppModel">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=AppModel</Command>
+      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=AppModel"</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="DigitalDocuments">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=DigitalDocuments</Command>
+      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=DigitalDocuments"</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Media">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=Media</Command>
+      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=Media"</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Editing">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=Editing</Command>
+      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=Editing"</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="ElementServices">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=ElementServices</Command>
+      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=ElementServices"</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Text">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=Text</Command>
+      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=Text"</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Animation">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=Animation</Command>
+      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=Animation"</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="3D">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=3D</Command>
+      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=3D"</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="2D">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=2D</Command>
+      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=2D"</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Controls">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=Controls</Command>
+      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=Controls"</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Imaging">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=Imaging</Command>
+      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=Imaging"</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="FlowLayout">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=FlowLayout</Command>
+      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=FlowLayout"</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="DataServices">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=DataServices</Command>
+      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=DataServices"</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="ElementLayout">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=ElementLayout</Command>
+      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=ElementLayout"</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Xaml">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=Xaml</Command>
+      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=Xaml"</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Globalization">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=Globalization</Command>
+      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=Globalization"</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Tablet">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=Tablet</Command>
+      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=Tablet"</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Integration">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=Integration</Command>
+      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=Integration"</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="XET">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=XET</Command>
+      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=XET"</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Printing">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=Printing</Command>
+      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=Printing"</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="WindowsFormsIntegration">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\helixrun.cmd /Area=WindowsFormsIntegration</Command>
+      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=WindowsFormsIntegration"</Command>
     </HelixWorkItem>
     -->
   </ItemGroup>
diff --git a/eng/helix/helixrun.cmd b/eng/helix/helixrun.cmd
deleted file mode 100644
index de4ef5db581..00000000000
--- a/eng/helix/helixrun.cmd
+++ /dev/null
@@ -1,13 +0,0 @@
-@echo off
-setlocal ENABLEDELAYEDEXPANSION
-powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0configure-helix-machine.ps1""" "
-
-REM Run the tests
-dotnet --info
-
-REM We can use %HELIX_PYTHONPATH% %HELIX_SCRIPT_ROOT%\upload_result.py to upload any QV specific logs and/or screenshots that we are interested in.
-REM For example: %HELIX_PYTHONPATH% %HELIX_SCRIPT_ROOT%\upload_result.py -result screenshot.jpg -result_name screenshot.jpg
-REM Then, links to these artifacts can then be included in the xUnit logs.
-
-REM Need to copy the xUnit log to a known location that helix can understand
-REM copy Test\Drts\testResults.xml ..\testResults.xml
\ No newline at end of file
diff --git a/eng/helix/prepare-helix-payload.ps1 b/eng/helix/prepare-helix-payload.ps1
index ea2d9aed842..675a95ddb74 100644
--- a/eng/helix/prepare-helix-payload.ps1
+++ b/eng/helix/prepare-helix-payload.ps1
@@ -48,4 +48,4 @@ CopyFolderStructure $localDotnetInstall $dotnetPayloadLocation
 
 # Copy scripts
 Copy-Item "eng\helix\configure-helix-machine.ps1" $payloadDir
-Copy-Item "eng\helix\helixrun.cmd" $payloadDir
\ No newline at end of file
+Copy-Item "eng\helix\runtests.ps1" $payloadDir
\ No newline at end of file
diff --git a/eng/helix/runtests.ps1 b/eng/helix/runtests.ps1
new file mode 100644
index 00000000000..29ec11c15e3
--- /dev/null
+++ b/eng/helix/runtests.ps1
@@ -0,0 +1,13 @@
+
+# Configure the machine before running tests
+& "$PSScriptRoot\configure-helix-machine.ps1"
+
+# Run the tests
+dotnet --info
+
+# We can use $env:HELIX_PYTHONPATH $env:HELIX_SCRIPT_ROOT\upload_result.py to upload any QV specific logs and/or screenshots that we are interested in.
+# For example: $env:HELIX_PYTHONPATH $env:HELIX_SCRIPT_ROOT%\upload_result.py -result screenshot.jpg -result_name screenshot.jpg
+# Then, links to these artifacts can then be included in the xUnit logs.
+
+# Need to copy the xUnit log to a known location that helix can understand
+# Copy-Item .\Test\Drts\testResults.xml ..\testResults.xml
\ No newline at end of file

From 847d4ef85c428e3bfd7e5971b9b38687e464ce5f Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Fri, 3 May 2019 10:05:52 -0700
Subject: [PATCH 45/72] updating dependencies and removing workaround

---
 eng/Build.props         | 8 --------
 eng/Version.Details.xml | 4 ++--
 2 files changed, 2 insertions(+), 10 deletions(-)
 delete mode 100644 eng/Build.props

diff --git a/eng/Build.props b/eng/Build.props
deleted file mode 100644
index da83de21674..00000000000
--- a/eng/Build.props
+++ /dev/null
@@ -1,8 +0,0 @@
-<Project>
-    <!-- Workarounds for Arcade bug: https://github.com/dotnet/arcade/issues/2641 -->
-    <PropertyGroup Condition="'$(_HelixSource)'!=''">
-        <_NuGetRestoreTargets>$(MSBuildToolsPath32)\..\..\..\Common7\IDE\CommonExtensions\Microsoft\NuGet\NuGet.targets</_NuGetRestoreTargets>
-        <NuGetRestoreTargets>true</NuGetRestoreTargets>
-        <DisableImplicitNETCorePlatformsReference>true</DisableImplicitNETCorePlatformsReference>
-    </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index ad1eac1f472..7967f760a08 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -95,9 +95,9 @@
       <Uri>https://github.com/dotnet/coreclr</Uri>
       <Sha>10df20ed3ff0208b3f16f79d5062662a8827f579</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19222.2">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19253.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>851e36df83d3361e4bd8a70a2a8a89f762469f9a</Sha>
+      <Sha>e31dd0f6fd12a136a2310a308d235c360703b221</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>

From b21ed79f0d30d8428acea6c7e9385632c2f66f01 Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Fri, 3 May 2019 10:46:37 -0700
Subject: [PATCH 46/72] adding documentation

---
 Documentation/developer-guide.md  |  1 +
 Documentation/testing-in-helix.md | 13 +++++++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 Documentation/testing-in-helix.md

diff --git a/Documentation/developer-guide.md b/Documentation/developer-guide.md
index 5ad54ab8041..b8386a38cc3 100644
--- a/Documentation/developer-guide.md
+++ b/Documentation/developer-guide.md
@@ -162,3 +162,4 @@ Follow the steps defined [here](https://github.com/dotnet/arcade/blob/master/Doc
 * [up-for-grabs WPF issues](https://github.com/dotnet/wpf/issues?q=is%3Aopen+is%3Aissue+label%3Aup-for-grabs)
 * [easy WPF issues](https://github.com/dotnet/wpf/issues?utf8=%E2%9C%93&q=is%3Aopen+is%3Aissue+label%3Aeasy)
 * [Code generation in dotnet/wpf](codegen.md)
+* [Testing in Helix](testing-in-helix.md)
diff --git a/Documentation/testing-in-helix.md b/Documentation/testing-in-helix.md
new file mode 100644
index 00000000000..5cbd402f7ad
--- /dev/null
+++ b/Documentation/testing-in-helix.md
@@ -0,0 +1,13 @@
+# Testing in Helix
+
+I'd recommend seeing the official Helix [readme](https://github.com/dotnet/arcade/blob/master/src/Microsoft.DotNet.Helix/Sdk/Readme.md) if you are interested in some of the general Helix concepts. I'll briefly outline what we are doing that is a bit unique:
+
+1. Helix has built-in support for running xUnit tests. Since we are not using xUnit, we have to manually setup our machines so that they work with QualityVault and STI.
+We manually restore the helixpublish.proj project during CI builds; this is done in `pipeline.yml`. This allows us to package reference the `Microsoft.DotNet.Wpf.DncEng.Test` package to pull down the binaries that we need. We can extract them into a local folder using the MSBuild property `RestorePackagesPath`, so that when the project is restored, we know the exact relative location of the packages.
+2. We need to create a "TestHost" installation of dotnet on the Helix machine. The default Helix support for installing dotnet only installs version 2.x, and only installs the `Microsoft.NETCore.App` runtime, and not the M`icrosoft.WindowsDesktop.App` or `Microsoft.AspNetCore.App` runtimes. I opted to doing this manually and copy it out of the `.dotnet` folder that gets created as part of ci builds, rather than running an installer on the Helix machine. I figured reducing the number of dependencies on making external network calls and downloading items from the internet the better.
+3. We copy both the nuget packages we care care about and the dotnet install in the `prepare-helix-payload.ps1` script. This gets invoked before we actually run tests in the `pipeline-yml` file located in the `eng` directory. Helix allows you to specify a `HelixCorrelationPayload` directory, where this directory gets deployed to the Helix machine, and is made available in your various helix commands with the `HELIX_CORRELATION_PAYLOAD` environment variable.
+4. Helix and Azure Pipelines can report xUnit logs, so we will be updating QualityVault to produce an xUnit compatible log. We will then need to copy that log to a known location for it to be picked up.
+
+## How we are running tests
+1. Currently, the `HelixQueues` that we selected are Windows.10.Amd64.Open;Windows.7.Amd64.Open;Windows.10.Amd64.ServerRS5.Open. Essentially, this translates to: "Latest Windows 10", "Windows 7", and "Windows 10 RS5 Server" addition. This enables tests to run on some of the most interesting and important SKUs, without overloading the Helix servers and/or making CI runs take an unnecessarily long time to run.
+2. In similar vain, we only run test passes for Release builds, mainly to save time and resources running duplicate tests in a near-identical environment.
\ No newline at end of file

From 2e6ea44ea23d0c45c038a53be6a4a889e0989b94 Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Fri, 3 May 2019 10:59:08 -0700
Subject: [PATCH 47/72] reverting dependency update

---
 eng/Version.Details.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 7967f760a08..ad1eac1f472 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -95,9 +95,9 @@
       <Uri>https://github.com/dotnet/coreclr</Uri>
       <Sha>10df20ed3ff0208b3f16f79d5062662a8827f579</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19253.2">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19222.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>e31dd0f6fd12a136a2310a308d235c360703b221</Sha>
+      <Sha>851e36df83d3361e4bd8a70a2a8a89f762469f9a</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>

From 56087eed4479857d79ff13e2f0c35ce3c0cb8626 Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Fri, 10 May 2019 15:52:53 -0700
Subject: [PATCH 48/72] switching back to true DrtXaml

---
 .../test/Common/DRT/dirs.proj                 |   19 +
 .../test/Common/Directory.Build.props         |    6 +
 .../test/Common/TestServices/DrtBase.cs       |    5 -
 .../test/Common/keys/TestTrusted.snk          |  Bin 0 -> 596 bytes
 .../test/Common/keys/TestUntrusted.snk        |  Bin 0 -> 596 bytes
 src/Microsoft.DotNet.Wpf/test/DRT.Build.props |    5 +
 .../test/DRT/Directory.Build.props            |    6 +
 .../BamlAvoidXmlTest/BamlAvoidXmlTest.csproj  |   10 +-
 .../BamlTestClasses40/BCMarkupExtension.cs    |    3 -
 .../test/DRT/DrtXaml/Directory.Build.props    |    4 +
 .../test/DRT/DrtXaml/DrtXaml/DrtXamlBase.cs   |   77 --
 .../XamlTestClasses.FriendWithKey.csproj      |   12 +
 .../XamlTestClasses.FriendWithoutKey.csproj   |   13 +
 .../DrtXaml.PartialTrustTests.csproj          |   20 +
 .../XamlTestClasses/XamlTestClasses.csproj    |    2 +-
 .../test/DRT/DrtXaml/dirs.proj                |   18 +
 .../test/Directory.Build.props                |   59 +-
 .../test/Directory.Build.targets              |    6 +
 src/Microsoft.DotNet.Wpf/test/Publish.props   |   12 +
 .../test/PublishAfterBuild.targets            |   11 +
 .../test/SourceLocations.props                | 1072 +++++++++++++++++
 .../test/StrongName.props                     |   17 +
 .../test/StrongName.targets                   |   12 +
 23 files changed, 1293 insertions(+), 96 deletions(-)
 create mode 100644 src/Microsoft.DotNet.Wpf/test/Common/DRT/dirs.proj
 create mode 100644 src/Microsoft.DotNet.Wpf/test/Common/Directory.Build.props
 create mode 100644 src/Microsoft.DotNet.Wpf/test/Common/keys/TestTrusted.snk
 create mode 100644 src/Microsoft.DotNet.Wpf/test/Common/keys/TestUntrusted.snk
 create mode 100644 src/Microsoft.DotNet.Wpf/test/DRT.Build.props
 create mode 100644 src/Microsoft.DotNet.Wpf/test/DRT/Directory.Build.props
 create mode 100644 src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/Directory.Build.props
 create mode 100644 src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/FriendWithKey/XamlTestClasses.FriendWithKey.csproj
 create mode 100644 src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/FriendWithoutKey/XamlTestClasses.FriendWithoutKey.csproj
 create mode 100644 src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/PartialTrustTests/DrtXaml.PartialTrustTests.csproj
 create mode 100644 src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/dirs.proj
 create mode 100644 src/Microsoft.DotNet.Wpf/test/Directory.Build.targets
 create mode 100644 src/Microsoft.DotNet.Wpf/test/Publish.props
 create mode 100644 src/Microsoft.DotNet.Wpf/test/PublishAfterBuild.targets
 create mode 100644 src/Microsoft.DotNet.Wpf/test/SourceLocations.props
 create mode 100644 src/Microsoft.DotNet.Wpf/test/StrongName.props
 create mode 100644 src/Microsoft.DotNet.Wpf/test/StrongName.targets

diff --git a/src/Microsoft.DotNet.Wpf/test/Common/DRT/dirs.proj b/src/Microsoft.DotNet.Wpf/test/Common/DRT/dirs.proj
new file mode 100644
index 00000000000..72dcacf30b3
--- /dev/null
+++ b/src/Microsoft.DotNet.Wpf/test/Common/DRT/dirs.proj
@@ -0,0 +1,19 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Project="$(_NTDRIVE)$(_NTROOT)\wpf\test\Microsoft.Wpf.Test.Native.Settings.Targets" />
+
+
+  <ItemGroup Condition="'$(BuildExePhase)' == '' ">
+
+    <ProjectFile Include="TestServices\TestServices.csproj" />
+    <ProjectFile Include="WPFSetup\wpfSetup.csproj" />
+    <ProjectFile Include="Tools\DrtTools.csproj" />
+
+    <!-- Broken for 3.5 Build in recent Dev11 WPF migration.  Since DRTs are NEVER run in 3.X, disable there -->
+    <ProjectFile Include="rundrt\rundrts.nativeproj" Condition="'$(WPF_TESTBUILD_TARGETVERSION)' != 'v3.5' AND '$(WPF_TESTBUILD_TARGETVERSION)' != 'v3.0'"/>
+
+  </ItemGroup>
+
+  <Import Project="$(_NTDRIVE)$(_NTROOT)\tools\Microsoft.DevDiv.Traversal.targets" />
+
+</Project>
diff --git a/src/Microsoft.DotNet.Wpf/test/Common/Directory.Build.props b/src/Microsoft.DotNet.Wpf/test/Common/Directory.Build.props
new file mode 100644
index 00000000000..7e783514db2
--- /dev/null
+++ b/src/Microsoft.DotNet.Wpf/test/Common/Directory.Build.props
@@ -0,0 +1,6 @@
+<Project>
+  <Import Condition="Exists('../Directory.Build.props')" Project="../Directory.Build.props" />
+  <PropertyGroup>
+    <PublishDir>$(WpfTestBasePublishPath)\Common</PublishDir>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Wpf/test/Common/TestServices/DrtBase.cs b/src/Microsoft.DotNet.Wpf/test/Common/TestServices/DrtBase.cs
index 59d384c5013..37bd98942c6 100644
--- a/src/Microsoft.DotNet.Wpf/test/Common/TestServices/DrtBase.cs
+++ b/src/Microsoft.DotNet.Wpf/test/Common/TestServices/DrtBase.cs
@@ -22,7 +22,6 @@
 using System.Text;
 
 using Microsoft.Win32;
-using Xunit.Abstractions;
 using MS.Internal;
 
 /************************************************************************
@@ -422,7 +421,6 @@ protected virtual bool HandleCommandLineArgument(string arg, bool option, string
                     case "help":
                         PrintUsage();
 
-                        Xunit.Assert.True(true);
                         Environment.Exit(0);
                         break;
 
@@ -1138,7 +1136,6 @@ public void Assert(bool cond, string message, params object[] arg)
 
                 // Write any delayed output for debugging purposes
                 WriteDelayedOutput();
-                Xunit.Assert.True(cond, s);
 
                 if (_loudAsserts)
                 {
@@ -2051,7 +2048,6 @@ void RunNextTest()
                         _testIndex++;
                     }
 
-                    Xunit.Assert.False(aborting);
 
                     // Schedule the next test.
                     // Special situation: The current test may have called Suspend() and then
@@ -2099,7 +2095,6 @@ private void ReportException(object o)
 
             ReportDrtInfo();
 
-            Xunit.Assert.True(_retcode == 0);
             Environment.Exit(_retcode);
         }
 
diff --git a/src/Microsoft.DotNet.Wpf/test/Common/keys/TestTrusted.snk b/src/Microsoft.DotNet.Wpf/test/Common/keys/TestTrusted.snk
new file mode 100644
index 0000000000000000000000000000000000000000..425dc4d7c7b74af91147890c2c856ee5e3a457b5
GIT binary patch
literal 596
zcmV-a0;~N80ssI2Bme+XQ$aES1ONa50097h+Xr;b{``olreQNO<-QW38`CP=elD#{
z1f2iOVubpaT-93wk#mAam`wci2T5?mOdX<|2Ot{{ko$WqVA7@p#H*?M!3M287&zM0
zmUs&eMHtXU{&2+JPL^XeNr}&zE>D`>LBH>ULw%!MiyRsaZLGB+MQls4i>;!*bO*x?
z-<x|FP}|CK&|y9_frm(uCscy3!1EMf!2Np-WtgOv2(`ei#{3VlytPRIghx*4_7Oeb
z1j6Q2O_P}X%S-FKVMtbxmPk!3Bb(m)6G&%tMoU@646(GyDTeU9M2CFJ{xYoCT13c9
z)Vh+inJ)4t>ZT!EJnN1o04^45o-ow$iKKx<%b7#VJuo`O*}9wM?waJmD$Fr(%Q0))
z4@9WjxvBK;>;E<njfe}L9JpPLO=bO0tcm?iZy*AevOt<AQe2645!|a9q__L}|B-F-
z)De$-jH3kPqpixHTp#thZ||gT0W%yWon}`YTlUuz$8elrnN+cPy#Dyu<6t9;ZhOeU
z@-~o+k>nL8w%^)}u&d0H8y1F&-4*@5&sNR%ghvl%*)kq3)B>+#U=jbs2V|#Trv)<q
znSbJ<-FO>;Tgx#BS`SQ$#&t6!4)PXAJYvnK)T%gSX4Xo-H`n!CT)S7kEqTm?_?}^X
zJDZ|h<FmW!ESNPZ#fKU?rTv9kc}sPG4xQ3d%fgn>;dEe9W4t%dt2UJ3TlGjuXjLXK
i<jZ2=39|pS{JNEB+BNe~zYkSaL<N*?&T_(2H(qt7eJ3RV

literal 0
HcmV?d00001

diff --git a/src/Microsoft.DotNet.Wpf/test/Common/keys/TestUntrusted.snk b/src/Microsoft.DotNet.Wpf/test/Common/keys/TestUntrusted.snk
new file mode 100644
index 0000000000000000000000000000000000000000..b36f71bca81fc21b4e98af110794c646097405eb
GIT binary patch
literal 596
zcmV-a0;~N80ssI2Bme+XQ$aES1ONa50098OyxF&eOw(5-u@iz8?OqS7kw$jafQAom
z2po(KgSjn(U;5{7sc83OeoJmL*MIID2tbI==Qhq*on@^Lrf&#rFJE<9Zz&1Ud}KRC
z$10F&s>T<;)^w4m{N+c4%9t^F>L|ceMMnRTBlh`DS$RJwbVGZ?(Ke(2mC*TM=BA{b
zEF|Gv%>7a>On-1vKUNU+)v^?qTZkdYS>|vVrpckXVSwhwH`$D{T;=}-`<_*6pTz6S
zla(S_@?`a3cyZNr?bQF)bhR69cAMP!vb5CG|FWbqYE4873?Yib>(5m{c5^a512o=S
zespg_F-va8{NBnY<J7`Cy?#lm2z$kS{0lUgoL&AL|3r{bzXC;3afewR=0s#}r?u9h
zIB9M2gH^e&p2vGd+^S&;T_|SC{-T`q8@$(`v&aaO@e&3Rk<l{Iuq`6-ev5?~mQ451
zzW{BMRvQ*1qxZ*b(Q@Cj?|gx$MT6Z@?X^TDDc@>CF%u9R&*>&N)5$g3Zw<YOFDKM;
zX9=h4(($M1M2tIlgOz(MYmnGc&gfDWykcFFVKH@7VlH2sC`7xgjeJ90?bZ&b<#HC(
z#N+}uGafP_{Np9e@vhS=u!fm838!XKLa)-RO128&a8P@veo94MLghI-VpK>Vl<b;r
z5czRe8G#oMN!r2ilfuXl_{G;*P}ED9+}S?A|JLVPu&5yvy=}Pgb%U?*eD%5JFdrAa
ildD3R1jvE4=eCwhx#_OQ`Ju-FrH9TXQCrr0yzgPHh$(si

literal 0
HcmV?d00001

diff --git a/src/Microsoft.DotNet.Wpf/test/DRT.Build.props b/src/Microsoft.DotNet.Wpf/test/DRT.Build.props
new file mode 100644
index 00000000000..de0b61a8185
--- /dev/null
+++ b/src/Microsoft.DotNet.Wpf/test/DRT.Build.props
@@ -0,0 +1,5 @@
+<Project>
+  <PropertyGroup>
+    <PublishDir>$(WpfDrtTestBasePublishPath)</PublishDir>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/Directory.Build.props b/src/Microsoft.DotNet.Wpf/test/DRT/Directory.Build.props
new file mode 100644
index 00000000000..7e783514db2
--- /dev/null
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/Directory.Build.props
@@ -0,0 +1,6 @@
+<Project>
+  <Import Condition="Exists('../Directory.Build.props')" Project="../Directory.Build.props" />
+  <PropertyGroup>
+    <PublishDir>$(WpfTestBasePublishPath)\Common</PublishDir>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlAvoidXmlTest/BamlAvoidXmlTest.csproj b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlAvoidXmlTest/BamlAvoidXmlTest.csproj
index e5778ec5e8f..288c956924a 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlAvoidXmlTest/BamlAvoidXmlTest.csproj
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlAvoidXmlTest/BamlAvoidXmlTest.csproj
@@ -1,6 +1,13 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyName>BamlAvoidXmlTest</AssemblyName>
+    <LinkSubsystem>console</LinkSubsystem>
+    <AssemblyIdentityVersionName>WCP</AssemblyIdentityVersionName>
+    <GenerateAssemblyAttribute>false</GenerateAssemblyAttribute>
+    <AddTargetFrameworkAttributeToWpfTestExe>true</AddTargetFrameworkAttributeToWpfTestExe>
+
+    <!-- Avoid auto-generating a main -->
+    <InternalMarkupCompilation>true</InternalMarkupCompilation>
     <RootNamespace>BamlAvoidXmlTest</RootNamespace>
     <Platforms>AnyCPU;x64</Platforms>
   </PropertyGroup>
@@ -12,6 +19,7 @@
 
   <ItemGroup>
     <Folder Include="Properties\" />
+    <Compile Include="BamlAvoidXmlTest.cs" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlTestClasses40/BCMarkupExtension.cs b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlTestClasses40/BCMarkupExtension.cs
index 90e3c53b5bc..d0f514bfc81 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlTestClasses40/BCMarkupExtension.cs
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlTestClasses40/BCMarkupExtension.cs
@@ -32,7 +32,6 @@ public override object ProvideValue(
         {
             return string.Format("Path: {0} , Mode: {1}", Path, Mode);
         }
-        [CLSCompliant(false)]
         [MarkupExtensionBracketCharacters('(',')')]
         [MarkupExtensionBracketCharacters('[',']')]
         [ConstructorArgument("value")]
@@ -44,7 +43,6 @@ public string Path
             set { _value = value; }
         }
 
-        [CLSCompliant(false)]
         [ConstructorArgument("value2")]
         [MarkupExtensionBracketCharacters('$','^')]
 #pragma warning disable CS3021 // Type or member does not need a CLSCompliant attribute because the assembly does not have a CLSCompliant attribute
@@ -71,7 +69,6 @@ public override object ProvideValue(
             return Path;
         }
 
-        [CLSCompliant(false)]
         [MarkupExtensionBracketCharacters('[',']')]
         [MarkupExtensionBracketCharacters('(', ')')]
 #pragma warning disable CS3021 // Type or member does not need a CLSCompliant attribute because the assembly does not have a CLSCompliant attribute
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/Directory.Build.props b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/Directory.Build.props
new file mode 100644
index 00000000000..319f7c13864
--- /dev/null
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/Directory.Build.props
@@ -0,0 +1,4 @@
+<Project>
+  <Import Condition="Exists('../Directory.Build.props')" Project="../Directory.Build.props" />
+  <Import Condition="Exists('$(WpfTestBasePath)/DRT.Build.props')" Project="$(WpfTestBasePath)/DRT.Build.props" />
+</Project>
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/DrtXamlBase.cs b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/DrtXamlBase.cs
index 71b3191ccef..2feeead35e0 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/DrtXamlBase.cs
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/DrtXamlBase.cs
@@ -12,86 +12,9 @@
 using System.IO;
 using DrtXaml.XamlTestFramework;
 using System.Xml;
-using Xunit;
-using Xunit.Abstractions;
-using System.Threading.Tasks;
-using System.Threading;
 
 namespace DrtXaml
 {
-    public class TestFrontEnd
-    {
-        public TestFrontEnd(ITestOutputHelper testOutputHelper)
-        {
-            _testOutputHelper = testOutputHelper;
-        }
-
-        [Theory]
-        [InlineData("ValueSerializerSerializationTests")]
-        [InlineData("ValueSerializerDeserializationAndRoundtripTest")]
-        [InlineData("NameReferenceTests")]
-        [InlineData("AdvXamlFeatureTests")]
-        [InlineData("AttachablePropertyServicesTests")]
-        [InlineData("AvoidSystemXmlTest")]
-        [InlineData("BamlTests")]
-        [InlineData("BasicXamlTests")]
-        [InlineData("CollectionTests")]
-        [InlineData("EventTests")]
-        [InlineData("FactoryArgumentTests")]
-        [InlineData("LoadPermissionTests")]
-        [InlineData("MarkupExtensionTests")]
-        [InlineData("NodeStreamTests")]
-        [InlineData("ObjectReaderTests")]
-        [InlineData("ObjectWriterBasicTests")]
-        [InlineData("SavedContextTests")]
-        [InlineData("SchemaTests")]
-        [InlineData("SubreaderTests")]
-        [InlineData("TypeArgumentTests")]
-        [InlineData("WpfUsageTests")]
-        [InlineData("XamlMarkupExtensionWriterTests")]
-        [InlineData("XamlXmlWriterTests")]
-        [InlineData("XamlXmlReaderTests")]
-        [InlineData("XamlTemplateTests")]
-        [InlineData("XamlServicesTests")]
-        public async Task RunSuite(params string[] data)
-        {
-            string[] switches = new[] { "-verbose", "-catchexceptions", "-quietasserts" };
-
-            var args = new List<string>(switches);
-            foreach (var arg in data)
-            {
-                if (!arg.StartsWith("-"))
-                {
-                    args.Add("-suite");
-                }
-                args.Add(arg);
-            }
-
-            await StartSTATask(() => new XamlDrt(_testOutputHelper).RunTests(args.ToArray()));
-        }
-
-        private static Task StartSTATask(Action action)
-        {
-            var tcs = new TaskCompletionSource<object>();
-            var thread = new Thread(() =>
-            {
-                try
-                {
-                    action();
-                    tcs.SetResult(new object());
-                }
-                catch (Exception e)
-                {
-                    tcs.SetException(e);
-                }
-            });
-            thread.SetApartmentState(ApartmentState.STA);
-            thread.Start();
-            return tcs.Task;
-        }
-
-        private ITestOutputHelper _testOutputHelper;
-    }
     public sealed class XamlDrt : DrtBase
     {
         public void RunTests(params string[] args)
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/FriendWithKey/XamlTestClasses.FriendWithKey.csproj b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/FriendWithKey/XamlTestClasses.FriendWithKey.csproj
new file mode 100644
index 00000000000..0d96d982242
--- /dev/null
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/FriendWithKey/XamlTestClasses.FriendWithKey.csproj
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+    <PropertyGroup>
+    <AssemblyName>XamlTestClasses.FriendWithKey</AssemblyName>
+    <OutputType>Library</OutputType>
+    <DefineConstants>$(DefineConstants);OLDRESOURCES</DefineConstants>
+    <TestCode>true</TestCode>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="FriendWithKey.cs" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/FriendWithoutKey/XamlTestClasses.FriendWithoutKey.csproj b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/FriendWithoutKey/XamlTestClasses.FriendWithoutKey.csproj
new file mode 100644
index 00000000000..b3ad111fa7f
--- /dev/null
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/FriendWithoutKey/XamlTestClasses.FriendWithoutKey.csproj
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+    <PropertyGroup>
+    <AssemblyName>XamlTestClasses.FriendWithoutKey</AssemblyName>
+    <OutputType>Library</OutputType>
+    <DefineConstants>$(DefineConstants);OLDRESOURCES</DefineConstants>
+    <TestCode>true</TestCode>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <SignAssembly>false</SignAssembly>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="FriendWithoutKey.cs" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/PartialTrustTests/DrtXaml.PartialTrustTests.csproj b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/PartialTrustTests/DrtXaml.PartialTrustTests.csproj
new file mode 100644
index 00000000000..22e6c73fbf0
--- /dev/null
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/PartialTrustTests/DrtXaml.PartialTrustTests.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+    <PropertyGroup>
+    <AssemblyName>DrtXaml.PartialTrustTests</AssemblyName>
+    <OutputType>Library</OutputType>
+    <DefineConstants>$(DefineConstants);OLDRESOURCES</DefineConstants>
+    <TestCode>true</TestCode>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <AssemblyAttributeClsCompliant>false</AssemblyAttributeClsCompliant>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="NonPublicEvents.cs" />
+    <Compile Include="ObjectWriterNonPublic.cs" />
+    <!--<Compile Include="SystemXamlInternal.cs" />-->
+    <!-- Need our own local copy of this file, because DrtXaml is not APTCA -->
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\DrtXaml\DrtXaml.csproj"/>
+    <ProjectReference Include="..\XamlTestClasses\XamlTestClasses.csproj"/>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/XamlTestClasses/XamlTestClasses.csproj b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/XamlTestClasses/XamlTestClasses.csproj
index 72ccaf787f5..faf81e73e6e 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/XamlTestClasses/XamlTestClasses.csproj
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/XamlTestClasses/XamlTestClasses.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
   
   <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
+    <SignAssembly>false</SignAssembly>
     <AssemblyOriginatorKeyFile>DrtXaml.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/dirs.proj b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/dirs.proj
new file mode 100644
index 00000000000..a74471c0709
--- /dev/null
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/dirs.proj
@@ -0,0 +1,18 @@
+<Project ToolsVersion="dogfood" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!--Import the settings-->
+  <Import Project="$(_NTDRIVE)$(_NTROOT)\wpf\test\Microsoft.Wpf.Test.Native.Settings.Targets" />
+
+  <ItemGroup Condition="'$(BuildExePhase)' == '' AND '$(WPF_TESTBUILD_TARGETVERSION)' != 'v3.0' AND '$(WPF_TESTBUILD_TARGETVERSION)' != 'v3.5' ">
+    <ProjectFile Include="DrtXaml\DrtXaml.csproj" />
+    <ProjectFile Include="PartialTrustTests\DrtXaml.PartialTrustTests.csproj" />
+    <ProjectFile Include="XamlTestClasses\XamlTestClasses.csproj" />
+    <ProjectFile Include="BamlTestClasses35\BamlTestClasses35.csproj" />
+    <ProjectFile Include="BamlTestClasses40\BamlTestClasses40.csproj" />
+    <ProjectFile Include="BamlAvoidXmlTest\BamlAvoidXmlTest.csproj" />
+    <ProjectFile Include="FriendWithKey\XamlTestClasses.FriendWithKey.csproj" />
+    <ProjectFile Include="FriendWithoutKey\XamlTestClasses.FriendWithoutKey.csproj" />
+  </ItemGroup>
+
+  <!--Import the targets-->
+  <Import Project="$(_NTDRIVE)$(_NTROOT)\tools\Microsoft.DevDiv.Traversal.targets" />
+</Project>
diff --git a/src/Microsoft.DotNet.Wpf/test/Directory.Build.props b/src/Microsoft.DotNet.Wpf/test/Directory.Build.props
index 4ca582bca1e..730df2169f9 100644
--- a/src/Microsoft.DotNet.Wpf/test/Directory.Build.props
+++ b/src/Microsoft.DotNet.Wpf/test/Directory.Build.props
@@ -1,20 +1,61 @@
 <Project>
+  <Import Condition="Exists('../Directory.Build.props')" Project="../Directory.Build.props" />
+  
   <PropertyGroup>
-    <WpfTest>true</WpfTest>
+    <PublishRoot>$(WpfIntRootDirectory)publish\</PublishRoot>
+    <PlatformFolder>x86</PlatformFolder>
+    <PlatformFolder Condition="'$(Platform)' == 'x64'">x64</PlatformFolder>
   </PropertyGroup>
-  <Import Condition="Exists('../Directory.Build.props')" Project="../Directory.Build.props" />
+  
   <PropertyGroup>
-    <WpfTestsDir>$(MsBuildThisFileDirectory)</WpfTestsDir>
-    <SignAssembly>false</SignAssembly>
-    <IsTestProject>true</IsTestProject>
-    <IsShipping>false</IsShipping>
-    <EnableXlfLocalization>false</EnableXlfLocalization>
-    <CLSCompliant>false</CLSCompliant>
+    <WpfTestBasePath>$(MsBuildThisFileDirectory)</WpfTestBasePath>
+    <DrtCommonRoot>$(WpfTestBasePath)\Common\DRT</DrtCommonRoot>
+    <WpfSharedRoot>$(WpfTestBasePath)\Shared</WpfSharedRoot>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <Platforms>AnyCPU;x64</Platforms>
+    <RuntimeIdentifiers>win-x64;win-x86</RuntimeIdentifiers>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
+  
+  <Import Project="$(MsBuildThisFileDirectory)\Publish.props"/>
+  <Import Project="$(MsBuildThisFileDirectory)\StrongName.props"/>
+
   <ItemDefinitionGroup>
     <EmbeddedResource>
       <GenerateSource>false</GenerateSource>
     </EmbeddedResource>
+    
+    <PackageReference>
+      <PrivateAssets>contentfiles;analyzers;build</PrivateAssets>
+    </PackageReference>
   </ItemDefinitionGroup>
-  <Import Project="$(WpfTestsDir)MultiTargeting.props" />
+
+  <PropertyGroup>
+    <InternalUtilitiesProject>$(WpfTestBasePath)\Infra\TestUtilities\InternalUtilities\InternalUtilities.csproj</InternalUtilitiesProject>
+    <TestContractsProject>$(WpfTestBasePath)\Infra\CommunityChest\TestContracts\TestContracts.csproj</TestContractsProject>
+    <TestApiCoreProject>$(WpfTestBasePath)\Infra\TestApi\TestApiCore\Code\TestApiCore.csproj</TestApiCoreProject>
+    <TestRuntimeProject>$(WpfTestBasePath)\Common\TestRuntime\TestRuntime.csproj</TestRuntimeProject>
+    <TestServicesProject>$(WpfTestBasePath)\Common\Drt\TestServices\TestServices.csproj</TestServicesProject>
+    <QualityVaultUtilitiesProject>$(WpfTestBasePath)\Infra\QualityVault\QualityVaultUtilities\QualityVaultUtilities.csproj</QualityVaultUtilitiesProject>
+    <DrtToolsProject>$(WpfTestBasePath)\Common\DRT\Tools\DrtTools.csproj</DrtToolsProject>
+  </PropertyGroup>
+
+  <Import Project="$(MsBuildThisFileDirectory)\SourceLocations.props"/>
+
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <EnableDefaultItems>false</EnableDefaultItems>
+  </PropertyGroup>
+
+
+  <PropertyGroup>
+    <!-- CS0618 - UnmanagedType.Struct usage -->
+    <!-- VSTHRD002 - Synchronous awaits from IPC since we can't convert the entire logging/IPC mechanism to async -->
+    <!-- VSTHRD001 - Legacy sync code -->
+    <NoWarn>CS0618;VSTHRD002;VSTHRD001</NoWarn>
+    
+    <!-- Remove these when open sourcing -->
+    <NoWarn>$(NoWarn);CS3005;CS3001;CS3002;CS3003;CS0169</NoWarn>
+  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Wpf/test/Directory.Build.targets b/src/Microsoft.DotNet.Wpf/test/Directory.Build.targets
new file mode 100644
index 00000000000..c42bcba8ce7
--- /dev/null
+++ b/src/Microsoft.DotNet.Wpf/test/Directory.Build.targets
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <Import Condition="Exists('../Directory.Build.targets')" Project="../Directory.Build.targets" />
+  <Import Project="StrongName.targets" />
+  <Import Project="PublishAfterBuild.targets" />
+</Project>
diff --git a/src/Microsoft.DotNet.Wpf/test/Publish.props b/src/Microsoft.DotNet.Wpf/test/Publish.props
new file mode 100644
index 00000000000..d1401f44259
--- /dev/null
+++ b/src/Microsoft.DotNet.Wpf/test/Publish.props
@@ -0,0 +1,12 @@
+<Project>
+    <PropertyGroup>
+        <_IsPortable >true</_IsPortable>
+        <SelfContained >false</SelfContained>
+        <RuntimeIdentifier >win-x86</RuntimeIdentifier>
+        <RuntimeIdentifier Condition="'$(Platform)' == 'x64'">win-x64</RuntimeIdentifier>
+        <PublishDir>$(PublishRoot)$(Configuration)\$(PlatformFolder)</PublishDir>
+        <WpfTestBasePublishPath>$(PublishDir)\Test</WpfTestBasePublishPath>
+        <WpfFeatureTestBasePublishPath>$(WpfTestBasePublishPath)\FeatureTests</WpfFeatureTestBasePublishPath>
+        <WpfDrtTestBasePublishPath>$(WpfTestBasePublishPath)\DRT</WpfDrtTestBasePublishPath>
+    </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Wpf/test/PublishAfterBuild.targets b/src/Microsoft.DotNet.Wpf/test/PublishAfterBuild.targets
new file mode 100644
index 00000000000..32916f86819
--- /dev/null
+++ b/src/Microsoft.DotNet.Wpf/test/PublishAfterBuild.targets
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+   <Target Name="AfterBuild" DependsOnTargets="PublishPropertySetup;Publish"/> 
+  
+   <Target
+       Name="PublishPropertySetup">
+     <PropertyGroup>
+         <NoBuild>true</NoBuild>
+     </PropertyGroup>
+   </Target>
+</Project>
diff --git a/src/Microsoft.DotNet.Wpf/test/SourceLocations.props b/src/Microsoft.DotNet.Wpf/test/SourceLocations.props
new file mode 100644
index 00000000000..8b669d5ffd5
--- /dev/null
+++ b/src/Microsoft.DotNet.Wpf/test/SourceLocations.props
@@ -0,0 +1,1072 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <PropertyGroup>
+    <CommonCodeLocation>$(WpfTestBasePath)\Common\Code\Microsoft\Test</CommonCodeLocation>
+    <CommonCriticalCodeLocation>$(WpfTestBasePath)\Common\Code\Critical\Microsoft\Test</CommonCriticalCodeLocation>
+    <CommonDataLocation>$(WpfTestBasePath)\Common\Data</CommonDataLocation>
+  </PropertyGroup>
+
+  <!-- ClickOnce Helper -->
+  <ItemGroup>
+    <SourcesClickonceHelper Include="$(CommonCodeLocation)\Deployment\ClickOnceHelper.cs"> <Link>Test\Deployment\ClickOnceHelper.cs</Link> </SourcesClickonceHelper>
+  </ItemGroup>
+
+  <!-- Container -->
+  <ItemGroup>
+    <SourcesContainer Include="$(CommonCodeLocation)\Container\StorageRootWrapper.cs"> <Link>Test\Container\StorageRootWrapper.cs</Link> </SourcesContainer>
+  </ItemGroup>
+
+  <!-- Exception Validation -->
+  <ItemGroup>
+    <SourcesExceptionValidation Include="$(CommonCodeLocation)\Globalization\Exceptions.cs"> <Link>Test\Globalization\Exceptions.cs</Link> </SourcesExceptionValidation>
+  </ItemGroup>
+
+  <!-- MSBuild -->
+  <ItemGroup>
+    <SourcesMSBuildEngine Include="$(CommonCodeLocation)\MSBuildEngine\Compiler.cs"> <Link>Test\MSBuildEngine\Compiler.cs</Link> </SourcesMSBuildEngine>
+    <SourcesMSBuildEngine Include="$(CommonCodeLocation)\MSBuildEngine\ErrorCodes.cs"> <Link>Test\MSBuildEngine\ErrorCodes.cs</Link> </SourcesMSBuildEngine>
+    <SourcesMSBuildEngine Include="$(CommonCodeLocation)\MSBuildEngine\ErrorWarningParser.cs"> <Link>Test\MSBuildEngine\ErrorWarningParser.cs</Link> </SourcesMSBuildEngine>
+    <SourcesMSBuildEngine Include="$(CommonCodeLocation)\MSBuildEngine\IMSBuildLogger.cs"> <Link>Test\MSBuildEngine\IMSBuildLogger.cs</Link> </SourcesMSBuildEngine>
+    <SourcesMSBuildEngine Include="$(CommonCodeLocation)\MSBuildEngine\MSBuildCommonHelper.cs"> <Link>Test\MSBuildEngine\MSBuildCommonHelper.cs</Link> </SourcesMSBuildEngine>
+    <SourcesMSBuildEngine Include="$(CommonCodeLocation)\MSBuildEngine\MSBuildLogger.cs"> <Link>Test\MSBuildEngine\MSBuildLogger.cs</Link> </SourcesMSBuildEngine>
+    <SourcesMSBuildEngine Include="$(CommonCodeLocation)\MSBuildEngine\MSBuildPerf.cs"> <Link>Test\MSBuildEngine\MSBuildPerf.cs</Link> </SourcesMSBuildEngine>
+    <SourcesMSBuildEngine Include="$(CommonCodeLocation)\MSBuildEngine\MSBuildPerfLogger.cs"> <Link>Test\MSBuildEngine\MSBuildPerfLogger.cs</Link> </SourcesMSBuildEngine>
+    <SourcesMSBuildEngine Include="$(CommonCodeLocation)\MSBuildEngine\MSBuildProjExecutor.cs"> <Link>Test\MSBuildEngine\MSBuildProjExecutor.cs</Link> </SourcesMSBuildEngine>
+    <SourcesMSBuildEngine Include="$(CommonCodeLocation)\MSBuildEngine\CompilerHelper.cs"> <Link>Test\MSBuildEngine\CompilerHelper.cs</Link> </SourcesMSBuildEngine>
+  </ItemGroup>
+
+  <!-- AutoData -->
+  <ItemGroup>
+    <SourcesAutoData Include="$(CommonCodeLocation)\Globalization\AutoDataEnums.cs"> <Link>Test\Globalization\AutoDataEnums.cs</Link> </SourcesAutoData>
+    <SourcesAutoData Include="$(CommonCodeLocation)\Globalization\extract.cs"> <Link>Test\Globalization\extract.cs</Link> </SourcesAutoData>
+    <SourcesAutoData Include="$(CommonCodeLocation)\Globalization\generate.cs"> <Link>Test\Globalization\generate.cs</Link> </SourcesAutoData>
+    <SourcesAutoData Include="$(CommonCodeLocation)\Globalization\LangPackHelper.cs"> <Link>Test\Globalization\LangPackHelper.cs</Link> </SourcesAutoData>
+  </ItemGroup>
+
+  <!-- ETW Logging Code -->
+  <ItemGroup>
+    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\ClrTraceEventParser.cs"> <Link>Test\EventTracing\ClrTraceEventParser.cs</Link> </SourcesETWLogging >
+    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\DynamicTraceEventParser.cs"> <Link>Test\EventTracing\DynamicTraceEventParser.cs</Link> </SourcesETWLogging >
+    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\ETWTraceEventSource.cs"> <Link>Test\EventTracing\ETWTraceEventSource.cs</Link> </SourcesETWLogging >
+    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\KernelTraceEventParser.cs"> <Link>Test\EventTracing\KernelTraceEventParser.cs</Link> </SourcesETWLogging >
+    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\Manifest.cs"> <Link>Test\EventTracing\Manifest.cs</Link> </SourcesETWLogging >
+    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\SymbolEventParser.cs"> <Link>Test\EventTracing\SymbolEventParser.cs</Link> </SourcesETWLogging >
+    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\SymbolResolver.cs"> <Link>Test\EventTracing\SymbolResolver.cs</Link> </SourcesETWLogging >
+    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\TraceEvent.cs"> <Link>Test\EventTracing\TraceEvent.cs</Link> </SourcesETWLogging >
+    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\TraceEventNativeMethods.cs"> <Link>Test\TraceEventNativeMethods.cs</Link> </SourcesETWLogging >
+    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\TraceEventSession.cs"> <Link>Test\EventTracing\TraceEventSession.cs</Link> </SourcesETWLogging >
+    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\TraceLog.cs"> <Link>Test\EventTracing\TraceLog.cs</Link> </SourcesETWLogging >
+    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\Utility.cs"> <Link>Test\EventTracing\Utility.cs</Link> </SourcesETWLogging >
+    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\WPFTraceEventParser.cs"> <Link>Test\EventTracing\WPFTraceEventParser.cs</Link> </SourcesETWLogging >
+
+    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\Utilities\CompressedStream.cs"> <Link>Test\EventTracing\Utilities\CompressedStream.cs</Link> </SourcesETWLogging >
+    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\Utilities\FastSerialization.cs"> <Link>Test\EventTracing\Utilities\FastSerialization.cs</Link> </SourcesETWLogging >
+    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\Utilities\GrowableArray.cs"> <Link>Test\EventTracing\Utilities\GrowableArray.cs</Link> </SourcesETWLogging >
+    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\Utilities\StreamReaderWriter.cs"> <Link>Test\EventTracing\Utilities\StreamReaderWriter.cs</Link> </SourcesETWLogging >
+    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\Utilities\StreamUtilities.cs"> <Link>Test\EventTracing\Utilities\StreamUtilities.cs</Link> </SourcesETWLogging >
+    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\Utilities\XmlUtilities.cs"> <Link>Test\EventTracing\Utilities\XmlUtilities.cs</Link> </SourcesETWLogging >
+  </ItemGroup>
+
+  <!-- Managed Resources AutoData  -->
+  <ItemGroup>
+    <ManagedResourcesAutoData Include="$(CommonCodeLocation)\Globalization\ChineseSimplified.txt">
+      <LogicalName>ChineseSimplified.txt</LogicalName>
+      <Link>Resources\Globalization\ChineseSimplified.txt</Link>
+    </ManagedResourcesAutoData>
+    <ManagedResourcesAutoData Include="$(CommonCodeLocation)\Globalization\ChineseTraditional.txt">
+      <LogicalName>ChineseTraditional.txt</LogicalName>
+      <Link>Resources\Globalization\ChineseTraditional.txt</Link>
+    </ManagedResourcesAutoData>
+    <ManagedResourcesAutoData Include="$(CommonCodeLocation)\Globalization\Japanese.txt">
+      <LogicalName>Japanese.txt</LogicalName>
+      <Link>Resources\Globalization\Japanese.txt</Link>
+    </ManagedResourcesAutoData>
+    <ManagedResourcesAutoData Include="$(CommonCodeLocation)\Globalization\Korean.txt">
+      <LogicalName>Korean.txt</LogicalName>
+      <Link>Resources\Globalization\Korean.txt</Link>
+    </ManagedResourcesAutoData>
+    <ManagedResourcesAutoData Include="$(CommonCodeLocation)\Globalization\ProblemDate.xml">
+      <LogicalName>ProblemDate.xml</LogicalName>
+      <Link>Resources\Globalization\ProblemDate.xml</Link>
+    </ManagedResourcesAutoData>
+    <ManagedResourcesAutoData Include="$(CommonCodeLocation)\Globalization\ProblemString.xml">
+      <LogicalName>ProblemString.xml</LogicalName>
+      <Link>Resources\Globalization\ProblemString.xml</Link>
+    </ManagedResourcesAutoData>
+  </ItemGroup>
+
+  <!-- Markup -->
+  <ItemGroup>
+    <SourcesMarkup Include="$(CommonCodeLocation)\Markup\ModifyXaml.cs"> <Link>Test\Markup\ModifyXaml.cs</Link> </SourcesMarkup>
+    <SourcesMarkup Include="$(CommonCodeLocation)\Markup\WPFLibraryGenerator.cs"> <Link>Test\Markup\WPFLibraryGenerator.cs</Link> </SourcesMarkup>
+    <SourcesMarkup Include="$(CommonCodeLocation)\Markup\WPFTreeGenerator.cs"> <Link>Test\Markup\WPFTreeGenerator.cs</Link> </SourcesMarkup>
+    <SourcesMarkup Include="$(CommonCodeLocation)\Markup\WPFXamlGenerator.cs"> <Link>Test\Markup\WPFXamlGenerator.cs</Link> </SourcesMarkup>
+    <SourcesMarkup Include="$(CommonCodeLocation)\Markup\XamlGenerator.cs"> <Link>Test\Markup\XamlGenerator.cs</Link> </SourcesMarkup>
+    <SourcesMarkup Include="$(CommonCodeLocation)\Markup\XmlGenerator.cs"> <Link>Test\Markup\XmlGenerator.cs</Link> </SourcesMarkup>
+    <SourcesMarkup Include="$(CommonCodeLocation)\Markup\XamlComparer.cs"> <Link>Test\Markup\XamlComparer.cs</Link> </SourcesMarkup>
+    <SourcesMarkup Include="$(CommonCodeLocation)\Markup\XamlTestDocument.cs"> <Link>Test\Markup\XamlTestDocument.cs</Link> </SourcesMarkup>
+  </ItemGroup>
+
+  <!-- Windows Forms -->
+  <ItemGroup>
+    <SourcesWindowsForms Include="$(CommonCodeLocation)\WindowsForms\Application.cs"> <Link>Test\WindowsForms\Application.cs</Link> </SourcesWindowsForms>
+    <SourcesWindowsForms Include="$(CommonCodeLocation)\WindowsForms\WindowsFormsSource.cs"> <Link>Test\WindowsForms\WindowsFormsSource.cs</Link> </SourcesWindowsForms>
+  </ItemGroup>
+
+  <!-- AppMonitor -->
+  <ItemGroup>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\ApplicationDeploymentHelper.cs"> <Link>Test\Loaders\ApplicationDeploymentHelper.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\ApplicationMonitorTest.cs"> <Link>Test\Loaders\ApplicationMonitorTest.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\ApplicationMonitor.cs"> <Link>Test\Loaders\ApplicationMonitor.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\ApplicationMonitorConfig.cs"> <Link>Test\Loaders\ApplicationMonitorConfig.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\FileHost.cs"> <Link>Test\Loaders\FileHost.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\IXamlLauncher.cs"> <Link>Test\Loaders\IXamlLauncher.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\LoaderStep.cs"> <Link>Test\Loaders\LoaderStep.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\ResourceHelper.cs"> <Link>Test\Loaders\ResourceHelper.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\FireFoxAutomationHelper.cs"> <Link>Test\Loaders\FireFoxAutomationHelper.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\UIHandler.cs"> <Link>Test\Loaders\UIHandler.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\ActivationStep.cs"> <Link>Test\Loaders\Steps\ActivationStep.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\FileHostStep.cs"> <Link>Test\Loaders\Steps\FileHostStep.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\HostingRuntimePolicyHelper.cs"> <Link>Test\Loaders\Steps\HostingRuntimePolicyHelper.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\LoggingSteps.cs"> <Link>Test\Loaders\Steps\LoggingSteps.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\VersionHelper.cs"> <Link>Test\Loaders\Steps\VersionHelper.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\RegistryStep.cs"> <Link>Test\Loaders\Steps\RegistryStep.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\UIHandlers\DefaultHandlers.cs"> <Link>Test\Loaders\UIHandlers\DefaultHandlers.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\Scripter.cs"> <Link>Test\Loaders\Steps\Scripter.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\String.cs"> <Link>Test\Loaders\Steps\String.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\Win32.cs"> <Link>Test\Loaders\Steps\Win32.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\Resources.cs"> <Link>Test\Loaders\Steps\Resources.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\Registry.cs"> <Link>Test\Loaders\Steps\Registry.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\Tests.cs"> <Link>Test\Loaders\Steps\Tests.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\Diagnostics.cs"> <Link>Test\Loaders\Steps\Diagnostics.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\IO.cs"> <Link>Test\Loaders\Steps\IO.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\UI.cs"> <Link>Test\Loaders\Steps\UI.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\XML.cs"> <Link>Test\Loaders\Steps\XML.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\Input.cs"> <Link>Test\Loaders\Steps\Input.cs</Link> </SourcesAppMonitor>
+    <!--<SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\Security.cs"> <Link>Test\Loaders\Steps\Security.cs</Link> </SourcesAppMonitor>-->
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\Reflection.cs"> <Link>Test\Loaders\Steps\Reflection.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\Avalon.cs"> <Link>Test\Loaders\Steps\Avalon.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\Collections.cs"> <Link>Test\Loaders\Steps\Collections.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\Environment.cs"> <Link>Test\Loaders\Steps\Environment.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\ScripterStep.cs"> <Link>Test\Loaders\Steps\ScripterStep.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\UIHandlers\CustomUIHandler.cs"> <Link>Test\Loaders\UIHandlers\CustomUIHandler.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\ConfigFileStep.cs"> <Link>Test\Loaders\Steps\ConfigFileStep.cs</Link> </SourcesAppMonitor>
+    <!--<SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\BrowserStateStep.cs"> <Link>Test\Loaders\Steps\BrowserStateStep.cs</Link> </SourcesAppMonitor>-->
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\IENavigationHelper.cs"> <Link>Test\Loaders\IENavigationHelper.cs</Link> </SourcesAppMonitor>
+    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\MachineInfoStepDisabler.cs"> <Link>Test\Loaders\Steps\MachineInfoStepDisabler.cs</Link> </SourcesAppMonitor>
+  </ItemGroup>
+
+  <!-- Managed Resources AppMonitor -->
+  <ItemGroup>
+    <!--<ManagedResourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\clickoncetest.pfx">
+      <LogicalName>clickoncetest.pfx</LogicalName>
+      <Link>Resources\Loaders\clickoncetest.pfx</Link>
+    </ManagedResourcesAppMonitor>-->
+    <ManagedResourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\NamedRegistrations.xml">
+      <LogicalName>NamedRegistrations.xml</LogicalName>
+      <Link>Resources\Loaders\NamedRegistrations.xml</Link>
+    </ManagedResourcesAppMonitor>
+    <ManagedResourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\ErrorCodes.xml">
+      <LogicalName>ErrorCodes.xml</LogicalName>
+      <Link>Resources\Loaders\ErrorCodes.xml</Link>
+    </ManagedResourcesAppMonitor>
+  </ItemGroup>
+
+  <!-- Threading -->
+  <ItemGroup>
+    <SourcesThreading Include="$(CommonCodeLocation)\Threading\DispatcherHelper.cs"> <Link>Test\Threading\DispatcherHelper.cs</Link> </SourcesThreading>
+    <SourcesThreading Include="$(CommonCodeLocation)\Threading\DispatcherQueueWrapper.cs"> <Link>Test\Threading\DispatcherQueueWrapper.cs</Link> </SourcesThreading>
+    <SourcesThreading Include="$(CommonCodeLocation)\Threading\DispatcherTimerHelper.cs"> <Link>Test\Threading\DispatcherTimerHelper.cs</Link> </SourcesThreading>
+    <SourcesThreading Include="$(CommonCodeLocation)\Threading\DispatcherPriorityHelper.cs"> <Link>Test\Threading\DispatcherPriorityHelper.cs</Link> </SourcesThreading>
+    <SourcesThreading Include="$(CommonCodeLocation)\Threading\DispatcherSignalHelper.cs"> <Link>Test\Threading\DispatcherSignalHelper.cs</Link> </SourcesThreading>
+  </ItemGroup>
+
+  <!-- Security -->
+  <ItemGroup>
+    <SourcesSecurity Include="$(CommonCodeLocation)\Security\Secure.cs"> <Link>Test\Security\Secure.cs</Link> </SourcesSecurity>
+  </ItemGroup>
+
+  <!-- Security Wrappers -->
+  <ItemGroup>
+    <SourcesSecurityWrappers Include="$(CommonCodeLocation)\Security\Wrappers\TestAPISw.cs"> <Link>Test\Security\Wrappers\TestAPISw.cs</Link> </SourcesSecurityWrappers>
+    <SourcesSecurityWrappers Include="$(CommonCodeLocation)\Security\Wrappers\AvalonWrappers.cs"> <Link>Test\Security\Wrappers\AvalonWrappers.cs</Link> </SourcesSecurityWrappers>
+    <SourcesSecurityWrappers Include="$(CommonCodeLocation)\Security\Wrappers\WrapperClasses.cs"> <Link>Test\Security\Wrappers\WrapperClasses.cs</Link> </SourcesSecurityWrappers>
+    <!-- Include 4.0 Wrappers based on build target version -->
+    <SourcesSecurityWrappers Include="$(CommonCodeLocation)\Security\Wrappers\WrapperClasses40.cs" Condition="'$(WPF_TESTBUILD_TARGETVERSION)' != 'v3.0' AND '$(WPF_TESTBUILD_TARGETVERSION)' != 'v3.5'"> <Link>Test\Security\Wrappers\WrapperClasses40.cs</Link> </SourcesSecurityWrappers>
+  </ItemGroup>
+
+  <!-- Display Minimal -->
+  <ItemGroup>
+    <SourcesDisplayMinimal Include="$(CommonCodeLocation)\Display\DisplayConfiguration.cs"> <Link>Test\Display\DisplayConfiguration.cs</Link> </SourcesDisplayMinimal>
+    <SourcesDisplayMinimal Include="$(CommonCodeLocation)\Display\DisplaySettings.cs"> <Link>Test\Display\DisplaySettings.cs</Link> </SourcesDisplayMinimal>
+    <SourcesDisplayMinimal Include="$(CommonCodeLocation)\Display\DisplaySettingsInfo.cs"> <Link>Test\Display\DisplaySettingsInfo.cs</Link> </SourcesDisplayMinimal>
+    <SourcesDisplayMinimal Include="$(CommonCodeLocation)\Display\DwmApi.cs"> <Link>Test\Display\DwmApi.cs</Link> </SourcesDisplayMinimal>
+    <SourcesDisplayMinimal Include="$(CommonCodeLocation)\Display\Monitor.cs"> <Link>Test\Display\Monitor.cs</Link> </SourcesDisplayMinimal>
+  </ItemGroup>
+
+  <!-- Display -->
+  <ItemGroup>
+    <SourcesDisplay Include="$(CommonCodeLocation)\Display\Desktop.cs"> <Link>Test\Display\Desktop.cs</Link> </SourcesDisplay>
+    <SourcesDisplay Include="@(SourcesDisplayMinimal)" />
+  </ItemGroup>
+
+  <!-- Leak Testing -->
+  <ItemGroup>
+    <SourcesLeak Include="$(CommonCodeLocation)\Leak\LeakTest.cs"> <Link>Test\Leak\LeakTest.cs</Link> </SourcesLeak>    
+  </ItemGroup>
+
+  <!-- Test Types -->
+  <ItemGroup>
+    <SourcesTestTypes Include="$(CommonCodeLocation)\TestTypes\AvalonModel.cs"> <Link>Test\TestTypes\AvalonModel.cs</Link> </SourcesTestTypes>
+    <SourcesTestTypes Include="$(CommonCodeLocation)\TestTypes\AvalonTest.cs"> <Link>Test\TestTypes\AvalonTest.cs</Link> </SourcesTestTypes>
+    <SourcesTestTypes Include="$(CommonCodeLocation)\TestTypes\ETWVerificationTest.cs"> <Link>Test\TestTypes\ETWVerificationTest.cs</Link> </SourcesTestTypes>
+    <SourcesTestTypes Include="$(CommonCodeLocation)\TestTypes\StepsTest.cs"> <Link>Test\TestTypes\StepsTest.cs</Link> </SourcesTestTypes>
+    <SourcesTestTypes Include="$(CommonCodeLocation)\TestTypes\WindowModel.cs"> <Link>Test\TestTypes\WindowModel.cs</Link> </SourcesTestTypes>
+    <SourcesTestTypes Include="$(CommonCodeLocation)\TestTypes\WindowTest.cs"> <Link>Test\TestTypes\WindowTest.cs</Link> </SourcesTestTypes>
+    <SourcesTestTypes Include="$(CommonCodeLocation)\TestTypes\WindowUtil.cs"> <Link>Test\TestTypes\WindowUtil.cs</Link> </SourcesTestTypes>
+    <SourcesTestTypes Include="$(CommonCodeLocation)\TestTypes\XamlModel.cs"> <Link>Test\TestTypes\XamlModel.cs</Link> </SourcesTestTypes>
+    <SourcesTestTypes Include="$(CommonCodeLocation)\TestTypes\XamlTest.cs"> <Link>Test\TestTypes\XamlTest.cs</Link> </SourcesTestTypes>
+    <SourcesTestTypes Include="$(CommonCodeLocation)\TestTypes\XamlVisualVerificationTest.cs"> <Link>Test\TestTypes\XamlVisualVerificationTest.cs</Link> </SourcesTestTypes>
+  </ItemGroup>
+
+  <!-- Drt -->
+  <ItemGroup>
+    <SourcesDrt Include="$(CommonCodeLocation)\Drt\DrtRunner.cs"> <Link>Test\Drt\DrtRunner.cs</Link> </SourcesDrt>
+  </ItemGroup>
+
+  <!-- Verification -->
+  <ItemGroup>
+    <SourcesVerification Include="$(CommonCodeLocation)\Verification\IVerifier.cs"> <Link>Test\Verification\IVerifier.cs</Link> </SourcesVerification>
+    <SourcesVerification Include="$(CommonCodeLocation)\Verification\IVerifyResult.cs"> <Link>Test\Verification\IVerifyResult.cs</Link> </SourcesVerification>
+    <SourcesVerification Include="$(CommonCodeLocation)\Verification\VerifyResult.cs"> <Link>Test\Verification\VerifyResult.cs</Link> </SourcesVerification>
+  </ItemGroup>
+
+  <!-- Input Minimal -->
+  <ItemGroup>
+    <SourcesInputMinimal Include="$(CommonCodeLocation)\Input\InputHelper.cs"> <Link>Test\Input\InputHelper.cs</Link> </SourcesInputMinimal>
+  </ItemGroup>
+
+  <!-- Input -->
+  <ItemGroup>
+    <SourcesInput Include="$(CommonCodeLocation)\Input\Input.cs"> <Link>Test\Input\Input.cs</Link> </SourcesInput>
+    <SourcesInput Include="$(CommonCodeLocation)\Input\NativeMethods.cs"> <Link>Test\Input\NativeMethods.cs</Link> </SourcesInput>
+    <SourcesInput Include="$(CommonCodeLocation)\Input\SafeNativeMethods.cs"> <Link>Test\Input\SafeNativeMethods.cs</Link> </SourcesInput>
+    <SourcesInput Include="$(CommonCodeLocation)\Input\UnsafeNativeMethods.cs"> <Link>Test\Input\UnsafeNativeMethods.cs</Link> </SourcesInput>
+    <SourcesInput Include="$(CommonCodeLocation)\Input\InputManagerWrapper.cs"> <Link>Test\Input\InputManagerWrapper.cs</Link> </SourcesInput>
+    <SourcesInput Include="$(CommonCodeLocation)\Input\KeyboardRecorder.cs"> <Link>Test\Input\KeyboardRecorder.cs</Link> </SourcesInput>
+    <SourcesInput Include="$(CommonCodeLocation)\Input\RawMouseActions.cs"> <Link>Test\Input\RawMouseActions.cs</Link> </SourcesInput>
+    <SourcesInput Include="$(CommonCodeLocation)\Input\InputReportEventArgsWrapper.cs"> <Link>Test\Input\InputReportEventArgsWrapper.cs</Link> </SourcesInput>
+    <SourcesInput Include="$(CommonCodeLocation)\Input\RawKeyboardActions.cs"> <Link>Test\Input\RawKeyboardActions.cs</Link> </SourcesInput>
+    <SourcesInput Include="$(CommonCodeLocation)\Input\RawMouseInputReportWrapper.cs"> <Link>Test\Input\RawMouseInputReportWrapper.cs</Link> </SourcesInput>
+    <SourcesInput Include="$(CommonCodeLocation)\Input\RawMouseState.cs"> <Link>Test\Input\RawMouseState.cs</Link> </SourcesInput>
+    <SourcesInput Include="$(CommonCodeLocation)\Input\RawKeyboardInputReportWrapper.cs"> <Link>Test\Input\RawKeyboardInputReportWrapper.cs</Link> </SourcesInput>
+    <SourcesInput Include="$(CommonCodeLocation)\Input\InputReportWrapper.cs"> <Link>Test\Input\InputReportWrapper.cs</Link> </SourcesInput>
+    <SourcesInput Include="$(CommonCodeLocation)\Input\KeyboardPlayer.cs"> <Link>Test\Input\KeyboardPlayer.cs</Link> </SourcesInput>
+    <SourcesInput Include="$(CommonCodeLocation)\Input\RawKeyboardState.cs"> <Link>Test\Input\RawKeyboardState.cs</Link> </SourcesInput>
+    <SourcesInput Include="$(CommonCodeLocation)\Input\RawTextInputReportWrapper.cs"> <Link>Test\Input\RawTextInputReportWrapper.cs</Link> </SourcesInput>
+    <SourcesInput Include="$(CommonCodeLocation)\Input\MultiMonitorHelper.cs"> <Link>Test\Input\MultiMonitorHelper.cs</Link> </SourcesInput>
+    <SourcesInput Include="$(CommonCodeLocation)\Input\UserInput.cs"> <Link>Test\Input\UserInput.cs</Link> </SourcesInput>
+    <SourcesInput Include="@(SourcesInputMinimal)" />
+  </ItemGroup>
+
+  <!-- Hosting/Xaml Browser Host- TODO: the name should be fixed. -->
+  <ItemGroup>
+    <SourcesXamlBrowserHost Include="$(CommonCodeLocation)\Hosting\UiaDistributedStepInfo.cs"> <Link>Test\Hosting\UiaDistributedStepInfo.cs</Link> </SourcesXamlBrowserHost>
+    <SourcesXamlBrowserHost Include="$(CommonCodeLocation)\Hosting\UiaDistributedStepTarget.cs"> <Link>Test\Hosting\UiaDistributedStepTarget.cs</Link> </SourcesXamlBrowserHost>
+    <SourcesXamlBrowserHost Include="$(CommonCodeLocation)\Hosting\UiaDistributedTestcase.cs"> <Link>Test\Hosting\UiaDistributedTestcase.cs</Link> </SourcesXamlBrowserHost>
+    <SourcesXamlBrowserHost Include="$(CommonCodeLocation)\Hosting\UiaDistributedTestCaseHost.cs"> <Link>Test\Hosting\UiaDistributedTestCaseHost.cs</Link> </SourcesXamlBrowserHost>
+    <SourcesXamlBrowserHost Include="$(CommonCodeLocation)\Hosting\UiaSimpleTestCase.cs"> <Link>Test\Hosting\UiaSimpleTestCase.cs</Link> </SourcesXamlBrowserHost>
+    <SourcesXamlBrowserHost Include="$(CommonCodeLocation)\Hosting\UiaTestState.cs"> <Link>Test\Hosting\UiaTestState.cs</Link> </SourcesXamlBrowserHost>
+
+    <SourcesXamlBrowserHost Include="$(CommonCodeLocation)\Hosting\XamlBrowserHost.cs"> <Link>Test\Hosting\XamlBrowserHost.cs</Link> </SourcesXamlBrowserHost>
+  </ItemGroup>
+
+  <!-- Object Serializer -->
+  <ItemGroup>
+    <SourcesObjectserializer Include="$(CommonCriticalCodeLocation)\Serialization\ObjectSerializer.cs"> <Link>Critical\Test\Serialization\ObjectSerializer.cs</Link> </SourcesObjectserializer>
+    <SourcesObjectserializer Include="$(CommonCriticalCodeLocation)\Serialization\DefaultObjectSerializer.cs"> <Link>Critical\Test\Serialization\DefaultObjectSerializer.cs</Link> </SourcesObjectserializer>
+  </ItemGroup>
+
+ <!-- Runtime Logging Sources -->
+  <ItemGroup>
+    <SharedRuntimeLoggingSources Include="$(CommonCriticalCodeLocation)\Logging\TestResult.cs"> <Link>Critical\Test\Logging\TestResult.cs</Link> </SharedRuntimeLoggingSources>
+    <SharedRuntimeLoggingSources Include="$(CommonCriticalCodeLocation)\Logging\IHarnessLoggingContract.cs"> <Link>Critical\Test\Logging\IHarnessLoggingContract.cs</Link> </SharedRuntimeLoggingSources>
+  </ItemGroup>
+
+  <!-- Logging -->
+  <ItemGroup>
+    <SourcesLogging Include="@(SharedRuntimeLoggingSources)" />
+    <SourcesLogging Include="$(CommonCodeLocation)\Logging\TestLog.cs"> <Link>Test\Logging\TestLog.cs</Link> </SourcesLogging>
+    <SourcesLogging Include="$(CommonCodeLocation)\Logging\TestStage.cs"> <Link>Test\Logging\TestStage.cs</Link> </SourcesLogging>
+    <SourcesLogging Include="$(CommonCodeLocation)\Logging\GlobalLog.cs"> <Link>Test\Logging\GlobalLog.cs</Link> </SourcesLogging>
+  </ItemGroup>
+
+  <!-- System Information -->
+  <ItemGroup>
+    <SourcesSystemInfo Include="$(CommonCodeLocation)\Diagnostics\SystemInformation.cs"> <Link>Test\Diagnostics\SystemInformation.cs</Link> </SourcesSystemInfo>
+    <SourcesSystemInfo Include="$(CommonCodeLocation)\Diagnostics\ProcessorInformation.cs"> <Link>Test\Diagnostics\ProcessorInformation.cs</Link> </SourcesSystemInfo>
+    <SourcesSystemInfo Include="$(CommonCodeLocation)\Diagnostics\SystemMetrics.cs"> <Link>Test\Diagnostics\SystemMetrics.cs</Link> </SourcesSystemInfo>
+  </ItemGroup>
+
+  <!-- System Information WPF-->
+  <ItemGroup>
+    <SourcesSystemInfoWpf Include="$(CommonCodeLocation)\Diagnostics\SystemInformation_Wpf.cs"> <Link>Test\Diagnostics\SystemInformation_Wpf.cs</Link> </SourcesSystemInfoWpf>
+  </ItemGroup>
+
+  <!-- System Information WindowsMediaPlayer-->
+  <ItemGroup>
+    <SourcesSystemInfoMediaPlayer Include="$(CommonCodeLocation)\Diagnostics\SystemInformation_WindowsMediaPlayer.cs"> <Link>Test\Diagnostics\SystemInformation_WindowsMediaPlayer.cs</Link> </SourcesSystemInfoMediaPlayer>
+  </ItemGroup>
+
+  <!-- Process Monitor -->
+  <ItemGroup>
+    <SourcesProcessmonitor Include="$(CommonCodeLocation)\Diagnostics\ProcessMonitor.cs"> <Link>Test\Diagnostics\ProcessMonitor.cs</Link> </SourcesProcessmonitor>
+  </ItemGroup>
+
+  <!-- Process Helper -->
+  <ItemGroup>
+    <SourcesProcessHelper Include="$(CommonCodeLocation)\Diagnostics\ProcessHelper.cs"> <Link>Test\Diagnostics\ProcessHelper.cs</Link> </SourcesProcessHelper>
+    <SourcesProcessHelper Include="$(CommonCodeLocation)\Diagnostics\ProcessGroup.cs"> <Link>Test\Diagnostics\ProcessGroup.cs</Link> </SourcesProcessHelper>
+    <SourcesProcessHelper Include="$(CommonCodeLocation)\Diagnostics\ManifestHelper.cs"> <Link>Test\Diagnostics\ManifestHelper.cs</Link> </SourcesProcessHelper>
+  </ItemGroup>
+
+  <!-- Loaders -->
+  <ItemGroup>
+    <SourcesLoaders Include="@(SourcesProcessMonitor)" />
+  </ItemGroup>
+
+  <!-- Debugging -->
+  <ItemGroup>
+    <SourcesDebugging Include="$(CommonCodeLocation)\Diagnostics\CdbSession.cs"><Link>Test\Diagnostics\CdbSession.cs</Link> </SourcesDebugging>
+  </ItemGroup>
+
+  <!-- State Management Runtime -->
+  <ItemGroup>
+    <SourcesStateManagementRuntime Include="$(CommonCodeLocation)\Configuration\MachineStateManager.cs"> <Link>Test\Configuration\MachineStateManager.cs</Link> </SourcesStateManagementRuntime>
+  </ItemGroup>
+
+  <!-- State Management -->
+  <ItemGroup>
+    <SourcesStateManagement Include="$(CommonCodeLocation)\StateManagement\StateManager.cs"> <Link>Test\StateManagement\StateManager.cs</Link> </SourcesStateManagement>
+    <SourcesStateManagement Include="$(CommonCodeLocation)\StateManagement\State.cs"> <Link>Test\StateManagement\State.cs</Link> </SourcesStateManagement>
+    <SourcesStateManagement Include="$(CommonCodeLocation)\StateManagement\RegistryState.cs"> <Link>Test\StateManagement\RegistryState.cs</Link> </SourcesStateManagement>
+    <SourcesStateManagement Include="$(CommonCodeLocation)\StateManagement\UserSessionState.cs"> <Link>Test\StateManagement\UserSessionState.cs</Link> </SourcesStateManagement>
+    <SourcesStateManagement Include="$(CommonCodeLocation)\StateManagement\SystemInformationState.cs"> <Link>Test\StateManagement\SystemInformationState.cs</Link> </SourcesStateManagement>
+    <SourcesStateManagement Include="$(CommonCodeLocation)\StateManagement\MonitorState.cs"> <Link>Test\StateManagement\MonitorState.cs</Link> </SourcesStateManagement>
+    <SourcesStateManagement Include="$(CommonCodeLocation)\StateManagement\DisplayThemeState.cs"> <Link>Test\StateManagement\DisplayThemeState.cs</Link> </SourcesStateManagement>
+    <SourcesStateManagement Include="$(CommonCodeLocation)\StateManagement\BrowserState.cs"> <Link>Test\StateManagement\BrowserState.cs</Link> </SourcesStateManagement>
+    <SourcesStateManagement Include="$(CommonCodeLocation)\StateManagement\FirewallExceptionState.cs"> <Link>Test\StateManagement\FirewallExceptionState.cs</Link> </SourcesStateManagement>
+    <SourcesStateManagement Include="$(CommonCodeLocation)\StateManagement\ComServerState.cs"> <Link>Test\StateManagement\ComServerState.cs</Link> </SourcesStateManagement>
+  </ItemGroup>
+
+  <!-- Execution Service Client -->
+  <ItemGroup>
+    <SourcesExecutionServiceClient Include="$(CommonCodeLocation)\Diagnostics\IExecutionService.cs"> <Link>Test\Diagnostics\IExecutionService.cs</Link> </SourcesExecutionServiceClient>
+    <SourcesExecutionServiceClient Include="$(CommonCodeLocation)\Diagnostics\ExecutionServiceClient.cs"> <Link>Test\Diagnostics\ExecutionServiceClient.cs</Link> </SourcesExecutionServiceClient>
+    <SourcesExecutionServiceClient Include="$(CommonCodeLocation)\Diagnostics\ExecutionServiceClientConnection.cs"> <Link>Test\Diagnostics\ExecutionServiceClientConnection.cs</Link> </SourcesExecutionServiceClient>
+    <SourcesExecutionServiceClient Include="$(CommonCodeLocation)\Diagnostics\FirefoxHelper.cs"> <Link>Test\Diagnostics\FirefoxHelper.cs</Link> </SourcesExecutionServiceClient>
+    <SourcesExecutionServiceClient Include="$(CommonCodeLocation)\Diagnostics\FirewallHelper.cs"> <Link>Test\Diagnostics\FirewallHelper.cs</Link> </SourcesExecutionServiceClient>
+    <SourcesExecutionServiceClient Include="$(CommonCodeLocation)\Diagnostics\RegistrationHelper.cs"> <Link>Test\Diagnostics\RegistrationHelper.cs</Link> </SourcesExecutionServiceClient>
+    <SourcesExecutionServiceClient Include="$(CommonCodeLocation)\Diagnostics\UserSessionHelper.cs"> <Link>Test\Diagnostics\UserSessionHelper.cs</Link> </SourcesExecutionServiceClient>
+    <SourcesExecutionServiceClient Include="$(CommonCodeLocation)\Diagnostics\UserInfo.cs"> <Link>Test\Diagnostics\UserInfo.cs</Link> </SourcesExecutionServiceClient>
+    <SourcesExecutionServiceClient Include="$(CommonCodeLocation)\Diagnostics\WttHelper.cs"> <Link>Test\Diagnostics\WttHelper.cs</Link> </SourcesExecutionServiceClient>
+    <SourcesExecutionServiceClient Include="$(CommonCodeLocation)\Diagnostics\ImpersonateUserHelper.cs"> <Link>Test\Diagnostics\ImpersonateUserHelper.cs</Link> </SourcesExecutionServiceClient>
+    <SourcesExecutionServiceClient Include="$(CommonCriticalCodeLocation)\Deployment\RuntimeDeploymentHelper.cs"> <Link>Critical\Test\Deployment\RuntimeDeploymentHelper.cs</Link> </SourcesExecutionServiceClient>
+  </ItemGroup>
+
+  <!-- Execution Service -->
+  <ItemGroup>
+    <SourcesExecutionservice Include="$(CommonCodeLocation)\Diagnostics\ExecutionServiceProxyClient.cs"> <Link>Test\Diagnostics\ExecutionServiceProxyClient.cs</Link> </SourcesExecutionservice>
+    <SourcesExecutionservice Include="$(CommonCodeLocation)\Diagnostics\ExecutionServiceProxy.cs"> <Link>Test\Diagnostics\ExecutionServiceProxy.cs</Link> </SourcesExecutionservice>
+  </ItemGroup>
+
+  <!-- Win32 Minimal -->
+  <ItemGroup>
+    <SourcesWin32Minimal Include="$(CommonCodeLocation)\Win32\NativeStructs.cs"> <Link>Test\Win32\NativeStructs.cs</Link> </SourcesWin32Minimal>
+    <SourcesWin32Minimal Include="$(CommonCodeLocation)\Win32\NativeConstants.cs"> <Link>Test\Win32\NativeConstants.cs</Link> </SourcesWin32Minimal>
+    <SourcesWin32Minimal Include="$(CommonCodeLocation)\Win32\Gdi32.cs"> <Link>Test\Win32\Gdi32.cs</Link> </SourcesWin32Minimal>
+    <SourcesWin32Minimal Include="$(CommonCodeLocation)\Win32\User32.cs"> <Link>Test\Win32\User32.cs</Link> </SourcesWin32Minimal>
+    <SourcesWin32Minimal Include="$(CommonCodeLocation)\Win32\Kernel32.cs"> <Link>Test\Win32\Kernel32.cs</Link> </SourcesWin32Minimal>
+    <SourcesWin32Minimal Include="$(CommonCodeLocation)\Win32\WindowEnumerator.cs"> <Link>Test\Win32\WindowEnumerator.cs</Link> </SourcesWin32Minimal>
+    <SourcesWin32Minimal Include="$(CommonCodeLocation)\Win32\Ntdll.cs"> <Link>Test\Win32\Ntdll.cs</Link> </SourcesWin32Minimal>
+  </ItemGroup>
+
+  <!-- Win32 -->
+  <ItemGroup>
+    <SourcesWin32 Include="$(CommonCodeLocation)\Win32\HwndSubClass.cs"> <Link>Test\Win32\HwndSubClass.cs</Link> </SourcesWin32>
+    <SourcesWin32 Include="$(CommonCodeLocation)\Win32\HwndWrapper.cs"> <Link>Test\Win32\HwndWrapper.cs</Link> </SourcesWin32>
+    <SourcesWin32 Include="$(CommonCodeLocation)\Win32\ManagedWndProcTracker.cs"> <Link>Test\Win32\ManagedWndProcTracker.cs</Link> </SourcesWin32>
+    <SourcesWin32 Include="$(CommonCodeLocation)\Win32\NativeMethods.cs"> <Link>Test\Win32\NativeMethods.cs</Link> </SourcesWin32>
+    <SourcesWin32 Include="$(CommonCodeLocation)\Win32\WeakReferenceList.cs"> <Link>Test\Win32\WeakReferenceList.cs</Link> </SourcesWin32>
+    <SourcesWin32 Include="$(CommonCodeLocation)\Win32\WeakReferenceListEnumerator.cs"> <Link>Test\Win32\WeakReferenceListEnumerator.cs</Link> </SourcesWin32>
+    <SourcesWin32 Include="$(CommonCodeLocation)\Win32\AcceleratorTable.cs"> <Link>Test\Win32\AcceleratorTable.cs</Link> </SourcesWin32>
+    <SourcesWin32 Include="@(SourcesWin32Minimal)" />
+  </ItemGroup>
+
+  <!-- Modeling -->
+  <ItemGroup>
+    <SourcesModeling Include="$(CommonCodeLocation)\Modeling\AsyncActionManager.cs"> <Link>Test\Modeling\AsyncActionManager.cs</Link> </SourcesModeling>
+    <SourcesModeling Include="$(CommonCodeLocation)\Modeling\Model.cs"> <Link>Test\Modeling\Model.cs</Link> </SourcesModeling>
+    <SourcesModeling Include="$(CommonCodeLocation)\Modeling\ModelingBaseObject.cs"> <Link>Test\Modeling\ModelingBaseObject.cs</Link> </SourcesModeling>
+    <SourcesModeling Include="$(CommonCodeLocation)\Modeling\TestLoader.cs"> <Link>Test\Modeling\TestLoader.cs</Link> </SourcesModeling>
+    <SourcesModeling Include="$(CommonCodeLocation)\Modeling\XamlTransformer.cs"> <Link>Test\Modeling\XamlTransformer.cs</Link> </SourcesModeling>
+    <SourcesModeling Include="$(CommonCodeLocation)\Modeling\XtcParser.cs"> <Link>Test\Modeling\XtcParser.cs</Link> </SourcesModeling>
+    <SourcesModeling Include="$(CommonCodeLocation)\Modeling\XtcTestCaseLoader.cs"> <Link>Test\Modeling\XtcTestCaseLoader.cs</Link> </SourcesModeling>
+  </ItemGroup>
+
+  <!-- Windows -->
+  <ItemGroup>
+    <SourcesWindows Include="$(CommonCodeLocation)\Windows\ActionForTypeHelper.cs"> <Link>Test\Windows\ActionForTypeHelper.cs</Link> </SourcesWindows>
+    <SourcesWindows Include="$(CommonCodeLocation)\Windows\TreeComparer.cs"> <Link>Test\Windows\TreeComparer.cs</Link> </SourcesWindows>
+  </ItemGroup>
+
+  <!-- Managed Resources Windows -->
+  <ItemGroup>
+    <ManagedResourcesWindows Include="$(CommonDataLocation)\Windows\PropertiesToSkip.xml">
+      <LogicalName>PropertiesToSkip.xml</LogicalName>
+      <Link>Resources\Windows\PropertiesToSkip.xml</Link>
+    </ManagedResourcesWindows>
+  </ItemGroup>
+
+  <!-- Test -->
+  <ItemGroup>
+    <SourcesTest Include="$(CommonCodeLocation)\EventHelper.cs"> <Link>Test\EventHelper.cs</Link> </SourcesTest>
+    <SourcesTest Include="$(CommonCodeLocation)\ExceptionHelper.cs"> <Link>Test\ExceptionHelper.cs</Link> </SourcesTest>
+    <SourcesTest Include="$(CommonCodeLocation)\TestException.cs"> <Link>Test\TestException.cs</Link> </SourcesTest>
+    <SourcesTest Include="$(CommonCodeLocation)\TestSetupException.cs"> <Link>Test\TestSetupException.cs</Link> </SourcesTest>
+    <SourcesTest Include="$(CommonCodeLocation)\TestValidationException.cs"> <Link>Test\TestValidationException.cs</Link> </SourcesTest>
+  </ItemGroup>
+
+  <!-- Serialization -->
+  <ItemGroup>
+    <SourcesSerialization Include="$(CommonCodeLocation)\Serialization\BamlHelper.cs"> <Link>Test\Serialization\BamlHelper.cs</Link> </SourcesSerialization>
+    <SourcesSerialization Include="$(CommonCodeLocation)\Serialization\BamlReaderWrapper.cs"> <Link>Test\Serialization\BamlReaderWrapper.cs</Link> </SourcesSerialization>
+    <SourcesSerialization Include="$(CommonCodeLocation)\Serialization\BamlWriterWrapper.cs"> <Link>Test\Serialization\BamlWriterWrapper.cs</Link> </SourcesSerialization>
+    <SourcesSerialization Include="$(CommonCodeLocation)\Serialization\IOHelper.cs"> <Link>Test\Serialization\IOHelper.cs</Link> </SourcesSerialization>
+    <SourcesSerialization Include="$(CommonCodeLocation)\Serialization\SerializationHelper.cs"> <Link>Test\Serialization\SerializationHelper.cs</Link> </SourcesSerialization>
+    <SourcesSerialization Include="$(CommonCodeLocation)\Serialization\WrapperUtil.cs"> <Link>Test\Serialization\WrapperUtil.cs</Link> </SourcesSerialization>
+    <SourcesSerialization Include="$(CommonCodeLocation)\Serialization\XamlRoundTrip.cs"> <Link>Test\Serialization\XamlRoundTrip.cs</Link> </SourcesSerialization>
+  </ItemGroup>
+
+  <!-- Serialization Custom Elements -->
+  <ItemGroup>
+    <SourcesSerializationCustomElements Include="$(CommonCodeLocation)\Serialization\CustomElements\CustomBorder.cs"> <Link>Test\Serialization\CustomElements\CustomBorder.cs</Link> </SourcesSerializationCustomElements>
+    <SourcesSerializationCustomElements Include="$(CommonCodeLocation)\Serialization\CustomElements\CustomButton.cs"> <Link>Test\Serialization\CustomElements\CustomButton.cs</Link> </SourcesSerializationCustomElements>
+    <SourcesSerializationCustomElements Include="$(CommonCodeLocation)\Serialization\CustomElements\CustomCanvas.cs"> <Link>Test\Serialization\CustomElements\CustomCanvas.cs</Link> </SourcesSerializationCustomElements>
+    <SourcesSerializationCustomElements Include="$(CommonCodeLocation)\Serialization\CustomElements\CustomDockPanel.cs"> <Link>Test\Serialization\CustomElements\CustomDockPanel.cs</Link> </SourcesSerializationCustomElements>
+    <SourcesSerializationCustomElements Include="$(CommonCodeLocation)\Serialization\CustomElements\CustomElementHelper.cs"> <Link>Test\Serialization\CustomElements\CustomElementHelper.cs</Link> </SourcesSerializationCustomElements>
+    <SourcesSerializationCustomElements Include="$(CommonCodeLocation)\Serialization\CustomElements\CustomPage.cs"> <Link>Test\Serialization\CustomElements\CustomPage.cs</Link> </SourcesSerializationCustomElements>
+    <SourcesSerializationCustomElements Include="$(CommonCodeLocation)\Serialization\CustomElements\CustomStackPanel.cs"> <Link>Test\Serialization\CustomElements\CustomStackPanel.cs</Link> </SourcesSerializationCustomElements>
+    <SourcesSerializationCustomElements Include="$(CommonCodeLocation)\Serialization\CustomElements\CustomTextPanel.cs"> <Link>Test\Serialization\CustomElements\CustomTextPanel.cs</Link> </SourcesSerializationCustomElements>
+    <SourcesSerializationCustomElements Include="$(CommonCodeLocation)\Serialization\CustomElements\CustomWindow.cs"> <Link>Test\Serialization\CustomElements\CustomWindow.cs</Link> </SourcesSerializationCustomElements>
+    <SourcesSerializationCustomElements Include="$(CommonCodeLocation)\Serialization\CustomElements\ICustomElement.cs"> <Link>Test\Serialization\CustomElements\ICustomElement.cs</Link> </SourcesSerializationCustomElements>
+  </ItemGroup>
+
+  <!-- Integration TXR -->
+  <ItemGroup>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\ActionForXamlInfo.cs"> <Link>Test\Integration\ActionForXamlInfo.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\FileVariationGenerator.cs"> <Link>Test\Integration\FileVariationGenerator.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\FileVariationItem.cs"> <Link>Test\Integration\FileVariationItem.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\BaseTestContract.cs"> <Link>Test\Integration\BaseTestContract.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\BaseVariationGenerator.cs"> <Link>Test\Integration\BaseVariationGenerator.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\CallbackVariationGenerator.cs"> <Link>Test\Integration\CallbackVariationGenerator.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\CallbackVariationItem.cs"> <Link>Test\Integration\CallbackVariationItem.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\CollectionsXamlHelper.cs"> <Link>Test\Integration\CollectionsXamlHelper.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\CombinationGenerator.cs"> <Link>Test\Integration\CombinationGenerator.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\GeneratorReference.cs"> <Link>Test\Integration\GeneratorReference.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\Helper.cs"> <Link>Test\Integration\Helper.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\ITestContract.cs"> <Link>Test\Integration\ITestContract.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\IVariationGenerator.cs"> <Link>Test\Integration\IVariationGenerator.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\MDEVariationGenerator.cs"> <Link>Test\Integration\MDEVariationGenerator.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\MDEVariationItem.cs"> <Link>Test\Integration\MDEVariationItem.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\NotificationList.cs"> <Link>Test\Integration\NotificationList.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\StorageItem.cs"> <Link>Test\Integration\StorageItem.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\TestExtenderGraph.cs"> <Link>Test\Integration\TestExtenderGraph.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\TestExtenderOutput.cs"> <Link>Test\Integration\TestExtenderOutput.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\VariationItem.cs"> <Link>Test\Integration\VariationItem.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\VariationItemGroup.cs"> <Link>Test\Integration\VariationItemGroup.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\CommonStorage.cs"> <Link>Test\Integration\CommonStorage.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\SelectorGenerator.cs"> <Link>Test\Integration\SelectorGenerator.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\ContentItem.cs"> <Link>Test\Integration\ContentItem.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\AssemblyDesc.cs"> <Link>Test\Integration\AssemblyDesc.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\WPF3Helper.cs"> <Link>Test\Integration\WPF3Helper.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\Windows\TypeVariationGenerator.cs"> <Link>Test\Integration\Windows\TypeVariationGenerator.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\Windows\TypeVariationItem.cs"> <Link>Test\Integration\Windows\TypeVariationItem.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\Windows\ContainerVariationGenerator.cs"> <Link>Test\Integration\Windows\ContainerVariationGenerator.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\Windows\ContainerVariationItem.cs"> <Link>Test\Integration\Windows\ContainerVariationItem.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\Windows\ActionSequenceVariationGenerator.cs"> <Link>Test\Integration\Windows\ActionSequenceVariationGenerator.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\Windows\ControllerProxy.cs"> <Link>Test\Integration\Windows\ControllerProxy.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\Windows\Controller.cs"> <Link>Test\Integration\Windows\Controller.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\Windows\ThreadController.cs"> <Link>Test\Integration\Windows\ThreadController.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\Windows\ApplicationController.cs"> <Link>Test\Integration\Windows\ApplicationController.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\Windows\WinFormsController.cs"> <Link>Test\Integration\Windows\WinFormsController.cs</Link> </SourcesIntegrationTxr>
+    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\TestExtenderHelper.cs"> <Link>Test\Integration\TestExtenderHelper.cs</Link> </SourcesIntegrationTxr>
+  </ItemGroup>
+
+  <!-- Pict -->
+  <ItemGroup>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\ObjectArrays\AllPossibleObjectArrayCollection.cs"> <Link>Test\PICT\ObjectArrays\AllPossibleObjectArrayCollection.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\ObjectArrays\AllPossibleObjectArrayEnumerator.cs"> <Link>Test\PICT\ObjectArrays\AllPossibleObjectArrayEnumerator.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\ObjectArrays\AllPossibleObjectArrayGenerationStrategy.cs"> <Link>Test\PICT\ObjectArrays\AllPossibleObjectArrayGenerationStrategy.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\ObjectArrays\IObjectArrayCollection.cs"> <Link>Test\PICT\ObjectArrays\IObjectArrayCollection.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\ObjectArrays\IObjectArrayEnumerator.cs"> <Link>Test\PICT\ObjectArrays\IObjectArrayEnumerator.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\ObjectArrays\IObjectArrayGenerationStrategy.cs"> <Link>Test\PICT\ObjectArrays\IObjectArrayGenerationStrategy.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\ObjectArrays\ObjectArrayGeneration.cs"> <Link>Test\PICT\ObjectArrays\ObjectArrayGeneration.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\ObjectArrays\ObjectArrayGenerator.cs"> <Link>Test\PICT\ObjectArrays\ObjectArrayGenerator.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\ObjectArrays\ObjectArrayPairwiseGeneration.cs"> <Link>Test\PICT\ObjectArrays\ObjectArrayPairwiseGeneration.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\ObjectArrays\PairwiseObjectArrayCollection.cs"> <Link>Test\PICT\ObjectArrays\PairwiseObjectArrayCollection.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\ObjectArrays\PairwiseObjectArrayEnumerator.cs"> <Link>Test\PICT\ObjectArrays\PairwiseObjectArrayEnumerator.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\ObjectArrays\PairwiseObjectArrayGenerationStrategy.cs"> <Link>Test\PICT\ObjectArrays\PairwiseObjectArrayGenerationStrategy.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\IPairwiseComment.cs"> <Link>Test\PICT\IPairwiseComment.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\IPairwiseVisitable.cs"> <Link>Test\PICT\IPairwiseVisitable.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseAliasCollection.cs"> <Link>Test\PICT\PairwiseAliasCollection.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseAndClause.cs"> <Link>Test\PICT\PairwiseAndClause.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseComparison.cs"> <Link>Test\PICT\PairwiseComparison.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseComparisonTerm.cs"> <Link>Test\PICT\PairwiseComparisonTerm.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseCondition.cs"> <Link>Test\PICT\PairwiseCondition.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseConditionCollection.cs"> <Link>Test\PICT\PairwiseConditionCollection.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseEqualTerm.cs"> <Link>Test\PICT\PairwiseEqualTerm.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseException.cs"> <Link>Test\PICT\PairwiseException.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseGreaterThanOrEqualTerm.cs"> <Link>Test\PICT\PairwiseGreaterThanOrEqualTerm.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseGreaterThanTerm.cs"> <Link>Test\PICT\PairwiseGreaterThanTerm.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseIfThenConstraint.cs"> <Link>Test\PICT\PairwiseIfThenConstraint.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseIfThenConstraintCollection.cs"> <Link>Test\PICT\PairwiseIfThenConstraintCollection.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseInTerm.cs"> <Link>Test\PICT\PairwiseInTerm.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseLessThanOrEqualTerm.cs"> <Link>Test\PICT\PairwiseLessThanOrEqualTerm.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseLessThanTerm.cs"> <Link>Test\PICT\PairwiseLessThanTerm.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseLikeTerm.cs"> <Link>Test\PICT\PairwiseLikeTerm.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseLogicalClause.cs"> <Link>Test\PICT\PairwiseLogicalClause.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseLogicalRelationship.cs"> <Link>Test\PICT\PairwiseLogicalRelationship.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseModel.cs"> <Link>Test\PICT\PairwiseModel.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseNotClause.cs"> <Link>Test\PICT\PairwiseNotClause.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseNotEqualTerm.cs"> <Link>Test\PICT\PairwiseNotEqualTerm.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseNotInTerm.cs"> <Link>Test\PICT\PairwiseNotInTerm.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseOrClause.cs"> <Link>Test\PICT\PairwiseOrClause.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseParameter.cs"> <Link>Test\PICT\PairwiseParameter.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseParameterCollection.cs"> <Link>Test\PICT\PairwiseParameterCollection.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseParameterConstraint.cs"> <Link>Test\PICT\PairwiseParameterConstraint.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseParameterConstraintCollection.cs"> <Link>Test\PICT\PairwiseParameterConstraintCollection.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwisePICTCache.cs"> <Link>Test\PICT\PairwisePICTCache.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseSettings.cs"> <Link>Test\PICT\PairwiseSettings.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseSubModel.cs"> <Link>Test\PICT\PairwiseSubModel.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseSubModelCollection.cs"> <Link>Test\PICT\PairwiseSubModelCollection.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseTerm.cs"> <Link>Test\PICT\PairwiseTerm.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseTuple.cs"> <Link>Test\PICT\PairwiseTuple.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseValue.cs"> <Link>Test\PICT\PairwiseValue.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseValueCollection.cs"> <Link>Test\PICT\PairwiseValueCollection.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseValueType.cs"> <Link>Test\PICT\PairwiseValueType.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseVisitor.cs"> <Link>Test\PICT\PairwiseVisitor.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PICTConstants.cs"> <Link>Test\PICT\PICTConstants.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PICTExecutionInformation.cs"> <Link>Test\PICT\PICTExecutionInformation.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PICTPairwiseVisitor.cs"> <Link>Test\PICT\PICTPairwiseVisitor.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PICTRunner.cs"> <Link>Test\PICT\PICTRunner.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PICTWarningBehaviors.cs"> <Link>Test\PICT\PICTWarningBehaviors.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PICTWarningEventArgs.cs"> <Link>Test\PICT\PICTWarningEventArgs.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\PICTWarningEventHandler.cs"> <Link>Test\PICT\PICTWarningEventHandler.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\MatrixOutput\PairwiseTestCase.cs"> <Link>Test\PICT\MatrixOutput\PairwiseTestCase.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\MatrixOutput\PairwiseTestMatrix.cs"> <Link>Test\PICT\MatrixOutput\PairwiseTestMatrix.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\MatrixOutput\PairwiseTestParameter.cs"> <Link>Test\PICT\MatrixOutput\PairwiseTestParameter.cs</Link> </SourcesPict>
+    <SourcesPict Include="$(CommonCodeLocation)\PICT\MatrixOutput\PairwiseHelper.cs"> <Link>Test\PICT\MatrixOutput\PairwiseTestParameter.cs</Link> </SourcesPict>
+  </ItemGroup>
+  
+  <!-- Imaging -->
+  <ItemGroup>
+    <SourcesImaging Include="$(CommonCodeLocation)\Imaging\BitmapCapture.cs"> <Link>Test\Imaging\BitmapCapture.cs</Link> </SourcesImaging>
+    <SourcesImaging Include="$(CommonCodeLocation)\Imaging\BitmapUtils.cs"> <Link>Test\Imaging\BitmapUtils.cs</Link> </SourcesImaging>
+    <SourcesImaging Include="$(CommonCodeLocation)\Imaging\ColorUtils.cs"> <Link>Test\Imaging\ColorUtils.cs</Link> </SourcesImaging>
+    <SourcesImaging Include="$(CommonCodeLocation)\Imaging\ComparisonAlgorithm.cs"> <Link>Test\Imaging\ComparisonAlgorithm.cs</Link> </SourcesImaging>
+    <SourcesImaging Include="$(CommonCodeLocation)\Imaging\ComparisonCriteria.cs"> <Link>Test\Imaging\ComparisonCriteria.cs</Link> </SourcesImaging>
+    <SourcesImaging Include="$(CommonCodeLocation)\Imaging\ComparisonOperation.cs"> <Link>Test\Imaging\ComparisonOperation.cs</Link> </SourcesImaging>
+    <SourcesImaging Include="$(CommonCodeLocation)\Imaging\ComparisonOperationUtils.cs"> <Link>Test\Imaging\ComparisonOperationUtils.cs</Link> </SourcesImaging>
+    <SourcesImaging Include="$(CommonCodeLocation)\Imaging\ComparisonResult.cs"> <Link>Test\Imaging\ComparisonResult.cs</Link> </SourcesImaging>
+    <SourcesImaging Include="$(CommonCodeLocation)\Imaging\ElementUtils.cs"> <Link>Test\Imaging\ElementUtils.cs</Link> </SourcesImaging>
+    <SourcesImaging Include="$(CommonCodeLocation)\Imaging\PixelData.cs"> <Link>Test\Imaging\PixelData.cs</Link> </SourcesImaging>
+  </ItemGroup>
+
+  <!-- Animation -->
+  <ItemGroup>
+    <SourcesAnimation Include="$(CommonCodeLocation)\Animation\AnimationSideBySide.cs"> <Link>Test\Animation\AnimationSideBySide.cs</Link> </SourcesAnimation>
+    <SourcesAnimation Include="$(CommonCodeLocation)\Animation\AnimationUtils.cs"> <Link>Test\Animation\AnimationUtils.cs</Link> </SourcesAnimation>
+    <SourcesAnimation Include="$(CommonCodeLocation)\Animation\AnimationValidator.cs"> <Link>Test\Animation\AnimationValidator.cs</Link> </SourcesAnimation>
+    <SourcesAnimation Include="$(CommonCodeLocation)\Animation\TimeManagerCommon.cs"> <Link>Test\Animation\TimeManagerCommon.cs</Link> </SourcesAnimation>
+  </ItemGroup>
+
+  <!-- Rendering VScan -->
+  <ItemGroup>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\ColorByte.cs"> <Link>Test\RenderingVerification\ColorByte.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\ColorDouble.cs"> <Link>Test\RenderingVerification\ColorDouble.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Color_Avalon.cs"> <Link>Test\RenderingVerification\Color_Avalon.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Curve.cs"> <Link>Test\RenderingVerification\Curve.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\CurveTolerance.cs"> <Link>Test\RenderingVerification\CurveTolerance.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\DisplayConfiguration.cs"> <Link>Test\RenderingVerification\DisplayConfiguration.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\DisplayConfigurationMinimal.cs"> <Link>Test\RenderingVerification\DisplayConfigurationMinimal.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Exceptions.cs"> <Link>Test\RenderingVerification\Exceptions.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\ImageAdapter.cs"> <Link>Test\RenderingVerification\ImageAdapter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\ImageComparator.cs"> <Link>Test\RenderingVerification\ImageComparator.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\ImageUtility.cs"> <Link>Test\RenderingVerification\ImageUtility.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\ImageUtilityProxy.cs"> <Link>Test\RenderingVerification\ImageUtilityProxy.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\ImageUtility_Avalon.cs"> <Link>Test\RenderingVerification\ImageUtility_Avalon.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Interfaces.cs"> <Link>Test\RenderingVerification\Interfaces.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\IPUtil.cs"> <Link>Test\RenderingVerification\IPUtil.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\KeepGreaterKey.cs"> <Link>Test\RenderingVerification\KeepGreaterKey.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\MetaDataInfo.cs"> <Link>Test\RenderingVerification\MetaDataInfo.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\MismatchingPoints.cs"> <Link>Test\RenderingVerification\MismatchingPoints.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Package.cs"> <Link>Test\RenderingVerification\Package.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Pixel.cs"> <Link>Test\RenderingVerification\Pixel.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\PInvoke.cs"> <Link>Test\RenderingVerification\PInvoke.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\PropertyItemWrapper.cs"> <Link>Test\RenderingVerification\PropertyItemWrapper.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\RuntimeInfo.cs"> <Link>Test\RenderingVerification\RuntimeInfo.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\RenderRect.cs"> <Link>Test\RenderingVerification\RenderRect.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\VideoCapture.cs"> <Link>Test\RenderingVerification\VideoCapture.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\XamlLauncherReflect.cs"> <Link>Test\RenderingVerification\XamlLauncherReflect.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\AffineFilter.cs"> <Link>Test\RenderingVerification\Filters\AffineFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\AttractorFilter.cs"> <Link>Test\RenderingVerification\Filters\AttractorFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\BlurFilter.cs"> <Link>Test\RenderingVerification\Filters\BlurFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\BrightnessContrastFilter.cs"> <Link>Test\RenderingVerification\Filters\BrightnessContrastFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\ChannelOperationFilter.cs"> <Link>Test\RenderingVerification\Filters\ChannelOperationFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\ColorFilter.cs"> <Link>Test\RenderingVerification\Filters\ColorFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\ColorSpaceConversion.cs"> <Link>Test\RenderingVerification\Filters\ColorSpaceConversion.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\ColorTransformFilter.cs"> <Link>Test\RenderingVerification\Filters\ColorTransformFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\ContrastFilter.cs"> <Link>Test\RenderingVerification\Filters\ContrastFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\ConvolutionFilter.cs"> <Link>Test\RenderingVerification\Filters\ConvolutionFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\EqualizeFilter.cs"> <Link>Test\RenderingVerification\Filters\EqualizeFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\Filter.cs"> <Link>Test\RenderingVerification\Filters\Filter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\FilterParameter.cs"> <Link>Test\RenderingVerification\Filters\FilterParameter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\FlipRotateFilter.cs"> <Link>Test\RenderingVerification\Filters\FlipRotateFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\GammaCorrectFilter.cs"> <Link>Test\RenderingVerification\Filters\GammaCorrectFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\GaussianFilter.cs"> <Link>Test\RenderingVerification\Filters\GaussianFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\GlowFilter.cs"> <Link>Test\RenderingVerification\Filters\GlowFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\GrayscaleFilter.cs"> <Link>Test\RenderingVerification\Filters\GrayscaleFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\IColorConverter.cs"> <Link>Test\RenderingVerification\Filters\IColorConverter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\Image2DTransforms.cs"> <Link>Test\RenderingVerification\Filters\Image2DTransforms.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\Interpolator.cs"> <Link>Test\RenderingVerification\Filters\Interpolator.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\LogicalOperationFilter.cs"> <Link>Test\RenderingVerification\Filters\LogicalOperationFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\Matrix2D.cs"> <Link>Test\RenderingVerification\Filters\Matrix2D.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\Matrix2DConverter.cs"> <Link>Test\RenderingVerification\Filters\Matrix2DConverter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\MorphologicalFilter.cs"> <Link>Test\RenderingVerification\Filters\MorphologicalFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\MorphShapeFilter.cs"> <Link>Test\RenderingVerification\Filters\MorphShapeFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\NegateFilter.cs"> <Link>Test\RenderingVerification\Filters\NegateFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\OpacityPointsFilter.cs"> <Link>Test\RenderingVerification\Filters\OpacityPointsFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\OrderStatisticFilter.cs"> <Link>Test\RenderingVerification\Filters\OrderStatisticFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\PixelizeFilter.cs"> <Link>Test\RenderingVerification\Filters\PixelizeFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\ProcessXmlFilter.cs"> <Link>Test\RenderingVerification\Filters\ProcessXmlFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\RenderingColorConverter.cs"> <Link>Test\RenderingVerification\Filters\RenderingColorConverter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\SaturateEdgeFilter.cs"> <Link>Test\RenderingVerification\Filters\SaturateEdgeFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\SchematizationFilter.cs"> <Link>Test\RenderingVerification\Filters\SchematizationFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\SharpenFilter.cs"> <Link>Test\RenderingVerification\Filters\SharpenFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\SpatialTransformFilter.cs"> <Link>Test\RenderingVerification\Filters\SpatialTransformFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\TintFilter.cs"> <Link>Test\RenderingVerification\Filters\TintFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\TintShadeFilter.cs"> <Link>Test\RenderingVerification\Filters\TintShadeFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\VMorph.cs"> <Link>Test\RenderingVerification\Filters\VMorph.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\WaveletTransformFilter.cs"> <Link>Test\RenderingVerification\Filters\WaveletTransformFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\WVMorph.cs"> <Link>Test\RenderingVerification\Filters\WVMorph.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Analytical\CartesianMomentDescriptor.cs"> <Link>Test\RenderingVerification\Models\Analytical\CartesianMomentDescriptor.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Analytical\Criterion.cs"> <Link>Test\RenderingVerification\Models\Analytical\Criterion.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Analytical\DescriptorBase.cs"> <Link>Test\RenderingVerification\Models\Analytical\DescriptorBase.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Analytical\DescriptorInfo.cs"> <Link>Test\RenderingVerification\Models\Analytical\DescriptorInfo.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Analytical\DescriptorManager.cs"> <Link>Test\RenderingVerification\Models\Analytical\DescriptorManager.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Analytical\DescriptorSquareMatrix.cs"> <Link>Test\RenderingVerification\Models\Analytical\DescriptorSquareMatrix.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Analytical\ImageToShapeIDMapping.cs"> <Link>Test\RenderingVerification\Models\Analytical\ImageToShapeIDMapping.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Analytical\Interfaces.cs"> <Link>Test\RenderingVerification\Models\Analytical\Interfaces.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Analytical\ModelManager2.cs"> <Link>Test\RenderingVerification\Models\Analytical\ModelManager2.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Analytical\MomentDescriptorBase.cs"> <Link>Test\RenderingVerification\Models\Analytical\MomentDescriptorBase.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Analytical\PolarMomentDescriptor.cs"> <Link>Test\RenderingVerification\Models\Analytical\PolarMomentDescriptor.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Analytical\VScan.cs"> <Link>Test\RenderingVerification\Models\Analytical\VScan.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\AnimatedProperty.cs"> <Link>Test\RenderingVerification\Models\Synthetical\AnimatedProperty.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\Animator.cs"> <Link>Test\RenderingVerification\Models\Synthetical\Animator.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\AvalonTypographer.cs"> <Link>Test\RenderingVerification\Models\Synthetical\AvalonTypographer.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\DeltaImageComparator.cs"> <Link>Test\RenderingVerification\Models\Synthetical\DeltaImageComparator.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\GeometryFilter.cs"> <Link>Test\RenderingVerification\Models\Synthetical\GeometryFilter.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\GlyphBase.cs"> <Link>Test\RenderingVerification\Models\Synthetical\GlyphBase.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\GlyphChar.cs"> <Link>Test\RenderingVerification\Models\Synthetical\GlyphChar.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\GlyphColorChooser.cs"> <Link>Test\RenderingVerification\Models\Synthetical\GlyphColorChooser.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\GlyphComparator.cs"> <Link>Test\RenderingVerification\Models\Synthetical\GlyphComparator.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\GlyphCompareInfo.cs"> <Link>Test\RenderingVerification\Models\Synthetical\GlyphCompareInfo.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\GlyphContainer.cs"> <Link>Test\RenderingVerification\Models\Synthetical\GlyphContainer.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\GlyphFont.cs"> <Link>Test\RenderingVerification\Models\Synthetical\GlyphFont.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\GlyphImage.cs"> <Link>Test\RenderingVerification\Models\Synthetical\GlyphImage.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\GlyphLayout.cs"> <Link>Test\RenderingVerification\Models\Synthetical\GlyphLayout.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\GlyphModel.cs"> <Link>Test\RenderingVerification\Models\Synthetical\GlyphModel.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\GlyphPanel.cs"> <Link>Test\RenderingVerification\Models\Synthetical\GlyphPanel.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\GlyphResource.cs"> <Link>Test\RenderingVerification\Models\Synthetical\GlyphResource.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\GlyphShape.cs"> <Link>Test\RenderingVerification\Models\Synthetical\GlyphShape.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\GlyphText.cs"> <Link>Test\RenderingVerification\Models\Synthetical\GlyphText.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\Interfaces.cs"> <Link>Test\RenderingVerification\Models\Synthetical\Interfaces.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\LayoutContainer.cs"> <Link>Test\RenderingVerification\Models\Synthetical\LayoutContainer.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\MatchingInfo.cs"> <Link>Test\RenderingVerification\Models\Synthetical\MatchingInfo.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\MatchingInfoEditor.cs"> <Link>Test\RenderingVerification\Models\Synthetical\MatchingInfoEditor.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\StandardTypographer.cs"> <Link>Test\RenderingVerification\Models\Synthetical\StandardTypographer.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\TypographBroker.cs"> <Link>Test\RenderingVerification\Models\Synthetical\TypographBroker.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\XenoSymbolBroker.cs"> <Link>Test\RenderingVerification\Models\Synthetical\XenoSymbolBroker.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\LayoutEngine\CanvasLayoutEngine.cs"> <Link>Test\RenderingVerification\Models\Synthetical\LayoutEngine\CanvasLayoutEngine.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\LayoutEngine\FlowLayoutEngine.cs"> <Link>Test\RenderingVerification\Models\Synthetical\LayoutEngine\FlowLayoutEngine.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\ResourceFetcher\EmbeddedResourceKey.cs"> <Link>Test\RenderingVerification\ResourceFetcher\EmbeddedResourceKey.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\ResourceFetcher\EmbeddedResourceProvider.cs"> <Link>Test\RenderingVerification\ResourceFetcher\EmbeddedResourceProvider.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\ResourceFetcher\ResourceProvider.cs"> <Link>Test\RenderingVerification\ResourceFetcher\ResourceProvider.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\ResourceFetcher\Resourcestripper.cs"> <Link>Test\RenderingVerification\ResourceFetcher\Resourcestripper.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\UnmanagedProxies\UnmanagedInterfaces.cs"> <Link>Test\RenderingVerification\UnmanagedProxies\UnmanagedInterfaces.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\AsyncData.cs"> <Link>Test\RenderingVerification\AsyncData.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\AsyncHelper.cs"> <Link>Test\RenderingVerification\AsyncHelper.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\ImageComparisonResult.cs"> <Link>Test\RenderingVerification\ImageComparisonResult.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\ImageComparisonSettings.cs"> <Link>Test\RenderingVerification\ImageComparisonSettings.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\ImageMetadata.cs"> <Link>Test\RenderingVerification\ImageMetadata.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\MasterDimensions.cs"> <Link>Test\RenderingVerification\MasterDimensions.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\MasterImageComparer.cs"> <Link>Test\RenderingVerification\MasterImageComparer.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\MasterIndex.cs"> <Link>Test\RenderingVerification\MasterIndex.cs</Link> </SourcesRenderingverification>
+    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\MasterMetadata.cs"> <Link>Test\RenderingVerification\MasterMetadata.cs</Link> </SourcesRenderingverification>
+  </ItemGroup>
+
+  <!-- Managed Resource Vscan -->
+  <ItemGroup>
+    <ManagedResourcesVscan Include="$(CommonCodeLocation)\RenderingVerification\DefaultTolerance.xml">
+      <LogicalName>Microsoft.Test.RenderingVerification.RenderingVerification.DefaultTolerance.xml</LogicalName>
+      <Link>Resources\VScan\DefaultTolerance.xml</Link>
+    </ManagedResourcesVscan>
+  </ItemGroup>
+
+  <!-- Compression -->
+  <ItemGroup>
+    <SourcesCompression Include="$(CommonCodeLocation)\Compression\Archiver.cs"> <Link>Test\Compression\Archiver.cs</Link> </SourcesCompression>
+    <SourcesCompression Include="$(CommonCodeLocation)\Compression\Cab\Cab.cs"> <Link>Test\Compression\Cab\Cab.cs</Link> </SourcesCompression>
+    <SourcesCompression Include="$(CommonCodeLocation)\Compression\Cab\CabApi.cs"> <Link>Test\Compression\Cab\CabApi.cs</Link> </SourcesCompression>
+    <SourcesCompression Include="$(CommonCodeLocation)\Compression\Cab\CabBase.cs"> <Link>Test\Compression\Cab\CabBase.cs</Link> </SourcesCompression>
+    <SourcesCompression Include="$(CommonCodeLocation)\Compression\Cab\CabCreator.cs"> <Link>Test\Compression\Cab\CabCreator.cs</Link> </SourcesCompression>
+    <SourcesCompression Include="$(CommonCodeLocation)\Compression\Cab\CabException.cs"> <Link>Test\Compression\Cab\CabException.cs</Link> </SourcesCompression>
+    <SourcesCompression Include="$(CommonCodeLocation)\Compression\Cab\CabExtractor.cs"> <Link>Test\Compression\Cab\CabExtractor.cs</Link> </SourcesCompression>
+    <SourcesCompression Include="$(CommonCodeLocation)\Compression\Cab\CabInfo.cs"> <Link>Test\Compression\Cab\CabInfo.cs</Link> </SourcesCompression>
+    <SourcesCompression Include="$(CommonCodeLocation)\Compression\Cab\CabStatus.cs"> <Link>Test\Compression\Cab\CabStatus.cs</Link> </SourcesCompression>
+    <SourcesCompression Include="$(CommonCodeLocation)\Compression\Cab\DuplicateStream.cs"> <Link>Test\Compression\Cab\DuplicateStream.cs</Link> </SourcesCompression>
+    <SourcesCompression Include="$(CommonCodeLocation)\Compression\Cab\HandleManager.cs"> <Link>Test\Compression\Cab\HandleManager.cs</Link> </SourcesCompression>
+    <SourcesCompression Include="$(CommonCodeLocation)\Compression\Cab\OffsetStream.cs"> <Link>Test\Compression\Cab\OffsetStream.cs</Link> </SourcesCompression>
+  </ItemGroup>
+
+  <!-- Graphics Base -->
+  <ItemGroup>
+    <SourcesGraphicsBase Include="$(CommonCodeLocation)\Graphics\ColorOperations.cs"> <Link>Test\Graphics\ColorOperations.cs</Link> </SourcesGraphicsBase>
+    <SourcesGraphicsBase Include="$(CommonCodeLocation)\Graphics\DiscreteAnimation.cs"> <Link>Test\Graphics\DiscreteAnimation.cs</Link> </SourcesGraphicsBase>
+    <SourcesGraphicsBase Include="$(CommonCodeLocation)\Graphics\MathEx.cs"> <Link>Test\Graphics\MathEx.cs</Link> </SourcesGraphicsBase>
+    <SourcesGraphicsBase Include="$(CommonCodeLocation)\Graphics\Matrix3DAnimation.cs"> <Link>Test\Graphics\Matrix3DAnimation.cs</Link> </SourcesGraphicsBase>
+    <SourcesGraphicsBase Include="$(CommonCodeLocation)\Graphics\MatrixUtils.cs"> <Link>Test\Graphics\MatrixUtils.cs</Link> </SourcesGraphicsBase>
+    <SourcesGraphicsBase Include="$(CommonCodeLocation)\Graphics\MeshOperations.cs"> <Link>Test\Graphics\MeshOperations.cs</Link> </SourcesGraphicsBase>
+    <SourcesGraphicsBase Include="$(CommonCodeLocation)\Graphics\ObjectUtils.cs"> <Link>Test\Graphics\ObjectUtils.cs</Link> </SourcesGraphicsBase>
+    <SourcesGraphicsBase Include="$(CommonCodeLocation)\Graphics\StringConverter.cs"> <Link>Test\Graphics\StringConverter.cs</Link> </SourcesGraphicsBase>
+    <SourcesGraphicsBase Include="$(CommonCodeLocation)\Graphics\VisualUtils.cs"> <Link>Test\Graphics\VisualUtils.cs</Link> </SourcesGraphicsBase>
+    <SourcesGraphicsBase Include="$(CommonCodeLocation)\Graphics\DpiScalingHelper.cs"> <Link>Test\Graphics\DpiScalingHelper.cs</Link> </SourcesGraphicsBase>
+    <SourcesGraphicsBase Include="$(CommonCodeLocation)\Graphics\RenderingModeHelper.cs"> <Link>Test\Graphics\RenderingModeHelper.cs</Link> </SourcesGraphicsBase>
+    <SourcesGraphicsBase Include="$(CommonCodeLocation)\Graphics\RenderingMode.cs"> <Link>Test\Graphics\RenderingMode.cs</Link> </SourcesGraphicsBase>
+  </ItemGroup>
+
+  <!-- Graphics Factories -->
+  <ItemGroup>
+    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\BrushFactory.cs"> <Link>Test\Graphics\Factories\BrushFactory.cs</Link> </SourcesGraphicsFactories>
+    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\CameraFactory.cs"> <Link>Test\Graphics\Factories\CameraFactory.cs</Link> </SourcesGraphicsFactories>
+    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\Const.cs"> <Link>Test\Graphics\Factories\Const.cs</Link> </SourcesGraphicsFactories>
+    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\Const2D.cs"> <Link>Test\Graphics\Factories\Const2D.cs</Link> </SourcesGraphicsFactories>
+    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\DrawingFactory.cs"> <Link>Test\Graphics\Factories\DrawingFactory.cs</Link> </SourcesGraphicsFactories>
+    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\EffectFactory.cs"> <Link>Test\Graphics\Factories\EffectFactory.cs</Link> </SourcesGraphicsFactories>
+    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\EffectInputFactory.cs"> <Link>Test\Graphics\Factories\EffectInputFactory.cs</Link> </SourcesGraphicsFactories>
+    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\GeometryFactory.cs"> <Link>Test\Graphics\Factories\GeometryFactory.cs</Link> </SourcesGraphicsFactories>
+    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\HitTestFilterFactory.cs"> <Link>Test\Graphics\Factories\HitTestFilterFactory.cs</Link> </SourcesGraphicsFactories>
+    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\LightFactory.cs"> <Link>Test\Graphics\Factories\LightFactory.cs</Link> </SourcesGraphicsFactories>
+    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\MaterialFactory.cs"> <Link>Test\Graphics\Factories\MaterialFactory.cs</Link> </SourcesGraphicsFactories>
+    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\MeshFactory.cs"> <Link>Test\Graphics\Factories\MeshFactory.cs</Link> </SourcesGraphicsFactories>
+    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\ModelFactory.cs"> <Link>Test\Graphics\Factories\ModelFactory.cs</Link> </SourcesGraphicsFactories>
+    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\ObjectFactory.cs"> <Link>Test\Graphics\Factories\ObjectFactory.cs</Link> </SourcesGraphicsFactories>
+    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\PenFactory.cs"> <Link>Test\Graphics\Factories\PenFactory.cs</Link> </SourcesGraphicsFactories>
+    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\SceneFactory.cs"> <Link>Test\Graphics\Factories\SceneFactory.cs</Link> </SourcesGraphicsFactories>
+    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\ShapeFactory.cs"> <Link>Test\Graphics\Factories\ShapeFactory.cs</Link> </SourcesGraphicsFactories>
+    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\Transform2DFactory.cs"> <Link>Test\Graphics\Factories\Transform2DFactory.cs</Link> </SourcesGraphicsFactories>
+    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\TransformFactory.cs"> <Link>Test\Graphics\Factories\TransformFactory.cs</Link> </SourcesGraphicsFactories>
+    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\Visual3DFactory.cs"> <Link>Test\Graphics\Factories\Visual3DFactory.cs</Link> </SourcesGraphicsFactories>
+    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\VisualFactory.cs"> <Link>Test\Graphics\Factories\VisualFactory.cs</Link> </SourcesGraphicsFactories>
+  </ItemGroup>
+
+  <!-- Graphics Reference Renderer -->
+  <ItemGroup>
+    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\BiLinearTextureFilter.cs"> <Link>Test\Graphics\ReferenceRender\BiLinearTextureFilter.cs</Link> </SourcesGraphicsReferenceRender>
+    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\Edge.cs"> <Link>Test\Graphics\ReferenceRender\Edge.cs</Link> </SourcesGraphicsReferenceRender>
+    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\GouraudShader.cs"> <Link>Test\Graphics\ReferenceRender\GouraudShader.cs</Link> </SourcesGraphicsReferenceRender>
+    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\HdrColor.cs"> <Link>Test\Graphics\ReferenceRender\HdrColor.cs</Link> </SourcesGraphicsReferenceRender>
+    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\Interpolators.cs"> <Link>Test\Graphics\ReferenceRender\Interpolators.cs</Link> </SourcesGraphicsReferenceRender>
+    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\LightEquations.cs"> <Link>Test\Graphics\ReferenceRender\LightEquations.cs</Link> </SourcesGraphicsReferenceRender>
+    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\MeshProjectedGeometry.cs"> <Link>Test\Graphics\ReferenceRender\MeshProjectedGeometry.cs</Link> </SourcesGraphicsReferenceRender>
+    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\ModelBounder.cs"> <Link>Test\Graphics\ReferenceRender\ModelBounder.cs</Link> </SourcesGraphicsReferenceRender>
+    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\ModelRenderer.cs"> <Link>Test\Graphics\ReferenceRender\ModelRenderer.cs</Link> </SourcesGraphicsReferenceRender>
+    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\NearestNeighbourTextureFilter.cs"> <Link>Test\Graphics\ReferenceRender\NearestNeighbourTextureFilter.cs</Link> </SourcesGraphicsReferenceRender>
+    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\PhongShader.cs"> <Link>Test\Graphics\ReferenceRender\PhongShader.cs</Link> </SourcesGraphicsReferenceRender>
+    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\ProjectedGeometry.cs"> <Link>Test\Graphics\ReferenceRender\ProjectedGeometry.cs</Link> </SourcesGraphicsReferenceRender>
+    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\RenderBuffer.cs"> <Link>Test\Graphics\ReferenceRender\RenderBuffer.cs</Link> </SourcesGraphicsReferenceRender>
+    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\RenderTolerance.cs"> <Link>Test\Graphics\ReferenceRender\RenderTolerance.cs</Link> </SourcesGraphicsReferenceRender>
+    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\RenderToToleranceShader.cs"> <Link>Test\Graphics\ReferenceRender\RenderToToleranceShader.cs</Link> </SourcesGraphicsReferenceRender>
+    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\RenderVerifier.cs"> <Link>Test\Graphics\ReferenceRender\RenderVerifier.cs</Link> </SourcesGraphicsReferenceRender>
+    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\SceneRenderer.cs"> <Link>Test\Graphics\ReferenceRender\SceneRenderer.cs</Link> </SourcesGraphicsReferenceRender>
+    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\Shader.cs"> <Link>Test\Graphics\ReferenceRender\Shader.cs</Link> </SourcesGraphicsReferenceRender>
+    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\SolidColorTextureFilter.cs"> <Link>Test\Graphics\ReferenceRender\SolidColorTextureFilter.cs</Link> </SourcesGraphicsReferenceRender>
+    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\SSLProjectedGeometry.cs"> <Link>Test\Graphics\ReferenceRender\SSLProjectedGeometry.cs</Link> </SourcesGraphicsReferenceRender>
+    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\TextureFilter.cs"> <Link>Test\Graphics\ReferenceRender\TextureFilter.cs</Link> </SourcesGraphicsReferenceRender>
+    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\TextureGenerator.cs"> <Link>Test\Graphics\ReferenceRender\TextureGenerator.cs</Link> </SourcesGraphicsReferenceRender>
+    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\Triangle.cs"> <Link>Test\Graphics\ReferenceRender\Triangle.cs</Link> </SourcesGraphicsReferenceRender>
+    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\TriLinearTextureFilter.cs"> <Link>Test\Graphics\ReferenceRender\TriLinearTextureFilter.cs</Link> </SourcesGraphicsReferenceRender>
+    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\Vertex.cs"> <Link>Test\Graphics\ReferenceRender\Vertex.cs</Link> </SourcesGraphicsReferenceRender>
+    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\VisualBounder.cs"> <Link>Test\Graphics\ReferenceRender\VisualBounder.cs</Link> </SourcesGraphicsReferenceRender>
+  </ItemGroup>
+
+  <!-- Graphics Test Types -->
+  <ItemGroup>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\AnimationAPITest.cs"> <Link>Test\Graphics\TestTypes\AnimationAPITest.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\AnimationAPITestBase.cs"> <Link>Test\Graphics\TestTypes\AnimationAPITestBase.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\ClassGenerator.cs"> <Link>Test\Graphics\TestTypes\ClassGenerator.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\CodeGenerator.cs"> <Link>Test\Graphics\TestTypes\CodeGenerator.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\ConstructorGenerator.cs"> <Link>Test\Graphics\TestTypes\ConstructorGenerator.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\CoreGraphicsTest.cs"> <Link>Test\Graphics\TestTypes\CoreGraphicsTest.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\EnvironmentWrapper.cs"> <Link>Test\Graphics\TestTypes\EnvironmentWrapper.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\ExceptionCatchingTest.cs"> <Link>Test\Graphics\TestTypes\ExceptionCatchingTest.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\Exceptions.cs"> <Link>Test\Graphics\TestTypes\Exceptions.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\FactoryParser.cs"> <Link>Test\Graphics\TestTypes\FactoryParser.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\InfoOrganizer.cs"> <Link>Test\Graphics\TestTypes\InfoOrganizer.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\InheritanceChecker.cs"> <Link>Test\Graphics\TestTypes\InheritanceChecker.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\Interop.cs"> <Link>Test\Graphics\TestTypes\Interop.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\Logger.cs"> <Link>Test\Graphics\TestTypes\Logger.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\MethodGenerator.cs"> <Link>Test\Graphics\TestTypes\MethodGenerator.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\MethodGeneratorBase.cs"> <Link>Test\Graphics\TestTypes\MethodGeneratorBase.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\PartialTrust.cs"> <Link>Test\Graphics\TestTypes\PartialTrust.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\PhotoConverter.cs"> <Link>Test\Graphics\TestTypes\PhotoConverter.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\Photographer.cs"> <Link>Test\Graphics\TestTypes\Photographer.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\PropertyGenerator.cs"> <Link>Test\Graphics\TestTypes\PropertyGenerator.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\ReferenceTest.cs"> <Link>Test\Graphics\TestTypes\ReferenceTest.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\RenderingTest.cs"> <Link>Test\Graphics\TestTypes\RenderingTest.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\RenderingWindow.cs"> <Link>Test\Graphics\TestTypes\RenderingWindow.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\RunAllTester.cs"> <Link>Test\Graphics\TestTypes\RunAllTester.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\RunScriptTester.cs"> <Link>Test\Graphics\TestTypes\RunScriptTester.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\SerializationTest.cs"> <Link>Test\Graphics\TestTypes\SerializationTest.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\Tester.cs"> <Link>Test\Graphics\TestTypes\Tester.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\TestLauncher.cs"> <Link>Test\Graphics\TestTypes\TestLauncher.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\TestObjects.cs"> <Link>Test\Graphics\TestTypes\TestObjects.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\Tokens.cs"> <Link>Test\Graphics\TestTypes\Tokens.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\Variation.cs"> <Link>Test\Graphics\TestTypes\Variation.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\ViewportWindow.cs"> <Link>Test\Graphics\TestTypes\ViewportWindow.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\VisualObjects.cs"> <Link>Test\Graphics\TestTypes\VisualObjects.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\VisualVerificationTest.cs"> <Link>Test\Graphics\TestTypes\VisualVerificationTest.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\VisualWindow.cs"> <Link>Test\Graphics\TestTypes\VisualWindow.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\VisualWrapper.cs"> <Link>Test\Graphics\TestTypes\VisualWrapper.cs</Link> </SourcesGraphicsTestTypes>
+    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\XAMLTest.cs"> <Link>Test\Graphics\TestTypes\XAMLTest.cs</Link> </SourcesGraphicsTestTypes>
+  </ItemGroup>
+
+  <!-- Graphics -->
+  <ItemGroup>
+    <SourcesGraphics Include="@(SourcesGraphicsBase)" />
+    <SourcesGraphics Include="@(SourcesGraphicsFactories)" />
+    <SourcesGraphics Include="@(SourcesGraphicsReferenceRender)" />
+    <SourcesGraphics Include="@(SourcesGraphicsTestTypes)" />
+  </ItemGroup>
+
+  <!-- Layout Common -->
+  <ItemGroup>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\Common\Common.cs"> <Link>Test\Layout\Common\Common.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\Common\LayoutTestWindows.cs"> <Link>Test\Layout\Common\LayoutTestWindows.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\Common\LayoutUtility.cs"> <Link>Test\Layout\Common\LayoutUtility.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\Common\DoubleUtil.cs"> <Link>Test\Layout\Common\DoubleUtil.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\Common\VisualScan.cs"> <Link>Test\Layout\Common\VisualScan.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\TestTypes\LayoutTest.cs"> <Link>Test\Layout\TestTypes\LayoutTest.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\TestTypes\CodeTest.cs"> <Link>Test\Layout\TestTypes\CodeTest.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\TestTypes\PropertyDumpTest.cs"> <Link>Test\Layout\TestTypes\PropertyDumpTest.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\TestTypes\VisualScanTest.cs"> <Link>Test\Layout\TestTypes\VisualScanTest.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\Arguments.cs"> <Link>Test\Layout\PropertyDump\Arguments.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\DiffPackage.cs"> <Link>Test\Layout\PropertyDump\DiffPackage.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\Filter.cs"> <Link>Test\Layout\PropertyDump\Filter.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\FrameworkElements.cs"> <Link>Test\Layout\PropertyDump\FrameworkElements.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\Package.cs"> <Link>Test\Layout\PropertyDump\Package.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\PropertyDumpCore.cs"> <Link>Test\Layout\PropertyDump\PropertyDumpCore.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\PropertyDumpHelper.cs"> <Link>Test\Layout\PropertyDump\PropertyDumpHelper.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\ColumnResultW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\ColumnResultW.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\ContainerParagraphResultW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\ContainerParagraphResultW.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\DocumentPageTextViewW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\DocumentPageTextViewW.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\FloaterParagraphResultW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\FloaterParagraphResultW.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\FigureParagraphResultW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\FigureParagraphResultW.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\FlowDocumentPageW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\FlowDocumentPageW.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\IEnumerableW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\IEnumerableW.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\LineResultDetailsW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\LineResultDetailsW.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\LineResultW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\LineResultW.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\OrientedTextPositionW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\OrientedTextPositionW.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\ParagraphResultW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\ParagraphResultW.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\ReflectionHelper.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\ReflectionHelper.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\RowParagraphResultW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\RowParagraphResultW.cs</Link> </SourcesLayoutCommon>    
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\SubpageParagraphResultW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\SubpageParagraphResultW.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\TableParagraphResultW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\TableParagraphResultW.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\TextDocumentViewW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\TextDocumentViewW.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\TextParagraphResultW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\TextParagraphResultW.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\TextParagraphViewW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\TextParagraphViewW.cs</Link> </SourcesLayoutCommon>
+    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\UIElementParagraphResultW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\UIElementParagraphResultW.cs</Link> </SourcesLayoutCommon>
+  </ItemGroup>
+
+  <!-- Stress Framework -->
+  <ItemGroup>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\DistributionFactory.cs"> <Link>Test\Stability\Stress\DistributionFactory.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\RandDist.cs"> <Link>Test\Stability\Stress\RandDist.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\RandomGenerator.cs"> <Link>Test\Stability\Stress\RandomGenerator.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Invariant.cs"> <Link>Test\Stability\Stress\Invariant.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\StressFrameWorkHelper.cs"> <Link>Test\Stability\Stress\StressFrameWorkHelper.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\WeightedList.cs"> <Link>Test\Stability\Stress\WeightedList.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Action\ActionManager.cs"> <Link>Test\Stability\Stress\Action\ActionManager.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Action\Attributes.cs"> <Link>Test\Stability\Stress\Action\Attributes.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Action\IAction.cs"> <Link>Test\Stability\Stress\Action\IAction.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Action\IActionFactory.cs"> <Link>Test\Stability\Stress\Action\IActionFactory.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Action\WeightedActionFactory.cs"> <Link>Test\Stability\Stress\Action\WeightedActionFactory.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\ConfigReader\ConfigReader.cs"> <Link>Test\Stability\Stress\ConfigReader\ConfigReader.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\ConfigReader\IConfigReader.cs"> <Link>Test\Stability\Stress\ConfigReader\IConfigReader.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\ConfigReader\MultipleTagSectionHandler.cs"> <Link>Test\Stability\Stress\ConfigReader\MultipleTagSectionHandler.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Context\ActionHandlers.cs"> <Link>Test\Stability\Stress\Context\ActionHandlers.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Context\EventHandlers.cs"> <Link>Test\Stability\Stress\Context\EventHandlers.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Context\EventArgs.cs"> <Link>Test\Stability\Stress\Context\EventArgs.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Context\Handlers.cs"> <Link>Test\Stability\Stress\Context\Handlers.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Context\IStressContext.cs"> <Link>Test\Stability\Stress\Context\IStressContext.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Context\IStressContextManager.cs"> <Link>Test\Stability\Stress\Context\IStressContextManager.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Context\StressContext.cs"> <Link>Test\Stability\Stress\Context\StressContext.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Context\StressContextManager.cs"> <Link>Test\Stability\Stress\Context\StressContextManager.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Context\IObjectFactory.cs"> <Link>Test\Stability\Stress\Context\IObjectFactory.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Context\EnumerationObjectFactory.cs"> <Link>Test\Stability\Stress\Context\EnumerationObjectFactory.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Context\ReflectionObjectFactory.cs"> <Link>Test\Stability\Stress\Context\ReflectionObjectFactory.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\CoreServices\CoreServices.cs"> <Link>Test\Stability\Stress\CoreServices\CoreServices.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\CoreServices\ICoreServices.cs"> <Link>Test\Stability\Stress\CoreServices\ICoreServices.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\CoreServices\IStressManager.cs"> <Link>Test\Stability\Stress\CoreServices\IStressManager.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\CoreServices\StressManager.cs"> <Link>Test\Stability\Stress\CoreServices\StressManager.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\CoreServices\EventLogger.cs"> <Link>Test\Stability\Stress\CoreServices\EventLogger.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Exceptions\ExceptionEventArgs.cs"> <Link>Test\Stability\Stress\Exceptions\ExceptionEventArgs.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Exceptions\ExceptionEventHandlers.cs"> <Link>Test\Stability\Stress\Exceptions\ExceptionEventHandlers.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\PropertyEngine\PropertyEngine.cs"> <Link>Test\Stability\Stress\PropertyEngine\PropertyEngine.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Storage\ContextStorage.cs"> <Link>Test\Stability\Stress\Storage\ContextStorage.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Storage\EventArgs.cs"> <Link>Test\Stability\Stress\Storage\EventArgs.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Storage\IStorage.cs"> <Link>Test\Stability\Stress\Storage\IStorage.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\StressFrameworkObject\IStressFrameworkObject.cs"> <Link>Test\Stability\Stress\StressFrameworkObject\IStressFrameworkObject.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\StressFrameworkObject\StressFrameworkObject.cs"> <Link>Test\Stability\Stress\StressFrameworkObject\StressFrameworkObject.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Security\SecurityHelper.cs"> <Link>Test\Stability\Stress\Security\SecurityHelper.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Thread\EventArgs.cs"> <Link>Test\Stability\Stress\Thread\EventArgs.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Thread\EventHandlers.cs"> <Link>Test\Stability\Stress\Thread\EventHandlers.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Thread\IStressThread.cs"> <Link>Test\Stability\Stress\Thread\IStressThread.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Thread\IStressThreadManager.cs"> <Link>Test\Stability\Stress\Thread\IStressThreadManager.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Thread\StressThread.cs"> <Link>Test\Stability\Stress\Thread\StressThread.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Thread\StressThreadManager.cs"> <Link>Test\Stability\Stress\Thread\StressThreadManager.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Utils\ProcessShutdownMonitor.cs"> <Link>Test\Stability\Stress\Utils\ProcessShutdownMonitor.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Utils\Win32NativeInterop.cs"> <Link>Test\Stability\Stress\Utils\Win32NativeInterop.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Utils\CommandlineParser.cs"> <Link>Test\Stability\Stress\Utils\CommandlineParser.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Utils\XmlParser.cs"> <Link>Test\Stability\Stress\Utils\XmlParser.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\IEHelper\DISPIDs.cs"> <Link>Test\Stability\Stress\IEHelper\DISPIDs.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\IEHelper\IEInterop.cs"> <Link>Test\Stability\Stress\IEHelper\IEInterop.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\IEHelper\Rtl.cs"> <Link>Test\Stability\Stress\IEHelper\Rtl.cs</Link> </SourcesStressFramework>
+    <SourcesStressFramework Include="$(CommonCodeLocation)\Collections\Generics\WeightedList.cs"> <Link>Test\Collections\Generics\WeightedList.cs</Link> </SourcesStressFramework>
+  </ItemGroup>
+
+  <!-- Stress Framework -->
+  <ItemGroup>
+    <SourcesStressFrameworkAvalonProxy Include="$(CommonCodeLocation)\Stability\Stress\AvalonProxy\AssemblyCacheEnum.cs"> <Link>Test\Stability\Stress\AvalonProxy\AssemblyCacheEnum.cs</Link> </SourcesStressFrameworkAvalonProxy>
+    <SourcesStressFrameworkAvalonProxy Include="$(CommonCodeLocation)\Stability\Stress\AvalonProxy\AvalonActionManager.cs"> <Link>Test\Stability\Stress\AvalonProxy\AvalonActionManager.cs</Link> </SourcesStressFrameworkAvalonProxy>
+    <SourcesStressFrameworkAvalonProxy Include="$(CommonCodeLocation)\Stability\Stress\AvalonProxy\AvalonStressContext.cs"> <Link>Test\Stability\Stress\AvalonProxy\AvalonStressContext.cs</Link> </SourcesStressFrameworkAvalonProxy>
+    <SourcesStressFrameworkAvalonProxy Include="$(CommonCodeLocation)\Stability\Stress\AvalonProxy\AvalonStressContextManager.cs"> <Link>Test\Stability\Stress\AvalonProxy\AvalonStressContextManager.cs</Link> </SourcesStressFrameworkAvalonProxy>
+    <SourcesStressFrameworkAvalonProxy Include="$(CommonCodeLocation)\Stability\Stress\AvalonProxy\AvalonStressThreadManager.cs"> <Link>Test\Stability\Stress\AvalonProxy\AvalonStressThreadManager.cs</Link> </SourcesStressFrameworkAvalonProxy>
+    <SourcesStressFrameworkAvalonProxy Include="$(CommonCodeLocation)\Stability\Stress\AvalonProxy\MemoryChecker.cs"> <Link>Test\Stability\Stress\AvalonProxy\MemoryChecker.cs</Link> </SourcesStressFrameworkAvalonProxy>
+    <SourcesStressFrameworkAvalonProxy Include="$(CommonCodeLocation)\Stability\Stress\AvalonProxy\AvalonStressFrameworkHelper.cs"> <Link>Test\Stability\Stress\AvalonProxy\AvalonStressFrameworkHelper.cs</Link> </SourcesStressFrameworkAvalonProxy>
+    <SourcesStressFrameworkAvalonProxy Include="$(CommonCodeLocation)\Stability\Stress\AvalonProxy\BrowserStressContext.cs"> <Link>Test\Stability\Stress\AvalonProxy\BrowserStressContext.cs</Link> </SourcesStressFrameworkAvalonProxy>
+    <SourcesStressFrameworkAvalonProxy Include="$(CommonCodeLocation)\Stability\Stress\AvalonProxy\BrowserStressContextManager.cs"> <Link>Test\Stability\Stress\AvalonProxy\BrowserStressContextManager.cs</Link> </SourcesStressFrameworkAvalonProxy>
+    <SourcesStressFrameworkAvalonProxy Include="$(CommonCodeLocation)\Stability\Stress\AvalonProxy\BrowserStressThreadManager.cs"> <Link>Test\Stability\Stress\AvalonProxy\BrowserStressThreadManager.cs</Link> </SourcesStressFrameworkAvalonProxy>
+  </ItemGroup>
+
+  <!-- Stress Framework -->
+  <ItemGroup>
+    <SourcesStressFrameworkLonghaulProxy Include="$(CommonCodeLocation)\Stability\Stress\LonghaulProxy\LonghaulSQLConnect.cs"> <Link>Test\Stability\Stress\LonghaulProxy\LonghaulSQLConnect.cs</Link> </SourcesStressFrameworkLonghaulProxy>
+    <SourcesStressFrameworkLonghaulProxy Include="$(CommonCodeLocation)\Stability\Stress\LonghaulProxy\LonghaulCommon.cs"> <Link>Test\Stability\Stress\LonghaulProxy\LonghaulCommon.cs</Link> </SourcesStressFrameworkLonghaulProxy>
+    <SourcesStressFrameworkLonghaulProxy Include="$(CommonCodeLocation)\Stability\Stress\LonghaulProxy\LonghaulStateObjects.cs"> <Link>Test\Stability\Stress\LonghaulProxy\LonghaulStateObjects.cs</Link> </SourcesStressFrameworkLonghaulProxy>
+    <SourcesStressFrameworkLonghaulProxy Include="$(CommonCodeLocation)\Stability\Stress\LonghaulProxy\LonghaulStressContext.cs"> <Link>Test\Stability\Stress\LonghaulProxy\LonghaulStressContext.cs</Link> </SourcesStressFrameworkLonghaulProxy>
+    <SourcesStressFrameworkLonghaulProxy Include="$(CommonCodeLocation)\Stability\Stress\LonghaulProxy\LonghaulStressContextManager.cs"> <Link>Test\Stability\Stress\LonghaulProxy\LonghaulStressContextManager.cs</Link> </SourcesStressFrameworkLonghaulProxy>
+    <SourcesStressFrameworkLonghaulProxy Include="$(CommonCodeLocation)\Stability\Stress\LonghaulProxy\LonghaulStressThreadManager.cs"> <Link>Test\Stability\Stress\LonghaulProxy\LonghaulStressThreadManager.cs</Link> </SourcesStressFrameworkLonghaulProxy>
+    <SourcesStressFrameworkLonghaulProxy Include="$(CommonCodeLocation)\Stability\Stress\LonghaulProxy\LonghaulEventLog.cs"> <Link>Test\Stability\Stress\LonghaulProxy\LonghaulEventLog.cs</Link> </SourcesStressFrameworkLonghaulProxy>
+  </ItemGroup>
+
+  <!-- Stability Leak -->
+  <ItemGroup>
+    <SourcesStabilityLeak Include="$(CommonCodeLocation)\Stability\LeakUtility.cs"> <Link>Test\Stability\LeakUtility.cs</Link> </SourcesStabilityLeak>
+    <SourcesStabilityLeak Include="$(CommonCodeLocation)\Stability\Input.cs"> <Link>Test\Stability\Input.cs</Link> </SourcesStabilityLeak>
+  </ItemGroup>
+
+  <!-- Stress Graphics -->
+  <ItemGroup>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\AddNodes.cs"> <Link>Test\Stability\Stress\Graphics\AddNodes.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\AnimationFactory.cs"> <Link>Test\Stability\Stress\Graphics\AnimationFactory.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\Channel.cs"> <Link>Test\Stability\Stress\Graphics\Channel.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\ChannelFactory.cs"> <Link>Test\Stability\Stress\Graphics\ChannelFactory.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\CompositionActorFactory.cs"> <Link>Test\Stability\Stress\Graphics\CompositionActorFactory.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\ConnectDisconnect.cs"> <Link>Test\Stability\Stress\Graphics\ConnectDisconnect.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\ConnectDisconnectActorFactory.cs"> <Link>Test\Stability\Stress\Graphics\ConnectDisconnectActorFactory.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\ContainerVisual.cs"> <Link>Test\Stability\Stress\Graphics\ContainerVisual.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\DrawContextProvider.cs"> <Link>Test\Stability\Stress\Graphics\DrawContextProvider.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\GetHwndSources.cs"> <Link>Test\Stability\Stress\Graphics\GetHwndSources.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\GetProperties.cs"> <Link>Test\Stability\Stress\Graphics\GetProperties.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\GetPropertiesFactory.cs"> <Link>Test\Stability\Stress\Graphics\GetPropertiesFactory.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\HelperClass.cs"> <Link>Test\Stability\Stress\Graphics\HelperClass.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\HitTest.cs"> <Link>Test\Stability\Stress\Graphics\HitTest.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\HitTestFactory.cs"> <Link>Test\Stability\Stress\Graphics\HitTestFactory.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\HostVisual.cs"> <Link>Test\Stability\Stress\Graphics\HostVisual.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\HwndSourceCreator.cs"> <Link>Test\Stability\Stress\Graphics\HwndSourceCreator.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\IDrawContextProvider.cs"> <Link>Test\Stability\Stress\Graphics\IDrawContextProvider.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\IRootVisualHolder.cs"> <Link>Test\Stability\Stress\Graphics\IRootVisualHolder.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\ISurface.cs"> <Link>Test\Stability\Stress\Graphics\ISurface.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\IVisual.cs"> <Link>Test\Stability\Stress\Graphics\IVisual.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\IVisualProperties.cs"> <Link>Test\Stability\Stress\Graphics\IVisualProperties.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\Magnifier.cs"> <Link>Test\Stability\Stress\Graphics\Magnifier.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\MagnifierFactory.cs"> <Link>Test\Stability\Stress\Graphics\MagnifierFactory.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\MoveNode.cs"> <Link>Test\Stability\Stress\Graphics\MoveNode.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\NodeActor.cs"> <Link>Test\Stability\Stress\Graphics\NodeActor.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\NodeCreator.cs"> <Link>Test\Stability\Stress\Graphics\NodeCreator.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\R3DVisual.cs"> <Link>Test\Stability\Stress\Graphics\R3DVisual.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\Random.cs"> <Link>Test\Stability\Stress\Graphics\Random.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\RemoveNode.cs"> <Link>Test\Stability\Stress\Graphics\RemoveNode.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\RenderTargetBitmap.cs"> <Link>Test\Stability\Stress\Graphics\RenderTargetBitmap.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\RenderTargetBitmapFactory.cs"> <Link>Test\Stability\Stress\Graphics\RenderTargetBitmapFactory.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\RootVisualHolder.cs"> <Link>Test\Stability\Stress\Graphics\RootVisualHolder.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\RootVisualHolderActor.cs"> <Link>Test\Stability\Stress\Graphics\RootVisualHolderActor.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\SharedObjects.cs"> <Link>Test\Stability\Stress\Graphics\SharedObjects.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\TransformCreatorFactory.cs"> <Link>Test\Stability\Stress\Graphics\TransformCreatorFactory.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\TreeActor.cs"> <Link>Test\Stability\Stress\Graphics\TreeActor.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\TreeCreator.cs"> <Link>Test\Stability\Stress\Graphics\TreeCreator.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\TreeCreatorInitFactory.cs"> <Link>Test\Stability\Stress\Graphics\TreeCreatorInitFactory.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\TreeInitActor.cs"> <Link>Test\Stability\Stress\Graphics\TreeInitActor.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\UpdateProperties.cs"> <Link>Test\Stability\Stress\Graphics\UpdateProperties.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\UpdatePropertiesFactory.cs"> <Link>Test\Stability\Stress\Graphics\UpdatePropertiesFactory.cs</Link> </SourcesStressGraphics>
+    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\VisualTarget.cs"> <Link>Test\Stability\Stress\Graphics\VisualTarget.cs</Link> </SourcesStressGraphics>
+  </ItemGroup>
+
+  <!-- Performance  -->
+  <ItemGroup>
+    <SourcesPerformanceTesting Include="$(CommonCodeLocation)\Performance\CLRProfilerControl.cs"> <Link>Test\Performance\CLRProfilerControl.cs</Link> </SourcesPerformanceTesting>
+    <SourcesPerformanceTesting Include="$(CommonCodeLocation)\Performance\CustomTestAction.cs"> <Link>Test\Performance\CustomTestAction.cs</Link> </SourcesPerformanceTesting>
+    <SourcesPerformanceTesting Include="$(CommonCodeLocation)\Performance\InputPerf.cs"> <Link>Test\Performance\InputPerf.cs</Link> </SourcesPerformanceTesting>
+    <SourcesPerformanceTesting Include="$(CommonCodeLocation)\Performance\PerfActionHelper.cs"> <Link>Test\Performance\PerfActionHelper.cs</Link> </SourcesPerformanceTesting>
+    <SourcesPerformanceTesting Include="$(CommonCodeLocation)\Performance\TraceProvider.cs"> <Link>Test\Performance\TraceProvider.cs</Link> </SourcesPerformanceTesting>
+    <SourcesPerformanceTesting Include="$(CommonCodeLocation)\Performance\EventTrace.cs"> <Link>Test\Performance\EventTrace.cs</Link> </SourcesPerformanceTesting>
+    <SourcesPerformanceTesting Include="$(CommonCodeLocation)\Performance\EventType.cs"> <Link>Test\Performance\EventType.cs</Link> </SourcesPerformanceTesting>
+  </ItemGroup>
+
+  <!-- Performance Partial Trust -->
+  <ItemGroup>
+    <SourcesPerformanceTestingPartialTrust Include="$(CommonCodeLocation)\Performance\CLRProfilerControl.cs"> <Link>Test\Performance\CLRProfilerControl.cs</Link> </SourcesPerformanceTestingPartialTrust>
+    <SourcesPerformanceTestingPartialTrust Include="$(CommonCodeLocation)\Performance\CustomTestAction.cs"> <Link>Test\Performance\CustomTestAction.cs</Link> </SourcesPerformanceTestingPartialTrust>
+    <SourcesPerformanceTestingPartialTrust Include="$(CommonCodeLocation)\Performance\InputPerf_PartialTrust.cs"> <Link>Test\Performance\InputPerf_PartialTrust.cs</Link> </SourcesPerformanceTestingPartialTrust>
+    <SourcesPerformanceTestingPartialTrust Include="$(CommonCodeLocation)\Performance\PerfActionHelper.cs"> <Link>Test\Performance\PerfActionHelper.cs</Link> </SourcesPerformanceTestingPartialTrust>
+    <SourcesPerformanceTestingPartialTrust Include="$(CommonCodeLocation)\Performance\PerfTestTraceProvider.cs"> <Link>Test\Performance\PerfTestTraceProvider.cs</Link> </SourcesPerformanceTestingPartialTrust>
+  </ItemGroup>
+
+  <!-- Annotations -->
+  <ItemGroup>
+    <SourcesAnnotations Include="$(CommonCodeLocation)\Annotations\AnnotationsTestSettings.cs"> <Link>Test\Annotations\AnnotationsTestSettings.cs</Link> </SourcesAnnotations>
+    <SourcesAnnotations Include="$(CommonCodeLocation)\Annotations\Attributes.cs"> <Link>Test\Annotations\Attributes.cs</Link> </SourcesAnnotations>
+    <SourcesAnnotations Include="$(CommonCodeLocation)\Annotations\FastTestSuite.cs"> <Link>Test\Annotations\FastTestSuite.cs</Link> </SourcesAnnotations>
+    <SourcesAnnotations Include="$(CommonCodeLocation)\Annotations\TestSuite.cs"> <Link>Test\Annotations\TestSuite.cs</Link> </SourcesAnnotations>
+    <SourcesAnnotations Include="$(CommonCodeLocation)\Annotations\TestSuiteRunner.cs"> <Link>Test\Annotations\TestSuiteRunner.cs</Link> </SourcesAnnotations>
+    <SourcesAnnotations Include="$(CommonCodeLocation)\Annotations\UIAutomationModule.cs"> <Link>Test\Annotations\UIAutomationModule.cs</Link> </SourcesAnnotations>
+    <SourcesAnnotations Include="$(CommonCodeLocation)\Annotations\VisualAutomationTestSuite.cs"> <Link>Test\Annotations\VisualAutomationTestSuite.cs</Link> </SourcesAnnotations>
+    <SourcesAnnotations Include="$(CommonCodeLocation)\Annotations\VScanModule.cs"> <Link>Test\Annotations\VScanModule.cs</Link> </SourcesAnnotations>
+    <SourcesAnnotations Include="$(CommonCodeLocation)\Annotations\Internal\ALogger.cs"> <Link>Test\Annotations\Internal\ALogger.cs</Link> </SourcesAnnotations>
+    <SourcesAnnotations Include="$(CommonCodeLocation)\Annotations\Internal\TestCase.cs"> <Link>Test\Annotations\Internal\TestCase.cs</Link> </SourcesAnnotations>
+    <SourcesAnnotations Include="$(CommonCodeLocation)\Annotations\Internal\TestVariation.cs"> <Link>Test\Annotations\Internal\TestVariation.cs</Link> </SourcesAnnotations>
+  </ItemGroup>
+
+</Project>
diff --git a/src/Microsoft.DotNet.Wpf/test/StrongName.props b/src/Microsoft.DotNet.Wpf/test/StrongName.props
new file mode 100644
index 00000000000..9d7644845c8
--- /dev/null
+++ b/src/Microsoft.DotNet.Wpf/test/StrongName.props
@@ -0,0 +1,17 @@
+<Project>
+    <PropertyGroup>
+        <SignAssembly>false</SignAssembly>
+        <TestUntrustedKey>$(WpfTestBasePath)\Common\keys\TestUntrusted.snk</TestUntrustedKey>
+        <TestUntrustedPublicKey>0024000004800000940000000602000000240000525341310004000001000100C1BCD9B7844CD35725B1138216ED5E0FAB914676D580860F6F081C8C0E83B92D835FFAE76FA968F7637E4B6E32D77FEE1C084088CEE736CE589D65AD0FA66F086C2F5F755A6F2909D17C643B45C72A906AAAC617BFD67491A8FCE54784CA98317AEA28C0544546FF9123F6F94E59793F2874437BC3D136A40095D0F960E6A6A4</TestUntrustedPublicKey>
+        <TestUntrustedPublicKeyToken>A069DEE354D95F76</TestUntrustedPublicKeyToken>
+
+        <TestTrustedKey>$(WpfTestBasePath)\Common\keys\TestTrusted.snk</TestTrustedKey>
+        <TestTrustedPublicKey>00240000048000009400000006020000002400005253413100040000010001007FDB0774CDFEFC88AAA6613332E5BE12A11BD32ADB7E2EAD4C049CFFCC6284FA975CD55B0291738247984CFCF4074970C44C1DA29B07201B0F90FB7B2C60D2A604C4ABA9FBC106AD3D1838DAD496780B0E4518D045FE70C4DE4E9663354989CF9A2E4F9ADD41BFEF82437DA35C8B1C1A0D6DACB521456C4BB18BADA2BE7407C3</TestTrustedPublicKey>
+        <TestTrustedPublicKeyToken>e1e6160fdd198bb1</TestTrustedPublicKeyToken>
+        
+        <!-- Sign with the test key and ensure that we do not delay sign test code -->
+        <DelaySign>false</DelaySign>
+        <AssemblyOriginatorKeyFile>$(TestUntrustedKey)</AssemblyOriginatorKeyFile>
+        <StrongNameKeyId>custom</StrongNameKeyId>
+    </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Wpf/test/StrongName.targets b/src/Microsoft.DotNet.Wpf/test/StrongName.targets
new file mode 100644
index 00000000000..cfc73c73f7b
--- /dev/null
+++ b/src/Microsoft.DotNet.Wpf/test/StrongName.targets
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <PropertyGroup Condition="'$(SignAssembly)' == 'true' AND '$(AssemblyOriginatorKeyFile)' == '$(TestTrustedKey)'" >
+        <PublicKey>$(TestTrustedPublicKey)</PublicKey>
+        <PublicKeyToken>$(TestTrustedPublicKeyToken)</PublicKeyToken>
+  </PropertyGroup>
+  
+  <PropertyGroup Condition="'$(SignAssembly)' == 'true' AND '$(AssemblyOriginatorKeyFile)' == '$(TestUntrustedKey)'" >
+        <PublicKey>$(TestUntrustedPublicKey)</PublicKey>
+        <PublicKeyToken>$(TestUntrustedPublicKeyToken)</PublicKeyToken>
+  </PropertyGroup>
+</Project>

From 8c5ec100019b1a0c5a7b70babf0867a2b72b79a4 Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Fri, 10 May 2019 16:13:51 -0700
Subject: [PATCH 49/72] prepare helix payload with DRT

---
 eng/helix/helixpublish.proj                     |  2 +-
 eng/helix/prepare-helix-payload.ps1             | 17 ++++++++++++++---
 eng/helix/runtests.ps1                          |  2 +-
 .../test/Directory.Build.props                  |  2 +-
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/eng/helix/helixpublish.proj b/eng/helix/helixpublish.proj
index 75037efd768..3792f934aaa 100644
--- a/eng/helix/helixpublish.proj
+++ b/eng/helix/helixpublish.proj
@@ -24,7 +24,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <!--<PackageReference Include="Microsoft.DotNet.Wpf.DncEng.Test" Version="1.0.0" /> -->
+    <PackageReference Include="runtime.win-$(Platform).Microsoft.DotNet.Wpf.Test" Version="1.0.0-beta.19260.5" />
     <HelixCorrelationPayload Include="..\..\HelixPayload\$(Configuration)\$(Platform)" /> 
     <HelixWorkItem Include="HelloHelix">
       <Timeout>00:20:00</Timeout>
diff --git a/eng/helix/prepare-helix-payload.ps1 b/eng/helix/prepare-helix-payload.ps1
index 675a95ddb74..7181d004d07 100644
--- a/eng/helix/prepare-helix-payload.ps1
+++ b/eng/helix/prepare-helix-payload.ps1
@@ -37,12 +37,23 @@ function CopyFolderStructure($from, $to)
 }
 
 # Copy files from nuget packages
-$testNugetLocation = Join-Path $nugetPackagesDir "Microsoft.DotNet.Wpf.DncEng.Test\1.0.0\tools\win-$platform\"
+$testNugetLocation = Join-Path $nugetPackagesDir "runtime.win-$platform.Microsoft.DotNet.Wpf.DncEng.Test\1.0.0-beta.19260.5\tools\win-$platform\"
 $testPayloadLocation = Join-Path $payloadDir "Test"
 CopyFolderStructure $testNugetLocation $testPayloadLocation
 
-# Copy local dotnet install
-$localDotnetInstall = Join-Path $env:BUILD_SOURCESDIRECTORY '.dotnet'
+# Copy local DRT assemblies to test location
+CopyFolderStructure $testNugetLocation $testPayloadLocation
+$drtArtifactsLocation = [System.IO.Path]::Combine($env:BUILD_SOURCESDIRECTORY, "artifacts\test", $configuration, $platform, "Test\DRT")
+$drtPayloadLocation = Join-Path $payloadDir "Test\DRT"
+CopyFolderStructure $drtArtifactsLocation $drtPayloadLocation
+
+# Copy built assemblies to dotnet install location
+$eng = Join-Path $env:BUILD_SOURCESDIRECTORY "eng"
+$configArgs = if ($configuration == "Release") { "-release" } else { }
+& "$eng\copy-wpf.ps1 -local -arch $platform $configArgs"
+
+# Copy local dotnet install to payload
+$localDotnetInstall = Join-Path $env:BUILD_SOURCESDIRECTORY ".dotnet"
 $dotnetPayloadLocation = Join-Path $payloadDir "dotnet"
 CopyFolderStructure $localDotnetInstall $dotnetPayloadLocation
 
diff --git a/eng/helix/runtests.ps1 b/eng/helix/runtests.ps1
index 29ec11c15e3..90dff99c810 100644
--- a/eng/helix/runtests.ps1
+++ b/eng/helix/runtests.ps1
@@ -3,7 +3,7 @@
 & "$PSScriptRoot\configure-helix-machine.ps1"
 
 # Run the tests
-dotnet --info
+Get-ChildItem -Recurse
 
 # We can use $env:HELIX_PYTHONPATH $env:HELIX_SCRIPT_ROOT\upload_result.py to upload any QV specific logs and/or screenshots that we are interested in.
 # For example: $env:HELIX_PYTHONPATH $env:HELIX_SCRIPT_ROOT%\upload_result.py -result screenshot.jpg -result_name screenshot.jpg
diff --git a/src/Microsoft.DotNet.Wpf/test/Directory.Build.props b/src/Microsoft.DotNet.Wpf/test/Directory.Build.props
index 730df2169f9..5f0070737bf 100644
--- a/src/Microsoft.DotNet.Wpf/test/Directory.Build.props
+++ b/src/Microsoft.DotNet.Wpf/test/Directory.Build.props
@@ -2,7 +2,7 @@
   <Import Condition="Exists('../Directory.Build.props')" Project="../Directory.Build.props" />
   
   <PropertyGroup>
-    <PublishRoot>$(WpfIntRootDirectory)publish\</PublishRoot>
+    <PublishRoot>$(RepoRoot)artifacts\test\</PublishRoot>
     <PlatformFolder>x86</PlatformFolder>
     <PlatformFolder Condition="'$(Platform)' == 'x64'">x64</PlatformFolder>
   </PropertyGroup>

From a5010142bf4fb0e7240fba0fadcce59021116fcd Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Sun, 12 May 2019 07:40:56 -0700
Subject: [PATCH 50/72] add source link for deterministic source path issue

---
 src/Microsoft.DotNet.Wpf/test/Directory.Build.props | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Microsoft.DotNet.Wpf/test/Directory.Build.props b/src/Microsoft.DotNet.Wpf/test/Directory.Build.props
index 5f0070737bf..bff1c6bee77 100644
--- a/src/Microsoft.DotNet.Wpf/test/Directory.Build.props
+++ b/src/Microsoft.DotNet.Wpf/test/Directory.Build.props
@@ -5,8 +5,13 @@
     <PublishRoot>$(RepoRoot)artifacts\test\</PublishRoot>
     <PlatformFolder>x86</PlatformFolder>
     <PlatformFolder Condition="'$(Platform)' == 'x64'">x64</PlatformFolder>
+    <MicrosoftSourceLinkVersion>1.0.0-beta2-18618-05</MicrosoftSourceLinkVersion>
   </PropertyGroup>
   
+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="$(MicrosoftSourceLinkVersion)" PrivateAssets="all"/>
+  </ItemGroup>
+
   <PropertyGroup>
     <WpfTestBasePath>$(MsBuildThisFileDirectory)</WpfTestBasePath>
     <DrtCommonRoot>$(WpfTestBasePath)\Common\DRT</DrtCommonRoot>

From 5222a873a1666c805d09b280dbf83a9ae8ebd889 Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Sun, 12 May 2019 08:13:59 -0700
Subject: [PATCH 51/72] remove explicit platform and extra file added

---
 .../test/DRT/DrtXaml/dirs.proj                | 18 ----------
 .../test/Directory.Build.props                | 35 ++++++++++++-------
 2 files changed, 22 insertions(+), 31 deletions(-)
 delete mode 100644 src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/dirs.proj

diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/dirs.proj b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/dirs.proj
deleted file mode 100644
index a74471c0709..00000000000
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/dirs.proj
+++ /dev/null
@@ -1,18 +0,0 @@
-<Project ToolsVersion="dogfood" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <!--Import the settings-->
-  <Import Project="$(_NTDRIVE)$(_NTROOT)\wpf\test\Microsoft.Wpf.Test.Native.Settings.Targets" />
-
-  <ItemGroup Condition="'$(BuildExePhase)' == '' AND '$(WPF_TESTBUILD_TARGETVERSION)' != 'v3.0' AND '$(WPF_TESTBUILD_TARGETVERSION)' != 'v3.5' ">
-    <ProjectFile Include="DrtXaml\DrtXaml.csproj" />
-    <ProjectFile Include="PartialTrustTests\DrtXaml.PartialTrustTests.csproj" />
-    <ProjectFile Include="XamlTestClasses\XamlTestClasses.csproj" />
-    <ProjectFile Include="BamlTestClasses35\BamlTestClasses35.csproj" />
-    <ProjectFile Include="BamlTestClasses40\BamlTestClasses40.csproj" />
-    <ProjectFile Include="BamlAvoidXmlTest\BamlAvoidXmlTest.csproj" />
-    <ProjectFile Include="FriendWithKey\XamlTestClasses.FriendWithKey.csproj" />
-    <ProjectFile Include="FriendWithoutKey\XamlTestClasses.FriendWithoutKey.csproj" />
-  </ItemGroup>
-
-  <!--Import the targets-->
-  <Import Project="$(_NTDRIVE)$(_NTROOT)\tools\Microsoft.DevDiv.Traversal.targets" />
-</Project>
diff --git a/src/Microsoft.DotNet.Wpf/test/Directory.Build.props b/src/Microsoft.DotNet.Wpf/test/Directory.Build.props
index bff1c6bee77..471b0be1781 100644
--- a/src/Microsoft.DotNet.Wpf/test/Directory.Build.props
+++ b/src/Microsoft.DotNet.Wpf/test/Directory.Build.props
@@ -2,25 +2,35 @@
   <Import Condition="Exists('../Directory.Build.props')" Project="../Directory.Build.props" />
   
   <PropertyGroup>
+    <WpfTestBasePath>$(MsBuildThisFileDirectory)</WpfTestBasePath>
+    <DrtCommonRoot>$(WpfTestBasePath)\Common\DRT</DrtCommonRoot>
+    <WpfSharedRoot>$(WpfTestBasePath)\Shared</WpfSharedRoot>
     <PublishRoot>$(RepoRoot)artifacts\test\</PublishRoot>
-    <PlatformFolder>x86</PlatformFolder>
-    <PlatformFolder Condition="'$(Platform)' == 'x64'">x64</PlatformFolder>
+
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+
     <MicrosoftSourceLinkVersion>1.0.0-beta2-18618-05</MicrosoftSourceLinkVersion>
   </PropertyGroup>
   
+  <Choose>
+    <When Condition="'$(Platform)' == 'x64'">
+      <PropertyGroup>
+        <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+        <PlatformFolder>x64</PlatformFolder>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup>
+        <RuntimeIdentifier>win-x86</RuntimeIdentifier>
+        <PlatformFolder>x86</PlatformFolder>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="$(MicrosoftSourceLinkVersion)" PrivateAssets="all"/>
   </ItemGroup>
-
-  <PropertyGroup>
-    <WpfTestBasePath>$(MsBuildThisFileDirectory)</WpfTestBasePath>
-    <DrtCommonRoot>$(WpfTestBasePath)\Common\DRT</DrtCommonRoot>
-    <WpfSharedRoot>$(WpfTestBasePath)\Shared</WpfSharedRoot>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
-    <Platforms>AnyCPU;x64</Platforms>
-    <RuntimeIdentifiers>win-x64;win-x86</RuntimeIdentifiers>
-    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-  </PropertyGroup>
   
   <Import Project="$(MsBuildThisFileDirectory)\Publish.props"/>
   <Import Project="$(MsBuildThisFileDirectory)\StrongName.props"/>
@@ -53,7 +63,6 @@
     <EnableDefaultItems>false</EnableDefaultItems>
   </PropertyGroup>
 
-
   <PropertyGroup>
     <!-- CS0618 - UnmanagedType.Struct usage -->
     <!-- VSTHRD002 - Synchronous awaits from IPC since we can't convert the entire logging/IPC mechanism to async -->

From f3b4f5bb86d2bf53e646788da416ac33aedc6cf6 Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Sun, 12 May 2019 10:59:12 -0700
Subject: [PATCH 52/72] fixing up targets/props so we can build with -test

---
 Microsoft.Dotnet.Wpf.sln                      |   4 +-
 .../WpfArcadeSdk/tools}/DRT.Build.props       |   2 +
 .../WpfArcadeSdk/tools}/Publish.props         |   2 +-
 .../tools/PublishAfterBuild.targets           |  18 +
 .../WpfArcadeSdk/tools}/SourceLocations.props |   0
 .../WpfArcadeSdk/tools}/StrongName.props      |   2 +-
 .../WpfArcadeSdk/tools}/StrongName.targets    |   0
 eng/copy-wpf.ps1                              |   5 +-
 eng/helix/configure-helix-machine.ps1         |  16 -
 eng/helix/helixpublish.proj                   |  22 +-
 eng/helix/prepare-helix-payload.ps1           |  18 +-
 eng/helix/runtests.ps1                        |  19 +-
 .../test/BranchCommon/data/CommonData.csproj  |  20 +
 .../BranchCommon/data/Directory.Build.props   |   3 +
 .../test/BranchCommon/data/DrtList.xml        | 587 ++++++++++++++++++
 .../Common/{ => DRT}/TestServices/DrtBase.cs  |   0
 .../TestServices/DrtBaseGlobalInput.cs        |   0
 .../{ => DRT}/TestServices/DrtBaseInput.cs    |   0
 .../MS/Internal/MultiTargetUtilities.cs       |   0
 .../TestServices/MS/Internal/PointUtil.cs     |   0
 .../MS/Internal/SecurityCriticalDataForSet.cs |   0
 .../TestServices/MS/Win32/ExternDll.cs        |   0
 .../TestServices/MS/Win32/HandleCollector.cs  |   0
 .../TestServices/MS/Win32/NativeMethodsCLR.cs |   0
 .../MS/Win32/NativeMethodsOther.cs            |   0
 .../MS/Win32/NativeMethodsSetLastError.cs     |   0
 .../MS/Win32/SafeNativeMethodsCLR.cs          |   0
 .../MS/Win32/SafeNativeMethodsOther.cs        |   0
 .../MS/Win32/UnsafeNativeMethodsCLR.cs        |   0
 .../MS/Win32/UnsafeNativeMethodsOther.cs      |   0
 .../TestServices/TestServices.csproj          |   0
 .../test/Common/DRT/dirs.proj                 |  19 -
 src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml.sln |   4 +-
 .../BamlAvoidXmlTest/BamlAvoidXmlTest.csproj  |  25 +
 .../BamlTestClasses40.csproj                  |   6 +-
 .../BamlTestClasses40/TempDPSetOrder1.xaml.cs |  43 --
 .../TempDPSetOrder1ListBox.cs                 |  54 ++
 .../test/DRT/DrtXaml/Directory.Build.props    |   2 +-
 .../{DrtXaml.Tests.csproj => DrtXaml.csproj}  |  11 +-
 .../XamlTestClasses.FriendWithKey.csproj      |   1 -
 .../XamlTestClasses.FriendWithoutKey.csproj   |   1 -
 .../DrtXaml.PartialTrustTests.csproj          |   1 -
 .../test/Directory.Build.props                |  37 +-
 .../test/Directory.Build.targets              |   7 +-
 .../test/MultiTargeting.props                 |  61 --
 .../test/PublishAfterBuild.targets            |  11 -
 46 files changed, 778 insertions(+), 223 deletions(-)
 rename {src/Microsoft.DotNet.Wpf/test => eng/WpfArcadeSdk/tools}/DRT.Build.props (61%)
 rename {src/Microsoft.DotNet.Wpf/test => eng/WpfArcadeSdk/tools}/Publish.props (91%)
 create mode 100644 eng/WpfArcadeSdk/tools/PublishAfterBuild.targets
 rename {src/Microsoft.DotNet.Wpf/test => eng/WpfArcadeSdk/tools}/SourceLocations.props (100%)
 rename {src/Microsoft.DotNet.Wpf/test => eng/WpfArcadeSdk/tools}/StrongName.props (91%)
 rename {src/Microsoft.DotNet.Wpf/test => eng/WpfArcadeSdk/tools}/StrongName.targets (100%)
 create mode 100644 src/Microsoft.DotNet.Wpf/test/BranchCommon/data/CommonData.csproj
 create mode 100644 src/Microsoft.DotNet.Wpf/test/BranchCommon/data/Directory.Build.props
 create mode 100644 src/Microsoft.DotNet.Wpf/test/BranchCommon/data/DrtList.xml
 rename src/Microsoft.DotNet.Wpf/test/Common/{ => DRT}/TestServices/DrtBase.cs (100%)
 rename src/Microsoft.DotNet.Wpf/test/Common/{ => DRT}/TestServices/DrtBaseGlobalInput.cs (100%)
 rename src/Microsoft.DotNet.Wpf/test/Common/{ => DRT}/TestServices/DrtBaseInput.cs (100%)
 rename src/Microsoft.DotNet.Wpf/test/Common/{ => DRT}/TestServices/MS/Internal/MultiTargetUtilities.cs (100%)
 rename src/Microsoft.DotNet.Wpf/test/Common/{ => DRT}/TestServices/MS/Internal/PointUtil.cs (100%)
 rename src/Microsoft.DotNet.Wpf/test/Common/{ => DRT}/TestServices/MS/Internal/SecurityCriticalDataForSet.cs (100%)
 rename src/Microsoft.DotNet.Wpf/test/Common/{ => DRT}/TestServices/MS/Win32/ExternDll.cs (100%)
 rename src/Microsoft.DotNet.Wpf/test/Common/{ => DRT}/TestServices/MS/Win32/HandleCollector.cs (100%)
 rename src/Microsoft.DotNet.Wpf/test/Common/{ => DRT}/TestServices/MS/Win32/NativeMethodsCLR.cs (100%)
 rename src/Microsoft.DotNet.Wpf/test/Common/{ => DRT}/TestServices/MS/Win32/NativeMethodsOther.cs (100%)
 rename src/Microsoft.DotNet.Wpf/test/Common/{ => DRT}/TestServices/MS/Win32/NativeMethodsSetLastError.cs (100%)
 rename src/Microsoft.DotNet.Wpf/test/Common/{ => DRT}/TestServices/MS/Win32/SafeNativeMethodsCLR.cs (100%)
 rename src/Microsoft.DotNet.Wpf/test/Common/{ => DRT}/TestServices/MS/Win32/SafeNativeMethodsOther.cs (100%)
 rename src/Microsoft.DotNet.Wpf/test/Common/{ => DRT}/TestServices/MS/Win32/UnsafeNativeMethodsCLR.cs (100%)
 rename src/Microsoft.DotNet.Wpf/test/Common/{ => DRT}/TestServices/MS/Win32/UnsafeNativeMethodsOther.cs (100%)
 rename src/Microsoft.DotNet.Wpf/test/Common/{ => DRT}/TestServices/TestServices.csproj (100%)
 delete mode 100644 src/Microsoft.DotNet.Wpf/test/Common/DRT/dirs.proj
 create mode 100644 src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlTestClasses40/TempDPSetOrder1ListBox.cs
 rename src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/{DrtXaml.Tests.csproj => DrtXaml.csproj} (86%)
 delete mode 100644 src/Microsoft.DotNet.Wpf/test/MultiTargeting.props
 delete mode 100644 src/Microsoft.DotNet.Wpf/test/PublishAfterBuild.targets

diff --git a/Microsoft.Dotnet.Wpf.sln b/Microsoft.Dotnet.Wpf.sln
index 4ee3b158701..e2d296bd014 100644
--- a/Microsoft.Dotnet.Wpf.sln
+++ b/Microsoft.Dotnet.Wpf.sln
@@ -81,9 +81,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Printing-ref", "src\
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{B0EFDB12-C931-4E7F-A6C2-D4AC111D7EDF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DrtXaml.Tests", "src\Microsoft.DotNet.Wpf\test\DRT\DrtXaml\DrtXaml\DrtXaml.Tests.csproj", "{FAB114A2-2C6C-4372-A6BB-BC087B646E3A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DrtXaml", "src\Microsoft.DotNet.Wpf\test\DRT\DrtXaml\DrtXaml\DrtXaml.csproj", "{FAB114A2-2C6C-4372-A6BB-BC087B646E3A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestServices", "src\Microsoft.DotNet.Wpf\test\Common\TestServices\TestServices.csproj", "{387F3700-8C0B-4CEC-A68A-1725F656A249}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestServices", "src\Microsoft.DotNet.Wpf\test\Common\DRT\TestServices\TestServices.csproj", "{387F3700-8C0B-4CEC-A68A-1725F656A249}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XamlTestClasses", "src\Microsoft.DotNet.Wpf\test\DRT\DrtXaml\XamlTestClasses\XamlTestClasses.csproj", "{3C1FC36C-E3E6-4EED-9ECA-CFF2EB950486}"
 EndProject
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT.Build.props b/eng/WpfArcadeSdk/tools/DRT.Build.props
similarity index 61%
rename from src/Microsoft.DotNet.Wpf/test/DRT.Build.props
rename to eng/WpfArcadeSdk/tools/DRT.Build.props
index de0b61a8185..047ab6efe2d 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT.Build.props
+++ b/eng/WpfArcadeSdk/tools/DRT.Build.props
@@ -1,5 +1,7 @@
 <Project>
   <PropertyGroup>
     <PublishDir>$(WpfDrtTestBasePublishPath)</PublishDir>
+    <IsTestProject>true</IsTestProject>
+    <SkipTests>true</SkipTests>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Wpf/test/Publish.props b/eng/WpfArcadeSdk/tools/Publish.props
similarity index 91%
rename from src/Microsoft.DotNet.Wpf/test/Publish.props
rename to eng/WpfArcadeSdk/tools/Publish.props
index d1401f44259..767506adb52 100644
--- a/src/Microsoft.DotNet.Wpf/test/Publish.props
+++ b/eng/WpfArcadeSdk/tools/Publish.props
@@ -2,7 +2,7 @@
     <PropertyGroup>
         <_IsPortable >true</_IsPortable>
         <SelfContained >false</SelfContained>
-        <RuntimeIdentifier >win-x86</RuntimeIdentifier>
+        <RuntimeIdentifier>win-x86</RuntimeIdentifier>
         <RuntimeIdentifier Condition="'$(Platform)' == 'x64'">win-x64</RuntimeIdentifier>
         <PublishDir>$(PublishRoot)$(Configuration)\$(PlatformFolder)</PublishDir>
         <WpfTestBasePublishPath>$(PublishDir)\Test</WpfTestBasePublishPath>
diff --git a/eng/WpfArcadeSdk/tools/PublishAfterBuild.targets b/eng/WpfArcadeSdk/tools/PublishAfterBuild.targets
new file mode 100644
index 00000000000..6e84793f7a0
--- /dev/null
+++ b/eng/WpfArcadeSdk/tools/PublishAfterBuild.targets
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+   <Target Name="AfterBuild" DependsOnTargets="PublishPropertySetup;Publish"/> 
+  
+   <Target Name="PublishPropertySetup">
+     <PropertyGroup>
+         <NoBuild>true</NoBuild>
+     </PropertyGroup>
+   </Target>
+
+  <!-- 
+  Don't copy the code coverage artifacts. These are always trying to be copied to the 
+  same location and so we get errors trying to overwrite files that are locked by a parallel
+  instance of MSBuild. We don't currently need these files. If we do, we can come up with a better
+  solution.
+  -->
+  <Target Name="CopyTraceDataCollectorArtifacts" />
+</Project>
diff --git a/src/Microsoft.DotNet.Wpf/test/SourceLocations.props b/eng/WpfArcadeSdk/tools/SourceLocations.props
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/test/SourceLocations.props
rename to eng/WpfArcadeSdk/tools/SourceLocations.props
diff --git a/src/Microsoft.DotNet.Wpf/test/StrongName.props b/eng/WpfArcadeSdk/tools/StrongName.props
similarity index 91%
rename from src/Microsoft.DotNet.Wpf/test/StrongName.props
rename to eng/WpfArcadeSdk/tools/StrongName.props
index 9d7644845c8..39b1310704d 100644
--- a/src/Microsoft.DotNet.Wpf/test/StrongName.props
+++ b/eng/WpfArcadeSdk/tools/StrongName.props
@@ -11,7 +11,7 @@
         
         <!-- Sign with the test key and ensure that we do not delay sign test code -->
         <DelaySign>false</DelaySign>
-        <AssemblyOriginatorKeyFile>$(TestUntrustedKey)</AssemblyOriginatorKeyFile>
+        <AssemblyOriginatorKeyFile Condition="'$(AssemblyOriginatorKeyFile)'==''">$(TestUntrustedKey)</AssemblyOriginatorKeyFile>
         <StrongNameKeyId>custom</StrongNameKeyId>
     </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Wpf/test/StrongName.targets b/eng/WpfArcadeSdk/tools/StrongName.targets
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/test/StrongName.targets
rename to eng/WpfArcadeSdk/tools/StrongName.targets
diff --git a/eng/copy-wpf.ps1 b/eng/copy-wpf.ps1
index dc4a5a51a67..59dd14bdfb7 100644
--- a/eng/copy-wpf.ps1
+++ b/eng/copy-wpf.ps1
@@ -60,7 +60,10 @@ function CopyPackagedBinaries($location, $localBinLocation, $packageName, $binar
 {
     $ArchFolder = if ($arch -eq "x86") { "" } else { "x64" }
     $BinLocation = [System.IO.Path]::Combine($localBinLocation, $Config, $ArchFolder, $packageName, "lib", $binaryLocationInPackage, "*")
-    Copy-Item -path $BinLocation -include "*.dll","*.pdb" -Destination $location
+    if (Test-Path $BinLocation)
+    {
+        Copy-Item -path $BinLocation -include "*.dll","*.pdb" -Destination $location
+    }
 }
 
 if ($help -or ([string]::IsNullOrEmpty($destination) -and !$local))
diff --git a/eng/helix/configure-helix-machine.ps1 b/eng/helix/configure-helix-machine.ps1
index ac8d4f5f3de..85403ad23fa 100644
--- a/eng/helix/configure-helix-machine.ps1
+++ b/eng/helix/configure-helix-machine.ps1
@@ -1,17 +1 @@
 # This file prepares the helix machine for our tests runs
-
-$dotnetLocation = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "dotnet"
-
-Write-Output "Adding dotnet location to path: $dotnetLocation"
-
-# Prepend the path to ensure that dotnet.exe is called from there.
-$env:path="$dotnetLocation;$env:path"
-
-# Don't look outside the TestHost to resolve best match SDKs.
-$env:DOTNET_MULTILEVEL_LOOKUP = 0
-
-# Disable first run since we do not need all ASP.NET packages restored.
-$env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
-
-# Ensure that the dotnet installed at our dotnetLocation is used
-$env:DOTNET_ROOT=$dotnetLocation
\ No newline at end of file
diff --git a/eng/helix/helixpublish.proj b/eng/helix/helixpublish.proj
index 3792f934aaa..aac15376b1f 100644
--- a/eng/helix/helixpublish.proj
+++ b/eng/helix/helixpublish.proj
@@ -1,4 +1,3 @@
-
 <Project Sdk="Microsoft.DotNet.Helix.Sdk" DefaultTargets="Test">
   <PropertyGroup>
     <!-- These properties help ensure proper and consistent restore behavior -->
@@ -10,25 +9,32 @@
       https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json
     </RestoreSources>
 
-    <!-- We copy our own dotnet payload over to the machine, so we don't want/need a different dotnet install -->
-    <IncludeDotNetCli>false</IncludeDotNetCli>
+    <IncludeDotNetCli>true</IncludeDotNetCli>
+    <DotNetCliPackageType>sdk</DotNetCliPackageType>
+    <!-- Set to match global.json.tools.dotnet by pre-build.ps1 -->
+    <DotNetCliVersion>$(DotNetCliVersion)</DotNetCliVersion>
+    
     <EnableXUnitReporter>true</EnableXUnitReporter>
     <EnableAzurePipelinesReporter>true</EnableAzurePipelinesReporter>
     <FailOnMissionControlTestFailure>true</FailOnMissionControlTestFailure>
 
     <!-- Semi-colon delimited list of commands that are executed before every test.-->
-    <HelixPreCommands>$(HelixPreCommands);</HelixPreCommands>
+    <HelixPreCommands>$(HelixPreCommands);powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\configure-helix-machine.ps1 -version Xaml"</HelixPreCommands>
 
     <!-- These are the list of Windows versions that we run tests on-->
-    <HelixTargetQueues>Windows.10.Amd64.Open;Windows.7.Amd64.Open;Windows.10.Amd64.ServerRS5.Open</HelixTargetQueues>
+    <!--<HelixTargetQueues>Windows.10.Amd64.Open;Windows.7.Amd64.Open;Windows.10.Amd64.ServerRS5.Open</HelixTargetQueues>-->
+    <!-- Just cutting down the total queues while bootstrapping to speed things up-->
+    <HelixTargetQueues>Windows.10.Amd64.Open</HelixTargetQueues>
+
+    <MicrosoftDotNetWpfTestPackageVersion>1.0.0-beta.19263.1</MicrosoftDotNetWpfTestPackageVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="runtime.win-$(Platform).Microsoft.DotNet.Wpf.Test" Version="1.0.0-beta.19260.5" />
+    <PackageReference Include="runtime.win-$(Platform).Microsoft.DotNet.Wpf.Test" Version="$(MicrosoftDotNetWpfTestPackageVersion)" />
     <HelixCorrelationPayload Include="..\..\HelixPayload\$(Configuration)\$(Platform)" /> 
-    <HelixWorkItem Include="HelloHelix">
+    <HelixWorkItem Include="Xaml">
       <Timeout>00:20:00</Timeout>
-      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1"</Command>
+      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 -area Xaml"</Command>
     </HelixWorkItem>
    <!-- 
    <HelixWorkItem Include="Annotations">
diff --git a/eng/helix/prepare-helix-payload.ps1 b/eng/helix/prepare-helix-payload.ps1
index 7181d004d07..efe24c50ec6 100644
--- a/eng/helix/prepare-helix-payload.ps1
+++ b/eng/helix/prepare-helix-payload.ps1
@@ -1,7 +1,8 @@
 [CmdLetBinding()]
 Param(
     [string]$platform,
-    [string]$configuration
+    [string]$configuration,
+    [string]$testPackageVersion
 )
 
 $payloadDir = "HelixPayload\$configuration\$platform"
@@ -34,10 +35,11 @@ function CopyFolderStructure($from, $to)
         Write-Output "Location doesn't exist: $from"
     }
 
+    Get-ChildItem $to -Recurse
 }
 
-# Copy files from nuget packages
-$testNugetLocation = Join-Path $nugetPackagesDir "runtime.win-$platform.Microsoft.DotNet.Wpf.DncEng.Test\1.0.0-beta.19260.5\tools\win-$platform\"
+# Copy files from nuget packages.
+$testNugetLocation = Resolve-Path (Join-Path $nugetPackagesDir "runtime.win-$platform.Microsoft.DotNet.Wpf.Test\*\tools\win-$platform\Test")
 $testPayloadLocation = Join-Path $payloadDir "Test"
 CopyFolderStructure $testNugetLocation $testPayloadLocation
 
@@ -47,16 +49,6 @@ $drtArtifactsLocation = [System.IO.Path]::Combine($env:BUILD_SOURCESDIRECTORY, "
 $drtPayloadLocation = Join-Path $payloadDir "Test\DRT"
 CopyFolderStructure $drtArtifactsLocation $drtPayloadLocation
 
-# Copy built assemblies to dotnet install location
-$eng = Join-Path $env:BUILD_SOURCESDIRECTORY "eng"
-$configArgs = if ($configuration == "Release") { "-release" } else { }
-& "$eng\copy-wpf.ps1 -local -arch $platform $configArgs"
-
-# Copy local dotnet install to payload
-$localDotnetInstall = Join-Path $env:BUILD_SOURCESDIRECTORY ".dotnet"
-$dotnetPayloadLocation = Join-Path $payloadDir "dotnet"
-CopyFolderStructure $localDotnetInstall $dotnetPayloadLocation
-
 # Copy scripts
 Copy-Item "eng\helix\configure-helix-machine.ps1" $payloadDir
 Copy-Item "eng\helix\runtests.ps1" $payloadDir
\ No newline at end of file
diff --git a/eng/helix/runtests.ps1 b/eng/helix/runtests.ps1
index 90dff99c810..241505851c1 100644
--- a/eng/helix/runtests.ps1
+++ b/eng/helix/runtests.ps1
@@ -1,13 +1,26 @@
+[CmdLetBinding()]
+Param(
+    [string]$area
+)
 
 # Configure the machine before running tests
-& "$PSScriptRoot\configure-helix-machine.ps1"
+. "$PSScriptRoot\configure-helix-machine.ps1"
+
+dotnet --info
 
 # Run the tests
-Get-ChildItem -Recurse
+$testLocation = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "Test"
+if (Test-Path "$testLocation\rundrts.cmd")
+{
+    Invoke-Expression "$testLocation\rundrts.cmd /Area=$area"
+}
 
 # We can use $env:HELIX_PYTHONPATH $env:HELIX_SCRIPT_ROOT\upload_result.py to upload any QV specific logs and/or screenshots that we are interested in.
 # For example: $env:HELIX_PYTHONPATH $env:HELIX_SCRIPT_ROOT%\upload_result.py -result screenshot.jpg -result_name screenshot.jpg
 # Then, links to these artifacts can then be included in the xUnit logs.
 
 # Need to copy the xUnit log to a known location that helix can understand
-# Copy-Item .\Test\Drts\testResults.xml ..\testResults.xml
\ No newline at end of file
+if (Test-Path "$env:AppData\QualityVault\Run\Report\testResults.xml")
+{
+    Copy-Item "$env:AppData\QualityVault\Run\Report\testResults.xml" "..\testResults.xml"
+}
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Wpf/test/BranchCommon/data/CommonData.csproj b/src/Microsoft.DotNet.Wpf/test/BranchCommon/data/CommonData.csproj
new file mode 100644
index 00000000000..ed8277f8958
--- /dev/null
+++ b/src/Microsoft.DotNet.Wpf/test/BranchCommon/data/CommonData.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <NoTargets>true</NoTargets>
+    <EnableDefaultItems>false</EnableDefaultItems>
+    <PublishDir>$(WpfTestBasePublishPath)</PublishDir>
+    <_IsPortable>true</_IsPortable>
+    <SelfContained>false</SelfContained>
+    <RuntimeIdentifier></RuntimeIdentifier>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Include="DrtList.xml">
+      <Link>DRT\%(Filename)%(Extension)</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  
+  </ItemGroup>
+
+</Project>
diff --git a/src/Microsoft.DotNet.Wpf/test/BranchCommon/data/Directory.Build.props b/src/Microsoft.DotNet.Wpf/test/BranchCommon/data/Directory.Build.props
new file mode 100644
index 00000000000..12d9ad073ec
--- /dev/null
+++ b/src/Microsoft.DotNet.Wpf/test/BranchCommon/data/Directory.Build.props
@@ -0,0 +1,3 @@
+<Project>
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+</Project>
diff --git a/src/Microsoft.DotNet.Wpf/test/BranchCommon/data/DrtList.xml b/src/Microsoft.DotNet.Wpf/test/BranchCommon/data/DrtList.xml
new file mode 100644
index 00000000000..1e94bca0882
--- /dev/null
+++ b/src/Microsoft.DotNet.Wpf/test/BranchCommon/data/DrtList.xml
@@ -0,0 +1,587 @@
+<!--
+Rundrtlist
+
+ Specifies the list of DRTs to run.
+
+
+ format:
+       name,archList,osList,team[,args]
+
+ name - filename of the drt.  e.g. DrtFooTest.exe
+ archList - architectures to run the drt for.
+   archList : arch [|arch ]
+   Possible values for arch, separated by |, use no blanks
+       all     - all architectures
+       x86     - run for x86
+       ia64    - run for IA64
+       amd64   - run for amd64
+ osList - operating systems to run the drt on.
+   osList : os [|os ]
+   Possible values for os, separated by |, use no blanks
+       all     - all operating systems
+       xp      - Windows Xp
+       vista   - Windows Vista
+ team - name of the Avalon FT that owns the drt
+ args - optional command line to send to the drt
+    - DRT is offline
+-->
+<Drts>
+  <Drt Executable="DrtAnnotations.exe" Architecture="x86|amd64" OS="all" Team="Annotations" />
+  <Drt Executable="DrtAppModelSuites.exe" Architecture="all" OS="all" Team="AppModel" >
+    <SupportFiles>
+      <SupportFile>newloadersuitehelperproject.exe</SupportFile>
+      <SupportFile>newloadersuitehelperproject1\newloadersuitehelperproject.exe</SupportFile>
+      <SupportFile>DrtFiles\loader_tulip.jpg</SupportFile>
+      <SupportFile>DrtFiles\PageA.xaml</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <!--<Drt Executable="DrtNativeEntryPoint.exe" Architecture="all" OS="all" Team="AppModel" >
+    <SupportFiles>
+      <SupportFile>LoaderTest.dll</SupportFile>
+      <SupportFile>DrtThirdPartyThemes.exe</SupportFile>
+    </SupportFiles>
+  </Drt>-->
+  <Drt Executable="DrtDocumentViewerSuite.exe" Architecture="all" OS="all" Team="DigitalDocuments" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\DocumentViewerSuite\Commanding</SupportFile>
+      <SupportFile>DrtFiles\DocumentViewerSuite\Stress</SupportFile>
+      <SupportFile>DrtFiles\DocumentViewerSuite\Styling</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtDigitalSignature.cmd" Architecture="all" OS="all" Team="DigitalDocuments" >
+    <SupportFiles>
+      <SupportFile>DrtDigitalSignature.exe</SupportFile>
+      <SupportFile>DrtFiles\digitalsignature</SupportFile>
+      <SupportFile>DelCertNoUI.exe</SupportFile>
+      <SupportFile>MakeCert.exe</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtPackScheme.exe" Architecture="all" OS="all" Team="DigitalDocuments" />
+  <Drt Executable="DrtMediaAPI.exe" Architecture="all" OS="all" Team="Media" />
+  <Drt Executable="DrtEditing.exe" Architecture="x86|amd64" OS="all" Team="Editing" >
+    <SupportFiles>
+      <SupportFile>DrtEditing.*</SupportFile>
+      <SupportFile>DrtFiles\Editing\CustomDict2.lex</SupportFile>
+      <SupportFile>DrtFiles\Editing\cut.png</SupportFile>
+      <SupportFile>DrtFiles\Editing\rtfsimple.rtf</SupportFile>
+      <SupportFile>DrtFiles\Editing\rtfsimple_expect.rtf.xaml</SupportFile>
+      <SupportFile>DrtFiles\Editing\rtfsimple_expect.rtf.xaml.rtf</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DRTPropertyEngine.exe" Architecture="all" OS="all" Team="ElementServices" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\PropertyEngine\TestInheritanceContext.xaml</SupportFile>
+      <SupportFile>DrtFiles\PropertyEngine\TestValueSource.xaml</SupportFile>
+      <SupportFile>DrtFiles\PropertyEngine\TestVisualTransforms.xaml</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtWindow.exe" Architecture="all" OS="all" Team="AppModel" >
+    <SupportFiles>
+      <SupportFile>DrtWindowSecure.cmd</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtWindowDragMove.exe" Architecture="all" OS="all" Team="AppModel" />
+  <Drt Executable="DrtWindowScroll.exe" Architecture="all" OS="all" Team="AppModel" />
+  <Drt Executable="DrtWindowAutoSize.exe" Architecture="all" OS="all" Team="AppModel" />-->
+  <Drt Executable="DrtDialog.exe" Architecture="all" OS="all" Team="AppModel" />
+  <Drt Executable="DrtIcon.exe" Architecture="all" OS="all" Team="AppModel">
+    <SupportFiles>
+      <SupportFile>DrtFiles\Icon</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtWindowMinMaxContentSize.exe" Architecture="all" OS="all" Team="AppModel" >
+    <SupportFiles>
+      <SupportFile>DrtWindowMinMaxContentSizeSecure.cmd</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtText.exe" Architecture="x86|amd64" OS="all" Team="Text" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\Text</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtApplicationEvents.cmd" Architecture="all" OS="all" Team="AppModel" >
+    <SupportFiles>
+      <SupportFile>DrtApplicationEvents.exe</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtAppThreadingModel.exe" Architecture="all" OS="all" Team="AppModel" />
+  <Drt Executable="DrtStartupUriXamlNavigationWindow.exe" Architecture="all" OS="all" Team="AppModel" />
+  <Drt Executable="DrtWindowFunctionality.exe" Architecture="all" OS="all" Team="AppModel" />
+  <Drt Executable="DrtWindowHeightWidthTopLeft.exe" Architecture="all" OS="all" Team="AppModel" />
+  <Drt Executable="DrtWindowResizeGripFlowDirection.exe" Architecture="x86|amd64" OS="all" Team="AppModel" />
+  <Drt Executable="DrtPage.exe" Architecture="x86|amd64" OS="all" Team="AppModel" />
+  <Drt Executable="DrtWindowAutoLocation.exe" Architecture="all" OS="all" Team="AppModel" />
+  <Drt Executable="DrtDRXSerialization.exe" Architecture="all" OS="all" Team="DigitalDocuments" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\DRXSerialization\DocumentViewerDefault.xaml</SupportFile>
+      <SupportFile>DrtFiles\DRXSerialization\DocumentViewerDefaultInput.xaml</SupportFile>
+      <SupportFile>DrtFiles\DRXSerialization\DocumentViewerNonDefault.xaml</SupportFile>
+      <SupportFile>DrtFiles\DRXSerialization\DocumentViewerNonDefaultInput.xaml</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtAnimation.exe" Architecture="all" OS="all" Team="Animation" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\DrtAnimation\DRTEasing.xaml</SupportFile>
+      <SupportFile>DrtFiles\DrtAnimation\DRTMarkupAnimation.xaml</SupportFile>
+      <SupportFile>DrtFiles\DrtAnimation\angels.jpg</SupportFile>
+      <SupportFile>DrtAnimationRDP.cmd</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtTiming.exe" Architecture="all" OS="all" Team="Animation" />
+  <Drt Executable="DrtBasic3D.exe" Architecture="x86|amd64" OS="all" Team="3D" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\DrtBasic3D\ambient.png</SupportFile>
+      <SupportFile>DrtFiles\DrtBasic3D\combined.png</SupportFile>
+      <SupportFile>DrtFiles\DrtBasic3D\diffuse.png</SupportFile>
+      <SupportFile>DrtFiles\DrtBasic3D\emissive.png</SupportFile>
+      <SupportFile>DrtFiles\DrtBasic3D\specular.png</SupportFile>
+      <SupportFile>DrtFiles\DrtBasic3D\msnbackground.bmp</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtElement3D.exe" Architecture="x86|amd64" OS="all" Team="3D" />
+  <Drt Executable="DrtMil2D.exe" Architecture="all" OS="all" Team="2D" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\DrtMil2D\cut.png</SupportFile>
+      <SupportFile>DrtFiles\DrtMil2D\tulip.jpg</SupportFile>
+      <SupportFile>DrtFiles\DrtMil2D\tulip48dpi.jpg</SupportFile>
+      <SupportFile>DrtFiles\DrtMil2D\tulip96x192dpi.png</SupportFile>
+      <SupportFile>DrtFiles\DrtMil2D\tile_checkered.PNG</SupportFile>
+      <SupportFile>DrtFiles\DrtMil2D\tiny_checkered.PNG</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtInput.exe" Architecture="all" OS="all" Team="ElementServices" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\Input\DrtInput.xml</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtUIContext.exe" Architecture="x86|amd64" OS="all" Team="ElementServices" />
+  <Drt Executable="DrtHwndSource.exe" Architecture="all" OS="all" Team="ElementServices" />
+  <Drt Executable="DrtControls.exe" Architecture="x86|amd64" OS="all" Team="Controls" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\Controls</SupportFile>
+      <SupportFile>DrtThemeDictionaryExtension.*</SupportFile>
+      <SupportFile>DrtThirdPartyThemes.dll</SupportFile>
+      <SupportFile>DrtThirdPartyThemes.pdb</SupportFile>
+      <SupportFile>ListView2App.*</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtMultiTouch.exe" Architecture="all" OS="all" Team="ElementServices" />
+  <Drt Executable="DrtImaging.exe" Architecture="x86|amd64" OS="all" Team="Imaging" >
+    <SupportFiles>
+      <SupportFile>DrtImagingD3D.dll</SupportFile>
+      <SupportFile>DrtFiles\DrtImaging</SupportFile>
+    </SupportFiles>
+  </Drt>
+<!-- disabling amd64 until bug 1845378 is fixed --><!--
+  --><!--<Drt Executable="DrtUImaging" Architecture="x86" OS="all" Team="Imaging" />
+  <Drt Executable="DrtUMetadata.exe" Architecture="x86|amd64" OS="all" Team="Imaging" />-->
+  <Drt Executable="DrtPageFunction.exe" Architecture="all" OS="all" Team="AppModel" />
+  <Drt Executable="DrtNavigationApplication.exe" Architecture="all" OS="all" Team="AppModel" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\NavigationApplication\NavAppBar.xaml</SupportFile>
+      <SupportFile>DrtFiles\NavigationApplication\NavAppFoo.xaml</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtNavigationEvents.exe" Architecture="all" OS="all" Team="AppModel" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\NavigationEvents</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtNavigationWindow.exe" Architecture="x86|amd64" OS="all" Team="AppModel" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\NavigationWindow\NavWindowBar.xaml</SupportFile>
+      <SupportFile>DrtFiles\NavigationWindow\NavWindowFoo.xaml</SupportFile>
+      <SupportFile>DrtFiles\NavigationWindow\NavWindowBar2.xaml</SupportFile>
+      <SupportFile>DrtFiles\NavigationWindow\NavWindowFoo2.xaml</SupportFile>
+    </SupportFiles>6
+  </Drt>
+  <Drt Executable="DrtNavMemPerf.exe" Architecture="x86|amd64" OS="all" Team="AppModel" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\navmemperf</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtReparentNavigator.exe" Architecture="x86|amd64" OS="all" Team="AppModel" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\ReparentNavigator\ReparentFrame.xaml</SupportFile>
+      <SupportFile>DrtFiles\ReparentNavigator\ReparentPage1.xaml</SupportFile>
+      <SupportFile>DrtFiles\ReparentNavigator\ReparentPage2.xaml</SupportFile>
+      <SupportFile>DrtFiles\ReparentNavigator\ReparentPage3.xaml</SupportFile>
+      <SupportFile>DrtFiles\ReparentNavigator\ReparentStart.xaml</SupportFile>
+      <SupportFile>DrtReparentNavigatorSecure.cmd</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtHyperlinkTargeting.exe" Architecture="x86|amd64" OS="all" Team="AppModel" />
+  <Drt Executable="DrtFrameJournaling.exe" Architecture="x86|amd64" OS="all" Team="AppModel" />
+  <Drt Executable="DrtJournal.exe" Architecture="x86|amd64" OS="all" Team="AppModel" />
+  <Drt Executable="DrtJournalMode.exe" Architecture="all" OS="all" Team="AppModel" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\JournalMode\DrtJournalModeDefault.xaml</SupportFile>
+      <SupportFile>DrtJournalModeSecure.cmd</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtXamlContainer.exe" Architecture="x86|amd64" OS="all" Team="AppModel" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\XamlContainer\NavByElement.xaml</SupportFile>
+      <SupportFile>DrtFiles\XamlContainer\NavByUri.xaml</SupportFile>
+      <SupportFile>DrtFiles\XamlContainer\SetContent.xaml</SupportFile>
+      <SupportFile>DrtFiles\XamlContainer\SetUri.xaml</SupportFile>
+      <SupportFile>DrtFiles\XamlContainer\DrtXamlContainer.Permissions</SupportFile>
+      <SupportFile>DrtXamlContainerSecure.cmd</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtNavigationToObject.exe" Architecture="x86|amd64" OS="all" Team="AppModel" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\NavigationToObject\FlowDocument.xaml</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtNavError.exe" Architecture="all" OS="all" Team="AppModel" />
+  <Drt Executable="DrtChangeable.exe" Architecture="all" OS="all" Team="2D" />
+  <Drt Executable="DrtVisualTarget.exe" Architecture="all" OS="all" Team="2D" />
+  <Drt Executable="DrtFlowLayout.exe" Architecture="x86|amd64" OS="all" Team="FlowLayout" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\FlowLayout</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="AvaCop.exe" Architecture="x86|amd64" OS="all" Team="DataServices" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\AvaCop</SupportFile>
+      <SupportFile>DrtFiles\DocumentViewerSuite\Commanding</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtDataSrv.exe" Architecture="x86|amd64" OS="all" Team="DataServices" Timeout="360">
+    <SupportFiles>
+      <SupportFile>DrtFiles\DataSrv</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtDataSrvMSB.exe" Architecture="all" OS="all" Team="DataServices" >
+    <SupportFiles>
+      <SupportFile>en-us\DrtDataSrvMSB.*</SupportFile>
+      <SupportFile>DrtFiles\DataSrvMSB\Content.JPG</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtLayout.exe" Architecture="x86|amd64" OS="all" Team="ElementLayout" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\Layout</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtTextFind.exe" Architecture="x86|amd64" OS="all" Team="ElementLayout" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\TextFind</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DRTInputMethod.exe" Architecture="all" OS="all" Team="Editing" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\DrtInputMethod</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DRTTextComposition.cmd" Architecture="x86|amd64" OS="all" Team="Editing" >
+    <SupportFiles>
+      <SupportFile>DRTTextComposition.exe</SupportFile>
+    </SupportFiles>
+  </Drt>
+<!-- 
+  <Drt Executable="Drtparser.exe" Architecture="all" OS="all" Team="Xaml" >
+    <SupportFiles>
+      <SupportFile>testclasses.dll</SupportFile>
+      <SupportFile>DrtFiles\Parser</SupportFile>
+    </SupportFiles>
+  </Drt>
+-->
+<!--Drt Executable="Drtserializer.exe" Architecture="x86|amd64" OS="all" Team="ElementServices" /-->
+  <Drt Executable="DrtMarkupSerializer.exe" Architecture="x86|amd64" OS="all" Team="ElementServices" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\MarkupSerializer</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtEvents.exe" Architecture="all" OS="all" Team="ElementServices" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\Events\DRTEvents_1.xaml</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtCommanding.exe" Architecture="all" OS="all" Team="ElementServices" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\Commanding</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtLocalization.exe" Architecture="all" OS="all" Team="Globalization" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\Localization</SupportFile>
+      <SupportFile>DrtFiles\Baml</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtPackagingApis.exe" Architecture="all" OS="all" Team="DigitalDocuments" />
+  <Drt Executable="DRTStoryboards.exe" Architecture="x86|amd64" OS="all" Team="Animation" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\DRTStoryboards\DRTStoryboards.xaml</SupportFile>
+      <SupportFile>DrtFiles\DRTStoryboards\ding.wav</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtInk.exe" Architecture="all" OS="all" Team="Tablet" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\Ink</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DRTColorAPI.exe" Architecture="all" OS="all" Team="Imaging" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\DrtColorAPI</SupportFile>
+    </SupportFiles>
+  </Drt>
+
+  <!--
+  <Drt Executable="drtbaml.exe" Architecture="all" OS="all" Team="Xaml" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\Baml</SupportFile>
+      <SupportFile>DrtFiles\Parser</SupportFile>
+      <SupportFile>testclasses.dll</SupportFile>
+      <SupportFile>drtparser.exe</SupportFile>
+    </SupportFiles>
+  </Drt>
+  -->
+
+  <Drt Executable="DrtStickyNoteControl.exe" Architecture="x86|amd64" OS="all" Team="Annotations" />
+  <Drt Executable="DrtInkCanvas.exe" Architecture="all" OS="all" Team="Tablet" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\InkCanvas</SupportFile>
+      <SupportFile>RunInkCanvasSpeedTests.cmd</SupportFile>
+      <SupportFile>RunInkCanvasAllocationTests.cmd</SupportFile>
+    </SupportFiles>
+  </Drt><!--
+
+  --><!-- Reenabled  9/2/09.  Contact mattgal for any crashes --><!--
+  <Drt Executable="DrtHosting.exe" Architecture="x86|amd64" OS="all" Team="AppModel" Args="-verbose" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\BrowserHosting</SupportFile>
+      <SupportFile>BrowserHostedDeployApp.*</SupportFile>
+      <SupportFile>BrowserHostedDeployApp35.*</SupportFile>
+    </SupportFiles>
+  </Drt>
+
+  --><!-- Disabled 1/07, failing consistently on Cinch --><!--
+  --><!--Drt Executable="DrtDrxAutomationLocal.cmd" Architecture="x86|amd64" OS="all" Team="DigitalDocuments" >
+    <SupportFiles>
+      <SupportFile>DrtDrxAutomation.exe</SupportFile>
+      <SupportFile>MakeCert.exe</SupportFile>
+    </SupportFiles>
+  </Drt--><!--
+  --><!-- Broken (again) by ClickOnce, different issues. Tracking work item on our side Dev10.521850.
+  <Drt Executable="DrtStandAloneApp.exe" Architecture="x86|amd64" OS="all" Team="AppModel" >
+    <SupportFiles>
+      <SupportFile>StandAloneDeployApp.*</SupportFile>
+    </SupportFiles>
+  </Drt>
+  -->
+  <Drt Executable="DrtPageContent.exe" Architecture="all" OS="all" Team="DigitalDocuments" >
+    <SupportFiles>
+      <SupportFile>FixedDocViewer.dll</SupportFile>
+      <SupportFile>DrtFiles\Payloads</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtFixedPanel.exe" Architecture="all" OS="all" Team="DigitalDocuments" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\Layout</SupportFile>
+      <SupportFile>DrtFiles\Payloads</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtFixedEdit.exe" Architecture="all" OS="all" Team="DigitalDocuments" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\FixedEdit</SupportFile>
+      <SupportFile>DrtFiles\Payloads</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtSequence.exe" Architecture="all" OS="all" Team="DigitalDocuments" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\Payloads</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtMetroTest.cmd" Architecture="x86|amd64" OS="all" Team="DigitalDocuments" >
+    <SupportFiles>
+      <SupportFile>DrtNGCTest.exe</SupportFile>
+      <SupportFile>DrtFiles\Payloads</SupportFile>
+      <SupportFile>DrtFiles\NGCTest\constitution.xaml</SupportFile>
+      <SupportFile>DrtAddDocStructure.exe</SupportFile>
+      <SupportFile>DrtFixedTest.exe</SupportFile>
+    </SupportFiles>
+  </Drt>
+
+  <!--<Drt Executable="DrtSeeScenario1.cmd" Architecture="all" OS="all" Team="PartialTrust">
+    <SupportFiles>
+      <SupportFile>Secure.exe</SupportFile>
+      <SupportFile>DrtSeeScenario1.exe</SupportFile>
+    </SupportFiles>
+  </Drt>
+
+  <Drt Executable="DrtSeeScenario6.cmd" Architecture="all" OS="all" Team="PartialTrust">
+    <SupportFiles>
+      <SupportFile>Secure.exe</SupportFile>
+      <SupportFile>drtpermissiontest.cmd</SupportFile>
+      <SupportFile>DrtFiles\Permissions</SupportFile>
+      <SupportFile>DrtPermissionTest.exe</SupportFile>
+      <SupportFile>DrtSeeScenario6.exe</SupportFile>
+    </SupportFiles>
+  </Drt>
+
+  --><!--Drt Executable="DrtAutomation.exe" Architecture="all" OS="all" Team="UIAutomation" /
+  <Drt Executable="DrtPrinterDriverMarkup.exe" Architecture="all" OS="all" Team="DigitalDocuments" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\PrinterDriverMarkup\</SupportFile>
+    </SupportFiles>
+  </Drt>-->
+  <!--  Leaving this one disabled for now... Mattgal 9-2-09
+  <Drt Executable="drtseescenario7.cmd" Architecture="all" OS="all" Team="PartialTrust" >
+    <SupportFiles>
+      <SupportFile>drtseescenario7.exe</SupportFile>
+      <SupportFile>Secure.exe</SupportFile>
+    </SupportFiles>
+  </Drt>
+  --><!--
+
+  <Drt Executable="DrtSeeExpressApp.exe" Architecture="x86|amd64" OS="all" Team="PartialTrust" >
+    <SupportFiles>
+      <SupportFile>TestSeeExpressApp*</SupportFile>
+      <SupportFile>DrtFiles\ExpressApp\Intro2Loose.jpg</SupportFile>
+    </SupportFiles>
+  </Drt>
+
+  <Drt Executable="DrtBrowserHostedMediaApp.exe" Architecture="x86" OS="all" Team="PartialTrust" >
+    <SupportFiles>
+      <SupportFile>DrtTools.dll</SupportFile>
+      <SupportFile>BrowserHostedMediaApp.*</SupportFile>
+      <SupportFile>DrtFiles\BrowserHostedMediaApp</SupportFile>
+    </SupportFiles>
+  </Drt>-->
+
+  <Drt Executable="DrtContainer.exe" Architecture="all" OS="all" Team="ElementServices" />
+  <Drt Executable="DrtCompressionXform.exe" Architecture="all" OS="all" Team="DigitalDocuments" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\compressionXform</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtPackageCompression.exe" Architecture="all" OS="all" Team="DigitalDocuments" />
+  <Drt Executable="DrtEncryptedPackageCoreProperties.exe" Architecture="all" OS="all" Team="DigitalDocuments" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\EncryptedPackageCoreProperties</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtZipIO.exe" Architecture="all" OS="all" Team="DigitalDocuments" />
+  <Drt Executable="DrtPackageCoreProperties.exe" Architecture="all" OS="all" Team="DigitalDocuments" />
+
+  <Drt Executable="DrtIndexing.exe" Architecture="all" OS="all" Team="DigitalDocuments">
+    <SupportFiles>
+      <SupportFile>BuildContainer.exe</SupportFile>
+      <SupportFile>IndexingFilterTool.exe</SupportFile>
+      <SupportFile>CompareChunkLists.exe</SupportFile>
+      <SupportFile>EncryptedPackageBuilder.exe</SupportFile>
+      <SupportFile>DrtFiles\Indexing</SupportFile>
+    </SupportFiles>
+  </Drt>
+
+     <!-- 12/29/06 - not enabled in Orcas yet. --><!--
+  --><!--<Drt Executable="DrtIndexingElementDictionary.exe" Architecture="all" OS="all" Team="DigitalDocuments" >
+    <SupportFiles>
+      <SupportFile>IndexingFilterTool</SupportFile>
+    </SupportFiles>
+  </Drt>-->
+  <Drt Executable="DrtInterleavedPackage.exe" Architecture="all" OS="all" Team="DigitalDocuments" />
+  <Drt Executable="DrtAppWindowList.exe" Architecture="all" OS="all" Team="AppModel" />
+  <Drt Executable="DrtAppShutdown.exe" Architecture="all" OS="all" Team="AppModel" />
+  <Drt Executable="DrtFlowLayoutExt.exe" Architecture="x86|amd64" OS="all" Team="FlowLayout" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\FlowLayoutExt</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtSelection.exe" Architecture="x86|amd64" OS="all" Team="FlowLayout" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\Selection</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtFlow.exe" Architecture="x86|amd64" OS="all" Team="FlowLayout" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\Flow</SupportFile>
+    </SupportFiles>
+  </Drt>
+<!--<Drt Executable="RunMILTest.cmd" Architecture="x86" OS="all" Team="2D" Args=" > RunMILTest.log">
+    <SupportFiles>
+      <SupportFile>RunMILTest.exe</SupportFile>
+    </SupportFiles>
+  </Drt>-->
+  <Drt Executable="DrtMedia.exe" Architecture="all" OS="all" Team="Media" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\DrtMedia\DrtMedia.xaml</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <!--
+  <Drt Executable="DrtEffects.exe" Architecture="x86|amd64" OS="all" Team="Effects" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\DrtEffects</SupportFile>
+    </SupportFiles>
+  </Drt>
+-->
+  <Drt Executable="WarmupOpt.cmd" Architecture="x86|amd64" OS="all" Team="Integration" >
+    <SupportFiles>
+      <SupportFile>WarmupOpt.exe</SupportFile>
+      <SupportFile>DrtFiles\WarmupOpt</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="MSNBamlOpt.exe" Architecture="x86|amd64" OS="all" Team="Integration" >
+    <SupportFiles>
+      <SupportFile>MSNBamlOpt*</SupportFile>
+      <SupportFile>en-us\MSNBamlOpt.resources.dll</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="SprinkleOpt.exe" Architecture="x86|amd64" OS="all" Team="Integration" />
+  <Drt Executable="HBROpt.exe" Architecture="x86|amd64" OS="all" Team="Integration" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\HBROpt</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtXaml.exe" Architecture="x86|amd64" OS="all" Team="Xaml" >
+    <SupportFiles>
+      <SupportFile>XamlTestClasses.dll</SupportFile>
+      <SupportFile>BamlTestClasses40.dll</SupportFile>
+      <SupportFile>BamlAvoidXmlTest.exe</SupportFile>
+      <SupportFile>XamlTestClasses.FriendWithKey.dll</SupportFile>
+      <SupportFile>XamlTestClasses.FriendWithoutKey.dll</SupportFile>
+      <SupportFile>DrtXaml.PartialTrustTests.dll</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtXpsApi.cmd" Architecture="all" OS="all" Team="DigitalDocuments" >
+    <SupportFiles>
+      <SupportFile>DrtXpsApi.exe</SupportFile>
+      <SupportFile>DrtFiles\XpsApi</SupportFile>
+      <SupportFile>DelCertNoUI.exe</SupportFile>
+      <SupportFile>MakeCert.exe</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtVisualSerialization.exe" Architecture="all" OS="all" Team="DigitalDocuments" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\VisualSerialization\testCMYK1.icc</SupportFile>
+      <SupportFile>DrtFiles\drtimaging\avalon.png</SupportFile>
+      <SupportFile>DrtFiles\drtimaging\tulip.jpg</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtNgcTest.exe" Architecture="all" OS="all" Team="DigitalDocuments" />
+  <Drt Executable="DrtVisualTreeChange.exe" Architecture="all" OS="all" Team="XET" />
+  <Drt Executable="DrtXamlSourceInfo.exe" Architecture="all" OS="all" Team="XET">
+    <SupportFiles>
+      <SupportFile>DrtFiles\XamlSourceInfoTest.Debug.dll</SupportFile>
+      <SupportFile>DrtFiles\XamlSourceInfoTest.Release.dll</SupportFile>
+    </SupportFiles>
+  </Drt>
+  <Drt Executable="DrtPrinting.exe" Architecture="all" OS="all" Team="Printing" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\Printing</SupportFile>
+    </SupportFiles>
+  </Drt>
+
+  <!--
+  <Drt Executable="DrtReachSerialization.exe" Architecture="all" OS="all" Team="DigitalDocuments" >
+    <SupportFiles>
+      <SupportFile>DrtFiles\DrtReachSerialization</SupportFile>
+    </SupportFiles>
+  </Drt>
+  --><!--
+
+  --><!-- DrtMediaBasic doesn't run on Vista - bug #1588743 --><!--
+  --><!--<Drt Executable="DrtMediaBasic.exe" Architecture="all" OS="xp" Team="Media" />-->
+  <Drt Executable="DrtWindowsFormsIntegration.exe" Architecture="all" OS="all" Team="WindowsFormsIntegration" />
+</Drts>
diff --git a/src/Microsoft.DotNet.Wpf/test/Common/TestServices/DrtBase.cs b/src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/DrtBase.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/test/Common/TestServices/DrtBase.cs
rename to src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/DrtBase.cs
diff --git a/src/Microsoft.DotNet.Wpf/test/Common/TestServices/DrtBaseGlobalInput.cs b/src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/DrtBaseGlobalInput.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/test/Common/TestServices/DrtBaseGlobalInput.cs
rename to src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/DrtBaseGlobalInput.cs
diff --git a/src/Microsoft.DotNet.Wpf/test/Common/TestServices/DrtBaseInput.cs b/src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/DrtBaseInput.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/test/Common/TestServices/DrtBaseInput.cs
rename to src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/DrtBaseInput.cs
diff --git a/src/Microsoft.DotNet.Wpf/test/Common/TestServices/MS/Internal/MultiTargetUtilities.cs b/src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/MS/Internal/MultiTargetUtilities.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/test/Common/TestServices/MS/Internal/MultiTargetUtilities.cs
rename to src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/MS/Internal/MultiTargetUtilities.cs
diff --git a/src/Microsoft.DotNet.Wpf/test/Common/TestServices/MS/Internal/PointUtil.cs b/src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/MS/Internal/PointUtil.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/test/Common/TestServices/MS/Internal/PointUtil.cs
rename to src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/MS/Internal/PointUtil.cs
diff --git a/src/Microsoft.DotNet.Wpf/test/Common/TestServices/MS/Internal/SecurityCriticalDataForSet.cs b/src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/MS/Internal/SecurityCriticalDataForSet.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/test/Common/TestServices/MS/Internal/SecurityCriticalDataForSet.cs
rename to src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/MS/Internal/SecurityCriticalDataForSet.cs
diff --git a/src/Microsoft.DotNet.Wpf/test/Common/TestServices/MS/Win32/ExternDll.cs b/src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/MS/Win32/ExternDll.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/test/Common/TestServices/MS/Win32/ExternDll.cs
rename to src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/MS/Win32/ExternDll.cs
diff --git a/src/Microsoft.DotNet.Wpf/test/Common/TestServices/MS/Win32/HandleCollector.cs b/src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/MS/Win32/HandleCollector.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/test/Common/TestServices/MS/Win32/HandleCollector.cs
rename to src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/MS/Win32/HandleCollector.cs
diff --git a/src/Microsoft.DotNet.Wpf/test/Common/TestServices/MS/Win32/NativeMethodsCLR.cs b/src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/MS/Win32/NativeMethodsCLR.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/test/Common/TestServices/MS/Win32/NativeMethodsCLR.cs
rename to src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/MS/Win32/NativeMethodsCLR.cs
diff --git a/src/Microsoft.DotNet.Wpf/test/Common/TestServices/MS/Win32/NativeMethodsOther.cs b/src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/MS/Win32/NativeMethodsOther.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/test/Common/TestServices/MS/Win32/NativeMethodsOther.cs
rename to src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/MS/Win32/NativeMethodsOther.cs
diff --git a/src/Microsoft.DotNet.Wpf/test/Common/TestServices/MS/Win32/NativeMethodsSetLastError.cs b/src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/MS/Win32/NativeMethodsSetLastError.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/test/Common/TestServices/MS/Win32/NativeMethodsSetLastError.cs
rename to src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/MS/Win32/NativeMethodsSetLastError.cs
diff --git a/src/Microsoft.DotNet.Wpf/test/Common/TestServices/MS/Win32/SafeNativeMethodsCLR.cs b/src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/MS/Win32/SafeNativeMethodsCLR.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/test/Common/TestServices/MS/Win32/SafeNativeMethodsCLR.cs
rename to src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/MS/Win32/SafeNativeMethodsCLR.cs
diff --git a/src/Microsoft.DotNet.Wpf/test/Common/TestServices/MS/Win32/SafeNativeMethodsOther.cs b/src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/MS/Win32/SafeNativeMethodsOther.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/test/Common/TestServices/MS/Win32/SafeNativeMethodsOther.cs
rename to src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/MS/Win32/SafeNativeMethodsOther.cs
diff --git a/src/Microsoft.DotNet.Wpf/test/Common/TestServices/MS/Win32/UnsafeNativeMethodsCLR.cs b/src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/MS/Win32/UnsafeNativeMethodsCLR.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/test/Common/TestServices/MS/Win32/UnsafeNativeMethodsCLR.cs
rename to src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/MS/Win32/UnsafeNativeMethodsCLR.cs
diff --git a/src/Microsoft.DotNet.Wpf/test/Common/TestServices/MS/Win32/UnsafeNativeMethodsOther.cs b/src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/MS/Win32/UnsafeNativeMethodsOther.cs
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/test/Common/TestServices/MS/Win32/UnsafeNativeMethodsOther.cs
rename to src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/MS/Win32/UnsafeNativeMethodsOther.cs
diff --git a/src/Microsoft.DotNet.Wpf/test/Common/TestServices/TestServices.csproj b/src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/TestServices.csproj
similarity index 100%
rename from src/Microsoft.DotNet.Wpf/test/Common/TestServices/TestServices.csproj
rename to src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/TestServices.csproj
diff --git a/src/Microsoft.DotNet.Wpf/test/Common/DRT/dirs.proj b/src/Microsoft.DotNet.Wpf/test/Common/DRT/dirs.proj
deleted file mode 100644
index 72dcacf30b3..00000000000
--- a/src/Microsoft.DotNet.Wpf/test/Common/DRT/dirs.proj
+++ /dev/null
@@ -1,19 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <Import Project="$(_NTDRIVE)$(_NTROOT)\wpf\test\Microsoft.Wpf.Test.Native.Settings.Targets" />
-
-
-  <ItemGroup Condition="'$(BuildExePhase)' == '' ">
-
-    <ProjectFile Include="TestServices\TestServices.csproj" />
-    <ProjectFile Include="WPFSetup\wpfSetup.csproj" />
-    <ProjectFile Include="Tools\DrtTools.csproj" />
-
-    <!-- Broken for 3.5 Build in recent Dev11 WPF migration.  Since DRTs are NEVER run in 3.X, disable there -->
-    <ProjectFile Include="rundrt\rundrts.nativeproj" Condition="'$(WPF_TESTBUILD_TARGETVERSION)' != 'v3.5' AND '$(WPF_TESTBUILD_TARGETVERSION)' != 'v3.0'"/>
-
-  </ItemGroup>
-
-  <Import Project="$(_NTDRIVE)$(_NTROOT)\tools\Microsoft.DevDiv.Traversal.targets" />
-
-</Project>
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml.sln b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml.sln
index 37c61ec0292..e9c83d048ac 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml.sln
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml.sln
@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.28010.2026
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DrtXaml.Tests", "DrtXaml\DrtXaml\DrtXaml.Tests.csproj", "{FAB114A2-2C6C-4372-A6BB-BC087B646E3A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DrtXaml", "DrtXaml\DrtXaml\DrtXaml.csproj", "{FAB114A2-2C6C-4372-A6BB-BC087B646E3A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestServices", "..\Common\TestServices\TestServices.csproj", "{387F3700-8C0B-4CEC-A68A-1725F656A249}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestServices", "..\Common\DRT\TestServices\TestServices.csproj", "{387F3700-8C0B-4CEC-A68A-1725F656A249}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XamlTestClasses", "DrtXaml\XamlTestClasses\XamlTestClasses.csproj", "{3C1FC36C-E3E6-4EED-9ECA-CFF2EB950486}"
 EndProject
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlAvoidXmlTest/BamlAvoidXmlTest.csproj b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlAvoidXmlTest/BamlAvoidXmlTest.csproj
index 288c956924a..c744feb3be1 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlAvoidXmlTest/BamlAvoidXmlTest.csproj
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlAvoidXmlTest/BamlAvoidXmlTest.csproj
@@ -25,4 +25,29 @@
   <ItemGroup>
     <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />
   </ItemGroup>
+
+  <ItemGroup>
+    <NetCoreReference Include="mscorlib" />
+    <NetCoreReference Include="netstandard" />
+    <NetCoreReference Include="System.Console" />
+    <NetCoreReference Include="System.Diagnostics.Debug" />
+    <NetCoreReference Include="System.Diagnostics.Tools" />
+    <NetCoreReference Include="System.Runtime.Extensions" />
+    <NetCoreReference Include="System.Runtime.InteropServices" />
+    <NetCoreReference Include="System.Resources.ResourceManager" />
+    <NetCoreReference Include="System.Linq" />
+    <NetCoreReference Include="System.ObjectModel" />
+    <NetCoreReference Include="System.ComponentModel" />
+    <NetCoreReference Include="System.ComponentModel.Primitives" />
+    <NetCoreReference Include="System.Collections" />
+    <NetCoreReference Include="System.Collections.Generic" />
+    <NetCoreReference Include="System.Collections.NonGeneric" />
+    <NetCoreReference Include="System.Collections.Concurrent" />
+    <NetCoreReference Include="System.Reflection.Primitives" />
+    <NetCoreReference Include="System.Text.Encoding.Extensions" />
+    <NetCoreReference Include="System.Threading" />
+    <NetCoreReference Include="System.Threading.Thread" />
+    <NetCoreReference Include="System.Threading.Tasks" />
+    <NetCoreReference Include="System.Xml.ReaderWriter" />
+  </ItemGroup>
 </Project>
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlTestClasses40/BamlTestClasses40.csproj b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlTestClasses40/BamlTestClasses40.csproj
index 39d1b6fedcd..3c4d5a8d8b5 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlTestClasses40/BamlTestClasses40.csproj
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlTestClasses40/BamlTestClasses40.csproj
@@ -62,12 +62,16 @@
     <Page Include="XmlSpace3.xaml">
       <Generator>MSBuild:Compile</Generator>
     </Page>
-
+    <Compile Include="BCMarkupExtension.cs" />
+    <Compile Include="TempDPSetOrder1ListBox.cs" />
     <None Remove="@(Page)" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)WindowsBase\WindowsBase.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)PresentationFramework\PresentationFramework.csproj" />
+    <ProjectReference Include="$(WpfSourceDir)PresentationCore\PresentationCore.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlTestClasses40/TempDPSetOrder1.xaml.cs b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlTestClasses40/TempDPSetOrder1.xaml.cs
index ba75f9a5345..0ddeeb78a63 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlTestClasses40/TempDPSetOrder1.xaml.cs
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlTestClasses40/TempDPSetOrder1.xaml.cs
@@ -16,47 +16,4 @@ public TempDPSetOrder1()
             InitializeComponent();
         }
     }
-
-    public enum Property
-    {
-        IsSynchronizedWithCurrentItem,
-        ItemsSource,
-        SelectedIndex
-    }
-
-    public class TempDPSetOrder1ListBox : ListBox
-    {
-        public static List<Property> Order { get; private set; }
-
-        static TempDPSetOrder1ListBox()
-        {
-            Order = new List<Property>();
-        }
-
-        protected override void OnPropertyChanged(DependencyPropertyChangedEventArgs e)
-        {
-            base.OnPropertyChanged(e);
-            if (e.Property.OwnerType.Equals(typeof(Selector)))
-            {
-                switch (e.Property.Name)
-                {
-                    case "IsSynchronizedWithCurrentItem":
-                        Order.Add(Property.IsSynchronizedWithCurrentItem);
-                        break;
-                    case "SelectedIndex":
-                        Order.Add(Property.SelectedIndex);
-                        break;
-                }
-            }
-            else if (e.Property.OwnerType.Equals(typeof(ItemsControl)))
-            {
-                switch (e.Property.Name)
-                {
-                    case "ItemsSource":
-                        Order.Add(Property.ItemsSource);
-                        break;
-                }
-            }
-        }
-    }
 }
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlTestClasses40/TempDPSetOrder1ListBox.cs b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlTestClasses40/TempDPSetOrder1ListBox.cs
new file mode 100644
index 00000000000..f9debdad8ce
--- /dev/null
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlTestClasses40/TempDPSetOrder1ListBox.cs
@@ -0,0 +1,54 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Collections.Generic;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+
+namespace BamlTestClasses40
+{
+    public enum Property
+    {
+        IsSynchronizedWithCurrentItem,
+        ItemsSource,
+        SelectedIndex
+    }
+    
+    public class TempDPSetOrder1ListBox : ListBox
+    {
+        public static List<Property> Order { get; private set; }
+
+        static TempDPSetOrder1ListBox()
+        {
+            Order = new List<Property>();
+        }
+
+        protected override void OnPropertyChanged(DependencyPropertyChangedEventArgs e)
+        {
+            base.OnPropertyChanged(e);
+            if (e.Property.OwnerType.Equals(typeof(Selector)))
+            {
+                switch (e.Property.Name)
+                {
+                    case "IsSynchronizedWithCurrentItem":
+                        Order.Add(Property.IsSynchronizedWithCurrentItem);
+                        break;
+                    case "SelectedIndex":
+                        Order.Add(Property.SelectedIndex);
+                        break;
+                }
+            }
+            else if (e.Property.OwnerType.Equals(typeof(ItemsControl)))
+            {
+                switch (e.Property.Name)
+                {
+                    case "ItemsSource":
+                        Order.Add(Property.ItemsSource);
+                        break;
+                }
+            }
+        }
+    }
+}
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/Directory.Build.props b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/Directory.Build.props
index 319f7c13864..4d1dc3791be 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/Directory.Build.props
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/Directory.Build.props
@@ -1,4 +1,4 @@
 <Project>
-  <Import Condition="Exists('../Directory.Build.props')" Project="../Directory.Build.props" />
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
   <Import Condition="Exists('$(WpfTestBasePath)/DRT.Build.props')" Project="$(WpfTestBasePath)/DRT.Build.props" />
 </Project>
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/DrtXaml.Tests.csproj b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/DrtXaml.csproj
similarity index 86%
rename from src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/DrtXaml.Tests.csproj
rename to src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/DrtXaml.csproj
index 47569961283..822d08b97c9 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/DrtXaml.Tests.csproj
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/DrtXaml.csproj
@@ -1,21 +1,20 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyName>DrtXaml</AssemblyName>
     <RootNamespace>DrtXaml</RootNamespace>
-    <ApplicationIcon />
-    <OutputType>Library</OutputType>
-    <StartupObject />
+    <LinkSubsystem>console</LinkSubsystem>
+    <OutputType>WinExe</OutputType>
     <Platforms>AnyCPU;x64</Platforms>
   </PropertyGroup>
 
   <PropertyGroup>
     <IsTestProject>true</IsTestProject>
-    <IsIntegrationTestProject>true</IsIntegrationTestProject>
+    <IsIntegrationTestProject>false</IsIntegrationTestProject>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
   
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Common\TestServices\TestServices.csproj" />
+    <ProjectReference Include="..\..\..\Common\DRT\TestServices\TestServices.csproj" />
     <ProjectReference Include="..\BamlAvoidXmlTest\BamlAvoidXmlTest.csproj" />
     <ProjectReference Include="..\BamlTestClasses40\BamlTestClasses40.csproj" />
     <ProjectReference Include="..\XamlTestClasses.FriendWithKey\XamlTestClasses.FriendWithKey.csproj" />
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/FriendWithKey/XamlTestClasses.FriendWithKey.csproj b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/FriendWithKey/XamlTestClasses.FriendWithKey.csproj
index 0d96d982242..b50c80cd7b3 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/FriendWithKey/XamlTestClasses.FriendWithKey.csproj
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/FriendWithKey/XamlTestClasses.FriendWithKey.csproj
@@ -3,7 +3,6 @@
     <AssemblyName>XamlTestClasses.FriendWithKey</AssemblyName>
     <OutputType>Library</OutputType>
     <DefineConstants>$(DefineConstants);OLDRESOURCES</DefineConstants>
-    <TestCode>true</TestCode>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/FriendWithoutKey/XamlTestClasses.FriendWithoutKey.csproj b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/FriendWithoutKey/XamlTestClasses.FriendWithoutKey.csproj
index b3ad111fa7f..0d902aa8960 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/FriendWithoutKey/XamlTestClasses.FriendWithoutKey.csproj
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/FriendWithoutKey/XamlTestClasses.FriendWithoutKey.csproj
@@ -3,7 +3,6 @@
     <AssemblyName>XamlTestClasses.FriendWithoutKey</AssemblyName>
     <OutputType>Library</OutputType>
     <DefineConstants>$(DefineConstants);OLDRESOURCES</DefineConstants>
-    <TestCode>true</TestCode>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <SignAssembly>false</SignAssembly>
   </PropertyGroup>
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/PartialTrustTests/DrtXaml.PartialTrustTests.csproj b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/PartialTrustTests/DrtXaml.PartialTrustTests.csproj
index 22e6c73fbf0..05472880300 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/PartialTrustTests/DrtXaml.PartialTrustTests.csproj
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/PartialTrustTests/DrtXaml.PartialTrustTests.csproj
@@ -3,7 +3,6 @@
     <AssemblyName>DrtXaml.PartialTrustTests</AssemblyName>
     <OutputType>Library</OutputType>
     <DefineConstants>$(DefineConstants);OLDRESOURCES</DefineConstants>
-    <TestCode>true</TestCode>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AssemblyAttributeClsCompliant>false</AssemblyAttributeClsCompliant>
   </PropertyGroup>
diff --git a/src/Microsoft.DotNet.Wpf/test/Directory.Build.props b/src/Microsoft.DotNet.Wpf/test/Directory.Build.props
index 471b0be1781..12c3872c4d5 100644
--- a/src/Microsoft.DotNet.Wpf/test/Directory.Build.props
+++ b/src/Microsoft.DotNet.Wpf/test/Directory.Build.props
@@ -1,39 +1,20 @@
 <Project>
-  <Import Condition="Exists('../Directory.Build.props')" Project="../Directory.Build.props" />
-  
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+
   <PropertyGroup>
     <WpfTestBasePath>$(MsBuildThisFileDirectory)</WpfTestBasePath>
     <DrtCommonRoot>$(WpfTestBasePath)\Common\DRT</DrtCommonRoot>
     <WpfSharedRoot>$(WpfTestBasePath)\Shared</WpfSharedRoot>
     <PublishRoot>$(RepoRoot)artifacts\test\</PublishRoot>
-
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-
-    <MicrosoftSourceLinkVersion>1.0.0-beta2-18618-05</MicrosoftSourceLinkVersion>
+    <RuntimeIdentifiers>win-x64;win-x86</RuntimeIdentifiers>
+    <PlatformFolder>x86</PlatformFolder>
+    <PlatformFolder Condition="'$(Platform)' == 'x64'">x64</PlatformFolder>
   </PropertyGroup>
-  
-  <Choose>
-    <When Condition="'$(Platform)' == 'x64'">
-      <PropertyGroup>
-        <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-        <PlatformFolder>x64</PlatformFolder>
-      </PropertyGroup>
-    </When>
-    <Otherwise>
-      <PropertyGroup>
-        <RuntimeIdentifier>win-x86</RuntimeIdentifier>
-        <PlatformFolder>x86</PlatformFolder>
-      </PropertyGroup>
-    </Otherwise>
-  </Choose>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="$(MicrosoftSourceLinkVersion)" PrivateAssets="all"/>
-  </ItemGroup>
-  
-  <Import Project="$(MsBuildThisFileDirectory)\Publish.props"/>
-  <Import Project="$(MsBuildThisFileDirectory)\StrongName.props"/>
+ 
+  <Import Project="$(WpfArcadeSdkToolsDir)\Publish.props"/>
+  <Import Project="$(WpfArcadeSdkToolsDir)\StrongName.props"/>
 
   <ItemDefinitionGroup>
     <EmbeddedResource>
@@ -55,7 +36,7 @@
     <DrtToolsProject>$(WpfTestBasePath)\Common\DRT\Tools\DrtTools.csproj</DrtToolsProject>
   </PropertyGroup>
 
-  <Import Project="$(MsBuildThisFileDirectory)\SourceLocations.props"/>
+  <Import Project="$(WpfArcadeSdkToolsDir)\SourceLocations.props"/>
 
   <PropertyGroup>
     <SignAssembly>true</SignAssembly>
diff --git a/src/Microsoft.DotNet.Wpf/test/Directory.Build.targets b/src/Microsoft.DotNet.Wpf/test/Directory.Build.targets
index c42bcba8ce7..2181cf771d7 100644
--- a/src/Microsoft.DotNet.Wpf/test/Directory.Build.targets
+++ b/src/Microsoft.DotNet.Wpf/test/Directory.Build.targets
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
-  <Import Condition="Exists('../Directory.Build.targets')" Project="../Directory.Build.targets" />
-  <Import Project="StrongName.targets" />
-  <Import Project="PublishAfterBuild.targets" />
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
+  <Import Project="$(WpfArcadeSdkToolsDir)StrongName.targets" />
+  <Import Project="$(WpfArcadeSdkToolsDir)PublishAfterBuild.targets" />
 </Project>
+  
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Wpf/test/MultiTargeting.props b/src/Microsoft.DotNet.Wpf/test/MultiTargeting.props
deleted file mode 100644
index 2f9f5d9b14f..00000000000
--- a/src/Microsoft.DotNet.Wpf/test/MultiTargeting.props
+++ /dev/null
@@ -1,61 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.0</TargetFrameworks>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <DefineConstants Condition="$(TargetFramework.StartsWith('net4'))">$(DefineConstants);NET4X</DefineConstants>
-    <DefineConstants Condition="$(TargetFramework.StartsWith('netcoreapp3'))">$(DefineConstants);NETCOREAPP3_X</DefineConstants>
-
-    <DefineConstants Condition="$(TargetFramework.Equals('net40'))">$(DefineConstants);NET40</DefineConstants>
-    <DefineConstants Condition="$(TargetFramework.Equals('net45'))">$(DefineConstants);NET45</DefineConstants>
-    <DefineConstants Condition="$(TargetFramework.Equals('net451'))">$(DefineConstants);NET451</DefineConstants>
-    <DefineConstants Condition="$(TargetFramework.Equals('net452'))">$(DefineConstants);NET452</DefineConstants>
-    <DefineConstants Condition="$(TargetFramework.Equals('net453'))">$(DefineConstants);NET453</DefineConstants>
-    <DefineConstants Condition="$(TargetFramework.Equals('net46'))">$(DefineConstants);NET46</DefineConstants>
-    <DefineConstants Condition="$(TargetFramework.Equals('net461'))">$(DefineConstants);NET461</DefineConstants>
-    <DefineConstants Condition="$(TargetFramework.Equals('net462'))">$(DefineConstants);NET462</DefineConstants>
-    <DefineConstants Condition="$(TargetFramework.Equals('net47'))">$(DefineConstants);NET47</DefineConstants>
-    <DefineConstants Condition="$(TargetFramework.Equals('net471'))">$(DefineConstants);NET471</DefineConstants>
-    <DefineConstants Condition="$(TargetFramework.Equals('net472'))">$(DefineConstants);NET472</DefineConstants>
-    
-    <DefineConstants Condition="$(TargetFramework.Equals('netcoreapp3.0'))">$(DefineConstants);NETCOREAPP3_0</DefineConstants>
-  </PropertyGroup>
-  
-  <ItemGroup Condition="'$(TargetFramework)'!='net35'">
-    <PackageReference Include="System.Reflection.Emit" Version="$(SystemReflectionEmitPackageVersion)" />
-  </ItemGroup>
-  
-  <!-- When IsUnitTestProject is set by Arcade, these ProjectReferences are implicitly included -->
-  <ItemGroup Condition="'$(TargetFramework)'!='net35' and '$(IsUnitTestProject)'!='true'">
-    <PackageReference Include="xunit" Version="$(XUnitVersion)" />
-    <PackageReference Include="xunit.runner.console" Version="$(XUnitRunnerConsoleVersion)">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitRunnerVisualStudioVersion)">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-
-  <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">   
-    <Reference Include="System.Xaml" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-    <Reference Include="UIAutomationClient" />
-    <Reference Include="UIAutomationProvider" />
-    <Reference Include="UIAutomationTypes" />
-    <Reference Include="WindowsBase" />
-    <Reference Include="Accessibility" />
-  </ItemGroup>
-  
-  <ItemGroup Condition="'$(TargetFramework)'=='net35'">
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-    <Reference Include="UIAutomationClient" />
-    <Reference Include="UIAutomationProvider" />
-    <Reference Include="UIAutomationTypes" />
-    <Reference Include="WindowsBase" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Wpf/test/PublishAfterBuild.targets b/src/Microsoft.DotNet.Wpf/test/PublishAfterBuild.targets
deleted file mode 100644
index 32916f86819..00000000000
--- a/src/Microsoft.DotNet.Wpf/test/PublishAfterBuild.targets
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project>
-   <Target Name="AfterBuild" DependsOnTargets="PublishPropertySetup;Publish"/> 
-  
-   <Target
-       Name="PublishPropertySetup">
-     <PropertyGroup>
-         <NoBuild>true</NoBuild>
-     </PropertyGroup>
-   </Target>
-</Project>

From 0a564c75488207b1a2d0153f589dabce18140ce6 Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Mon, 27 May 2019 12:03:47 -0700
Subject: [PATCH 53/72] tests properly running and reporting results

---
 eng/helix/prepare-helix-payload.ps1                   | 11 +++++------
 eng/helix/runtests.ps1                                |  2 +-
 .../test/BranchCommon/data/DrtList.xml                |  1 -
 .../test/DRT/Directory.Build.props                    |  2 +-
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/eng/helix/prepare-helix-payload.ps1 b/eng/helix/prepare-helix-payload.ps1
index efe24c50ec6..0591a2b6e31 100644
--- a/eng/helix/prepare-helix-payload.ps1
+++ b/eng/helix/prepare-helix-payload.ps1
@@ -1,11 +1,10 @@
 [CmdLetBinding()]
 Param(
     [string]$platform,
-    [string]$configuration,
-    [string]$testPackageVersion
+    [string]$configuration
 )
 
-$payloadDir = "HelixPayload\$configuration\$platform"
+$payloadDir = "$PSScriptRoot\HelixPayload\$configuration\$platform"
 
 $nugetPackagesDir = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "packages"
 
@@ -39,7 +38,7 @@ function CopyFolderStructure($from, $to)
 }
 
 # Copy files from nuget packages.
-$testNugetLocation = Resolve-Path (Join-Path $nugetPackagesDir "runtime.win-$platform.Microsoft.DotNet.Wpf.Test\*\tools\win-$platform\Test")
+$testNugetLocation = Resolve-Path (Join-Path $nugetPackagesDir "runtime.win-$platform.Microsoft.DotNet.Wpf.Test.*\tools\win-$platform\Test")
 $testPayloadLocation = Join-Path $payloadDir "Test"
 CopyFolderStructure $testNugetLocation $testPayloadLocation
 
@@ -50,5 +49,5 @@ $drtPayloadLocation = Join-Path $payloadDir "Test\DRT"
 CopyFolderStructure $drtArtifactsLocation $drtPayloadLocation
 
 # Copy scripts
-Copy-Item "eng\helix\configure-helix-machine.ps1" $payloadDir
-Copy-Item "eng\helix\runtests.ps1" $payloadDir
\ No newline at end of file
+Copy-Item "$PSScriptRoot\configure-helix-machine.ps1" $payloadDir
+Copy-Item "$PSScriptRoot\runtests.ps1" $payloadDir
\ No newline at end of file
diff --git a/eng/helix/runtests.ps1 b/eng/helix/runtests.ps1
index 241505851c1..d47f9f15f96 100644
--- a/eng/helix/runtests.ps1
+++ b/eng/helix/runtests.ps1
@@ -22,5 +22,5 @@ if (Test-Path "$testLocation\rundrts.cmd")
 # Need to copy the xUnit log to a known location that helix can understand
 if (Test-Path "$env:AppData\QualityVault\Run\Report\testResults.xml")
 {
-    Copy-Item "$env:AppData\QualityVault\Run\Report\testResults.xml" "..\testResults.xml"
+    Copy-Item "$env:AppData\QualityVault\Run\Report\testResults.xml" ".\testResults.xml"
 }
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Wpf/test/BranchCommon/data/DrtList.xml b/src/Microsoft.DotNet.Wpf/test/BranchCommon/data/DrtList.xml
index 1e94bca0882..e28c5f4a76b 100644
--- a/src/Microsoft.DotNet.Wpf/test/BranchCommon/data/DrtList.xml
+++ b/src/Microsoft.DotNet.Wpf/test/BranchCommon/data/DrtList.xml
@@ -541,7 +541,6 @@ Rundrtlist
       <SupportFile>BamlAvoidXmlTest.exe</SupportFile>
       <SupportFile>XamlTestClasses.FriendWithKey.dll</SupportFile>
       <SupportFile>XamlTestClasses.FriendWithoutKey.dll</SupportFile>
-      <SupportFile>DrtXaml.PartialTrustTests.dll</SupportFile>
     </SupportFiles>
   </Drt>
   <Drt Executable="DrtXpsApi.cmd" Architecture="all" OS="all" Team="DigitalDocuments" >
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/Directory.Build.props b/src/Microsoft.DotNet.Wpf/test/DRT/Directory.Build.props
index 7e783514db2..7167d0c5112 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT/Directory.Build.props
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <Import Condition="Exists('../Directory.Build.props')" Project="../Directory.Build.props" />
   <PropertyGroup>
-    <PublishDir>$(WpfTestBasePublishPath)\Common</PublishDir>
+    <PublishDir>$(WpfTestBasePublishPath)\DRT</PublishDir>
   </PropertyGroup>
 </Project>
\ No newline at end of file

From c14bb3dc24761053b283a805926c51c1f79185d5 Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Mon, 27 May 2019 12:57:57 -0700
Subject: [PATCH 54/72] a little cleaning up

---
 eng/helix/helixpublish.proj         | 2 +-
 eng/helix/prepare-helix-payload.ps1 | 5 +++--
 eng/helix/runtests.ps1              | 2 --
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/eng/helix/helixpublish.proj b/eng/helix/helixpublish.proj
index aac15376b1f..8fa7d9a29ef 100644
--- a/eng/helix/helixpublish.proj
+++ b/eng/helix/helixpublish.proj
@@ -19,7 +19,7 @@
     <FailOnMissionControlTestFailure>true</FailOnMissionControlTestFailure>
 
     <!-- Semi-colon delimited list of commands that are executed before every test.-->
-    <HelixPreCommands>$(HelixPreCommands);powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\configure-helix-machine.ps1 -version Xaml"</HelixPreCommands>
+    <HelixPreCommands>$(HelixPreCommands);</HelixPreCommands>
 
     <!-- These are the list of Windows versions that we run tests on-->
     <!--<HelixTargetQueues>Windows.10.Amd64.Open;Windows.7.Amd64.Open;Windows.10.Amd64.ServerRS5.Open</HelixTargetQueues>-->
diff --git a/eng/helix/prepare-helix-payload.ps1 b/eng/helix/prepare-helix-payload.ps1
index 0591a2b6e31..f0f726c294d 100644
--- a/eng/helix/prepare-helix-payload.ps1
+++ b/eng/helix/prepare-helix-payload.ps1
@@ -19,6 +19,9 @@ New-Item -ItemType Directory -Force -Path $payloadDir
 
 function CopyFolderStructure($from, $to)
 {
+    Write-Output "Copying from: $from"
+    Write-Output "          to: $to"
+    
     if(Test-Path $to)
     {
         Remove-Item $to -Recurse
@@ -33,8 +36,6 @@ function CopyFolderStructure($from, $to)
     {
         Write-Output "Location doesn't exist: $from"
     }
-
-    Get-ChildItem $to -Recurse
 }
 
 # Copy files from nuget packages.
diff --git a/eng/helix/runtests.ps1 b/eng/helix/runtests.ps1
index d47f9f15f96..c902dfd14e9 100644
--- a/eng/helix/runtests.ps1
+++ b/eng/helix/runtests.ps1
@@ -6,8 +6,6 @@ Param(
 # Configure the machine before running tests
 . "$PSScriptRoot\configure-helix-machine.ps1"
 
-dotnet --info
-
 # Run the tests
 $testLocation = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "Test"
 if (Test-Path "$testLocation\rundrts.cmd")

From 04d7e3d4058a90377c1348f966767ca820a70f16 Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Mon, 27 May 2019 13:07:23 -0700
Subject: [PATCH 55/72] fix creating payload directory

---
 eng/helix/prepare-helix-payload.ps1 | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/eng/helix/prepare-helix-payload.ps1 b/eng/helix/prepare-helix-payload.ps1
index f0f726c294d..ac29459d060 100644
--- a/eng/helix/prepare-helix-payload.ps1
+++ b/eng/helix/prepare-helix-payload.ps1
@@ -4,12 +4,10 @@ Param(
     [string]$configuration
 )
 
-$payloadDir = "$PSScriptRoot\HelixPayload\$configuration\$platform"
+$payloadDir = "HelixPayload\$configuration\$platform"
 
 $nugetPackagesDir = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "packages"
 
-# TODO: Once we have the nuget package from the dotnet-wpf-test, we can better understand what we 
-# need to do here.
 # Create the payload directory. Remove it if it already exists.
 if(Test-Path $payloadDir)
 {
@@ -19,9 +17,6 @@ New-Item -ItemType Directory -Force -Path $payloadDir
 
 function CopyFolderStructure($from, $to)
 {
-    Write-Output "Copying from: $from"
-    Write-Output "          to: $to"
-    
     if(Test-Path $to)
     {
         Remove-Item $to -Recurse
@@ -50,5 +45,5 @@ $drtPayloadLocation = Join-Path $payloadDir "Test\DRT"
 CopyFolderStructure $drtArtifactsLocation $drtPayloadLocation
 
 # Copy scripts
-Copy-Item "$PSScriptRoot\configure-helix-machine.ps1" $payloadDir
-Copy-Item "$PSScriptRoot\runtests.ps1" $payloadDir
\ No newline at end of file
+Copy-Item "eng\helix\configure-helix-machine.ps1" $payloadDir
+Copy-Item "eng\helix\runtests.ps1" $payloadDir
\ No newline at end of file

From b2c930814f2007139f237b225dc619a4ba7406cd Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Mon, 27 May 2019 13:25:50 -0700
Subject: [PATCH 56/72] put test directory back to how it is when restoring via
 msbuild

---
 eng/Versions.props                            |  1 +
 eng/helix/configure-helix-machine.ps1         | 29 +++++++++++
 eng/helix/helixpublish.proj                   | 51 ++++++++++---------
 eng/helix/prepare-helix-payload.ps1           |  6 +--
 eng/helix/runtests.cmd                        |  3 ++
 eng/helix/runtests.ps1                        |  8 +--
 eng/pipeline.yml                              |  2 +-
 .../test/BranchCommon/data/CommonData.csproj  |  2 +-
 8 files changed, 69 insertions(+), 33 deletions(-)
 create mode 100644 eng/helix/runtests.cmd

diff --git a/eng/Versions.props b/eng/Versions.props
index ec0f112db0b..841a8a4784d 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -58,6 +58,7 @@
     <XUnitVersion>2.4.0</XUnitVersion>
     <XUnitRunnerConsoleVersion>$(XUnitVersion)</XUnitRunnerConsoleVersion>
     <XUnitRunnerVisualStudioVersion>$(XUnitVersion)</XUnitRunnerVisualStudioVersion>
+    <MicrosoftDotNetWpfTestPackageVersion>1.0.0-beta.19263.1</MicrosoftDotNetWpfTestPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <RestoreSources>
diff --git a/eng/helix/configure-helix-machine.ps1 b/eng/helix/configure-helix-machine.ps1
index 85403ad23fa..4f20fb2866a 100644
--- a/eng/helix/configure-helix-machine.ps1
+++ b/eng/helix/configure-helix-machine.ps1
@@ -1 +1,30 @@
 # This file prepares the helix machine for our tests runs
+$dotnetLocation = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "dotnet"
+
+# Set DOTNET_ROOT variables so the host can find it
+Set-Item -Path "env:DOTNET_ROOT(x86)" -Value $dotnetLocation
+Set-Item -Path "env:DOTNET_ROOT" -Value $dotnetLocation
+
+$runtimes = dotnet --list-runtimes
+foreach ($rt in $runtimes)
+{
+    if ($rt.StartsWith("Microsoft.WindowsDesktop.App"))
+    {
+        $version = $rt.Split(" ")[1]
+    }
+}
+
+# Rewrite the *.runtimeconfig.json files to match the version of the runtime on the machine
+$infraLocation = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "Test\Infra"
+$stiConfigFile = Join-Path $infraLocation "Sti.runtimeconfig.json"
+$qvConfigFile = Join-Path $infraLocation "QualityVaultFrontEnd.runtimeconfig.json"
+$configFiles = $stiConfigFile, $qvConfigFile
+foreach ($config in $configFiles)
+{
+    # Read current config file
+    $jsondata = Get-Content -Raw -Path $config | ConvertFrom-Json
+    # Update version
+    $jsondata.runtimeOptions.framework.version = $version
+    # Write data back
+    $jsondata | ConvertTo-Json -depth 100 | Set-Content $config
+}
\ No newline at end of file
diff --git a/eng/helix/helixpublish.proj b/eng/helix/helixpublish.proj
index 8fa7d9a29ef..9d4a8cdc9d1 100644
--- a/eng/helix/helixpublish.proj
+++ b/eng/helix/helixpublish.proj
@@ -13,7 +13,9 @@
     <DotNetCliPackageType>sdk</DotNetCliPackageType>
     <!-- Set to match global.json.tools.dotnet by pre-build.ps1 -->
     <DotNetCliVersion>$(DotNetCliVersion)</DotNetCliVersion>
-    
+    <DotNetCliRuntime>win-x86</DotNetCliRuntime>
+    <DotNetCliRuntime Condition="'$(Platform)' == 'x64'">win-x64</DotNetCliRuntime>
+
     <EnableXUnitReporter>true</EnableXUnitReporter>
     <EnableAzurePipelinesReporter>true</EnableAzurePipelinesReporter>
     <FailOnMissionControlTestFailure>true</FailOnMissionControlTestFailure>
@@ -26,7 +28,6 @@
     <!-- Just cutting down the total queues while bootstrapping to speed things up-->
     <HelixTargetQueues>Windows.10.Amd64.Open</HelixTargetQueues>
 
-    <MicrosoftDotNetWpfTestPackageVersion>1.0.0-beta.19263.1</MicrosoftDotNetWpfTestPackageVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -34,96 +35,96 @@
     <HelixCorrelationPayload Include="..\..\HelixPayload\$(Configuration)\$(Platform)" /> 
     <HelixWorkItem Include="Xaml">
       <Timeout>00:20:00</Timeout>
-      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 -area Xaml"</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Xaml</Command>
     </HelixWorkItem>
    <!-- 
    <HelixWorkItem Include="Annotations">
       <Timeout>00:20:00</Timeout> 
-      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=Annotations"</Command>
+      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Annotations</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="AppModel">
       <Timeout>00:20:00</Timeout>
-      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=AppModel"</Command>
+      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=AppModel</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="DigitalDocuments">
       <Timeout>00:20:00</Timeout>
-      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=DigitalDocuments"</Command>
+      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=DigitalDocuments</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Media">
       <Timeout>00:20:00</Timeout>
-      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=Media"</Command>
+      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Media</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Editing">
       <Timeout>00:20:00</Timeout>
-      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=Editing"</Command>
+      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Editing</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="ElementServices">
       <Timeout>00:20:00</Timeout>
-      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=ElementServices"</Command>
+      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=ElementServices</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Text">
       <Timeout>00:20:00</Timeout>
-      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=Text"</Command>
+      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Text</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Animation">
       <Timeout>00:20:00</Timeout>
-      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=Animation"</Command>
+      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Animation</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="3D">
       <Timeout>00:20:00</Timeout>
-      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=3D"</Command>
+      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=3D</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="2D">
       <Timeout>00:20:00</Timeout>
-      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=2D"</Command>
+      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=2D</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Controls">
       <Timeout>00:20:00</Timeout>
-      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=Controls"</Command>
+      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Controls</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Imaging">
       <Timeout>00:20:00</Timeout>
-      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=Imaging"</Command>
+      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Imaging</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="FlowLayout">
       <Timeout>00:20:00</Timeout>
-      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=FlowLayout"</Command>
+      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=FlowLayout</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="DataServices">
       <Timeout>00:20:00</Timeout>
-      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=DataServices"</Command>
+      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=DataServices</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="ElementLayout">
       <Timeout>00:20:00</Timeout>
-      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=ElementLayout"</Command>
+      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=ElementLayout</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Xaml">
       <Timeout>00:20:00</Timeout>
-      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=Xaml"</Command>
+      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Xaml</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Globalization">
       <Timeout>00:20:00</Timeout>
-      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=Globalization"</Command>
+      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Globalization</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Tablet">
       <Timeout>00:20:00</Timeout>
-      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=Tablet"</Command>
+      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Tablet</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Integration">
       <Timeout>00:20:00</Timeout>
-      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=Integration"</Command>
+      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Integration</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="XET">
       <Timeout>00:20:00</Timeout>
-      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=XET"</Command>
+      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=XET</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Printing">
       <Timeout>00:20:00</Timeout>
-      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=Printing"</Command>
+      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Printing</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="WindowsFormsIntegration">
       <Timeout>00:20:00</Timeout>
-      <Command>powershell -ExecutionPolicy ByPass -NoProfile -command "&amp; %HELIX_CORRELATION_PAYLOAD%\runtests.ps1 /Area=WindowsFormsIntegration"</Command>
+      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=WindowsFormsIntegration</Command>
     </HelixWorkItem>
     -->
   </ItemGroup>
diff --git a/eng/helix/prepare-helix-payload.ps1 b/eng/helix/prepare-helix-payload.ps1
index ac29459d060..9f382820f4a 100644
--- a/eng/helix/prepare-helix-payload.ps1
+++ b/eng/helix/prepare-helix-payload.ps1
@@ -34,16 +34,16 @@ function CopyFolderStructure($from, $to)
 }
 
 # Copy files from nuget packages.
-$testNugetLocation = Resolve-Path (Join-Path $nugetPackagesDir "runtime.win-$platform.Microsoft.DotNet.Wpf.Test.*\tools\win-$platform\Test")
+$testNugetLocation = Resolve-Path (Join-Path $nugetPackagesDir "runtime.win-$platform.Microsoft.DotNet.Wpf.Test\*\tools\win-$platform\Test")
 $testPayloadLocation = Join-Path $payloadDir "Test"
 CopyFolderStructure $testNugetLocation $testPayloadLocation
 
 # Copy local DRT assemblies to test location
-CopyFolderStructure $testNugetLocation $testPayloadLocation
 $drtArtifactsLocation = [System.IO.Path]::Combine($env:BUILD_SOURCESDIRECTORY, "artifacts\test", $configuration, $platform, "Test\DRT")
 $drtPayloadLocation = Join-Path $payloadDir "Test\DRT"
 CopyFolderStructure $drtArtifactsLocation $drtPayloadLocation
 
 # Copy scripts
 Copy-Item "eng\helix\configure-helix-machine.ps1" $payloadDir
-Copy-Item "eng\helix\runtests.ps1" $payloadDir
\ No newline at end of file
+Copy-Item "eng\helix\runtests.ps1" $payloadDir
+Copy-Item "eng\helix\runtests.cmd" $payloadDir
diff --git a/eng/helix/runtests.cmd b/eng/helix/runtests.cmd
new file mode 100644
index 00000000000..c7b6190b9f2
--- /dev/null
+++ b/eng/helix/runtests.cmd
@@ -0,0 +1,3 @@
+@echo off
+
+powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0runtests.ps1"""  %*"
\ No newline at end of file
diff --git a/eng/helix/runtests.ps1 b/eng/helix/runtests.ps1
index c902dfd14e9..55d4395441a 100644
--- a/eng/helix/runtests.ps1
+++ b/eng/helix/runtests.ps1
@@ -1,6 +1,6 @@
 [CmdLetBinding()]
 Param(
-    [string]$area
+    [string]$command
 )
 
 # Configure the machine before running tests
@@ -10,7 +10,7 @@ Param(
 $testLocation = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "Test"
 if (Test-Path "$testLocation\rundrts.cmd")
 {
-    Invoke-Expression "$testLocation\rundrts.cmd /Area=$area"
+    Invoke-Expression "$testLocation\rundrts.cmd $command"
 }
 
 # We can use $env:HELIX_PYTHONPATH $env:HELIX_SCRIPT_ROOT\upload_result.py to upload any QV specific logs and/or screenshots that we are interested in.
@@ -20,5 +20,7 @@ if (Test-Path "$testLocation\rundrts.cmd")
 # Need to copy the xUnit log to a known location that helix can understand
 if (Test-Path "$env:AppData\QualityVault\Run\Report\testResults.xml")
 {
-    Copy-Item "$env:AppData\QualityVault\Run\Report\testResults.xml" ".\testResults.xml"
+    $resultLocation = $PSScriptRoot
+    Write-Output "Copying test results to $resultLocation"
+    Copy-Item "$env:AppData\QualityVault\Run\Report\testResults.xml" $resultLocation
 }
\ No newline at end of file
diff --git a/eng/pipeline.yml b/eng/pipeline.yml
index e2f05cb5eda..7ea3b6cdacc 100644
--- a/eng/pipeline.yml
+++ b/eng/pipeline.yml
@@ -18,7 +18,7 @@ jobs:
   parameters:
     enableMicrobuild: true
     enablePublishBuildArtifacts: true
-    enablePublishTestResults: true
+    enablePublishTestResults: false # tests run in helix
     enablePublishBuildAssets: true
     enablePublishUsingPipelines: $(_PublishUsingPipelines)
     enableTelemetry: true
diff --git a/src/Microsoft.DotNet.Wpf/test/BranchCommon/data/CommonData.csproj b/src/Microsoft.DotNet.Wpf/test/BranchCommon/data/CommonData.csproj
index ed8277f8958..9a963ba3405 100644
--- a/src/Microsoft.DotNet.Wpf/test/BranchCommon/data/CommonData.csproj
+++ b/src/Microsoft.DotNet.Wpf/test/BranchCommon/data/CommonData.csproj
@@ -14,7 +14,7 @@
       <Link>DRT\%(Filename)%(Extension)</Link>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-  
+ 
   </ItemGroup>
 
 </Project>

From d1aa7dd5c0cf1488465f39141b3c696a720442dd Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Wed, 29 May 2019 11:11:57 -0700
Subject: [PATCH 57/72] updating dependencies

---
 eng/Version.Details.xml                       |  4 ++--
 eng/helix/helixpublish.proj                   |  4 ++--
 eng/pipeline.yml                              |  4 ----
 eng/pre-build.ps1                             |  7 -------
 global.json                                   |  2 +-
 .../DrtXaml.PartialTrustTests.csproj          | 19 -------------------
 6 files changed, 5 insertions(+), 35 deletions(-)
 delete mode 100644 eng/pre-build.ps1
 delete mode 100644 src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/PartialTrustTests/DrtXaml.PartialTrustTests.csproj

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index ad1eac1f472..a6d00a56925 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -95,9 +95,9 @@
       <Uri>https://github.com/dotnet/coreclr</Uri>
       <Sha>10df20ed3ff0208b3f16f79d5062662a8827f579</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19222.2">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19278.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>851e36df83d3361e4bd8a70a2a8a89f762469f9a</Sha>
+      <Sha>11f90a2a260422201895de58e57170131ab4efe7</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/helix/helixpublish.proj b/eng/helix/helixpublish.proj
index 9d4a8cdc9d1..59d6c21b45a 100644
--- a/eng/helix/helixpublish.proj
+++ b/eng/helix/helixpublish.proj
@@ -10,9 +10,9 @@
     </RestoreSources>
 
     <IncludeDotNetCli>true</IncludeDotNetCli>
-    <DotNetCliPackageType>sdk</DotNetCliPackageType>
+    <DotNetCliPackageType>runtime</DotNetCliPackageType>
     <!-- Set to match global.json.tools.dotnet by pre-build.ps1 -->
-    <DotNetCliVersion>$(DotNetCliVersion)</DotNetCliVersion>
+    <DotNetCliVersion>$(MicrosoftNetCoreAppVersion)</DotNetCliVersion>
     <DotNetCliRuntime>win-x86</DotNetCliRuntime>
     <DotNetCliRuntime Condition="'$(Platform)' == 'x64'">win-x64</DotNetCliRuntime>
 
diff --git a/eng/pipeline.yml b/eng/pipeline.yml
index 7ea3b6cdacc..286a1b2020d 100644
--- a/eng/pipeline.yml
+++ b/eng/pipeline.yml
@@ -120,10 +120,6 @@ jobs:
       - checkout: self
         clean: true
       
-      # Set VSO Variable(s)
-      - powershell: eng\pre-build.ps1
-        displayName: Pre-Build - Set VSO Variables
-
       # Use utility script to run script command dependent on agent OS.
       - script: eng\common\cibuild.cmd
           -configuration $(_BuildConfig) 
diff --git a/eng/pre-build.ps1 b/eng/pre-build.ps1
deleted file mode 100644
index baad60ccbd9..00000000000
--- a/eng/pre-build.ps1
+++ /dev/null
@@ -1,7 +0,0 @@
-# Open global.json
-$globaljsonpath = Join-Path $env:BUILD_SOURCESDIRECTORY 'global.json'
-$jsondata = Get-Content -Raw -Path $globaljsonpath | ConvertFrom-Json
-
-# Set DotNetCliVersion to global.json.tools.dotnet
-$dotnetcliver = $jsondata.tools.dotnet
-Write-Host "##vso[task.setvariable variable=DotNetCliVersion;]$dotnetcliver"
\ No newline at end of file
diff --git a/global.json b/global.json
index 1e111d5600a..9f7136d509e 100644
--- a/global.json
+++ b/global.json
@@ -13,7 +13,7 @@
   },
   "msbuild-sdks": {
     "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19305.13",
-    "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19222.2"
+    "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19278.1"
   },
   "native-tools": {
     "strawberry-perl": "5.28.1.1-1"
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/PartialTrustTests/DrtXaml.PartialTrustTests.csproj b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/PartialTrustTests/DrtXaml.PartialTrustTests.csproj
deleted file mode 100644
index 05472880300..00000000000
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/PartialTrustTests/DrtXaml.PartialTrustTests.csproj
+++ /dev/null
@@ -1,19 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
-    <PropertyGroup>
-    <AssemblyName>DrtXaml.PartialTrustTests</AssemblyName>
-    <OutputType>Library</OutputType>
-    <DefineConstants>$(DefineConstants);OLDRESOURCES</DefineConstants>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <AssemblyAttributeClsCompliant>false</AssemblyAttributeClsCompliant>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="NonPublicEvents.cs" />
-    <Compile Include="ObjectWriterNonPublic.cs" />
-    <!--<Compile Include="SystemXamlInternal.cs" />-->
-    <!-- Need our own local copy of this file, because DrtXaml is not APTCA -->
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\DrtXaml\DrtXaml.csproj"/>
-    <ProjectReference Include="..\XamlTestClasses\XamlTestClasses.csproj"/>
-  </ItemGroup>
-</Project>
\ No newline at end of file

From 42d12804ea9317aedbce5260f1285f7bc6bac584 Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Wed, 29 May 2019 14:02:28 -0700
Subject: [PATCH 58/72] adding all helix queues

---
 eng/helix/helixpublish.proj | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/eng/helix/helixpublish.proj b/eng/helix/helixpublish.proj
index 59d6c21b45a..3bf2ce66467 100644
--- a/eng/helix/helixpublish.proj
+++ b/eng/helix/helixpublish.proj
@@ -24,10 +24,7 @@
     <HelixPreCommands>$(HelixPreCommands);</HelixPreCommands>
 
     <!-- These are the list of Windows versions that we run tests on-->
-    <!--<HelixTargetQueues>Windows.10.Amd64.Open;Windows.7.Amd64.Open;Windows.10.Amd64.ServerRS5.Open</HelixTargetQueues>-->
-    <!-- Just cutting down the total queues while bootstrapping to speed things up-->
-    <HelixTargetQueues>Windows.10.Amd64.Open</HelixTargetQueues>
-
+    <HelixTargetQueues>Windows.10.Amd64.Open;Windows.7.Amd64.Open;Windows.10.Amd64.ServerRS5.Open</HelixTargetQueues>
   </PropertyGroup>
 
   <ItemGroup>

From 4b5da99fffc80544173042befd9275189b861937 Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Thu, 30 May 2019 11:12:37 -0700
Subject: [PATCH 59/72] running tests with build -test

this creates the payload as part of msbuild
---
 eng/AfterSolutionBuild.targets                |   3 +
 eng/WpfArcadeSdk/Sdk/Sdk.targets              |   1 +
 .../tools/CreateTestPayload.targets           |  39 ++
 eng/WpfArcadeSdk/tools/RunDrtsLocal.targets   |   5 +
 .../tools/configure-helix-machine.ps1         |  30 +
 eng/WpfArcadeSdk/tools/runtests.cmd           |   3 +
 eng/WpfArcadeSdk/tools/runtests.ps1           |  29 +
 eng/helix/helixpublish.proj                   |  52 +-
 eng/pipeline.yml                              |  23 -
 ...t.DotNet.Arcade.Wpf.Sdk.ArchNeutral.csproj |   2 +
 .../test/BranchCommon/data/DrtList.xml        | 548 ------------------
 11 files changed, 139 insertions(+), 596 deletions(-)
 create mode 100644 eng/AfterSolutionBuild.targets
 create mode 100644 eng/WpfArcadeSdk/tools/CreateTestPayload.targets
 create mode 100644 eng/WpfArcadeSdk/tools/RunDrtsLocal.targets
 create mode 100644 eng/WpfArcadeSdk/tools/configure-helix-machine.ps1
 create mode 100644 eng/WpfArcadeSdk/tools/runtests.cmd
 create mode 100644 eng/WpfArcadeSdk/tools/runtests.ps1

diff --git a/eng/AfterSolutionBuild.targets b/eng/AfterSolutionBuild.targets
new file mode 100644
index 00000000000..3b6300aec90
--- /dev/null
+++ b/eng/AfterSolutionBuild.targets
@@ -0,0 +1,3 @@
+<Project>
+    <Import Project="$(MSBuildThisFileDirectory)WpfArcadeSdk\tools\RunDrtsLocal.targets" Condition="'$(Test)'=='True'" />
+</Project>
\ No newline at end of file
diff --git a/eng/WpfArcadeSdk/Sdk/Sdk.targets b/eng/WpfArcadeSdk/Sdk/Sdk.targets
index 88a2a498f5d..d035888e2ac 100644
--- a/eng/WpfArcadeSdk/Sdk/Sdk.targets
+++ b/eng/WpfArcadeSdk/Sdk/Sdk.targets
@@ -22,6 +22,7 @@
   <Import Project="$(NoTargetsTargets)" Condition="'$(NoTargets)'=='true'"/>
   <Import Project="$(WpfArcadeSdkToolsDir)InjectModuleInitializer.targets" Condition="'$(InjectModuleInitializer)'=='true'"/>
   <Import Project="$(WpfArcadeSdkToolsDir)TestProjects.targets" />
+  <Import Project="$(WpfArcadeSdkToolsDir)CreateTestPayload.targets" Condition="'$(CreateTestPayload)'=='true'"/>
   
   <!-- PresentationBuildTasks related targets files -->
   <Import Project="$(WpfArcadeSdkToolsDir)Pbt.targets" Condition="'$(InternalMarkupCompilation)'=='true'"/>
diff --git a/eng/WpfArcadeSdk/tools/CreateTestPayload.targets b/eng/WpfArcadeSdk/tools/CreateTestPayload.targets
new file mode 100644
index 00000000000..b53e478dad4
--- /dev/null
+++ b/eng/WpfArcadeSdk/tools/CreateTestPayload.targets
@@ -0,0 +1,39 @@
+<Project>
+
+    <!-- We use a local RID here since we don't want to change the build layout by setting the actual RID. -->
+  <PropertyGroup>
+    <LocalRuntimeIdentifier Condition="'$(Platform)'=='x64' or '$(Platform)'=='x86' or '$(Platform)'=='arm' or '$(Platform)'=='arm64'">win-$(Platform)</LocalRuntimeIdentifier>
+    <LocalRuntimeIdentifier Condition="'$(Platform)'=='Win32' or '$(Platform)'=='AnyCPU'">win-x86</LocalRuntimeIdentifier>
+
+    <NoWarn>$(NoWarn);NU3027;NU3018</NoWarn>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="runtime.$(LocalRuntimeIdentifier).Microsoft.DotNet.Wpf.Test" Version="$(MicrosoftDotNetWpfTestPackageVersion)" GeneratePathProperty="true" />
+  </ItemGroup>
+
+  <PropertyGroup Condition="'$(LocalRuntimeIdentifier)'=='win-x86'">
+    <MicrosoftDotNetWpfTestPath>$(Pkgruntime_win-x86_Microsoft_DotNet_Wpf_Test)\tools\$(LocalRuntimeIdentifier)\Test\</MicrosoftDotNetWpfTestPath>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(LocalRuntimeIdentifier)'=='win-x64'">
+    <MicrosoftDotNetWpfTestPath>$(Pkgruntime_win-x64_Microsoft_DotNet_Wpf_Test)\tools\$(LocalRuntimeIdentifier)\Test\</MicrosoftDotNetWpfTestPath>
+  </PropertyGroup>
+
+  <Target Name="CreateTestPayload" BeforeTargets="Test">
+    <ItemGroup>
+      <MicrosoftDotNetWpfTestContents Include="$(MicrosoftDotNetWpfTestPath)\**\*.*" />
+      <OtherPayloadContents Include="$(WpfArcadeSdkToolsDir)runtests.cmd" />
+      <OtherPayloadContents Include="$(WpfArcadeSdkToolsDir)runtests.ps1" />
+      <OtherPayloadContents Include="$(WpfArcadeSdkToolsDir)configure-helix-machine.ps1" Condition="'$(ContinousIntegrationBuild)'=='True'" />
+    </ItemGroup>
+
+    <Copy SourceFiles="@(MicrosoftDotNetWpfTestContents)"
+          DestinationFiles="@(MicrosoftDotNetWpfTestContents->'$(WpfTestBasePublishPath)\%(RecursiveDir)%(Filename)%(Extension)')"  />
+
+    <Copy SourceFiles="@(OtherPayloadContents)"
+          DestinationFolder="$(PublishDir)"  />
+
+  </Target>
+
+</Project>
diff --git a/eng/WpfArcadeSdk/tools/RunDrtsLocal.targets b/eng/WpfArcadeSdk/tools/RunDrtsLocal.targets
new file mode 100644
index 00000000000..376c35bb846
--- /dev/null
+++ b/eng/WpfArcadeSdk/tools/RunDrtsLocal.targets
@@ -0,0 +1,5 @@
+<Project>
+  <Target Name="RunDrts" AfterTargets="Build" Condition="'$(ContinuousIntegrationBuild)'!='True'">
+    <Exec Command="$(RepoRoot)\artifacts\test\$(Configuration)\$(Platform)\runtests.cmd"/>
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/eng/WpfArcadeSdk/tools/configure-helix-machine.ps1 b/eng/WpfArcadeSdk/tools/configure-helix-machine.ps1
new file mode 100644
index 00000000000..4f20fb2866a
--- /dev/null
+++ b/eng/WpfArcadeSdk/tools/configure-helix-machine.ps1
@@ -0,0 +1,30 @@
+# This file prepares the helix machine for our tests runs
+$dotnetLocation = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "dotnet"
+
+# Set DOTNET_ROOT variables so the host can find it
+Set-Item -Path "env:DOTNET_ROOT(x86)" -Value $dotnetLocation
+Set-Item -Path "env:DOTNET_ROOT" -Value $dotnetLocation
+
+$runtimes = dotnet --list-runtimes
+foreach ($rt in $runtimes)
+{
+    if ($rt.StartsWith("Microsoft.WindowsDesktop.App"))
+    {
+        $version = $rt.Split(" ")[1]
+    }
+}
+
+# Rewrite the *.runtimeconfig.json files to match the version of the runtime on the machine
+$infraLocation = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "Test\Infra"
+$stiConfigFile = Join-Path $infraLocation "Sti.runtimeconfig.json"
+$qvConfigFile = Join-Path $infraLocation "QualityVaultFrontEnd.runtimeconfig.json"
+$configFiles = $stiConfigFile, $qvConfigFile
+foreach ($config in $configFiles)
+{
+    # Read current config file
+    $jsondata = Get-Content -Raw -Path $config | ConvertFrom-Json
+    # Update version
+    $jsondata.runtimeOptions.framework.version = $version
+    # Write data back
+    $jsondata | ConvertTo-Json -depth 100 | Set-Content $config
+}
\ No newline at end of file
diff --git a/eng/WpfArcadeSdk/tools/runtests.cmd b/eng/WpfArcadeSdk/tools/runtests.cmd
new file mode 100644
index 00000000000..c7b6190b9f2
--- /dev/null
+++ b/eng/WpfArcadeSdk/tools/runtests.cmd
@@ -0,0 +1,3 @@
+@echo off
+
+powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0runtests.ps1"""  %*"
\ No newline at end of file
diff --git a/eng/WpfArcadeSdk/tools/runtests.ps1 b/eng/WpfArcadeSdk/tools/runtests.ps1
new file mode 100644
index 00000000000..b3cda8665db
--- /dev/null
+++ b/eng/WpfArcadeSdk/tools/runtests.ps1
@@ -0,0 +1,29 @@
+[CmdLetBinding()]
+Param(
+    [string]$command
+)
+
+# Configure the machine before running tests
+if (Test-Path "$PSScriptRoot\configure-helix-machine.ps1")
+{
+    . "$PSScriptRoot\configure-helix-machine.ps1"
+}
+
+# Run the tests
+$testLocation = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "Test"
+if (Test-Path "$testLocation\rundrts.cmd")
+{
+    Invoke-Expression "$testLocation\rundrts.cmd $command"
+}
+
+# We can use $env:HELIX_PYTHONPATH $env:HELIX_SCRIPT_ROOT\upload_result.py to upload any QV specific logs and/or screenshots that we are interested in.
+# For example: $env:HELIX_PYTHONPATH $env:HELIX_SCRIPT_ROOT%\upload_result.py -result screenshot.jpg -result_name screenshot.jpg
+# Then, links to these artifacts can then be included in the xUnit logs.
+
+# Need to copy the xUnit log to a known location that helix can understand
+if (Test-Path "$env:AppData\QualityVault\Run\Report\testResults.xml")
+{
+    $resultLocation = $PSScriptRoot
+    Write-Output "Copying test results to $resultLocation"
+    Copy-Item "$env:AppData\QualityVault\Run\Report\testResults.xml" $resultLocation
+}
\ No newline at end of file
diff --git a/eng/helix/helixpublish.proj b/eng/helix/helixpublish.proj
index 3bf2ce66467..6869d5b7bbc 100644
--- a/eng/helix/helixpublish.proj
+++ b/eng/helix/helixpublish.proj
@@ -28,100 +28,102 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="runtime.win-$(Platform).Microsoft.DotNet.Wpf.Test" Version="$(MicrosoftDotNetWpfTestPackageVersion)" />
-    <HelixCorrelationPayload Include="..\..\HelixPayload\$(Configuration)\$(Platform)" /> 
+    <HelixCorrelationPayload Include="artifacts\test\$(Configuration)\$(Platform)" /> 
     <HelixWorkItem Include="Xaml">
       <Timeout>00:20:00</Timeout>
       <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Xaml</Command>
     </HelixWorkItem>
-   <!-- 
+   
+   <!--
+   Uncomment when bringing appropriate DRTs out into the open
+   
    <HelixWorkItem Include="Annotations">
       <Timeout>00:20:00</Timeout> 
-      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Annotations</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Annotations</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="AppModel">
       <Timeout>00:20:00</Timeout>
-      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=AppModel</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=AppModel</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="DigitalDocuments">
       <Timeout>00:20:00</Timeout>
-      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=DigitalDocuments</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=DigitalDocuments</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Media">
       <Timeout>00:20:00</Timeout>
-      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Media</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Media</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Editing">
       <Timeout>00:20:00</Timeout>
-      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Editing</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Editing</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="ElementServices">
       <Timeout>00:20:00</Timeout>
-      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=ElementServices</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=ElementServices</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Text">
       <Timeout>00:20:00</Timeout>
-      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Text</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Text</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Animation">
       <Timeout>00:20:00</Timeout>
-      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Animation</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Animation</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="3D">
       <Timeout>00:20:00</Timeout>
-      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=3D</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=3D</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="2D">
       <Timeout>00:20:00</Timeout>
-      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=2D</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=2D</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Controls">
       <Timeout>00:20:00</Timeout>
-      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Controls</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Controls</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Imaging">
       <Timeout>00:20:00</Timeout>
-      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Imaging</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Imaging</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="FlowLayout">
       <Timeout>00:20:00</Timeout>
-      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=FlowLayout</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=FlowLayout</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="DataServices">
       <Timeout>00:20:00</Timeout>
-      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=DataServices</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=DataServices</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="ElementLayout">
       <Timeout>00:20:00</Timeout>
-      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=ElementLayout</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=ElementLayout</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Xaml">
       <Timeout>00:20:00</Timeout>
-      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Xaml</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Xaml</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Globalization">
       <Timeout>00:20:00</Timeout>
-      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Globalization</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Globalization</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Tablet">
       <Timeout>00:20:00</Timeout>
-      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Tablet</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Tablet</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Integration">
       <Timeout>00:20:00</Timeout>
-      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Integration</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Integration</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="XET">
       <Timeout>00:20:00</Timeout>
-      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=XET</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=XET</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="Printing">
       <Timeout>00:20:00</Timeout>
-      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Printing</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Printing</Command>
     </HelixWorkItem>
     <HelixWorkItem Include="WindowsFormsIntegration">
       <Timeout>00:20:00</Timeout>
-      <Command>%HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=WindowsFormsIntegration</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=WindowsFormsIntegration</Command>
     </HelixWorkItem>
     -->
   </ItemGroup>
diff --git a/eng/pipeline.yml b/eng/pipeline.yml
index 286a1b2020d..a7cfb192b5f 100644
--- a/eng/pipeline.yml
+++ b/eng/pipeline.yml
@@ -130,29 +130,6 @@ jobs:
           $(_PlatformArgs)
         displayName: Windows Build / Publish
 
-      - powershell: eng\common\build.ps1
-          -restore
-          -configuration $(_BuildConfig) 
-          $(_OfficialBuildIdArgs)
-          $(_PlatformArgs)
-          -projects $(Build.SourcesDirectory)\eng\helix\helixpublish.proj
-        displayName: Restoring Nuget Dependencies for Helix
-        env:
-          SYSTEM_ACCESSTOKEN: $(System.AccessToken)
-          HelixSource: $(_HelixSource)
-          HelixType: 'tests/drt'
-          HelixBuild: $(Build.BuildNumber)
-          HelixTargetQueues: $(_TestHelixAgentPool)
-          HelixAccessToken: $(_HelixToken)              # only defined for internal CI
-          Creator: $(_HelixCreator)
-        condition: and(succeeded(), eq(variables['_BuildConfig'], 'Release')) # on helix machine (with real signing)
-
-      # Prepare the helix payload
-      - powershell: eng\helix\prepare-helix-payload.ps1
-         -configuration $(_BuildConfig) -platform $(_Platform)
-        displayName: Preparing Helix Payload
-        condition: and(succeeded(), eq(variables['_BuildConfig'], 'Release')) # on helix machine (with real signing)
-
       # Run DRTs
       - powershell: eng\common\cibuild.cmd
           -configuration $(_BuildConfig)
diff --git a/packaging/Microsoft.DotNet.Arcade.Wpf.Sdk/Microsoft.DotNet.Arcade.Wpf.Sdk.ArchNeutral.csproj b/packaging/Microsoft.DotNet.Arcade.Wpf.Sdk/Microsoft.DotNet.Arcade.Wpf.Sdk.ArchNeutral.csproj
index cce7486b2a3..9a6c924a2f5 100644
--- a/packaging/Microsoft.DotNet.Arcade.Wpf.Sdk/Microsoft.DotNet.Arcade.Wpf.Sdk.ArchNeutral.csproj
+++ b/packaging/Microsoft.DotNet.Arcade.Wpf.Sdk/Microsoft.DotNet.Arcade.Wpf.Sdk.ArchNeutral.csproj
@@ -3,6 +3,8 @@
     <ProjectGuid>{B73BB4AB-68DE-4B91-BBB0-AB4F2D504AC3}</ProjectGuid>
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <Platforms>AnyCPU;x64</Platforms>
+    <!-- We ignore this warning because we want to pack powershell scripts that won't be executed as part of installing this package. -->
+    <NoWarn>NU5111</NoWarn>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/src/Microsoft.DotNet.Wpf/test/BranchCommon/data/DrtList.xml b/src/Microsoft.DotNet.Wpf/test/BranchCommon/data/DrtList.xml
index e28c5f4a76b..a3178d03618 100644
--- a/src/Microsoft.DotNet.Wpf/test/BranchCommon/data/DrtList.xml
+++ b/src/Microsoft.DotNet.Wpf/test/BranchCommon/data/DrtList.xml
@@ -26,514 +26,6 @@ Rundrtlist
     - DRT is offline
 -->
 <Drts>
-  <Drt Executable="DrtAnnotations.exe" Architecture="x86|amd64" OS="all" Team="Annotations" />
-  <Drt Executable="DrtAppModelSuites.exe" Architecture="all" OS="all" Team="AppModel" >
-    <SupportFiles>
-      <SupportFile>newloadersuitehelperproject.exe</SupportFile>
-      <SupportFile>newloadersuitehelperproject1\newloadersuitehelperproject.exe</SupportFile>
-      <SupportFile>DrtFiles\loader_tulip.jpg</SupportFile>
-      <SupportFile>DrtFiles\PageA.xaml</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <!--<Drt Executable="DrtNativeEntryPoint.exe" Architecture="all" OS="all" Team="AppModel" >
-    <SupportFiles>
-      <SupportFile>LoaderTest.dll</SupportFile>
-      <SupportFile>DrtThirdPartyThemes.exe</SupportFile>
-    </SupportFiles>
-  </Drt>-->
-  <Drt Executable="DrtDocumentViewerSuite.exe" Architecture="all" OS="all" Team="DigitalDocuments" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\DocumentViewerSuite\Commanding</SupportFile>
-      <SupportFile>DrtFiles\DocumentViewerSuite\Stress</SupportFile>
-      <SupportFile>DrtFiles\DocumentViewerSuite\Styling</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtDigitalSignature.cmd" Architecture="all" OS="all" Team="DigitalDocuments" >
-    <SupportFiles>
-      <SupportFile>DrtDigitalSignature.exe</SupportFile>
-      <SupportFile>DrtFiles\digitalsignature</SupportFile>
-      <SupportFile>DelCertNoUI.exe</SupportFile>
-      <SupportFile>MakeCert.exe</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtPackScheme.exe" Architecture="all" OS="all" Team="DigitalDocuments" />
-  <Drt Executable="DrtMediaAPI.exe" Architecture="all" OS="all" Team="Media" />
-  <Drt Executable="DrtEditing.exe" Architecture="x86|amd64" OS="all" Team="Editing" >
-    <SupportFiles>
-      <SupportFile>DrtEditing.*</SupportFile>
-      <SupportFile>DrtFiles\Editing\CustomDict2.lex</SupportFile>
-      <SupportFile>DrtFiles\Editing\cut.png</SupportFile>
-      <SupportFile>DrtFiles\Editing\rtfsimple.rtf</SupportFile>
-      <SupportFile>DrtFiles\Editing\rtfsimple_expect.rtf.xaml</SupportFile>
-      <SupportFile>DrtFiles\Editing\rtfsimple_expect.rtf.xaml.rtf</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DRTPropertyEngine.exe" Architecture="all" OS="all" Team="ElementServices" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\PropertyEngine\TestInheritanceContext.xaml</SupportFile>
-      <SupportFile>DrtFiles\PropertyEngine\TestValueSource.xaml</SupportFile>
-      <SupportFile>DrtFiles\PropertyEngine\TestVisualTransforms.xaml</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtWindow.exe" Architecture="all" OS="all" Team="AppModel" >
-    <SupportFiles>
-      <SupportFile>DrtWindowSecure.cmd</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtWindowDragMove.exe" Architecture="all" OS="all" Team="AppModel" />
-  <Drt Executable="DrtWindowScroll.exe" Architecture="all" OS="all" Team="AppModel" />
-  <Drt Executable="DrtWindowAutoSize.exe" Architecture="all" OS="all" Team="AppModel" />-->
-  <Drt Executable="DrtDialog.exe" Architecture="all" OS="all" Team="AppModel" />
-  <Drt Executable="DrtIcon.exe" Architecture="all" OS="all" Team="AppModel">
-    <SupportFiles>
-      <SupportFile>DrtFiles\Icon</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtWindowMinMaxContentSize.exe" Architecture="all" OS="all" Team="AppModel" >
-    <SupportFiles>
-      <SupportFile>DrtWindowMinMaxContentSizeSecure.cmd</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtText.exe" Architecture="x86|amd64" OS="all" Team="Text" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\Text</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtApplicationEvents.cmd" Architecture="all" OS="all" Team="AppModel" >
-    <SupportFiles>
-      <SupportFile>DrtApplicationEvents.exe</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtAppThreadingModel.exe" Architecture="all" OS="all" Team="AppModel" />
-  <Drt Executable="DrtStartupUriXamlNavigationWindow.exe" Architecture="all" OS="all" Team="AppModel" />
-  <Drt Executable="DrtWindowFunctionality.exe" Architecture="all" OS="all" Team="AppModel" />
-  <Drt Executable="DrtWindowHeightWidthTopLeft.exe" Architecture="all" OS="all" Team="AppModel" />
-  <Drt Executable="DrtWindowResizeGripFlowDirection.exe" Architecture="x86|amd64" OS="all" Team="AppModel" />
-  <Drt Executable="DrtPage.exe" Architecture="x86|amd64" OS="all" Team="AppModel" />
-  <Drt Executable="DrtWindowAutoLocation.exe" Architecture="all" OS="all" Team="AppModel" />
-  <Drt Executable="DrtDRXSerialization.exe" Architecture="all" OS="all" Team="DigitalDocuments" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\DRXSerialization\DocumentViewerDefault.xaml</SupportFile>
-      <SupportFile>DrtFiles\DRXSerialization\DocumentViewerDefaultInput.xaml</SupportFile>
-      <SupportFile>DrtFiles\DRXSerialization\DocumentViewerNonDefault.xaml</SupportFile>
-      <SupportFile>DrtFiles\DRXSerialization\DocumentViewerNonDefaultInput.xaml</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtAnimation.exe" Architecture="all" OS="all" Team="Animation" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\DrtAnimation\DRTEasing.xaml</SupportFile>
-      <SupportFile>DrtFiles\DrtAnimation\DRTMarkupAnimation.xaml</SupportFile>
-      <SupportFile>DrtFiles\DrtAnimation\angels.jpg</SupportFile>
-      <SupportFile>DrtAnimationRDP.cmd</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtTiming.exe" Architecture="all" OS="all" Team="Animation" />
-  <Drt Executable="DrtBasic3D.exe" Architecture="x86|amd64" OS="all" Team="3D" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\DrtBasic3D\ambient.png</SupportFile>
-      <SupportFile>DrtFiles\DrtBasic3D\combined.png</SupportFile>
-      <SupportFile>DrtFiles\DrtBasic3D\diffuse.png</SupportFile>
-      <SupportFile>DrtFiles\DrtBasic3D\emissive.png</SupportFile>
-      <SupportFile>DrtFiles\DrtBasic3D\specular.png</SupportFile>
-      <SupportFile>DrtFiles\DrtBasic3D\msnbackground.bmp</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtElement3D.exe" Architecture="x86|amd64" OS="all" Team="3D" />
-  <Drt Executable="DrtMil2D.exe" Architecture="all" OS="all" Team="2D" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\DrtMil2D\cut.png</SupportFile>
-      <SupportFile>DrtFiles\DrtMil2D\tulip.jpg</SupportFile>
-      <SupportFile>DrtFiles\DrtMil2D\tulip48dpi.jpg</SupportFile>
-      <SupportFile>DrtFiles\DrtMil2D\tulip96x192dpi.png</SupportFile>
-      <SupportFile>DrtFiles\DrtMil2D\tile_checkered.PNG</SupportFile>
-      <SupportFile>DrtFiles\DrtMil2D\tiny_checkered.PNG</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtInput.exe" Architecture="all" OS="all" Team="ElementServices" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\Input\DrtInput.xml</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtUIContext.exe" Architecture="x86|amd64" OS="all" Team="ElementServices" />
-  <Drt Executable="DrtHwndSource.exe" Architecture="all" OS="all" Team="ElementServices" />
-  <Drt Executable="DrtControls.exe" Architecture="x86|amd64" OS="all" Team="Controls" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\Controls</SupportFile>
-      <SupportFile>DrtThemeDictionaryExtension.*</SupportFile>
-      <SupportFile>DrtThirdPartyThemes.dll</SupportFile>
-      <SupportFile>DrtThirdPartyThemes.pdb</SupportFile>
-      <SupportFile>ListView2App.*</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtMultiTouch.exe" Architecture="all" OS="all" Team="ElementServices" />
-  <Drt Executable="DrtImaging.exe" Architecture="x86|amd64" OS="all" Team="Imaging" >
-    <SupportFiles>
-      <SupportFile>DrtImagingD3D.dll</SupportFile>
-      <SupportFile>DrtFiles\DrtImaging</SupportFile>
-    </SupportFiles>
-  </Drt>
-<!-- disabling amd64 until bug 1845378 is fixed --><!--
-  --><!--<Drt Executable="DrtUImaging" Architecture="x86" OS="all" Team="Imaging" />
-  <Drt Executable="DrtUMetadata.exe" Architecture="x86|amd64" OS="all" Team="Imaging" />-->
-  <Drt Executable="DrtPageFunction.exe" Architecture="all" OS="all" Team="AppModel" />
-  <Drt Executable="DrtNavigationApplication.exe" Architecture="all" OS="all" Team="AppModel" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\NavigationApplication\NavAppBar.xaml</SupportFile>
-      <SupportFile>DrtFiles\NavigationApplication\NavAppFoo.xaml</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtNavigationEvents.exe" Architecture="all" OS="all" Team="AppModel" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\NavigationEvents</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtNavigationWindow.exe" Architecture="x86|amd64" OS="all" Team="AppModel" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\NavigationWindow\NavWindowBar.xaml</SupportFile>
-      <SupportFile>DrtFiles\NavigationWindow\NavWindowFoo.xaml</SupportFile>
-      <SupportFile>DrtFiles\NavigationWindow\NavWindowBar2.xaml</SupportFile>
-      <SupportFile>DrtFiles\NavigationWindow\NavWindowFoo2.xaml</SupportFile>
-    </SupportFiles>6
-  </Drt>
-  <Drt Executable="DrtNavMemPerf.exe" Architecture="x86|amd64" OS="all" Team="AppModel" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\navmemperf</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtReparentNavigator.exe" Architecture="x86|amd64" OS="all" Team="AppModel" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\ReparentNavigator\ReparentFrame.xaml</SupportFile>
-      <SupportFile>DrtFiles\ReparentNavigator\ReparentPage1.xaml</SupportFile>
-      <SupportFile>DrtFiles\ReparentNavigator\ReparentPage2.xaml</SupportFile>
-      <SupportFile>DrtFiles\ReparentNavigator\ReparentPage3.xaml</SupportFile>
-      <SupportFile>DrtFiles\ReparentNavigator\ReparentStart.xaml</SupportFile>
-      <SupportFile>DrtReparentNavigatorSecure.cmd</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtHyperlinkTargeting.exe" Architecture="x86|amd64" OS="all" Team="AppModel" />
-  <Drt Executable="DrtFrameJournaling.exe" Architecture="x86|amd64" OS="all" Team="AppModel" />
-  <Drt Executable="DrtJournal.exe" Architecture="x86|amd64" OS="all" Team="AppModel" />
-  <Drt Executable="DrtJournalMode.exe" Architecture="all" OS="all" Team="AppModel" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\JournalMode\DrtJournalModeDefault.xaml</SupportFile>
-      <SupportFile>DrtJournalModeSecure.cmd</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtXamlContainer.exe" Architecture="x86|amd64" OS="all" Team="AppModel" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\XamlContainer\NavByElement.xaml</SupportFile>
-      <SupportFile>DrtFiles\XamlContainer\NavByUri.xaml</SupportFile>
-      <SupportFile>DrtFiles\XamlContainer\SetContent.xaml</SupportFile>
-      <SupportFile>DrtFiles\XamlContainer\SetUri.xaml</SupportFile>
-      <SupportFile>DrtFiles\XamlContainer\DrtXamlContainer.Permissions</SupportFile>
-      <SupportFile>DrtXamlContainerSecure.cmd</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtNavigationToObject.exe" Architecture="x86|amd64" OS="all" Team="AppModel" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\NavigationToObject\FlowDocument.xaml</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtNavError.exe" Architecture="all" OS="all" Team="AppModel" />
-  <Drt Executable="DrtChangeable.exe" Architecture="all" OS="all" Team="2D" />
-  <Drt Executable="DrtVisualTarget.exe" Architecture="all" OS="all" Team="2D" />
-  <Drt Executable="DrtFlowLayout.exe" Architecture="x86|amd64" OS="all" Team="FlowLayout" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\FlowLayout</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="AvaCop.exe" Architecture="x86|amd64" OS="all" Team="DataServices" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\AvaCop</SupportFile>
-      <SupportFile>DrtFiles\DocumentViewerSuite\Commanding</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtDataSrv.exe" Architecture="x86|amd64" OS="all" Team="DataServices" Timeout="360">
-    <SupportFiles>
-      <SupportFile>DrtFiles\DataSrv</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtDataSrvMSB.exe" Architecture="all" OS="all" Team="DataServices" >
-    <SupportFiles>
-      <SupportFile>en-us\DrtDataSrvMSB.*</SupportFile>
-      <SupportFile>DrtFiles\DataSrvMSB\Content.JPG</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtLayout.exe" Architecture="x86|amd64" OS="all" Team="ElementLayout" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\Layout</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtTextFind.exe" Architecture="x86|amd64" OS="all" Team="ElementLayout" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\TextFind</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DRTInputMethod.exe" Architecture="all" OS="all" Team="Editing" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\DrtInputMethod</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DRTTextComposition.cmd" Architecture="x86|amd64" OS="all" Team="Editing" >
-    <SupportFiles>
-      <SupportFile>DRTTextComposition.exe</SupportFile>
-    </SupportFiles>
-  </Drt>
-<!-- 
-  <Drt Executable="Drtparser.exe" Architecture="all" OS="all" Team="Xaml" >
-    <SupportFiles>
-      <SupportFile>testclasses.dll</SupportFile>
-      <SupportFile>DrtFiles\Parser</SupportFile>
-    </SupportFiles>
-  </Drt>
--->
-<!--Drt Executable="Drtserializer.exe" Architecture="x86|amd64" OS="all" Team="ElementServices" /-->
-  <Drt Executable="DrtMarkupSerializer.exe" Architecture="x86|amd64" OS="all" Team="ElementServices" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\MarkupSerializer</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtEvents.exe" Architecture="all" OS="all" Team="ElementServices" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\Events\DRTEvents_1.xaml</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtCommanding.exe" Architecture="all" OS="all" Team="ElementServices" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\Commanding</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtLocalization.exe" Architecture="all" OS="all" Team="Globalization" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\Localization</SupportFile>
-      <SupportFile>DrtFiles\Baml</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtPackagingApis.exe" Architecture="all" OS="all" Team="DigitalDocuments" />
-  <Drt Executable="DRTStoryboards.exe" Architecture="x86|amd64" OS="all" Team="Animation" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\DRTStoryboards\DRTStoryboards.xaml</SupportFile>
-      <SupportFile>DrtFiles\DRTStoryboards\ding.wav</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtInk.exe" Architecture="all" OS="all" Team="Tablet" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\Ink</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DRTColorAPI.exe" Architecture="all" OS="all" Team="Imaging" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\DrtColorAPI</SupportFile>
-    </SupportFiles>
-  </Drt>
-
-  <!--
-  <Drt Executable="drtbaml.exe" Architecture="all" OS="all" Team="Xaml" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\Baml</SupportFile>
-      <SupportFile>DrtFiles\Parser</SupportFile>
-      <SupportFile>testclasses.dll</SupportFile>
-      <SupportFile>drtparser.exe</SupportFile>
-    </SupportFiles>
-  </Drt>
-  -->
-
-  <Drt Executable="DrtStickyNoteControl.exe" Architecture="x86|amd64" OS="all" Team="Annotations" />
-  <Drt Executable="DrtInkCanvas.exe" Architecture="all" OS="all" Team="Tablet" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\InkCanvas</SupportFile>
-      <SupportFile>RunInkCanvasSpeedTests.cmd</SupportFile>
-      <SupportFile>RunInkCanvasAllocationTests.cmd</SupportFile>
-    </SupportFiles>
-  </Drt><!--
-
-  --><!-- Reenabled  9/2/09.  Contact mattgal for any crashes --><!--
-  <Drt Executable="DrtHosting.exe" Architecture="x86|amd64" OS="all" Team="AppModel" Args="-verbose" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\BrowserHosting</SupportFile>
-      <SupportFile>BrowserHostedDeployApp.*</SupportFile>
-      <SupportFile>BrowserHostedDeployApp35.*</SupportFile>
-    </SupportFiles>
-  </Drt>
-
-  --><!-- Disabled 1/07, failing consistently on Cinch --><!--
-  --><!--Drt Executable="DrtDrxAutomationLocal.cmd" Architecture="x86|amd64" OS="all" Team="DigitalDocuments" >
-    <SupportFiles>
-      <SupportFile>DrtDrxAutomation.exe</SupportFile>
-      <SupportFile>MakeCert.exe</SupportFile>
-    </SupportFiles>
-  </Drt--><!--
-  --><!-- Broken (again) by ClickOnce, different issues. Tracking work item on our side Dev10.521850.
-  <Drt Executable="DrtStandAloneApp.exe" Architecture="x86|amd64" OS="all" Team="AppModel" >
-    <SupportFiles>
-      <SupportFile>StandAloneDeployApp.*</SupportFile>
-    </SupportFiles>
-  </Drt>
-  -->
-  <Drt Executable="DrtPageContent.exe" Architecture="all" OS="all" Team="DigitalDocuments" >
-    <SupportFiles>
-      <SupportFile>FixedDocViewer.dll</SupportFile>
-      <SupportFile>DrtFiles\Payloads</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtFixedPanel.exe" Architecture="all" OS="all" Team="DigitalDocuments" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\Layout</SupportFile>
-      <SupportFile>DrtFiles\Payloads</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtFixedEdit.exe" Architecture="all" OS="all" Team="DigitalDocuments" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\FixedEdit</SupportFile>
-      <SupportFile>DrtFiles\Payloads</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtSequence.exe" Architecture="all" OS="all" Team="DigitalDocuments" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\Payloads</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtMetroTest.cmd" Architecture="x86|amd64" OS="all" Team="DigitalDocuments" >
-    <SupportFiles>
-      <SupportFile>DrtNGCTest.exe</SupportFile>
-      <SupportFile>DrtFiles\Payloads</SupportFile>
-      <SupportFile>DrtFiles\NGCTest\constitution.xaml</SupportFile>
-      <SupportFile>DrtAddDocStructure.exe</SupportFile>
-      <SupportFile>DrtFixedTest.exe</SupportFile>
-    </SupportFiles>
-  </Drt>
-
-  <!--<Drt Executable="DrtSeeScenario1.cmd" Architecture="all" OS="all" Team="PartialTrust">
-    <SupportFiles>
-      <SupportFile>Secure.exe</SupportFile>
-      <SupportFile>DrtSeeScenario1.exe</SupportFile>
-    </SupportFiles>
-  </Drt>
-
-  <Drt Executable="DrtSeeScenario6.cmd" Architecture="all" OS="all" Team="PartialTrust">
-    <SupportFiles>
-      <SupportFile>Secure.exe</SupportFile>
-      <SupportFile>drtpermissiontest.cmd</SupportFile>
-      <SupportFile>DrtFiles\Permissions</SupportFile>
-      <SupportFile>DrtPermissionTest.exe</SupportFile>
-      <SupportFile>DrtSeeScenario6.exe</SupportFile>
-    </SupportFiles>
-  </Drt>
-
-  --><!--Drt Executable="DrtAutomation.exe" Architecture="all" OS="all" Team="UIAutomation" /
-  <Drt Executable="DrtPrinterDriverMarkup.exe" Architecture="all" OS="all" Team="DigitalDocuments" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\PrinterDriverMarkup\</SupportFile>
-    </SupportFiles>
-  </Drt>-->
-  <!--  Leaving this one disabled for now... Mattgal 9-2-09
-  <Drt Executable="drtseescenario7.cmd" Architecture="all" OS="all" Team="PartialTrust" >
-    <SupportFiles>
-      <SupportFile>drtseescenario7.exe</SupportFile>
-      <SupportFile>Secure.exe</SupportFile>
-    </SupportFiles>
-  </Drt>
-  --><!--
-
-  <Drt Executable="DrtSeeExpressApp.exe" Architecture="x86|amd64" OS="all" Team="PartialTrust" >
-    <SupportFiles>
-      <SupportFile>TestSeeExpressApp*</SupportFile>
-      <SupportFile>DrtFiles\ExpressApp\Intro2Loose.jpg</SupportFile>
-    </SupportFiles>
-  </Drt>
-
-  <Drt Executable="DrtBrowserHostedMediaApp.exe" Architecture="x86" OS="all" Team="PartialTrust" >
-    <SupportFiles>
-      <SupportFile>DrtTools.dll</SupportFile>
-      <SupportFile>BrowserHostedMediaApp.*</SupportFile>
-      <SupportFile>DrtFiles\BrowserHostedMediaApp</SupportFile>
-    </SupportFiles>
-  </Drt>-->
-
-  <Drt Executable="DrtContainer.exe" Architecture="all" OS="all" Team="ElementServices" />
-  <Drt Executable="DrtCompressionXform.exe" Architecture="all" OS="all" Team="DigitalDocuments" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\compressionXform</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtPackageCompression.exe" Architecture="all" OS="all" Team="DigitalDocuments" />
-  <Drt Executable="DrtEncryptedPackageCoreProperties.exe" Architecture="all" OS="all" Team="DigitalDocuments" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\EncryptedPackageCoreProperties</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtZipIO.exe" Architecture="all" OS="all" Team="DigitalDocuments" />
-  <Drt Executable="DrtPackageCoreProperties.exe" Architecture="all" OS="all" Team="DigitalDocuments" />
-
-  <Drt Executable="DrtIndexing.exe" Architecture="all" OS="all" Team="DigitalDocuments">
-    <SupportFiles>
-      <SupportFile>BuildContainer.exe</SupportFile>
-      <SupportFile>IndexingFilterTool.exe</SupportFile>
-      <SupportFile>CompareChunkLists.exe</SupportFile>
-      <SupportFile>EncryptedPackageBuilder.exe</SupportFile>
-      <SupportFile>DrtFiles\Indexing</SupportFile>
-    </SupportFiles>
-  </Drt>
-
-     <!-- 12/29/06 - not enabled in Orcas yet. --><!--
-  --><!--<Drt Executable="DrtIndexingElementDictionary.exe" Architecture="all" OS="all" Team="DigitalDocuments" >
-    <SupportFiles>
-      <SupportFile>IndexingFilterTool</SupportFile>
-    </SupportFiles>
-  </Drt>-->
-  <Drt Executable="DrtInterleavedPackage.exe" Architecture="all" OS="all" Team="DigitalDocuments" />
-  <Drt Executable="DrtAppWindowList.exe" Architecture="all" OS="all" Team="AppModel" />
-  <Drt Executable="DrtAppShutdown.exe" Architecture="all" OS="all" Team="AppModel" />
-  <Drt Executable="DrtFlowLayoutExt.exe" Architecture="x86|amd64" OS="all" Team="FlowLayout" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\FlowLayoutExt</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtSelection.exe" Architecture="x86|amd64" OS="all" Team="FlowLayout" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\Selection</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtFlow.exe" Architecture="x86|amd64" OS="all" Team="FlowLayout" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\Flow</SupportFile>
-    </SupportFiles>
-  </Drt>
-<!--<Drt Executable="RunMILTest.cmd" Architecture="x86" OS="all" Team="2D" Args=" > RunMILTest.log">
-    <SupportFiles>
-      <SupportFile>RunMILTest.exe</SupportFile>
-    </SupportFiles>
-  </Drt>-->
-  <Drt Executable="DrtMedia.exe" Architecture="all" OS="all" Team="Media" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\DrtMedia\DrtMedia.xaml</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <!--
-  <Drt Executable="DrtEffects.exe" Architecture="x86|amd64" OS="all" Team="Effects" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\DrtEffects</SupportFile>
-    </SupportFiles>
-  </Drt>
--->
-  <Drt Executable="WarmupOpt.cmd" Architecture="x86|amd64" OS="all" Team="Integration" >
-    <SupportFiles>
-      <SupportFile>WarmupOpt.exe</SupportFile>
-      <SupportFile>DrtFiles\WarmupOpt</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="MSNBamlOpt.exe" Architecture="x86|amd64" OS="all" Team="Integration" >
-    <SupportFiles>
-      <SupportFile>MSNBamlOpt*</SupportFile>
-      <SupportFile>en-us\MSNBamlOpt.resources.dll</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="SprinkleOpt.exe" Architecture="x86|amd64" OS="all" Team="Integration" />
-  <Drt Executable="HBROpt.exe" Architecture="x86|amd64" OS="all" Team="Integration" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\HBROpt</SupportFile>
-    </SupportFiles>
-  </Drt>
   <Drt Executable="DrtXaml.exe" Architecture="x86|amd64" OS="all" Team="Xaml" >
     <SupportFiles>
       <SupportFile>XamlTestClasses.dll</SupportFile>
@@ -543,44 +35,4 @@ Rundrtlist
       <SupportFile>XamlTestClasses.FriendWithoutKey.dll</SupportFile>
     </SupportFiles>
   </Drt>
-  <Drt Executable="DrtXpsApi.cmd" Architecture="all" OS="all" Team="DigitalDocuments" >
-    <SupportFiles>
-      <SupportFile>DrtXpsApi.exe</SupportFile>
-      <SupportFile>DrtFiles\XpsApi</SupportFile>
-      <SupportFile>DelCertNoUI.exe</SupportFile>
-      <SupportFile>MakeCert.exe</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtVisualSerialization.exe" Architecture="all" OS="all" Team="DigitalDocuments" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\VisualSerialization\testCMYK1.icc</SupportFile>
-      <SupportFile>DrtFiles\drtimaging\avalon.png</SupportFile>
-      <SupportFile>DrtFiles\drtimaging\tulip.jpg</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtNgcTest.exe" Architecture="all" OS="all" Team="DigitalDocuments" />
-  <Drt Executable="DrtVisualTreeChange.exe" Architecture="all" OS="all" Team="XET" />
-  <Drt Executable="DrtXamlSourceInfo.exe" Architecture="all" OS="all" Team="XET">
-    <SupportFiles>
-      <SupportFile>DrtFiles\XamlSourceInfoTest.Debug.dll</SupportFile>
-      <SupportFile>DrtFiles\XamlSourceInfoTest.Release.dll</SupportFile>
-    </SupportFiles>
-  </Drt>
-  <Drt Executable="DrtPrinting.exe" Architecture="all" OS="all" Team="Printing" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\Printing</SupportFile>
-    </SupportFiles>
-  </Drt>
-
-  <!--
-  <Drt Executable="DrtReachSerialization.exe" Architecture="all" OS="all" Team="DigitalDocuments" >
-    <SupportFiles>
-      <SupportFile>DrtFiles\DrtReachSerialization</SupportFile>
-    </SupportFiles>
-  </Drt>
-  --><!--
-
-  --><!-- DrtMediaBasic doesn't run on Vista - bug #1588743 --><!--
-  --><!--<Drt Executable="DrtMediaBasic.exe" Architecture="all" OS="xp" Team="Media" />-->
-  <Drt Executable="DrtWindowsFormsIntegration.exe" Architecture="all" OS="all" Team="WindowsFormsIntegration" />
 </Drts>

From 77673c1a4132629daec2c2532ca33cd502bc8cf1 Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Fri, 31 May 2019 11:23:33 -0700
Subject: [PATCH 60/72] fixing DrtXaml

This is very close, we are just missing native wpf assemblies from being added to the deps.json
---
 .../tools/CreateTestPayload.targets           |    6 +-
 eng/WpfArcadeSdk/tools/DRT.Build.props        |    7 -
 .../tools/GenerateProgramFileForTests.targets |    2 +-
 eng/WpfArcadeSdk/tools/Publish.props          |   12 -
 .../tools/PublishAfterBuild.targets           |    7 -
 eng/WpfArcadeSdk/tools/SourceLocations.props  | 1072 -----------------
 eng/WpfArcadeSdk/tools/StrongName.props       |   17 -
 eng/WpfArcadeSdk/tools/StrongName.targets     |   12 -
 eng/WpfArcadeSdk/tools/TestProjects.targets   |   26 +-
 eng/helix/configure-helix-machine.ps1         |   30 -
 eng/helix/prepare-helix-payload.ps1           |   49 -
 eng/helix/runtests.cmd                        |    3 -
 eng/helix/runtests.ps1                        |   26 -
 eng/{helix => }/helixpublish.proj             |   10 +-
 eng/pipeline.yml                              |    4 +-
 .../test/BranchCommon/data/CommonData.csproj  |   20 -
 .../BranchCommon/data/Directory.Build.props   |    3 -
 .../test/Common/DRT/TestServices/DrtBase.cs   |   34 +-
 .../DRT/TestServices/TestServices.csproj      |   14 +-
 .../BamlAvoidXmlTest/BamlAvoidXmlTest.csproj  |   30 -
 .../BamlTestClasses40.csproj                  |    2 -
 .../test/DRT/DrtXaml/Directory.Build.props    |    1 -
 .../test/DRT/DrtXaml/DrtXaml/DrtXaml.csproj   |   10 +-
 .../test/DRT/DrtXaml/DrtXaml/DrtXamlBase.cs   |    8 +-
 .../DRT/DrtXaml/DrtXaml/Tests/SchemaTests.cs  |    2 -
 .../DrtXaml/XamlTestFrameWork/Assert.cs       |  246 ++--
 .../XamlTestClasses.FriendWithKey.csproj      |   11 -
 .../XamlTestClasses.FriendWithoutKey.csproj   |   12 -
 .../XamlTestClasses.FriendWithKey.csproj      |    1 +
 .../XamlTestClasses.FriendWithoutKey.csproj   |    1 +
 .../XamlTestClasses/XamlTestClasses.csproj    |    1 -
 .../test/Directory.Build.props                |   59 +-
 .../test/Directory.Build.targets              |    3 +-
 33 files changed, 223 insertions(+), 1518 deletions(-)
 delete mode 100644 eng/WpfArcadeSdk/tools/DRT.Build.props
 delete mode 100644 eng/WpfArcadeSdk/tools/Publish.props
 delete mode 100644 eng/WpfArcadeSdk/tools/SourceLocations.props
 delete mode 100644 eng/WpfArcadeSdk/tools/StrongName.props
 delete mode 100644 eng/WpfArcadeSdk/tools/StrongName.targets
 delete mode 100644 eng/helix/configure-helix-machine.ps1
 delete mode 100644 eng/helix/prepare-helix-payload.ps1
 delete mode 100644 eng/helix/runtests.cmd
 delete mode 100644 eng/helix/runtests.ps1
 rename eng/{helix => }/helixpublish.proj (91%)
 delete mode 100644 src/Microsoft.DotNet.Wpf/test/BranchCommon/data/CommonData.csproj
 delete mode 100644 src/Microsoft.DotNet.Wpf/test/BranchCommon/data/Directory.Build.props
 delete mode 100644 src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/FriendWithKey/XamlTestClasses.FriendWithKey.csproj
 delete mode 100644 src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/FriendWithoutKey/XamlTestClasses.FriendWithoutKey.csproj

diff --git a/eng/WpfArcadeSdk/tools/CreateTestPayload.targets b/eng/WpfArcadeSdk/tools/CreateTestPayload.targets
index b53e478dad4..c7872ca0772 100644
--- a/eng/WpfArcadeSdk/tools/CreateTestPayload.targets
+++ b/eng/WpfArcadeSdk/tools/CreateTestPayload.targets
@@ -1,5 +1,4 @@
 <Project>
-
     <!-- We use a local RID here since we don't want to change the build layout by setting the actual RID. -->
   <PropertyGroup>
     <LocalRuntimeIdentifier Condition="'$(Platform)'=='x64' or '$(Platform)'=='x86' or '$(Platform)'=='arm' or '$(Platform)'=='arm64'">win-$(Platform)</LocalRuntimeIdentifier>
@@ -32,7 +31,10 @@
           DestinationFiles="@(MicrosoftDotNetWpfTestContents->'$(WpfTestBasePublishPath)\%(RecursiveDir)%(Filename)%(Extension)')"  />
 
     <Copy SourceFiles="@(OtherPayloadContents)"
-          DestinationFolder="$(PublishDir)"  />
+          DestinationFolder="$(PublishRoot)"  />
+
+    <Copy SourceFiles="$(WpfTestsDir)BranchCommon\data\DrtList.xml"
+          DestinationFolder="$(WpfTestBasePublishPath)\DRT"  />
 
   </Target>
 
diff --git a/eng/WpfArcadeSdk/tools/DRT.Build.props b/eng/WpfArcadeSdk/tools/DRT.Build.props
deleted file mode 100644
index 047ab6efe2d..00000000000
--- a/eng/WpfArcadeSdk/tools/DRT.Build.props
+++ /dev/null
@@ -1,7 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <PublishDir>$(WpfDrtTestBasePublishPath)</PublishDir>
-    <IsTestProject>true</IsTestProject>
-    <SkipTests>true</SkipTests>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/eng/WpfArcadeSdk/tools/GenerateProgramFileForTests.targets b/eng/WpfArcadeSdk/tools/GenerateProgramFileForTests.targets
index 1ff69760a46..7542aab1a7a 100644
--- a/eng/WpfArcadeSdk/tools/GenerateProgramFileForTests.targets
+++ b/eng/WpfArcadeSdk/tools/GenerateProgramFileForTests.targets
@@ -1,6 +1,6 @@
 <Project>
   <Target Name="EnsureProgramFileIsGeneratedOnlyForTests"
-          Condition="'$(IsTestProject)'=='true' And '$(GenerateProgramFile)'!='true'"
+          Condition="'$(IsTestProject)'=='true' And '$(GenerateProgramFile)'!='false'"
           BeforeTargets="CoreCompile">
     <PropertyGroup>
       <GenerateProgramFile Condition="'$(InternalMarkupCompilation)'!='true'">true</GenerateProgramFile>
diff --git a/eng/WpfArcadeSdk/tools/Publish.props b/eng/WpfArcadeSdk/tools/Publish.props
deleted file mode 100644
index 767506adb52..00000000000
--- a/eng/WpfArcadeSdk/tools/Publish.props
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project>
-    <PropertyGroup>
-        <_IsPortable >true</_IsPortable>
-        <SelfContained >false</SelfContained>
-        <RuntimeIdentifier>win-x86</RuntimeIdentifier>
-        <RuntimeIdentifier Condition="'$(Platform)' == 'x64'">win-x64</RuntimeIdentifier>
-        <PublishDir>$(PublishRoot)$(Configuration)\$(PlatformFolder)</PublishDir>
-        <WpfTestBasePublishPath>$(PublishDir)\Test</WpfTestBasePublishPath>
-        <WpfFeatureTestBasePublishPath>$(WpfTestBasePublishPath)\FeatureTests</WpfFeatureTestBasePublishPath>
-        <WpfDrtTestBasePublishPath>$(WpfTestBasePublishPath)\DRT</WpfDrtTestBasePublishPath>
-    </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/eng/WpfArcadeSdk/tools/PublishAfterBuild.targets b/eng/WpfArcadeSdk/tools/PublishAfterBuild.targets
index 6e84793f7a0..42f92318850 100644
--- a/eng/WpfArcadeSdk/tools/PublishAfterBuild.targets
+++ b/eng/WpfArcadeSdk/tools/PublishAfterBuild.targets
@@ -8,11 +8,4 @@
      </PropertyGroup>
    </Target>
 
-  <!-- 
-  Don't copy the code coverage artifacts. These are always trying to be copied to the 
-  same location and so we get errors trying to overwrite files that are locked by a parallel
-  instance of MSBuild. We don't currently need these files. If we do, we can come up with a better
-  solution.
-  -->
-  <Target Name="CopyTraceDataCollectorArtifacts" />
 </Project>
diff --git a/eng/WpfArcadeSdk/tools/SourceLocations.props b/eng/WpfArcadeSdk/tools/SourceLocations.props
deleted file mode 100644
index 8b669d5ffd5..00000000000
--- a/eng/WpfArcadeSdk/tools/SourceLocations.props
+++ /dev/null
@@ -1,1072 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <CommonCodeLocation>$(WpfTestBasePath)\Common\Code\Microsoft\Test</CommonCodeLocation>
-    <CommonCriticalCodeLocation>$(WpfTestBasePath)\Common\Code\Critical\Microsoft\Test</CommonCriticalCodeLocation>
-    <CommonDataLocation>$(WpfTestBasePath)\Common\Data</CommonDataLocation>
-  </PropertyGroup>
-
-  <!-- ClickOnce Helper -->
-  <ItemGroup>
-    <SourcesClickonceHelper Include="$(CommonCodeLocation)\Deployment\ClickOnceHelper.cs"> <Link>Test\Deployment\ClickOnceHelper.cs</Link> </SourcesClickonceHelper>
-  </ItemGroup>
-
-  <!-- Container -->
-  <ItemGroup>
-    <SourcesContainer Include="$(CommonCodeLocation)\Container\StorageRootWrapper.cs"> <Link>Test\Container\StorageRootWrapper.cs</Link> </SourcesContainer>
-  </ItemGroup>
-
-  <!-- Exception Validation -->
-  <ItemGroup>
-    <SourcesExceptionValidation Include="$(CommonCodeLocation)\Globalization\Exceptions.cs"> <Link>Test\Globalization\Exceptions.cs</Link> </SourcesExceptionValidation>
-  </ItemGroup>
-
-  <!-- MSBuild -->
-  <ItemGroup>
-    <SourcesMSBuildEngine Include="$(CommonCodeLocation)\MSBuildEngine\Compiler.cs"> <Link>Test\MSBuildEngine\Compiler.cs</Link> </SourcesMSBuildEngine>
-    <SourcesMSBuildEngine Include="$(CommonCodeLocation)\MSBuildEngine\ErrorCodes.cs"> <Link>Test\MSBuildEngine\ErrorCodes.cs</Link> </SourcesMSBuildEngine>
-    <SourcesMSBuildEngine Include="$(CommonCodeLocation)\MSBuildEngine\ErrorWarningParser.cs"> <Link>Test\MSBuildEngine\ErrorWarningParser.cs</Link> </SourcesMSBuildEngine>
-    <SourcesMSBuildEngine Include="$(CommonCodeLocation)\MSBuildEngine\IMSBuildLogger.cs"> <Link>Test\MSBuildEngine\IMSBuildLogger.cs</Link> </SourcesMSBuildEngine>
-    <SourcesMSBuildEngine Include="$(CommonCodeLocation)\MSBuildEngine\MSBuildCommonHelper.cs"> <Link>Test\MSBuildEngine\MSBuildCommonHelper.cs</Link> </SourcesMSBuildEngine>
-    <SourcesMSBuildEngine Include="$(CommonCodeLocation)\MSBuildEngine\MSBuildLogger.cs"> <Link>Test\MSBuildEngine\MSBuildLogger.cs</Link> </SourcesMSBuildEngine>
-    <SourcesMSBuildEngine Include="$(CommonCodeLocation)\MSBuildEngine\MSBuildPerf.cs"> <Link>Test\MSBuildEngine\MSBuildPerf.cs</Link> </SourcesMSBuildEngine>
-    <SourcesMSBuildEngine Include="$(CommonCodeLocation)\MSBuildEngine\MSBuildPerfLogger.cs"> <Link>Test\MSBuildEngine\MSBuildPerfLogger.cs</Link> </SourcesMSBuildEngine>
-    <SourcesMSBuildEngine Include="$(CommonCodeLocation)\MSBuildEngine\MSBuildProjExecutor.cs"> <Link>Test\MSBuildEngine\MSBuildProjExecutor.cs</Link> </SourcesMSBuildEngine>
-    <SourcesMSBuildEngine Include="$(CommonCodeLocation)\MSBuildEngine\CompilerHelper.cs"> <Link>Test\MSBuildEngine\CompilerHelper.cs</Link> </SourcesMSBuildEngine>
-  </ItemGroup>
-
-  <!-- AutoData -->
-  <ItemGroup>
-    <SourcesAutoData Include="$(CommonCodeLocation)\Globalization\AutoDataEnums.cs"> <Link>Test\Globalization\AutoDataEnums.cs</Link> </SourcesAutoData>
-    <SourcesAutoData Include="$(CommonCodeLocation)\Globalization\extract.cs"> <Link>Test\Globalization\extract.cs</Link> </SourcesAutoData>
-    <SourcesAutoData Include="$(CommonCodeLocation)\Globalization\generate.cs"> <Link>Test\Globalization\generate.cs</Link> </SourcesAutoData>
-    <SourcesAutoData Include="$(CommonCodeLocation)\Globalization\LangPackHelper.cs"> <Link>Test\Globalization\LangPackHelper.cs</Link> </SourcesAutoData>
-  </ItemGroup>
-
-  <!-- ETW Logging Code -->
-  <ItemGroup>
-    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\ClrTraceEventParser.cs"> <Link>Test\EventTracing\ClrTraceEventParser.cs</Link> </SourcesETWLogging >
-    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\DynamicTraceEventParser.cs"> <Link>Test\EventTracing\DynamicTraceEventParser.cs</Link> </SourcesETWLogging >
-    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\ETWTraceEventSource.cs"> <Link>Test\EventTracing\ETWTraceEventSource.cs</Link> </SourcesETWLogging >
-    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\KernelTraceEventParser.cs"> <Link>Test\EventTracing\KernelTraceEventParser.cs</Link> </SourcesETWLogging >
-    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\Manifest.cs"> <Link>Test\EventTracing\Manifest.cs</Link> </SourcesETWLogging >
-    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\SymbolEventParser.cs"> <Link>Test\EventTracing\SymbolEventParser.cs</Link> </SourcesETWLogging >
-    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\SymbolResolver.cs"> <Link>Test\EventTracing\SymbolResolver.cs</Link> </SourcesETWLogging >
-    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\TraceEvent.cs"> <Link>Test\EventTracing\TraceEvent.cs</Link> </SourcesETWLogging >
-    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\TraceEventNativeMethods.cs"> <Link>Test\TraceEventNativeMethods.cs</Link> </SourcesETWLogging >
-    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\TraceEventSession.cs"> <Link>Test\EventTracing\TraceEventSession.cs</Link> </SourcesETWLogging >
-    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\TraceLog.cs"> <Link>Test\EventTracing\TraceLog.cs</Link> </SourcesETWLogging >
-    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\Utility.cs"> <Link>Test\EventTracing\Utility.cs</Link> </SourcesETWLogging >
-    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\WPFTraceEventParser.cs"> <Link>Test\EventTracing\WPFTraceEventParser.cs</Link> </SourcesETWLogging >
-
-    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\Utilities\CompressedStream.cs"> <Link>Test\EventTracing\Utilities\CompressedStream.cs</Link> </SourcesETWLogging >
-    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\Utilities\FastSerialization.cs"> <Link>Test\EventTracing\Utilities\FastSerialization.cs</Link> </SourcesETWLogging >
-    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\Utilities\GrowableArray.cs"> <Link>Test\EventTracing\Utilities\GrowableArray.cs</Link> </SourcesETWLogging >
-    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\Utilities\StreamReaderWriter.cs"> <Link>Test\EventTracing\Utilities\StreamReaderWriter.cs</Link> </SourcesETWLogging >
-    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\Utilities\StreamUtilities.cs"> <Link>Test\EventTracing\Utilities\StreamUtilities.cs</Link> </SourcesETWLogging >
-    <SourcesETWLogging Include="$(CommonCodeLocation)\EventTracing\Utilities\XmlUtilities.cs"> <Link>Test\EventTracing\Utilities\XmlUtilities.cs</Link> </SourcesETWLogging >
-  </ItemGroup>
-
-  <!-- Managed Resources AutoData  -->
-  <ItemGroup>
-    <ManagedResourcesAutoData Include="$(CommonCodeLocation)\Globalization\ChineseSimplified.txt">
-      <LogicalName>ChineseSimplified.txt</LogicalName>
-      <Link>Resources\Globalization\ChineseSimplified.txt</Link>
-    </ManagedResourcesAutoData>
-    <ManagedResourcesAutoData Include="$(CommonCodeLocation)\Globalization\ChineseTraditional.txt">
-      <LogicalName>ChineseTraditional.txt</LogicalName>
-      <Link>Resources\Globalization\ChineseTraditional.txt</Link>
-    </ManagedResourcesAutoData>
-    <ManagedResourcesAutoData Include="$(CommonCodeLocation)\Globalization\Japanese.txt">
-      <LogicalName>Japanese.txt</LogicalName>
-      <Link>Resources\Globalization\Japanese.txt</Link>
-    </ManagedResourcesAutoData>
-    <ManagedResourcesAutoData Include="$(CommonCodeLocation)\Globalization\Korean.txt">
-      <LogicalName>Korean.txt</LogicalName>
-      <Link>Resources\Globalization\Korean.txt</Link>
-    </ManagedResourcesAutoData>
-    <ManagedResourcesAutoData Include="$(CommonCodeLocation)\Globalization\ProblemDate.xml">
-      <LogicalName>ProblemDate.xml</LogicalName>
-      <Link>Resources\Globalization\ProblemDate.xml</Link>
-    </ManagedResourcesAutoData>
-    <ManagedResourcesAutoData Include="$(CommonCodeLocation)\Globalization\ProblemString.xml">
-      <LogicalName>ProblemString.xml</LogicalName>
-      <Link>Resources\Globalization\ProblemString.xml</Link>
-    </ManagedResourcesAutoData>
-  </ItemGroup>
-
-  <!-- Markup -->
-  <ItemGroup>
-    <SourcesMarkup Include="$(CommonCodeLocation)\Markup\ModifyXaml.cs"> <Link>Test\Markup\ModifyXaml.cs</Link> </SourcesMarkup>
-    <SourcesMarkup Include="$(CommonCodeLocation)\Markup\WPFLibraryGenerator.cs"> <Link>Test\Markup\WPFLibraryGenerator.cs</Link> </SourcesMarkup>
-    <SourcesMarkup Include="$(CommonCodeLocation)\Markup\WPFTreeGenerator.cs"> <Link>Test\Markup\WPFTreeGenerator.cs</Link> </SourcesMarkup>
-    <SourcesMarkup Include="$(CommonCodeLocation)\Markup\WPFXamlGenerator.cs"> <Link>Test\Markup\WPFXamlGenerator.cs</Link> </SourcesMarkup>
-    <SourcesMarkup Include="$(CommonCodeLocation)\Markup\XamlGenerator.cs"> <Link>Test\Markup\XamlGenerator.cs</Link> </SourcesMarkup>
-    <SourcesMarkup Include="$(CommonCodeLocation)\Markup\XmlGenerator.cs"> <Link>Test\Markup\XmlGenerator.cs</Link> </SourcesMarkup>
-    <SourcesMarkup Include="$(CommonCodeLocation)\Markup\XamlComparer.cs"> <Link>Test\Markup\XamlComparer.cs</Link> </SourcesMarkup>
-    <SourcesMarkup Include="$(CommonCodeLocation)\Markup\XamlTestDocument.cs"> <Link>Test\Markup\XamlTestDocument.cs</Link> </SourcesMarkup>
-  </ItemGroup>
-
-  <!-- Windows Forms -->
-  <ItemGroup>
-    <SourcesWindowsForms Include="$(CommonCodeLocation)\WindowsForms\Application.cs"> <Link>Test\WindowsForms\Application.cs</Link> </SourcesWindowsForms>
-    <SourcesWindowsForms Include="$(CommonCodeLocation)\WindowsForms\WindowsFormsSource.cs"> <Link>Test\WindowsForms\WindowsFormsSource.cs</Link> </SourcesWindowsForms>
-  </ItemGroup>
-
-  <!-- AppMonitor -->
-  <ItemGroup>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\ApplicationDeploymentHelper.cs"> <Link>Test\Loaders\ApplicationDeploymentHelper.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\ApplicationMonitorTest.cs"> <Link>Test\Loaders\ApplicationMonitorTest.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\ApplicationMonitor.cs"> <Link>Test\Loaders\ApplicationMonitor.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\ApplicationMonitorConfig.cs"> <Link>Test\Loaders\ApplicationMonitorConfig.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\FileHost.cs"> <Link>Test\Loaders\FileHost.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\IXamlLauncher.cs"> <Link>Test\Loaders\IXamlLauncher.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\LoaderStep.cs"> <Link>Test\Loaders\LoaderStep.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\ResourceHelper.cs"> <Link>Test\Loaders\ResourceHelper.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\FireFoxAutomationHelper.cs"> <Link>Test\Loaders\FireFoxAutomationHelper.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\UIHandler.cs"> <Link>Test\Loaders\UIHandler.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\ActivationStep.cs"> <Link>Test\Loaders\Steps\ActivationStep.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\FileHostStep.cs"> <Link>Test\Loaders\Steps\FileHostStep.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\HostingRuntimePolicyHelper.cs"> <Link>Test\Loaders\Steps\HostingRuntimePolicyHelper.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\LoggingSteps.cs"> <Link>Test\Loaders\Steps\LoggingSteps.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\VersionHelper.cs"> <Link>Test\Loaders\Steps\VersionHelper.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\RegistryStep.cs"> <Link>Test\Loaders\Steps\RegistryStep.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\UIHandlers\DefaultHandlers.cs"> <Link>Test\Loaders\UIHandlers\DefaultHandlers.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\Scripter.cs"> <Link>Test\Loaders\Steps\Scripter.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\String.cs"> <Link>Test\Loaders\Steps\String.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\Win32.cs"> <Link>Test\Loaders\Steps\Win32.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\Resources.cs"> <Link>Test\Loaders\Steps\Resources.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\Registry.cs"> <Link>Test\Loaders\Steps\Registry.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\Tests.cs"> <Link>Test\Loaders\Steps\Tests.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\Diagnostics.cs"> <Link>Test\Loaders\Steps\Diagnostics.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\IO.cs"> <Link>Test\Loaders\Steps\IO.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\UI.cs"> <Link>Test\Loaders\Steps\UI.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\XML.cs"> <Link>Test\Loaders\Steps\XML.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\Input.cs"> <Link>Test\Loaders\Steps\Input.cs</Link> </SourcesAppMonitor>
-    <!--<SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\Security.cs"> <Link>Test\Loaders\Steps\Security.cs</Link> </SourcesAppMonitor>-->
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\Reflection.cs"> <Link>Test\Loaders\Steps\Reflection.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\Avalon.cs"> <Link>Test\Loaders\Steps\Avalon.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\Collections.cs"> <Link>Test\Loaders\Steps\Collections.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\Environment.cs"> <Link>Test\Loaders\Steps\Environment.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\ScripterStep.cs"> <Link>Test\Loaders\Steps\ScripterStep.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\UIHandlers\CustomUIHandler.cs"> <Link>Test\Loaders\UIHandlers\CustomUIHandler.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\ConfigFileStep.cs"> <Link>Test\Loaders\Steps\ConfigFileStep.cs</Link> </SourcesAppMonitor>
-    <!--<SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\BrowserStateStep.cs"> <Link>Test\Loaders\Steps\BrowserStateStep.cs</Link> </SourcesAppMonitor>-->
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\IENavigationHelper.cs"> <Link>Test\Loaders\IENavigationHelper.cs</Link> </SourcesAppMonitor>
-    <SourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\MachineInfoStepDisabler.cs"> <Link>Test\Loaders\Steps\MachineInfoStepDisabler.cs</Link> </SourcesAppMonitor>
-  </ItemGroup>
-
-  <!-- Managed Resources AppMonitor -->
-  <ItemGroup>
-    <!--<ManagedResourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\clickoncetest.pfx">
-      <LogicalName>clickoncetest.pfx</LogicalName>
-      <Link>Resources\Loaders\clickoncetest.pfx</Link>
-    </ManagedResourcesAppMonitor>-->
-    <ManagedResourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\NamedRegistrations.xml">
-      <LogicalName>NamedRegistrations.xml</LogicalName>
-      <Link>Resources\Loaders\NamedRegistrations.xml</Link>
-    </ManagedResourcesAppMonitor>
-    <ManagedResourcesAppMonitor Include="$(CommonCodeLocation)\Loaders\Steps\ErrorCodes.xml">
-      <LogicalName>ErrorCodes.xml</LogicalName>
-      <Link>Resources\Loaders\ErrorCodes.xml</Link>
-    </ManagedResourcesAppMonitor>
-  </ItemGroup>
-
-  <!-- Threading -->
-  <ItemGroup>
-    <SourcesThreading Include="$(CommonCodeLocation)\Threading\DispatcherHelper.cs"> <Link>Test\Threading\DispatcherHelper.cs</Link> </SourcesThreading>
-    <SourcesThreading Include="$(CommonCodeLocation)\Threading\DispatcherQueueWrapper.cs"> <Link>Test\Threading\DispatcherQueueWrapper.cs</Link> </SourcesThreading>
-    <SourcesThreading Include="$(CommonCodeLocation)\Threading\DispatcherTimerHelper.cs"> <Link>Test\Threading\DispatcherTimerHelper.cs</Link> </SourcesThreading>
-    <SourcesThreading Include="$(CommonCodeLocation)\Threading\DispatcherPriorityHelper.cs"> <Link>Test\Threading\DispatcherPriorityHelper.cs</Link> </SourcesThreading>
-    <SourcesThreading Include="$(CommonCodeLocation)\Threading\DispatcherSignalHelper.cs"> <Link>Test\Threading\DispatcherSignalHelper.cs</Link> </SourcesThreading>
-  </ItemGroup>
-
-  <!-- Security -->
-  <ItemGroup>
-    <SourcesSecurity Include="$(CommonCodeLocation)\Security\Secure.cs"> <Link>Test\Security\Secure.cs</Link> </SourcesSecurity>
-  </ItemGroup>
-
-  <!-- Security Wrappers -->
-  <ItemGroup>
-    <SourcesSecurityWrappers Include="$(CommonCodeLocation)\Security\Wrappers\TestAPISw.cs"> <Link>Test\Security\Wrappers\TestAPISw.cs</Link> </SourcesSecurityWrappers>
-    <SourcesSecurityWrappers Include="$(CommonCodeLocation)\Security\Wrappers\AvalonWrappers.cs"> <Link>Test\Security\Wrappers\AvalonWrappers.cs</Link> </SourcesSecurityWrappers>
-    <SourcesSecurityWrappers Include="$(CommonCodeLocation)\Security\Wrappers\WrapperClasses.cs"> <Link>Test\Security\Wrappers\WrapperClasses.cs</Link> </SourcesSecurityWrappers>
-    <!-- Include 4.0 Wrappers based on build target version -->
-    <SourcesSecurityWrappers Include="$(CommonCodeLocation)\Security\Wrappers\WrapperClasses40.cs" Condition="'$(WPF_TESTBUILD_TARGETVERSION)' != 'v3.0' AND '$(WPF_TESTBUILD_TARGETVERSION)' != 'v3.5'"> <Link>Test\Security\Wrappers\WrapperClasses40.cs</Link> </SourcesSecurityWrappers>
-  </ItemGroup>
-
-  <!-- Display Minimal -->
-  <ItemGroup>
-    <SourcesDisplayMinimal Include="$(CommonCodeLocation)\Display\DisplayConfiguration.cs"> <Link>Test\Display\DisplayConfiguration.cs</Link> </SourcesDisplayMinimal>
-    <SourcesDisplayMinimal Include="$(CommonCodeLocation)\Display\DisplaySettings.cs"> <Link>Test\Display\DisplaySettings.cs</Link> </SourcesDisplayMinimal>
-    <SourcesDisplayMinimal Include="$(CommonCodeLocation)\Display\DisplaySettingsInfo.cs"> <Link>Test\Display\DisplaySettingsInfo.cs</Link> </SourcesDisplayMinimal>
-    <SourcesDisplayMinimal Include="$(CommonCodeLocation)\Display\DwmApi.cs"> <Link>Test\Display\DwmApi.cs</Link> </SourcesDisplayMinimal>
-    <SourcesDisplayMinimal Include="$(CommonCodeLocation)\Display\Monitor.cs"> <Link>Test\Display\Monitor.cs</Link> </SourcesDisplayMinimal>
-  </ItemGroup>
-
-  <!-- Display -->
-  <ItemGroup>
-    <SourcesDisplay Include="$(CommonCodeLocation)\Display\Desktop.cs"> <Link>Test\Display\Desktop.cs</Link> </SourcesDisplay>
-    <SourcesDisplay Include="@(SourcesDisplayMinimal)" />
-  </ItemGroup>
-
-  <!-- Leak Testing -->
-  <ItemGroup>
-    <SourcesLeak Include="$(CommonCodeLocation)\Leak\LeakTest.cs"> <Link>Test\Leak\LeakTest.cs</Link> </SourcesLeak>    
-  </ItemGroup>
-
-  <!-- Test Types -->
-  <ItemGroup>
-    <SourcesTestTypes Include="$(CommonCodeLocation)\TestTypes\AvalonModel.cs"> <Link>Test\TestTypes\AvalonModel.cs</Link> </SourcesTestTypes>
-    <SourcesTestTypes Include="$(CommonCodeLocation)\TestTypes\AvalonTest.cs"> <Link>Test\TestTypes\AvalonTest.cs</Link> </SourcesTestTypes>
-    <SourcesTestTypes Include="$(CommonCodeLocation)\TestTypes\ETWVerificationTest.cs"> <Link>Test\TestTypes\ETWVerificationTest.cs</Link> </SourcesTestTypes>
-    <SourcesTestTypes Include="$(CommonCodeLocation)\TestTypes\StepsTest.cs"> <Link>Test\TestTypes\StepsTest.cs</Link> </SourcesTestTypes>
-    <SourcesTestTypes Include="$(CommonCodeLocation)\TestTypes\WindowModel.cs"> <Link>Test\TestTypes\WindowModel.cs</Link> </SourcesTestTypes>
-    <SourcesTestTypes Include="$(CommonCodeLocation)\TestTypes\WindowTest.cs"> <Link>Test\TestTypes\WindowTest.cs</Link> </SourcesTestTypes>
-    <SourcesTestTypes Include="$(CommonCodeLocation)\TestTypes\WindowUtil.cs"> <Link>Test\TestTypes\WindowUtil.cs</Link> </SourcesTestTypes>
-    <SourcesTestTypes Include="$(CommonCodeLocation)\TestTypes\XamlModel.cs"> <Link>Test\TestTypes\XamlModel.cs</Link> </SourcesTestTypes>
-    <SourcesTestTypes Include="$(CommonCodeLocation)\TestTypes\XamlTest.cs"> <Link>Test\TestTypes\XamlTest.cs</Link> </SourcesTestTypes>
-    <SourcesTestTypes Include="$(CommonCodeLocation)\TestTypes\XamlVisualVerificationTest.cs"> <Link>Test\TestTypes\XamlVisualVerificationTest.cs</Link> </SourcesTestTypes>
-  </ItemGroup>
-
-  <!-- Drt -->
-  <ItemGroup>
-    <SourcesDrt Include="$(CommonCodeLocation)\Drt\DrtRunner.cs"> <Link>Test\Drt\DrtRunner.cs</Link> </SourcesDrt>
-  </ItemGroup>
-
-  <!-- Verification -->
-  <ItemGroup>
-    <SourcesVerification Include="$(CommonCodeLocation)\Verification\IVerifier.cs"> <Link>Test\Verification\IVerifier.cs</Link> </SourcesVerification>
-    <SourcesVerification Include="$(CommonCodeLocation)\Verification\IVerifyResult.cs"> <Link>Test\Verification\IVerifyResult.cs</Link> </SourcesVerification>
-    <SourcesVerification Include="$(CommonCodeLocation)\Verification\VerifyResult.cs"> <Link>Test\Verification\VerifyResult.cs</Link> </SourcesVerification>
-  </ItemGroup>
-
-  <!-- Input Minimal -->
-  <ItemGroup>
-    <SourcesInputMinimal Include="$(CommonCodeLocation)\Input\InputHelper.cs"> <Link>Test\Input\InputHelper.cs</Link> </SourcesInputMinimal>
-  </ItemGroup>
-
-  <!-- Input -->
-  <ItemGroup>
-    <SourcesInput Include="$(CommonCodeLocation)\Input\Input.cs"> <Link>Test\Input\Input.cs</Link> </SourcesInput>
-    <SourcesInput Include="$(CommonCodeLocation)\Input\NativeMethods.cs"> <Link>Test\Input\NativeMethods.cs</Link> </SourcesInput>
-    <SourcesInput Include="$(CommonCodeLocation)\Input\SafeNativeMethods.cs"> <Link>Test\Input\SafeNativeMethods.cs</Link> </SourcesInput>
-    <SourcesInput Include="$(CommonCodeLocation)\Input\UnsafeNativeMethods.cs"> <Link>Test\Input\UnsafeNativeMethods.cs</Link> </SourcesInput>
-    <SourcesInput Include="$(CommonCodeLocation)\Input\InputManagerWrapper.cs"> <Link>Test\Input\InputManagerWrapper.cs</Link> </SourcesInput>
-    <SourcesInput Include="$(CommonCodeLocation)\Input\KeyboardRecorder.cs"> <Link>Test\Input\KeyboardRecorder.cs</Link> </SourcesInput>
-    <SourcesInput Include="$(CommonCodeLocation)\Input\RawMouseActions.cs"> <Link>Test\Input\RawMouseActions.cs</Link> </SourcesInput>
-    <SourcesInput Include="$(CommonCodeLocation)\Input\InputReportEventArgsWrapper.cs"> <Link>Test\Input\InputReportEventArgsWrapper.cs</Link> </SourcesInput>
-    <SourcesInput Include="$(CommonCodeLocation)\Input\RawKeyboardActions.cs"> <Link>Test\Input\RawKeyboardActions.cs</Link> </SourcesInput>
-    <SourcesInput Include="$(CommonCodeLocation)\Input\RawMouseInputReportWrapper.cs"> <Link>Test\Input\RawMouseInputReportWrapper.cs</Link> </SourcesInput>
-    <SourcesInput Include="$(CommonCodeLocation)\Input\RawMouseState.cs"> <Link>Test\Input\RawMouseState.cs</Link> </SourcesInput>
-    <SourcesInput Include="$(CommonCodeLocation)\Input\RawKeyboardInputReportWrapper.cs"> <Link>Test\Input\RawKeyboardInputReportWrapper.cs</Link> </SourcesInput>
-    <SourcesInput Include="$(CommonCodeLocation)\Input\InputReportWrapper.cs"> <Link>Test\Input\InputReportWrapper.cs</Link> </SourcesInput>
-    <SourcesInput Include="$(CommonCodeLocation)\Input\KeyboardPlayer.cs"> <Link>Test\Input\KeyboardPlayer.cs</Link> </SourcesInput>
-    <SourcesInput Include="$(CommonCodeLocation)\Input\RawKeyboardState.cs"> <Link>Test\Input\RawKeyboardState.cs</Link> </SourcesInput>
-    <SourcesInput Include="$(CommonCodeLocation)\Input\RawTextInputReportWrapper.cs"> <Link>Test\Input\RawTextInputReportWrapper.cs</Link> </SourcesInput>
-    <SourcesInput Include="$(CommonCodeLocation)\Input\MultiMonitorHelper.cs"> <Link>Test\Input\MultiMonitorHelper.cs</Link> </SourcesInput>
-    <SourcesInput Include="$(CommonCodeLocation)\Input\UserInput.cs"> <Link>Test\Input\UserInput.cs</Link> </SourcesInput>
-    <SourcesInput Include="@(SourcesInputMinimal)" />
-  </ItemGroup>
-
-  <!-- Hosting/Xaml Browser Host- TODO: the name should be fixed. -->
-  <ItemGroup>
-    <SourcesXamlBrowserHost Include="$(CommonCodeLocation)\Hosting\UiaDistributedStepInfo.cs"> <Link>Test\Hosting\UiaDistributedStepInfo.cs</Link> </SourcesXamlBrowserHost>
-    <SourcesXamlBrowserHost Include="$(CommonCodeLocation)\Hosting\UiaDistributedStepTarget.cs"> <Link>Test\Hosting\UiaDistributedStepTarget.cs</Link> </SourcesXamlBrowserHost>
-    <SourcesXamlBrowserHost Include="$(CommonCodeLocation)\Hosting\UiaDistributedTestcase.cs"> <Link>Test\Hosting\UiaDistributedTestcase.cs</Link> </SourcesXamlBrowserHost>
-    <SourcesXamlBrowserHost Include="$(CommonCodeLocation)\Hosting\UiaDistributedTestCaseHost.cs"> <Link>Test\Hosting\UiaDistributedTestCaseHost.cs</Link> </SourcesXamlBrowserHost>
-    <SourcesXamlBrowserHost Include="$(CommonCodeLocation)\Hosting\UiaSimpleTestCase.cs"> <Link>Test\Hosting\UiaSimpleTestCase.cs</Link> </SourcesXamlBrowserHost>
-    <SourcesXamlBrowserHost Include="$(CommonCodeLocation)\Hosting\UiaTestState.cs"> <Link>Test\Hosting\UiaTestState.cs</Link> </SourcesXamlBrowserHost>
-
-    <SourcesXamlBrowserHost Include="$(CommonCodeLocation)\Hosting\XamlBrowserHost.cs"> <Link>Test\Hosting\XamlBrowserHost.cs</Link> </SourcesXamlBrowserHost>
-  </ItemGroup>
-
-  <!-- Object Serializer -->
-  <ItemGroup>
-    <SourcesObjectserializer Include="$(CommonCriticalCodeLocation)\Serialization\ObjectSerializer.cs"> <Link>Critical\Test\Serialization\ObjectSerializer.cs</Link> </SourcesObjectserializer>
-    <SourcesObjectserializer Include="$(CommonCriticalCodeLocation)\Serialization\DefaultObjectSerializer.cs"> <Link>Critical\Test\Serialization\DefaultObjectSerializer.cs</Link> </SourcesObjectserializer>
-  </ItemGroup>
-
- <!-- Runtime Logging Sources -->
-  <ItemGroup>
-    <SharedRuntimeLoggingSources Include="$(CommonCriticalCodeLocation)\Logging\TestResult.cs"> <Link>Critical\Test\Logging\TestResult.cs</Link> </SharedRuntimeLoggingSources>
-    <SharedRuntimeLoggingSources Include="$(CommonCriticalCodeLocation)\Logging\IHarnessLoggingContract.cs"> <Link>Critical\Test\Logging\IHarnessLoggingContract.cs</Link> </SharedRuntimeLoggingSources>
-  </ItemGroup>
-
-  <!-- Logging -->
-  <ItemGroup>
-    <SourcesLogging Include="@(SharedRuntimeLoggingSources)" />
-    <SourcesLogging Include="$(CommonCodeLocation)\Logging\TestLog.cs"> <Link>Test\Logging\TestLog.cs</Link> </SourcesLogging>
-    <SourcesLogging Include="$(CommonCodeLocation)\Logging\TestStage.cs"> <Link>Test\Logging\TestStage.cs</Link> </SourcesLogging>
-    <SourcesLogging Include="$(CommonCodeLocation)\Logging\GlobalLog.cs"> <Link>Test\Logging\GlobalLog.cs</Link> </SourcesLogging>
-  </ItemGroup>
-
-  <!-- System Information -->
-  <ItemGroup>
-    <SourcesSystemInfo Include="$(CommonCodeLocation)\Diagnostics\SystemInformation.cs"> <Link>Test\Diagnostics\SystemInformation.cs</Link> </SourcesSystemInfo>
-    <SourcesSystemInfo Include="$(CommonCodeLocation)\Diagnostics\ProcessorInformation.cs"> <Link>Test\Diagnostics\ProcessorInformation.cs</Link> </SourcesSystemInfo>
-    <SourcesSystemInfo Include="$(CommonCodeLocation)\Diagnostics\SystemMetrics.cs"> <Link>Test\Diagnostics\SystemMetrics.cs</Link> </SourcesSystemInfo>
-  </ItemGroup>
-
-  <!-- System Information WPF-->
-  <ItemGroup>
-    <SourcesSystemInfoWpf Include="$(CommonCodeLocation)\Diagnostics\SystemInformation_Wpf.cs"> <Link>Test\Diagnostics\SystemInformation_Wpf.cs</Link> </SourcesSystemInfoWpf>
-  </ItemGroup>
-
-  <!-- System Information WindowsMediaPlayer-->
-  <ItemGroup>
-    <SourcesSystemInfoMediaPlayer Include="$(CommonCodeLocation)\Diagnostics\SystemInformation_WindowsMediaPlayer.cs"> <Link>Test\Diagnostics\SystemInformation_WindowsMediaPlayer.cs</Link> </SourcesSystemInfoMediaPlayer>
-  </ItemGroup>
-
-  <!-- Process Monitor -->
-  <ItemGroup>
-    <SourcesProcessmonitor Include="$(CommonCodeLocation)\Diagnostics\ProcessMonitor.cs"> <Link>Test\Diagnostics\ProcessMonitor.cs</Link> </SourcesProcessmonitor>
-  </ItemGroup>
-
-  <!-- Process Helper -->
-  <ItemGroup>
-    <SourcesProcessHelper Include="$(CommonCodeLocation)\Diagnostics\ProcessHelper.cs"> <Link>Test\Diagnostics\ProcessHelper.cs</Link> </SourcesProcessHelper>
-    <SourcesProcessHelper Include="$(CommonCodeLocation)\Diagnostics\ProcessGroup.cs"> <Link>Test\Diagnostics\ProcessGroup.cs</Link> </SourcesProcessHelper>
-    <SourcesProcessHelper Include="$(CommonCodeLocation)\Diagnostics\ManifestHelper.cs"> <Link>Test\Diagnostics\ManifestHelper.cs</Link> </SourcesProcessHelper>
-  </ItemGroup>
-
-  <!-- Loaders -->
-  <ItemGroup>
-    <SourcesLoaders Include="@(SourcesProcessMonitor)" />
-  </ItemGroup>
-
-  <!-- Debugging -->
-  <ItemGroup>
-    <SourcesDebugging Include="$(CommonCodeLocation)\Diagnostics\CdbSession.cs"><Link>Test\Diagnostics\CdbSession.cs</Link> </SourcesDebugging>
-  </ItemGroup>
-
-  <!-- State Management Runtime -->
-  <ItemGroup>
-    <SourcesStateManagementRuntime Include="$(CommonCodeLocation)\Configuration\MachineStateManager.cs"> <Link>Test\Configuration\MachineStateManager.cs</Link> </SourcesStateManagementRuntime>
-  </ItemGroup>
-
-  <!-- State Management -->
-  <ItemGroup>
-    <SourcesStateManagement Include="$(CommonCodeLocation)\StateManagement\StateManager.cs"> <Link>Test\StateManagement\StateManager.cs</Link> </SourcesStateManagement>
-    <SourcesStateManagement Include="$(CommonCodeLocation)\StateManagement\State.cs"> <Link>Test\StateManagement\State.cs</Link> </SourcesStateManagement>
-    <SourcesStateManagement Include="$(CommonCodeLocation)\StateManagement\RegistryState.cs"> <Link>Test\StateManagement\RegistryState.cs</Link> </SourcesStateManagement>
-    <SourcesStateManagement Include="$(CommonCodeLocation)\StateManagement\UserSessionState.cs"> <Link>Test\StateManagement\UserSessionState.cs</Link> </SourcesStateManagement>
-    <SourcesStateManagement Include="$(CommonCodeLocation)\StateManagement\SystemInformationState.cs"> <Link>Test\StateManagement\SystemInformationState.cs</Link> </SourcesStateManagement>
-    <SourcesStateManagement Include="$(CommonCodeLocation)\StateManagement\MonitorState.cs"> <Link>Test\StateManagement\MonitorState.cs</Link> </SourcesStateManagement>
-    <SourcesStateManagement Include="$(CommonCodeLocation)\StateManagement\DisplayThemeState.cs"> <Link>Test\StateManagement\DisplayThemeState.cs</Link> </SourcesStateManagement>
-    <SourcesStateManagement Include="$(CommonCodeLocation)\StateManagement\BrowserState.cs"> <Link>Test\StateManagement\BrowserState.cs</Link> </SourcesStateManagement>
-    <SourcesStateManagement Include="$(CommonCodeLocation)\StateManagement\FirewallExceptionState.cs"> <Link>Test\StateManagement\FirewallExceptionState.cs</Link> </SourcesStateManagement>
-    <SourcesStateManagement Include="$(CommonCodeLocation)\StateManagement\ComServerState.cs"> <Link>Test\StateManagement\ComServerState.cs</Link> </SourcesStateManagement>
-  </ItemGroup>
-
-  <!-- Execution Service Client -->
-  <ItemGroup>
-    <SourcesExecutionServiceClient Include="$(CommonCodeLocation)\Diagnostics\IExecutionService.cs"> <Link>Test\Diagnostics\IExecutionService.cs</Link> </SourcesExecutionServiceClient>
-    <SourcesExecutionServiceClient Include="$(CommonCodeLocation)\Diagnostics\ExecutionServiceClient.cs"> <Link>Test\Diagnostics\ExecutionServiceClient.cs</Link> </SourcesExecutionServiceClient>
-    <SourcesExecutionServiceClient Include="$(CommonCodeLocation)\Diagnostics\ExecutionServiceClientConnection.cs"> <Link>Test\Diagnostics\ExecutionServiceClientConnection.cs</Link> </SourcesExecutionServiceClient>
-    <SourcesExecutionServiceClient Include="$(CommonCodeLocation)\Diagnostics\FirefoxHelper.cs"> <Link>Test\Diagnostics\FirefoxHelper.cs</Link> </SourcesExecutionServiceClient>
-    <SourcesExecutionServiceClient Include="$(CommonCodeLocation)\Diagnostics\FirewallHelper.cs"> <Link>Test\Diagnostics\FirewallHelper.cs</Link> </SourcesExecutionServiceClient>
-    <SourcesExecutionServiceClient Include="$(CommonCodeLocation)\Diagnostics\RegistrationHelper.cs"> <Link>Test\Diagnostics\RegistrationHelper.cs</Link> </SourcesExecutionServiceClient>
-    <SourcesExecutionServiceClient Include="$(CommonCodeLocation)\Diagnostics\UserSessionHelper.cs"> <Link>Test\Diagnostics\UserSessionHelper.cs</Link> </SourcesExecutionServiceClient>
-    <SourcesExecutionServiceClient Include="$(CommonCodeLocation)\Diagnostics\UserInfo.cs"> <Link>Test\Diagnostics\UserInfo.cs</Link> </SourcesExecutionServiceClient>
-    <SourcesExecutionServiceClient Include="$(CommonCodeLocation)\Diagnostics\WttHelper.cs"> <Link>Test\Diagnostics\WttHelper.cs</Link> </SourcesExecutionServiceClient>
-    <SourcesExecutionServiceClient Include="$(CommonCodeLocation)\Diagnostics\ImpersonateUserHelper.cs"> <Link>Test\Diagnostics\ImpersonateUserHelper.cs</Link> </SourcesExecutionServiceClient>
-    <SourcesExecutionServiceClient Include="$(CommonCriticalCodeLocation)\Deployment\RuntimeDeploymentHelper.cs"> <Link>Critical\Test\Deployment\RuntimeDeploymentHelper.cs</Link> </SourcesExecutionServiceClient>
-  </ItemGroup>
-
-  <!-- Execution Service -->
-  <ItemGroup>
-    <SourcesExecutionservice Include="$(CommonCodeLocation)\Diagnostics\ExecutionServiceProxyClient.cs"> <Link>Test\Diagnostics\ExecutionServiceProxyClient.cs</Link> </SourcesExecutionservice>
-    <SourcesExecutionservice Include="$(CommonCodeLocation)\Diagnostics\ExecutionServiceProxy.cs"> <Link>Test\Diagnostics\ExecutionServiceProxy.cs</Link> </SourcesExecutionservice>
-  </ItemGroup>
-
-  <!-- Win32 Minimal -->
-  <ItemGroup>
-    <SourcesWin32Minimal Include="$(CommonCodeLocation)\Win32\NativeStructs.cs"> <Link>Test\Win32\NativeStructs.cs</Link> </SourcesWin32Minimal>
-    <SourcesWin32Minimal Include="$(CommonCodeLocation)\Win32\NativeConstants.cs"> <Link>Test\Win32\NativeConstants.cs</Link> </SourcesWin32Minimal>
-    <SourcesWin32Minimal Include="$(CommonCodeLocation)\Win32\Gdi32.cs"> <Link>Test\Win32\Gdi32.cs</Link> </SourcesWin32Minimal>
-    <SourcesWin32Minimal Include="$(CommonCodeLocation)\Win32\User32.cs"> <Link>Test\Win32\User32.cs</Link> </SourcesWin32Minimal>
-    <SourcesWin32Minimal Include="$(CommonCodeLocation)\Win32\Kernel32.cs"> <Link>Test\Win32\Kernel32.cs</Link> </SourcesWin32Minimal>
-    <SourcesWin32Minimal Include="$(CommonCodeLocation)\Win32\WindowEnumerator.cs"> <Link>Test\Win32\WindowEnumerator.cs</Link> </SourcesWin32Minimal>
-    <SourcesWin32Minimal Include="$(CommonCodeLocation)\Win32\Ntdll.cs"> <Link>Test\Win32\Ntdll.cs</Link> </SourcesWin32Minimal>
-  </ItemGroup>
-
-  <!-- Win32 -->
-  <ItemGroup>
-    <SourcesWin32 Include="$(CommonCodeLocation)\Win32\HwndSubClass.cs"> <Link>Test\Win32\HwndSubClass.cs</Link> </SourcesWin32>
-    <SourcesWin32 Include="$(CommonCodeLocation)\Win32\HwndWrapper.cs"> <Link>Test\Win32\HwndWrapper.cs</Link> </SourcesWin32>
-    <SourcesWin32 Include="$(CommonCodeLocation)\Win32\ManagedWndProcTracker.cs"> <Link>Test\Win32\ManagedWndProcTracker.cs</Link> </SourcesWin32>
-    <SourcesWin32 Include="$(CommonCodeLocation)\Win32\NativeMethods.cs"> <Link>Test\Win32\NativeMethods.cs</Link> </SourcesWin32>
-    <SourcesWin32 Include="$(CommonCodeLocation)\Win32\WeakReferenceList.cs"> <Link>Test\Win32\WeakReferenceList.cs</Link> </SourcesWin32>
-    <SourcesWin32 Include="$(CommonCodeLocation)\Win32\WeakReferenceListEnumerator.cs"> <Link>Test\Win32\WeakReferenceListEnumerator.cs</Link> </SourcesWin32>
-    <SourcesWin32 Include="$(CommonCodeLocation)\Win32\AcceleratorTable.cs"> <Link>Test\Win32\AcceleratorTable.cs</Link> </SourcesWin32>
-    <SourcesWin32 Include="@(SourcesWin32Minimal)" />
-  </ItemGroup>
-
-  <!-- Modeling -->
-  <ItemGroup>
-    <SourcesModeling Include="$(CommonCodeLocation)\Modeling\AsyncActionManager.cs"> <Link>Test\Modeling\AsyncActionManager.cs</Link> </SourcesModeling>
-    <SourcesModeling Include="$(CommonCodeLocation)\Modeling\Model.cs"> <Link>Test\Modeling\Model.cs</Link> </SourcesModeling>
-    <SourcesModeling Include="$(CommonCodeLocation)\Modeling\ModelingBaseObject.cs"> <Link>Test\Modeling\ModelingBaseObject.cs</Link> </SourcesModeling>
-    <SourcesModeling Include="$(CommonCodeLocation)\Modeling\TestLoader.cs"> <Link>Test\Modeling\TestLoader.cs</Link> </SourcesModeling>
-    <SourcesModeling Include="$(CommonCodeLocation)\Modeling\XamlTransformer.cs"> <Link>Test\Modeling\XamlTransformer.cs</Link> </SourcesModeling>
-    <SourcesModeling Include="$(CommonCodeLocation)\Modeling\XtcParser.cs"> <Link>Test\Modeling\XtcParser.cs</Link> </SourcesModeling>
-    <SourcesModeling Include="$(CommonCodeLocation)\Modeling\XtcTestCaseLoader.cs"> <Link>Test\Modeling\XtcTestCaseLoader.cs</Link> </SourcesModeling>
-  </ItemGroup>
-
-  <!-- Windows -->
-  <ItemGroup>
-    <SourcesWindows Include="$(CommonCodeLocation)\Windows\ActionForTypeHelper.cs"> <Link>Test\Windows\ActionForTypeHelper.cs</Link> </SourcesWindows>
-    <SourcesWindows Include="$(CommonCodeLocation)\Windows\TreeComparer.cs"> <Link>Test\Windows\TreeComparer.cs</Link> </SourcesWindows>
-  </ItemGroup>
-
-  <!-- Managed Resources Windows -->
-  <ItemGroup>
-    <ManagedResourcesWindows Include="$(CommonDataLocation)\Windows\PropertiesToSkip.xml">
-      <LogicalName>PropertiesToSkip.xml</LogicalName>
-      <Link>Resources\Windows\PropertiesToSkip.xml</Link>
-    </ManagedResourcesWindows>
-  </ItemGroup>
-
-  <!-- Test -->
-  <ItemGroup>
-    <SourcesTest Include="$(CommonCodeLocation)\EventHelper.cs"> <Link>Test\EventHelper.cs</Link> </SourcesTest>
-    <SourcesTest Include="$(CommonCodeLocation)\ExceptionHelper.cs"> <Link>Test\ExceptionHelper.cs</Link> </SourcesTest>
-    <SourcesTest Include="$(CommonCodeLocation)\TestException.cs"> <Link>Test\TestException.cs</Link> </SourcesTest>
-    <SourcesTest Include="$(CommonCodeLocation)\TestSetupException.cs"> <Link>Test\TestSetupException.cs</Link> </SourcesTest>
-    <SourcesTest Include="$(CommonCodeLocation)\TestValidationException.cs"> <Link>Test\TestValidationException.cs</Link> </SourcesTest>
-  </ItemGroup>
-
-  <!-- Serialization -->
-  <ItemGroup>
-    <SourcesSerialization Include="$(CommonCodeLocation)\Serialization\BamlHelper.cs"> <Link>Test\Serialization\BamlHelper.cs</Link> </SourcesSerialization>
-    <SourcesSerialization Include="$(CommonCodeLocation)\Serialization\BamlReaderWrapper.cs"> <Link>Test\Serialization\BamlReaderWrapper.cs</Link> </SourcesSerialization>
-    <SourcesSerialization Include="$(CommonCodeLocation)\Serialization\BamlWriterWrapper.cs"> <Link>Test\Serialization\BamlWriterWrapper.cs</Link> </SourcesSerialization>
-    <SourcesSerialization Include="$(CommonCodeLocation)\Serialization\IOHelper.cs"> <Link>Test\Serialization\IOHelper.cs</Link> </SourcesSerialization>
-    <SourcesSerialization Include="$(CommonCodeLocation)\Serialization\SerializationHelper.cs"> <Link>Test\Serialization\SerializationHelper.cs</Link> </SourcesSerialization>
-    <SourcesSerialization Include="$(CommonCodeLocation)\Serialization\WrapperUtil.cs"> <Link>Test\Serialization\WrapperUtil.cs</Link> </SourcesSerialization>
-    <SourcesSerialization Include="$(CommonCodeLocation)\Serialization\XamlRoundTrip.cs"> <Link>Test\Serialization\XamlRoundTrip.cs</Link> </SourcesSerialization>
-  </ItemGroup>
-
-  <!-- Serialization Custom Elements -->
-  <ItemGroup>
-    <SourcesSerializationCustomElements Include="$(CommonCodeLocation)\Serialization\CustomElements\CustomBorder.cs"> <Link>Test\Serialization\CustomElements\CustomBorder.cs</Link> </SourcesSerializationCustomElements>
-    <SourcesSerializationCustomElements Include="$(CommonCodeLocation)\Serialization\CustomElements\CustomButton.cs"> <Link>Test\Serialization\CustomElements\CustomButton.cs</Link> </SourcesSerializationCustomElements>
-    <SourcesSerializationCustomElements Include="$(CommonCodeLocation)\Serialization\CustomElements\CustomCanvas.cs"> <Link>Test\Serialization\CustomElements\CustomCanvas.cs</Link> </SourcesSerializationCustomElements>
-    <SourcesSerializationCustomElements Include="$(CommonCodeLocation)\Serialization\CustomElements\CustomDockPanel.cs"> <Link>Test\Serialization\CustomElements\CustomDockPanel.cs</Link> </SourcesSerializationCustomElements>
-    <SourcesSerializationCustomElements Include="$(CommonCodeLocation)\Serialization\CustomElements\CustomElementHelper.cs"> <Link>Test\Serialization\CustomElements\CustomElementHelper.cs</Link> </SourcesSerializationCustomElements>
-    <SourcesSerializationCustomElements Include="$(CommonCodeLocation)\Serialization\CustomElements\CustomPage.cs"> <Link>Test\Serialization\CustomElements\CustomPage.cs</Link> </SourcesSerializationCustomElements>
-    <SourcesSerializationCustomElements Include="$(CommonCodeLocation)\Serialization\CustomElements\CustomStackPanel.cs"> <Link>Test\Serialization\CustomElements\CustomStackPanel.cs</Link> </SourcesSerializationCustomElements>
-    <SourcesSerializationCustomElements Include="$(CommonCodeLocation)\Serialization\CustomElements\CustomTextPanel.cs"> <Link>Test\Serialization\CustomElements\CustomTextPanel.cs</Link> </SourcesSerializationCustomElements>
-    <SourcesSerializationCustomElements Include="$(CommonCodeLocation)\Serialization\CustomElements\CustomWindow.cs"> <Link>Test\Serialization\CustomElements\CustomWindow.cs</Link> </SourcesSerializationCustomElements>
-    <SourcesSerializationCustomElements Include="$(CommonCodeLocation)\Serialization\CustomElements\ICustomElement.cs"> <Link>Test\Serialization\CustomElements\ICustomElement.cs</Link> </SourcesSerializationCustomElements>
-  </ItemGroup>
-
-  <!-- Integration TXR -->
-  <ItemGroup>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\ActionForXamlInfo.cs"> <Link>Test\Integration\ActionForXamlInfo.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\FileVariationGenerator.cs"> <Link>Test\Integration\FileVariationGenerator.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\FileVariationItem.cs"> <Link>Test\Integration\FileVariationItem.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\BaseTestContract.cs"> <Link>Test\Integration\BaseTestContract.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\BaseVariationGenerator.cs"> <Link>Test\Integration\BaseVariationGenerator.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\CallbackVariationGenerator.cs"> <Link>Test\Integration\CallbackVariationGenerator.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\CallbackVariationItem.cs"> <Link>Test\Integration\CallbackVariationItem.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\CollectionsXamlHelper.cs"> <Link>Test\Integration\CollectionsXamlHelper.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\CombinationGenerator.cs"> <Link>Test\Integration\CombinationGenerator.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\GeneratorReference.cs"> <Link>Test\Integration\GeneratorReference.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\Helper.cs"> <Link>Test\Integration\Helper.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\ITestContract.cs"> <Link>Test\Integration\ITestContract.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\IVariationGenerator.cs"> <Link>Test\Integration\IVariationGenerator.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\MDEVariationGenerator.cs"> <Link>Test\Integration\MDEVariationGenerator.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\MDEVariationItem.cs"> <Link>Test\Integration\MDEVariationItem.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\NotificationList.cs"> <Link>Test\Integration\NotificationList.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\StorageItem.cs"> <Link>Test\Integration\StorageItem.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\TestExtenderGraph.cs"> <Link>Test\Integration\TestExtenderGraph.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\TestExtenderOutput.cs"> <Link>Test\Integration\TestExtenderOutput.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\VariationItem.cs"> <Link>Test\Integration\VariationItem.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\VariationItemGroup.cs"> <Link>Test\Integration\VariationItemGroup.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\CommonStorage.cs"> <Link>Test\Integration\CommonStorage.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\SelectorGenerator.cs"> <Link>Test\Integration\SelectorGenerator.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\ContentItem.cs"> <Link>Test\Integration\ContentItem.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\AssemblyDesc.cs"> <Link>Test\Integration\AssemblyDesc.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\WPF3Helper.cs"> <Link>Test\Integration\WPF3Helper.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\Windows\TypeVariationGenerator.cs"> <Link>Test\Integration\Windows\TypeVariationGenerator.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\Windows\TypeVariationItem.cs"> <Link>Test\Integration\Windows\TypeVariationItem.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\Windows\ContainerVariationGenerator.cs"> <Link>Test\Integration\Windows\ContainerVariationGenerator.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\Windows\ContainerVariationItem.cs"> <Link>Test\Integration\Windows\ContainerVariationItem.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\Windows\ActionSequenceVariationGenerator.cs"> <Link>Test\Integration\Windows\ActionSequenceVariationGenerator.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\Windows\ControllerProxy.cs"> <Link>Test\Integration\Windows\ControllerProxy.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\Windows\Controller.cs"> <Link>Test\Integration\Windows\Controller.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\Windows\ThreadController.cs"> <Link>Test\Integration\Windows\ThreadController.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\Windows\ApplicationController.cs"> <Link>Test\Integration\Windows\ApplicationController.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\Windows\WinFormsController.cs"> <Link>Test\Integration\Windows\WinFormsController.cs</Link> </SourcesIntegrationTxr>
-    <SourcesIntegrationTxr Include="$(CommonCodeLocation)\Integration\TestExtenderHelper.cs"> <Link>Test\Integration\TestExtenderHelper.cs</Link> </SourcesIntegrationTxr>
-  </ItemGroup>
-
-  <!-- Pict -->
-  <ItemGroup>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\ObjectArrays\AllPossibleObjectArrayCollection.cs"> <Link>Test\PICT\ObjectArrays\AllPossibleObjectArrayCollection.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\ObjectArrays\AllPossibleObjectArrayEnumerator.cs"> <Link>Test\PICT\ObjectArrays\AllPossibleObjectArrayEnumerator.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\ObjectArrays\AllPossibleObjectArrayGenerationStrategy.cs"> <Link>Test\PICT\ObjectArrays\AllPossibleObjectArrayGenerationStrategy.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\ObjectArrays\IObjectArrayCollection.cs"> <Link>Test\PICT\ObjectArrays\IObjectArrayCollection.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\ObjectArrays\IObjectArrayEnumerator.cs"> <Link>Test\PICT\ObjectArrays\IObjectArrayEnumerator.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\ObjectArrays\IObjectArrayGenerationStrategy.cs"> <Link>Test\PICT\ObjectArrays\IObjectArrayGenerationStrategy.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\ObjectArrays\ObjectArrayGeneration.cs"> <Link>Test\PICT\ObjectArrays\ObjectArrayGeneration.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\ObjectArrays\ObjectArrayGenerator.cs"> <Link>Test\PICT\ObjectArrays\ObjectArrayGenerator.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\ObjectArrays\ObjectArrayPairwiseGeneration.cs"> <Link>Test\PICT\ObjectArrays\ObjectArrayPairwiseGeneration.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\ObjectArrays\PairwiseObjectArrayCollection.cs"> <Link>Test\PICT\ObjectArrays\PairwiseObjectArrayCollection.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\ObjectArrays\PairwiseObjectArrayEnumerator.cs"> <Link>Test\PICT\ObjectArrays\PairwiseObjectArrayEnumerator.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\ObjectArrays\PairwiseObjectArrayGenerationStrategy.cs"> <Link>Test\PICT\ObjectArrays\PairwiseObjectArrayGenerationStrategy.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\IPairwiseComment.cs"> <Link>Test\PICT\IPairwiseComment.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\IPairwiseVisitable.cs"> <Link>Test\PICT\IPairwiseVisitable.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseAliasCollection.cs"> <Link>Test\PICT\PairwiseAliasCollection.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseAndClause.cs"> <Link>Test\PICT\PairwiseAndClause.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseComparison.cs"> <Link>Test\PICT\PairwiseComparison.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseComparisonTerm.cs"> <Link>Test\PICT\PairwiseComparisonTerm.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseCondition.cs"> <Link>Test\PICT\PairwiseCondition.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseConditionCollection.cs"> <Link>Test\PICT\PairwiseConditionCollection.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseEqualTerm.cs"> <Link>Test\PICT\PairwiseEqualTerm.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseException.cs"> <Link>Test\PICT\PairwiseException.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseGreaterThanOrEqualTerm.cs"> <Link>Test\PICT\PairwiseGreaterThanOrEqualTerm.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseGreaterThanTerm.cs"> <Link>Test\PICT\PairwiseGreaterThanTerm.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseIfThenConstraint.cs"> <Link>Test\PICT\PairwiseIfThenConstraint.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseIfThenConstraintCollection.cs"> <Link>Test\PICT\PairwiseIfThenConstraintCollection.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseInTerm.cs"> <Link>Test\PICT\PairwiseInTerm.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseLessThanOrEqualTerm.cs"> <Link>Test\PICT\PairwiseLessThanOrEqualTerm.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseLessThanTerm.cs"> <Link>Test\PICT\PairwiseLessThanTerm.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseLikeTerm.cs"> <Link>Test\PICT\PairwiseLikeTerm.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseLogicalClause.cs"> <Link>Test\PICT\PairwiseLogicalClause.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseLogicalRelationship.cs"> <Link>Test\PICT\PairwiseLogicalRelationship.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseModel.cs"> <Link>Test\PICT\PairwiseModel.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseNotClause.cs"> <Link>Test\PICT\PairwiseNotClause.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseNotEqualTerm.cs"> <Link>Test\PICT\PairwiseNotEqualTerm.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseNotInTerm.cs"> <Link>Test\PICT\PairwiseNotInTerm.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseOrClause.cs"> <Link>Test\PICT\PairwiseOrClause.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseParameter.cs"> <Link>Test\PICT\PairwiseParameter.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseParameterCollection.cs"> <Link>Test\PICT\PairwiseParameterCollection.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseParameterConstraint.cs"> <Link>Test\PICT\PairwiseParameterConstraint.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseParameterConstraintCollection.cs"> <Link>Test\PICT\PairwiseParameterConstraintCollection.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwisePICTCache.cs"> <Link>Test\PICT\PairwisePICTCache.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseSettings.cs"> <Link>Test\PICT\PairwiseSettings.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseSubModel.cs"> <Link>Test\PICT\PairwiseSubModel.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseSubModelCollection.cs"> <Link>Test\PICT\PairwiseSubModelCollection.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseTerm.cs"> <Link>Test\PICT\PairwiseTerm.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseTuple.cs"> <Link>Test\PICT\PairwiseTuple.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseValue.cs"> <Link>Test\PICT\PairwiseValue.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseValueCollection.cs"> <Link>Test\PICT\PairwiseValueCollection.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseValueType.cs"> <Link>Test\PICT\PairwiseValueType.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PairwiseVisitor.cs"> <Link>Test\PICT\PairwiseVisitor.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PICTConstants.cs"> <Link>Test\PICT\PICTConstants.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PICTExecutionInformation.cs"> <Link>Test\PICT\PICTExecutionInformation.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PICTPairwiseVisitor.cs"> <Link>Test\PICT\PICTPairwiseVisitor.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PICTRunner.cs"> <Link>Test\PICT\PICTRunner.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PICTWarningBehaviors.cs"> <Link>Test\PICT\PICTWarningBehaviors.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PICTWarningEventArgs.cs"> <Link>Test\PICT\PICTWarningEventArgs.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\PICTWarningEventHandler.cs"> <Link>Test\PICT\PICTWarningEventHandler.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\MatrixOutput\PairwiseTestCase.cs"> <Link>Test\PICT\MatrixOutput\PairwiseTestCase.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\MatrixOutput\PairwiseTestMatrix.cs"> <Link>Test\PICT\MatrixOutput\PairwiseTestMatrix.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\MatrixOutput\PairwiseTestParameter.cs"> <Link>Test\PICT\MatrixOutput\PairwiseTestParameter.cs</Link> </SourcesPict>
-    <SourcesPict Include="$(CommonCodeLocation)\PICT\MatrixOutput\PairwiseHelper.cs"> <Link>Test\PICT\MatrixOutput\PairwiseTestParameter.cs</Link> </SourcesPict>
-  </ItemGroup>
-  
-  <!-- Imaging -->
-  <ItemGroup>
-    <SourcesImaging Include="$(CommonCodeLocation)\Imaging\BitmapCapture.cs"> <Link>Test\Imaging\BitmapCapture.cs</Link> </SourcesImaging>
-    <SourcesImaging Include="$(CommonCodeLocation)\Imaging\BitmapUtils.cs"> <Link>Test\Imaging\BitmapUtils.cs</Link> </SourcesImaging>
-    <SourcesImaging Include="$(CommonCodeLocation)\Imaging\ColorUtils.cs"> <Link>Test\Imaging\ColorUtils.cs</Link> </SourcesImaging>
-    <SourcesImaging Include="$(CommonCodeLocation)\Imaging\ComparisonAlgorithm.cs"> <Link>Test\Imaging\ComparisonAlgorithm.cs</Link> </SourcesImaging>
-    <SourcesImaging Include="$(CommonCodeLocation)\Imaging\ComparisonCriteria.cs"> <Link>Test\Imaging\ComparisonCriteria.cs</Link> </SourcesImaging>
-    <SourcesImaging Include="$(CommonCodeLocation)\Imaging\ComparisonOperation.cs"> <Link>Test\Imaging\ComparisonOperation.cs</Link> </SourcesImaging>
-    <SourcesImaging Include="$(CommonCodeLocation)\Imaging\ComparisonOperationUtils.cs"> <Link>Test\Imaging\ComparisonOperationUtils.cs</Link> </SourcesImaging>
-    <SourcesImaging Include="$(CommonCodeLocation)\Imaging\ComparisonResult.cs"> <Link>Test\Imaging\ComparisonResult.cs</Link> </SourcesImaging>
-    <SourcesImaging Include="$(CommonCodeLocation)\Imaging\ElementUtils.cs"> <Link>Test\Imaging\ElementUtils.cs</Link> </SourcesImaging>
-    <SourcesImaging Include="$(CommonCodeLocation)\Imaging\PixelData.cs"> <Link>Test\Imaging\PixelData.cs</Link> </SourcesImaging>
-  </ItemGroup>
-
-  <!-- Animation -->
-  <ItemGroup>
-    <SourcesAnimation Include="$(CommonCodeLocation)\Animation\AnimationSideBySide.cs"> <Link>Test\Animation\AnimationSideBySide.cs</Link> </SourcesAnimation>
-    <SourcesAnimation Include="$(CommonCodeLocation)\Animation\AnimationUtils.cs"> <Link>Test\Animation\AnimationUtils.cs</Link> </SourcesAnimation>
-    <SourcesAnimation Include="$(CommonCodeLocation)\Animation\AnimationValidator.cs"> <Link>Test\Animation\AnimationValidator.cs</Link> </SourcesAnimation>
-    <SourcesAnimation Include="$(CommonCodeLocation)\Animation\TimeManagerCommon.cs"> <Link>Test\Animation\TimeManagerCommon.cs</Link> </SourcesAnimation>
-  </ItemGroup>
-
-  <!-- Rendering VScan -->
-  <ItemGroup>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\ColorByte.cs"> <Link>Test\RenderingVerification\ColorByte.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\ColorDouble.cs"> <Link>Test\RenderingVerification\ColorDouble.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Color_Avalon.cs"> <Link>Test\RenderingVerification\Color_Avalon.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Curve.cs"> <Link>Test\RenderingVerification\Curve.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\CurveTolerance.cs"> <Link>Test\RenderingVerification\CurveTolerance.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\DisplayConfiguration.cs"> <Link>Test\RenderingVerification\DisplayConfiguration.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\DisplayConfigurationMinimal.cs"> <Link>Test\RenderingVerification\DisplayConfigurationMinimal.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Exceptions.cs"> <Link>Test\RenderingVerification\Exceptions.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\ImageAdapter.cs"> <Link>Test\RenderingVerification\ImageAdapter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\ImageComparator.cs"> <Link>Test\RenderingVerification\ImageComparator.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\ImageUtility.cs"> <Link>Test\RenderingVerification\ImageUtility.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\ImageUtilityProxy.cs"> <Link>Test\RenderingVerification\ImageUtilityProxy.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\ImageUtility_Avalon.cs"> <Link>Test\RenderingVerification\ImageUtility_Avalon.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Interfaces.cs"> <Link>Test\RenderingVerification\Interfaces.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\IPUtil.cs"> <Link>Test\RenderingVerification\IPUtil.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\KeepGreaterKey.cs"> <Link>Test\RenderingVerification\KeepGreaterKey.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\MetaDataInfo.cs"> <Link>Test\RenderingVerification\MetaDataInfo.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\MismatchingPoints.cs"> <Link>Test\RenderingVerification\MismatchingPoints.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Package.cs"> <Link>Test\RenderingVerification\Package.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Pixel.cs"> <Link>Test\RenderingVerification\Pixel.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\PInvoke.cs"> <Link>Test\RenderingVerification\PInvoke.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\PropertyItemWrapper.cs"> <Link>Test\RenderingVerification\PropertyItemWrapper.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\RuntimeInfo.cs"> <Link>Test\RenderingVerification\RuntimeInfo.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\RenderRect.cs"> <Link>Test\RenderingVerification\RenderRect.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\VideoCapture.cs"> <Link>Test\RenderingVerification\VideoCapture.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\XamlLauncherReflect.cs"> <Link>Test\RenderingVerification\XamlLauncherReflect.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\AffineFilter.cs"> <Link>Test\RenderingVerification\Filters\AffineFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\AttractorFilter.cs"> <Link>Test\RenderingVerification\Filters\AttractorFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\BlurFilter.cs"> <Link>Test\RenderingVerification\Filters\BlurFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\BrightnessContrastFilter.cs"> <Link>Test\RenderingVerification\Filters\BrightnessContrastFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\ChannelOperationFilter.cs"> <Link>Test\RenderingVerification\Filters\ChannelOperationFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\ColorFilter.cs"> <Link>Test\RenderingVerification\Filters\ColorFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\ColorSpaceConversion.cs"> <Link>Test\RenderingVerification\Filters\ColorSpaceConversion.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\ColorTransformFilter.cs"> <Link>Test\RenderingVerification\Filters\ColorTransformFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\ContrastFilter.cs"> <Link>Test\RenderingVerification\Filters\ContrastFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\ConvolutionFilter.cs"> <Link>Test\RenderingVerification\Filters\ConvolutionFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\EqualizeFilter.cs"> <Link>Test\RenderingVerification\Filters\EqualizeFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\Filter.cs"> <Link>Test\RenderingVerification\Filters\Filter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\FilterParameter.cs"> <Link>Test\RenderingVerification\Filters\FilterParameter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\FlipRotateFilter.cs"> <Link>Test\RenderingVerification\Filters\FlipRotateFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\GammaCorrectFilter.cs"> <Link>Test\RenderingVerification\Filters\GammaCorrectFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\GaussianFilter.cs"> <Link>Test\RenderingVerification\Filters\GaussianFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\GlowFilter.cs"> <Link>Test\RenderingVerification\Filters\GlowFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\GrayscaleFilter.cs"> <Link>Test\RenderingVerification\Filters\GrayscaleFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\IColorConverter.cs"> <Link>Test\RenderingVerification\Filters\IColorConverter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\Image2DTransforms.cs"> <Link>Test\RenderingVerification\Filters\Image2DTransforms.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\Interpolator.cs"> <Link>Test\RenderingVerification\Filters\Interpolator.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\LogicalOperationFilter.cs"> <Link>Test\RenderingVerification\Filters\LogicalOperationFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\Matrix2D.cs"> <Link>Test\RenderingVerification\Filters\Matrix2D.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\Matrix2DConverter.cs"> <Link>Test\RenderingVerification\Filters\Matrix2DConverter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\MorphologicalFilter.cs"> <Link>Test\RenderingVerification\Filters\MorphologicalFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\MorphShapeFilter.cs"> <Link>Test\RenderingVerification\Filters\MorphShapeFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\NegateFilter.cs"> <Link>Test\RenderingVerification\Filters\NegateFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\OpacityPointsFilter.cs"> <Link>Test\RenderingVerification\Filters\OpacityPointsFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\OrderStatisticFilter.cs"> <Link>Test\RenderingVerification\Filters\OrderStatisticFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\PixelizeFilter.cs"> <Link>Test\RenderingVerification\Filters\PixelizeFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\ProcessXmlFilter.cs"> <Link>Test\RenderingVerification\Filters\ProcessXmlFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\RenderingColorConverter.cs"> <Link>Test\RenderingVerification\Filters\RenderingColorConverter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\SaturateEdgeFilter.cs"> <Link>Test\RenderingVerification\Filters\SaturateEdgeFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\SchematizationFilter.cs"> <Link>Test\RenderingVerification\Filters\SchematizationFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\SharpenFilter.cs"> <Link>Test\RenderingVerification\Filters\SharpenFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\SpatialTransformFilter.cs"> <Link>Test\RenderingVerification\Filters\SpatialTransformFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\TintFilter.cs"> <Link>Test\RenderingVerification\Filters\TintFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\TintShadeFilter.cs"> <Link>Test\RenderingVerification\Filters\TintShadeFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\VMorph.cs"> <Link>Test\RenderingVerification\Filters\VMorph.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\WaveletTransformFilter.cs"> <Link>Test\RenderingVerification\Filters\WaveletTransformFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Filters\WVMorph.cs"> <Link>Test\RenderingVerification\Filters\WVMorph.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Analytical\CartesianMomentDescriptor.cs"> <Link>Test\RenderingVerification\Models\Analytical\CartesianMomentDescriptor.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Analytical\Criterion.cs"> <Link>Test\RenderingVerification\Models\Analytical\Criterion.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Analytical\DescriptorBase.cs"> <Link>Test\RenderingVerification\Models\Analytical\DescriptorBase.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Analytical\DescriptorInfo.cs"> <Link>Test\RenderingVerification\Models\Analytical\DescriptorInfo.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Analytical\DescriptorManager.cs"> <Link>Test\RenderingVerification\Models\Analytical\DescriptorManager.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Analytical\DescriptorSquareMatrix.cs"> <Link>Test\RenderingVerification\Models\Analytical\DescriptorSquareMatrix.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Analytical\ImageToShapeIDMapping.cs"> <Link>Test\RenderingVerification\Models\Analytical\ImageToShapeIDMapping.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Analytical\Interfaces.cs"> <Link>Test\RenderingVerification\Models\Analytical\Interfaces.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Analytical\ModelManager2.cs"> <Link>Test\RenderingVerification\Models\Analytical\ModelManager2.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Analytical\MomentDescriptorBase.cs"> <Link>Test\RenderingVerification\Models\Analytical\MomentDescriptorBase.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Analytical\PolarMomentDescriptor.cs"> <Link>Test\RenderingVerification\Models\Analytical\PolarMomentDescriptor.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Analytical\VScan.cs"> <Link>Test\RenderingVerification\Models\Analytical\VScan.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\AnimatedProperty.cs"> <Link>Test\RenderingVerification\Models\Synthetical\AnimatedProperty.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\Animator.cs"> <Link>Test\RenderingVerification\Models\Synthetical\Animator.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\AvalonTypographer.cs"> <Link>Test\RenderingVerification\Models\Synthetical\AvalonTypographer.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\DeltaImageComparator.cs"> <Link>Test\RenderingVerification\Models\Synthetical\DeltaImageComparator.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\GeometryFilter.cs"> <Link>Test\RenderingVerification\Models\Synthetical\GeometryFilter.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\GlyphBase.cs"> <Link>Test\RenderingVerification\Models\Synthetical\GlyphBase.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\GlyphChar.cs"> <Link>Test\RenderingVerification\Models\Synthetical\GlyphChar.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\GlyphColorChooser.cs"> <Link>Test\RenderingVerification\Models\Synthetical\GlyphColorChooser.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\GlyphComparator.cs"> <Link>Test\RenderingVerification\Models\Synthetical\GlyphComparator.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\GlyphCompareInfo.cs"> <Link>Test\RenderingVerification\Models\Synthetical\GlyphCompareInfo.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\GlyphContainer.cs"> <Link>Test\RenderingVerification\Models\Synthetical\GlyphContainer.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\GlyphFont.cs"> <Link>Test\RenderingVerification\Models\Synthetical\GlyphFont.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\GlyphImage.cs"> <Link>Test\RenderingVerification\Models\Synthetical\GlyphImage.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\GlyphLayout.cs"> <Link>Test\RenderingVerification\Models\Synthetical\GlyphLayout.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\GlyphModel.cs"> <Link>Test\RenderingVerification\Models\Synthetical\GlyphModel.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\GlyphPanel.cs"> <Link>Test\RenderingVerification\Models\Synthetical\GlyphPanel.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\GlyphResource.cs"> <Link>Test\RenderingVerification\Models\Synthetical\GlyphResource.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\GlyphShape.cs"> <Link>Test\RenderingVerification\Models\Synthetical\GlyphShape.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\GlyphText.cs"> <Link>Test\RenderingVerification\Models\Synthetical\GlyphText.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\Interfaces.cs"> <Link>Test\RenderingVerification\Models\Synthetical\Interfaces.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\LayoutContainer.cs"> <Link>Test\RenderingVerification\Models\Synthetical\LayoutContainer.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\MatchingInfo.cs"> <Link>Test\RenderingVerification\Models\Synthetical\MatchingInfo.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\MatchingInfoEditor.cs"> <Link>Test\RenderingVerification\Models\Synthetical\MatchingInfoEditor.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\StandardTypographer.cs"> <Link>Test\RenderingVerification\Models\Synthetical\StandardTypographer.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\TypographBroker.cs"> <Link>Test\RenderingVerification\Models\Synthetical\TypographBroker.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\XenoSymbolBroker.cs"> <Link>Test\RenderingVerification\Models\Synthetical\XenoSymbolBroker.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\LayoutEngine\CanvasLayoutEngine.cs"> <Link>Test\RenderingVerification\Models\Synthetical\LayoutEngine\CanvasLayoutEngine.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\Models\Synthetical\LayoutEngine\FlowLayoutEngine.cs"> <Link>Test\RenderingVerification\Models\Synthetical\LayoutEngine\FlowLayoutEngine.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\ResourceFetcher\EmbeddedResourceKey.cs"> <Link>Test\RenderingVerification\ResourceFetcher\EmbeddedResourceKey.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\ResourceFetcher\EmbeddedResourceProvider.cs"> <Link>Test\RenderingVerification\ResourceFetcher\EmbeddedResourceProvider.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\ResourceFetcher\ResourceProvider.cs"> <Link>Test\RenderingVerification\ResourceFetcher\ResourceProvider.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\ResourceFetcher\Resourcestripper.cs"> <Link>Test\RenderingVerification\ResourceFetcher\Resourcestripper.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\UnmanagedProxies\UnmanagedInterfaces.cs"> <Link>Test\RenderingVerification\UnmanagedProxies\UnmanagedInterfaces.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\AsyncData.cs"> <Link>Test\RenderingVerification\AsyncData.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\AsyncHelper.cs"> <Link>Test\RenderingVerification\AsyncHelper.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\ImageComparisonResult.cs"> <Link>Test\RenderingVerification\ImageComparisonResult.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\ImageComparisonSettings.cs"> <Link>Test\RenderingVerification\ImageComparisonSettings.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\ImageMetadata.cs"> <Link>Test\RenderingVerification\ImageMetadata.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\MasterDimensions.cs"> <Link>Test\RenderingVerification\MasterDimensions.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\MasterImageComparer.cs"> <Link>Test\RenderingVerification\MasterImageComparer.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\MasterIndex.cs"> <Link>Test\RenderingVerification\MasterIndex.cs</Link> </SourcesRenderingverification>
-    <SourcesRenderingverification Include="$(CommonCodeLocation)\RenderingVerification\MasterMetadata.cs"> <Link>Test\RenderingVerification\MasterMetadata.cs</Link> </SourcesRenderingverification>
-  </ItemGroup>
-
-  <!-- Managed Resource Vscan -->
-  <ItemGroup>
-    <ManagedResourcesVscan Include="$(CommonCodeLocation)\RenderingVerification\DefaultTolerance.xml">
-      <LogicalName>Microsoft.Test.RenderingVerification.RenderingVerification.DefaultTolerance.xml</LogicalName>
-      <Link>Resources\VScan\DefaultTolerance.xml</Link>
-    </ManagedResourcesVscan>
-  </ItemGroup>
-
-  <!-- Compression -->
-  <ItemGroup>
-    <SourcesCompression Include="$(CommonCodeLocation)\Compression\Archiver.cs"> <Link>Test\Compression\Archiver.cs</Link> </SourcesCompression>
-    <SourcesCompression Include="$(CommonCodeLocation)\Compression\Cab\Cab.cs"> <Link>Test\Compression\Cab\Cab.cs</Link> </SourcesCompression>
-    <SourcesCompression Include="$(CommonCodeLocation)\Compression\Cab\CabApi.cs"> <Link>Test\Compression\Cab\CabApi.cs</Link> </SourcesCompression>
-    <SourcesCompression Include="$(CommonCodeLocation)\Compression\Cab\CabBase.cs"> <Link>Test\Compression\Cab\CabBase.cs</Link> </SourcesCompression>
-    <SourcesCompression Include="$(CommonCodeLocation)\Compression\Cab\CabCreator.cs"> <Link>Test\Compression\Cab\CabCreator.cs</Link> </SourcesCompression>
-    <SourcesCompression Include="$(CommonCodeLocation)\Compression\Cab\CabException.cs"> <Link>Test\Compression\Cab\CabException.cs</Link> </SourcesCompression>
-    <SourcesCompression Include="$(CommonCodeLocation)\Compression\Cab\CabExtractor.cs"> <Link>Test\Compression\Cab\CabExtractor.cs</Link> </SourcesCompression>
-    <SourcesCompression Include="$(CommonCodeLocation)\Compression\Cab\CabInfo.cs"> <Link>Test\Compression\Cab\CabInfo.cs</Link> </SourcesCompression>
-    <SourcesCompression Include="$(CommonCodeLocation)\Compression\Cab\CabStatus.cs"> <Link>Test\Compression\Cab\CabStatus.cs</Link> </SourcesCompression>
-    <SourcesCompression Include="$(CommonCodeLocation)\Compression\Cab\DuplicateStream.cs"> <Link>Test\Compression\Cab\DuplicateStream.cs</Link> </SourcesCompression>
-    <SourcesCompression Include="$(CommonCodeLocation)\Compression\Cab\HandleManager.cs"> <Link>Test\Compression\Cab\HandleManager.cs</Link> </SourcesCompression>
-    <SourcesCompression Include="$(CommonCodeLocation)\Compression\Cab\OffsetStream.cs"> <Link>Test\Compression\Cab\OffsetStream.cs</Link> </SourcesCompression>
-  </ItemGroup>
-
-  <!-- Graphics Base -->
-  <ItemGroup>
-    <SourcesGraphicsBase Include="$(CommonCodeLocation)\Graphics\ColorOperations.cs"> <Link>Test\Graphics\ColorOperations.cs</Link> </SourcesGraphicsBase>
-    <SourcesGraphicsBase Include="$(CommonCodeLocation)\Graphics\DiscreteAnimation.cs"> <Link>Test\Graphics\DiscreteAnimation.cs</Link> </SourcesGraphicsBase>
-    <SourcesGraphicsBase Include="$(CommonCodeLocation)\Graphics\MathEx.cs"> <Link>Test\Graphics\MathEx.cs</Link> </SourcesGraphicsBase>
-    <SourcesGraphicsBase Include="$(CommonCodeLocation)\Graphics\Matrix3DAnimation.cs"> <Link>Test\Graphics\Matrix3DAnimation.cs</Link> </SourcesGraphicsBase>
-    <SourcesGraphicsBase Include="$(CommonCodeLocation)\Graphics\MatrixUtils.cs"> <Link>Test\Graphics\MatrixUtils.cs</Link> </SourcesGraphicsBase>
-    <SourcesGraphicsBase Include="$(CommonCodeLocation)\Graphics\MeshOperations.cs"> <Link>Test\Graphics\MeshOperations.cs</Link> </SourcesGraphicsBase>
-    <SourcesGraphicsBase Include="$(CommonCodeLocation)\Graphics\ObjectUtils.cs"> <Link>Test\Graphics\ObjectUtils.cs</Link> </SourcesGraphicsBase>
-    <SourcesGraphicsBase Include="$(CommonCodeLocation)\Graphics\StringConverter.cs"> <Link>Test\Graphics\StringConverter.cs</Link> </SourcesGraphicsBase>
-    <SourcesGraphicsBase Include="$(CommonCodeLocation)\Graphics\VisualUtils.cs"> <Link>Test\Graphics\VisualUtils.cs</Link> </SourcesGraphicsBase>
-    <SourcesGraphicsBase Include="$(CommonCodeLocation)\Graphics\DpiScalingHelper.cs"> <Link>Test\Graphics\DpiScalingHelper.cs</Link> </SourcesGraphicsBase>
-    <SourcesGraphicsBase Include="$(CommonCodeLocation)\Graphics\RenderingModeHelper.cs"> <Link>Test\Graphics\RenderingModeHelper.cs</Link> </SourcesGraphicsBase>
-    <SourcesGraphicsBase Include="$(CommonCodeLocation)\Graphics\RenderingMode.cs"> <Link>Test\Graphics\RenderingMode.cs</Link> </SourcesGraphicsBase>
-  </ItemGroup>
-
-  <!-- Graphics Factories -->
-  <ItemGroup>
-    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\BrushFactory.cs"> <Link>Test\Graphics\Factories\BrushFactory.cs</Link> </SourcesGraphicsFactories>
-    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\CameraFactory.cs"> <Link>Test\Graphics\Factories\CameraFactory.cs</Link> </SourcesGraphicsFactories>
-    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\Const.cs"> <Link>Test\Graphics\Factories\Const.cs</Link> </SourcesGraphicsFactories>
-    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\Const2D.cs"> <Link>Test\Graphics\Factories\Const2D.cs</Link> </SourcesGraphicsFactories>
-    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\DrawingFactory.cs"> <Link>Test\Graphics\Factories\DrawingFactory.cs</Link> </SourcesGraphicsFactories>
-    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\EffectFactory.cs"> <Link>Test\Graphics\Factories\EffectFactory.cs</Link> </SourcesGraphicsFactories>
-    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\EffectInputFactory.cs"> <Link>Test\Graphics\Factories\EffectInputFactory.cs</Link> </SourcesGraphicsFactories>
-    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\GeometryFactory.cs"> <Link>Test\Graphics\Factories\GeometryFactory.cs</Link> </SourcesGraphicsFactories>
-    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\HitTestFilterFactory.cs"> <Link>Test\Graphics\Factories\HitTestFilterFactory.cs</Link> </SourcesGraphicsFactories>
-    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\LightFactory.cs"> <Link>Test\Graphics\Factories\LightFactory.cs</Link> </SourcesGraphicsFactories>
-    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\MaterialFactory.cs"> <Link>Test\Graphics\Factories\MaterialFactory.cs</Link> </SourcesGraphicsFactories>
-    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\MeshFactory.cs"> <Link>Test\Graphics\Factories\MeshFactory.cs</Link> </SourcesGraphicsFactories>
-    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\ModelFactory.cs"> <Link>Test\Graphics\Factories\ModelFactory.cs</Link> </SourcesGraphicsFactories>
-    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\ObjectFactory.cs"> <Link>Test\Graphics\Factories\ObjectFactory.cs</Link> </SourcesGraphicsFactories>
-    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\PenFactory.cs"> <Link>Test\Graphics\Factories\PenFactory.cs</Link> </SourcesGraphicsFactories>
-    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\SceneFactory.cs"> <Link>Test\Graphics\Factories\SceneFactory.cs</Link> </SourcesGraphicsFactories>
-    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\ShapeFactory.cs"> <Link>Test\Graphics\Factories\ShapeFactory.cs</Link> </SourcesGraphicsFactories>
-    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\Transform2DFactory.cs"> <Link>Test\Graphics\Factories\Transform2DFactory.cs</Link> </SourcesGraphicsFactories>
-    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\TransformFactory.cs"> <Link>Test\Graphics\Factories\TransformFactory.cs</Link> </SourcesGraphicsFactories>
-    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\Visual3DFactory.cs"> <Link>Test\Graphics\Factories\Visual3DFactory.cs</Link> </SourcesGraphicsFactories>
-    <SourcesGraphicsFactories Include="$(CommonCodeLocation)\Graphics\Factories\VisualFactory.cs"> <Link>Test\Graphics\Factories\VisualFactory.cs</Link> </SourcesGraphicsFactories>
-  </ItemGroup>
-
-  <!-- Graphics Reference Renderer -->
-  <ItemGroup>
-    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\BiLinearTextureFilter.cs"> <Link>Test\Graphics\ReferenceRender\BiLinearTextureFilter.cs</Link> </SourcesGraphicsReferenceRender>
-    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\Edge.cs"> <Link>Test\Graphics\ReferenceRender\Edge.cs</Link> </SourcesGraphicsReferenceRender>
-    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\GouraudShader.cs"> <Link>Test\Graphics\ReferenceRender\GouraudShader.cs</Link> </SourcesGraphicsReferenceRender>
-    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\HdrColor.cs"> <Link>Test\Graphics\ReferenceRender\HdrColor.cs</Link> </SourcesGraphicsReferenceRender>
-    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\Interpolators.cs"> <Link>Test\Graphics\ReferenceRender\Interpolators.cs</Link> </SourcesGraphicsReferenceRender>
-    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\LightEquations.cs"> <Link>Test\Graphics\ReferenceRender\LightEquations.cs</Link> </SourcesGraphicsReferenceRender>
-    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\MeshProjectedGeometry.cs"> <Link>Test\Graphics\ReferenceRender\MeshProjectedGeometry.cs</Link> </SourcesGraphicsReferenceRender>
-    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\ModelBounder.cs"> <Link>Test\Graphics\ReferenceRender\ModelBounder.cs</Link> </SourcesGraphicsReferenceRender>
-    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\ModelRenderer.cs"> <Link>Test\Graphics\ReferenceRender\ModelRenderer.cs</Link> </SourcesGraphicsReferenceRender>
-    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\NearestNeighbourTextureFilter.cs"> <Link>Test\Graphics\ReferenceRender\NearestNeighbourTextureFilter.cs</Link> </SourcesGraphicsReferenceRender>
-    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\PhongShader.cs"> <Link>Test\Graphics\ReferenceRender\PhongShader.cs</Link> </SourcesGraphicsReferenceRender>
-    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\ProjectedGeometry.cs"> <Link>Test\Graphics\ReferenceRender\ProjectedGeometry.cs</Link> </SourcesGraphicsReferenceRender>
-    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\RenderBuffer.cs"> <Link>Test\Graphics\ReferenceRender\RenderBuffer.cs</Link> </SourcesGraphicsReferenceRender>
-    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\RenderTolerance.cs"> <Link>Test\Graphics\ReferenceRender\RenderTolerance.cs</Link> </SourcesGraphicsReferenceRender>
-    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\RenderToToleranceShader.cs"> <Link>Test\Graphics\ReferenceRender\RenderToToleranceShader.cs</Link> </SourcesGraphicsReferenceRender>
-    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\RenderVerifier.cs"> <Link>Test\Graphics\ReferenceRender\RenderVerifier.cs</Link> </SourcesGraphicsReferenceRender>
-    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\SceneRenderer.cs"> <Link>Test\Graphics\ReferenceRender\SceneRenderer.cs</Link> </SourcesGraphicsReferenceRender>
-    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\Shader.cs"> <Link>Test\Graphics\ReferenceRender\Shader.cs</Link> </SourcesGraphicsReferenceRender>
-    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\SolidColorTextureFilter.cs"> <Link>Test\Graphics\ReferenceRender\SolidColorTextureFilter.cs</Link> </SourcesGraphicsReferenceRender>
-    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\SSLProjectedGeometry.cs"> <Link>Test\Graphics\ReferenceRender\SSLProjectedGeometry.cs</Link> </SourcesGraphicsReferenceRender>
-    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\TextureFilter.cs"> <Link>Test\Graphics\ReferenceRender\TextureFilter.cs</Link> </SourcesGraphicsReferenceRender>
-    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\TextureGenerator.cs"> <Link>Test\Graphics\ReferenceRender\TextureGenerator.cs</Link> </SourcesGraphicsReferenceRender>
-    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\Triangle.cs"> <Link>Test\Graphics\ReferenceRender\Triangle.cs</Link> </SourcesGraphicsReferenceRender>
-    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\TriLinearTextureFilter.cs"> <Link>Test\Graphics\ReferenceRender\TriLinearTextureFilter.cs</Link> </SourcesGraphicsReferenceRender>
-    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\Vertex.cs"> <Link>Test\Graphics\ReferenceRender\Vertex.cs</Link> </SourcesGraphicsReferenceRender>
-    <SourcesGraphicsReferenceRender Include="$(CommonCodeLocation)\Graphics\ReferenceRender\VisualBounder.cs"> <Link>Test\Graphics\ReferenceRender\VisualBounder.cs</Link> </SourcesGraphicsReferenceRender>
-  </ItemGroup>
-
-  <!-- Graphics Test Types -->
-  <ItemGroup>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\AnimationAPITest.cs"> <Link>Test\Graphics\TestTypes\AnimationAPITest.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\AnimationAPITestBase.cs"> <Link>Test\Graphics\TestTypes\AnimationAPITestBase.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\ClassGenerator.cs"> <Link>Test\Graphics\TestTypes\ClassGenerator.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\CodeGenerator.cs"> <Link>Test\Graphics\TestTypes\CodeGenerator.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\ConstructorGenerator.cs"> <Link>Test\Graphics\TestTypes\ConstructorGenerator.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\CoreGraphicsTest.cs"> <Link>Test\Graphics\TestTypes\CoreGraphicsTest.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\EnvironmentWrapper.cs"> <Link>Test\Graphics\TestTypes\EnvironmentWrapper.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\ExceptionCatchingTest.cs"> <Link>Test\Graphics\TestTypes\ExceptionCatchingTest.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\Exceptions.cs"> <Link>Test\Graphics\TestTypes\Exceptions.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\FactoryParser.cs"> <Link>Test\Graphics\TestTypes\FactoryParser.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\InfoOrganizer.cs"> <Link>Test\Graphics\TestTypes\InfoOrganizer.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\InheritanceChecker.cs"> <Link>Test\Graphics\TestTypes\InheritanceChecker.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\Interop.cs"> <Link>Test\Graphics\TestTypes\Interop.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\Logger.cs"> <Link>Test\Graphics\TestTypes\Logger.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\MethodGenerator.cs"> <Link>Test\Graphics\TestTypes\MethodGenerator.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\MethodGeneratorBase.cs"> <Link>Test\Graphics\TestTypes\MethodGeneratorBase.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\PartialTrust.cs"> <Link>Test\Graphics\TestTypes\PartialTrust.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\PhotoConverter.cs"> <Link>Test\Graphics\TestTypes\PhotoConverter.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\Photographer.cs"> <Link>Test\Graphics\TestTypes\Photographer.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\PropertyGenerator.cs"> <Link>Test\Graphics\TestTypes\PropertyGenerator.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\ReferenceTest.cs"> <Link>Test\Graphics\TestTypes\ReferenceTest.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\RenderingTest.cs"> <Link>Test\Graphics\TestTypes\RenderingTest.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\RenderingWindow.cs"> <Link>Test\Graphics\TestTypes\RenderingWindow.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\RunAllTester.cs"> <Link>Test\Graphics\TestTypes\RunAllTester.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\RunScriptTester.cs"> <Link>Test\Graphics\TestTypes\RunScriptTester.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\SerializationTest.cs"> <Link>Test\Graphics\TestTypes\SerializationTest.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\Tester.cs"> <Link>Test\Graphics\TestTypes\Tester.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\TestLauncher.cs"> <Link>Test\Graphics\TestTypes\TestLauncher.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\TestObjects.cs"> <Link>Test\Graphics\TestTypes\TestObjects.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\Tokens.cs"> <Link>Test\Graphics\TestTypes\Tokens.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\Variation.cs"> <Link>Test\Graphics\TestTypes\Variation.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\ViewportWindow.cs"> <Link>Test\Graphics\TestTypes\ViewportWindow.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\VisualObjects.cs"> <Link>Test\Graphics\TestTypes\VisualObjects.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\VisualVerificationTest.cs"> <Link>Test\Graphics\TestTypes\VisualVerificationTest.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\VisualWindow.cs"> <Link>Test\Graphics\TestTypes\VisualWindow.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\VisualWrapper.cs"> <Link>Test\Graphics\TestTypes\VisualWrapper.cs</Link> </SourcesGraphicsTestTypes>
-    <SourcesGraphicsTestTypes Include="$(CommonCodeLocation)\Graphics\TestTypes\XAMLTest.cs"> <Link>Test\Graphics\TestTypes\XAMLTest.cs</Link> </SourcesGraphicsTestTypes>
-  </ItemGroup>
-
-  <!-- Graphics -->
-  <ItemGroup>
-    <SourcesGraphics Include="@(SourcesGraphicsBase)" />
-    <SourcesGraphics Include="@(SourcesGraphicsFactories)" />
-    <SourcesGraphics Include="@(SourcesGraphicsReferenceRender)" />
-    <SourcesGraphics Include="@(SourcesGraphicsTestTypes)" />
-  </ItemGroup>
-
-  <!-- Layout Common -->
-  <ItemGroup>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\Common\Common.cs"> <Link>Test\Layout\Common\Common.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\Common\LayoutTestWindows.cs"> <Link>Test\Layout\Common\LayoutTestWindows.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\Common\LayoutUtility.cs"> <Link>Test\Layout\Common\LayoutUtility.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\Common\DoubleUtil.cs"> <Link>Test\Layout\Common\DoubleUtil.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\Common\VisualScan.cs"> <Link>Test\Layout\Common\VisualScan.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\TestTypes\LayoutTest.cs"> <Link>Test\Layout\TestTypes\LayoutTest.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\TestTypes\CodeTest.cs"> <Link>Test\Layout\TestTypes\CodeTest.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\TestTypes\PropertyDumpTest.cs"> <Link>Test\Layout\TestTypes\PropertyDumpTest.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\TestTypes\VisualScanTest.cs"> <Link>Test\Layout\TestTypes\VisualScanTest.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\Arguments.cs"> <Link>Test\Layout\PropertyDump\Arguments.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\DiffPackage.cs"> <Link>Test\Layout\PropertyDump\DiffPackage.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\Filter.cs"> <Link>Test\Layout\PropertyDump\Filter.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\FrameworkElements.cs"> <Link>Test\Layout\PropertyDump\FrameworkElements.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\Package.cs"> <Link>Test\Layout\PropertyDump\Package.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\PropertyDumpCore.cs"> <Link>Test\Layout\PropertyDump\PropertyDumpCore.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\PropertyDumpHelper.cs"> <Link>Test\Layout\PropertyDump\PropertyDumpHelper.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\ColumnResultW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\ColumnResultW.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\ContainerParagraphResultW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\ContainerParagraphResultW.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\DocumentPageTextViewW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\DocumentPageTextViewW.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\FloaterParagraphResultW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\FloaterParagraphResultW.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\FigureParagraphResultW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\FigureParagraphResultW.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\FlowDocumentPageW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\FlowDocumentPageW.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\IEnumerableW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\IEnumerableW.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\LineResultDetailsW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\LineResultDetailsW.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\LineResultW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\LineResultW.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\OrientedTextPositionW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\OrientedTextPositionW.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\ParagraphResultW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\ParagraphResultW.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\ReflectionHelper.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\ReflectionHelper.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\RowParagraphResultW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\RowParagraphResultW.cs</Link> </SourcesLayoutCommon>    
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\SubpageParagraphResultW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\SubpageParagraphResultW.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\TableParagraphResultW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\TableParagraphResultW.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\TextDocumentViewW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\TextDocumentViewW.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\TextParagraphResultW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\TextParagraphResultW.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\TextParagraphViewW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\TextParagraphViewW.cs</Link> </SourcesLayoutCommon>
-    <SourcesLayoutCommon Include="$(CommonCodeLocation)\Layout\PropertyDump\TextViewWrapper\UIElementParagraphResultW.cs"> <Link>Test\Layout\PropertyDump\TextViewWrapper\UIElementParagraphResultW.cs</Link> </SourcesLayoutCommon>
-  </ItemGroup>
-
-  <!-- Stress Framework -->
-  <ItemGroup>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\DistributionFactory.cs"> <Link>Test\Stability\Stress\DistributionFactory.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\RandDist.cs"> <Link>Test\Stability\Stress\RandDist.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\RandomGenerator.cs"> <Link>Test\Stability\Stress\RandomGenerator.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Invariant.cs"> <Link>Test\Stability\Stress\Invariant.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\StressFrameWorkHelper.cs"> <Link>Test\Stability\Stress\StressFrameWorkHelper.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\WeightedList.cs"> <Link>Test\Stability\Stress\WeightedList.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Action\ActionManager.cs"> <Link>Test\Stability\Stress\Action\ActionManager.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Action\Attributes.cs"> <Link>Test\Stability\Stress\Action\Attributes.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Action\IAction.cs"> <Link>Test\Stability\Stress\Action\IAction.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Action\IActionFactory.cs"> <Link>Test\Stability\Stress\Action\IActionFactory.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Action\WeightedActionFactory.cs"> <Link>Test\Stability\Stress\Action\WeightedActionFactory.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\ConfigReader\ConfigReader.cs"> <Link>Test\Stability\Stress\ConfigReader\ConfigReader.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\ConfigReader\IConfigReader.cs"> <Link>Test\Stability\Stress\ConfigReader\IConfigReader.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\ConfigReader\MultipleTagSectionHandler.cs"> <Link>Test\Stability\Stress\ConfigReader\MultipleTagSectionHandler.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Context\ActionHandlers.cs"> <Link>Test\Stability\Stress\Context\ActionHandlers.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Context\EventHandlers.cs"> <Link>Test\Stability\Stress\Context\EventHandlers.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Context\EventArgs.cs"> <Link>Test\Stability\Stress\Context\EventArgs.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Context\Handlers.cs"> <Link>Test\Stability\Stress\Context\Handlers.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Context\IStressContext.cs"> <Link>Test\Stability\Stress\Context\IStressContext.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Context\IStressContextManager.cs"> <Link>Test\Stability\Stress\Context\IStressContextManager.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Context\StressContext.cs"> <Link>Test\Stability\Stress\Context\StressContext.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Context\StressContextManager.cs"> <Link>Test\Stability\Stress\Context\StressContextManager.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Context\IObjectFactory.cs"> <Link>Test\Stability\Stress\Context\IObjectFactory.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Context\EnumerationObjectFactory.cs"> <Link>Test\Stability\Stress\Context\EnumerationObjectFactory.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Context\ReflectionObjectFactory.cs"> <Link>Test\Stability\Stress\Context\ReflectionObjectFactory.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\CoreServices\CoreServices.cs"> <Link>Test\Stability\Stress\CoreServices\CoreServices.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\CoreServices\ICoreServices.cs"> <Link>Test\Stability\Stress\CoreServices\ICoreServices.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\CoreServices\IStressManager.cs"> <Link>Test\Stability\Stress\CoreServices\IStressManager.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\CoreServices\StressManager.cs"> <Link>Test\Stability\Stress\CoreServices\StressManager.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\CoreServices\EventLogger.cs"> <Link>Test\Stability\Stress\CoreServices\EventLogger.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Exceptions\ExceptionEventArgs.cs"> <Link>Test\Stability\Stress\Exceptions\ExceptionEventArgs.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Exceptions\ExceptionEventHandlers.cs"> <Link>Test\Stability\Stress\Exceptions\ExceptionEventHandlers.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\PropertyEngine\PropertyEngine.cs"> <Link>Test\Stability\Stress\PropertyEngine\PropertyEngine.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Storage\ContextStorage.cs"> <Link>Test\Stability\Stress\Storage\ContextStorage.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Storage\EventArgs.cs"> <Link>Test\Stability\Stress\Storage\EventArgs.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Storage\IStorage.cs"> <Link>Test\Stability\Stress\Storage\IStorage.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\StressFrameworkObject\IStressFrameworkObject.cs"> <Link>Test\Stability\Stress\StressFrameworkObject\IStressFrameworkObject.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\StressFrameworkObject\StressFrameworkObject.cs"> <Link>Test\Stability\Stress\StressFrameworkObject\StressFrameworkObject.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Security\SecurityHelper.cs"> <Link>Test\Stability\Stress\Security\SecurityHelper.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Thread\EventArgs.cs"> <Link>Test\Stability\Stress\Thread\EventArgs.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Thread\EventHandlers.cs"> <Link>Test\Stability\Stress\Thread\EventHandlers.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Thread\IStressThread.cs"> <Link>Test\Stability\Stress\Thread\IStressThread.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Thread\IStressThreadManager.cs"> <Link>Test\Stability\Stress\Thread\IStressThreadManager.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Thread\StressThread.cs"> <Link>Test\Stability\Stress\Thread\StressThread.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Thread\StressThreadManager.cs"> <Link>Test\Stability\Stress\Thread\StressThreadManager.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Utils\ProcessShutdownMonitor.cs"> <Link>Test\Stability\Stress\Utils\ProcessShutdownMonitor.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Utils\Win32NativeInterop.cs"> <Link>Test\Stability\Stress\Utils\Win32NativeInterop.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Utils\CommandlineParser.cs"> <Link>Test\Stability\Stress\Utils\CommandlineParser.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\Utils\XmlParser.cs"> <Link>Test\Stability\Stress\Utils\XmlParser.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\IEHelper\DISPIDs.cs"> <Link>Test\Stability\Stress\IEHelper\DISPIDs.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\IEHelper\IEInterop.cs"> <Link>Test\Stability\Stress\IEHelper\IEInterop.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Stability\Stress\IEHelper\Rtl.cs"> <Link>Test\Stability\Stress\IEHelper\Rtl.cs</Link> </SourcesStressFramework>
-    <SourcesStressFramework Include="$(CommonCodeLocation)\Collections\Generics\WeightedList.cs"> <Link>Test\Collections\Generics\WeightedList.cs</Link> </SourcesStressFramework>
-  </ItemGroup>
-
-  <!-- Stress Framework -->
-  <ItemGroup>
-    <SourcesStressFrameworkAvalonProxy Include="$(CommonCodeLocation)\Stability\Stress\AvalonProxy\AssemblyCacheEnum.cs"> <Link>Test\Stability\Stress\AvalonProxy\AssemblyCacheEnum.cs</Link> </SourcesStressFrameworkAvalonProxy>
-    <SourcesStressFrameworkAvalonProxy Include="$(CommonCodeLocation)\Stability\Stress\AvalonProxy\AvalonActionManager.cs"> <Link>Test\Stability\Stress\AvalonProxy\AvalonActionManager.cs</Link> </SourcesStressFrameworkAvalonProxy>
-    <SourcesStressFrameworkAvalonProxy Include="$(CommonCodeLocation)\Stability\Stress\AvalonProxy\AvalonStressContext.cs"> <Link>Test\Stability\Stress\AvalonProxy\AvalonStressContext.cs</Link> </SourcesStressFrameworkAvalonProxy>
-    <SourcesStressFrameworkAvalonProxy Include="$(CommonCodeLocation)\Stability\Stress\AvalonProxy\AvalonStressContextManager.cs"> <Link>Test\Stability\Stress\AvalonProxy\AvalonStressContextManager.cs</Link> </SourcesStressFrameworkAvalonProxy>
-    <SourcesStressFrameworkAvalonProxy Include="$(CommonCodeLocation)\Stability\Stress\AvalonProxy\AvalonStressThreadManager.cs"> <Link>Test\Stability\Stress\AvalonProxy\AvalonStressThreadManager.cs</Link> </SourcesStressFrameworkAvalonProxy>
-    <SourcesStressFrameworkAvalonProxy Include="$(CommonCodeLocation)\Stability\Stress\AvalonProxy\MemoryChecker.cs"> <Link>Test\Stability\Stress\AvalonProxy\MemoryChecker.cs</Link> </SourcesStressFrameworkAvalonProxy>
-    <SourcesStressFrameworkAvalonProxy Include="$(CommonCodeLocation)\Stability\Stress\AvalonProxy\AvalonStressFrameworkHelper.cs"> <Link>Test\Stability\Stress\AvalonProxy\AvalonStressFrameworkHelper.cs</Link> </SourcesStressFrameworkAvalonProxy>
-    <SourcesStressFrameworkAvalonProxy Include="$(CommonCodeLocation)\Stability\Stress\AvalonProxy\BrowserStressContext.cs"> <Link>Test\Stability\Stress\AvalonProxy\BrowserStressContext.cs</Link> </SourcesStressFrameworkAvalonProxy>
-    <SourcesStressFrameworkAvalonProxy Include="$(CommonCodeLocation)\Stability\Stress\AvalonProxy\BrowserStressContextManager.cs"> <Link>Test\Stability\Stress\AvalonProxy\BrowserStressContextManager.cs</Link> </SourcesStressFrameworkAvalonProxy>
-    <SourcesStressFrameworkAvalonProxy Include="$(CommonCodeLocation)\Stability\Stress\AvalonProxy\BrowserStressThreadManager.cs"> <Link>Test\Stability\Stress\AvalonProxy\BrowserStressThreadManager.cs</Link> </SourcesStressFrameworkAvalonProxy>
-  </ItemGroup>
-
-  <!-- Stress Framework -->
-  <ItemGroup>
-    <SourcesStressFrameworkLonghaulProxy Include="$(CommonCodeLocation)\Stability\Stress\LonghaulProxy\LonghaulSQLConnect.cs"> <Link>Test\Stability\Stress\LonghaulProxy\LonghaulSQLConnect.cs</Link> </SourcesStressFrameworkLonghaulProxy>
-    <SourcesStressFrameworkLonghaulProxy Include="$(CommonCodeLocation)\Stability\Stress\LonghaulProxy\LonghaulCommon.cs"> <Link>Test\Stability\Stress\LonghaulProxy\LonghaulCommon.cs</Link> </SourcesStressFrameworkLonghaulProxy>
-    <SourcesStressFrameworkLonghaulProxy Include="$(CommonCodeLocation)\Stability\Stress\LonghaulProxy\LonghaulStateObjects.cs"> <Link>Test\Stability\Stress\LonghaulProxy\LonghaulStateObjects.cs</Link> </SourcesStressFrameworkLonghaulProxy>
-    <SourcesStressFrameworkLonghaulProxy Include="$(CommonCodeLocation)\Stability\Stress\LonghaulProxy\LonghaulStressContext.cs"> <Link>Test\Stability\Stress\LonghaulProxy\LonghaulStressContext.cs</Link> </SourcesStressFrameworkLonghaulProxy>
-    <SourcesStressFrameworkLonghaulProxy Include="$(CommonCodeLocation)\Stability\Stress\LonghaulProxy\LonghaulStressContextManager.cs"> <Link>Test\Stability\Stress\LonghaulProxy\LonghaulStressContextManager.cs</Link> </SourcesStressFrameworkLonghaulProxy>
-    <SourcesStressFrameworkLonghaulProxy Include="$(CommonCodeLocation)\Stability\Stress\LonghaulProxy\LonghaulStressThreadManager.cs"> <Link>Test\Stability\Stress\LonghaulProxy\LonghaulStressThreadManager.cs</Link> </SourcesStressFrameworkLonghaulProxy>
-    <SourcesStressFrameworkLonghaulProxy Include="$(CommonCodeLocation)\Stability\Stress\LonghaulProxy\LonghaulEventLog.cs"> <Link>Test\Stability\Stress\LonghaulProxy\LonghaulEventLog.cs</Link> </SourcesStressFrameworkLonghaulProxy>
-  </ItemGroup>
-
-  <!-- Stability Leak -->
-  <ItemGroup>
-    <SourcesStabilityLeak Include="$(CommonCodeLocation)\Stability\LeakUtility.cs"> <Link>Test\Stability\LeakUtility.cs</Link> </SourcesStabilityLeak>
-    <SourcesStabilityLeak Include="$(CommonCodeLocation)\Stability\Input.cs"> <Link>Test\Stability\Input.cs</Link> </SourcesStabilityLeak>
-  </ItemGroup>
-
-  <!-- Stress Graphics -->
-  <ItemGroup>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\AddNodes.cs"> <Link>Test\Stability\Stress\Graphics\AddNodes.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\AnimationFactory.cs"> <Link>Test\Stability\Stress\Graphics\AnimationFactory.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\Channel.cs"> <Link>Test\Stability\Stress\Graphics\Channel.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\ChannelFactory.cs"> <Link>Test\Stability\Stress\Graphics\ChannelFactory.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\CompositionActorFactory.cs"> <Link>Test\Stability\Stress\Graphics\CompositionActorFactory.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\ConnectDisconnect.cs"> <Link>Test\Stability\Stress\Graphics\ConnectDisconnect.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\ConnectDisconnectActorFactory.cs"> <Link>Test\Stability\Stress\Graphics\ConnectDisconnectActorFactory.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\ContainerVisual.cs"> <Link>Test\Stability\Stress\Graphics\ContainerVisual.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\DrawContextProvider.cs"> <Link>Test\Stability\Stress\Graphics\DrawContextProvider.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\GetHwndSources.cs"> <Link>Test\Stability\Stress\Graphics\GetHwndSources.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\GetProperties.cs"> <Link>Test\Stability\Stress\Graphics\GetProperties.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\GetPropertiesFactory.cs"> <Link>Test\Stability\Stress\Graphics\GetPropertiesFactory.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\HelperClass.cs"> <Link>Test\Stability\Stress\Graphics\HelperClass.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\HitTest.cs"> <Link>Test\Stability\Stress\Graphics\HitTest.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\HitTestFactory.cs"> <Link>Test\Stability\Stress\Graphics\HitTestFactory.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\HostVisual.cs"> <Link>Test\Stability\Stress\Graphics\HostVisual.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\HwndSourceCreator.cs"> <Link>Test\Stability\Stress\Graphics\HwndSourceCreator.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\IDrawContextProvider.cs"> <Link>Test\Stability\Stress\Graphics\IDrawContextProvider.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\IRootVisualHolder.cs"> <Link>Test\Stability\Stress\Graphics\IRootVisualHolder.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\ISurface.cs"> <Link>Test\Stability\Stress\Graphics\ISurface.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\IVisual.cs"> <Link>Test\Stability\Stress\Graphics\IVisual.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\IVisualProperties.cs"> <Link>Test\Stability\Stress\Graphics\IVisualProperties.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\Magnifier.cs"> <Link>Test\Stability\Stress\Graphics\Magnifier.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\MagnifierFactory.cs"> <Link>Test\Stability\Stress\Graphics\MagnifierFactory.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\MoveNode.cs"> <Link>Test\Stability\Stress\Graphics\MoveNode.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\NodeActor.cs"> <Link>Test\Stability\Stress\Graphics\NodeActor.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\NodeCreator.cs"> <Link>Test\Stability\Stress\Graphics\NodeCreator.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\R3DVisual.cs"> <Link>Test\Stability\Stress\Graphics\R3DVisual.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\Random.cs"> <Link>Test\Stability\Stress\Graphics\Random.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\RemoveNode.cs"> <Link>Test\Stability\Stress\Graphics\RemoveNode.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\RenderTargetBitmap.cs"> <Link>Test\Stability\Stress\Graphics\RenderTargetBitmap.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\RenderTargetBitmapFactory.cs"> <Link>Test\Stability\Stress\Graphics\RenderTargetBitmapFactory.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\RootVisualHolder.cs"> <Link>Test\Stability\Stress\Graphics\RootVisualHolder.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\RootVisualHolderActor.cs"> <Link>Test\Stability\Stress\Graphics\RootVisualHolderActor.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\SharedObjects.cs"> <Link>Test\Stability\Stress\Graphics\SharedObjects.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\TransformCreatorFactory.cs"> <Link>Test\Stability\Stress\Graphics\TransformCreatorFactory.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\TreeActor.cs"> <Link>Test\Stability\Stress\Graphics\TreeActor.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\TreeCreator.cs"> <Link>Test\Stability\Stress\Graphics\TreeCreator.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\TreeCreatorInitFactory.cs"> <Link>Test\Stability\Stress\Graphics\TreeCreatorInitFactory.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\TreeInitActor.cs"> <Link>Test\Stability\Stress\Graphics\TreeInitActor.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\UpdateProperties.cs"> <Link>Test\Stability\Stress\Graphics\UpdateProperties.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\UpdatePropertiesFactory.cs"> <Link>Test\Stability\Stress\Graphics\UpdatePropertiesFactory.cs</Link> </SourcesStressGraphics>
-    <SourcesStressGraphics Include="$(CommonCodeLocation)\Stability\Stress\Graphics\VisualTarget.cs"> <Link>Test\Stability\Stress\Graphics\VisualTarget.cs</Link> </SourcesStressGraphics>
-  </ItemGroup>
-
-  <!-- Performance  -->
-  <ItemGroup>
-    <SourcesPerformanceTesting Include="$(CommonCodeLocation)\Performance\CLRProfilerControl.cs"> <Link>Test\Performance\CLRProfilerControl.cs</Link> </SourcesPerformanceTesting>
-    <SourcesPerformanceTesting Include="$(CommonCodeLocation)\Performance\CustomTestAction.cs"> <Link>Test\Performance\CustomTestAction.cs</Link> </SourcesPerformanceTesting>
-    <SourcesPerformanceTesting Include="$(CommonCodeLocation)\Performance\InputPerf.cs"> <Link>Test\Performance\InputPerf.cs</Link> </SourcesPerformanceTesting>
-    <SourcesPerformanceTesting Include="$(CommonCodeLocation)\Performance\PerfActionHelper.cs"> <Link>Test\Performance\PerfActionHelper.cs</Link> </SourcesPerformanceTesting>
-    <SourcesPerformanceTesting Include="$(CommonCodeLocation)\Performance\TraceProvider.cs"> <Link>Test\Performance\TraceProvider.cs</Link> </SourcesPerformanceTesting>
-    <SourcesPerformanceTesting Include="$(CommonCodeLocation)\Performance\EventTrace.cs"> <Link>Test\Performance\EventTrace.cs</Link> </SourcesPerformanceTesting>
-    <SourcesPerformanceTesting Include="$(CommonCodeLocation)\Performance\EventType.cs"> <Link>Test\Performance\EventType.cs</Link> </SourcesPerformanceTesting>
-  </ItemGroup>
-
-  <!-- Performance Partial Trust -->
-  <ItemGroup>
-    <SourcesPerformanceTestingPartialTrust Include="$(CommonCodeLocation)\Performance\CLRProfilerControl.cs"> <Link>Test\Performance\CLRProfilerControl.cs</Link> </SourcesPerformanceTestingPartialTrust>
-    <SourcesPerformanceTestingPartialTrust Include="$(CommonCodeLocation)\Performance\CustomTestAction.cs"> <Link>Test\Performance\CustomTestAction.cs</Link> </SourcesPerformanceTestingPartialTrust>
-    <SourcesPerformanceTestingPartialTrust Include="$(CommonCodeLocation)\Performance\InputPerf_PartialTrust.cs"> <Link>Test\Performance\InputPerf_PartialTrust.cs</Link> </SourcesPerformanceTestingPartialTrust>
-    <SourcesPerformanceTestingPartialTrust Include="$(CommonCodeLocation)\Performance\PerfActionHelper.cs"> <Link>Test\Performance\PerfActionHelper.cs</Link> </SourcesPerformanceTestingPartialTrust>
-    <SourcesPerformanceTestingPartialTrust Include="$(CommonCodeLocation)\Performance\PerfTestTraceProvider.cs"> <Link>Test\Performance\PerfTestTraceProvider.cs</Link> </SourcesPerformanceTestingPartialTrust>
-  </ItemGroup>
-
-  <!-- Annotations -->
-  <ItemGroup>
-    <SourcesAnnotations Include="$(CommonCodeLocation)\Annotations\AnnotationsTestSettings.cs"> <Link>Test\Annotations\AnnotationsTestSettings.cs</Link> </SourcesAnnotations>
-    <SourcesAnnotations Include="$(CommonCodeLocation)\Annotations\Attributes.cs"> <Link>Test\Annotations\Attributes.cs</Link> </SourcesAnnotations>
-    <SourcesAnnotations Include="$(CommonCodeLocation)\Annotations\FastTestSuite.cs"> <Link>Test\Annotations\FastTestSuite.cs</Link> </SourcesAnnotations>
-    <SourcesAnnotations Include="$(CommonCodeLocation)\Annotations\TestSuite.cs"> <Link>Test\Annotations\TestSuite.cs</Link> </SourcesAnnotations>
-    <SourcesAnnotations Include="$(CommonCodeLocation)\Annotations\TestSuiteRunner.cs"> <Link>Test\Annotations\TestSuiteRunner.cs</Link> </SourcesAnnotations>
-    <SourcesAnnotations Include="$(CommonCodeLocation)\Annotations\UIAutomationModule.cs"> <Link>Test\Annotations\UIAutomationModule.cs</Link> </SourcesAnnotations>
-    <SourcesAnnotations Include="$(CommonCodeLocation)\Annotations\VisualAutomationTestSuite.cs"> <Link>Test\Annotations\VisualAutomationTestSuite.cs</Link> </SourcesAnnotations>
-    <SourcesAnnotations Include="$(CommonCodeLocation)\Annotations\VScanModule.cs"> <Link>Test\Annotations\VScanModule.cs</Link> </SourcesAnnotations>
-    <SourcesAnnotations Include="$(CommonCodeLocation)\Annotations\Internal\ALogger.cs"> <Link>Test\Annotations\Internal\ALogger.cs</Link> </SourcesAnnotations>
-    <SourcesAnnotations Include="$(CommonCodeLocation)\Annotations\Internal\TestCase.cs"> <Link>Test\Annotations\Internal\TestCase.cs</Link> </SourcesAnnotations>
-    <SourcesAnnotations Include="$(CommonCodeLocation)\Annotations\Internal\TestVariation.cs"> <Link>Test\Annotations\Internal\TestVariation.cs</Link> </SourcesAnnotations>
-  </ItemGroup>
-
-</Project>
diff --git a/eng/WpfArcadeSdk/tools/StrongName.props b/eng/WpfArcadeSdk/tools/StrongName.props
deleted file mode 100644
index 39b1310704d..00000000000
--- a/eng/WpfArcadeSdk/tools/StrongName.props
+++ /dev/null
@@ -1,17 +0,0 @@
-<Project>
-    <PropertyGroup>
-        <SignAssembly>false</SignAssembly>
-        <TestUntrustedKey>$(WpfTestBasePath)\Common\keys\TestUntrusted.snk</TestUntrustedKey>
-        <TestUntrustedPublicKey>0024000004800000940000000602000000240000525341310004000001000100C1BCD9B7844CD35725B1138216ED5E0FAB914676D580860F6F081C8C0E83B92D835FFAE76FA968F7637E4B6E32D77FEE1C084088CEE736CE589D65AD0FA66F086C2F5F755A6F2909D17C643B45C72A906AAAC617BFD67491A8FCE54784CA98317AEA28C0544546FF9123F6F94E59793F2874437BC3D136A40095D0F960E6A6A4</TestUntrustedPublicKey>
-        <TestUntrustedPublicKeyToken>A069DEE354D95F76</TestUntrustedPublicKeyToken>
-
-        <TestTrustedKey>$(WpfTestBasePath)\Common\keys\TestTrusted.snk</TestTrustedKey>
-        <TestTrustedPublicKey>00240000048000009400000006020000002400005253413100040000010001007FDB0774CDFEFC88AAA6613332E5BE12A11BD32ADB7E2EAD4C049CFFCC6284FA975CD55B0291738247984CFCF4074970C44C1DA29B07201B0F90FB7B2C60D2A604C4ABA9FBC106AD3D1838DAD496780B0E4518D045FE70C4DE4E9663354989CF9A2E4F9ADD41BFEF82437DA35C8B1C1A0D6DACB521456C4BB18BADA2BE7407C3</TestTrustedPublicKey>
-        <TestTrustedPublicKeyToken>e1e6160fdd198bb1</TestTrustedPublicKeyToken>
-        
-        <!-- Sign with the test key and ensure that we do not delay sign test code -->
-        <DelaySign>false</DelaySign>
-        <AssemblyOriginatorKeyFile Condition="'$(AssemblyOriginatorKeyFile)'==''">$(TestUntrustedKey)</AssemblyOriginatorKeyFile>
-        <StrongNameKeyId>custom</StrongNameKeyId>
-    </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/eng/WpfArcadeSdk/tools/StrongName.targets b/eng/WpfArcadeSdk/tools/StrongName.targets
deleted file mode 100644
index cfc73c73f7b..00000000000
--- a/eng/WpfArcadeSdk/tools/StrongName.targets
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project>
-  <PropertyGroup Condition="'$(SignAssembly)' == 'true' AND '$(AssemblyOriginatorKeyFile)' == '$(TestTrustedKey)'" >
-        <PublicKey>$(TestTrustedPublicKey)</PublicKey>
-        <PublicKeyToken>$(TestTrustedPublicKeyToken)</PublicKeyToken>
-  </PropertyGroup>
-  
-  <PropertyGroup Condition="'$(SignAssembly)' == 'true' AND '$(AssemblyOriginatorKeyFile)' == '$(TestUntrustedKey)'" >
-        <PublicKey>$(TestUntrustedPublicKey)</PublicKey>
-        <PublicKeyToken>$(TestUntrustedPublicKeyToken)</PublicKeyToken>
-  </PropertyGroup>
-</Project>
diff --git a/eng/WpfArcadeSdk/tools/TestProjects.targets b/eng/WpfArcadeSdk/tools/TestProjects.targets
index d5396b3a087..28dcf279bcb 100644
--- a/eng/WpfArcadeSdk/tools/TestProjects.targets
+++ b/eng/WpfArcadeSdk/tools/TestProjects.targets
@@ -7,7 +7,8 @@
   <PropertyGroup Condition="'$(IsTestProject)' == 'true' or '$(WpfTest)'=='true'">
     <TestArchitectures Condition="'$(PlatformTarget)' == '' or '$(PlatformTarget)' == 'AnyCpu'">x86</TestArchitectures>
     <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
-    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+    <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
+    <CopyLocalLockFileAssemblies Condition="'$(CreateTestPayload)'=='true'">true</CopyLocalLockFileAssemblies>
     <IsSelfContained>true</IsSelfContained>
   </PropertyGroup>
 
@@ -18,7 +19,8 @@
     -->
     <PackageReference Include="runtime.$(RuntimeIdentifier).$(MicrosoftDotNetWpfDncEngPackage)"
                       Condition="'$(RepositoryName)'=='wpf'"
-                      Version="$(MicrosoftDotNetWpfDncEngVersion)">
+                      Version="$(MicrosoftDotNetWpfDncEngVersion)"
+                      Publish="$(CreateTestPayload)">
       <CopyLocal>true</CopyLocal>
       <GeneratePathProperty>true</GeneratePathProperty>
     </PackageReference>
@@ -26,24 +28,24 @@
     <!-- 
       PackageReference from individual WPF projects here 
     -->
-    <PackageReference Include="$(SystemIOPackagingPackage)" Version="$(SystemIOPackagingVersion)" CopyLocal="true" />
+    <PackageReference Include="$(SystemIOPackagingPackage)" Version="$(SystemIOPackagingVersion)" Publish="$(CreateTestPayload)" />
     <PackageReference Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryPackageVersion)" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerPackageVersion)" CopyLocal="true"  />
-    <PackageReference Include="System.Diagnostics.EventLog" Version="$(SystemDiagnosticsEventLogPackageVersion)" CopyLocal="true" />
-    <PackageReference Include="System.Security.Cryptography.Xml" Version="$(SystemSecurityCryptographyXmlPackageVersion)" CopyLocal="true" />
-    <PackageReference Include="System.Security.Permissions" Version="$(SystemSecurityPermissionsPackageVersion)" CopyLocal="true" />
-    <PackageReference Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsPackageVersion)" CopyLocal="true" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerPackageVersion)" Publish="$(CreateTestPayload)"  />
+    <PackageReference Include="System.Diagnostics.EventLog" Version="$(SystemDiagnosticsEventLogPackageVersion)" Publish="$(CreateTestPayload)" />
+    <PackageReference Include="System.Security.Cryptography.Xml" Version="$(SystemSecurityCryptographyXmlPackageVersion)" Publish="$(CreateTestPayload)" />
+    <PackageReference Include="System.Security.Permissions" Version="$(SystemSecurityPermissionsPackageVersion)" Publish="$(CreateTestPayload)" />
+    <PackageReference Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsPackageVersion)" Publish="$(CreateTestPayload)" />
 
-    <PackageReference Include="System.Security.AccessControl" Version="$(SystemSecurityAccessControlPackageVersion)" CopyLocal="true" />
-    <PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsPackageVersion)" CopyLocal="true" />
+    <PackageReference Include="System.Security.AccessControl" Version="$(SystemSecurityAccessControlPackageVersion)" Publish="$(CreateTestPayload)" />
+    <PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsPackageVersion)" Publish="$(CreateTestPayload)" />
 
 
 
     <!-- These exist to ensure that dependencies (esp. native ones) are binplaced with tests correctly -->
-    <None Condition="'$(RuntimeIdentifier)'=='win-x64'"
+    <None Condition="'$(RuntimeIdentifier)'=='win-x64' And '$(CreateTestPayload)'=='true'"
           Include="$(Pkgruntime_win-x64_Microsoft_DotNet_Wpf_DncEng)\runtimes\$(RuntimeIdentifier)\native\*.dll"
           CopyToOutputDirectory="PreserveNewest"/>
-    <None Condition="'$(RuntimeIdentifier)'=='win-x86'"
+    <None Condition="'$(RuntimeIdentifier)'=='win-x86' And '$(CreateTestPayload)'=='true'"
            Include="$(Pkgruntime_win-x86_Microsoft_DotNet_Wpf_DncEng)\runtimes\$(RuntimeIdentifier)\native\*.dll"
           CopyToOutputDirectory="PreserveNewest"/>
 
diff --git a/eng/helix/configure-helix-machine.ps1 b/eng/helix/configure-helix-machine.ps1
deleted file mode 100644
index 4f20fb2866a..00000000000
--- a/eng/helix/configure-helix-machine.ps1
+++ /dev/null
@@ -1,30 +0,0 @@
-# This file prepares the helix machine for our tests runs
-$dotnetLocation = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "dotnet"
-
-# Set DOTNET_ROOT variables so the host can find it
-Set-Item -Path "env:DOTNET_ROOT(x86)" -Value $dotnetLocation
-Set-Item -Path "env:DOTNET_ROOT" -Value $dotnetLocation
-
-$runtimes = dotnet --list-runtimes
-foreach ($rt in $runtimes)
-{
-    if ($rt.StartsWith("Microsoft.WindowsDesktop.App"))
-    {
-        $version = $rt.Split(" ")[1]
-    }
-}
-
-# Rewrite the *.runtimeconfig.json files to match the version of the runtime on the machine
-$infraLocation = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "Test\Infra"
-$stiConfigFile = Join-Path $infraLocation "Sti.runtimeconfig.json"
-$qvConfigFile = Join-Path $infraLocation "QualityVaultFrontEnd.runtimeconfig.json"
-$configFiles = $stiConfigFile, $qvConfigFile
-foreach ($config in $configFiles)
-{
-    # Read current config file
-    $jsondata = Get-Content -Raw -Path $config | ConvertFrom-Json
-    # Update version
-    $jsondata.runtimeOptions.framework.version = $version
-    # Write data back
-    $jsondata | ConvertTo-Json -depth 100 | Set-Content $config
-}
\ No newline at end of file
diff --git a/eng/helix/prepare-helix-payload.ps1 b/eng/helix/prepare-helix-payload.ps1
deleted file mode 100644
index 9f382820f4a..00000000000
--- a/eng/helix/prepare-helix-payload.ps1
+++ /dev/null
@@ -1,49 +0,0 @@
-[CmdLetBinding()]
-Param(
-    [string]$platform,
-    [string]$configuration
-)
-
-$payloadDir = "HelixPayload\$configuration\$platform"
-
-$nugetPackagesDir = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "packages"
-
-# Create the payload directory. Remove it if it already exists.
-if(Test-Path $payloadDir)
-{
-    Remove-Item $payloadDir -Recurse
-}
-New-Item -ItemType Directory -Force -Path $payloadDir
-
-function CopyFolderStructure($from, $to)
-{
-    if(Test-Path $to)
-    {
-        Remove-Item $to -Recurse
-    }
-    New-Item -ItemType Directory -Force -Path $to
-
-    if (Test-Path $from)
-    {
-        Get-ChildItem $from | Copy-Item -Destination $to -Recurse 
-    }
-    else
-    {
-        Write-Output "Location doesn't exist: $from"
-    }
-}
-
-# Copy files from nuget packages.
-$testNugetLocation = Resolve-Path (Join-Path $nugetPackagesDir "runtime.win-$platform.Microsoft.DotNet.Wpf.Test\*\tools\win-$platform\Test")
-$testPayloadLocation = Join-Path $payloadDir "Test"
-CopyFolderStructure $testNugetLocation $testPayloadLocation
-
-# Copy local DRT assemblies to test location
-$drtArtifactsLocation = [System.IO.Path]::Combine($env:BUILD_SOURCESDIRECTORY, "artifacts\test", $configuration, $platform, "Test\DRT")
-$drtPayloadLocation = Join-Path $payloadDir "Test\DRT"
-CopyFolderStructure $drtArtifactsLocation $drtPayloadLocation
-
-# Copy scripts
-Copy-Item "eng\helix\configure-helix-machine.ps1" $payloadDir
-Copy-Item "eng\helix\runtests.ps1" $payloadDir
-Copy-Item "eng\helix\runtests.cmd" $payloadDir
diff --git a/eng/helix/runtests.cmd b/eng/helix/runtests.cmd
deleted file mode 100644
index c7b6190b9f2..00000000000
--- a/eng/helix/runtests.cmd
+++ /dev/null
@@ -1,3 +0,0 @@
-@echo off
-
-powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0runtests.ps1"""  %*"
\ No newline at end of file
diff --git a/eng/helix/runtests.ps1 b/eng/helix/runtests.ps1
deleted file mode 100644
index 55d4395441a..00000000000
--- a/eng/helix/runtests.ps1
+++ /dev/null
@@ -1,26 +0,0 @@
-[CmdLetBinding()]
-Param(
-    [string]$command
-)
-
-# Configure the machine before running tests
-. "$PSScriptRoot\configure-helix-machine.ps1"
-
-# Run the tests
-$testLocation = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "Test"
-if (Test-Path "$testLocation\rundrts.cmd")
-{
-    Invoke-Expression "$testLocation\rundrts.cmd $command"
-}
-
-# We can use $env:HELIX_PYTHONPATH $env:HELIX_SCRIPT_ROOT\upload_result.py to upload any QV specific logs and/or screenshots that we are interested in.
-# For example: $env:HELIX_PYTHONPATH $env:HELIX_SCRIPT_ROOT%\upload_result.py -result screenshot.jpg -result_name screenshot.jpg
-# Then, links to these artifacts can then be included in the xUnit logs.
-
-# Need to copy the xUnit log to a known location that helix can understand
-if (Test-Path "$env:AppData\QualityVault\Run\Report\testResults.xml")
-{
-    $resultLocation = $PSScriptRoot
-    Write-Output "Copying test results to $resultLocation"
-    Copy-Item "$env:AppData\QualityVault\Run\Report\testResults.xml" $resultLocation
-}
\ No newline at end of file
diff --git a/eng/helix/helixpublish.proj b/eng/helixpublish.proj
similarity index 91%
rename from eng/helix/helixpublish.proj
rename to eng/helixpublish.proj
index 6869d5b7bbc..8f3aa2ac922 100644
--- a/eng/helix/helixpublish.proj
+++ b/eng/helixpublish.proj
@@ -1,14 +1,6 @@
 <Project Sdk="Microsoft.DotNet.Helix.Sdk" DefaultTargets="Test">
   <PropertyGroup>
-    <!-- These properties help ensure proper and consistent restore behavior -->
     <TargetFramework>netcoreapp3.0</TargetFramework>
-    <RestorePackagesPath>$(MSBuildThisFileDirectory)packages</RestorePackagesPath>
-    <DisableImplicitNETCorePlatformsReference>true</DisableImplicitNETCorePlatformsReference>
-    <RestoreSources>
-      $(RestoreSources);
-      https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json
-    </RestoreSources>
-
     <IncludeDotNetCli>true</IncludeDotNetCli>
     <DotNetCliPackageType>runtime</DotNetCliPackageType>
     <!-- Set to match global.json.tools.dotnet by pre-build.ps1 -->
@@ -28,7 +20,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <HelixCorrelationPayload Include="artifacts\test\$(Configuration)\$(Platform)" /> 
+    <HelixCorrelationPayload Include="$(ArtifactsDir)\test\$(Configuration)\$(Platform)" /> 
     <HelixWorkItem Include="Xaml">
       <Timeout>00:20:00</Timeout>
       <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Xaml</Command>
diff --git a/eng/pipeline.yml b/eng/pipeline.yml
index a7cfb192b5f..f92f5428ee6 100644
--- a/eng/pipeline.yml
+++ b/eng/pipeline.yml
@@ -135,8 +135,8 @@ jobs:
           -configuration $(_BuildConfig)
           $(_OfficialBuildIdArgs) 
           $(_PlatformArgs)
-          -projects $(Build.SourcesDirectory)\eng\helix\helixpublish.proj
-          /bl:$(BUILD.SOURCESDIRECTORY)\artifacts\log\$(_BuildConfig)\HelixUnit.binlog
+          -projects $(Build.SourcesDirectory)\eng\helixpublish.proj
+          /bl:$(BUILD.SOURCESDIRECTORY)\artifacts\log\$(_BuildConfig)\HelixDrt.binlog
         displayName: Run Developer Regression Tests on Helix Machine (Release)
         env:
           HelixSource: $(_HelixSource)
diff --git a/src/Microsoft.DotNet.Wpf/test/BranchCommon/data/CommonData.csproj b/src/Microsoft.DotNet.Wpf/test/BranchCommon/data/CommonData.csproj
deleted file mode 100644
index 9a963ba3405..00000000000
--- a/src/Microsoft.DotNet.Wpf/test/BranchCommon/data/CommonData.csproj
+++ /dev/null
@@ -1,20 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <NoTargets>true</NoTargets>
-    <EnableDefaultItems>false</EnableDefaultItems>
-    <PublishDir>$(WpfTestBasePublishPath)</PublishDir>
-    <_IsPortable>true</_IsPortable>
-    <SelfContained>false</SelfContained>
-    <RuntimeIdentifier></RuntimeIdentifier>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <None Include="DrtList.xml">
-      <Link>DRT\%(Filename)%(Extension)</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
- 
-  </ItemGroup>
-
-</Project>
diff --git a/src/Microsoft.DotNet.Wpf/test/BranchCommon/data/Directory.Build.props b/src/Microsoft.DotNet.Wpf/test/BranchCommon/data/Directory.Build.props
deleted file mode 100644
index 12d9ad073ec..00000000000
--- a/src/Microsoft.DotNet.Wpf/test/BranchCommon/data/Directory.Build.props
+++ /dev/null
@@ -1,3 +0,0 @@
-<Project>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
-</Project>
diff --git a/src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/DrtBase.cs b/src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/DrtBase.cs
index 37bd98942c6..79fa006d094 100644
--- a/src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/DrtBase.cs
+++ b/src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/DrtBase.cs
@@ -213,7 +213,7 @@ static DrtBase()
             Application app = Application.Current;  // runs Application.Init(), which sets up Avalon services
         }
 
-        protected DrtBase(ITestOutputHelper output)
+        protected DrtBase()
         {
             string assertExit = Environment.GetEnvironmentVariable("AVALON_ASSERTEXIT");
             if (assertExit != null && assertExit.Length > 0)
@@ -232,7 +232,6 @@ protected DrtBase(ITestOutputHelper output)
             }
 
             _dispatcher = Dispatcher.CurrentDispatcher;
-            _output = output;
         }
 
         /// <summary>
@@ -249,7 +248,7 @@ protected DrtBase(ITestOutputHelper output)
         /// <returns>DRT exit code -- to be returned from Main()</returns>
         public int Run(string[] args)
         {
-            _delayedConsoleOutput = new StringAndFileWriter(DrtName, _output);
+            _delayedConsoleOutput = new StringAndFileWriter(DrtName);
 
             _retcode = ReadCommandLineArguments(args);
 
@@ -2621,10 +2620,9 @@ private static void Win32BlockInput(bool blockIt)
 
         private class StringAndFileWriter : StringWriter
         {
-            public StringAndFileWriter(string drtName, ITestOutputHelper output) : base(new StringBuilder())
+            public StringAndFileWriter(string drtName) : base(new StringBuilder())
             {
                 _buffer = GetStringBuilder();
-                _output = output;
                 if (string.IsNullOrEmpty(drtName))
                 {
                     throw new ArgumentException("DrtName must be defined");
@@ -2710,14 +2708,6 @@ public override void Write(char value)
                         _logFile.Write(value);
                         _logFile.Flush();
                     }
-
-                    try
-                    {
-                        _output.WriteLine($"{value}");
-                    }
-                    catch
-                    {
-                    }
                 }
             }
 
@@ -2735,14 +2725,6 @@ public override void Write(char[] buffer, int index, int count)
                         _logFile.Write(buffer, index, count);
                         _logFile.Flush();
                     }
-
-                    var sb = new StringBuilder();
-                    sb.Append(buffer, index, count);
-                    try
-                    {
-                        _output.WriteLine(sb.ToString());
-                    }
-                    catch { }
                 }
             }
 
@@ -2772,12 +2754,6 @@ public override void Write(string value)
                         _logFile.Write(value);
                         _logFile.Flush();
                     }
-
-                    try
-                    {
-                        _output.WriteLine(value);
-                    }
-                    catch { }
                 }
             }
 
@@ -2801,8 +2777,6 @@ public void CloseFile()
             private StringBuilder _buffer;
             private bool _isClosed = false;
             private object _instanceLock = new object();
-
-            private ITestOutputHelper _output;
         }
 
         private class DualWriter : StringWriter
@@ -2915,8 +2889,6 @@ public bool TimedOut
         //
 
         private Dispatcher _dispatcher;
-        private ITestOutputHelper _output;
-       
 
         private HwndSource _source = null;
         private Visual _rootElement;
diff --git a/src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/TestServices.csproj b/src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/TestServices.csproj
index c4d5ad2748d..81436587de5 100644
--- a/src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/TestServices.csproj
+++ b/src/Microsoft.DotNet.Wpf/test/Common/DRT/TestServices/TestServices.csproj
@@ -1,11 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <AssemblyName>TestServices</AssemblyName>
-        <RootNamespace>TestServices</RootNamespace>
-        <DefineConstants>$(DefineConstants);FRAMEWORK_NATIVEMETHODS;CORE_NATIVEMETHODS;DRT</DefineConstants>
-        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-        <NoWarn>$(NoWarn);CS0618;0618</NoWarn>
-        <Platforms>AnyCPU;x64</Platforms>
+      <AssemblyName>TestServices</AssemblyName>
+      <RootNamespace>TestServices</RootNamespace>
+      <DefineConstants>$(DefineConstants);FRAMEWORK_NATIVEMETHODS;CORE_NATIVEMETHODS;DRT</DefineConstants>
+      <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+      <NoWarn>$(NoWarn);CS0618;0618</NoWarn>
+      <Platforms>AnyCPU;x64</Platforms>
+      <CLSCompliant>false</CLSCompliant>
+      <OutputType>Library</OutputType>
     </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlAvoidXmlTest/BamlAvoidXmlTest.csproj b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlAvoidXmlTest/BamlAvoidXmlTest.csproj
index c744feb3be1..dae72c72de6 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlAvoidXmlTest/BamlAvoidXmlTest.csproj
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlAvoidXmlTest/BamlAvoidXmlTest.csproj
@@ -7,7 +7,6 @@
     <AddTargetFrameworkAttributeToWpfTestExe>true</AddTargetFrameworkAttributeToWpfTestExe>
 
     <!-- Avoid auto-generating a main -->
-    <InternalMarkupCompilation>true</InternalMarkupCompilation>
     <RootNamespace>BamlAvoidXmlTest</RootNamespace>
     <Platforms>AnyCPU;x64</Platforms>
   </PropertyGroup>
@@ -17,37 +16,8 @@
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Folder Include="Properties\" />
-    <Compile Include="BamlAvoidXmlTest.cs" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <NetCoreReference Include="mscorlib" />
-    <NetCoreReference Include="netstandard" />
-    <NetCoreReference Include="System.Console" />
-    <NetCoreReference Include="System.Diagnostics.Debug" />
-    <NetCoreReference Include="System.Diagnostics.Tools" />
-    <NetCoreReference Include="System.Runtime.Extensions" />
-    <NetCoreReference Include="System.Runtime.InteropServices" />
-    <NetCoreReference Include="System.Resources.ResourceManager" />
-    <NetCoreReference Include="System.Linq" />
-    <NetCoreReference Include="System.ObjectModel" />
-    <NetCoreReference Include="System.ComponentModel" />
-    <NetCoreReference Include="System.ComponentModel.Primitives" />
-    <NetCoreReference Include="System.Collections" />
-    <NetCoreReference Include="System.Collections.Generic" />
-    <NetCoreReference Include="System.Collections.NonGeneric" />
-    <NetCoreReference Include="System.Collections.Concurrent" />
-    <NetCoreReference Include="System.Reflection.Primitives" />
-    <NetCoreReference Include="System.Text.Encoding.Extensions" />
-    <NetCoreReference Include="System.Threading" />
-    <NetCoreReference Include="System.Threading.Thread" />
-    <NetCoreReference Include="System.Threading.Tasks" />
-    <NetCoreReference Include="System.Xml.ReaderWriter" />
-  </ItemGroup>
 </Project>
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlTestClasses40/BamlTestClasses40.csproj b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlTestClasses40/BamlTestClasses40.csproj
index 3c4d5a8d8b5..8b04041b658 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlTestClasses40/BamlTestClasses40.csproj
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlTestClasses40/BamlTestClasses40.csproj
@@ -62,8 +62,6 @@
     <Page Include="XmlSpace3.xaml">
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Compile Include="BCMarkupExtension.cs" />
-    <Compile Include="TempDPSetOrder1ListBox.cs" />
     <None Remove="@(Page)" />
   </ItemGroup>
 
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/Directory.Build.props b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/Directory.Build.props
index 4d1dc3791be..bf987b61ede 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/Directory.Build.props
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/Directory.Build.props
@@ -1,4 +1,3 @@
 <Project>
   <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
-  <Import Condition="Exists('$(WpfTestBasePath)/DRT.Build.props')" Project="$(WpfTestBasePath)/DRT.Build.props" />
 </Project>
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/DrtXaml.csproj b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/DrtXaml.csproj
index 822d08b97c9..769c148aa6e 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/DrtXaml.csproj
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/DrtXaml.csproj
@@ -5,12 +5,12 @@
     <LinkSubsystem>console</LinkSubsystem>
     <OutputType>WinExe</OutputType>
     <Platforms>AnyCPU;x64</Platforms>
+    <StartupObject>DrtXaml.XamlDrt</StartupObject>
+    <CreateTestPayload>true</CreateTestPayload>
   </PropertyGroup>
 
   <PropertyGroup>
-    <IsTestProject>true</IsTestProject>
     <IsIntegrationTestProject>false</IsIntegrationTestProject>
-    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
   
   <ItemGroup>
@@ -24,12 +24,6 @@
 
   <ItemGroup>
     <ProjectReference Include="$(WpfSourceDir)System.Xaml\System.Xaml.csproj" />
-    <PackageReference Include="System.IO.Packaging" Version="$(SystemIOPackagingVersion)" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="System.Security.Permissions" Version="$(SystemSecurityPermissionsPackageVersion)" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerPackageVersion)" />
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/DrtXamlBase.cs b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/DrtXamlBase.cs
index 2feeead35e0..7499fee2047 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/DrtXamlBase.cs
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/DrtXamlBase.cs
@@ -17,12 +17,14 @@ namespace DrtXaml
 {
     public sealed class XamlDrt : DrtBase
     {
-        public void RunTests(params string[] args)
+        [STAThread]
+        public static int Main(string[] args)
         {
-            Run(args);
+            DrtBase drt = new XamlDrt();
+            return drt.Run(args);
         }
 
-        public XamlDrt(ITestOutputHelper output) : base(output)
+        private XamlDrt()
         {
             DrtName = "DrtXaml";
             WindowTitle = "XAML DRT";
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/Tests/SchemaTests.cs b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/Tests/SchemaTests.cs
index 311c4445747..d3fcf564232 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/Tests/SchemaTests.cs
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/Tests/SchemaTests.cs
@@ -1244,9 +1244,7 @@ public void ParsedDynamicAssemblyCollectible()
         }
 
          [TestMethod]
-#if NETCOREAPP3_X
          [TestKnownFailure(Reason = ".NET Core does not support Assembly.ReflectionOnlyLoad. Contact wpfdev for additional details")]
-#endif
         public void ReflectionOnlyTypes()
         {
             XamlSchemaContext oldXsc = _schemaContext;
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/XamlTestFrameWork/Assert.cs b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/XamlTestFrameWork/Assert.cs
index 4b4f422494a..a915c356f47 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/XamlTestFrameWork/Assert.cs
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/XamlTestFrameWork/Assert.cs
@@ -5,111 +5,102 @@
 using System;
 using System.Collections.Generic;
 using System.Collections;
-using Xunit;
-using Xunit.Sdk;
 
 namespace DrtXaml.XamlTestFramework
 {
-    public class EqualException2 : EqualException
+    public static class Assert
     {
-        public EqualException2(object expected, object actual) : base(expected, actual)
+        public static void AreEqual(decimal expected, decimal actual)
         {
+            AreEqual(expected, actual, "Are not equal");
         }
 
-        public EqualException2(string expected, string actual, int expectedIndex, int actualIndex) : base(expected, actual, expectedIndex, actualIndex)
+        public static void AreEqual(int expected, int actual)
         {
+            AreEqual(expected, actual, "Are not equal");
         }
 
-        public EqualException2(object expected, object actual, string message): this(expected, actual)
+        public static void AreEqual(uint expected, uint actual)
         {
-            UserMessage = message;
+            AreEqual(expected, actual, "Are not equal");
         }
-    }
 
-    public class NotEqualException2 : NotEqualException
-    {
-        public NotEqualException2(NotEqualException inner, string message): base(inner.Expected, inner.Actual)
+        public static void AreEqual(string expected, string actual)
         {
-            UserMessage = message;
+            AreEqual(expected, actual, "Are not equal");
         }
-    }
 
-    public class NotNullException2 : NotNullException
-    {
-        public NotNullException2()
+        public static void AreEqual(float expected, float actual)
         {
+            AreEqual(expected, actual, "Are not equal");
         }
 
-        public NotNullException2(string message)
+        public static void AreEqual(double expected, double actual)
         {
-            UserMessage = message;
+            AreEqual(expected, actual, "Are not equal");
         }
-    }
 
-    public class NullException2 : NullException
-    {
-        public NullException2(object actual) : base(actual)
+        public static void AreEqual(object expected, object actual)
         {
+            AreEqual(expected, actual, "Are not equal");
         }
 
-        public NullException2(object actual, string message): this(actual)
+        public static void AreEqual(decimal expected, decimal actual, string message)
         {
-            UserMessage = message;
+            if (expected != actual)
+            {
+                Fail(message);
+            }
         }
-    }
 
-    public class IsAssignableFromException2 : IsAssignableFromException
-    {
-        public IsAssignableFromException2(Type expected, object actual) : base(expected, actual)
+        public static void AreEqual(int expected, int actual, string message)
         {
+            if (expected != actual)
+            {
+                Fail(message);
+            }
         }
 
-        public IsAssignableFromException2(Type expected, object actual, string message) : this(expected, actual)
+        public static void AreEqual(uint expected, uint actual, string message)
         {
-            UserMessage = message;
+            if (expected != actual)
+            {
+                Fail(message);
+            }
         }
-    }
 
-
-    public static class Assert
-    {
-
-        public static void AreEqual<T>(T expected, T actual)
+        public static void AreEqual(string expected, string actual, string message)
         {
-            AreEqual<T>(expected, actual, "Are not equal");
+            if (expected != actual)
+            {
+                Fail(message);
+            }
         }
 
-        public static void AreEqual<T>(T expected, T actual, string message)
+        public static void AreEqual(float expected, float actual, string message)
         {
-            try
-            {
-                Xunit.Assert.Equal<T>(expected, actual);
-            }
-            catch (EqualException)
+            if (expected != actual)
             {
-                throw new EqualException2(expected, actual, message);
+                Fail(message);
             }
         }
 
-        public static void AreNotEqual<T>(T expected, T actual)
+        public static void AreEqual(double expected, double actual, string message)
         {
-            AreNotEqual<T>(expected, actual, "Should not be equal");
+            if (expected != actual)
+            {
+                Fail(message);
+            }
         }
 
-        public static void AreNotEqual<T>(T expected, T actual, string message)
+        public static void AreEqual(object expected, object actual, string message)
         {
-            try
-            {
-                Xunit.Assert.NotEqual<T>(expected, actual);
-            }
-            catch (NotEqualException e)
+            if (!(expected.Equals(actual)))
             {
-                throw new NotEqualException2(e, message);
+                Fail(message);
             }
         }
 
-
-
         public static void AreEqualOrdered<T>(IList<T> actual, params T[] expected)
         {
             Assert.AreEqual(expected.Length, actual.Count);
@@ -128,7 +119,96 @@ public static void AreEqualUnordered<T>(ICollection<T> actual, params T[] expect
             }
         }
         
+        public static void AreNotEqual(decimal expected, decimal actual)
+        {
+            AreNotEqual(expected, actual, "Should not be equal");
+        }
+
+        public static void AreNotEqual(int expected, int actual)
+        {
+            AreNotEqual(expected, actual, "Should not be equal");
+        }
+
+        public static void AreNotEqual(uint expected, uint actual)
+        {
+            AreNotEqual(expected, actual, "Should not be equal");
+        }
+
+        public static void AreNotEqual(string expected, string actual)
+        {
+            AreNotEqual(expected, actual, "Should not be equal");
+        }
+
+        public static void AreNotEqual(float expected, float actual)
+        {
+            AreNotEqual(expected, actual, "Should not be equal");
+        }
         
+        public static void AreNotEqual(double expected, double actual)
+        {
+            AreNotEqual(expected, actual, "Should not be equal");
+        }
+
+        public static void AreNotEqual(object expected, object actual)
+        {
+            AreNotEqual(expected, actual, "Should not be equal");
+        }
+
+        public static void AreNotEqual(decimal expected, decimal actual, string message)
+        {
+            if (expected == actual)
+            {
+                Fail(message);
+            }
+        }
+
+        public static void AreNotEqual(int expected, int actual, string message)
+        {
+            if (expected == actual)
+            {
+                Fail(message);
+            }
+        }
+
+        public static void AreNotEqual(uint expected, uint actual, string message)
+        {
+            if (expected == actual)
+            {
+                Fail(message);
+            }
+        }
+
+        public static void AreNotEqual(string expected, string actual, string message)
+        {
+            if (expected == actual)
+            {
+                Fail(message);
+            }
+        }
+
+        public static void AreNotEqual(float expected, float actual, string message)
+        {
+            if (expected == actual)
+            {
+                Fail(message);
+            }
+        }
+
+        public static void AreNotEqual(double expected, double actual, string message)
+        {
+            if (expected == actual)
+            {
+                Fail(message);
+            }
+        }
+
+        public static void AreNotEqual(object expected, object actual, string message)
+        {
+            if (object.Equals(expected, actual))
+            {
+                Fail(message);
+            }
+        }
 
         public static void AreSame(object expected, object actual)
         {
@@ -137,7 +217,10 @@ public static void AreSame(object expected, object actual)
 
         public static void AreSame(object expected, object actual, string message)
         {
-            Assert.AreEqual<object>(expected, actual, message);
+            if (!(object.ReferenceEquals(expected, actual)))
+            {
+                Assert.Fail(message);
+            }
         }
 
         public static void AreNotSame(object expected, object actual)
@@ -147,7 +230,20 @@ public static void AreNotSame(object expected, object actual)
 
         public static void AreNotSame(object expected, object actual, string message)
         {
-            Assert.AreNotEqual<object>(expected, actual, message);
+            if (object.ReferenceEquals(expected, actual))
+            {
+                Assert.Fail(message);
+            }
+        }
+
+        public static void Fail()
+        {
+            Fail("Please call Fail(message) not Fail()");
+        }
+
+        public static void Fail(string message)
+        {
+            throw new InvalidOperationException(message);
         }
 
         public static void IsEmpty(ICollection collection)
@@ -170,7 +266,10 @@ public static void IsFalse(bool condition)
 
         public static void IsFalse(bool condition, string message)
         {
-            Xunit.Assert.False(condition, message);
+            if (condition)
+            {
+                Assert.Fail(message);
+            }
         }
 
         public static void IsNotNull(object o)
@@ -180,13 +279,9 @@ public static void IsNotNull(object o)
 
         public static void IsNotNull(object o, string message)
         {
-            try
+            if (o == null)
             {
-                Xunit.Assert.NotNull(o);
-            }
-            catch (NotNullException)
-            {
-                throw new NotNullException2(message);
+                Assert.Fail(message);
             }
         }
 
@@ -197,13 +292,9 @@ public static void IsNull(object o)
 
         public static void IsNull(object o, string message)
         {
-            try
-            {
-                Xunit.Assert.Null(o);
-            }
-            catch (NullException)
+            if (o != null)
             {
-                throw new NullException2(o, message);
+                Assert.Fail(message);
             }
         }
 
@@ -214,7 +305,7 @@ public static void IsTrue(bool condition)
 
         public static void IsTrue(bool condition, string message)
         {
-            Xunit.Assert.True(condition, message);
+            AreEqual(true, condition, message);
         }
 
         public static void IsInstanceOfType(Type expected, object actual)
@@ -224,19 +315,10 @@ public static void IsInstanceOfType(Type expected, object actual)
 
         public static void IsInstanceOfType(Type expected, object actual, string message)
         {
-            try
+            if (!(expected.IsInstanceOfType(actual)))
             {
-                Xunit.Assert.IsAssignableFrom(expected, actual);
+                Assert.Fail(message);
             }
-            catch(IsAssignableFromException)
-            {
-                throw new IsAssignableFromException2(expected, actual, message);
-            }
-        }
-
-        public static void Fail(string message)
-        {
-            Xunit.Assert.True(false, message);
         }
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/FriendWithKey/XamlTestClasses.FriendWithKey.csproj b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/FriendWithKey/XamlTestClasses.FriendWithKey.csproj
deleted file mode 100644
index b50c80cd7b3..00000000000
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/FriendWithKey/XamlTestClasses.FriendWithKey.csproj
+++ /dev/null
@@ -1,11 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
-    <PropertyGroup>
-    <AssemblyName>XamlTestClasses.FriendWithKey</AssemblyName>
-    <OutputType>Library</OutputType>
-    <DefineConstants>$(DefineConstants);OLDRESOURCES</DefineConstants>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="FriendWithKey.cs" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/FriendWithoutKey/XamlTestClasses.FriendWithoutKey.csproj b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/FriendWithoutKey/XamlTestClasses.FriendWithoutKey.csproj
deleted file mode 100644
index 0d902aa8960..00000000000
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/FriendWithoutKey/XamlTestClasses.FriendWithoutKey.csproj
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
-    <PropertyGroup>
-    <AssemblyName>XamlTestClasses.FriendWithoutKey</AssemblyName>
-    <OutputType>Library</OutputType>
-    <DefineConstants>$(DefineConstants);OLDRESOURCES</DefineConstants>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <SignAssembly>false</SignAssembly>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="FriendWithoutKey.cs" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/XamlTestClasses.FriendWithKey/XamlTestClasses.FriendWithKey.csproj b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/XamlTestClasses.FriendWithKey/XamlTestClasses.FriendWithKey.csproj
index 53e9006f66f..38ef8c623f8 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/XamlTestClasses.FriendWithKey/XamlTestClasses.FriendWithKey.csproj
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/XamlTestClasses.FriendWithKey/XamlTestClasses.FriendWithKey.csproj
@@ -3,5 +3,6 @@
     <AssemblyName>XamlTestClasses.FriendWithKey</AssemblyName>
     <RootNamespace>XamlTestClasses.FriendWithKey</RootNamespace>
     <Platforms>AnyCPU;x64</Platforms>
+    <OutputType>Library</OutputType>
   </PropertyGroup>
 </Project>
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/XamlTestClasses.FriendWithoutKey/XamlTestClasses.FriendWithoutKey.csproj b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/XamlTestClasses.FriendWithoutKey/XamlTestClasses.FriendWithoutKey.csproj
index 2292641f063..15261c44875 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/XamlTestClasses.FriendWithoutKey/XamlTestClasses.FriendWithoutKey.csproj
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/XamlTestClasses.FriendWithoutKey/XamlTestClasses.FriendWithoutKey.csproj
@@ -3,5 +3,6 @@
     <AssemblyName>XamlTestClasses.FriendWithoutKey</AssemblyName>
     <RootNamespace>XamlTestClasses.FriendWithoutKey</RootNamespace>
     <Platforms>AnyCPU;x64</Platforms>
+    <OutputType>Library</OutputType>
   </PropertyGroup>
 </Project>
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/XamlTestClasses/XamlTestClasses.csproj b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/XamlTestClasses/XamlTestClasses.csproj
index faf81e73e6e..a0d7274219d 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/XamlTestClasses/XamlTestClasses.csproj
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/XamlTestClasses/XamlTestClasses.csproj
@@ -6,7 +6,6 @@
   </PropertyGroup>
   
   <PropertyGroup>
-    <SignAssembly>false</SignAssembly>
     <AssemblyOriginatorKeyFile>DrtXaml.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   
diff --git a/src/Microsoft.DotNet.Wpf/test/Directory.Build.props b/src/Microsoft.DotNet.Wpf/test/Directory.Build.props
index 12c3872c4d5..7c34f925711 100644
--- a/src/Microsoft.DotNet.Wpf/test/Directory.Build.props
+++ b/src/Microsoft.DotNet.Wpf/test/Directory.Build.props
@@ -1,56 +1,29 @@
 <Project>
+  <PropertyGroup>
+    <WpfTest>true</WpfTest>
+  </PropertyGroup>
   <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
-
   <PropertyGroup>
-    <WpfTestBasePath>$(MsBuildThisFileDirectory)</WpfTestBasePath>
-    <DrtCommonRoot>$(WpfTestBasePath)\Common\DRT</DrtCommonRoot>
-    <WpfSharedRoot>$(WpfTestBasePath)\Shared</WpfSharedRoot>
-    <PublishRoot>$(RepoRoot)artifacts\test\</PublishRoot>
+    <WpfTestsDir>$(MsBuildThisFileDirectory)</WpfTestsDir>
+    <SignAssembly>false</SignAssembly>
+    <IsTestProject Condition="'$(IsTestProject)'!='false'">true</IsTestProject>
+    <IsShipping>false</IsShipping>
+    <EnableXlfLocalization>false</EnableXlfLocalization>
+    <CLSCompliant>false</CLSCompliant>
     <TargetFramework>netcoreapp3.0</TargetFramework>
-    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-    <RuntimeIdentifiers>win-x64;win-x86</RuntimeIdentifiers>
+
+    <SelfContained>false</SelfContained>
+
+    <!-- Arcade SDK defaults to AnyCpu ~= x64. In WPF, we will map AnyCpu => x86 instead -->
     <PlatformFolder>x86</PlatformFolder>
     <PlatformFolder Condition="'$(Platform)' == 'x64'">x64</PlatformFolder>
-  </PropertyGroup>
- 
-  <Import Project="$(WpfArcadeSdkToolsDir)\Publish.props"/>
-  <Import Project="$(WpfArcadeSdkToolsDir)\StrongName.props"/>
+    <PublishRoot>$(RepoRoot)artifacts\test\$(Configuration)\$(PlatformFolder)</PublishRoot>
 
+    <WpfTestBasePublishPath>$(PublishRoot)\Test</WpfTestBasePublishPath>
+  </PropertyGroup>
   <ItemDefinitionGroup>
     <EmbeddedResource>
       <GenerateSource>false</GenerateSource>
     </EmbeddedResource>
-    
-    <PackageReference>
-      <PrivateAssets>contentfiles;analyzers;build</PrivateAssets>
-    </PackageReference>
   </ItemDefinitionGroup>
-
-  <PropertyGroup>
-    <InternalUtilitiesProject>$(WpfTestBasePath)\Infra\TestUtilities\InternalUtilities\InternalUtilities.csproj</InternalUtilitiesProject>
-    <TestContractsProject>$(WpfTestBasePath)\Infra\CommunityChest\TestContracts\TestContracts.csproj</TestContractsProject>
-    <TestApiCoreProject>$(WpfTestBasePath)\Infra\TestApi\TestApiCore\Code\TestApiCore.csproj</TestApiCoreProject>
-    <TestRuntimeProject>$(WpfTestBasePath)\Common\TestRuntime\TestRuntime.csproj</TestRuntimeProject>
-    <TestServicesProject>$(WpfTestBasePath)\Common\Drt\TestServices\TestServices.csproj</TestServicesProject>
-    <QualityVaultUtilitiesProject>$(WpfTestBasePath)\Infra\QualityVault\QualityVaultUtilities\QualityVaultUtilities.csproj</QualityVaultUtilitiesProject>
-    <DrtToolsProject>$(WpfTestBasePath)\Common\DRT\Tools\DrtTools.csproj</DrtToolsProject>
-  </PropertyGroup>
-
-  <Import Project="$(WpfArcadeSdkToolsDir)\SourceLocations.props"/>
-
-  <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <EnableDefaultItems>false</EnableDefaultItems>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <!-- CS0618 - UnmanagedType.Struct usage -->
-    <!-- VSTHRD002 - Synchronous awaits from IPC since we can't convert the entire logging/IPC mechanism to async -->
-    <!-- VSTHRD001 - Legacy sync code -->
-    <NoWarn>CS0618;VSTHRD002;VSTHRD001</NoWarn>
-    
-    <!-- Remove these when open sourcing -->
-    <NoWarn>$(NoWarn);CS3005;CS3001;CS3002;CS3003;CS0169</NoWarn>
-  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Wpf/test/Directory.Build.targets b/src/Microsoft.DotNet.Wpf/test/Directory.Build.targets
index 2181cf771d7..55094856dec 100644
--- a/src/Microsoft.DotNet.Wpf/test/Directory.Build.targets
+++ b/src/Microsoft.DotNet.Wpf/test/Directory.Build.targets
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
-  <Import Project="$(WpfArcadeSdkToolsDir)StrongName.targets" />
-  <Import Project="$(WpfArcadeSdkToolsDir)PublishAfterBuild.targets" />
+  <Import Project="$(WpfArcadeSdkToolsDir)PublishAfterBuild.targets"/>
 </Project>
   
\ No newline at end of file

From b9281ab326d45e0c67d636c070fca05724359d7a Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Fri, 31 May 2019 14:08:36 -0700
Subject: [PATCH 61/72] don't use publish

---
 eng/AddDrtsToPayload.targets                  | 26 +++++++++++++++++++
 .../tools/CreateTestPayload.targets           | 22 ++++++++++++++--
 .../tools/PublishAfterBuild.targets           | 11 --------
 eng/WpfArcadeSdk/tools/RunDrtsLocal.targets   |  2 ++
 eng/WpfArcadeSdk/tools/TestProjects.targets   | 26 +++++++++----------
 .../test/Common/Directory.Build.props         |  3 ---
 .../test/DRT/Directory.Build.props            |  3 ---
 .../test/Directory.Build.props                | 10 +------
 .../test/Directory.Build.targets              |  6 -----
 9 files changed, 61 insertions(+), 48 deletions(-)
 create mode 100644 eng/AddDrtsToPayload.targets
 delete mode 100644 eng/WpfArcadeSdk/tools/PublishAfterBuild.targets
 delete mode 100644 src/Microsoft.DotNet.Wpf/test/Directory.Build.targets

diff --git a/eng/AddDrtsToPayload.targets b/eng/AddDrtsToPayload.targets
new file mode 100644
index 00000000000..30f8f09b80a
--- /dev/null
+++ b/eng/AddDrtsToPayload.targets
@@ -0,0 +1,26 @@
+<Project>
+  <PropertyGroup>
+    <!-- AnyCPU/x86 builds don't produce an output folder in artifacts. This only exists for x64 builds. -->
+    <PlatformFolder Condition="'$(Platform)'=='x64'">x64</PlatformFolder>
+
+    <!-- For the test payload, we default to x86 for AnyCPU platform --> 
+    <PayloadPlatformFolder>x86</PayloadPlatformFolder>
+    <PayloadPlatformFolder Condition="'$(Platform)'=='x64'">x64</PayloadPlatformFolder>
+    <PayloadBaseLocation>$(RepoRoot)artifacts\test\$(Configuration)\$(PayloadPlatformFolder)</PayloadBaseLocation>
+    <PayloadDrtLocation>$(PayloadBaseLocation)\Test\DRT</PayloadDrtLocation>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <!-- List of DRTs to include -->
+    <DRT Include="DrtXaml" />
+  </ItemGroup>
+
+  <Target Name="AddDrtsToPayload" BeforeTargets="RunDrts">
+    <ItemGroup>
+      <DrtPayloadContents Include="$(RepoRoot)artifacts\bin\%(DRT.Identity)\$(PlatformFolder)\$(Configuration)\**\*.*"/>
+    </ItemGroup>
+    <Copy SourceFiles="@(DrtPayloadContents)"
+          DestinationFiles="@(DrtPayloadContents->'$(PayloadDrtLocation)\%(RecursiveDir)%(Filename)%(Extension)')"  />
+  </Target>
+
+</Project>
diff --git a/eng/WpfArcadeSdk/tools/CreateTestPayload.targets b/eng/WpfArcadeSdk/tools/CreateTestPayload.targets
index c7872ca0772..958044295b7 100644
--- a/eng/WpfArcadeSdk/tools/CreateTestPayload.targets
+++ b/eng/WpfArcadeSdk/tools/CreateTestPayload.targets
@@ -3,14 +3,24 @@
   <PropertyGroup>
     <LocalRuntimeIdentifier Condition="'$(Platform)'=='x64' or '$(Platform)'=='x86' or '$(Platform)'=='arm' or '$(Platform)'=='arm64'">win-$(Platform)</LocalRuntimeIdentifier>
     <LocalRuntimeIdentifier Condition="'$(Platform)'=='Win32' or '$(Platform)'=='AnyCPU'">win-x86</LocalRuntimeIdentifier>
-
     <NoWarn>$(NoWarn);NU3027;NU3018</NoWarn>
+
+     <!-- Arcade SDK defaults to AnyCpu ~= x64. In WPF, we will map AnyCpu => x86 instead -->
+    <PlatformFolder>x86</PlatformFolder>
+    <PlatformFolder Condition="'$(Platform)' == 'x64'">x64</PlatformFolder>
+    <PublishRoot>$(RepoRoot)artifacts\test\$(Configuration)\$(PlatformFolder)</PublishRoot>
+
+    <WpfTestBasePublishPath>$(PublishRoot)\Test</WpfTestBasePublishPath>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="runtime.$(LocalRuntimeIdentifier).Microsoft.DotNet.Wpf.Test" Version="$(MicrosoftDotNetWpfTestPackageVersion)" GeneratePathProperty="true" />
   </ItemGroup>
 
+  <ItemGroup>
+    <DRT Include="DrtXaml" />
+  </ItemGroup>
+
   <PropertyGroup Condition="'$(LocalRuntimeIdentifier)'=='win-x86'">
     <MicrosoftDotNetWpfTestPath>$(Pkgruntime_win-x86_Microsoft_DotNet_Wpf_Test)\tools\$(LocalRuntimeIdentifier)\Test\</MicrosoftDotNetWpfTestPath>
   </PropertyGroup>
@@ -19,12 +29,15 @@
     <MicrosoftDotNetWpfTestPath>$(Pkgruntime_win-x64_Microsoft_DotNet_Wpf_Test)\tools\$(LocalRuntimeIdentifier)\Test\</MicrosoftDotNetWpfTestPath>
   </PropertyGroup>
 
-  <Target Name="CreateTestPayload" BeforeTargets="Test">
+  <Target Name="CreateTestPayload" BeforeTargets="Test" AfterTargets="Build">
     <ItemGroup>
       <MicrosoftDotNetWpfTestContents Include="$(MicrosoftDotNetWpfTestPath)\**\*.*" />
       <OtherPayloadContents Include="$(WpfArcadeSdkToolsDir)runtests.cmd" />
       <OtherPayloadContents Include="$(WpfArcadeSdkToolsDir)runtests.ps1" />
       <OtherPayloadContents Include="$(WpfArcadeSdkToolsDir)configure-helix-machine.ps1" Condition="'$(ContinousIntegrationBuild)'=='True'" />
+
+      <DrtPayloadContents Include="$(RepoRoot)artifacts\bin\%(DRT.Identity)\$(PlatformFolder)\$(Configuration)\**\*.*"/>
+
     </ItemGroup>
 
     <Copy SourceFiles="@(MicrosoftDotNetWpfTestContents)"
@@ -36,6 +49,11 @@
     <Copy SourceFiles="$(WpfTestsDir)BranchCommon\data\DrtList.xml"
           DestinationFolder="$(WpfTestBasePublishPath)\DRT"  />
 
+    <Copy SourceFiles="$(WpfTestsDir)BranchCommon\data\DrtList.xml"
+          DestinationFolder="$(WpfTestBasePublishPath)\DRT"  />
+
+    <Copy SourceFiles="@(DrtPayloadContents)"
+          DestinationFolder="@(DrtPayloadContents->'$(DrtPayloadContents)\%(RecursiveDir)%(Filename)%(Extension)')"  />
   </Target>
 
 </Project>
diff --git a/eng/WpfArcadeSdk/tools/PublishAfterBuild.targets b/eng/WpfArcadeSdk/tools/PublishAfterBuild.targets
deleted file mode 100644
index 42f92318850..00000000000
--- a/eng/WpfArcadeSdk/tools/PublishAfterBuild.targets
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project>
-   <Target Name="AfterBuild" DependsOnTargets="PublishPropertySetup;Publish"/> 
-  
-   <Target Name="PublishPropertySetup">
-     <PropertyGroup>
-         <NoBuild>true</NoBuild>
-     </PropertyGroup>
-   </Target>
-
-</Project>
diff --git a/eng/WpfArcadeSdk/tools/RunDrtsLocal.targets b/eng/WpfArcadeSdk/tools/RunDrtsLocal.targets
index 376c35bb846..8a73ac96dab 100644
--- a/eng/WpfArcadeSdk/tools/RunDrtsLocal.targets
+++ b/eng/WpfArcadeSdk/tools/RunDrtsLocal.targets
@@ -1,4 +1,6 @@
 <Project>
+  <!-- The internal and external repos each define their own drts to add that need running. -->
+  <Import Project="$(RepoRoot)\eng\AddDrtsToPayload.targets" Condition="Exists('$(RepoRoot)\eng\AddDrtsToPayload.targets')" />
   <Target Name="RunDrts" AfterTargets="Build" Condition="'$(ContinuousIntegrationBuild)'!='True'">
     <Exec Command="$(RepoRoot)\artifacts\test\$(Configuration)\$(Platform)\runtests.cmd"/>
   </Target>
diff --git a/eng/WpfArcadeSdk/tools/TestProjects.targets b/eng/WpfArcadeSdk/tools/TestProjects.targets
index 28dcf279bcb..d5396b3a087 100644
--- a/eng/WpfArcadeSdk/tools/TestProjects.targets
+++ b/eng/WpfArcadeSdk/tools/TestProjects.targets
@@ -7,8 +7,7 @@
   <PropertyGroup Condition="'$(IsTestProject)' == 'true' or '$(WpfTest)'=='true'">
     <TestArchitectures Condition="'$(PlatformTarget)' == '' or '$(PlatformTarget)' == 'AnyCpu'">x86</TestArchitectures>
     <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
-    <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
-    <CopyLocalLockFileAssemblies Condition="'$(CreateTestPayload)'=='true'">true</CopyLocalLockFileAssemblies>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <IsSelfContained>true</IsSelfContained>
   </PropertyGroup>
 
@@ -19,8 +18,7 @@
     -->
     <PackageReference Include="runtime.$(RuntimeIdentifier).$(MicrosoftDotNetWpfDncEngPackage)"
                       Condition="'$(RepositoryName)'=='wpf'"
-                      Version="$(MicrosoftDotNetWpfDncEngVersion)"
-                      Publish="$(CreateTestPayload)">
+                      Version="$(MicrosoftDotNetWpfDncEngVersion)">
       <CopyLocal>true</CopyLocal>
       <GeneratePathProperty>true</GeneratePathProperty>
     </PackageReference>
@@ -28,24 +26,24 @@
     <!-- 
       PackageReference from individual WPF projects here 
     -->
-    <PackageReference Include="$(SystemIOPackagingPackage)" Version="$(SystemIOPackagingVersion)" Publish="$(CreateTestPayload)" />
+    <PackageReference Include="$(SystemIOPackagingPackage)" Version="$(SystemIOPackagingVersion)" CopyLocal="true" />
     <PackageReference Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryPackageVersion)" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerPackageVersion)" Publish="$(CreateTestPayload)"  />
-    <PackageReference Include="System.Diagnostics.EventLog" Version="$(SystemDiagnosticsEventLogPackageVersion)" Publish="$(CreateTestPayload)" />
-    <PackageReference Include="System.Security.Cryptography.Xml" Version="$(SystemSecurityCryptographyXmlPackageVersion)" Publish="$(CreateTestPayload)" />
-    <PackageReference Include="System.Security.Permissions" Version="$(SystemSecurityPermissionsPackageVersion)" Publish="$(CreateTestPayload)" />
-    <PackageReference Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsPackageVersion)" Publish="$(CreateTestPayload)" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerPackageVersion)" CopyLocal="true"  />
+    <PackageReference Include="System.Diagnostics.EventLog" Version="$(SystemDiagnosticsEventLogPackageVersion)" CopyLocal="true" />
+    <PackageReference Include="System.Security.Cryptography.Xml" Version="$(SystemSecurityCryptographyXmlPackageVersion)" CopyLocal="true" />
+    <PackageReference Include="System.Security.Permissions" Version="$(SystemSecurityPermissionsPackageVersion)" CopyLocal="true" />
+    <PackageReference Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsPackageVersion)" CopyLocal="true" />
 
-    <PackageReference Include="System.Security.AccessControl" Version="$(SystemSecurityAccessControlPackageVersion)" Publish="$(CreateTestPayload)" />
-    <PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsPackageVersion)" Publish="$(CreateTestPayload)" />
+    <PackageReference Include="System.Security.AccessControl" Version="$(SystemSecurityAccessControlPackageVersion)" CopyLocal="true" />
+    <PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsPackageVersion)" CopyLocal="true" />
 
 
 
     <!-- These exist to ensure that dependencies (esp. native ones) are binplaced with tests correctly -->
-    <None Condition="'$(RuntimeIdentifier)'=='win-x64' And '$(CreateTestPayload)'=='true'"
+    <None Condition="'$(RuntimeIdentifier)'=='win-x64'"
           Include="$(Pkgruntime_win-x64_Microsoft_DotNet_Wpf_DncEng)\runtimes\$(RuntimeIdentifier)\native\*.dll"
           CopyToOutputDirectory="PreserveNewest"/>
-    <None Condition="'$(RuntimeIdentifier)'=='win-x86' And '$(CreateTestPayload)'=='true'"
+    <None Condition="'$(RuntimeIdentifier)'=='win-x86'"
            Include="$(Pkgruntime_win-x86_Microsoft_DotNet_Wpf_DncEng)\runtimes\$(RuntimeIdentifier)\native\*.dll"
           CopyToOutputDirectory="PreserveNewest"/>
 
diff --git a/src/Microsoft.DotNet.Wpf/test/Common/Directory.Build.props b/src/Microsoft.DotNet.Wpf/test/Common/Directory.Build.props
index 7e783514db2..66ffd0bbef4 100644
--- a/src/Microsoft.DotNet.Wpf/test/Common/Directory.Build.props
+++ b/src/Microsoft.DotNet.Wpf/test/Common/Directory.Build.props
@@ -1,6 +1,3 @@
 <Project>
   <Import Condition="Exists('../Directory.Build.props')" Project="../Directory.Build.props" />
-  <PropertyGroup>
-    <PublishDir>$(WpfTestBasePublishPath)\Common</PublishDir>
-  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/Directory.Build.props b/src/Microsoft.DotNet.Wpf/test/DRT/Directory.Build.props
index 7167d0c5112..66ffd0bbef4 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT/Directory.Build.props
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/Directory.Build.props
@@ -1,6 +1,3 @@
 <Project>
   <Import Condition="Exists('../Directory.Build.props')" Project="../Directory.Build.props" />
-  <PropertyGroup>
-    <PublishDir>$(WpfTestBasePublishPath)\DRT</PublishDir>
-  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Wpf/test/Directory.Build.props b/src/Microsoft.DotNet.Wpf/test/Directory.Build.props
index 7c34f925711..16e1712ef31 100644
--- a/src/Microsoft.DotNet.Wpf/test/Directory.Build.props
+++ b/src/Microsoft.DotNet.Wpf/test/Directory.Build.props
@@ -11,15 +11,7 @@
     <EnableXlfLocalization>false</EnableXlfLocalization>
     <CLSCompliant>false</CLSCompliant>
     <TargetFramework>netcoreapp3.0</TargetFramework>
-
-    <SelfContained>false</SelfContained>
-
-    <!-- Arcade SDK defaults to AnyCpu ~= x64. In WPF, we will map AnyCpu => x86 instead -->
-    <PlatformFolder>x86</PlatformFolder>
-    <PlatformFolder Condition="'$(Platform)' == 'x64'">x64</PlatformFolder>
-    <PublishRoot>$(RepoRoot)artifacts\test\$(Configuration)\$(PlatformFolder)</PublishRoot>
-
-    <WpfTestBasePublishPath>$(PublishRoot)\Test</WpfTestBasePublishPath>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <EmbeddedResource>
diff --git a/src/Microsoft.DotNet.Wpf/test/Directory.Build.targets b/src/Microsoft.DotNet.Wpf/test/Directory.Build.targets
deleted file mode 100644
index 55094856dec..00000000000
--- a/src/Microsoft.DotNet.Wpf/test/Directory.Build.targets
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
-  <Import Project="$(WpfArcadeSdkToolsDir)PublishAfterBuild.targets"/>
-</Project>
-  
\ No newline at end of file

From a2ec5b803490197c883b727bfa571c7aaf3e4c2f Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Fri, 31 May 2019 14:08:44 -0700
Subject: [PATCH 62/72] updating documentation

---
 Documentation/developer-guide.md  | 22 ++++++++++++++++++++++
 Documentation/testing-in-helix.md | 11 +++++------
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/Documentation/developer-guide.md b/Documentation/developer-guide.md
index b8386a38cc3..3673835a6c1 100644
--- a/Documentation/developer-guide.md
+++ b/Documentation/developer-guide.md
@@ -23,6 +23,28 @@ We use the following workflow for building and testing features and fixes.
 
 You first need to [Fork](https://github.com/dotnet/corefx/wiki/Checking-out-the-code-repository#fork-the-repository) and [Clone](https://github.com/dotnet/corefx/wiki/Checking-out-the-code-repository#clone-the-repository) this WPF repository. This is a one-time task.
 
+
+### Running DRTs locally ###
+In order to run the set of DRTs on your local machine, pass the `-test` parameter to the `build.cmd` script. At the end of the run, you should see something like this:
+
+```
+  A total of 1 test Infos were processed, with the following results.
+   Passed: 1
+   Failed (need to analyze): 0
+   Failed (with BugIDs): 0
+   Ignore: 0
+
+```
+If there were any failures, you can cd into $(RepoRoot)\artifacts\test\$(Configuration)\$(Platform)\Test and run the tests manually with the `/debugtests` flag. This will open a cmd window, where you can open the test executable in Visual Studio and debug it. For example, to debug DrtXaml.exe you would enter this into the command window:
+
+`"%ProgramFiles%\Microsoft Visual Studio\2019\Preview\Common7\IDE\devenv.exe" DrtXaml.exe`
+
+Once Visual Studio is open, you will first need to manually change the debugger type from `Auto` to `Mixed (CoreCLR)`. From there you can F5 and the test will execute.
+
+*Note: To run a specific test, you can pass the name of the test like this: `/name=DrtXaml`.*
+
+**NOTE: This requires being run from an admin window at the moment. This restriction will be removed shortly.**
+
 ### Testing Locally built WPF assemblies (excluding PresentationBuildTasks)
 This section of guide is intended to discuss the different approaches for ad-hoc testing of WPF assemblies,
 and not automated testing. There are a few different ways this can be done, and for the most part,
diff --git a/Documentation/testing-in-helix.md b/Documentation/testing-in-helix.md
index 5cbd402f7ad..58274b9f261 100644
--- a/Documentation/testing-in-helix.md
+++ b/Documentation/testing-in-helix.md
@@ -2,12 +2,11 @@
 
 I'd recommend seeing the official Helix [readme](https://github.com/dotnet/arcade/blob/master/src/Microsoft.DotNet.Helix/Sdk/Readme.md) if you are interested in some of the general Helix concepts. I'll briefly outline what we are doing that is a bit unique:
 
-1. Helix has built-in support for running xUnit tests. Since we are not using xUnit, we have to manually setup our machines so that they work with QualityVault and STI.
-We manually restore the helixpublish.proj project during CI builds; this is done in `pipeline.yml`. This allows us to package reference the `Microsoft.DotNet.Wpf.DncEng.Test` package to pull down the binaries that we need. We can extract them into a local folder using the MSBuild property `RestorePackagesPath`, so that when the project is restored, we know the exact relative location of the packages.
-2. We need to create a "TestHost" installation of dotnet on the Helix machine. The default Helix support for installing dotnet only installs version 2.x, and only installs the `Microsoft.NETCore.App` runtime, and not the M`icrosoft.WindowsDesktop.App` or `Microsoft.AspNetCore.App` runtimes. I opted to doing this manually and copy it out of the `.dotnet` folder that gets created as part of ci builds, rather than running an installer on the Helix machine. I figured reducing the number of dependencies on making external network calls and downloading items from the internet the better.
-3. We copy both the nuget packages we care care about and the dotnet install in the `prepare-helix-payload.ps1` script. This gets invoked before we actually run tests in the `pipeline-yml` file located in the `eng` directory. Helix allows you to specify a `HelixCorrelationPayload` directory, where this directory gets deployed to the Helix machine, and is made available in your various helix commands with the `HELIX_CORRELATION_PAYLOAD` environment variable.
-4. Helix and Azure Pipelines can report xUnit logs, so we will be updating QualityVault to produce an xUnit compatible log. We will then need to copy that log to a known location for it to be picked up.
+1. Helix has built-in support for running xUnit tests. Since we are not using xUnit, we have to manually setup our machines so that they work with QualityVault and STI. During the build, we create a payload directory that contains the infrastructure we need. A single project (in our case `DrtXaml`) is responsible for creating this directory (see instances of the MSBuild property `CreateTestPayload`).
+2. After the build is done, we utilize Arcade's `AfterSolutionBuild.targets` extension point to finish creating the rest of the payload if the `-test` parameter is passed to the build. Here we add the just built DRTs and if `-ci` was **not** passed into to the build, run the tests. 
+3. Helix allows you to specify a `HelixCorrelationPayload` directory, where this directory gets deployed to the Helix machine, and is made available in your various helix commands with the `HELIX_CORRELATION_PAYLOAD` environment variable. We use the payload directory created described above.
+4. Helix and Azure Pipelines can report xUnit logs, so we will be updating QualityVault to produce an xUnit compatible log. We will then need to copy that log to a known location for it to be picked up. This location can be in any subfolder of the `HelixWorkItem` working directory. 
 
 ## How we are running tests
 1. Currently, the `HelixQueues` that we selected are Windows.10.Amd64.Open;Windows.7.Amd64.Open;Windows.10.Amd64.ServerRS5.Open. Essentially, this translates to: "Latest Windows 10", "Windows 7", and "Windows 10 RS5 Server" addition. This enables tests to run on some of the most interesting and important SKUs, without overloading the Helix servers and/or making CI runs take an unnecessarily long time to run.
-2. In similar vain, we only run test passes for Release builds, mainly to save time and resources running duplicate tests in a near-identical environment.
\ No newline at end of file
+2. In a similar fashion, we only run test passes for Release builds, mainly to save time and resources running duplicate tests in a near-identical environment.
\ No newline at end of file

From 9bec6543200a8de5c7f548e7d2a704a4ad8e9145 Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Fri, 31 May 2019 14:34:04 -0700
Subject: [PATCH 63/72] fixing typo

---
 eng/WpfArcadeSdk/tools/CreateTestPayload.targets | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/eng/WpfArcadeSdk/tools/CreateTestPayload.targets b/eng/WpfArcadeSdk/tools/CreateTestPayload.targets
index 958044295b7..c92938d61f4 100644
--- a/eng/WpfArcadeSdk/tools/CreateTestPayload.targets
+++ b/eng/WpfArcadeSdk/tools/CreateTestPayload.targets
@@ -17,10 +17,6 @@
     <PackageReference Include="runtime.$(LocalRuntimeIdentifier).Microsoft.DotNet.Wpf.Test" Version="$(MicrosoftDotNetWpfTestPackageVersion)" GeneratePathProperty="true" />
   </ItemGroup>
 
-  <ItemGroup>
-    <DRT Include="DrtXaml" />
-  </ItemGroup>
-
   <PropertyGroup Condition="'$(LocalRuntimeIdentifier)'=='win-x86'">
     <MicrosoftDotNetWpfTestPath>$(Pkgruntime_win-x86_Microsoft_DotNet_Wpf_Test)\tools\$(LocalRuntimeIdentifier)\Test\</MicrosoftDotNetWpfTestPath>
   </PropertyGroup>
@@ -34,10 +30,7 @@
       <MicrosoftDotNetWpfTestContents Include="$(MicrosoftDotNetWpfTestPath)\**\*.*" />
       <OtherPayloadContents Include="$(WpfArcadeSdkToolsDir)runtests.cmd" />
       <OtherPayloadContents Include="$(WpfArcadeSdkToolsDir)runtests.ps1" />
-      <OtherPayloadContents Include="$(WpfArcadeSdkToolsDir)configure-helix-machine.ps1" Condition="'$(ContinousIntegrationBuild)'=='True'" />
-
-      <DrtPayloadContents Include="$(RepoRoot)artifacts\bin\%(DRT.Identity)\$(PlatformFolder)\$(Configuration)\**\*.*"/>
-
+      <OtherPayloadContents Include="$(WpfArcadeSdkToolsDir)configure-helix-machine.ps1" Condition="'$(ContinuousIntegrationBuild)'=='True'" />
     </ItemGroup>
 
     <Copy SourceFiles="@(MicrosoftDotNetWpfTestContents)"
@@ -51,9 +44,6 @@
 
     <Copy SourceFiles="$(WpfTestsDir)BranchCommon\data\DrtList.xml"
           DestinationFolder="$(WpfTestBasePublishPath)\DRT"  />
-
-    <Copy SourceFiles="@(DrtPayloadContents)"
-          DestinationFolder="@(DrtPayloadContents->'$(DrtPayloadContents)\%(RecursiveDir)%(Filename)%(Extension)')"  />
   </Target>
 
 </Project>

From a08952da42e9d5b9ce75b094a80ddc8cd4864ed3 Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Mon, 3 Jun 2019 09:46:43 -0700
Subject: [PATCH 64/72] responding to pr feedback

---
 Documentation/developer-guide.md              |  12 ++-
 eng/AddDrtsToPayload.targets                  |  26 -----
 eng/WpfArcadeSdk/Sdk/Sdk.props                |   4 +
 .../tools/AddDrtsToPayload.targets            |  35 ++++++
 .../tools/CreateTestPayload.targets           |  23 ++--
 eng/WpfArcadeSdk/tools/DrtsToRun.props        |   9 ++
 eng/WpfArcadeSdk/tools/RunDrtsLocal.targets   |   7 +-
 eng/WpfArcadeSdk/tools/TestProjects.targets   |   3 +-
 eng/helixpublish.proj                         | 100 +-----------------
 9 files changed, 75 insertions(+), 144 deletions(-)
 delete mode 100644 eng/AddDrtsToPayload.targets
 create mode 100644 eng/WpfArcadeSdk/tools/AddDrtsToPayload.targets
 create mode 100644 eng/WpfArcadeSdk/tools/DrtsToRun.props

diff --git a/Documentation/developer-guide.md b/Documentation/developer-guide.md
index 3673835a6c1..3e3ae808a4f 100644
--- a/Documentation/developer-guide.md
+++ b/Documentation/developer-guide.md
@@ -35,15 +35,17 @@ In order to run the set of DRTs on your local machine, pass the `-test` paramete
    Ignore: 0
 
 ```
-If there were any failures, you can cd into $(RepoRoot)\artifacts\test\$(Configuration)\$(Platform)\Test and run the tests manually with the `/debugtests` flag. This will open a cmd window, where you can open the test executable in Visual Studio and debug it. For example, to debug DrtXaml.exe you would enter this into the command window:
+If there were any failures, you can cd into $(RepoRoot)\artifacts\test\$(Configuration)\$(Platform)\Test and run the tests manually with the `/debugtests` flag using the `RunDrts.cmd` script. Note that you do not run the `RunDrtsDebug` script, as this will debug the test infrastructure, `QualityVault`. When you pass the `/debugtests` flag, a cmd window will open where you can open the test executable in Visual Studio and debug it. When the cmd pops up, you will see instructions for debugging using a few different commands, however these commands will enable you to debug the `Simple Test Invocation` executable, `sti.exe`, which simply launches the test executable you are most likely interested in debugging. Using `DrtXaml.exe` as an example, this is how you can debug the test executable:
 
+1. `$(RepoRoot)\artifacts\test\$(Configuration)\$(Platform)\Test\RunDrts.cmd /name=DrtXaml /debugtests`
+2. Enter following command into the cmd window that pops up:
 `"%ProgramFiles%\Microsoft Visual Studio\2019\Preview\Common7\IDE\devenv.exe" DrtXaml.exe`
+3. Once Visual Studio is open, manually change the debugger type from `Auto` to `Mixed (CoreCLR)`.
+4. From there you can F5 and the test will execute.
 
-Once Visual Studio is open, you will first need to manually change the debugger type from `Auto` to `Mixed (CoreCLR)`. From there you can F5 and the test will execute.
+*Note: To run a specific test, you can pass the name of the test like this: `/name=DrtXaml`. The names of these tests are contained in DrtList.xml*
 
-*Note: To run a specific test, you can pass the name of the test like this: `/name=DrtXaml`.*
-
-**NOTE: This requires being run from an admin window at the moment. This restriction will be removed shortly.**
+**NOTE: This requires being run from an admin window at the moment. Removing this restriction is tracked by https://github.com/dotnet/wpf/issues/816. **
 
 ### Testing Locally built WPF assemblies (excluding PresentationBuildTasks)
 This section of guide is intended to discuss the different approaches for ad-hoc testing of WPF assemblies,
diff --git a/eng/AddDrtsToPayload.targets b/eng/AddDrtsToPayload.targets
deleted file mode 100644
index 30f8f09b80a..00000000000
--- a/eng/AddDrtsToPayload.targets
+++ /dev/null
@@ -1,26 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <!-- AnyCPU/x86 builds don't produce an output folder in artifacts. This only exists for x64 builds. -->
-    <PlatformFolder Condition="'$(Platform)'=='x64'">x64</PlatformFolder>
-
-    <!-- For the test payload, we default to x86 for AnyCPU platform --> 
-    <PayloadPlatformFolder>x86</PayloadPlatformFolder>
-    <PayloadPlatformFolder Condition="'$(Platform)'=='x64'">x64</PayloadPlatformFolder>
-    <PayloadBaseLocation>$(RepoRoot)artifacts\test\$(Configuration)\$(PayloadPlatformFolder)</PayloadBaseLocation>
-    <PayloadDrtLocation>$(PayloadBaseLocation)\Test\DRT</PayloadDrtLocation>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <!-- List of DRTs to include -->
-    <DRT Include="DrtXaml" />
-  </ItemGroup>
-
-  <Target Name="AddDrtsToPayload" BeforeTargets="RunDrts">
-    <ItemGroup>
-      <DrtPayloadContents Include="$(RepoRoot)artifacts\bin\%(DRT.Identity)\$(PlatformFolder)\$(Configuration)\**\*.*"/>
-    </ItemGroup>
-    <Copy SourceFiles="@(DrtPayloadContents)"
-          DestinationFiles="@(DrtPayloadContents->'$(PayloadDrtLocation)\%(RecursiveDir)%(Filename)%(Extension)')"  />
-  </Target>
-
-</Project>
diff --git a/eng/WpfArcadeSdk/Sdk/Sdk.props b/eng/WpfArcadeSdk/Sdk/Sdk.props
index 2393ddf03e9..19eec4d0054 100644
--- a/eng/WpfArcadeSdk/Sdk/Sdk.props
+++ b/eng/WpfArcadeSdk/Sdk/Sdk.props
@@ -17,6 +17,10 @@
     <LangVersion Condition="'$(LangVersion)'==''">8.0</LangVersion>
     <CLSCompliant Condition="'$(CLSCompliant)'==''">true</CLSCompliant>
     <IncludeDllSafeSearchPathAttribute Condition="'$(IncludeDllSafeSearchPathAttribute )'==''">true</IncludeDllSafeSearchPathAttribute>
+
+    <!-- Properly calculates the RuntimeIdentifier based on the Platform type. Doesn't actually set the RuntimeIdentifier property. -->
+    <WpfRuntimeIdentifier Condition="('$(Platform)'!='AnyCPU' and '$(Platform)'!='Win32') Or $(Platform.EndsWith('64'))">win-$(Platform)</WpfRuntimeIdentifier>
+    <WpfRuntimeIdentifier Condition="'$(Platform)'=='AnyCPU' or '$(Platform)'=='Win32' or '$(Platform)'=='x86'">win-x86</WpfRuntimeIdentifier>
   </PropertyGroup>
 
   <Import Project="$(WpfArcadeSdkToolsDir)RuntimeFrameworkReference.props"/>
diff --git a/eng/WpfArcadeSdk/tools/AddDrtsToPayload.targets b/eng/WpfArcadeSdk/tools/AddDrtsToPayload.targets
new file mode 100644
index 00000000000..60c1044a63f
--- /dev/null
+++ b/eng/WpfArcadeSdk/tools/AddDrtsToPayload.targets
@@ -0,0 +1,35 @@
+<Project>
+  <!--
+  This .targets file is included by RunDrtsLocal.targets, which is built using the Arcade
+  extension point AfterSolutionBuild.targets. This doesn't include any of the custom MSBuild properties
+  that get set during the regular build. That doesn't matter much to us, there isn't really a whole lot
+  of extra stuff we need to do. We only depend on the $(Platform) and $(Configuration) properties to know
+  where to include the rest of the tests.
+  -->
+  <PropertyGroup>
+    <!-- AnyCPU/x86 builds don't produce an output folder in artifacts. This only exists for x64 builds. -->
+    <PlatformFolder Condition="'$(Platform)'=='x64'">x64</PlatformFolder>
+
+    <!-- For the test payload, we default to x86 for AnyCPU platform. --> 
+    <PayloadBaseLocation>$(RepoRoot)artifacts\test\$(Configuration)\$(Platform)\</PayloadBaseLocation>
+    <PayloadDrtLocation>$(PayloadBaseLocation)Test\DRT\</PayloadDrtLocation>
+  </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. 
+  -->
+  <Import Project="$(RepoRoot)eng\DrtsToRun.props" Condition="Exists('$(RepoRoot)eng\DrtsToRun.props')" />
+
+  <!-- List of DRTs to include that come from dotnet/wpf -->
+  <Import Project="$(MSBuildFileThisDirectory)DrtsToRun.props"/>
+
+  <Target Name="AddDrtsToPayload" BeforeTargets="RunDrts">
+    <ItemGroup>
+      <DrtPayloadContents Include="$(RepoRoot)artifacts\bin\%(DRT.Identity)\$(PlatformFolder)\$(Configuration)\**\*.*"/>
+    </ItemGroup>
+    <Copy SourceFiles="@(DrtPayloadContents)"
+          DestinationFiles="@(DrtPayloadContents->'$(PayloadDrtLocation)%(RecursiveDir)%(Filename)%(Extension)')"  />
+  </Target>
+
+</Project>
diff --git a/eng/WpfArcadeSdk/tools/CreateTestPayload.targets b/eng/WpfArcadeSdk/tools/CreateTestPayload.targets
index c92938d61f4..4f21f19dd24 100644
--- a/eng/WpfArcadeSdk/tools/CreateTestPayload.targets
+++ b/eng/WpfArcadeSdk/tools/CreateTestPayload.targets
@@ -1,8 +1,6 @@
 <Project>
     <!-- We use a local RID here since we don't want to change the build layout by setting the actual RID. -->
   <PropertyGroup>
-    <LocalRuntimeIdentifier Condition="'$(Platform)'=='x64' or '$(Platform)'=='x86' or '$(Platform)'=='arm' or '$(Platform)'=='arm64'">win-$(Platform)</LocalRuntimeIdentifier>
-    <LocalRuntimeIdentifier Condition="'$(Platform)'=='Win32' or '$(Platform)'=='AnyCPU'">win-x86</LocalRuntimeIdentifier>
     <NoWarn>$(NoWarn);NU3027;NU3018</NoWarn>
 
      <!-- Arcade SDK defaults to AnyCpu ~= x64. In WPF, we will map AnyCpu => x86 instead -->
@@ -10,40 +8,37 @@
     <PlatformFolder Condition="'$(Platform)' == 'x64'">x64</PlatformFolder>
     <PublishRoot>$(RepoRoot)artifacts\test\$(Configuration)\$(PlatformFolder)</PublishRoot>
 
-    <WpfTestBasePublishPath>$(PublishRoot)\Test</WpfTestBasePublishPath>
+    <WpfTestBasePublishPath>$(PublishRoot)\Test\</WpfTestBasePublishPath>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="runtime.$(LocalRuntimeIdentifier).Microsoft.DotNet.Wpf.Test" Version="$(MicrosoftDotNetWpfTestPackageVersion)" GeneratePathProperty="true" />
+    <PackageReference Include="runtime.$(WpfRuntimeIdentifier).Microsoft.DotNet.Wpf.Test" Version="$(MicrosoftDotNetWpfTestPackageVersion)" GeneratePathProperty="true" />
   </ItemGroup>
 
-  <PropertyGroup Condition="'$(LocalRuntimeIdentifier)'=='win-x86'">
-    <MicrosoftDotNetWpfTestPath>$(Pkgruntime_win-x86_Microsoft_DotNet_Wpf_Test)\tools\$(LocalRuntimeIdentifier)\Test\</MicrosoftDotNetWpfTestPath>
+  <PropertyGroup Condition="'$(WpfRuntimeIdentifier)'=='win-x86'">
+    <MicrosoftDotNetWpfTestPath>$(Pkgruntime_win-x86_Microsoft_DotNet_Wpf_Test)\tools\$(WpfRuntimeIdentifier)\Test\</MicrosoftDotNetWpfTestPath>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(LocalRuntimeIdentifier)'=='win-x64'">
-    <MicrosoftDotNetWpfTestPath>$(Pkgruntime_win-x64_Microsoft_DotNet_Wpf_Test)\tools\$(LocalRuntimeIdentifier)\Test\</MicrosoftDotNetWpfTestPath>
+  <PropertyGroup Condition="'$(WpfRuntimeIdentifier)'=='win-x64'">
+    <MicrosoftDotNetWpfTestPath>$(Pkgruntime_win-x64_Microsoft_DotNet_Wpf_Test)\tools\$(WpfRuntimeIdentifier)\Test\</MicrosoftDotNetWpfTestPath>
   </PropertyGroup>
 
   <Target Name="CreateTestPayload" BeforeTargets="Test" AfterTargets="Build">
     <ItemGroup>
-      <MicrosoftDotNetWpfTestContents Include="$(MicrosoftDotNetWpfTestPath)\**\*.*" />
+      <MicrosoftDotNetWpfTestContents Include="$(MicrosoftDotNetWpfTestPath)**\*.*" />
       <OtherPayloadContents Include="$(WpfArcadeSdkToolsDir)runtests.cmd" />
       <OtherPayloadContents Include="$(WpfArcadeSdkToolsDir)runtests.ps1" />
       <OtherPayloadContents Include="$(WpfArcadeSdkToolsDir)configure-helix-machine.ps1" Condition="'$(ContinuousIntegrationBuild)'=='True'" />
     </ItemGroup>
 
     <Copy SourceFiles="@(MicrosoftDotNetWpfTestContents)"
-          DestinationFiles="@(MicrosoftDotNetWpfTestContents->'$(WpfTestBasePublishPath)\%(RecursiveDir)%(Filename)%(Extension)')"  />
+          DestinationFiles="@(MicrosoftDotNetWpfTestContents->'$(WpfTestBasePublishPath)%(RecursiveDir)%(Filename)%(Extension)')"  />
 
     <Copy SourceFiles="@(OtherPayloadContents)"
           DestinationFolder="$(PublishRoot)"  />
 
     <Copy SourceFiles="$(WpfTestsDir)BranchCommon\data\DrtList.xml"
-          DestinationFolder="$(WpfTestBasePublishPath)\DRT"  />
-
-    <Copy SourceFiles="$(WpfTestsDir)BranchCommon\data\DrtList.xml"
-          DestinationFolder="$(WpfTestBasePublishPath)\DRT"  />
+          DestinationFolder="$(WpfTestBasePublishPath)DRT"  />
   </Target>
 
 </Project>
diff --git a/eng/WpfArcadeSdk/tools/DrtsToRun.props b/eng/WpfArcadeSdk/tools/DrtsToRun.props
new file mode 100644
index 00000000000..72da7bd3216
--- /dev/null
+++ b/eng/WpfArcadeSdk/tools/DrtsToRun.props
@@ -0,0 +1,9 @@
+<Project>
+  <ItemGroup>
+    <!--
+    List of Drts to run that are built out of dotnet/wpf. Note that this is incredibly
+    similar to DrtList.xml. https://github.com/dotnet/wpf/issues/815 tracks producing this
+    file based on what is in that list. -->
+    <DRT Include="DrtXaml" Area="Xaml"/>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/eng/WpfArcadeSdk/tools/RunDrtsLocal.targets b/eng/WpfArcadeSdk/tools/RunDrtsLocal.targets
index 8a73ac96dab..2c74d3ae3eb 100644
--- a/eng/WpfArcadeSdk/tools/RunDrtsLocal.targets
+++ b/eng/WpfArcadeSdk/tools/RunDrtsLocal.targets
@@ -1,6 +1,11 @@
 <Project>
+  <!--
+  This .targets file is included by the Arcade extension point AfterSolutionBuild.targets. Arcade doesn't
+  include any of the custom MSBuild properties that get set during the regular build. So the $(WpfArcadeSdkPath)
+  properties aren't available to us.
+  -->
   <!-- The internal and external repos each define their own drts to add that need running. -->
-  <Import Project="$(RepoRoot)\eng\AddDrtsToPayload.targets" Condition="Exists('$(RepoRoot)\eng\AddDrtsToPayload.targets')" />
+  <Import Project="$(MSBuildThisFileDirectory)AddDrtsToPayload.targets" Condition="Exists('$(MSBuildThisFileDirectory)AddDrtsToPayload.targets')" />
   <Target Name="RunDrts" AfterTargets="Build" Condition="'$(ContinuousIntegrationBuild)'!='True'">
     <Exec Command="$(RepoRoot)\artifacts\test\$(Configuration)\$(Platform)\runtests.cmd"/>
   </Target>
diff --git a/eng/WpfArcadeSdk/tools/TestProjects.targets b/eng/WpfArcadeSdk/tools/TestProjects.targets
index d5396b3a087..335d9cacf16 100644
--- a/eng/WpfArcadeSdk/tools/TestProjects.targets
+++ b/eng/WpfArcadeSdk/tools/TestProjects.targets
@@ -1,7 +1,6 @@
 <Project>
   <PropertyGroup Condition="'$(WpfTest)'=='true' Or '$(IsTestProject)'=='true'">
-    <RuntimeIdentifier Condition="('$(Platform)'!='AnyCPU' and '$(Platform)'!='Win32') Or $(Platform.EndsWith('64'))">win-$(Platform)</RuntimeIdentifier>
-    <RuntimeIdentifier Condition="'$(Platform)'=='AnyCPU' or '$(Platform)'=='Win32' or '$(Platform)'=='x86'">win-x86</RuntimeIdentifier>
+    <RuntimeIdentifier>$(WpfRuntimeIdentifier)</RuntimeIdentifier>
   </PropertyGroup>
   <!-- Arcade SDK defaults to AnyCpu ~= x64. In WPF, we will map AnyCpu => x86 instead -->
   <PropertyGroup Condition="'$(IsTestProject)' == 'true' or '$(WpfTest)'=='true'">
diff --git a/eng/helixpublish.proj b/eng/helixpublish.proj
index 8f3aa2ac922..a662f8fbc98 100644
--- a/eng/helixpublish.proj
+++ b/eng/helixpublish.proj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.DotNet.Helix.Sdk" DefaultTargets="Test">
+  <Import Project="$(WpfArcadeSdkToolsDir)DrtsToRun.props" />
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <IncludeDotNetCli>true</IncludeDotNetCli>
     <DotNetCliPackageType>runtime</DotNetCliPackageType>
     <!-- Set to match global.json.tools.dotnet by pre-build.ps1 -->
     <DotNetCliVersion>$(MicrosoftNetCoreAppVersion)</DotNetCliVersion>
-    <DotNetCliRuntime>win-x86</DotNetCliRuntime>
-    <DotNetCliRuntime Condition="'$(Platform)' == 'x64'">win-x64</DotNetCliRuntime>
+    <DotNetCliRuntime>$(WpfRuntimeIdentifier)</DotNetCliRuntime>
 
     <EnableXUnitReporter>true</EnableXUnitReporter>
     <EnableAzurePipelinesReporter>true</EnableAzurePipelinesReporter>
@@ -21,102 +21,10 @@
 
   <ItemGroup>
     <HelixCorrelationPayload Include="$(ArtifactsDir)\test\$(Configuration)\$(Platform)" /> 
-    <HelixWorkItem Include="Xaml">
+    <HelixWorkItem Include="@(DRT->'%(Identity)'">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Xaml</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=%(Area)</Command>
     </HelixWorkItem>
    
-   <!--
-   Uncomment when bringing appropriate DRTs out into the open
-   
-   <HelixWorkItem Include="Annotations">
-      <Timeout>00:20:00</Timeout> 
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Annotations</Command>
-    </HelixWorkItem>
-    <HelixWorkItem Include="AppModel">
-      <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=AppModel</Command>
-    </HelixWorkItem>
-    <HelixWorkItem Include="DigitalDocuments">
-      <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=DigitalDocuments</Command>
-    </HelixWorkItem>
-    <HelixWorkItem Include="Media">
-      <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Media</Command>
-    </HelixWorkItem>
-    <HelixWorkItem Include="Editing">
-      <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Editing</Command>
-    </HelixWorkItem>
-    <HelixWorkItem Include="ElementServices">
-      <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=ElementServices</Command>
-    </HelixWorkItem>
-    <HelixWorkItem Include="Text">
-      <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Text</Command>
-    </HelixWorkItem>
-    <HelixWorkItem Include="Animation">
-      <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Animation</Command>
-    </HelixWorkItem>
-    <HelixWorkItem Include="3D">
-      <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=3D</Command>
-    </HelixWorkItem>
-    <HelixWorkItem Include="2D">
-      <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=2D</Command>
-    </HelixWorkItem>
-    <HelixWorkItem Include="Controls">
-      <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Controls</Command>
-    </HelixWorkItem>
-    <HelixWorkItem Include="Imaging">
-      <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Imaging</Command>
-    </HelixWorkItem>
-    <HelixWorkItem Include="FlowLayout">
-      <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=FlowLayout</Command>
-    </HelixWorkItem>
-    <HelixWorkItem Include="DataServices">
-      <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=DataServices</Command>
-    </HelixWorkItem>
-    <HelixWorkItem Include="ElementLayout">
-      <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=ElementLayout</Command>
-    </HelixWorkItem>
-    <HelixWorkItem Include="Xaml">
-      <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Xaml</Command>
-    </HelixWorkItem>
-    <HelixWorkItem Include="Globalization">
-      <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Globalization</Command>
-    </HelixWorkItem>
-    <HelixWorkItem Include="Tablet">
-      <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Tablet</Command>
-    </HelixWorkItem>
-    <HelixWorkItem Include="Integration">
-      <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Integration</Command>
-    </HelixWorkItem>
-    <HelixWorkItem Include="XET">
-      <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=XET</Command>
-    </HelixWorkItem>
-    <HelixWorkItem Include="Printing">
-      <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=Printing</Command>
-    </HelixWorkItem>
-    <HelixWorkItem Include="WindowsFormsIntegration">
-      <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=WindowsFormsIntegration</Command>
-    </HelixWorkItem>
-    -->
   </ItemGroup>
 </Project>
\ No newline at end of file

From ed35be03c31ca69ed44d0e7f0b0bf380f083adf2 Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Mon, 3 Jun 2019 10:42:15 -0700
Subject: [PATCH 65/72] updating injectmoduleinitializer

---
 eng/WpfArcadeSdk/Sdk/Sdk.props                |  5 +++-
 .../tools/InjectModuleInitializer.targets     | 28 +++++++------------
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/eng/WpfArcadeSdk/Sdk/Sdk.props b/eng/WpfArcadeSdk/Sdk/Sdk.props
index 19eec4d0054..d688f838cfc 100644
--- a/eng/WpfArcadeSdk/Sdk/Sdk.props
+++ b/eng/WpfArcadeSdk/Sdk/Sdk.props
@@ -18,7 +18,10 @@
     <CLSCompliant Condition="'$(CLSCompliant)'==''">true</CLSCompliant>
     <IncludeDllSafeSearchPathAttribute Condition="'$(IncludeDllSafeSearchPathAttribute )'==''">true</IncludeDllSafeSearchPathAttribute>
 
-    <!-- Properly calculates the RuntimeIdentifier based on the Platform type. Doesn't actually set the RuntimeIdentifier property. -->
+    <!--
+    Properly calculates the RuntimeIdentifier based on the Platform type. We don't want to affect the build by actually setting RuntimeIdentifier.
+    Those that are interested in setting the RuntimeIdentifier or having a property that mirrors it can use this one here.
+    -->
     <WpfRuntimeIdentifier Condition="('$(Platform)'!='AnyCPU' and '$(Platform)'!='Win32') Or $(Platform.EndsWith('64'))">win-$(Platform)</WpfRuntimeIdentifier>
     <WpfRuntimeIdentifier Condition="'$(Platform)'=='AnyCPU' or '$(Platform)'=='Win32' or '$(Platform)'=='x86'">win-x86</WpfRuntimeIdentifier>
   </PropertyGroup>
diff --git a/eng/WpfArcadeSdk/tools/InjectModuleInitializer.targets b/eng/WpfArcadeSdk/tools/InjectModuleInitializer.targets
index 1e9b0d757cd..2a246ef0937 100644
--- a/eng/WpfArcadeSdk/tools/InjectModuleInitializer.targets
+++ b/eng/WpfArcadeSdk/tools/InjectModuleInitializer.targets
@@ -1,12 +1,4 @@
 <Project>
-
-  <!-- We use a local RID here since we don't want to change the build layout by setting the actual RID. -->
-  <PropertyGroup>
-    <LocalRuntimeIdentifier Condition="'$(Platform)'=='x64' or '$(Platform)'=='x86' or '$(Platform)'=='arm' or '$(Platform)'=='arm64'">win-$(Platform)</LocalRuntimeIdentifier>
-    <LocalRuntimeIdentifier Condition="'$(Platform)'=='Win32' or '$(Platform)'=='AnyCPU'">win-x86</LocalRuntimeIdentifier>
-    <LocalRuntimeIdentifier Condition="'$(Architecture)'==''">win-x64</LocalRuntimeIdentifier>
-  </PropertyGroup>
-
   <Choose>
     <!-- 
         Use the IL Tools that are compiled and distributed with .NET Core.  WPF doesn't currently use these as default because they do not
@@ -20,16 +12,16 @@
         <PackageReference Include="$(PackageRuntimeIdentifierPrefix).Microsoft.NETCore.Runtime.CoreCLR" Version="MicrosoftNETCoreRuntimeCoreCLRVersion" GeneratePathProperty="true" />
       </ItemGroup>
 
-      <PropertyGroup Condition="'$(LocalRuntimeIdentifier)'=='win-x86'">
-        <ILDAsmPath>$(Pkgruntime_win-x86_Microsoft_NETCore_ILDAsm)\runtimes\$(LocalRuntimeIdentifier)\native\</ILDAsmPath>
-        <ILAsmPath>$(Pkgruntime_win-x86_Microsoft_NETCore_ILAsm)\runtimes\$(LocalRuntimeIdentifier)\native\</ILAsmPath>
-        <CoreCLRPath>$(Pkgruntime_win-x86_Microsoft_NETCore_Runtime_CoreCLR)\runtimes\$(LocalRuntimeIdentifier)\native\</CoreCLRPath>
+      <PropertyGroup Condition="'$(WpfRuntimeIdentifier)'=='win-x86'">
+        <ILDAsmPath>$(Pkgruntime_win-x86_Microsoft_NETCore_ILDAsm)\runtimes\$(WpfRuntimeIdentifier)\native\</ILDAsmPath>
+        <ILAsmPath>$(Pkgruntime_win-x86_Microsoft_NETCore_ILAsm)\runtimes\$(WpfRuntimeIdentifier)\native\</ILAsmPath>
+        <CoreCLRPath>$(Pkgruntime_win-x86_Microsoft_NETCore_Runtime_CoreCLR)\runtimes\$(WpfRuntimeIdentifier)\native\</CoreCLRPath>
       </PropertyGroup>
 
-      <PropertyGroup Condition="'$(LocalRuntimeIdentifier)'=='win-x64'">
-        <ILDAsmPath>$(Pkgruntime_win-x64_Microsoft_NETCore_ILDAsm)\runtimes\$(LocalRuntimeIdentifier)\native\</ILDAsmPath>
-        <ILAsmPath>$(Pkgruntime_win-x64_Microsoft_NETCore_ILAsm)\runtimes\$(LocalRuntimeIdentifier)\native\</ILAsmPath>
-        <CoreCLRPath>$(Pkgruntime_win-x64_Microsoft_NETCore_Runtime_CoreCLR)\runtimes\$(LocalRuntimeIdentifier)\native\</CoreCLRPath>
+      <PropertyGroup Condition="'$(WpfRuntimeIdentifier)'=='win-x64'">
+        <ILDAsmPath>$(Pkgruntime_win-x64_Microsoft_NETCore_ILDAsm)\runtimes\$(WpfRuntimeIdentifier)\native\</ILDAsmPath>
+        <ILAsmPath>$(Pkgruntime_win-x64_Microsoft_NETCore_ILAsm)\runtimes\$(WpfRuntimeIdentifier)\native\</ILAsmPath>
+        <CoreCLRPath>$(Pkgruntime_win-x64_Microsoft_NETCore_Runtime_CoreCLR)\runtimes\$(WpfRuntimeIdentifier)\native\</CoreCLRPath>
 
       </PropertyGroup>
 
@@ -355,8 +347,8 @@
   -->
   <Target Name="FindNetFrameworkILTools" BeforeTargets="DeconstructDll" Condition="'$(UseNetCoreILTools)'!='true'">
     <PropertyGroup>
-      <DotNetFrameworkBitness Condition="'$(LocalRuntimeIdentifier)'=='win-x64'">Bitness64</DotNetFrameworkBitness>
-      <DotNetFrameworkBitness Condition="'$(LocalRuntimeIdentifier)'=='win-x86'">Bitness32</DotNetFrameworkBitness>
+      <DotNetFrameworkBitness Condition="'$(WpfRuntimeIdentifier)'=='win-x64'">Bitness64</DotNetFrameworkBitness>
+      <DotNetFrameworkBitness Condition="'$(WpfRuntimeIdentifier)'=='win-x86'">Bitness32</DotNetFrameworkBitness>
     </PropertyGroup>
     <FindDotNetFrameworkILToolsTask DotNetBitness="$(DotNetFrameworkBitness)">
       <Output TaskParameter="ILDAsm" PropertyName="ILDAsm" />

From 9bfaccce112f93fc2f51b0c8628a52006d036771 Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Mon, 3 Jun 2019 11:59:48 -0700
Subject: [PATCH 66/72] fix batching

---
 .../tools/configure-helix-machine.ps1         | 26 +------------------
 eng/helixpublish.proj                         |  2 +-
 2 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/eng/WpfArcadeSdk/tools/configure-helix-machine.ps1 b/eng/WpfArcadeSdk/tools/configure-helix-machine.ps1
index 4f20fb2866a..50004a6ef5c 100644
--- a/eng/WpfArcadeSdk/tools/configure-helix-machine.ps1
+++ b/eng/WpfArcadeSdk/tools/configure-helix-machine.ps1
@@ -3,28 +3,4 @@ $dotnetLocation = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.P
 
 # Set DOTNET_ROOT variables so the host can find it
 Set-Item -Path "env:DOTNET_ROOT(x86)" -Value $dotnetLocation
-Set-Item -Path "env:DOTNET_ROOT" -Value $dotnetLocation
-
-$runtimes = dotnet --list-runtimes
-foreach ($rt in $runtimes)
-{
-    if ($rt.StartsWith("Microsoft.WindowsDesktop.App"))
-    {
-        $version = $rt.Split(" ")[1]
-    }
-}
-
-# Rewrite the *.runtimeconfig.json files to match the version of the runtime on the machine
-$infraLocation = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "Test\Infra"
-$stiConfigFile = Join-Path $infraLocation "Sti.runtimeconfig.json"
-$qvConfigFile = Join-Path $infraLocation "QualityVaultFrontEnd.runtimeconfig.json"
-$configFiles = $stiConfigFile, $qvConfigFile
-foreach ($config in $configFiles)
-{
-    # Read current config file
-    $jsondata = Get-Content -Raw -Path $config | ConvertFrom-Json
-    # Update version
-    $jsondata.runtimeOptions.framework.version = $version
-    # Write data back
-    $jsondata | ConvertTo-Json -depth 100 | Set-Content $config
-}
\ No newline at end of file
+Set-Item -Path "env:DOTNET_ROOT" -Value $dotnetLocation
\ No newline at end of file
diff --git a/eng/helixpublish.proj b/eng/helixpublish.proj
index a662f8fbc98..c1c150c4535 100644
--- a/eng/helixpublish.proj
+++ b/eng/helixpublish.proj
@@ -21,7 +21,7 @@
 
   <ItemGroup>
     <HelixCorrelationPayload Include="$(ArtifactsDir)\test\$(Configuration)\$(Platform)" /> 
-    <HelixWorkItem Include="@(DRT->'%(Identity)'">
+    <HelixWorkItem Include="@(DRT)">
       <Timeout>00:20:00</Timeout>
       <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=%(Area)</Command>
     </HelixWorkItem>

From f64744a57052d27f1361e61943da5da031cae974 Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Mon, 3 Jun 2019 14:23:16 -0700
Subject: [PATCH 67/72] add back workaround for missing WindowsDesktop

---
 .../tools/configure-helix-machine.ps1         | 39 ++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/eng/WpfArcadeSdk/tools/configure-helix-machine.ps1 b/eng/WpfArcadeSdk/tools/configure-helix-machine.ps1
index 50004a6ef5c..eae32cb9213 100644
--- a/eng/WpfArcadeSdk/tools/configure-helix-machine.ps1
+++ b/eng/WpfArcadeSdk/tools/configure-helix-machine.ps1
@@ -3,4 +3,41 @@ $dotnetLocation = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.P
 
 # Set DOTNET_ROOT variables so the host can find it
 Set-Item -Path "env:DOTNET_ROOT(x86)" -Value $dotnetLocation
-Set-Item -Path "env:DOTNET_ROOT" -Value $dotnetLocation
\ No newline at end of file
+Set-Item -Path "env:DOTNET_ROOT" -Value $dotnetLocation
+
+# Temporary workaround until https://github.com/dotnet/wpf/issues/816 is addressed.
+# The test infrastructure is built against an older version of Microsoft.WindowsDesktop.App.
+# Here we re-write the infrastructure runtimeconfig files so that they can load
+$runtimes = dotnet --list-runtimes
+foreach ($rt in $runtimes)
+{
+    if ($rt.StartsWith("Microsoft.WindowsDesktop.App"))
+    {
+        $version = $rt.Split(" ")[1]
+    }
+}
+
+if ($null -ne $version)
+{
+    # Rewrite the *.runtimeconfig.json files to match the version of the runtime on the machine
+    $infraLocation = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "Test\Infra"
+    $stiConfigFile = Join-Path $infraLocation "Sti.runtimeconfig.json"
+    $qvConfigFile = Join-Path $infraLocation "QualityVaultFrontEnd.runtimeconfig.json"
+    $configFiles = $stiConfigFile, $qvConfigFile
+    foreach ($config in $configFiles)
+    {
+        # Read current config file
+        $jsondata = Get-Content -Raw -Path $config | ConvertFrom-Json
+        # Update version
+        $jsondata.runtimeOptions.framework.version = $version
+        # Write data back
+        $jsondata | ConvertTo-Json -depth 100 | Set-Content $config
+    } 
+}
+else
+{
+    Write-Error "No WindowsDesktop runtime found on machine!"
+    
+    Write-Output "Runtimes installed:"
+    Write-Output $runtimes
+}

From 61d53a83e58188f1da040fe72b5c696ebfc55552 Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Tue, 4 Jun 2019 06:48:36 -0700
Subject: [PATCH 68/72] add WindowsDesktop package to payload for CI builds

QualityVault and STI require the WindowsDesktop package
---
 .../tools/CreateTestPayload.targets           | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/eng/WpfArcadeSdk/tools/CreateTestPayload.targets b/eng/WpfArcadeSdk/tools/CreateTestPayload.targets
index 4f21f19dd24..74ec58027b8 100644
--- a/eng/WpfArcadeSdk/tools/CreateTestPayload.targets
+++ b/eng/WpfArcadeSdk/tools/CreateTestPayload.targets
@@ -6,9 +6,11 @@
      <!-- Arcade SDK defaults to AnyCpu ~= x64. In WPF, we will map AnyCpu => x86 instead -->
     <PlatformFolder>x86</PlatformFolder>
     <PlatformFolder Condition="'$(Platform)' == 'x64'">x64</PlatformFolder>
-    <PublishRoot>$(RepoRoot)artifacts\test\$(Configuration)\$(PlatformFolder)</PublishRoot>
+    <PayloadRoot>$(RepoRoot)artifacts\test\$(Configuration)\$(PlatformFolder)</PayloadRoot>
 
-    <WpfTestBasePublishPath>$(PublishRoot)\Test\</WpfTestBasePublishPath>
+    <WpfTestBasePayloadPath>$(PayloadRoot)\Test\</WpfTestBasePayloadPath>
+
+    <WindowsDesktopPayloadPath>$(PayloadRoot)\dotnet\shared\Microsoft.WindowsDesktop.App\</WindowsDesktopPayloadPath>
   </PropertyGroup>
 
   <ItemGroup>
@@ -29,16 +31,26 @@
       <OtherPayloadContents Include="$(WpfArcadeSdkToolsDir)runtests.cmd" />
       <OtherPayloadContents Include="$(WpfArcadeSdkToolsDir)runtests.ps1" />
       <OtherPayloadContents Include="$(WpfArcadeSdkToolsDir)configure-helix-machine.ps1" Condition="'$(ContinuousIntegrationBuild)'=='True'" />
+
+      <!-- 
+        We have to ship over the WindowsDesktop for our test infrastructure.
+        Once https://github.com/dotnet/wpf/issues/816 is done we can remove this.
+      -->
+      <WindowsDesktopContents Include="$(RepoRoot).dotnet\shared\Microsoft.WindowsDesktop.App\**\*.*" />
     </ItemGroup>
 
     <Copy SourceFiles="@(MicrosoftDotNetWpfTestContents)"
-          DestinationFiles="@(MicrosoftDotNetWpfTestContents->'$(WpfTestBasePublishPath)%(RecursiveDir)%(Filename)%(Extension)')"  />
+          DestinationFiles="@(MicrosoftDotNetWpfTestContents->'$(WpfTestBasePayloadPath)%(RecursiveDir)%(Filename)%(Extension)')"  />
 
     <Copy SourceFiles="@(OtherPayloadContents)"
-          DestinationFolder="$(PublishRoot)"  />
+          DestinationFolder="$(PayloadRoot)"  />
 
     <Copy SourceFiles="$(WpfTestsDir)BranchCommon\data\DrtList.xml"
-          DestinationFolder="$(WpfTestBasePublishPath)DRT"  />
+          DestinationFolder="$(WpfTestBasePayloadPath)DRT"  />
+
+    <Copy SourceFiles="@(WindowsDesktopContents)"
+          DestinationFiles="@(WindowsDesktopContents->'$(WindowsDesktopPayloadPath)%(RecursiveDir)%(Filename)%(Extension)')"
+          Condition="'$(ContinuousIntegrationBuild)'=='True'"/>
   </Target>
 
 </Project>

From d8b1f9037b1a351847af97c747a34803be34e3a6 Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Tue, 4 Jun 2019 10:59:28 -0700
Subject: [PATCH 69/72] ensure ResolveFrameworkReferences actually works

---
 .../tools/configure-helix-machine.ps1         |  5 --
 eng/WpfArcadeSdk/tools/runtests.ps1           | 24 ++++++-
 eng/helixpublish.proj                         |  2 +-
 .../BamlAvoidXmlTest/BamlAvoidXmlTest.csproj  |  6 --
 .../test/DRT/DrtXaml/DrtXaml/DrtXaml.csproj   |  2 +-
 .../XamlTestClasses/XamlTestClasses.csproj    |  1 +
 .../test/Directory.Build.props                |  2 +-
 .../test/MultiTargeting.props                 | 65 +++++++++++++++++++
 8 files changed, 90 insertions(+), 17 deletions(-)
 create mode 100644 src/Microsoft.DotNet.Wpf/test/MultiTargeting.props

diff --git a/eng/WpfArcadeSdk/tools/configure-helix-machine.ps1 b/eng/WpfArcadeSdk/tools/configure-helix-machine.ps1
index eae32cb9213..63d0db5ed97 100644
--- a/eng/WpfArcadeSdk/tools/configure-helix-machine.ps1
+++ b/eng/WpfArcadeSdk/tools/configure-helix-machine.ps1
@@ -1,9 +1,4 @@
 # This file prepares the helix machine for our tests runs
-$dotnetLocation = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "dotnet"
-
-# Set DOTNET_ROOT variables so the host can find it
-Set-Item -Path "env:DOTNET_ROOT(x86)" -Value $dotnetLocation
-Set-Item -Path "env:DOTNET_ROOT" -Value $dotnetLocation
 
 # Temporary workaround until https://github.com/dotnet/wpf/issues/816 is addressed.
 # The test infrastructure is built against an older version of Microsoft.WindowsDesktop.App.
diff --git a/eng/WpfArcadeSdk/tools/runtests.ps1 b/eng/WpfArcadeSdk/tools/runtests.ps1
index b3cda8665db..f9da1e186ce 100644
--- a/eng/WpfArcadeSdk/tools/runtests.ps1
+++ b/eng/WpfArcadeSdk/tools/runtests.ps1
@@ -1,13 +1,31 @@
 [CmdLetBinding()]
 Param(
-    [string]$command
+    [string]$command,
+    [switch]$ci
 )
 
-# Configure the machine before running tests
-if (Test-Path "$PSScriptRoot\configure-helix-machine.ps1")
+if ($ci)
 {
+    # When running in ci, the dotnet install is located at %HELIX_CORRELATION_PAYLOAD% along with all our test content.
+    $dotnetLocation = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "dotnet"
+    # Only either the x86 or x64 versions of dotnet are installed on the helix machine, and they both go to the same location
+    $x86dotnetLocation = $dotnetLocation
+
+    # Run any extra machine setup required for Helix
     . "$PSScriptRoot\configure-helix-machine.ps1"
 }
+else
+{
+    # When running local, we run out of $(RepoRoot)artifacts\test\$(Configuration)\$(Platform)
+    # The dotnet install is located at $(RepoRoot).dotnet
+    $dotnetLocation =  Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "..\..\..\..\.dotnet" -Resolve
+    # The x86 location installed by Arcade is in the x86 directory
+    $x86dotnetLocation = "$dotnetLocation\x86"
+}
+
+# Set DOTNET_ROOT variables so the host can find it
+Set-Item -Path "env:DOTNET_ROOT(x86)" -Value $x86dotnetLocation
+Set-Item -Path "env:DOTNET_ROOT" -Value $dotnetLocation
 
 # Run the tests
 $testLocation = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "Test"
diff --git a/eng/helixpublish.proj b/eng/helixpublish.proj
index c1c150c4535..1b081126899 100644
--- a/eng/helixpublish.proj
+++ b/eng/helixpublish.proj
@@ -23,7 +23,7 @@
     <HelixCorrelationPayload Include="$(ArtifactsDir)\test\$(Configuration)\$(Platform)" /> 
     <HelixWorkItem Include="@(DRT)">
       <Timeout>00:20:00</Timeout>
-      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=%(Area)</Command>
+      <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=%(Area) -ci</Command>
     </HelixWorkItem>
    
   </ItemGroup>
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlAvoidXmlTest/BamlAvoidXmlTest.csproj b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlAvoidXmlTest/BamlAvoidXmlTest.csproj
index dae72c72de6..6587485ae36 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlAvoidXmlTest/BamlAvoidXmlTest.csproj
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/BamlAvoidXmlTest/BamlAvoidXmlTest.csproj
@@ -1,12 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyName>BamlAvoidXmlTest</AssemblyName>
-    <LinkSubsystem>console</LinkSubsystem>
-    <AssemblyIdentityVersionName>WCP</AssemblyIdentityVersionName>
-    <GenerateAssemblyAttribute>false</GenerateAssemblyAttribute>
-    <AddTargetFrameworkAttributeToWpfTestExe>true</AddTargetFrameworkAttributeToWpfTestExe>
-
-    <!-- Avoid auto-generating a main -->
     <RootNamespace>BamlAvoidXmlTest</RootNamespace>
     <Platforms>AnyCPU;x64</Platforms>
   </PropertyGroup>
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/DrtXaml.csproj b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/DrtXaml.csproj
index 769c148aa6e..39fdb07e5da 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/DrtXaml.csproj
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/DrtXaml/DrtXaml.csproj
@@ -3,7 +3,7 @@
     <AssemblyName>DrtXaml</AssemblyName>
     <RootNamespace>DrtXaml</RootNamespace>
     <LinkSubsystem>console</LinkSubsystem>
-    <OutputType>WinExe</OutputType>
+    <OutputType>Exe</OutputType>
     <Platforms>AnyCPU;x64</Platforms>
     <StartupObject>DrtXaml.XamlDrt</StartupObject>
     <CreateTestPayload>true</CreateTestPayload>
diff --git a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/XamlTestClasses/XamlTestClasses.csproj b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/XamlTestClasses/XamlTestClasses.csproj
index a0d7274219d..72ccaf787f5 100644
--- a/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/XamlTestClasses/XamlTestClasses.csproj
+++ b/src/Microsoft.DotNet.Wpf/test/DRT/DrtXaml/XamlTestClasses/XamlTestClasses.csproj
@@ -6,6 +6,7 @@
   </PropertyGroup>
   
   <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>DrtXaml.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   
diff --git a/src/Microsoft.DotNet.Wpf/test/Directory.Build.props b/src/Microsoft.DotNet.Wpf/test/Directory.Build.props
index 16e1712ef31..e7d3f6b26b9 100644
--- a/src/Microsoft.DotNet.Wpf/test/Directory.Build.props
+++ b/src/Microsoft.DotNet.Wpf/test/Directory.Build.props
@@ -10,7 +10,6 @@
     <IsShipping>false</IsShipping>
     <EnableXlfLocalization>false</EnableXlfLocalization>
     <CLSCompliant>false</CLSCompliant>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
   </PropertyGroup>
   <ItemDefinitionGroup>
@@ -18,4 +17,5 @@
       <GenerateSource>false</GenerateSource>
     </EmbeddedResource>
   </ItemDefinitionGroup>
+  <Import Project="$(WpfTestsDir)MultiTargeting.props" />
 </Project>
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Wpf/test/MultiTargeting.props b/src/Microsoft.DotNet.Wpf/test/MultiTargeting.props
new file mode 100644
index 00000000000..f2482461c39
--- /dev/null
+++ b/src/Microsoft.DotNet.Wpf/test/MultiTargeting.props
@@ -0,0 +1,65 @@
+<Project>
+  <PropertyGroup>
+    <TargetFrameworks>netcoreapp3.0</TargetFrameworks>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <DefineConstants Condition="$(TargetFramework.StartsWith('net4'))">$(DefineConstants);NET4X</DefineConstants>
+    <DefineConstants Condition="$(TargetFramework.StartsWith('netcoreapp3'))">$(DefineConstants);NETCOREAPP3_X</DefineConstants>
+
+    <DefineConstants Condition="$(TargetFramework.Equals('net40'))">$(DefineConstants);NET40</DefineConstants>
+    <DefineConstants Condition="$(TargetFramework.Equals('net45'))">$(DefineConstants);NET45</DefineConstants>
+    <DefineConstants Condition="$(TargetFramework.Equals('net451'))">$(DefineConstants);NET451</DefineConstants>
+    <DefineConstants Condition="$(TargetFramework.Equals('net452'))">$(DefineConstants);NET452</DefineConstants>
+    <DefineConstants Condition="$(TargetFramework.Equals('net453'))">$(DefineConstants);NET453</DefineConstants>
+    <DefineConstants Condition="$(TargetFramework.Equals('net46'))">$(DefineConstants);NET46</DefineConstants>
+    <DefineConstants Condition="$(TargetFramework.Equals('net461'))">$(DefineConstants);NET461</DefineConstants>
+    <DefineConstants Condition="$(TargetFramework.Equals('net462'))">$(DefineConstants);NET462</DefineConstants>
+    <DefineConstants Condition="$(TargetFramework.Equals('net47'))">$(DefineConstants);NET47</DefineConstants>
+    <DefineConstants Condition="$(TargetFramework.Equals('net471'))">$(DefineConstants);NET471</DefineConstants>
+    <DefineConstants Condition="$(TargetFramework.Equals('net472'))">$(DefineConstants);NET472</DefineConstants>
+    
+    <DefineConstants Condition="$(TargetFramework.Equals('netcoreapp3.0'))">$(DefineConstants);NETCOREAPP3_0</DefineConstants>
+  </PropertyGroup>
+  
+  <ItemGroup Condition="'$(TargetFramework)'!='net35'">
+    <PackageReference Include="System.Reflection.Emit" Version="$(SystemReflectionEmitPackageVersion)" />
+  </ItemGroup>
+  
+  <!--
+       When IsUnitTestProject is set by Arcade, these ProjectReferences are implicitly included. Many of our
+       tests don't require xUnit. So a non-unit test that does require xUnit has to set the IsXUnitProject property
+       to true.
+  -->
+  <ItemGroup Condition="'$(TargetFramework)'!='net35' and '$(IsUnitTestProject)'!='true' and '$(IsXUnitProject)'=='true'">
+    <PackageReference Include="xunit" Version="$(XUnitVersion)" />
+    <PackageReference Include="xunit.runner.console" Version="$(XUnitRunnerConsoleVersion)">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitRunnerVisualStudioVersion)">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">   
+    <Reference Include="System.Xaml" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+    <Reference Include="UIAutomationClient" />
+    <Reference Include="UIAutomationProvider" />
+    <Reference Include="UIAutomationTypes" />
+    <Reference Include="WindowsBase" />
+    <Reference Include="Accessibility" />
+  </ItemGroup>
+  
+  <ItemGroup Condition="'$(TargetFramework)'=='net35'">
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+    <Reference Include="UIAutomationClient" />
+    <Reference Include="UIAutomationProvider" />
+    <Reference Include="UIAutomationTypes" />
+    <Reference Include="WindowsBase" />
+  </ItemGroup>
+</Project>
\ No newline at end of file

From 6764712498f42ba8ed435663efc12bfcfb5887e3 Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Tue, 4 Jun 2019 13:04:51 -0700
Subject: [PATCH 70/72] workaround no windowsdesktop install on helix machine

---
 eng/Versions.props                            |  4 ++++
 .../tools/CreateTestPayload.targets           | 19 ++++++++++---------
 eng/helixpublish.proj                         | 14 +++++++++++++-
 eng/pipeline.yml                              |  6 +++++-
 eng/pre-build.ps1                             |  7 +++++++
 5 files changed, 39 insertions(+), 11 deletions(-)
 create mode 100644 eng/pre-build.ps1

diff --git a/eng/Versions.props b/eng/Versions.props
index 841a8a4784d..7e0eb5fa390 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -58,6 +58,10 @@
     <XUnitVersion>2.4.0</XUnitVersion>
     <XUnitRunnerConsoleVersion>$(XUnitVersion)</XUnitRunnerConsoleVersion>
     <XUnitRunnerVisualStudioVersion>$(XUnitVersion)</XUnitRunnerVisualStudioVersion>
+    <!--
+    This is the version of the test infrastructure package is compiled against. This should be
+    removed as part of https://github.com/dotnet/wpf/issues/816 
+    -->
     <MicrosoftDotNetWpfTestPackageVersion>1.0.0-beta.19263.1</MicrosoftDotNetWpfTestPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/eng/WpfArcadeSdk/tools/CreateTestPayload.targets b/eng/WpfArcadeSdk/tools/CreateTestPayload.targets
index 74ec58027b8..935ee0943a7 100644
--- a/eng/WpfArcadeSdk/tools/CreateTestPayload.targets
+++ b/eng/WpfArcadeSdk/tools/CreateTestPayload.targets
@@ -10,7 +10,7 @@
 
     <WpfTestBasePayloadPath>$(PayloadRoot)\Test\</WpfTestBasePayloadPath>
 
-    <WindowsDesktopPayloadPath>$(PayloadRoot)\dotnet\shared\Microsoft.WindowsDesktop.App\</WindowsDesktopPayloadPath>
+    <NETCoreAppPayloadPath>$(PayloadRoot)\dotnet\shared\Microsoft.NETCore.App\$(MicrosoftNETCoreAppVersion)\</NETCoreAppPayloadPath>
   </PropertyGroup>
 
   <ItemGroup>
@@ -31,12 +31,7 @@
       <OtherPayloadContents Include="$(WpfArcadeSdkToolsDir)runtests.cmd" />
       <OtherPayloadContents Include="$(WpfArcadeSdkToolsDir)runtests.ps1" />
       <OtherPayloadContents Include="$(WpfArcadeSdkToolsDir)configure-helix-machine.ps1" Condition="'$(ContinuousIntegrationBuild)'=='True'" />
-
-      <!-- 
-        We have to ship over the WindowsDesktop for our test infrastructure.
-        Once https://github.com/dotnet/wpf/issues/816 is done we can remove this.
-      -->
-      <WindowsDesktopContents Include="$(RepoRoot).dotnet\shared\Microsoft.WindowsDesktop.App\**\*.*" />
+      <MicrosoftNetCoreAppContents Include="$(DotNetRoot)shared\Microsoft.NETCore.App\$(MicrosoftNETCoreAppVersion)\**\*.*" />
     </ItemGroup>
 
     <Copy SourceFiles="@(MicrosoftDotNetWpfTestContents)"
@@ -48,8 +43,14 @@
     <Copy SourceFiles="$(WpfTestsDir)BranchCommon\data\DrtList.xml"
           DestinationFolder="$(WpfTestBasePayloadPath)DRT"  />
 
-    <Copy SourceFiles="@(WindowsDesktopContents)"
-          DestinationFiles="@(WindowsDesktopContents->'$(WindowsDesktopPayloadPath)%(RecursiveDir)%(Filename)%(Extension)')"
+      <!-- 
+        We have to ship over the MicrosoftNetCoreApp that we run against for our tests. This is primarily due to QualityVault
+        being built against WindowsDesktop and there not being a way to install WindowsDesktop via the multi-framework support
+        by arcade due to https://github.com/dotnet/core-setup/issues/6370. Once https://github.com/dotnet/wpf/issues/816
+        is done we can remove this.
+      -->
+    <Copy SourceFiles="@(MicrosoftNetCoreAppContents)"
+          DestinationFiles="@(MicrosoftNetCoreAppContents->'$(NETCoreAppPayloadPath)%(RecursiveDir)%(Filename)%(Extension)')"
           Condition="'$(ContinuousIntegrationBuild)'=='True'"/>
   </Target>
 
diff --git a/eng/helixpublish.proj b/eng/helixpublish.proj
index 1b081126899..81f734141b4 100644
--- a/eng/helixpublish.proj
+++ b/eng/helixpublish.proj
@@ -3,9 +3,21 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <IncludeDotNetCli>true</IncludeDotNetCli>
+
+    <!--
+    Ideally we could use $(MicrosoftNetCoreAppVersion) for DotNetCliVersion and 'runtime' for DotNetCliPackageType.
+    However, we need a full install on the Helix machine that includes the WindowsDesktop SDK since QV is dependent on it.
+    Once we move it into the open we can put these back to how they should be. See https://github.com/dotnet/wpf/issues/816 
+    for any more details.
+
+    Right now, we set it to match global.json.tools.dotnet set by pre-build.ps1. Both of these can be removed once the above
+    issue is fixed.
+
     <DotNetCliPackageType>runtime</DotNetCliPackageType>
-    <!-- Set to match global.json.tools.dotnet by pre-build.ps1 -->
     <DotNetCliVersion>$(MicrosoftNetCoreAppVersion)</DotNetCliVersion>
+    -->
+    <DotNetCliPackageType>sdk</DotNetCliPackageType>
+    <DotNetCliVersion>$(DotNetCliVersion)</DotNetCliVersion>
     <DotNetCliRuntime>$(WpfRuntimeIdentifier)</DotNetCliRuntime>
 
     <EnableXUnitReporter>true</EnableXUnitReporter>
diff --git a/eng/pipeline.yml b/eng/pipeline.yml
index f92f5428ee6..0f70d2be7ae 100644
--- a/eng/pipeline.yml
+++ b/eng/pipeline.yml
@@ -119,7 +119,11 @@ jobs:
       steps:
       - checkout: self
         clean: true
-      
+
+      # Set VSO Variable(s)
+      - powershell: eng\pre-build.ps1
+        displayName: Pre-Build - Set VSO Variables
+
       # Use utility script to run script command dependent on agent OS.
       - script: eng\common\cibuild.cmd
           -configuration $(_BuildConfig) 
diff --git a/eng/pre-build.ps1 b/eng/pre-build.ps1
new file mode 100644
index 00000000000..baad60ccbd9
--- /dev/null
+++ b/eng/pre-build.ps1
@@ -0,0 +1,7 @@
+# Open global.json
+$globaljsonpath = Join-Path $env:BUILD_SOURCESDIRECTORY 'global.json'
+$jsondata = Get-Content -Raw -Path $globaljsonpath | ConvertFrom-Json
+
+# Set DotNetCliVersion to global.json.tools.dotnet
+$dotnetcliver = $jsondata.tools.dotnet
+Write-Host "##vso[task.setvariable variable=DotNetCliVersion;]$dotnetcliver"
\ No newline at end of file

From 3c1d3264ae6ffef40d9a2b8f1dc1a7466e9199f9 Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Tue, 4 Jun 2019 13:52:27 -0700
Subject: [PATCH 71/72] updating developer documentation

---
 Documentation/developer-guide.md | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/Documentation/developer-guide.md b/Documentation/developer-guide.md
index 3e3ae808a4f..fae16537f42 100644
--- a/Documentation/developer-guide.md
+++ b/Documentation/developer-guide.md
@@ -35,15 +35,19 @@ In order to run the set of DRTs on your local machine, pass the `-test` paramete
    Ignore: 0
 
 ```
-If there were any failures, you can cd into $(RepoRoot)\artifacts\test\$(Configuration)\$(Platform)\Test and run the tests manually with the `/debugtests` flag using the `RunDrts.cmd` script. Note that you do not run the `RunDrtsDebug` script, as this will debug the test infrastructure, `QualityVault`. When you pass the `/debugtests` flag, a cmd window will open where you can open the test executable in Visual Studio and debug it. When the cmd pops up, you will see instructions for debugging using a few different commands, however these commands will enable you to debug the `Simple Test Invocation` executable, `sti.exe`, which simply launches the test executable you are most likely interested in debugging. Using `DrtXaml.exe` as an example, this is how you can debug the test executable:
+If there were any failures, you can cd into $(RepoRoot)\artifacts\test\$(Configuration)\$(Platform)\Test and run the tests manually with the `/debugtests` flag using the `RunDrts.cmd` script. Note that you do not run the `RunDrtsDebug` script, as this will debug the test infrastructure, `QualityVault`. When you pass the `/debugtests` flag, a cmd window will open where you can open the test executable in Visual Studio and debug it. When the cmd pops up, you will see instructions for debugging using a few different commands, however these commands will enable you to debug the `Simple Test Invocation` executable, `sti.exe`, which simply launches the test executable you are most likely interested in debugging. Using `DrtXaml.exe` as an example, this is how you can debug the test executable. Any MSBuild style properties should be replaced with actual values:
 
 1. `$(RepoRoot)\artifacts\test\$(Configuration)\$(Platform)\Test\RunDrts.cmd /name=DrtXaml /debugtests`
 2. Enter following command into the cmd window that pops up:
 `"%ProgramFiles%\Microsoft Visual Studio\2019\Preview\Common7\IDE\devenv.exe" DrtXaml.exe`
-3. Once Visual Studio is open, manually change the debugger type from `Auto` to `Mixed (CoreCLR)`.
+3. Once Visual Studio is open, go to `Debug-> DrtXaml Properties` and do the following:
+    - Manually change the `Debugger Type` from `Auto` to `Mixed (CoreCLR)`.
+    - Change the `Environment` from `Default` to a custom one that properly defines the `DOTNET_ROOT` variable so that the host is able to locate the install of `Microsoft.NETCore.App`.
+      - x86 (Default): Name: `DOTNET_ROOT(x86)` Value: `$(RepoRoot).dotnet\x86`
+      - x64 (/p:Platform=x64): Name: `DOTNET_ROOT` Value: `$(RepoRoot).dotnet` 
 4. From there you can F5 and the test will execute.
 
-*Note: To run a specific test, you can pass the name of the test like this: `/name=DrtXaml`. The names of these tests are contained in DrtList.xml*
+*Note: To run a specific test, you can pass the name of the test like this: `/name=DrtXaml`. The names of these tests are contained in DrtList.xml.*
 
 **NOTE: This requires being run from an admin window at the moment. Removing this restriction is tracked by https://github.com/dotnet/wpf/issues/816. **
 

From b5372647b221f2b9fbc78de76e6d8d73f9810699 Mon Sep 17 00:00:00 2001
From: Steven Kirbach <steven.kirbach@gmail.com>
Date: Tue, 4 Jun 2019 15:59:06 -0700
Subject: [PATCH 72/72] allow for looking outside of local dotnet install

---
 .../tools/CreateTestPayload.targets           |  9 ++-
 .../tools/configure-helix-machine.ps1         | 38 ----------
 eng/WpfArcadeSdk/tools/configure-machine.ps1  | 71 +++++++++++++++++++
 eng/WpfArcadeSdk/tools/runtests.ps1           | 35 ++++-----
 4 files changed, 93 insertions(+), 60 deletions(-)
 delete mode 100644 eng/WpfArcadeSdk/tools/configure-helix-machine.ps1
 create mode 100644 eng/WpfArcadeSdk/tools/configure-machine.ps1

diff --git a/eng/WpfArcadeSdk/tools/CreateTestPayload.targets b/eng/WpfArcadeSdk/tools/CreateTestPayload.targets
index 935ee0943a7..d96c8e11098 100644
--- a/eng/WpfArcadeSdk/tools/CreateTestPayload.targets
+++ b/eng/WpfArcadeSdk/tools/CreateTestPayload.targets
@@ -26,12 +26,17 @@
   </PropertyGroup>
 
   <Target Name="CreateTestPayload" BeforeTargets="Test" AfterTargets="Build">
+    <PropertyGroup>
+      <LocalDotnetLocation>$(DotNetRoot)x86\</LocalDotnetLocation>
+      <LocalDotnetLocation Condition="'$(Platform)' == 'x64'">$(DotNetRoot)</LocalDotnetLocation>
+
+    </PropertyGroup>
     <ItemGroup>
       <MicrosoftDotNetWpfTestContents Include="$(MicrosoftDotNetWpfTestPath)**\*.*" />
       <OtherPayloadContents Include="$(WpfArcadeSdkToolsDir)runtests.cmd" />
       <OtherPayloadContents Include="$(WpfArcadeSdkToolsDir)runtests.ps1" />
-      <OtherPayloadContents Include="$(WpfArcadeSdkToolsDir)configure-helix-machine.ps1" Condition="'$(ContinuousIntegrationBuild)'=='True'" />
-      <MicrosoftNetCoreAppContents Include="$(DotNetRoot)shared\Microsoft.NETCore.App\$(MicrosoftNETCoreAppVersion)\**\*.*" />
+      <OtherPayloadContents Include="$(WpfArcadeSdkToolsDir)configure-machine.ps1" />
+      <MicrosoftNetCoreAppContents Include="$(LocalDotnetLocation)shared\Microsoft.NETCore.App\$(MicrosoftNETCoreAppVersion)\**\*.*" />
     </ItemGroup>
 
     <Copy SourceFiles="@(MicrosoftDotNetWpfTestContents)"
diff --git a/eng/WpfArcadeSdk/tools/configure-helix-machine.ps1 b/eng/WpfArcadeSdk/tools/configure-helix-machine.ps1
deleted file mode 100644
index 63d0db5ed97..00000000000
--- a/eng/WpfArcadeSdk/tools/configure-helix-machine.ps1
+++ /dev/null
@@ -1,38 +0,0 @@
-# This file prepares the helix machine for our tests runs
-
-# Temporary workaround until https://github.com/dotnet/wpf/issues/816 is addressed.
-# The test infrastructure is built against an older version of Microsoft.WindowsDesktop.App.
-# Here we re-write the infrastructure runtimeconfig files so that they can load
-$runtimes = dotnet --list-runtimes
-foreach ($rt in $runtimes)
-{
-    if ($rt.StartsWith("Microsoft.WindowsDesktop.App"))
-    {
-        $version = $rt.Split(" ")[1]
-    }
-}
-
-if ($null -ne $version)
-{
-    # Rewrite the *.runtimeconfig.json files to match the version of the runtime on the machine
-    $infraLocation = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "Test\Infra"
-    $stiConfigFile = Join-Path $infraLocation "Sti.runtimeconfig.json"
-    $qvConfigFile = Join-Path $infraLocation "QualityVaultFrontEnd.runtimeconfig.json"
-    $configFiles = $stiConfigFile, $qvConfigFile
-    foreach ($config in $configFiles)
-    {
-        # Read current config file
-        $jsondata = Get-Content -Raw -Path $config | ConvertFrom-Json
-        # Update version
-        $jsondata.runtimeOptions.framework.version = $version
-        # Write data back
-        $jsondata | ConvertTo-Json -depth 100 | Set-Content $config
-    } 
-}
-else
-{
-    Write-Error "No WindowsDesktop runtime found on machine!"
-    
-    Write-Output "Runtimes installed:"
-    Write-Output $runtimes
-}
diff --git a/eng/WpfArcadeSdk/tools/configure-machine.ps1 b/eng/WpfArcadeSdk/tools/configure-machine.ps1
new file mode 100644
index 00000000000..e8c54acd2a3
--- /dev/null
+++ b/eng/WpfArcadeSdk/tools/configure-machine.ps1
@@ -0,0 +1,71 @@
+[CmdLetBinding()]
+Param(
+    [switch]$ci
+)
+# This file prepares the machine for our tests runs
+
+if ($ci)
+{
+    # When running in ci, the dotnet install is located at %HELIX_CORRELATION_PAYLOAD% along with all our test content.
+    $dotnetLocation = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "dotnet"
+    # Only either the x86 or x64 versions of dotnet are installed on the helix machine, and they both go to the same location
+    $x86dotnetLocation = $dotnetLocation
+}
+else
+{
+    # When running local, we can use the DOTNET_INSTALL_DIR environment variable set by Arcade
+    $dotnetLocation = $env:DOTNET_INSTALL_DIR
+
+    # The x86 location installed by Arcade is in the x86 directory
+    $x86dotnetLocation = "$dotnetLocation\x86"
+    
+    # This is yet one more unfortunate workaround required until https://github.com/dotnet/wpf/issues/816 is addressed, or until
+    # QualityVault and STI don't use WindowsDesktop any longer. Since the multi-framework support only installs the Microsoft.NETCore.App
+    # runtime in the 'x86' dir, we need the ability to look outside that directory for an install of Microsoft.WindowsDesktop.App.
+    $env:DOTNET_MULTILEVEL_LOOKUP=1
+}
+
+# Set DOTNET_ROOT variables so the host can find it
+Set-Item -Path "env:DOTNET_ROOT(x86)" -Value $x86dotnetLocation
+Set-Item -Path "env:DOTNET_ROOT" -Value $dotnetLocation
+
+# Temporary workaround until https://github.com/dotnet/wpf/issues/816 is addressed.
+# The test infrastructure is built against an older version of Microsoft.WindowsDesktop.App.
+# Here we re-write the infrastructure runtimeconfig files so that they can load
+if ($ci)
+{
+    $runtimes = dotnet --list-runtimes
+    foreach ($rt in $runtimes)
+    {
+        if ($rt.StartsWith("Microsoft.WindowsDesktop.App"))
+        {
+            $version = $rt.Split(" ")[1]
+        }
+    }
+    
+    if ($null -ne $version)
+    {
+        # Rewrite the *.runtimeconfig.json files to match the version of the runtime on the machine
+        $infraLocation = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "Test\Infra"
+        $stiConfigFile = Join-Path $infraLocation "Sti.runtimeconfig.json"
+        $qvConfigFile = Join-Path $infraLocation "QualityVaultFrontEnd.runtimeconfig.json"
+        $configFiles = $stiConfigFile, $qvConfigFile
+        foreach ($config in $configFiles)
+        {
+            # Read current config file
+            $jsondata = Get-Content -Raw -Path $config | ConvertFrom-Json
+            # Update version
+            $jsondata.runtimeOptions.framework.version = $version
+            # Write data back
+            $jsondata | ConvertTo-Json -depth 100 | Set-Content $config
+        } 
+    }
+    else
+    {
+        Write-Error "No WindowsDesktop runtime found on machine!"
+        
+        Write-Output "Runtimes installed:"
+        Write-Output $runtimes
+    }
+    
+}
diff --git a/eng/WpfArcadeSdk/tools/runtests.ps1 b/eng/WpfArcadeSdk/tools/runtests.ps1
index f9da1e186ce..7213e388000 100644
--- a/eng/WpfArcadeSdk/tools/runtests.ps1
+++ b/eng/WpfArcadeSdk/tools/runtests.ps1
@@ -4,29 +4,18 @@ Param(
     [switch]$ci
 )
 
-if ($ci)
+# Run any configuration needed for the test pass
+if (Test-Path "$PSScriptRoot\configure-machine.ps1")
 {
-    # When running in ci, the dotnet install is located at %HELIX_CORRELATION_PAYLOAD% along with all our test content.
-    $dotnetLocation = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "dotnet"
-    # Only either the x86 or x64 versions of dotnet are installed on the helix machine, and they both go to the same location
-    $x86dotnetLocation = $dotnetLocation
-
-    # Run any extra machine setup required for Helix
-    . "$PSScriptRoot\configure-helix-machine.ps1"
+    . "$PSScriptRoot\configure-machine.ps1" -ci:$ci
 }
-else
+
+if (Test-Path "$env:AppData\QualityVault")
 {
-    # When running local, we run out of $(RepoRoot)artifacts\test\$(Configuration)\$(Platform)
-    # The dotnet install is located at $(RepoRoot).dotnet
-    $dotnetLocation =  Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "..\..\..\..\.dotnet" -Resolve
-    # The x86 location installed by Arcade is in the x86 directory
-    $x86dotnetLocation = "$dotnetLocation\x86"
+    # Cleanup any QualityVault stuff left behind before executing the tests
+    Remove-Item "$env:AppData\QualityVault" -Recurse
 }
 
-# Set DOTNET_ROOT variables so the host can find it
-Set-Item -Path "env:DOTNET_ROOT(x86)" -Value $x86dotnetLocation
-Set-Item -Path "env:DOTNET_ROOT" -Value $dotnetLocation
-
 # Run the tests
 $testLocation = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "Test"
 if (Test-Path "$testLocation\rundrts.cmd")
@@ -41,7 +30,13 @@ if (Test-Path "$testLocation\rundrts.cmd")
 # Need to copy the xUnit log to a known location that helix can understand
 if (Test-Path "$env:AppData\QualityVault\Run\Report\testResults.xml")
 {
-    $resultLocation = $PSScriptRoot
-    Write-Output "Copying test results to $resultLocation"
+    $resultLocation = Get-Location
+    Write-Output "Copying testResults.xml to $resultLocation"
     Copy-Item "$env:AppData\QualityVault\Run\Report\testResults.xml" $resultLocation
+}
+
+if (Test-Path "$env:AppData\QualityVault")
+{
+    # Cleanup what QualityVault left behind in AppData to save space on Helix machines
+    Remove-Item "$env:AppData\QualityVault" -Recurse
 }
\ No newline at end of file