From 980ca4a340cd2f280efb8215c5a7581169beafe9 Mon Sep 17 00:00:00 2001
From: Jared Parsons <jaredpparsons@gmail.com>
Date: Tue, 28 Jul 2020 11:46:09 -0700
Subject: [PATCH] More

---
 eng/build.ps1                                                 | 4 ++--
 eng/build.sh                                                  | 2 +-
 .../Roslyn.Services.UnitTests.Utilities.csproj                | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/eng/build.ps1 b/eng/build.ps1
index c4c1e71467f..aaeb81b6bf6 100644
--- a/eng/build.ps1
+++ b/eng/build.ps1
@@ -212,7 +212,7 @@ function BuildSolution() {
   $projects = Join-Path $RepoRoot $solution
   $toolsetBuildProj = InitializeToolset
 
-  $testTargetFrameworks = if ($testCoreClr) { 'netcoreapp3.1;net5.0' } else { "" }
+  $testTargetFrameworks = if ($testCoreClr) { 'net5.0' } else { "" }
   
   $ibcDropName = GetIbcDropName
 
@@ -251,7 +251,7 @@ function BuildSolution() {
       /p:OfficialBuildId=$officialBuildId `
       /p:UseRoslynAnalyzers=$runAnalyzers `
       /p:BootstrapBuildPath=$bootstrapDir `
-      /p:TestTargetFrameworks='$testTargetFrameworks' `
+      /p:TestTargetFrameworks=$testTargetFrameworks `
       /p:TreatWarningsAsErrors=$warnAsError `
       /p:EnableNgenOptimization=$applyOptimizationData `
       /p:IbcOptimizationDataDir=$ibcDir `
diff --git a/eng/build.sh b/eng/build.sh
index f14170a1365..0b4926f8eb7 100755
--- a/eng/build.sh
+++ b/eng/build.sh
@@ -266,7 +266,7 @@ function BuildSolution {
     test_runtime_args="--debug"
   elif [[ "$test_core_clr" == true ]]; then
     test=true
-    test_runtime="/p:TestRuntime=Core /p:TestTargetFrameworks=netcoreapp3.1;net5.0"
+    test_runtime="/p:TestRuntime=Core /p:TestTargetFrameworks=net5.0"
     mono_tool=""
   fi
 
diff --git a/src/Workspaces/CoreTestUtilities/Roslyn.Services.UnitTests.Utilities.csproj b/src/Workspaces/CoreTestUtilities/Roslyn.Services.UnitTests.Utilities.csproj
index 091b74ecaa0..4738e4fa9d7 100644
--- a/src/Workspaces/CoreTestUtilities/Roslyn.Services.UnitTests.Utilities.csproj
+++ b/src/Workspaces/CoreTestUtilities/Roslyn.Services.UnitTests.Utilities.csproj
@@ -4,7 +4,7 @@
   <PropertyGroup>
     <OutputType>Library</OutputType>
     <RootNamespace>Microsoft.CodeAnalysis.UnitTests</RootNamespace>
-    <TargetFrameworks>net5.0;netcoreapp3.1;net472</TargetFrameworks>
+    <TargetFrameworks>net5.0;net472</TargetFrameworks>
     <UseWpf>true</UseWpf>
     <IsShipping>false</IsShipping>
     <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
-- 
GitLab