Merge pull request #21014 from sharwell/launch-settings

Launch settings for test projects

build/Targets/Imports.targets

@@ -500,6 +500,11 @@
     <AdditionalFiles Include="@(PublicAPI)" />
   </ItemGroup>
 
+  <ItemGroup>
+    <!-- Show launchSettings.json in the project if it exists. -->
+    <None Include="$(AppDesignerFolder)\launchSettings.json" Condition="Exists('$(AppDesignerFolder)\launchSettings.json')" />
+  </ItemGroup>
+
   <!-- CPS doesn't show these items by default, but we want to show them. -->
   <ItemGroup>
     <!-- XAML pages and resources -->

build/Targets/Packages.props

@@ -227,6 +227,7 @@
     <xunitassertVersion>2.2.0-beta4-build3444</xunitassertVersion>
     <xunitconsolenetcoreVersion>1.0.2-prerelease-00104</xunitconsolenetcoreVersion>
     <xunitrunnerconsoleVersion>2.2.0-beta4-build3444</xunitrunnerconsoleVersion>
+    <xunitrunnerwpfVersion>1.0.41</xunitrunnerwpfVersion>
   </PropertyGroup>
 
 </Project>

build/Targets/Roslyn.Toolsets.Xunit.targets

-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
+    <!-- xUnit.net Console Runner -->
     <XUnitPath>$(NuGetPackageRoot)\xunit.runner.console\$(xunitrunnerconsoleVersion)\tools\xunit.console.x86.exe</XUnitPath>
     <XUnitTestResultsDirectory>$(OutDir)\xUnitResults</XUnitTestResultsDirectory>
     <XUnitArguments>"$(OutDir)\$(AssemblyName).dll" -html "$(XUnitTestResultsDirectory)\$(AssemblyName).html" -noshadow</XUnitArguments>
     <PrepareForBuildDependsOn>$(PrepareForBuildDependsOn);AddDefaultTestAppConfig</PrepareForBuildDependsOn>
+
+    <!-- xUnit.net WPF Runner -->
+    <XUnitWpfPath>$(NuGetPackageRoot)\xunit.runner.wpf\$(xunitrunnerwpfVersion)\tools\xunit.runner.wpf.exe</XUnitWpfPath>
+    <XUnitWpfArguments>"$(OutDir)\$(AssemblyName).dll"</XUnitWpfArguments>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="xunit.runner.wpf" Version="$(xunitrunnerwpfVersion)" PrivateAssets="all" />
+  </ItemGroup>
+
   <Target Name="Test" DependsOnTargets="Build">
     <MakeDir Directories="$(XUnitTestResultsDirectory)" />
     <Exec Command="&quot;$(XUnitPath)&quot; $(XUnitArguments)" />

src/CodeStyle/CSharp/Tests/Properties/launchSettings.json

@@ -3,6 +3,10 @@
     "xUnit.net Console": {
       "executablePath": "$(XUnitPath)",
       "commandLineArgs": "$(XUnitArguments)"
+    },
+    "xUnit.net WPF Runner": {
+      "executablePath": "$(XUnitWpfPath)",
+      "commandLineArgs": "$(XUnitWpfArguments)"
     }
   }
 }

src/CodeStyle/Core/Tests/Properties/launchSettings.json

@@ -3,6 +3,10 @@
     "xUnit.net Console": {
       "executablePath": "$(XUnitPath)",
       "commandLineArgs": "$(XUnitArguments)"
+    },
+    "xUnit.net WPF Runner": {
+      "executablePath": "$(XUnitWpfPath)",
+      "commandLineArgs": "$(XUnitWpfArguments)"
     }
   }
 }

src/CodeStyle/VisualBasic/Tests/My Project/launchSettings.json

@@ -3,6 +3,10 @@
     "xUnit.net Console": {
       "executablePath": "$(XUnitPath)",
       "commandLineArgs": "$(XUnitArguments)"
+    },
+    "xUnit.net WPF Runner": {
+      "executablePath": "$(XUnitWpfPath)",
+      "commandLineArgs": "$(XUnitWpfArguments)"
     }
   }
 }

src/Compilers/CSharp/Test/CommandLine/Properties/launchSettings.json

