diff --git a/eng/packaging.targets b/eng/packaging.targets
index a4ed0ec8855e6f..264fc6828181f6 100644
--- a/eng/packaging.targets
+++ b/eng/packaging.targets
@@ -48,7 +48,7 @@
<_IsWindowsDesktopApp Condition="$(WindowsDesktopCoreAppLibrary.Contains('$(AssemblyName);'))">true
<_IsAspNetCoreApp Condition="$(AspNetCoreAppLibrary.Contains('$(AssemblyName);'))">true
<_AssemblyInTargetingPack Condition="('$(IsNETCoreAppSrc)' == 'true' or '$(IsNetCoreAppRef)' == 'true' or '$(_IsAspNetCoreApp)' == 'true' or '$(_IsWindowsDesktopApp)' == 'true') and '$(TargetFrameworkIdentifier)' != '.NETFramework'">true
-
+
$(MajorVersion).$(MinorVersion).0.$(ServicingVersion)
@@ -318,12 +318,6 @@
-
-
-
-
- 4.0.0.0
ECMA
diff --git a/src/libraries/System.ComponentModel.Composition/Directory.Build.targets b/src/libraries/System.ComponentModel.Composition/Directory.Build.targets
new file mode 100644
index 00000000000000..fca3b1feb7a9c4
--- /dev/null
+++ b/src/libraries/System.ComponentModel.Composition/Directory.Build.targets
@@ -0,0 +1,8 @@
+
+
+
+
+ 4.0.0.0
+
+
diff --git a/src/libraries/System.Data.DataSetExtensions/Directory.Build.props b/src/libraries/System.Data.DataSetExtensions/Directory.Build.props
index bfb6ea882438b6..798ccfd363e813 100644
--- a/src/libraries/System.Data.DataSetExtensions/Directory.Build.props
+++ b/src/libraries/System.Data.DataSetExtensions/Directory.Build.props
@@ -1,8 +1,6 @@
-
- 4.0.0.0
ECMA
diff --git a/src/libraries/System.DirectoryServices.AccountManagement/Directory.Build.props b/src/libraries/System.DirectoryServices.AccountManagement/Directory.Build.props
index 4cf151da3064fc..de81d80c303d7d 100644
--- a/src/libraries/System.DirectoryServices.AccountManagement/Directory.Build.props
+++ b/src/libraries/System.DirectoryServices.AccountManagement/Directory.Build.props
@@ -1,10 +1,6 @@
-
- 4.0.0.0
ECMA
windows
diff --git a/src/libraries/System.DirectoryServices.AccountManagement/Directory.Build.targets b/src/libraries/System.DirectoryServices.AccountManagement/Directory.Build.targets
new file mode 100644
index 00000000000000..fca3b1feb7a9c4
--- /dev/null
+++ b/src/libraries/System.DirectoryServices.AccountManagement/Directory.Build.targets
@@ -0,0 +1,8 @@
+
+
+
+
+ 4.0.0.0
+
+
diff --git a/src/libraries/System.DirectoryServices.Protocols/Directory.Build.props b/src/libraries/System.DirectoryServices.Protocols/Directory.Build.props
index 525d9a0d12ab6f..831e8089e2459c 100644
--- a/src/libraries/System.DirectoryServices.Protocols/Directory.Build.props
+++ b/src/libraries/System.DirectoryServices.Protocols/Directory.Build.props
@@ -1,10 +1,6 @@
-
- 4.0.0.0
Microsoft
true
browser;android;ios;tvos
diff --git a/src/libraries/System.DirectoryServices.Protocols/Directory.Build.targets b/src/libraries/System.DirectoryServices.Protocols/Directory.Build.targets
new file mode 100644
index 00000000000000..1cdbd6995abe81
--- /dev/null
+++ b/src/libraries/System.DirectoryServices.Protocols/Directory.Build.targets
@@ -0,0 +1,8 @@
+
+
+
+
+ 4.0.0.0
+
+
diff --git a/src/libraries/System.DirectoryServices/Directory.Build.props b/src/libraries/System.DirectoryServices/Directory.Build.props
index 0740890146a71c..709a22a7537088 100644
--- a/src/libraries/System.DirectoryServices/Directory.Build.props
+++ b/src/libraries/System.DirectoryServices/Directory.Build.props
@@ -1,13 +1,6 @@
-
- 4.0.0.0
-
- true
Microsoft
windows
diff --git a/src/libraries/System.DirectoryServices/Directory.Build.targets b/src/libraries/System.DirectoryServices/Directory.Build.targets
new file mode 100644
index 00000000000000..fca3b1feb7a9c4
--- /dev/null
+++ b/src/libraries/System.DirectoryServices/Directory.Build.targets
@@ -0,0 +1,8 @@
+
+
+
+
+ 4.0.0.0
+
+
diff --git a/src/libraries/System.Management/Directory.Build.props b/src/libraries/System.Management/Directory.Build.props
index bfa544ca6f649e..709a22a7537088 100644
--- a/src/libraries/System.Management/Directory.Build.props
+++ b/src/libraries/System.Management/Directory.Build.props
@@ -1,10 +1,6 @@
-
- 4.0.0.0
Microsoft
windows
diff --git a/src/libraries/System.Management/Directory.Build.targets b/src/libraries/System.Management/Directory.Build.targets
new file mode 100644
index 00000000000000..1cdbd6995abe81
--- /dev/null
+++ b/src/libraries/System.Management/Directory.Build.targets
@@ -0,0 +1,8 @@
+
+
+
+
+ 4.0.0.0
+
+
diff --git a/src/libraries/System.Reflection.Context/Directory.Build.props b/src/libraries/System.Reflection.Context/Directory.Build.props
index ed15ad04f46183..798ccfd363e813 100644
--- a/src/libraries/System.Reflection.Context/Directory.Build.props
+++ b/src/libraries/System.Reflection.Context/Directory.Build.props
@@ -1,7 +1,6 @@
- 4.0.3.0
ECMA
diff --git a/src/libraries/System.Reflection.Context/Directory.Build.targets b/src/libraries/System.Reflection.Context/Directory.Build.targets
new file mode 100644
index 00000000000000..00afa2a62c35e3
--- /dev/null
+++ b/src/libraries/System.Reflection.Context/Directory.Build.targets
@@ -0,0 +1,9 @@
+
+
+
+
+ 4.0.3.0
+
+
diff --git a/src/libraries/System.Reflection.Context/ref/System.Reflection.Context.csproj b/src/libraries/System.Reflection.Context/ref/System.Reflection.Context.csproj
index 33a308c367eabc..bdca6894ae20a2 100644
--- a/src/libraries/System.Reflection.Context/ref/System.Reflection.Context.csproj
+++ b/src/libraries/System.Reflection.Context/ref/System.Reflection.Context.csproj
@@ -1,9 +1,5 @@
-
- 4.0.0.0
$(NetCoreAppCurrent);$(NetCoreAppPrevious);$(NetCoreAppMinimum);netstandard2.1;netstandard2.0
diff --git a/src/libraries/System.Runtime.Caching/Directory.Build.props b/src/libraries/System.Runtime.Caching/Directory.Build.props
index 30af6959a0707b..d68d22c1b917f8 100644
--- a/src/libraries/System.Runtime.Caching/Directory.Build.props
+++ b/src/libraries/System.Runtime.Caching/Directory.Build.props
@@ -1,10 +1,6 @@
-
- 4.0.0.0
Microsoft
true
diff --git a/src/libraries/System.Runtime.Caching/Directory.Build.targets b/src/libraries/System.Runtime.Caching/Directory.Build.targets
new file mode 100644
index 00000000000000..1cdbd6995abe81
--- /dev/null
+++ b/src/libraries/System.Runtime.Caching/Directory.Build.targets
@@ -0,0 +1,8 @@
+
+
+
+
+ 4.0.0.0
+
+
diff --git a/src/libraries/System.Speech/Directory.Build.props b/src/libraries/System.Speech/Directory.Build.props
index db2f816d5af405..d43c87c09cb684 100644
--- a/src/libraries/System.Speech/Directory.Build.props
+++ b/src/libraries/System.Speech/Directory.Build.props
@@ -1,10 +1,6 @@
-
- 4.0.0.0
MicrosoftShared
windows
diff --git a/src/libraries/System.Speech/Directory.Build.targets b/src/libraries/System.Speech/Directory.Build.targets
new file mode 100644
index 00000000000000..1cdbd6995abe81
--- /dev/null
+++ b/src/libraries/System.Speech/Directory.Build.targets
@@ -0,0 +1,8 @@
+
+
+
+
+ 4.0.0.0
+
+