Adding fork of xunit.console

Arcade.sln

@@ -77,6 +77,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Helix.Clie
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.SourceRewriter", "src\Microsoft.DotNet.SourceRewriter\Microsoft.DotNet.SourceRewriter.csproj", "{464D41D0-D1C4-4D3C-BD43-28A2B4260EFF}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.XUnitConsoleRunner", "src\Microsoft.DotNet.XUnitConsoleRunner\src\Microsoft.DotNet.XUnitConsoleRunner.csproj", "{2D6BC91D-5D19-4611-B111-FA70C4E8E90D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -463,6 +465,18 @@ Global
 		{464D41D0-D1C4-4D3C-BD43-28A2B4260EFF}.Release|x64.Build.0 = Release|Any CPU
 		{464D41D0-D1C4-4D3C-BD43-28A2B4260EFF}.Release|x86.ActiveCfg = Release|Any CPU
 		{464D41D0-D1C4-4D3C-BD43-28A2B4260EFF}.Release|x86.Build.0 = Release|Any CPU
+		{2D6BC91D-5D19-4611-B111-FA70C4E8E90D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2D6BC91D-5D19-4611-B111-FA70C4E8E90D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2D6BC91D-5D19-4611-B111-FA70C4E8E90D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2D6BC91D-5D19-4611-B111-FA70C4E8E90D}.Debug|x64.Build.0 = Debug|Any CPU
+		{2D6BC91D-5D19-4611-B111-FA70C4E8E90D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2D6BC91D-5D19-4611-B111-FA70C4E8E90D}.Debug|x86.Build.0 = Debug|Any CPU
+		{2D6BC91D-5D19-4611-B111-FA70C4E8E90D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2D6BC91D-5D19-4611-B111-FA70C4E8E90D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2D6BC91D-5D19-4611-B111-FA70C4E8E90D}.Release|x64.ActiveCfg = Release|Any CPU
+		{2D6BC91D-5D19-4611-B111-FA70C4E8E90D}.Release|x64.Build.0 = Release|Any CPU
+		{2D6BC91D-5D19-4611-B111-FA70C4E8E90D}.Release|x86.ActiveCfg = Release|Any CPU
+		{2D6BC91D-5D19-4611-B111-FA70C4E8E90D}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

THIRD-PARTY-NOTICES.TXT

@@ -8,4 +8,24 @@ bring it to our attention. Post an issue or email us:
 
 The attached notices are provided for information only.
 
-No notices are provided at this time.
+---------------------------------------
+
+The code in src/Microsoft.DotNet.XUnitConsoleRunner/src/* was imported from:
+    https://github.com/xunit/xunit/tree/v2/src/xunit.console
+
+This set of code is covered by the following license:
+
+    Copyright (c) .NET Foundation and Contributors
+    All Rights Reserved
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.

eng/Versions.props

@@ -47,6 +47,7 @@
     <SystemValueTupleVersion>4.4.0</SystemValueTupleVersion>
     <WindowsAzureStorageVersion>8.5.0</WindowsAzureStorageVersion>
     <XUnitVersion>2.4.1-pre.build.4059</XUnitVersion>
+    <XUnitAbstractionsVersion>2.0.3</XUnitAbstractionsVersion>
     <XUnitVSRunnerVersion>2.4.1-pre.build.4059</XUnitVSRunnerVersion>
     <MicrosoftDotNetBuildTasksFeedVersion>2.2.0-beta.19067.6</MicrosoftDotNetBuildTasksFeedVersion>
     <MicrosoftDotNetMaestroTasksVersion>1.0.0-beta.19060.8</MicrosoftDotNetMaestroTasksVersion>

src/Microsoft.DotNet.CoreFxTesting/build/core/Core.targets

@@ -31,7 +31,7 @@
     <RunScriptHost Condition="'$(BuildingNETCoreAppVertical)' == 'true' AND '$(TargetOS)' != 'Windows_NT'">$(RunScriptHostDir)dotnet</RunScriptHost>
 
     <!-- In UAP we don't want the repro steps printed. -->
-    <RunScriptOutputEchoes Condition="'$(BuildingUAPVertical)' != 'true' AND '$(UseDotNetNativeToolchain)' != 'true'">true</RunScriptOutputEchoes>
+    <RunScriptOutputEchoes Condition="'$(BuildingUAPVertical)' != 'true'">true</RunScriptOutputEchoes>
   </PropertyGroup>
 
   <Target Name="PublishSupplementalTestData"

src/Microsoft.DotNet.CoreFxTesting/build/core/test/Test.props

@@ -7,7 +7,7 @@
     <TestRunnerConfigPath>$(TestAssetsDir)xunit.runner.json</TestRunnerConfigPath>
     <TestResultsName>testResults.xml</TestResultsName>
 
-    <GenerateRunScriptDependsOn>ValidateTargetOSTrait;$(GenerateRunScriptDependsOn);SetupILCTestProfile;</GenerateRunScriptDependsOn>
+    <GenerateRunScriptDependsOn>ValidateTargetOSTrait;$(GenerateRunScriptDependsOn);</GenerateRunScriptDependsOn>
   </PropertyGroup>
 
   <!-- Test runner config file. -->

src/Microsoft.DotNet.CoreFxTesting/build/core/test/Test.targets

@@ -111,42 +111,33 @@
         <!-- We use the netcoreapp runner for ILC but change its extension to .exe to satisfy ILC. -->
         <OriginalTestRunnerName>xunit.console.dll</OriginalTestRunnerName>
 
-        <RemoteExecutorConsoleAppName>RemoteExecutorConsoleApp.exe</RemoteExecutorConsoleAppName>
-        <RemoteExecutorConsoleAppNameWithoutExtension>RemoteExecutorConsoleApp</RemoteExecutorConsoleAppNameWithoutExtension>
         <_TestILCFolder>%RUNTIME_PATH%\TestILC</_TestILCFolder>
         <ILCBuildType Condition="'$(ILCBuildType)' == ''">ret</ILCBuildType>
         <_UseSharedAssemblies Condition="'$(EnableMultiFileILCTests)' == 'true'">-useSharedAssemblies</_UseSharedAssemblies>
         <_ILCWin32 Condition="'$(BuildingUAPAOTVertical)' != 'true'">-win32</_ILCWin32>
       </PropertyGroup>
+
+      <ItemGroup>
+        <RunScriptCommands Include="for /R &quot;$(ILCFXInputFolder)&quot; %25%25I in (%2A) do @if not exist &quot;%25%25~nxI&quot; (mklink /H &quot;%25%25~nxI&quot; &quot;%25%25I&quot; 1>NUL)" />
+        <RunScriptCommands Include="copy /y $(_TestILCFolder)\default.rd.xml %EXECUTION_DIR%" />
+        <RunScriptCommands Include="move /y $(OriginalTestRunnerName) $(TestRunnerName)" />
+        <RunScriptCommands Include="if exist %EXECUTION_DIR%int rmdir /S /Q %EXECUTION_DIR%int" />
+        <RunScriptCommands Include="if exist %EXECUTION_DIR%native rmdir /S /Q %EXECUTION_DIR%native" />
+
+        <RunScriptCommands Include="call $(_TestILCFolder)\ilc.exe -ExeName $(TestRunnerName) -in %EXECUTION_DIR% -out %EXECUTION_DIR%int\$(TestRunnerName)\ -usedefaultpinvoke -buildtype $(ILCBuildType) -v diag $(_UseSharedAssemblies) $(_ILCWin32)" />
+        <RunScriptCommands Include="set ILCERRORLEVEL=%ERRORLEVEL%" />
+        <RunScriptCommands Include="if NOT [%ILCERRORLEVEL%] == [0] exit /b %ILCERRORLEVEL%" />
+        <RunScriptCommands Include="robocopy /S /NP %EXECUTION_DIR%int\$(TestRunnerName)\ %EXECUTION_DIR%native\" />
+
+        <RunScriptCommands Include="copy /y $(_TestILCFolder)\CRT\vcruntime140_app.dll %EXECUTION_DIR%native" />
+        <RunScriptCommands Include="echo > %EXECUTION_DIR%\native\$(TestAssembly)"/>
+        <RunScriptCommands Include="cd native"/>
+
+        <!-- These will cause failures if execution is skipped, such as on ARM -->
+        <PostRunScriptCommands Condition="'$(ArchGroup)' != 'arm'" Include="copy /y $(TestResultsName) %EXECUTION_DIR%\" />
+      </ItemGroup>
     </When>
 
   </Choose>
 
-  <Target Name="SetupILCTestProfile" Condition="'$(UseDotNetNativeToolchain)' == 'true'">
-
-    <ItemGroup>
-      <TargetExecutableNames Include="$(TestRunnerName)"/>
-      <TargetExecutableNames Condition="'%(ProjectReference.Filename)' == '$(RemoteExecutorConsoleAppNameWithoutExtension)'" Include="$(RemoteExecutorConsoleAppName)"/>
-
-      <RunScriptCommands Include="for /R &quot;$(ILCFXInputFolder)&quot; %25%25I in (%2A) do @if not exist &quot;%25%25~nxI&quot; (mklink /H &quot;%25%25~nxI&quot; &quot;%25%25I&quot; 1>NUL)" />
-      <RunScriptCommands Include="copy /y $(_TestILCFolder)\default.rd.xml %EXECUTION_DIR%" />
-      <RunScriptCommands Include="move /y $(OriginalTestRunnerName) $(TestRunnerName)" />
-      <RunScriptCommands Include="if exist %EXECUTION_DIR%int rmdir /S /Q %EXECUTION_DIR%int" />
-      <RunScriptCommands Include="if exist %EXECUTION_DIR%native rmdir /S /Q %EXECUTION_DIR%native" />
-      <RunScriptCommands Include="@(TargetExecutableNames -> '
-  call $(_TestILCFolder)\ilc.exe -ExeName %(Identity) -in %EXECUTION_DIR% -out %EXECUTION_DIR%int\%(Identity)\ -usedefaultpinvoke:false -buildtype $(ILCBuildType) -v diag $(_UseSharedAssemblies) $(_ILCWin32)
-  set ILCERRORLEVEL=%ERRORLEVEL%
-  if NOT [%ILCERRORLEVEL%] == [0] exit /b %ILCERRORLEVEL%
-  robocopy /S /NP %EXECUTION_DIR%int\%(Identity)\ %EXECUTION_DIR%native\
-  ')"/>
-      <RunScriptCommands Include="copy /y $(_TestILCFolder)\CRT\vcruntime140_app.dll %EXECUTION_DIR%native" />
-      <RunScriptCommands Include="echo > %EXECUTION_DIR%\native\$(TestAssembly)"/>
-      <RunScriptCommands Include="cd native"/>
-
-      <!-- These will cause failures if execution is skipped, such as on ARM -->
-      <PostRunScriptCommands Condition="'$(ArchGroup)' != 'arm'" Include="copy /y $(TestResultsName) %EXECUTION_DIR%\" />
-    </ItemGroup>
-
-  </Target>
-
 </Project>

src/Microsoft.DotNet.XUnitRunnerUap/src/Microsoft.DotNet.XUnitRunnerUap.csproj → src/Microsoft.DotNet.Uap.TestTools/Microsoft.DotNet.XUnitRunnerUap/Microsoft.DotNet.XUnitRunnerUap.csproj

@@ -125,19 +125,62 @@
     <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="CommandLine.cs" />
-    <Compile Include="DictionaryExtensions.cs" />
-    <Compile Include="Program.cs" />
+    <Compile Include="..\..\Microsoft.DotNet.XUnitConsoleRunner\src\CommandLine.cs">
+      <Link>CommandLine.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Microsoft.DotNet.XUnitConsoleRunner\src\ConsoleRunner.cs">
+      <Link>ConsoleRunner.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Microsoft.DotNet.XUnitConsoleRunner\src\ParallelismOption.cs">
+      <Link>ParallelismOption.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Microsoft.DotNet.XUnitConsoleRunner\src\Program.cs">
+      <Link>Program.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Microsoft.DotNet.XUnitConsoleRunner\src\RemoteExecutor.cs">
+      <Link>RemoteExecutor.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Microsoft.DotNet.XUnitConsoleRunner\src\Sinks\DiagnosticMessageSink.cs">
+      <Link>Sinks\DiagnosticMessageSink.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Microsoft.DotNet.XUnitConsoleRunner\src\Utility\Transform.cs">
+      <Link>Utility\Transform.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Microsoft.DotNet.XUnitConsoleRunner\src\Utility\TransformFactory.cs">
+      <Link>Utility\TransformFactory.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Microsoft.DotNet.XUnitConsoleRunner\src\Utility\ConsoleRunnerLogger.cs">
+      <Link>Utility\ConsoleRunnerLogger.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Microsoft.DotNet.XUnitConsoleRunner\src\common\ConsoleHelper.cs">
+      <Link>common\ConsoleHelper.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Microsoft.DotNet.XUnitConsoleRunner\src\common\DictionaryExtensions.cs">
+      <Link>common\DictionaryExtensions.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Microsoft.DotNet.XUnitConsoleRunner\src\common\Json.cs">
+      <Link>common\Json.cs</Link>
+    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="RemoteExecutor.cs" />
-    <Compile Include="StandardUapVisitor.cs" />
   </ItemGroup>
   <ItemGroup>
     <AppxManifest Include="Package.appxmanifest">
       <SubType>Designer</SubType>
     </AppxManifest>
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedContent Include="..\..\Microsoft.DotNet.XUnitConsoleRunner\src\HTML.xslt">
+      <Link>HTML.xslt</Link>
+    </EmbeddedContent>
+    <EmbeddedContent Include="..\..\Microsoft.DotNet.XUnitConsoleRunner\src\JUnitXml.xslt">
+      <Link>JUnitXml.xslt</Link>
+    </EmbeddedContent>
+    <EmbeddedContent Include="..\..\Microsoft.DotNet.XUnitConsoleRunner\src\NUnitXml.xslt">
+      <Link>NUnitXml.xslt</Link>
+    </EmbeddedContent>
+    <EmbeddedContent Include="..\..\Microsoft.DotNet.XUnitConsoleRunner\src\xUnit1.xslt">
+      <Link>xUnit1.xslt</Link>
+    </EmbeddedContent>
     <Content Include="Properties\Default.rd.xml" />
     <Content Include="Assets\Square310x310Logo.png" />
     <Content Include="Assets\Square44x44Logo.png" />
@@ -149,8 +192,13 @@
     <Content Include="Assets\Wide310x150Logo.png" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="Microsoft.Net.Native.Compiler">
+      <Version>2.2.1</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.2.0-Preview1-26502-02</Version>
+      <Version>6.2.0-preview1-26926-04</Version>
     </PackageReference>
     <PackageReference Include="xunit">
       <Version>2.4.1-pre.build.4059</Version>

src/Microsoft.DotNet.XUnitRunnerUap/README.md → src/Microsoft.DotNet.Uap.TestTools/README.md

@@ -12,7 +12,7 @@ Supported platforms:
  - ARM and ARM64 tools installed
  - Windows 10 >= v10.0.17134 (April 2018 Update)
 
- To build and bundle the runner and launcher for deployment invoke the `buildAndUpdate.bat` script as following: `.\buildAndUpdate.bat src Launcher bin`. This will create an output directory (third parameter) which can be copied into the existing nuget package `Microsoft.DotNet.Uap.TestTools` for updates.
+ To build and bundle the runner and launcher for deployment invoke the `buildAndUpdate.bat` script as following: `.\buildAndUpdate.bat Microsoft.DotNet.XUnitRunnerUap WindowsStoreAppLauncher ..\Microsoft.DotNet.XUnitConsoleRunner\src bin\microsoft.dotnet.uap.testtools`. This will create an output directory (third parameter) which can be copied into the existing nuget package `Microsoft.DotNet.Uap.TestTools` for updates.
 
 ## Microsoft.DotNet.XUnitRunnerUap
 

src/Microsoft.DotNet.XUnitRunnerUap/buildAndUpdate.bat → src/Microsoft.DotNet.Uap.TestTools/buildAndUpdate.bat

@@ -2,7 +2,8 @@ setlocal
     echo off
     set RunnerSourceFolder=%1
     set LauncherSourceFolder=%2
-    set DestinationFolder=%3
+    set XUnitConsoleRunnerFolder=%3
+    set DestinationFolder=%4
 
     call :LauncherMain x86
     call :RunnerMain x86
@@ -16,6 +17,8 @@ setlocal
     call :LauncherMain arm64
     call :RunnerMain arm64
 
+    call :XUnitConsoleRunner
+
     echo on
     goto :EOF
 
@@ -26,7 +29,15 @@ setlocal
     msbuild /t:rebuild "%LauncherSourceFolder%\WindowsStoreAppLauncher.vcxproj" /p:Platform=%_platform% /p:Configuration=Release
 
     REM Copy the launcher executable
-    xcopy /y "%LauncherSourceFolder%\bin\%_platform%\Release\WindowsStoreAppLauncher.exe" "%DestinationFolder%\%_platform%\Launcher\"
+    xcopy /y "%LauncherSourceFolder%\bin\%_platform%\Release\WindowsStoreAppLauncher.exe" "%DestinationFolder%\Tools\%_platform%\Launcher\"
+    GOTO :EOF
+
+:XUnitConsoleRunner
+    REM Rebuild the runner
+    msbuild /t:rebuild "%XUnitConsoleRunnerFolder%\Microsoft.DotNet.XUnitConsoleRunner.csproj" /p:DefineConstants="WINDOWS_UWP" /p:OutputPath="bin\WINDOWS_UWP"
+
+    REM Copy the runner executable
+    xcopy /y "%XUnitConsoleRunnerFolder%\bin\WINDOWS_UWP\*" "%DestinationFolder%\lib\netcoreapp2.0\"
     GOTO :EOF
 
 :RunnerMain
@@ -42,12 +53,13 @@ setlocal
     IF "%_platform%" == "arm64" (
         makeappx unpack /l /o /p "%RunnerSourceFolder%\bin\AppPackages\Microsoft.DotNet.XUnitRunnerUap_1.0.0.0_%_platform%_Debug_Test\Dependencies\%_platform%\Microsoft.VCLibs.%_platform%.14.00.appx" /d "%RunnerSourceFolder%\bin\unpack\Microsoft.VCLibs.%_platform%.Debug.14.00\%_platform%"
     ) ELSE (
-        makeappx unpack /l /o /p "%RunnerSourceFolder%\bin\AppPackages\Microsoft.DotNet.XUnitRunnerUap_1.0.0.0_%_platform%_Debug_Test\Dependencies\%_platform%\Microsoft.NET.CoreRuntime.2.1.appx" /d "%RunnerSourceFolder%\bin\unpack\Microsoft.NET.CoreRuntime.2.1\%_platform%"
+        makeappx unpack /l /o /p "%RunnerSourceFolder%\bin\AppPackages\Microsoft.DotNet.XUnitRunnerUap_1.0.0.0_%_platform%_Debug_Test\Dependencies\%_platform%\Microsoft.NET.CoreRuntime.2.2.appx" /d "%RunnerSourceFolder%\bin\unpack\Microsoft.NET.CoreRuntime.2.2\%_platform%"
+        makeappx unpack /l /o /p "%RunnerSourceFolder%\bin\AppPackages\Microsoft.DotNet.XUnitRunnerUap_1.0.0.0_%_platform%_Debug_Test\Dependencies\%_platform%\Microsoft.NET.CoreFramework.Debug.2.2.appx" /d "%RunnerSourceFolder%\bin\unpack\Microsoft.NET.CoreFramework.Debug.2.2\%_platform%"
         makeappx unpack /l /o /p "%RunnerSourceFolder%\bin\AppPackages\Microsoft.DotNet.XUnitRunnerUap_1.0.0.0_%_platform%_Debug_Test\Dependencies\%_platform%\Microsoft.VCLibs.%_platform%.Debug.14.00.appx" /d "%RunnerSourceFolder%\bin\unpack\Microsoft.VCLibs.%_platform%.Debug.14.00\%_platform%"
     )
 
     REM Copy the files we care about from the unpacked folder
-    call :RunnerCopy "%RunnerSourceFolder%\bin\unpack" "%DestinationFolder%\%_platform%\Runner"
+    call :RunnerCopy "%RunnerSourceFolder%\bin\unpack" "%DestinationFolder%\Tools\%_platform%\Runner"
     GOTO :EOF
 
 :RunnerCopy
@@ -71,27 +83,24 @@ setlocal
     IF "%_platform%" == "arm64" (
         xcopy /y %_mainSource%\clrcompression.dll %_dest%\
         xcopy /y %_mainSource%\Microsoft.DotNet.XUnitRunnerUap.dll %_dest%\
-        xcopy /y %_mainSource%\mrt100.dll %_dest%\
-        xcopy /y %_mainSource%\mrt100_app.dll %_dest%\
-        xcopy /y %_mainSource%\vcruntime140_app.dll %_dest%\
     ) ELSE (
         xcopy /y %_mainSource%\entrypoint\Microsoft.DotNet.XUnitRunnerUap.exe %_dest%\entrypoint\
         xcopy /y %_mainSource%\Properties\Default.rd.xml %_dest%\Properties\
         xcopy /y %_mainSource%\WinMetadata\Windows.winmd %_dest%\WinMetadata\
-        xcopy /y %_mainSource%\System.ServiceModel.dll %_dest%\
-        xcopy /y %_mainSource%\System.ServiceModel.Duplex.dll %_dest%\
-        xcopy /y %_mainSource%\System.ServiceModel.Http.dll %_dest%\
-        xcopy /y %_mainSource%\System.ServiceModel.NetTcp.dll %_dest%\
-        xcopy /y %_mainSource%\System.ServiceModel.Primitives.dll %_dest%\
-        xcopy /y %_mainSource%\System.ServiceModel.Security.dll %_dest%\
-        xcopy /y %_mainSource%\System.ServiceModel.Web.dll %_dest%\
-        xcopy /y %_mainSource%\System.ServiceProcess.dll %_dest%\
+        xcopy /y "%_source%\Microsoft.NET.CoreFramework.Debug.2.2\%_platform%\System.ServiceModel.dll" %_dest%\
+        xcopy /y "%_source%\Microsoft.NET.CoreFramework.Debug.2.2\%_platform%\System.ServiceModel.Duplex.dll" %_dest%\
+        xcopy /y "%_source%\Microsoft.NET.CoreFramework.Debug.2.2\%_platform%\System.ServiceModel.Http.dll" %_dest%\
+        xcopy /y "%_source%\Microsoft.NET.CoreFramework.Debug.2.2\%_platform%\System.ServiceModel.NetTcp.dll" %_dest%\
+        xcopy /y "%_source%\Microsoft.NET.CoreFramework.Debug.2.2\%_platform%\System.ServiceModel.Primitives.dll" %_dest%\
+        xcopy /y "%_source%\Microsoft.NET.CoreFramework.Debug.2.2\%_platform%\System.ServiceModel.Security.dll" %_dest%\
+        xcopy /y "%_source%\Microsoft.NET.CoreFramework.Debug.2.2\%_platform%\System.ServiceModel.Web.dll" %_dest%\
+        xcopy /y "%_source%\Microsoft.NET.CoreFramework.Debug.2.2\%_platform%\System.ServiceProcess.dll" %_dest%\
         xcopy /y %_mainSource%\xunit.abstractions.dll %_dest%\
         xcopy /y %_mainSource%\xunit.assert.dll %_dest%\
         xcopy /y %_mainSource%\xunit.core.dll %_dest%\
         xcopy /y %_mainSource%\xunit.execution.dotnet.dll %_dest%\
         xcopy /y %_mainSource%\xunit.runner.utility.uwp10.dll %_dest%\
-        xcopy /y "%_source%\Microsoft.NET.CoreRuntime.2.1\%_platform%\uwphost.dll" "%_dest%\"
+        xcopy /y "%_source%\Microsoft.NET.CoreRuntime.2.2\%_platform%\uwphost.dll" "%_dest%\"
     )
 
 GOTO:EOF

src/Microsoft.DotNet.XUnitConsoleRunner/README.md

@@ -0,0 +1,6 @@
+# Custom Version of the Xunit Console Runner
+
+## Origin/Attribution
+This is a fork of the code in https://github.com/xunit/xunit for building the `Microsoft.DotNet.XUnitConsoleRunner` NuGet package.
+The original authors of this code are Brad Wilson and Oren Novotny.  See `../../THIRD-PARTY-NOTICES.TXT` for
+the license for this code.