@@ -3,6 +3,10 @@
     "xUnit.net Console": {
       "executablePath": "$(XUnitPath)",
       "commandLineArgs": "$(XUnitArguments)"
+    },
+    "xUnit.net WPF Runner": {
+      "executablePath": "$(XUnitWpfPath)",
+      "commandLineArgs": "$(XUnitWpfArguments)"
     }
   }
 }

src/Compilers/CSharp/Test/Emit/Properties/launchSettings.json

@@ -3,6 +3,10 @@
     "xUnit.net Console": {
       "executablePath": "$(XUnitPath)",
       "commandLineArgs": "$(XUnitArguments)"
+    },
+    "xUnit.net WPF Runner": {
+      "executablePath": "$(XUnitWpfPath)",
+      "commandLineArgs": "$(XUnitWpfArguments)"
     }
   }
 }

src/Compilers/CSharp/Test/Semantic/Properties/launchSettings.json

@@ -3,6 +3,10 @@
     "xUnit.net Console": {
       "executablePath": "$(XUnitPath)",
       "commandLineArgs": "$(XUnitArguments)"
+    },
+    "xUnit.net WPF Runner": {
+      "executablePath": "$(XUnitWpfPath)",
+      "commandLineArgs": "$(XUnitWpfArguments)"
     }
   }
 }

src/Compilers/CSharp/Test/Symbol/Properties/launchSettings.json

@@ -3,6 +3,10 @@
     "xUnit.net Console": {
       "executablePath": "$(XUnitPath)",
       "commandLineArgs": "$(XUnitArguments)"
+    },
+    "xUnit.net WPF Runner": {
+      "executablePath": "$(XUnitWpfPath)",
+      "commandLineArgs": "$(XUnitWpfArguments)"
     }
   }
 }

src/Compilers/CSharp/Test/Syntax/Properties/launchSettings.json

@@ -3,6 +3,10 @@
     "xUnit.net Console": {
       "executablePath": "$(XUnitPath)",
       "commandLineArgs": "$(XUnitArguments)"
+    },
+    "xUnit.net WPF Runner": {
+      "executablePath": "$(XUnitWpfPath)",
+      "commandLineArgs": "$(XUnitWpfArguments)"
     }
   }
 }

src/Compilers/CSharp/Test/WinRT/Properties/launchSettings.json

@@ -3,6 +3,10 @@
     "xUnit.net Console": {
       "executablePath": "$(XUnitPath)",
       "commandLineArgs": "$(XUnitArguments)"
+    },
+    "xUnit.net WPF Runner": {
+      "executablePath": "$(XUnitWpfPath)",
+      "commandLineArgs": "$(XUnitWpfArguments)"
     }
   }
 }

src/Compilers/Core/CodeAnalysisTest/Properties/launchSettings.json

@@ -3,6 +3,10 @@
     "xUnit.net Console": {
       "executablePath": "$(XUnitPath)",
       "commandLineArgs": "$(XUnitArguments)"
+    },
+    "xUnit.net WPF Runner": {
+      "executablePath": "$(XUnitWpfPath)",
+      "commandLineArgs": "$(XUnitWpfArguments)"
     }
   }
 }

src/Compilers/Core/MSBuildTaskTests/Properties/launchSettings.json

@@ -3,6 +3,10 @@
     "xUnit.net Console": {
       "executablePath": "$(XUnitPath)",
       "commandLineArgs": "$(XUnitArguments)"
+    },
+    "xUnit.net WPF Runner": {
+      "executablePath": "$(XUnitWpfPath)",
+      "commandLineArgs": "$(XUnitWpfArguments)"
     }
   }
 }

src/Compilers/Server/VBCSCompilerTests/Properties/launchSettings.json

@@ -3,6 +3,10 @@
     "xUnit.net Console": {
       "executablePath": "$(XUnitPath)",
       "commandLineArgs": "$(XUnitArguments)"
+    },
+    "xUnit.net WPF Runner": {
+      "executablePath": "$(XUnitWpfPath)",
+      "commandLineArgs": "$(XUnitWpfArguments)"
     }
   }
 }

src/Compilers/VisualBasic/Test/CommandLine/My Project/launchSettings.json

