diff --git a/Directory.Build.props b/Directory.Build.props
index 9c3a0921d..5f6c9bd6f 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -28,12 +28,9 @@ tools\TestAssetsDependencies\TestAssetsDependencies.csproj
true
true
-
- netcoreapp3.0
-
- 3.0
+
diff --git a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj
index 9b3a4e233..758e81ed5 100644
--- a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj
+++ b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj
@@ -3,7 +3,7 @@
1.0.0-rc
- netcoreapp2.2
+ $(CliTargetFramework)
Exe
diff --git a/TestAssets/TestPackages/dotnet-portable/dotnet-portable.csproj b/TestAssets/TestPackages/dotnet-portable/dotnet-portable.csproj
index 1aef6a2d9..f707001e8 100644
--- a/TestAssets/TestPackages/dotnet-portable/dotnet-portable.csproj
+++ b/TestAssets/TestPackages/dotnet-portable/dotnet-portable.csproj
@@ -2,7 +2,7 @@
- netcoreapp2.2
+ $(CliTargetFramework)
Exe
diff --git a/TestAssets/TestPackages/dotnet-prefercliruntime/dotnet-prefercliruntime.csproj b/TestAssets/TestPackages/dotnet-prefercliruntime/dotnet-prefercliruntime.csproj
index 8706fd623..c97da18f4 100644
--- a/TestAssets/TestPackages/dotnet-prefercliruntime/dotnet-prefercliruntime.csproj
+++ b/TestAssets/TestPackages/dotnet-prefercliruntime/dotnet-prefercliruntime.csproj
@@ -2,7 +2,7 @@
- netcoreapp2.2
+ $(CliTargetFramework)
Exe
diff --git a/TestAssets/TestProjects/AppWithApplicationUrlInLaunchSettings/AppWithApplicationUrlInLaunchSettings.csproj b/TestAssets/TestProjects/AppWithApplicationUrlInLaunchSettings/AppWithApplicationUrlInLaunchSettings.csproj
index 576839f8e..8ef0c8c1b 100644
--- a/TestAssets/TestProjects/AppWithApplicationUrlInLaunchSettings/AppWithApplicationUrlInLaunchSettings.csproj
+++ b/TestAssets/TestProjects/AppWithApplicationUrlInLaunchSettings/AppWithApplicationUrlInLaunchSettings.csproj
@@ -3,6 +3,6 @@
Exe
- netcoreapp2.2
+ $(CliTargetFramework)
diff --git a/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj b/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj
index 89540778e..a095969a6 100644
--- a/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj
+++ b/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj
@@ -3,7 +3,7 @@
Exe
- netcoreapp2.2
+ $(CliTargetFramework)
win7-x64;win7-x86;osx.10.12-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;rhel.6-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64;linux-musl-x64
$(TEST_PACKAGES)
diff --git a/TestAssets/TestProjects/TestAppWithProjDepTool/TestAppWithProjDepTool.csproj b/TestAssets/TestProjects/TestAppWithProjDepTool/TestAppWithProjDepTool.csproj
index 71c0021d7..d05c83d53 100644
--- a/TestAssets/TestProjects/TestAppWithProjDepTool/TestAppWithProjDepTool.csproj
+++ b/TestAssets/TestProjects/TestAppWithProjDepTool/TestAppWithProjDepTool.csproj
@@ -3,7 +3,7 @@
Exe
- netcoreapp2.2
+ $(CliTargetFramework)
$(TEST_PACKAGES)
diff --git a/TestAssets/TestProjects/TestWebAppSimple/TestWebAppSimple.csproj b/TestAssets/TestProjects/TestWebAppSimple/TestWebAppSimple.csproj
index 0d5ffc364..a6a28607a 100644
--- a/TestAssets/TestProjects/TestWebAppSimple/TestWebAppSimple.csproj
+++ b/TestAssets/TestProjects/TestWebAppSimple/TestWebAppSimple.csproj
@@ -2,7 +2,7 @@
- netcoreapp2.2
+ $(CliTargetFramework)
diff --git a/build/TargetFramework.props b/build/TargetFramework.props
new file mode 100644
index 000000000..ca28c4c38
--- /dev/null
+++ b/build/TargetFramework.props
@@ -0,0 +1,7 @@
+
+
+ netcoreapp3.0
+
+ 3.0
+
+
diff --git a/testAsset.props b/testAsset.props
index 8d003d8ab..1a10b582d 100644
--- a/testAsset.props
+++ b/testAsset.props
@@ -2,6 +2,7 @@
$(MSBuildThisFileDirectory)
+
diff --git a/tools/CrossGen.Dependencies/CrossGen.Dependencies.csproj b/tools/CrossGen.Dependencies/CrossGen.Dependencies.csproj
index 0ca594efa..6cf680998 100644
--- a/tools/CrossGen.Dependencies/CrossGen.Dependencies.csproj
+++ b/tools/CrossGen.Dependencies/CrossGen.Dependencies.csproj
@@ -1,6 +1,6 @@
- netcoreapp2.2
+ $(CliTargetFramework)
$(SharedFrameworkRid)