From bc4937adfa2d78ceb8009edd013e9f56b6321175 Mon Sep 17 00:00:00 2001
From: Jared Parsons <jaredpar@microsoft.com>
Date: Tue, 29 Aug 2017 15:45:17 -0700
Subject: [PATCH] Simplify the app.config model for testing

---
 build/Defaults/{Net460 => Desktop}/app.config |  0
 build/Defaults/Net461/app.config              | 18 ------------------
 build/Defaults/Net462/app.config              | 18 ------------------
 build/Targets/Roslyn.Toolsets.Xunit.targets   |  3 +--
 4 files changed, 1 insertion(+), 38 deletions(-)
 rename build/Defaults/{Net460 => Desktop}/app.config (100%)
 delete mode 100644 build/Defaults/Net461/app.config
 delete mode 100644 build/Defaults/Net462/app.config

diff --git a/build/Defaults/Net460/app.config b/build/Defaults/Desktop/app.config
similarity index 100%
rename from build/Defaults/Net460/app.config
rename to build/Defaults/Desktop/app.config
diff --git a/build/Defaults/Net461/app.config b/build/Defaults/Net461/app.config
deleted file mode 100644
index 3219341094b..00000000000
--- a/build/Defaults/Net461/app.config
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- The default app.config for test projects that do not specify one -->
-<configuration>
-  <appSettings>
-    <add key="xunit.diagnosticMessages" value="false"/>
-    <add key="xunit.parallelizeTestCollections" value="false"/>
-    <add key="xunit.shadowCopy" value="false"/> <!-- Set shadow copy to false so that the VS Test Explorer can properly load our public signed binaries -->
-  </appSettings>
-  <system.diagnostics>
-    <trace>
-      <listeners>
-        <remove name="Default" />
-        <add name="ThrowingTraceListener" type="Microsoft.CodeAnalysis.ThrowingTraceListener, Roslyn.Test.Utilities" />
-      </listeners>
-    </trace>
-  </system.diagnostics>
-</configuration>
diff --git a/build/Defaults/Net462/app.config b/build/Defaults/Net462/app.config
deleted file mode 100644
index 3219341094b..00000000000
--- a/build/Defaults/Net462/app.config
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- The default app.config for test projects that do not specify one -->
-<configuration>
-  <appSettings>
-    <add key="xunit.diagnosticMessages" value="false"/>
-    <add key="xunit.parallelizeTestCollections" value="false"/>
-    <add key="xunit.shadowCopy" value="false"/> <!-- Set shadow copy to false so that the VS Test Explorer can properly load our public signed binaries -->
-  </appSettings>
-  <system.diagnostics>
-    <trace>
-      <listeners>
-        <remove name="Default" />
-        <add name="ThrowingTraceListener" type="Microsoft.CodeAnalysis.ThrowingTraceListener, Roslyn.Test.Utilities" />
-      </listeners>
-    </trace>
-  </system.diagnostics>
-</configuration>
diff --git a/build/Targets/Roslyn.Toolsets.Xunit.targets b/build/Targets/Roslyn.Toolsets.Xunit.targets
index c51338e50d5..48bc420e7d4 100644
--- a/build/Targets/Roslyn.Toolsets.Xunit.targets
+++ b/build/Targets/Roslyn.Toolsets.Xunit.targets
@@ -54,8 +54,7 @@
   <Target Name="AddDefaultTestAppConfig">
     <PropertyGroup>
       <_AlreadyHasAppConfig Condition="'%(None.Filename)%(None.Extension)' == 'app.config'">true</_AlreadyHasAppConfig>
-      <_DefaultAppConfigFile Condition="'$(TargetFramework)' == 'net46'">$(MSBuildThisFileDirectory)..\Defaults\Net460\app.config</_DefaultAppConfigFile>
-      <_DefaultAppConfigFile Condition="'$(TargetFramework)' == 'net461'">$(MSBuildThisFileDirectory)..\Defaults\Net461\app.config</_DefaultAppConfigFile>
+      <_DefaultAppConfigFile Condition="'$(TargetFramework)' != 'netcoreapp2.0'">$(MSBuildThisFileDirectory)..\Defaults\Desktop\app.config</_DefaultAppConfigFile>
       <_DefaultAppConfigFile Condition="'$(TargetFramework)' == 'netcoreapp2.0'">$(MSBuildThisFileDirectory)..\Defaults\Portable\app.config</_DefaultAppConfigFile>
     </PropertyGroup>
 
-- 
GitLab