@@ -3,6 +3,10 @@
     "xUnit.net Console": {
       "executablePath": "$(XUnitPath)",
       "commandLineArgs": "$(XUnitArguments)"
+    },
+    "xUnit.net WPF Runner": {
+      "executablePath": "$(XUnitWpfPath)",
+      "commandLineArgs": "$(XUnitWpfArguments)"
     }
   }
 }

src/Compilers/VisualBasic/Test/Emit/My Project/launchSettings.json

@@ -3,6 +3,10 @@
     "xUnit.net Console": {
       "executablePath": "$(XUnitPath)",
       "commandLineArgs": "$(XUnitArguments)"
+    },
+    "xUnit.net WPF Runner": {
+      "executablePath": "$(XUnitWpfPath)",
+      "commandLineArgs": "$(XUnitWpfArguments)"
     }
   }
 }

src/Compilers/VisualBasic/Test/Semantic/My Project/launchSettings.json

@@ -3,6 +3,10 @@
     "xUnit.net Console": {
       "executablePath": "$(XUnitPath)",
       "commandLineArgs": "$(XUnitArguments)"
+    },
+    "xUnit.net WPF Runner": {
+      "executablePath": "$(XUnitWpfPath)",
+      "commandLineArgs": "$(XUnitWpfArguments)"
     }
   }
 }

src/Compilers/VisualBasic/Test/Symbol/My Project/launchSettings.json

@@ -3,6 +3,10 @@
     "xUnit.net Console": {
       "executablePath": "$(XUnitPath)",
       "commandLineArgs": "$(XUnitArguments)"
+    },
+    "xUnit.net WPF Runner": {
+      "executablePath": "$(XUnitWpfPath)",
+      "commandLineArgs": "$(XUnitWpfArguments)"
     }
   }
 }

src/Compilers/VisualBasic/Test/Syntax/My Project/launchSettings.json

@@ -3,6 +3,10 @@
     "xUnit.net Console": {
       "executablePath": "$(XUnitPath)",
       "commandLineArgs": "$(XUnitArguments)"
+    },
+    "xUnit.net WPF Runner": {
+      "executablePath": "$(XUnitWpfPath)",
+      "commandLineArgs": "$(XUnitWpfArguments)"
     }
   }
 }

src/EditorFeatures/CSharpTest/Properties/launchSettings.json

@@ -3,6 +3,10 @@
     "xUnit.net Console": {
       "executablePath": "$(XUnitPath)",
       "commandLineArgs": "$(XUnitArguments)"
+    },
+    "xUnit.net WPF Runner": {
+      "executablePath": "$(XUnitWpfPath)",
+      "commandLineArgs": "$(XUnitWpfArguments)"
     }
   }
 }

src/EditorFeatures/CSharpTest2/Properties/launchSettings.json

@@ -3,6 +3,10 @@
     "xUnit.net Console": {
       "executablePath": "$(XUnitPath)",
       "commandLineArgs": "$(XUnitArguments)"
+    },
+    "xUnit.net WPF Runner": {
+      "executablePath": "$(XUnitWpfPath)",
+      "commandLineArgs": "$(XUnitWpfArguments)"
     }
   }
 }

src/EditorFeatures/Test/Properties/launchSettings.json

@@ -3,6 +3,10 @@
     "xUnit.net Console": {
       "executablePath": "$(XUnitPath)",
       "commandLineArgs": "$(XUnitArguments)"
+    },
+    "xUnit.net WPF Runner": {
+      "executablePath": "$(XUnitWpfPath)",
+      "commandLineArgs": "$(XUnitWpfArguments)"
     }
   }
 }

src/EditorFeatures/Test2/My Project/launchSettings.json

@@ -3,6 +3,10 @@
     "xUnit.net Console": {
       "executablePath": "$(XUnitPath)",
       "commandLineArgs": "$(XUnitArguments)"
+    },
+    "xUnit.net WPF Runner": {
+      "executablePath": "$(XUnitWpfPath)",
+      "commandLineArgs": "$(XUnitWpfArguments)"
     }
   }
 }

src/EditorFeatures/VisualBasicTest/My Project/launchSettings.json

