diff --git a/eng/targets/Settings.props b/eng/targets/Settings.props
index 9a0e7bf9aab40..78c1cc189229d 100644
--- a/eng/targets/Settings.props
+++ b/eng/targets/Settings.props
@@ -16,7 +16,6 @@
true
$(RepoRoot)build\ToolsetPackages\
- netcoreapp3.1;net472
true
strict
diff --git a/src/Compilers/CSharp/Test/CommandLine/Microsoft.CodeAnalysis.CSharp.CommandLine.UnitTests.csproj b/src/Compilers/CSharp/Test/CommandLine/Microsoft.CodeAnalysis.CSharp.CommandLine.UnitTests.csproj
index e0d5d265f2cf2..4d7e9cd2bd7c1 100644
--- a/src/Compilers/CSharp/Test/CommandLine/Microsoft.CodeAnalysis.CSharp.CommandLine.UnitTests.csproj
+++ b/src/Compilers/CSharp/Test/CommandLine/Microsoft.CodeAnalysis.CSharp.CommandLine.UnitTests.csproj
@@ -4,7 +4,7 @@
Library
Microsoft.CodeAnalysis.CSharp.CommandLine.UnitTests
- $(RoslynPortableTargetFrameworks)
+ netcoreapp3.1;net472
true
diff --git a/src/Compilers/CSharp/Test/Emit/Microsoft.CodeAnalysis.CSharp.Emit.UnitTests.csproj b/src/Compilers/CSharp/Test/Emit/Microsoft.CodeAnalysis.CSharp.Emit.UnitTests.csproj
index e85cfa5282f14..625b7be3e1377 100644
--- a/src/Compilers/CSharp/Test/Emit/Microsoft.CodeAnalysis.CSharp.Emit.UnitTests.csproj
+++ b/src/Compilers/CSharp/Test/Emit/Microsoft.CodeAnalysis.CSharp.Emit.UnitTests.csproj
@@ -4,7 +4,7 @@
Library
Microsoft.CodeAnalysis.CSharp.UnitTests
- $(RoslynPortableTargetFrameworks)
+ netcoreapp3.1;net472
true
diff --git a/src/Compilers/CSharp/Test/IOperation/Microsoft.CodeAnalysis.CSharp.IOperation.UnitTests.csproj b/src/Compilers/CSharp/Test/IOperation/Microsoft.CodeAnalysis.CSharp.IOperation.UnitTests.csproj
index e7e8d3d4b95da..614ec6dec028c 100644
--- a/src/Compilers/CSharp/Test/IOperation/Microsoft.CodeAnalysis.CSharp.IOperation.UnitTests.csproj
+++ b/src/Compilers/CSharp/Test/IOperation/Microsoft.CodeAnalysis.CSharp.IOperation.UnitTests.csproj
@@ -4,7 +4,7 @@
Library
Microsoft.CodeAnalysis.CSharp.IOperation.UnitTests
- $(RoslynPortableTargetFrameworks)
+ netcoreapp3.1;net472
diff --git a/src/Compilers/CSharp/Test/Semantic/Microsoft.CodeAnalysis.CSharp.Semantic.UnitTests.csproj b/src/Compilers/CSharp/Test/Semantic/Microsoft.CodeAnalysis.CSharp.Semantic.UnitTests.csproj
index b28742225d161..d768bd07eff33 100644
--- a/src/Compilers/CSharp/Test/Semantic/Microsoft.CodeAnalysis.CSharp.Semantic.UnitTests.csproj
+++ b/src/Compilers/CSharp/Test/Semantic/Microsoft.CodeAnalysis.CSharp.Semantic.UnitTests.csproj
@@ -4,7 +4,7 @@
Library
Microsoft.CodeAnalysis.CSharp.Semantic.UnitTests
- $(RoslynPortableTargetFrameworks)
+ netcoreapp3.1;net472
diff --git a/src/Compilers/CSharp/Test/Symbol/Microsoft.CodeAnalysis.CSharp.Symbol.UnitTests.csproj b/src/Compilers/CSharp/Test/Symbol/Microsoft.CodeAnalysis.CSharp.Symbol.UnitTests.csproj
index 3153903e633ce..8677c4fded935 100644
--- a/src/Compilers/CSharp/Test/Symbol/Microsoft.CodeAnalysis.CSharp.Symbol.UnitTests.csproj
+++ b/src/Compilers/CSharp/Test/Symbol/Microsoft.CodeAnalysis.CSharp.Symbol.UnitTests.csproj
@@ -5,7 +5,7 @@
Library
Microsoft.CodeAnalysis.CSharp.Symbol.UnitTests
true
- $(RoslynPortableTargetFrameworks)
+ netcoreapp3.1;net472
true
diff --git a/src/Compilers/CSharp/Test/Syntax/Microsoft.CodeAnalysis.CSharp.Syntax.UnitTests.csproj b/src/Compilers/CSharp/Test/Syntax/Microsoft.CodeAnalysis.CSharp.Syntax.UnitTests.csproj
index bdad5c4697bf0..49eef0e4adacd 100644
--- a/src/Compilers/CSharp/Test/Syntax/Microsoft.CodeAnalysis.CSharp.Syntax.UnitTests.csproj
+++ b/src/Compilers/CSharp/Test/Syntax/Microsoft.CodeAnalysis.CSharp.Syntax.UnitTests.csproj
@@ -7,7 +7,7 @@
false
true
true
- $(RoslynPortableTargetFrameworks)
+ netcoreapp3.1;net472
$(NoWarn);1570;1587
diff --git a/src/Compilers/CSharp/Test/WinRT/Microsoft.CodeAnalysis.CSharp.WinRT.UnitTests.csproj b/src/Compilers/CSharp/Test/WinRT/Microsoft.CodeAnalysis.CSharp.WinRT.UnitTests.csproj
index ac1b5dcc11f53..bb028ce31b4a7 100644
--- a/src/Compilers/CSharp/Test/WinRT/Microsoft.CodeAnalysis.CSharp.WinRT.UnitTests.csproj
+++ b/src/Compilers/CSharp/Test/WinRT/Microsoft.CodeAnalysis.CSharp.WinRT.UnitTests.csproj
@@ -4,7 +4,7 @@
Library
Microsoft.CodeAnalysis.CSharp.UnitTests.CodeGen
- $(RoslynPortableTargetFrameworks)
+ netcoreapp3.1;net472
diff --git a/src/Compilers/CSharp/csc/csc.csproj b/src/Compilers/CSharp/csc/csc.csproj
index e7ec326304828..01e6741bb0961 100644
--- a/src/Compilers/CSharp/csc/csc.csproj
+++ b/src/Compilers/CSharp/csc/csc.csproj
@@ -8,7 +8,7 @@
false
true
Microsoft.CodeAnalysis.CSharp.CommandLine.Program
- $(RoslynPortableTargetFrameworks)
+ netcoreapp3.1;net472
true
false
true
diff --git a/src/Compilers/Core/CodeAnalysisTest/Microsoft.CodeAnalysis.UnitTests.csproj b/src/Compilers/Core/CodeAnalysisTest/Microsoft.CodeAnalysis.UnitTests.csproj
index 18b2974541abf..b1aaf326b5442 100644
--- a/src/Compilers/Core/CodeAnalysisTest/Microsoft.CodeAnalysis.UnitTests.csproj
+++ b/src/Compilers/Core/CodeAnalysisTest/Microsoft.CodeAnalysis.UnitTests.csproj
@@ -5,7 +5,7 @@
Library
Microsoft.CodeAnalysis.UnitTests
true
- $(RoslynPortableTargetFrameworks)
+ netcoreapp3.1;net472
diff --git a/src/Compilers/Core/MSBuildTask/Microsoft.Build.Tasks.CodeAnalysis.csproj b/src/Compilers/Core/MSBuildTask/Microsoft.Build.Tasks.CodeAnalysis.csproj
index d53d91c31ab99..9802a8ebac093 100644
--- a/src/Compilers/Core/MSBuildTask/Microsoft.Build.Tasks.CodeAnalysis.csproj
+++ b/src/Compilers/Core/MSBuildTask/Microsoft.Build.Tasks.CodeAnalysis.csproj
@@ -6,7 +6,7 @@
Library
Microsoft.CodeAnalysis.BuildTasks
en-US
- $(RoslynPortableTargetFrameworks)
+ netcoreapp3.1;net472
enable
true
diff --git a/src/Compilers/Server/VBCSCompiler/VBCSCompiler.csproj b/src/Compilers/Server/VBCSCompiler/VBCSCompiler.csproj
index 3018c3c61a947..3fde7d77d3d8c 100644
--- a/src/Compilers/Server/VBCSCompiler/VBCSCompiler.csproj
+++ b/src/Compilers/Server/VBCSCompiler/VBCSCompiler.csproj
@@ -5,7 +5,7 @@
Exe
true
- $(RoslynPortableTargetFrameworks)
+ netcoreapp3.1;net472
false
true
false
diff --git a/src/Compilers/Server/VBCSCompilerTests/VBCSCompiler.UnitTests.csproj b/src/Compilers/Server/VBCSCompilerTests/VBCSCompiler.UnitTests.csproj
index 23b5d124abbc4..82b401a580a80 100644
--- a/src/Compilers/Server/VBCSCompilerTests/VBCSCompiler.UnitTests.csproj
+++ b/src/Compilers/Server/VBCSCompilerTests/VBCSCompiler.UnitTests.csproj
@@ -5,7 +5,7 @@
Library
Microsoft.CodeAnalysis.CompilerServer.UnitTests
true
- $(RoslynPortableTargetFrameworks)
+ netcoreapp3.1;net472
diff --git a/src/Compilers/VisualBasic/Test/IOperation/Roslyn.Compilers.VisualBasic.IOperation.UnitTests.vbproj b/src/Compilers/VisualBasic/Test/IOperation/Roslyn.Compilers.VisualBasic.IOperation.UnitTests.vbproj
index c74f02d1699b5..5cb7be9c6df0e 100644
--- a/src/Compilers/VisualBasic/Test/IOperation/Roslyn.Compilers.VisualBasic.IOperation.UnitTests.vbproj
+++ b/src/Compilers/VisualBasic/Test/IOperation/Roslyn.Compilers.VisualBasic.IOperation.UnitTests.vbproj
@@ -3,7 +3,7 @@
Library
- $(RoslynPortableTargetFrameworks)
+ netcoreapp3.1;net472
diff --git a/src/Compilers/VisualBasic/Test/Semantic/Microsoft.CodeAnalysis.VisualBasic.Semantic.UnitTests.vbproj b/src/Compilers/VisualBasic/Test/Semantic/Microsoft.CodeAnalysis.VisualBasic.Semantic.UnitTests.vbproj
index 65e8a21fea480..5224f9fa766c6 100644
--- a/src/Compilers/VisualBasic/Test/Semantic/Microsoft.CodeAnalysis.VisualBasic.Semantic.UnitTests.vbproj
+++ b/src/Compilers/VisualBasic/Test/Semantic/Microsoft.CodeAnalysis.VisualBasic.Semantic.UnitTests.vbproj
@@ -3,7 +3,7 @@
Library
- $(RoslynPortableTargetFrameworks)
+ netcoreapp3.1;net472
diff --git a/src/Compilers/VisualBasic/Test/Syntax/Microsoft.CodeAnalysis.VisualBasic.Syntax.UnitTests.vbproj b/src/Compilers/VisualBasic/Test/Syntax/Microsoft.CodeAnalysis.VisualBasic.Syntax.UnitTests.vbproj
index 4cf483117f2ee..d5430086b3d1d 100644
--- a/src/Compilers/VisualBasic/Test/Syntax/Microsoft.CodeAnalysis.VisualBasic.Syntax.UnitTests.vbproj
+++ b/src/Compilers/VisualBasic/Test/Syntax/Microsoft.CodeAnalysis.VisualBasic.Syntax.UnitTests.vbproj
@@ -3,7 +3,7 @@
Library
- $(RoslynPortableTargetFrameworks)
+ netcoreapp3.1;net472
diff --git a/src/Compilers/VisualBasic/vbc/vbc.csproj b/src/Compilers/VisualBasic/vbc/vbc.csproj
index caef65a8d47e6..48843d2c54274 100644
--- a/src/Compilers/VisualBasic/vbc/vbc.csproj
+++ b/src/Compilers/VisualBasic/vbc/vbc.csproj
@@ -7,7 +7,7 @@
Microsoft.CodeAnalysis.VisualBasic.CommandLine
true
Microsoft.CodeAnalysis.VisualBasic.CommandLine.Program
- $(RoslynPortableTargetFrameworks)
+ netcoreapp3.1;net472
true
false
true
diff --git a/src/EditorFeatures/Text/Microsoft.CodeAnalysis.EditorFeatures.Text.csproj b/src/EditorFeatures/Text/Microsoft.CodeAnalysis.EditorFeatures.Text.csproj
index f9e27f6c55ff5..edc6e41687559 100644
--- a/src/EditorFeatures/Text/Microsoft.CodeAnalysis.EditorFeatures.Text.csproj
+++ b/src/EditorFeatures/Text/Microsoft.CodeAnalysis.EditorFeatures.Text.csproj
@@ -4,7 +4,7 @@
Library
Microsoft.CodeAnalysis.Text
- $(RoslynPortableTargetFrameworks)
+ netcoreapp3.1;net472
partial
diff --git a/src/Interactive/csi/csi.csproj b/src/Interactive/csi/csi.csproj
index 725103b7bba00..3970bb4e9ea38 100644
--- a/src/Interactive/csi/csi.csproj
+++ b/src/Interactive/csi/csi.csproj
@@ -5,7 +5,7 @@
Exe
CSharpInteractive
- $(RoslynPortableTargetFrameworks)
+ netcoreapp3.1;net472
diff --git a/src/Interactive/vbi/vbi.vbproj b/src/Interactive/vbi/vbi.vbproj
index b4766aa25ef5f..5bbdf7f03a798 100644
--- a/src/Interactive/vbi/vbi.vbproj
+++ b/src/Interactive/vbi/vbi.vbproj
@@ -5,7 +5,7 @@
Exe
Sub Main
- $(RoslynPortableTargetFrameworks)
+ netcoreapp3.1;net472
diff --git a/src/NuGet/Microsoft.Net.Compilers.Toolset/Microsoft.Net.Compilers.Toolset.Package.csproj b/src/NuGet/Microsoft.Net.Compilers.Toolset/Microsoft.Net.Compilers.Toolset.Package.csproj
index 88954e878e7c5..9e646ebab5b99 100644
--- a/src/NuGet/Microsoft.Net.Compilers.Toolset/Microsoft.Net.Compilers.Toolset.Package.csproj
+++ b/src/NuGet/Microsoft.Net.Compilers.Toolset/Microsoft.Net.Compilers.Toolset.Package.csproj
@@ -1,7 +1,7 @@
- $(RoslynPortableTargetFrameworks)
+ netcoreapp3.1;net472
true
Microsoft.Net.Compilers.Toolset
diff --git a/src/Scripting/CSharpTest/Microsoft.CodeAnalysis.CSharp.Scripting.UnitTests.csproj b/src/Scripting/CSharpTest/Microsoft.CodeAnalysis.CSharp.Scripting.UnitTests.csproj
index 4457a981e8a5a..9b6dd68c6675b 100644
--- a/src/Scripting/CSharpTest/Microsoft.CodeAnalysis.CSharp.Scripting.UnitTests.csproj
+++ b/src/Scripting/CSharpTest/Microsoft.CodeAnalysis.CSharp.Scripting.UnitTests.csproj
@@ -5,7 +5,7 @@
Library
Microsoft.CodeAnalysis.CSharp.Scripting.UnitTests
true
- $(RoslynPortableTargetFrameworks)
+ netcoreapp3.1;net472
diff --git a/src/Scripting/CoreTest/Microsoft.CodeAnalysis.Scripting.UnitTests.csproj b/src/Scripting/CoreTest/Microsoft.CodeAnalysis.Scripting.UnitTests.csproj
index 4b2e85b21fbd4..d84ec3149efed 100644
--- a/src/Scripting/CoreTest/Microsoft.CodeAnalysis.Scripting.UnitTests.csproj
+++ b/src/Scripting/CoreTest/Microsoft.CodeAnalysis.Scripting.UnitTests.csproj
@@ -5,7 +5,7 @@
Library
Microsoft.CodeAnalysis.Scripting.Test
true
- $(RoslynPortableTargetFrameworks)
+ netcoreapp3.1;net472
diff --git a/src/Test/PdbUtilities/Roslyn.Test.PdbUtilities.csproj b/src/Test/PdbUtilities/Roslyn.Test.PdbUtilities.csproj
index 3eeabb1a30584..3bebf626603b2 100644
--- a/src/Test/PdbUtilities/Roslyn.Test.PdbUtilities.csproj
+++ b/src/Test/PdbUtilities/Roslyn.Test.PdbUtilities.csproj
@@ -4,7 +4,7 @@
Library
Roslyn.Test.PdbUtilities
- $(RoslynPortableTargetFrameworks)
+ netcoreapp3.1;net472
14.0
true
false
diff --git a/src/Test/Utilities/Portable/Roslyn.Test.Utilities.csproj b/src/Test/Utilities/Portable/Roslyn.Test.Utilities.csproj
index a54ad9adb9351..85f79eb82cd8e 100644
--- a/src/Test/Utilities/Portable/Roslyn.Test.Utilities.csproj
+++ b/src/Test/Utilities/Portable/Roslyn.Test.Utilities.csproj
@@ -4,7 +4,7 @@
Library
true
- netstandard2.0;$(RoslynPortableTargetFrameworks)
+ netstandard2.0;netcoreapp3.1;net472
false
diff --git a/src/Tools/BuildBoss/ProjectCheckerUtil.cs b/src/Tools/BuildBoss/ProjectCheckerUtil.cs
index c034d58d3c0e3..f8218a6ba4926 100644
--- a/src/Tools/BuildBoss/ProjectCheckerUtil.cs
+++ b/src/Tools/BuildBoss/ProjectCheckerUtil.cs
@@ -332,7 +332,6 @@ private bool CheckTargetFrameworks(TextWriter textWriter)
case "net20":
case "net472":
case "netcoreapp3.1":
- case "$(RoslynPortableTargetFrameworks)":
continue;
}
diff --git a/src/Tools/IdeCoreBenchmarks/IdeCoreBenchmarks.csproj b/src/Tools/IdeCoreBenchmarks/IdeCoreBenchmarks.csproj
index 6c0ce1ce453b4..3239fb042e192 100644
--- a/src/Tools/IdeCoreBenchmarks/IdeCoreBenchmarks.csproj
+++ b/src/Tools/IdeCoreBenchmarks/IdeCoreBenchmarks.csproj
@@ -5,7 +5,7 @@
Exe
- $(RoslynPortableTargetFrameworks)
+ netcoreapp3.1;net472
false
AnyCPU
diff --git a/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj b/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj
index 68ae1c0822f4a..4f635d489acee 100644
--- a/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj
+++ b/src/Workspaces/Core/MSBuild/Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj
@@ -5,7 +5,7 @@
Library
Microsoft.CodeAnalysis
true
- $(RoslynPortableTargetFrameworks)
+ netcoreapp3.1;net472
$(DefineConstants);WORKSPACE_MSBUILD
true