@@ -3,6 +3,10 @@
     "xUnit.net Console": {
       "executablePath": "$(XUnitPath)",
       "commandLineArgs": "$(XUnitArguments)"
+    },
+    "xUnit.net WPF Runner": {
+      "executablePath": "$(XUnitWpfPath)",
+      "commandLineArgs": "$(XUnitWpfArguments)"
     }
   }
 }

src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/Properties/launchSettings.json

@@ -3,6 +3,10 @@
     "xUnit.net Console": {
       "executablePath": "$(XUnitPath)",
       "commandLineArgs": "$(XUnitArguments)"
+    },
+    "xUnit.net WPF Runner": {
+      "executablePath": "$(XUnitWpfPath)",
+      "commandLineArgs": "$(XUnitWpfArguments)"
     }
   }
 }

src/ExpressionEvaluator/CSharp/Test/ResultProvider/Properties/launchSettings.json

@@ -3,6 +3,10 @@
     "xUnit.net Console": {
       "executablePath": "$(XUnitPath)",
       "commandLineArgs": "$(XUnitArguments)"
+    },
+    "xUnit.net WPF Runner": {
+      "executablePath": "$(XUnitWpfPath)",
+      "commandLineArgs": "$(XUnitWpfArguments)"
     }
   }
 }

src/ExpressionEvaluator/Core/Test/FunctionResolver/Properties/launchSettings.json

@@ -3,6 +3,10 @@
     "xUnit.net Console": {
       "executablePath": "$(XUnitPath)",
       "commandLineArgs": "$(XUnitArguments)"
+    },
+    "xUnit.net WPF Runner": {
+      "executablePath": "$(XUnitWpfPath)",
+      "commandLineArgs": "$(XUnitWpfArguments)"
     }
   }
 }

src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/My Project/launchSettings.json

@@ -3,6 +3,10 @@
     "xUnit.net Console": {
       "executablePath": "$(XUnitPath)",
       "commandLineArgs": "$(XUnitArguments)"
+    },
+    "xUnit.net WPF Runner": {
+      "executablePath": "$(XUnitWpfPath)",
+      "commandLineArgs": "$(XUnitWpfArguments)"
     }
   }
 }

src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/My Project/launchSettings.json

@@ -3,6 +3,10 @@
     "xUnit.net Console": {
       "executablePath": "$(XUnitPath)",
       "commandLineArgs": "$(XUnitArguments)"
+    },
+    "xUnit.net WPF Runner": {
+      "executablePath": "$(XUnitWpfPath)",
+      "commandLineArgs": "$(XUnitWpfArguments)"
     }
   }
 }

src/Interactive/HostTest/Properties/launchSettings.json

@@ -3,6 +3,10 @@
     "xUnit.net Console": {
       "executablePath": "$(XUnitPath)",
       "commandLineArgs": "$(XUnitArguments)"
+    },
+    "xUnit.net WPF Runner": {
+      "executablePath": "$(XUnitWpfPath)",
+      "commandLineArgs": "$(XUnitWpfArguments)"
     }
   }
 }

src/Scripting/CSharpTest.Desktop/Properties/launchSettings.json

@@ -3,6 +3,10 @@
     "xUnit.net Console": {
       "executablePath": "$(XUnitPath)",
       "commandLineArgs": "$(XUnitArguments)"
+    },
+    "xUnit.net WPF Runner": {
+      "executablePath": "$(XUnitWpfPath)",
+      "commandLineArgs": "$(XUnitWpfArguments)"
     }
   }
 }

src/Scripting/CSharpTest/Properties/launchSettings.json

@@ -3,6 +3,10 @@
     "xUnit.net Console": {
       "executablePath": "$(XUnitPath)",
       "commandLineArgs": "$(XUnitArguments)"
+    },
+    "xUnit.net WPF Runner": {
+      "executablePath": "$(XUnitWpfPath)",
+      "commandLineArgs": "$(XUnitWpfArguments)"
     }
   }
 }

src/Scripting/CoreTest.Desktop/Properties/launchSettings.json

@@ -3,6 +3,10 @@
     "xUnit.net Console": {
       "executablePath": "$(XUnitPath)",
       "commandLineArgs": "$(XUnitArguments)"
+    },
+    "xUnit.net WPF Runner": {
+      "executablePath": "$(XUnitWpfPath)",
+      "commandLineArgs": "$(XUnitWpfArguments)"
     }
   }
 }

src/Scripting/CoreTest/Properties/launchSettings.json

@@ -3,6 +3,10 @@
     "xUnit.net Console": {
       "executablePath": "$(XUnitPath)",
       "commandLineArgs": "$(XUnitArguments)"
+    },
+    "xUnit.net WPF Runner": {
+      "executablePath": "$(XUnitWpfPath)",
+      "commandLineArgs": "$(XUnitWpfArguments)"
     }
   }
 }

src/Scripting/VisualBasicTest/My Project/launchSettings.json

@@ -3,6 +3,10 @@
     "xUnit.net Console": {
       "executablePath": "$(XUnitPath)",
       "commandLineArgs": "$(XUnitArguments)"
+    },
+    "xUnit.net WPF Runner": {
+      "executablePath": "$(XUnitWpfPath)",
+      "commandLineArgs": "$(XUnitWpfArguments)"
     }
   }
 }

src/VisualStudio/CSharp/Test/Properties/launchSettings.json

@@ -3,6 +3,10 @@
     "xUnit.net Console": {
       "executablePath": "$(XUnitPath)",
       "commandLineArgs": "$(XUnitArguments)"
+    },
+    "xUnit.net WPF Runner": {
+      "executablePath": "$(XUnitWpfPath)",
+      "commandLineArgs": "$(XUnitWpfArguments)"
     }
   }
 }

src/VisualStudio/Core/Test.Next/Properties/launchSettings.json

@@ -3,6 +3,10 @@
     "xUnit.net Console": {
       "executablePath": "$(XUnitPath)",
       "commandLineArgs": "$(XUnitArguments)"
+    },
+    "xUnit.net WPF Runner": {
+      "executablePath": "$(XUnitWpfPath)",
+      "commandLineArgs": "$(XUnitWpfArguments)"
     }
   }
 }

src/VisualStudio/Core/Test/My Project/launchSettings.json

@@ -3,6 +3,10 @@
     "xUnit.net Console": {
       "executablePath": "$(XUnitPath)",
       "commandLineArgs": "$(XUnitArguments)"
+    },
+    "xUnit.net WPF Runner": {
+      "executablePath": "$(XUnitWpfPath)",
+      "commandLineArgs": "$(XUnitWpfArguments)"
     }
   }
 }

src/VisualStudio/IntegrationTest/IntegrationTests/Properties/launchSettings.json

@@ -3,6 +3,10 @@
     "xUnit.net Console": {
       "executablePath": "$(XUnitPath)",
       "commandLineArgs": "$(XUnitArguments)"
+    },
+    "xUnit.net WPF Runner": {
+      "executablePath": "$(XUnitWpfPath)",
+      "commandLineArgs": "$(XUnitWpfArguments)"
     }
   }
 }

src/Workspaces/CSharpTest/Properties/launchSettings.json

@@ -3,6 +3,10 @@
     "xUnit.net Console": {
       "executablePath": "$(XUnitPath)",
       "commandLineArgs": "$(XUnitArguments)"
+    },
+    "xUnit.net WPF Runner": {
+      "executablePath": "$(XUnitWpfPath)",
+      "commandLineArgs": "$(XUnitWpfArguments)"
     }
   }
 }

src/Workspaces/CoreTest/Properties/launchSettings.json

@@ -3,6 +3,10 @@
     "xUnit.net Console": {
       "executablePath": "$(XUnitPath)",
       "commandLineArgs": "$(XUnitArguments)"
+    },
+    "xUnit.net WPF Runner": {
+      "executablePath": "$(XUnitWpfPath)",
+      "commandLineArgs": "$(XUnitWpfArguments)"
     }
   }
 }

src/Workspaces/VisualBasicTest/My Project/launchSettings.json

@@ -3,6 +3,10 @@
     "xUnit.net Console": {
       "executablePath": "$(XUnitPath)",
       "commandLineArgs": "$(XUnitArguments)"
+    },
+    "xUnit.net WPF Runner": {
+      "executablePath": "$(XUnitWpfPath)",
+      "commandLineArgs": "$(XUnitWpfArguments)"
     }
   }
 }