From 1df03e5bbdb35e99655ec89d34e21c5d53ab4ff7 Mon Sep 17 00:00:00 2001
From: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Fri, 15 Jun 2018 17:01:34 -0500
Subject: [PATCH] Rename dir files to Directory.Build

dir.props => Directory.Build.props
dir.targets => Directory.Build.targets


Commit migrated from https://github.com/dotnet/corefx/commit/204a8dbbc23bfc51d419c93f2f2ddaf50db8020f
---
 src/libraries/BuildToolsVersion.txt           |  2 +-
 .../{dir.props => Directory.Build.props}      |  4 ++--
 .../pkg/CoreFx.Private.TestUtilities.pkgproj  |  4 ++--
 src/libraries/Directory.Build.props           |  2 +-
 src/libraries/Directory.Build.targets         | 24 +++++++++++++++++--
 .../Directory.Build.props}                    |  2 +-
 .../pkg/Microsoft.CSharp.pkgproj              |  4 ++--
 .../{dir.props => Directory.Build.props}      |  2 +-
 ...nostics.Tracing.EventSource.Redist.pkgproj |  4 ++--
 .../pkg/Microsoft.VisualBasic.pkgproj         |  6 ++---
 .../Directory.Build.props}                    |  2 +-
 .../{dir.props => Directory.Build.props}      |  2 +-
 ...osoft.Win32.Registry.AccessControl.pkgproj |  4 ++--
 .../Directory.Build.props}                    |  2 +-
 .../pkg/Microsoft.Win32.Registry.pkgproj      |  4 ++--
 .../{dir.props => Directory.Build.props}      |  2 +-
 .../pkg/Microsoft.Win32.SystemEvents.pkgproj  |  4 ++--
 .../{dir.props => Directory.Build.props}      |  2 +-
 .../Microsoft.XmlSerializer.Generator.pkgproj |  4 ++--
 src/libraries/Native/build-native.cmd         | 14 +++++++++--
 src/libraries/Native/native-binplace.proj     |  4 ++--
 .../pkg/{dir.props => Directory.Build.props}  |  2 +-
 .../{dir.targets => Directory.Build.targets}  |  2 +-
 ...e.native.System.Data.SqlClient.sni.pkgproj |  6 ++---
 .../SharedFrameworkValidation.proj            |  4 ++--
 .../{dir.props => Directory.Build.props}      |  2 +-
 .../{dir.props => Directory.Build.props}      |  2 +-
 .../System.Buffers/pkg/System.Buffers.pkgproj |  4 ++--
 .../Directory.Build.props}                    |  2 +-
 .../System.CodeDom/pkg/System.CodeDom.pkgproj |  4 ++--
 .../{dir.props => Directory.Build.props}      |  2 +-
 .../{dir.props => Directory.Build.props}      |  2 +-
 .../pkg/System.Collections.Immutable.pkgproj  |  4 ++--
 .../Directory.Build.props}                    |  2 +-
 .../Directory.Build.props}                    |  2 +-
 .../Directory.Build.props}                    |  2 +-
 .../{dir.props => Directory.Build.props}      |  2 +-
 .../System.ComponentModel.Annotations.pkgproj |  4 ++--
 .../{dir.props => Directory.Build.props}      |  2 +-
 .../System.ComponentModel.Composition.pkgproj |  4 ++--
 .../Directory.Build.props                     | 10 ++++++++
 .../dir.props                                 | 10 --------
 .../{dir.props => Directory.Build.props}      |  2 +-
 .../{dir.props => Directory.Build.props}      |  2 +-
 .../{dir.props => Directory.Build.props}      |  2 +-
 .../Directory.Build.props}                    |  2 +-
 ...System.Composition.AttributedModel.pkgproj |  4 ++--
 .../Directory.Build.props}                    |  2 +-
 .../pkg/System.Composition.Convention.pkgproj |  4 ++--
 .../Directory.Build.props}                    |  2 +-
 .../pkg/System.Composition.Hosting.pkgproj    |  4 ++--
 .../{dir.props => Directory.Build.props}      |  2 +-
 .../pkg/System.Composition.Runtime.pkgproj    |  4 ++--
 .../Directory.Build.props                     |  4 ++++
 .../System.Composition.TypedParts/dir.props   |  4 ----
 .../pkg/System.Composition.TypedParts.pkgproj |  4 ++--
 .../{dir.props => Directory.Build.props}      |  2 +-
 .../pkg/System.Composition.pkgproj            |  4 ++--
 .../Directory.Build.props}                    |  2 +-
 ...Configuration.ConfigurationManager.pkgproj |  4 ++--
 .../System.Console/Directory.Build.props      | 10 ++++++++
 src/libraries/System.Console/dir.props        | 10 --------
 .../{dir.props => Directory.Build.props}      |  2 +-
 .../{dir.props => Directory.Build.props}      |  2 +-
 .../pkg/System.Data.DataSetExtensions.pkgproj |  4 ++--
 .../Directory.Build.props}                    |  2 +-
 .../pkg/System.Data.Odbc.pkgproj              |  4 ++--
 .../{dir.props => Directory.Build.props}      |  2 +-
 .../pkg/System.Data.SqlClient.pkgproj         |  4 ++--
 .../Directory.Build.props}                    |  2 +-
 .../Directory.Build.props                     | 10 ++++++++
 .../System.Diagnostics.Debug/dir.props        | 10 --------
 .../{dir.props => Directory.Build.props}      |  2 +-
 ...ystem.Diagnostics.DiagnosticSource.pkgproj |  4 ++--
 .../Directory.Build.props}                    |  2 +-
 .../pkg/System.Diagnostics.EventLog.pkgproj   |  4 ++--
 .../Directory.Build.props}                    |  2 +-
 .../NativeConsoleApp/NativeConsoleApp.vcxproj |  4 ++--
 .../tests/NativeLibrary/NativeLibrary.vcxproj |  4 ++--
 .../SecondNativeLibrary.vcxproj               |  4 ++--
 ...m.Diagnostics.FileVersionInfo.Tests.csproj |  2 +-
 .../{dir.props => Directory.Build.props}      |  2 +-
 ...tem.Diagnostics.PerformanceCounter.pkgproj |  4 ++--
 .../Directory.Build.props                     | 10 ++++++++
 .../System.Diagnostics.Process/dir.props      | 10 --------
 .../Directory.Build.props                     | 10 ++++++++
 .../System.Diagnostics.StackTrace/dir.props   | 10 --------
 .../Directory.Build.props                     | 10 ++++++++
 .../dir.props                                 | 10 --------
 .../Directory.Build.props                     | 10 ++++++++
 .../System.Diagnostics.Tools/dir.props        | 10 --------
 .../Directory.Build.props                     | 10 ++++++++
 .../System.Diagnostics.TraceSource/dir.props  | 10 --------
 .../Directory.Build.props                     | 10 ++++++++
 .../System.Diagnostics.Tracing/dir.props      | 10 --------
 .../{dir.props => Directory.Build.props}      |  2 +-
 ...irectoryServices.AccountManagement.pkgproj |  4 ++--
 .../Directory.Build.props}                    |  2 +-
 ...System.DirectoryServices.Protocols.pkgproj |  4 ++--
 .../Directory.Build.props}                    |  2 +-
 .../pkg/System.DirectoryServices.pkgproj      |  4 ++--
 .../Directory.Build.props                     |  8 +++++++
 src/libraries/System.Drawing.Common/dir.props |  8 -------
 .../pkg/System.Drawing.Common.pkgproj         |  4 ++--
 ...em.Drawing.Common.Performance.Tests.csproj |  6 ++---
 .../{dir.props => Directory.Build.props}      |  2 +-
 .../Directory.Build.props                     | 10 ++++++++
 .../System.Dynamic.Runtime/dir.props          | 10 --------
 .../Directory.Build.props                     | 10 ++++++++
 .../System.Globalization.Calendars/dir.props  | 10 --------
 ...ion.CalendarsWithConfigSwitch.Tests.csproj |  6 ++---
 .../Directory.Build.props                     | 10 ++++++++
 .../System.Globalization.Extensions/dir.props | 10 --------
 .../Directory.Build.props                     | 10 ++++++++
 src/libraries/System.Globalization/dir.props  | 10 --------
 .../{dir.props => Directory.Build.props}      |  2 +-
 .../{dir.props => Directory.Build.props}      |  2 +-
 .../{dir.props => Directory.Build.props}      |  2 +-
 .../{dir.props => Directory.Build.props}      |  2 +-
 ...System.IO.FileSystem.AccessControl.pkgproj |  4 ++--
 .../Directory.Build.props                     | 10 ++++++++
 .../System.IO.FileSystem.DriveInfo/dir.props  | 10 --------
 .../Directory.Build.props                     | 10 ++++++++
 .../System.IO.FileSystem.Primitives/dir.props | 10 --------
 .../Directory.Build.props                     | 10 ++++++++
 .../System.IO.FileSystem.Watcher/dir.props    | 10 --------
 .../Directory.Build.props                     | 10 ++++++++
 src/libraries/System.IO.FileSystem/dir.props  | 10 --------
 .../Directory.Build.props                     | 10 ++++++++
 .../System.IO.IsolatedStorage/dir.props       | 10 --------
 .../Directory.Build.props                     | 10 ++++++++
 .../System.IO.MemoryMappedFiles/dir.props     | 10 --------
 .../Directory.Build.props}                    |  2 +-
 .../pkg/System.IO.Packaging.pkgproj           |  4 ++--
 .../System.IO.Pipelines/Directory.Build.props |  8 +++++++
 src/libraries/System.IO.Pipelines/dir.props   |  8 -------
 .../pkg/System.IO.Pipelines.pkgproj           |  4 ++--
 .../{dir.props => Directory.Build.props}      |  2 +-
 .../pkg/System.IO.Pipes.AccessControl.pkgproj |  4 ++--
 .../System.IO.Pipes/Directory.Build.props     | 10 ++++++++
 src/libraries/System.IO.Pipes/dir.props       | 10 --------
 .../{dir.props => Directory.Build.props}      |  2 +-
 .../pkg/System.IO.Ports.pkgproj               |  4 ++--
 .../Directory.Build.props                     | 10 ++++++++
 .../System.IO.UnmanagedMemoryStream/dir.props | 10 --------
 src/libraries/System.IO/Directory.Build.props | 10 ++++++++
 src/libraries/System.IO/dir.props             | 10 --------
 .../{dir.props => Directory.Build.props}      |  2 +-
 .../System.Json/pkg/System.Json.pkgproj       |  4 ++--
 .../Directory.Build.props                     | 10 ++++++++
 .../System.Linq.Expressions/dir.props         | 10 --------
 .../Directory.Build.props}                    |  2 +-
 ...tem.Linq.Parallel.Performance.Tests.csproj |  6 ++---
 .../Directory.Build.props}                    |  2 +-
 .../System.Linq/Directory.Build.props         | 10 ++++++++
 src/libraries/System.Linq/dir.props           | 10 --------
 .../Directory.Build.props}                    |  2 +-
 .../pkg/System.Management.pkgproj             |  4 ++--
 .../{dir.props => Directory.Build.props}      |  2 +-
 .../System.Memory/pkg/System.Memory.pkgproj   |  4 ++--
 .../Directory.Build.props}                    |  2 +-
 .../Directory.Build.props}                    |  2 +-
 .../System.Net.Http.WinHttpHandler.pkgproj    |  4 ++--
 .../System.Net.Http/Directory.Build.props     | 10 ++++++++
 src/libraries/System.Net.Http/dir.props       | 10 --------
 .../{dir.props => Directory.Build.props}      |  2 +-
 .../{dir.props => Directory.Build.props}      |  2 +-
 .../Directory.Build.props                     | 10 ++++++++
 .../System.Net.NameResolution/dir.props       | 10 --------
 .../Directory.Build.props                     | 10 ++++++++
 .../System.Net.NetworkInformation/dir.props   | 10 --------
 .../System.Net.Ping/Directory.Build.props     | 10 ++++++++
 src/libraries/System.Net.Ping/dir.props       | 10 --------
 .../Directory.Build.props                     | 10 ++++++++
 src/libraries/System.Net.Primitives/dir.props | 10 --------
 .../System.Net.Requests/Directory.Build.props | 10 ++++++++
 src/libraries/System.Net.Requests/dir.props   | 10 --------
 .../System.Net.Security/Directory.Build.props | 10 ++++++++
 src/libraries/System.Net.Security/dir.props   | 10 --------
 .../Directory.Build.props}                    |  2 +-
 .../System.Net.Sockets/Directory.Build.props  | 10 ++++++++
 src/libraries/System.Net.Sockets/dir.props    | 10 --------
 .../Directory.Build.props}                    |  2 +-
 .../Directory.Build.props                     | 10 ++++++++
 .../System.Net.WebHeaderCollection/dir.props  | 10 --------
 .../System.Net.WebProxy/Directory.Build.props | 10 ++++++++
 src/libraries/System.Net.WebProxy/dir.props   | 10 --------
 .../Directory.Build.props                     | 10 ++++++++
 .../System.Net.WebSockets.Client/dir.props    | 10 --------
 .../Directory.Build.props                     |  8 +++++++
 .../dir.props                                 |  8 -------
 ...m.Net.WebSockets.WebSocketProtocol.pkgproj |  4 ++--
 .../Directory.Build.props                     | 10 ++++++++
 src/libraries/System.Net.WebSockets/dir.props | 10 --------
 .../Directory.Build.props}                    |  2 +-
 .../{dir.props => Directory.Build.props}      |  2 +-
 .../pkg/System.Numerics.Vectors.pkgproj       |  4 ++--
 .../System.ObjectModel/Directory.Build.props  | 10 ++++++++
 src/libraries/System.ObjectModel/dir.props    | 10 --------
 .../{dir.props => Directory.Build.props}      |  2 +-
 .../{dir.props => Directory.Build.props}      |  2 +-
 .../{dir.props => Directory.Build.props}      |  2 +-
 .../{dir.props => Directory.Build.props}      |  2 +-
 .../{dir.props => Directory.Build.props}      |  2 +-
 .../{dir.props => Directory.Build.props}      |  2 +-
 .../{dir.props => Directory.Build.props}      |  2 +-
 .../System.Reflection.DispatchProxy.pkgproj   |  4 ++--
 .../{dir.props => Directory.Build.props}      |  2 +-
 .../{dir.props => Directory.Build.props}      |  2 +-
 .../{dir.props => Directory.Build.props}      |  2 +-
 .../Directory.Build.props                     | 10 ++++++++
 .../System.Reflection.Extensions/dir.props    | 10 --------
 .../{dir.props => Directory.Build.props}      |  2 +-
 .../pkg/System.Reflection.Metadata.pkgproj    |  4 ++--
 .../Directory.Build.props                     | 10 ++++++++
 .../System.Reflection.Primitives/dir.props    | 10 --------
 .../{dir.props => Directory.Build.props}      |  2 +-
 .../System.Reflection.TypeExtensions.pkgproj  |  4 ++--
 .../System.Reflection/Directory.Build.props   | 10 ++++++++
 src/libraries/System.Reflection/dir.props     | 10 --------
 .../Directory.Build.props                     | 10 ++++++++
 .../System.Resources.Reader/dir.props         | 10 --------
 .../Directory.Build.props                     | 10 ++++++++
 .../dir.props                                 | 10 --------
 .../Directory.Build.props                     | 10 ++++++++
 .../System.Resources.Writer/dir.props         | 10 --------
 .../Directory.Build.props}                    |  2 +-
 .../pkg/System.Runtime.Caching.pkgproj        |  4 ++--
 ...em.Runtime.CompilerServices.Unsafe.pkgproj |  4 ++--
 .../Directory.Build.props                     | 10 ++++++++
 .../dir.props                                 | 10 --------
 .../Directory.Build.props                     | 10 ++++++++
 .../System.Runtime.Extensions/dir.props       | 10 --------
 .../Directory.Build.props                     | 10 ++++++++
 .../System.Runtime.Handles/dir.props          | 10 --------
 .../Directory.Build.props}                    |  2 +-
 .../Directory.Build.props                     | 10 ++++++++
 .../dir.props                                 | 10 --------
 .../Directory.Build.props                     | 10 ++++++++
 .../System.Runtime.InteropServices/dir.props  | 10 --------
 .../{dir.props => Directory.Build.props}      |  2 +-
 ...em.Runtime.Intrinsics.Experimental.pkgproj |  4 ++--
 .../{dir.props => Directory.Build.props}      |  2 +-
 .../Directory.Build.props                     | 10 ++++++++
 .../System.Runtime.Numerics/dir.props         | 10 --------
 .../{dir.props => Directory.Build.props}      |  2 +-
 .../Directory.Build.props}                    |  2 +-
 .../Directory.Build.props                     | 10 ++++++++
 .../dir.props                                 | 10 --------
 .../{dir.props => Directory.Build.props}      |  2 +-
 .../{dir.props => Directory.Build.props}      |  2 +-
 .../{dir.props => Directory.Build.props}      |  2 +-
 .../System.Runtime/Directory.Build.props      | 10 ++++++++
 src/libraries/System.Runtime/dir.props        | 10 --------
 .../System.Reflection.TestModule.ilproj       |  4 ++--
 .../{dir.props => Directory.Build.props}      |  2 +-
 .../pkg/System.Security.AccessControl.pkgproj |  4 ++--
 .../Directory.Build.props                     | 10 ++++++++
 .../System.Security.Claims/dir.props          | 10 --------
 .../{dir.props => Directory.Build.props}      |  2 +-
 .../{dir.props => Directory.Build.props}      |  2 +-
 .../System.Security.Cryptography.Cng.pkgproj  |  4 ++--
 .../Directory.Build.props                     | 10 ++++++++
 .../dir.props                                 | 10 --------
 .../Directory.Build.props                     | 10 ++++++++
 .../dir.props                                 | 10 --------
 .../Directory.Build.props}                    |  2 +-
 ...stem.Security.Cryptography.OpenSsl.pkgproj |  4 ++--
 .../{dir.props => Directory.Build.props}      |  2 +-
 .../System.Security.Cryptography.Pkcs.pkgproj |  4 ++--
 .../Directory.Build.props                     | 10 ++++++++
 .../dir.props                                 | 10 --------
 .../Directory.Build.props                     |  8 +++++++
 .../dir.props                                 |  8 -------
 ...ecurity.Cryptography.ProtectedData.pkgproj |  4 ++--
 .../Directory.Build.props                     | 10 ++++++++
 .../dir.props                                 | 10 --------
 .../{dir.props => Directory.Build.props}      |  2 +-
 .../System.Security.Cryptography.Xml.pkgproj  |  4 ++--
 .../Directory.Build.props}                    |  2 +-
 .../pkg/System.Security.Permissions.pkgproj   |  4 ++--
 .../{dir.props => Directory.Build.props}      |  2 +-
 .../System.Security.Principal.Windows.pkgproj |  4 ++--
 .../Directory.Build.props                     | 10 ++++++++
 .../System.Security.Principal/dir.props       | 10 --------
 .../Directory.Build.props                     | 10 ++++++++
 .../System.Security.SecureString/dir.props    | 10 --------
 .../Directory.Build.props                     |  8 +++++++
 .../System.ServiceModel.Syndication/dir.props |  8 -------
 .../System.ServiceModel.Syndication.pkgproj   |  4 ++--
 .../{dir.props => Directory.Build.props}      |  2 +-
 ...m.ServiceProcess.ServiceController.pkgproj |  4 ++--
 .../{dir.props => Directory.Build.props}      |  2 +-
 .../System.Text.Encoding.CodePages.pkgproj    |  4 ++--
 .../Directory.Build.props                     | 10 ++++++++
 .../System.Text.Encoding.Extensions/dir.props | 10 --------
 .../Directory.Build.props                     | 10 ++++++++
 src/libraries/System.Text.Encoding/dir.props  | 10 --------
 .../{dir.props => Directory.Build.props}      |  2 +-
 .../pkg/System.Text.Encodings.Web.pkgproj     |  4 ++--
 .../Directory.Build.props                     | 10 ++++++++
 .../System.Text.RegularExpressions/dir.props  | 10 --------
 .../Directory.Build.props                     |  8 +++++++
 .../System.Threading.AccessControl/dir.props  |  8 -------
 .../System.Threading.AccessControl.pkgproj    |  4 ++--
 .../Directory.Build.props                     |  8 +++++++
 .../System.Threading.Channels/dir.props       |  8 -------
 .../pkg/System.Threading.Channels.pkgproj     |  4 ++--
 .../Directory.Build.props                     | 10 ++++++++
 .../System.Threading.Overlapped/dir.props     | 10 --------
 .../{dir.props => Directory.Build.props}      |  2 +-
 .../System.Threading.Tasks.Dataflow.pkgproj   |  4 ++--
 .../{dir.props => Directory.Build.props}      |  2 +-
 .../System.Threading.Tasks.Extensions.pkgproj |  6 ++---
 .../Directory.Build.props                     | 10 ++++++++
 .../System.Threading.Tasks.Parallel/dir.props | 10 --------
 .../Directory.Build.props                     | 10 ++++++++
 .../System.Threading.Tasks/dir.props          | 10 --------
 .../Directory.Build.props                     | 10 ++++++++
 .../System.Threading.Thread/dir.props         | 10 --------
 .../Directory.Build.props                     | 10 ++++++++
 .../System.Threading.ThreadPool/dir.props     | 10 --------
 .../Directory.Build.props                     | 10 ++++++++
 .../System.Threading.Timer/dir.props          | 10 --------
 .../System.Threading/Directory.Build.props    | 10 ++++++++
 src/libraries/System.Threading/dir.props      | 10 --------
 .../Directory.Build.props                     | 10 ++++++++
 .../System.Transactions.Local/dir.props       | 10 --------
 .../{dir.props => Directory.Build.props}      |  2 +-
 .../pkg/System.ValueTuple.pkgproj             |  4 ++--
 .../Directory.Build.props                     | 10 ++++++++
 .../System.Web.HttpUtility/dir.props          | 10 --------
 .../Directory.Build.props                     | 10 ++++++++
 .../System.Xml.ReaderWriter/dir.props         | 10 --------
 .../Directory.Build.props                     | 10 ++++++++
 src/libraries/System.Xml.XDocument/dir.props  | 10 --------
 .../Directory.Build.props                     | 10 ++++++++
 .../System.Xml.XPath.XDocument/dir.props      | 10 --------
 .../System.Xml.XPath/Directory.Build.props    | 10 ++++++++
 src/libraries/System.Xml.XPath/dir.props      | 10 --------
 .../Directory.Build.props                     | 10 ++++++++
 .../System.Xml.XmlDocument/dir.props          | 10 --------
 .../Directory.Build.props                     | 10 ++++++++
 .../System.Xml.XmlSerializer/dir.props        | 10 --------
 src/libraries/build.proj                      |  6 ++---
 src/libraries/dir.props                       |  3 ---
 src/libraries/dir.targets                     | 22 -----------------
 src/libraries/dirs.proj                       |  4 ++--
 .../{dir.props => Directory.Build.props}      |  2 +-
 .../{dir.targets => Directory.Build.targets}  |  2 +-
 src/libraries/external/ILLink/ILLink.depproj  |  4 ++--
 .../harvestPackages.SharedFramework.depproj   |  4 ++--
 src/libraries/external/dir.proj               |  2 +-
 src/libraries/external/docs/docs.depproj      |  4 ++--
 .../harvestPackages/harvestPackages.depproj   |  4 ++--
 .../external/netcoreapp/netcoreapp.depproj    |  4 ++--
 src/libraries/external/netfx/netfx.depproj    |  4 ++--
 .../external/netstandard/netstandard.depproj  |  4 ++--
 .../external/portable/portable.depproj        |  4 ++--
 .../external/runtime/runtime.depproj          |  4 ++--
 .../test-runtime/XUnit.Runtime.depproj        |  4 ++--
 src/libraries/external/uap/uap.depproj        |  4 ++--
 src/libraries/external/winrt/winrt.depproj    |  4 ++--
 src/libraries/packages.builds                 |  2 +-
 .../pkg/{dir.props => Directory.Build.props}  |  2 +-
 .../{dir.targets => Directory.Build.targets}  |  2 +-
 .../Microsoft.NETCore.Platforms.builds        |  2 +-
 .../Microsoft.NETCore.Platforms.pkgproj       |  6 ++---
 .../Microsoft.NETCore.Targets.builds          |  2 +-
 .../Microsoft.NETCore.Targets.pkgproj         |  6 ++---
 ...Microsoft.Private.CoreFx.NETCoreApp.builds |  2 +-
 ...icrosoft.Private.CoreFx.NETCoreApp.pkgproj |  4 ++--
 .../Microsoft.Private.CoreFx.UAP.builds       |  2 +-
 .../Microsoft.Private.CoreFx.UAP.pkgproj      |  4 ++--
 .../Microsoft.Private.PackageBaseline.builds  |  2 +-
 .../Microsoft.Private.PackageBaseline.pkgproj |  4 ++--
 ...crosoft.Windows.Compatibility.Shims.builds |  2 +-
 ...rosoft.Windows.Compatibility.Shims.pkgproj |  4 ++--
 .../Microsoft.Windows.Compatibility.builds    |  2 +-
 .../Microsoft.Windows.Compatibility.pkgproj   |  4 ++--
 src/libraries/pkg/test/testPackages.proj      |  4 ++--
 src/libraries/post.builds                     |  4 ++--
 src/libraries/publish.proj                    |  4 ++--
 src/libraries/ref.builds                      |  2 +-
 src/libraries/shims/ApiCompat.proj            |  4 ++--
 .../{dir.props => Directory.Build.props}      |  2 +-
 .../{dir.props => Directory.Build.props}      |  6 ++---
 src/libraries/shims/shims.proj                |  4 ++--
 src/libraries/sign.builds                     |  4 ++--
 src/libraries/src.builds                      |  2 +-
 src/libraries/syncAzure.proj                  |  2 +-
 src/libraries/tests.builds                    |  4 ++--
 src/libraries/upload-tests.proj               |  2 +-
 393 files changed, 1186 insertions(+), 1187 deletions(-)
 rename src/libraries/CoreFx.Private.TestUtilities/{dir.props => Directory.Build.props} (86%)
 rename src/libraries/{System.Runtime.Serialization.Json/dir.props => Microsoft.CSharp/Directory.Build.props} (87%)
 rename src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/{dir.props => Directory.Build.props} (84%)
 rename src/libraries/{System.Collections/dir.props => Microsoft.Win32.Primitives/Directory.Build.props} (85%)
 rename src/libraries/Microsoft.Win32.Registry.AccessControl/{dir.props => Directory.Build.props} (82%)
 rename src/libraries/{System.Security.Cryptography.OpenSsl/dir.props => Microsoft.Win32.Registry/Directory.Build.props} (86%)
 rename src/libraries/Microsoft.Win32.SystemEvents/{dir.props => Directory.Build.props} (82%)
 rename src/libraries/Microsoft.XmlSerializer.Generator/{dir.props => Directory.Build.props} (90%)
 rename src/libraries/Native/pkg/{dir.props => Directory.Build.props} (94%)
 rename src/libraries/Native/pkg/{dir.targets => Directory.Build.targets} (95%)
 rename src/libraries/System.AppContext/{dir.props => Directory.Build.props} (85%)
 rename src/libraries/System.Buffers/{dir.props => Directory.Build.props} (85%)
 rename src/libraries/{System.Security.Permissions/dir.props => System.CodeDom/Directory.Build.props} (82%)
 rename src/libraries/System.Collections.Concurrent/{dir.props => Directory.Build.props} (87%)
 rename src/libraries/System.Collections.Immutable/{dir.props => Directory.Build.props} (86%)
 rename src/libraries/{System.Collections.Specialized/dir.props => System.Collections.NonGeneric/Directory.Build.props} (85%)
 rename src/libraries/{System.Collections.NonGeneric/dir.props => System.Collections.Specialized/Directory.Build.props} (85%)
 rename src/libraries/{Microsoft.Win32.Primitives/dir.props => System.Collections/Directory.Build.props} (85%)
 rename src/libraries/System.ComponentModel.Annotations/{dir.props => Directory.Build.props} (85%)
 rename src/libraries/System.ComponentModel.Composition/{dir.props => Directory.Build.props} (85%)
 create mode 100644 src/libraries/System.ComponentModel.EventBasedAsync/Directory.Build.props
 delete mode 100644 src/libraries/System.ComponentModel.EventBasedAsync/dir.props
 rename src/libraries/System.ComponentModel.Primitives/{dir.props => Directory.Build.props} (85%)
 rename src/libraries/System.ComponentModel.TypeConverter/{dir.props => Directory.Build.props} (85%)
 rename src/libraries/System.ComponentModel/{dir.props => Directory.Build.props} (87%)
 rename src/libraries/{System.Composition.Convention/dir.props => System.Composition.AttributedModel/Directory.Build.props} (66%)
 rename src/libraries/{System.Composition.Hosting/dir.props => System.Composition.Convention/Directory.Build.props} (66%)
 rename src/libraries/{System.Composition.AttributedModel/dir.props => System.Composition.Hosting/Directory.Build.props} (66%)
 rename src/libraries/System.Composition.Runtime/{dir.props => Directory.Build.props} (66%)
 create mode 100644 src/libraries/System.Composition.TypedParts/Directory.Build.props
 delete mode 100644 src/libraries/System.Composition.TypedParts/dir.props
 rename src/libraries/System.Composition/{dir.props => Directory.Build.props} (82%)
 rename src/libraries/{System.CodeDom/dir.props => System.Configuration.ConfigurationManager/Directory.Build.props} (82%)
 create mode 100644 src/libraries/System.Console/Directory.Build.props
 delete mode 100644 src/libraries/System.Console/dir.props
 rename src/libraries/System.Data.Common/{dir.props => Directory.Build.props} (85%)
 rename src/libraries/System.Data.DataSetExtensions/{dir.props => Directory.Build.props} (82%)
 rename src/libraries/{System.Diagnostics.EventLog/dir.props => System.Data.Odbc/Directory.Build.props} (82%)
 rename src/libraries/System.Data.SqlClient/{dir.props => Directory.Build.props} (83%)
 rename src/libraries/{System.Linq.Parallel/dir.props => System.Diagnostics.Contracts/Directory.Build.props} (87%)
 create mode 100644 src/libraries/System.Diagnostics.Debug/Directory.Build.props
 delete mode 100644 src/libraries/System.Diagnostics.Debug/dir.props
 rename src/libraries/System.Diagnostics.DiagnosticSource/{dir.props => Directory.Build.props} (86%)
 rename src/libraries/{System.Data.Odbc/dir.props => System.Diagnostics.EventLog/Directory.Build.props} (82%)
 rename src/libraries/{System.Runtime.InteropServices.RuntimeInformation/dir.props => System.Diagnostics.FileVersionInfo/Directory.Build.props} (85%)
 rename src/libraries/System.Diagnostics.PerformanceCounter/{dir.props => Directory.Build.props} (82%)
 create mode 100644 src/libraries/System.Diagnostics.Process/Directory.Build.props
 delete mode 100644 src/libraries/System.Diagnostics.Process/dir.props
 create mode 100644 src/libraries/System.Diagnostics.StackTrace/Directory.Build.props
 delete mode 100644 src/libraries/System.Diagnostics.StackTrace/dir.props
 create mode 100644 src/libraries/System.Diagnostics.TextWriterTraceListener/Directory.Build.props
 delete mode 100644 src/libraries/System.Diagnostics.TextWriterTraceListener/dir.props
 create mode 100644 src/libraries/System.Diagnostics.Tools/Directory.Build.props
 delete mode 100644 src/libraries/System.Diagnostics.Tools/dir.props
 create mode 100644 src/libraries/System.Diagnostics.TraceSource/Directory.Build.props
 delete mode 100644 src/libraries/System.Diagnostics.TraceSource/dir.props
 create mode 100644 src/libraries/System.Diagnostics.Tracing/Directory.Build.props
 delete mode 100644 src/libraries/System.Diagnostics.Tracing/dir.props
 rename src/libraries/System.DirectoryServices.AccountManagement/{dir.props => Directory.Build.props} (88%)
 rename src/libraries/{System.DirectoryServices/dir.props => System.DirectoryServices.Protocols/Directory.Build.props} (88%)
 rename src/libraries/{System.Management/dir.props => System.DirectoryServices/Directory.Build.props} (88%)
 create mode 100644 src/libraries/System.Drawing.Common/Directory.Build.props
 delete mode 100644 src/libraries/System.Drawing.Common/dir.props
 rename src/libraries/System.Drawing.Primitives/{dir.props => Directory.Build.props} (85%)
 create mode 100644 src/libraries/System.Dynamic.Runtime/Directory.Build.props
 delete mode 100644 src/libraries/System.Dynamic.Runtime/dir.props
 create mode 100644 src/libraries/System.Globalization.Calendars/Directory.Build.props
 delete mode 100644 src/libraries/System.Globalization.Calendars/dir.props
 create mode 100644 src/libraries/System.Globalization.Extensions/Directory.Build.props
 delete mode 100644 src/libraries/System.Globalization.Extensions/dir.props
 create mode 100644 src/libraries/System.Globalization/Directory.Build.props
 delete mode 100644 src/libraries/System.Globalization/dir.props
 rename src/libraries/System.IO.Compression.Brotli/{dir.props => Directory.Build.props} (85%)
 rename src/libraries/System.IO.Compression.ZipFile/{dir.props => Directory.Build.props} (85%)
 rename src/libraries/System.IO.Compression/{dir.props => Directory.Build.props} (85%)
 rename src/libraries/System.IO.FileSystem.AccessControl/{dir.props => Directory.Build.props} (86%)
 create mode 100644 src/libraries/System.IO.FileSystem.DriveInfo/Directory.Build.props
 delete mode 100644 src/libraries/System.IO.FileSystem.DriveInfo/dir.props
 create mode 100644 src/libraries/System.IO.FileSystem.Primitives/Directory.Build.props
 delete mode 100644 src/libraries/System.IO.FileSystem.Primitives/dir.props
 create mode 100644 src/libraries/System.IO.FileSystem.Watcher/Directory.Build.props
 delete mode 100644 src/libraries/System.IO.FileSystem.Watcher/dir.props
 create mode 100644 src/libraries/System.IO.FileSystem/Directory.Build.props
 delete mode 100644 src/libraries/System.IO.FileSystem/dir.props
 create mode 100644 src/libraries/System.IO.IsolatedStorage/Directory.Build.props
 delete mode 100644 src/libraries/System.IO.IsolatedStorage/dir.props
 create mode 100644 src/libraries/System.IO.MemoryMappedFiles/Directory.Build.props
 delete mode 100644 src/libraries/System.IO.MemoryMappedFiles/dir.props
 rename src/libraries/{System.Net.Http.WinHttpHandler/dir.props => System.IO.Packaging/Directory.Build.props} (82%)
 create mode 100644 src/libraries/System.IO.Pipelines/Directory.Build.props
 delete mode 100644 src/libraries/System.IO.Pipelines/dir.props
 rename src/libraries/System.IO.Pipes.AccessControl/{dir.props => Directory.Build.props} (86%)
 create mode 100644 src/libraries/System.IO.Pipes/Directory.Build.props
 delete mode 100644 src/libraries/System.IO.Pipes/dir.props
 rename src/libraries/System.IO.Ports/{dir.props => Directory.Build.props} (83%)
 create mode 100644 src/libraries/System.IO.UnmanagedMemoryStream/Directory.Build.props
 delete mode 100644 src/libraries/System.IO.UnmanagedMemoryStream/dir.props
 create mode 100644 src/libraries/System.IO/Directory.Build.props
 delete mode 100644 src/libraries/System.IO/dir.props
 rename src/libraries/System.Json/{dir.props => Directory.Build.props} (82%)
 create mode 100644 src/libraries/System.Linq.Expressions/Directory.Build.props
 delete mode 100644 src/libraries/System.Linq.Expressions/dir.props
 rename src/libraries/{System.Linq.Queryable/dir.props => System.Linq.Parallel/Directory.Build.props} (87%)
 rename src/libraries/{System.Diagnostics.Contracts/dir.props => System.Linq.Queryable/Directory.Build.props} (87%)
 create mode 100644 src/libraries/System.Linq/Directory.Build.props
 delete mode 100644 src/libraries/System.Linq/dir.props
 rename src/libraries/{System.Runtime.Caching/dir.props => System.Management/Directory.Build.props} (88%)
 rename src/libraries/System.Memory/{dir.props => Directory.Build.props} (91%)
 rename src/libraries/{System.Numerics.Vectors.WindowsRuntime/dir.props => System.Net.Http.Rtc/Directory.Build.props} (83%)
 rename src/libraries/{System.IO.Packaging/dir.props => System.Net.Http.WinHttpHandler/Directory.Build.props} (82%)
 create mode 100644 src/libraries/System.Net.Http/Directory.Build.props
 delete mode 100644 src/libraries/System.Net.Http/dir.props
 rename src/libraries/System.Net.HttpListener/{dir.props => Directory.Build.props} (85%)
 rename src/libraries/System.Net.Mail/{dir.props => Directory.Build.props} (85%)
 create mode 100644 src/libraries/System.Net.NameResolution/Directory.Build.props
 delete mode 100644 src/libraries/System.Net.NameResolution/dir.props
 create mode 100644 src/libraries/System.Net.NetworkInformation/Directory.Build.props
 delete mode 100644 src/libraries/System.Net.NetworkInformation/dir.props
 create mode 100644 src/libraries/System.Net.Ping/Directory.Build.props
 delete mode 100644 src/libraries/System.Net.Ping/dir.props
 create mode 100644 src/libraries/System.Net.Primitives/Directory.Build.props
 delete mode 100644 src/libraries/System.Net.Primitives/dir.props
 create mode 100644 src/libraries/System.Net.Requests/Directory.Build.props
 delete mode 100644 src/libraries/System.Net.Requests/dir.props
 create mode 100644 src/libraries/System.Net.Security/Directory.Build.props
 delete mode 100644 src/libraries/System.Net.Security/dir.props
 rename src/libraries/{System.Net.WebClient/dir.props => System.Net.ServicePoint/Directory.Build.props} (85%)
 create mode 100644 src/libraries/System.Net.Sockets/Directory.Build.props
 delete mode 100644 src/libraries/System.Net.Sockets/dir.props
 rename src/libraries/{System.Net.ServicePoint/dir.props => System.Net.WebClient/Directory.Build.props} (85%)
 create mode 100644 src/libraries/System.Net.WebHeaderCollection/Directory.Build.props
 delete mode 100644 src/libraries/System.Net.WebHeaderCollection/dir.props
 create mode 100644 src/libraries/System.Net.WebProxy/Directory.Build.props
 delete mode 100644 src/libraries/System.Net.WebProxy/dir.props
 create mode 100644 src/libraries/System.Net.WebSockets.Client/Directory.Build.props
 delete mode 100644 src/libraries/System.Net.WebSockets.Client/dir.props
 create mode 100644 src/libraries/System.Net.WebSockets.WebSocketProtocol/Directory.Build.props
 delete mode 100644 src/libraries/System.Net.WebSockets.WebSocketProtocol/dir.props
 create mode 100644 src/libraries/System.Net.WebSockets/Directory.Build.props
 delete mode 100644 src/libraries/System.Net.WebSockets/dir.props
 rename src/libraries/{System.Net.Http.Rtc/dir.props => System.Numerics.Vectors.WindowsRuntime/Directory.Build.props} (83%)
 rename src/libraries/System.Numerics.Vectors/{dir.props => Directory.Build.props} (85%)
 create mode 100644 src/libraries/System.ObjectModel/Directory.Build.props
 delete mode 100644 src/libraries/System.ObjectModel/dir.props
 rename src/libraries/System.Private.DataContractSerialization/{dir.props => Directory.Build.props} (87%)
 rename src/libraries/System.Private.Reflection.Metadata.Ecma335/{dir.props => Directory.Build.props} (85%)
 rename src/libraries/System.Private.Uri/{dir.props => Directory.Build.props} (86%)
 rename src/libraries/System.Private.Xml.Linq/{dir.props => Directory.Build.props} (87%)
 rename src/libraries/System.Private.Xml/{dir.props => Directory.Build.props} (87%)
 rename src/libraries/System.Reflection.Context/{dir.props => Directory.Build.props} (86%)
 rename src/libraries/System.Reflection.DispatchProxy/{dir.props => Directory.Build.props} (85%)
 rename src/libraries/System.Reflection.Emit.ILGeneration/{dir.props => Directory.Build.props} (88%)
 rename src/libraries/System.Reflection.Emit.Lightweight/{dir.props => Directory.Build.props} (88%)
 rename src/libraries/System.Reflection.Emit/{dir.props => Directory.Build.props} (86%)
 create mode 100644 src/libraries/System.Reflection.Extensions/Directory.Build.props
 delete mode 100644 src/libraries/System.Reflection.Extensions/dir.props
 rename src/libraries/System.Reflection.Metadata/{dir.props => Directory.Build.props} (86%)
 create mode 100644 src/libraries/System.Reflection.Primitives/Directory.Build.props
 delete mode 100644 src/libraries/System.Reflection.Primitives/dir.props
 rename src/libraries/System.Reflection.TypeExtensions/{dir.props => Directory.Build.props} (85%)
 create mode 100644 src/libraries/System.Reflection/Directory.Build.props
 delete mode 100644 src/libraries/System.Reflection/dir.props
 create mode 100644 src/libraries/System.Resources.Reader/Directory.Build.props
 delete mode 100644 src/libraries/System.Resources.Reader/dir.props
 create mode 100644 src/libraries/System.Resources.ResourceManager/Directory.Build.props
 delete mode 100644 src/libraries/System.Resources.ResourceManager/dir.props
 create mode 100644 src/libraries/System.Resources.Writer/Directory.Build.props
 delete mode 100644 src/libraries/System.Resources.Writer/dir.props
 rename src/libraries/{System.DirectoryServices.Protocols/dir.props => System.Runtime.Caching/Directory.Build.props} (88%)
 create mode 100644 src/libraries/System.Runtime.CompilerServices.VisualC/Directory.Build.props
 delete mode 100644 src/libraries/System.Runtime.CompilerServices.VisualC/dir.props
 create mode 100644 src/libraries/System.Runtime.Extensions/Directory.Build.props
 delete mode 100644 src/libraries/System.Runtime.Extensions/dir.props
 create mode 100644 src/libraries/System.Runtime.Handles/Directory.Build.props
 delete mode 100644 src/libraries/System.Runtime.Handles/dir.props
 rename src/libraries/{System.Diagnostics.FileVersionInfo/dir.props => System.Runtime.InteropServices.RuntimeInformation/Directory.Build.props} (85%)
 create mode 100644 src/libraries/System.Runtime.InteropServices.WindowsRuntime/Directory.Build.props
 delete mode 100644 src/libraries/System.Runtime.InteropServices.WindowsRuntime/dir.props
 create mode 100644 src/libraries/System.Runtime.InteropServices/Directory.Build.props
 delete mode 100644 src/libraries/System.Runtime.InteropServices/dir.props
 rename src/libraries/System.Runtime.Intrinsics.Experimental/{dir.props => Directory.Build.props} (87%)
 rename src/libraries/System.Runtime.Loader/{dir.props => Directory.Build.props} (84%)
 create mode 100644 src/libraries/System.Runtime.Numerics/Directory.Build.props
 delete mode 100644 src/libraries/System.Runtime.Numerics/dir.props
 rename src/libraries/System.Runtime.Serialization.Formatters/{dir.props => Directory.Build.props} (85%)
 rename src/libraries/{Microsoft.CSharp/dir.props => System.Runtime.Serialization.Json/Directory.Build.props} (87%)
 create mode 100644 src/libraries/System.Runtime.Serialization.Primitives/Directory.Build.props
 delete mode 100644 src/libraries/System.Runtime.Serialization.Primitives/dir.props
 rename src/libraries/System.Runtime.Serialization.Xml/{dir.props => Directory.Build.props} (85%)
 rename src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/{dir.props => Directory.Build.props} (83%)
 rename src/libraries/System.Runtime.WindowsRuntime/{dir.props => Directory.Build.props} (83%)
 create mode 100644 src/libraries/System.Runtime/Directory.Build.props
 delete mode 100644 src/libraries/System.Runtime/dir.props
 rename src/libraries/System.Security.AccessControl/{dir.props => Directory.Build.props} (86%)
 create mode 100644 src/libraries/System.Security.Claims/Directory.Build.props
 delete mode 100644 src/libraries/System.Security.Claims/dir.props
 rename src/libraries/System.Security.Cryptography.Algorithms/{dir.props => Directory.Build.props} (85%)
 rename src/libraries/System.Security.Cryptography.Cng/{dir.props => Directory.Build.props} (86%)
 create mode 100644 src/libraries/System.Security.Cryptography.Csp/Directory.Build.props
 delete mode 100644 src/libraries/System.Security.Cryptography.Csp/dir.props
 create mode 100644 src/libraries/System.Security.Cryptography.Encoding/Directory.Build.props
 delete mode 100644 src/libraries/System.Security.Cryptography.Encoding/dir.props
 rename src/libraries/{Microsoft.Win32.Registry/dir.props => System.Security.Cryptography.OpenSsl/Directory.Build.props} (86%)
 rename src/libraries/System.Security.Cryptography.Pkcs/{dir.props => Directory.Build.props} (82%)
 create mode 100644 src/libraries/System.Security.Cryptography.Primitives/Directory.Build.props
 delete mode 100644 src/libraries/System.Security.Cryptography.Primitives/dir.props
 create mode 100644 src/libraries/System.Security.Cryptography.ProtectedData/Directory.Build.props
 delete mode 100644 src/libraries/System.Security.Cryptography.ProtectedData/dir.props
 create mode 100644 src/libraries/System.Security.Cryptography.X509Certificates/Directory.Build.props
 delete mode 100644 src/libraries/System.Security.Cryptography.X509Certificates/dir.props
 rename src/libraries/System.Security.Cryptography.Xml/{dir.props => Directory.Build.props} (82%)
 rename src/libraries/{System.Configuration.ConfigurationManager/dir.props => System.Security.Permissions/Directory.Build.props} (82%)
 rename src/libraries/System.Security.Principal.Windows/{dir.props => Directory.Build.props} (86%)
 create mode 100644 src/libraries/System.Security.Principal/Directory.Build.props
 delete mode 100644 src/libraries/System.Security.Principal/dir.props
 create mode 100644 src/libraries/System.Security.SecureString/Directory.Build.props
 delete mode 100644 src/libraries/System.Security.SecureString/dir.props
 create mode 100644 src/libraries/System.ServiceModel.Syndication/Directory.Build.props
 delete mode 100644 src/libraries/System.ServiceModel.Syndication/dir.props
 rename src/libraries/System.ServiceProcess.ServiceController/{dir.props => Directory.Build.props} (82%)
 rename src/libraries/System.Text.Encoding.CodePages/{dir.props => Directory.Build.props} (83%)
 create mode 100644 src/libraries/System.Text.Encoding.Extensions/Directory.Build.props
 delete mode 100644 src/libraries/System.Text.Encoding.Extensions/dir.props
 create mode 100644 src/libraries/System.Text.Encoding/Directory.Build.props
 delete mode 100644 src/libraries/System.Text.Encoding/dir.props
 rename src/libraries/System.Text.Encodings.Web/{dir.props => Directory.Build.props} (82%)
 create mode 100644 src/libraries/System.Text.RegularExpressions/Directory.Build.props
 delete mode 100644 src/libraries/System.Text.RegularExpressions/dir.props
 create mode 100644 src/libraries/System.Threading.AccessControl/Directory.Build.props
 delete mode 100644 src/libraries/System.Threading.AccessControl/dir.props
 create mode 100644 src/libraries/System.Threading.Channels/Directory.Build.props
 delete mode 100644 src/libraries/System.Threading.Channels/dir.props
 create mode 100644 src/libraries/System.Threading.Overlapped/Directory.Build.props
 delete mode 100644 src/libraries/System.Threading.Overlapped/dir.props
 rename src/libraries/System.Threading.Tasks.Dataflow/{dir.props => Directory.Build.props} (86%)
 rename src/libraries/System.Threading.Tasks.Extensions/{dir.props => Directory.Build.props} (91%)
 create mode 100644 src/libraries/System.Threading.Tasks.Parallel/Directory.Build.props
 delete mode 100644 src/libraries/System.Threading.Tasks.Parallel/dir.props
 create mode 100644 src/libraries/System.Threading.Tasks/Directory.Build.props
 delete mode 100644 src/libraries/System.Threading.Tasks/dir.props
 create mode 100644 src/libraries/System.Threading.Thread/Directory.Build.props
 delete mode 100644 src/libraries/System.Threading.Thread/dir.props
 create mode 100644 src/libraries/System.Threading.ThreadPool/Directory.Build.props
 delete mode 100644 src/libraries/System.Threading.ThreadPool/dir.props
 create mode 100644 src/libraries/System.Threading.Timer/Directory.Build.props
 delete mode 100644 src/libraries/System.Threading.Timer/dir.props
 create mode 100644 src/libraries/System.Threading/Directory.Build.props
 delete mode 100644 src/libraries/System.Threading/dir.props
 create mode 100644 src/libraries/System.Transactions.Local/Directory.Build.props
 delete mode 100644 src/libraries/System.Transactions.Local/dir.props
 rename src/libraries/System.ValueTuple/{dir.props => Directory.Build.props} (85%)
 create mode 100644 src/libraries/System.Web.HttpUtility/Directory.Build.props
 delete mode 100644 src/libraries/System.Web.HttpUtility/dir.props
 create mode 100644 src/libraries/System.Xml.ReaderWriter/Directory.Build.props
 delete mode 100644 src/libraries/System.Xml.ReaderWriter/dir.props
 create mode 100644 src/libraries/System.Xml.XDocument/Directory.Build.props
 delete mode 100644 src/libraries/System.Xml.XDocument/dir.props
 create mode 100644 src/libraries/System.Xml.XPath.XDocument/Directory.Build.props
 delete mode 100644 src/libraries/System.Xml.XPath.XDocument/dir.props
 create mode 100644 src/libraries/System.Xml.XPath/Directory.Build.props
 delete mode 100644 src/libraries/System.Xml.XPath/dir.props
 create mode 100644 src/libraries/System.Xml.XmlDocument/Directory.Build.props
 delete mode 100644 src/libraries/System.Xml.XmlDocument/dir.props
 create mode 100644 src/libraries/System.Xml.XmlSerializer/Directory.Build.props
 delete mode 100644 src/libraries/System.Xml.XmlSerializer/dir.props
 delete mode 100644 src/libraries/dir.props
 delete mode 100644 src/libraries/dir.targets
 rename src/libraries/external/{dir.props => Directory.Build.props} (89%)
 rename src/libraries/external/{dir.targets => Directory.Build.targets} (93%)
 rename src/libraries/pkg/{dir.props => Directory.Build.props} (98%)
 rename src/libraries/pkg/{dir.targets => Directory.Build.targets} (96%)
 rename src/libraries/shims/{dir.props => Directory.Build.props} (92%)
 rename src/libraries/shims/manual/{dir.props => Directory.Build.props} (86%)

diff --git a/src/libraries/BuildToolsVersion.txt b/src/libraries/BuildToolsVersion.txt
index 3bad84b8703..b91b92475b1 100644
--- a/src/libraries/BuildToolsVersion.txt
+++ b/src/libraries/BuildToolsVersion.txt
@@ -1 +1 @@
-2.2.0-preview1-02911-01
+2.2.0-preview1-02912-0
\ No newline at end of file
diff --git a/src/libraries/CoreFx.Private.TestUtilities/dir.props b/src/libraries/CoreFx.Private.TestUtilities/Directory.Build.props
similarity index 86%
rename from src/libraries/CoreFx.Private.TestUtilities/dir.props
rename to src/libraries/CoreFx.Private.TestUtilities/Directory.Build.props
index 5721456d1d0..84179fc84dc 100644
--- a/src/libraries/CoreFx.Private.TestUtilities/dir.props
+++ b/src/libraries/CoreFx.Private.TestUtilities/Directory.Build.props
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>1.0.1.0</AssemblyVersion>
     <AssemblyKey>Test</AssemblyKey>
     <!-- DO NOT ship this as stable for .NET Core 2.0. -->
     <BlockStable>true</BlockStable>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/CoreFx.Private.TestUtilities/pkg/CoreFx.Private.TestUtilities.pkgproj b/src/libraries/CoreFx.Private.TestUtilities/pkg/CoreFx.Private.TestUtilities.pkgproj
index 2f9f2405ba4..d231608c227 100644
--- a/src/libraries/CoreFx.Private.TestUtilities/pkg/CoreFx.Private.TestUtilities.pkgproj
+++ b/src/libraries/CoreFx.Private.TestUtilities/pkg/CoreFx.Private.TestUtilities.pkgproj
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\CoreFx.Private.TestUtilities.csproj">
       <SupportedFramework>uap10.0.16299;netcoreapp2.0;net461;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\CoreFx.Private.TestUtilities.csproj"/>
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props
index 2dd9df93c90..78036970dc2 100644
--- a/src/libraries/Directory.Build.props
+++ b/src/libraries/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), dir.props))\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <EnableDefaultItems>false</EnableDefaultItems>
     <NoWarn>CS3021;$(NoWarn)</NoWarn>
diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets
index e1f18fc6f19..fcb0ff4021c 100644
--- a/src/libraries/Directory.Build.targets
+++ b/src/libraries/Directory.Build.targets
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project InitialTargets="AddSkipGetTargetFrameworkToProjectReferences">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup>
+    <ErrorIfBuildToolsRestoredFromIndividualProject Condition="!Exists('$(ToolsDir)')">true</ErrorIfBuildToolsRestoredFromIndividualProject>
+  </PropertyGroup>
+
+  <Import Project="..\Directory.Build.targets" />
+  
   <Target Name="_CheckForInvalidConfigurationAndPlatform" />
   <Target Name="_CheckForUnsupportedTargetFramework" />
   <Target Name="RunResolvePackageDependencies" />
@@ -22,6 +27,21 @@
     <PropertyGroup>
       <ResolvePackageDependenciesForBuildDependsOn></ResolvePackageDependenciesForBuildDependsOn>
     </PropertyGroup>
-    
+
   </Target>
+
+  <!-- Returns the assembly version of the project for consumption
+       by the NuGet package generation -->
+  <Target Name="GetAssemblyVersion"
+          Returns="$(AssemblyVersion)"/>
+
+  <!-- Returns the generated documentation file for consumption
+       by the NuGet package generation -->
+  <Target Name="GetDocumentationFile"
+          Returns="$(DocumentationFile)"/>
+
+  <Target Name="DumpTargets" BeforeTargets="ResolveProjectReferences">
+    <Message Text="DumpTargets> $(OutputPath), C=[$(Configuration)], CG=[$(ConfigurationGroup)], OG=[$(OSGroup)], TG=[$(TargetGroup)]" Importance="Low" />
+  </Target>
+
 </Project> 
diff --git a/src/libraries/System.Runtime.Serialization.Json/dir.props b/src/libraries/Microsoft.CSharp/Directory.Build.props
similarity index 87%
rename from src/libraries/System.Runtime.Serialization.Json/dir.props
rename to src/libraries/Microsoft.CSharp/Directory.Build.props
index 2010639bb33..8455e16f095 100644
--- a/src/libraries/System.Runtime.Serialization.Json/dir.props
+++ b/src/libraries/Microsoft.CSharp/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.4.0</AssemblyVersion>
     <AssemblyKey>MSFT</AssemblyKey>
diff --git a/src/libraries/Microsoft.CSharp/pkg/Microsoft.CSharp.pkgproj b/src/libraries/Microsoft.CSharp/pkg/Microsoft.CSharp.pkgproj
index 45d2d8dd310..01f313e3cb1 100644
--- a/src/libraries/Microsoft.CSharp/pkg/Microsoft.CSharp.pkgproj
+++ b/src/libraries/Microsoft.CSharp/pkg/Microsoft.CSharp.pkgproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\Microsoft.CSharp.csproj">
       <SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
@@ -41,5 +41,5 @@
       <Value>.NETStandard,Version=v1.0;.NETStandard,Version=v1.1;.NETStandard,Version=v1.2</Value>
     </ValidatePackageSuppression>
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/dir.props b/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/Directory.Build.props
similarity index 84%
rename from src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/dir.props
rename to src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/Directory.Build.props
index 56f0349243e..70e1444a150 100644
--- a/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/dir.props
+++ b/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <PackageVersion>2.1.0</PackageVersion>
     <AssemblyVersion>2.0.2.0</AssemblyVersion>
diff --git a/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/pkg/Microsoft.Diagnostics.Tracing.EventSource.Redist.pkgproj b/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/pkg/Microsoft.Diagnostics.Tracing.EventSource.Redist.pkgproj
index 3379276bae7..f13488f3158 100644
--- a/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/pkg/Microsoft.Diagnostics.Tracing.EventSource.Redist.pkgproj
+++ b/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/pkg/Microsoft.Diagnostics.Tracing.EventSource.Redist.pkgproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
 
   <ItemGroup>
     <ProjectReference Include="..\src\Microsoft.Diagnostics.Tracing.EventSource.Redist.csproj">
@@ -13,5 +13,5 @@
     <SkipPackageFileCheck>true</SkipPackageFileCheck>
   </PropertyGroup>
 
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/Microsoft.VisualBasic/pkg/Microsoft.VisualBasic.pkgproj b/src/libraries/Microsoft.VisualBasic/pkg/Microsoft.VisualBasic.pkgproj
index 5a8b968b565..5ffb2c09755 100644
--- a/src/libraries/Microsoft.VisualBasic/pkg/Microsoft.VisualBasic.pkgproj
+++ b/src/libraries/Microsoft.VisualBasic/pkg/Microsoft.VisualBasic.pkgproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\Microsoft.VisualBasic.csproj">
       <SupportedFramework>net45;netcore45;netcoreapp1.0;wpa81;$(AllXamarinFrameworks)</SupportedFramework>
@@ -22,5 +22,5 @@
       <Value>.NETStandard,Version=v1.1;.NETStandard,Version=v1.2</Value>
     </ValidatePackageSuppression>
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
+</Project>
diff --git a/src/libraries/System.Collections/dir.props b/src/libraries/Microsoft.Win32.Primitives/Directory.Build.props
similarity index 85%
rename from src/libraries/System.Collections/dir.props
rename to src/libraries/Microsoft.Win32.Primitives/Directory.Build.props
index e0633597727..2ac6942ba72 100644
--- a/src/libraries/System.Collections/dir.props
+++ b/src/libraries/Microsoft.Win32.Primitives/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <AssemblyKey>MSFT</AssemblyKey>
diff --git a/src/libraries/Microsoft.Win32.Registry.AccessControl/dir.props b/src/libraries/Microsoft.Win32.Registry.AccessControl/Directory.Build.props
similarity index 82%
rename from src/libraries/Microsoft.Win32.Registry.AccessControl/dir.props
rename to src/libraries/Microsoft.Win32.Registry.AccessControl/Directory.Build.props
index 0d81e0a9e88..0eee85e4403 100644
--- a/src/libraries/Microsoft.Win32.Registry.AccessControl/dir.props
+++ b/src/libraries/Microsoft.Win32.Registry.AccessControl/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.4.0</AssemblyVersion>
     <AssemblyKey>MSFT</AssemblyKey>
diff --git a/src/libraries/Microsoft.Win32.Registry.AccessControl/pkg/Microsoft.Win32.Registry.AccessControl.pkgproj b/src/libraries/Microsoft.Win32.Registry.AccessControl/pkg/Microsoft.Win32.Registry.AccessControl.pkgproj
index 2b744f20912..2d8e3dbf318 100644
--- a/src/libraries/Microsoft.Win32.Registry.AccessControl/pkg/Microsoft.Win32.Registry.AccessControl.pkgproj
+++ b/src/libraries/Microsoft.Win32.Registry.AccessControl/pkg/Microsoft.Win32.Registry.AccessControl.pkgproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\Microsoft.Win32.Registry.AccessControl.csproj">
       <SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
@@ -12,5 +12,5 @@
     </HarvestIncludePaths>
     <HarvestIncludePaths Include="runtimes/win/lib/netstandard1.3;lib/netstandard1.3" />
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.OpenSsl/dir.props b/src/libraries/Microsoft.Win32.Registry/Directory.Build.props
similarity index 86%
rename from src/libraries/System.Security.Cryptography.OpenSsl/dir.props
rename to src/libraries/Microsoft.Win32.Registry/Directory.Build.props
index 8c1928e5835..56ea582b1e6 100644
--- a/src/libraries/System.Security.Cryptography.OpenSsl/dir.props
+++ b/src/libraries/Microsoft.Win32.Registry/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.1.2.0</AssemblyVersion>
     <AssemblyKey>MSFT</AssemblyKey>
diff --git a/src/libraries/Microsoft.Win32.Registry/pkg/Microsoft.Win32.Registry.pkgproj b/src/libraries/Microsoft.Win32.Registry/pkg/Microsoft.Win32.Registry.pkgproj
index e444f293b3e..684d0f0c3fa 100644
--- a/src/libraries/Microsoft.Win32.Registry/pkg/Microsoft.Win32.Registry.pkgproj
+++ b/src/libraries/Microsoft.Win32.Registry/pkg/Microsoft.Win32.Registry.pkgproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\Microsoft.Win32.Registry.csproj">
       <SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
@@ -12,5 +12,5 @@
     </HarvestIncludePaths>
     <HarvestIncludePaths Include="runtimes/win/lib/netstandard1.3;lib/netstandard1.3" />
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/Microsoft.Win32.SystemEvents/dir.props b/src/libraries/Microsoft.Win32.SystemEvents/Directory.Build.props
similarity index 82%
rename from src/libraries/Microsoft.Win32.SystemEvents/dir.props
rename to src/libraries/Microsoft.Win32.SystemEvents/Directory.Build.props
index af5b2933851..5d39fb280b3 100644
--- a/src/libraries/Microsoft.Win32.SystemEvents/dir.props
+++ b/src/libraries/Microsoft.Win32.SystemEvents/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <AssemblyKey>Open</AssemblyKey>
diff --git a/src/libraries/Microsoft.Win32.SystemEvents/pkg/Microsoft.Win32.SystemEvents.pkgproj b/src/libraries/Microsoft.Win32.SystemEvents/pkg/Microsoft.Win32.SystemEvents.pkgproj
index 22c2e1d90df..b3259258fda 100644
--- a/src/libraries/Microsoft.Win32.SystemEvents/pkg/Microsoft.Win32.SystemEvents.pkgproj
+++ b/src/libraries/Microsoft.Win32.SystemEvents/pkg/Microsoft.Win32.SystemEvents.pkgproj
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\Microsoft.Win32.SystemEvents.csproj">
       <SupportedFramework>uap10.0.16299;net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\Microsoft.Win32.SystemEvents.csproj" />
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/Microsoft.XmlSerializer.Generator/dir.props b/src/libraries/Microsoft.XmlSerializer.Generator/Directory.Build.props
similarity index 90%
rename from src/libraries/Microsoft.XmlSerializer.Generator/dir.props
rename to src/libraries/Microsoft.XmlSerializer.Generator/Directory.Build.props
index 66b1e87a746..698a7c9dc65 100644
--- a/src/libraries/Microsoft.XmlSerializer.Generator/dir.props
+++ b/src/libraries/Microsoft.XmlSerializer.Generator/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <PackageVersion>2.0.0</PackageVersion>
     <SkipValidatePackage>true</SkipValidatePackage>
diff --git a/src/libraries/Microsoft.XmlSerializer.Generator/pkg/Microsoft.XmlSerializer.Generator.pkgproj b/src/libraries/Microsoft.XmlSerializer.Generator/pkg/Microsoft.XmlSerializer.Generator.pkgproj
index 1278907b244..b10b6e00b7a 100644
--- a/src/libraries/Microsoft.XmlSerializer.Generator/pkg/Microsoft.XmlSerializer.Generator.pkgproj
+++ b/src/libraries/Microsoft.XmlSerializer.Generator/pkg/Microsoft.XmlSerializer.Generator.pkgproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\src\Microsoft.XmlSerializer.Generator.csproj" />
   </ItemGroup>
@@ -19,6 +19,6 @@
       <TargetPath>\lib\netstandard2.0\</TargetPath>
     </PackageFile>
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
   <Import Project=".\GenerateNupkgProps.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/Native/build-native.cmd b/src/libraries/Native/build-native.cmd
index 641b710951a..6d66e1aa899 100644
--- a/src/libraries/Native/build-native.cmd
+++ b/src/libraries/Native/build-native.cmd
@@ -103,11 +103,21 @@ goto :SetupDirs
 echo Commencing build of native components
 echo.
 
+set "__BaseIntermediatesDir=%__binDir%\obj\Windows_NT.%__BuildArch%.%CMAKE_BUILD_TYPE%"
+
+:: Write an empty Directory.Build.props/targets to ensure that msbuild doesn't pick up 
+:: the repo's root Directory.Build.props/targets.
+set MSBUILD_EMPTY_PROJECT_CONTENT= ^
+ ^^^<Project xmlns=^"http://schemas.microsoft.com/developer/msbuild/2003^"^^^> ^
+ ^^^</Project^^^>
+echo %MSBUILD_EMPTY_PROJECT_CONTENT% > "%__BaseIntermediatesDir%\Directory.Build.props"
+echo %MSBUILD_EMPTY_PROJECT_CONTENT% > "%__BaseIntermediatesDir%\Directory.Build.targets"
+
 if %__CMakeBinDir% == "" (
     set "__CMakeBinDir=%__binDir%\Windows_NT.%__BuildArch%.%CMAKE_BUILD_TYPE%\native"
 )
 if %__IntermediatesDir% == "" (
-    set "__IntermediatesDir=%__binDir%\obj\Windows_NT.%__BuildArch%.%CMAKE_BUILD_TYPE%\native"
+    set "__IntermediatesDir=%__BaseIntermediatesDir%\native"
 )
 set "__CMakeBinDir=%__CMakeBinDir:\=/%"
 set "__IntermediatesDir=%__IntermediatesDir:\=/%"
@@ -160,7 +170,7 @@ echo Done building Native components
 
 :BuildNativeAOT
 set "__CMakeBinDir=%__binDir%\Windows_NT.%__BuildArch%.%CMAKE_BUILD_TYPE%\native_aot"
-set "__IntermediatesDir=%__binDir%\obj\Windows_NT.%__BuildArch%.%CMAKE_BUILD_TYPE%\native_aot"
+set "__IntermediatesDir=%__BaseIntermediatesDir%\native_aot"
 set "__CMakeBinDir=%__CMakeBinDir:\=/%"
 set "__IntermediatesDir=%__IntermediatesDir:\=/%"
 if exist "%__IntermediatesDir%" rd /s /q "%__IntermediatesDir%"
diff --git a/src/libraries/Native/native-binplace.proj b/src/libraries/Native/native-binplace.proj
index f66558ee7e2..b0b5e52aba1 100644
--- a/src/libraries/Native/native-binplace.proj
+++ b/src/libraries/Native/native-binplace.proj
@@ -9,12 +9,12 @@
       netfx;
     </BuildConfigurations>
   </PropertyGroup>
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <Target Name="Build" DependsOnTargets="BinPlace" />
   <Target Name="Clean" />
   <Target Name="Rebuild" DependsOnTargets="Clean;Build" />
 
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 
   <Target Name="GetBinPlaceItems">
     <ItemGroup>
diff --git a/src/libraries/Native/pkg/dir.props b/src/libraries/Native/pkg/Directory.Build.props
similarity index 94%
rename from src/libraries/Native/pkg/dir.props
rename to src/libraries/Native/pkg/Directory.Build.props
index f89dc1deb2e..8c670f037e0 100644
--- a/src/libraries/Native/pkg/dir.props
+++ b/src/libraries/Native/pkg/Directory.Build.props
@@ -1,5 +1,5 @@
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)\.., dir.props))\dir.props" />
+  <Import Project="..\..\Directory.Build.props" />
 
   <PropertyGroup>
     <!-- common properties that point to output of native build.  Can be overriden in case of 
diff --git a/src/libraries/Native/pkg/dir.targets b/src/libraries/Native/pkg/Directory.Build.targets
similarity index 95%
rename from src/libraries/Native/pkg/dir.targets
rename to src/libraries/Native/pkg/Directory.Build.targets
index a525c68af33..2c22401f381 100644
--- a/src/libraries/Native/pkg/dir.targets
+++ b/src/libraries/Native/pkg/Directory.Build.targets
@@ -58,5 +58,5 @@
     </ItemGroup>
   </Target>
 
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)\.., dir.targets))\dir.targets" />
+  <Import Project="..\..\Directory.Build.targets" />
 </Project>
diff --git a/src/libraries/Native/pkg/runtime.native.System.Data.SqlClient.sni/runtime.native.System.Data.SqlClient.sni.pkgproj b/src/libraries/Native/pkg/runtime.native.System.Data.SqlClient.sni/runtime.native.System.Data.SqlClient.sni.pkgproj
index 4d0f3c58bfd..a1ef7a072b4 100644
--- a/src/libraries/Native/pkg/runtime.native.System.Data.SqlClient.sni/runtime.native.System.Data.SqlClient.sni.pkgproj
+++ b/src/libraries/Native/pkg/runtime.native.System.Data.SqlClient.sni/runtime.native.System.Data.SqlClient.sni.pkgproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <PropertyGroup>
     <SkipPackageFileCheck>true</SkipPackageFileCheck>
     <SkipValidatePackage>true</SkipValidatePackage>
@@ -16,5 +16,5 @@
       <Version>$(RuntimeWinX64RuntimeNativeSystemDataSqlClientSniPackageVersion)</Version>
     </Dependency>
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
+</Project>
diff --git a/src/libraries/SharedFrameworkValidation/SharedFrameworkValidation.proj b/src/libraries/SharedFrameworkValidation/SharedFrameworkValidation.proj
index 228dfb3fba1..52a0068546e 100644
--- a/src/libraries/SharedFrameworkValidation/SharedFrameworkValidation.proj
+++ b/src/libraries/SharedFrameworkValidation/SharedFrameworkValidation.proj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
 
   <PropertyGroup>
     <SharedFrameworkValidationRefPath>$(RefRootPath)SharedFrameworkValidation</SharedFrameworkValidationRefPath>
@@ -221,5 +221,5 @@
   </Target>
   <Target Name="Rebuild" DependsOnTargets="Clean;Build" />
 
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
diff --git a/src/libraries/System.AppContext/dir.props b/src/libraries/System.AppContext/Directory.Build.props
similarity index 85%
rename from src/libraries/System.AppContext/dir.props
rename to src/libraries/System.AppContext/Directory.Build.props
index b89fb6fc11e..c493677ae13 100644
--- a/src/libraries/System.AppContext/dir.props
+++ b/src/libraries/System.AppContext/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.2.1.0</AssemblyVersion>
     <AssemblyKey>MSFT</AssemblyKey>
diff --git a/src/libraries/System.Buffers/dir.props b/src/libraries/System.Buffers/Directory.Build.props
similarity index 85%
rename from src/libraries/System.Buffers/dir.props
rename to src/libraries/System.Buffers/Directory.Build.props
index 0b0f84c8bb7..8b5b4bc235c 100644
--- a/src/libraries/System.Buffers/dir.props
+++ b/src/libraries/System.Buffers/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.4.0</AssemblyVersion>
     <AssemblyKey>Open</AssemblyKey>
diff --git a/src/libraries/System.Buffers/pkg/System.Buffers.pkgproj b/src/libraries/System.Buffers/pkg/System.Buffers.pkgproj
index cb2771fe58a..23c79c27eb4 100644
--- a/src/libraries/System.Buffers/pkg/System.Buffers.pkgproj
+++ b/src/libraries/System.Buffers/pkg/System.Buffers.pkgproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <HarvestIncludePath Include="ref\netstandard1.1;ref\netstandard2.0">
       <SupportedFramework>netcore45;netcoreapp1.0;wpa81;$(AllXamarinFrameworks)</SupportedFramework>
@@ -17,5 +17,5 @@
     <InboxOnTargetFramework Include="netcoreapp2.0" />
     <InboxOnTargetFramework Include="uap10.0.16299" />
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Security.Permissions/dir.props b/src/libraries/System.CodeDom/Directory.Build.props
similarity index 82%
rename from src/libraries/System.Security.Permissions/dir.props
rename to src/libraries/System.CodeDom/Directory.Build.props
index f6666544659..c4358a81dca 100644
--- a/src/libraries/System.Security.Permissions/dir.props
+++ b/src/libraries/System.CodeDom/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.2.0</AssemblyVersion>
     <AssemblyKey>Open</AssemblyKey>
diff --git a/src/libraries/System.CodeDom/pkg/System.CodeDom.pkgproj b/src/libraries/System.CodeDom/pkg/System.CodeDom.pkgproj
index 3d889b41bb2..2f99fd4fcb1 100644
--- a/src/libraries/System.CodeDom/pkg/System.CodeDom.pkgproj
+++ b/src/libraries/System.CodeDom/pkg/System.CodeDom.pkgproj
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.CodeDom.csproj">
       <SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.CodeDom.csproj" />
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Collections.Concurrent/dir.props b/src/libraries/System.Collections.Concurrent/Directory.Build.props
similarity index 87%
rename from src/libraries/System.Collections.Concurrent/dir.props
rename to src/libraries/System.Collections.Concurrent/Directory.Build.props
index 43279fb8d37..4a51cb8df48 100644
--- a/src/libraries/System.Collections.Concurrent/dir.props
+++ b/src/libraries/System.Collections.Concurrent/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.14.0</AssemblyVersion>
     <AssemblyKey>MSFT</AssemblyKey>
diff --git a/src/libraries/System.Collections.Immutable/dir.props b/src/libraries/System.Collections.Immutable/Directory.Build.props
similarity index 86%
rename from src/libraries/System.Collections.Immutable/dir.props
rename to src/libraries/System.Collections.Immutable/Directory.Build.props
index d97346dfe1d..0a36fdfd3e6 100644
--- a/src/libraries/System.Collections.Immutable/dir.props
+++ b/src/libraries/System.Collections.Immutable/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <PackageVersion>1.6.0</PackageVersion>
     <AssemblyVersion>1.2.4.0</AssemblyVersion>
diff --git a/src/libraries/System.Collections.Immutable/pkg/System.Collections.Immutable.pkgproj b/src/libraries/System.Collections.Immutable/pkg/System.Collections.Immutable.pkgproj
index fb72021465e..54a2b54778f 100644
--- a/src/libraries/System.Collections.Immutable/pkg/System.Collections.Immutable.pkgproj
+++ b/src/libraries/System.Collections.Immutable/pkg/System.Collections.Immutable.pkgproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <PropertyGroup>
     <!-- we need to be supported on pre-nuget-3 platforms (Dev12, Dev11, etc) -->
     <MinClientVersion>2.8.6</MinClientVersion>
@@ -19,5 +19,5 @@
       <Value>.NETCoreApp;UAP</Value>
     </ValidatePackageSuppression>
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Collections.Specialized/dir.props b/src/libraries/System.Collections.NonGeneric/Directory.Build.props
similarity index 85%
rename from src/libraries/System.Collections.Specialized/dir.props
rename to src/libraries/System.Collections.NonGeneric/Directory.Build.props
index e0633597727..2ac6942ba72 100644
--- a/src/libraries/System.Collections.Specialized/dir.props
+++ b/src/libraries/System.Collections.NonGeneric/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <AssemblyKey>MSFT</AssemblyKey>
diff --git a/src/libraries/System.Collections.NonGeneric/dir.props b/src/libraries/System.Collections.Specialized/Directory.Build.props
similarity index 85%
rename from src/libraries/System.Collections.NonGeneric/dir.props
rename to src/libraries/System.Collections.Specialized/Directory.Build.props
index e0633597727..2ac6942ba72 100644
--- a/src/libraries/System.Collections.NonGeneric/dir.props
+++ b/src/libraries/System.Collections.Specialized/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <AssemblyKey>MSFT</AssemblyKey>
diff --git a/src/libraries/Microsoft.Win32.Primitives/dir.props b/src/libraries/System.Collections/Directory.Build.props
similarity index 85%
rename from src/libraries/Microsoft.Win32.Primitives/dir.props
rename to src/libraries/System.Collections/Directory.Build.props
index e0633597727..2ac6942ba72 100644
--- a/src/libraries/Microsoft.Win32.Primitives/dir.props
+++ b/src/libraries/System.Collections/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <AssemblyKey>MSFT</AssemblyKey>
diff --git a/src/libraries/System.ComponentModel.Annotations/dir.props b/src/libraries/System.ComponentModel.Annotations/Directory.Build.props
similarity index 85%
rename from src/libraries/System.ComponentModel.Annotations/dir.props
rename to src/libraries/System.ComponentModel.Annotations/Directory.Build.props
index ef58836411c..712fde9d57e 100644
--- a/src/libraries/System.ComponentModel.Annotations/dir.props
+++ b/src/libraries/System.ComponentModel.Annotations/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.2.2.0</AssemblyVersion>
     <AssemblyKey>MSFT</AssemblyKey>
diff --git a/src/libraries/System.ComponentModel.Annotations/pkg/System.ComponentModel.Annotations.pkgproj b/src/libraries/System.ComponentModel.Annotations/pkg/System.ComponentModel.Annotations.pkgproj
index 122946a2267..c9e4d8f08f4 100644
--- a/src/libraries/System.ComponentModel.Annotations/pkg/System.ComponentModel.Annotations.pkgproj
+++ b/src/libraries/System.ComponentModel.Annotations/pkg/System.ComponentModel.Annotations.pkgproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.ComponentModel.Annotations.csproj">
       <SupportedFramework>net461</SupportedFramework>
@@ -23,5 +23,5 @@
       <Value>.NETStandard,Version=v1.1;.NETStandard,Version=v1.2;.NETStandard,Version=v1.3</Value>
     </ValidatePackageSuppression>
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.ComponentModel.Composition/dir.props b/src/libraries/System.ComponentModel.Composition/Directory.Build.props
similarity index 85%
rename from src/libraries/System.ComponentModel.Composition/dir.props
rename to src/libraries/System.ComponentModel.Composition/Directory.Build.props
index 95204c770a2..189dfc22441 100644
--- a/src/libraries/System.ComponentModel.Composition/dir.props
+++ b/src/libraries/System.ComponentModel.Composition/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <AssemblyKey>ECMA</AssemblyKey>
diff --git a/src/libraries/System.ComponentModel.Composition/pkg/System.ComponentModel.Composition.pkgproj b/src/libraries/System.ComponentModel.Composition/pkg/System.ComponentModel.Composition.pkgproj
index 8b79a972cc6..ae3641d6a15 100644
--- a/src/libraries/System.ComponentModel.Composition/pkg/System.ComponentModel.Composition.pkgproj
+++ b/src/libraries/System.ComponentModel.Composition/pkg/System.ComponentModel.Composition.pkgproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.ComponentModel.Composition.csproj">
       <SupportedFramework>uap10.0.16299;netcoreapp2.0;net45;$(AllXamarinFrameworks)</SupportedFramework>
@@ -12,5 +12,5 @@
     <InboxOnTargetFramework Include="uap10.0.16299" />
     <InboxOnTargetFramework Include="$(AllXamarinFrameworks)" />
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
diff --git a/src/libraries/System.ComponentModel.EventBasedAsync/Directory.Build.props b/src/libraries/System.ComponentModel.EventBasedAsync/Directory.Build.props
new file mode 100644
index 00000000000..2ac6942ba72
--- /dev/null
+++ b/src/libraries/System.ComponentModel.EventBasedAsync/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.1.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.ComponentModel.EventBasedAsync/dir.props b/src/libraries/System.ComponentModel.EventBasedAsync/dir.props
deleted file mode 100644
index e0633597727..00000000000
--- a/src/libraries/System.ComponentModel.EventBasedAsync/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.ComponentModel.Primitives/dir.props b/src/libraries/System.ComponentModel.Primitives/Directory.Build.props
similarity index 85%
rename from src/libraries/System.ComponentModel.Primitives/dir.props
rename to src/libraries/System.ComponentModel.Primitives/Directory.Build.props
index b89fb6fc11e..c493677ae13 100644
--- a/src/libraries/System.ComponentModel.Primitives/dir.props
+++ b/src/libraries/System.ComponentModel.Primitives/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.2.1.0</AssemblyVersion>
     <AssemblyKey>MSFT</AssemblyKey>
diff --git a/src/libraries/System.ComponentModel.TypeConverter/dir.props b/src/libraries/System.ComponentModel.TypeConverter/Directory.Build.props
similarity index 85%
rename from src/libraries/System.ComponentModel.TypeConverter/dir.props
rename to src/libraries/System.ComponentModel.TypeConverter/Directory.Build.props
index b89fb6fc11e..c493677ae13 100644
--- a/src/libraries/System.ComponentModel.TypeConverter/dir.props
+++ b/src/libraries/System.ComponentModel.TypeConverter/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.2.1.0</AssemblyVersion>
     <AssemblyKey>MSFT</AssemblyKey>
diff --git a/src/libraries/System.ComponentModel/dir.props b/src/libraries/System.ComponentModel/Directory.Build.props
similarity index 87%
rename from src/libraries/System.ComponentModel/dir.props
rename to src/libraries/System.ComponentModel/Directory.Build.props
index ad2f0ed1395..c4419f3e6ab 100644
--- a/src/libraries/System.ComponentModel/dir.props
+++ b/src/libraries/System.ComponentModel/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.3.0</AssemblyVersion>
     <AssemblyKey>MSFT</AssemblyKey>
diff --git a/src/libraries/System.Composition.Convention/dir.props b/src/libraries/System.Composition.AttributedModel/Directory.Build.props
similarity index 66%
rename from src/libraries/System.Composition.Convention/dir.props
rename to src/libraries/System.Composition.AttributedModel/Directory.Build.props
index 587d769112d..a73f4a74fb4 100644
--- a/src/libraries/System.Composition.Convention/dir.props
+++ b/src/libraries/System.Composition.AttributedModel/Directory.Build.props
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\System.Composition\dir.props" />
+  <Import Project="..\System.Composition\Directory.Build.props" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Composition.AttributedModel/pkg/System.Composition.AttributedModel.pkgproj b/src/libraries/System.Composition.AttributedModel/pkg/System.Composition.AttributedModel.pkgproj
index af4245af96a..b7d4b2e7312 100644
--- a/src/libraries/System.Composition.AttributedModel/pkg/System.Composition.AttributedModel.pkgproj
+++ b/src/libraries/System.Composition.AttributedModel/pkg/System.Composition.AttributedModel.pkgproj
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\src\System.Composition.AttributedModel.csproj">
       <SupportedFramework>net45;netcore45;netcoreapp1.0;wp8;wpa81;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Composition.Hosting/dir.props b/src/libraries/System.Composition.Convention/Directory.Build.props
similarity index 66%
rename from src/libraries/System.Composition.Hosting/dir.props
rename to src/libraries/System.Composition.Convention/Directory.Build.props
index 587d769112d..a73f4a74fb4 100644
--- a/src/libraries/System.Composition.Hosting/dir.props
+++ b/src/libraries/System.Composition.Convention/Directory.Build.props
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\System.Composition\dir.props" />
+  <Import Project="..\System.Composition\Directory.Build.props" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Composition.Convention/pkg/System.Composition.Convention.pkgproj b/src/libraries/System.Composition.Convention/pkg/System.Composition.Convention.pkgproj
index 336a7db611e..e4698f19b2e 100644
--- a/src/libraries/System.Composition.Convention/pkg/System.Composition.Convention.pkgproj
+++ b/src/libraries/System.Composition.Convention/pkg/System.Composition.Convention.pkgproj
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\src\System.Composition.Convention.csproj">
       <SupportedFramework>net45;netcore45;netcoreapp1.0;wp8;wpa81;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Composition.AttributedModel/dir.props b/src/libraries/System.Composition.Hosting/Directory.Build.props
similarity index 66%
rename from src/libraries/System.Composition.AttributedModel/dir.props
rename to src/libraries/System.Composition.Hosting/Directory.Build.props
index 587d769112d..a73f4a74fb4 100644
--- a/src/libraries/System.Composition.AttributedModel/dir.props
+++ b/src/libraries/System.Composition.Hosting/Directory.Build.props
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\System.Composition\dir.props" />
+  <Import Project="..\System.Composition\Directory.Build.props" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Composition.Hosting/pkg/System.Composition.Hosting.pkgproj b/src/libraries/System.Composition.Hosting/pkg/System.Composition.Hosting.pkgproj
index c5cf0cfd59d..c0742f5eb9d 100644
--- a/src/libraries/System.Composition.Hosting/pkg/System.Composition.Hosting.pkgproj
+++ b/src/libraries/System.Composition.Hosting/pkg/System.Composition.Hosting.pkgproj
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\src\System.Composition.Hosting.csproj">
       <SupportedFramework>net45;netcore45;netcoreapp1.0;wp8;wpa81;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Composition.Runtime/dir.props b/src/libraries/System.Composition.Runtime/Directory.Build.props
similarity index 66%
rename from src/libraries/System.Composition.Runtime/dir.props
rename to src/libraries/System.Composition.Runtime/Directory.Build.props
index 587d769112d..a73f4a74fb4 100644
--- a/src/libraries/System.Composition.Runtime/dir.props
+++ b/src/libraries/System.Composition.Runtime/Directory.Build.props
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\System.Composition\dir.props" />
+  <Import Project="..\System.Composition\Directory.Build.props" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Composition.Runtime/pkg/System.Composition.Runtime.pkgproj b/src/libraries/System.Composition.Runtime/pkg/System.Composition.Runtime.pkgproj
index 35d60022440..335729f9759 100644
--- a/src/libraries/System.Composition.Runtime/pkg/System.Composition.Runtime.pkgproj
+++ b/src/libraries/System.Composition.Runtime/pkg/System.Composition.Runtime.pkgproj
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\src\System.Composition.Runtime.csproj">
       <SupportedFramework>net45;netcore45;netcoreapp1.0;wp8;wpa81;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Composition.TypedParts/Directory.Build.props b/src/libraries/System.Composition.TypedParts/Directory.Build.props
new file mode 100644
index 00000000000..a73f4a74fb4
--- /dev/null
+++ b/src/libraries/System.Composition.TypedParts/Directory.Build.props
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\System.Composition\Directory.Build.props" />
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Composition.TypedParts/dir.props b/src/libraries/System.Composition.TypedParts/dir.props
deleted file mode 100644
index 587d769112d..00000000000
--- a/src/libraries/System.Composition.TypedParts/dir.props
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\System.Composition\dir.props" />
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Composition.TypedParts/pkg/System.Composition.TypedParts.pkgproj b/src/libraries/System.Composition.TypedParts/pkg/System.Composition.TypedParts.pkgproj
index 89f31ff87cf..8a7072751dd 100644
--- a/src/libraries/System.Composition.TypedParts/pkg/System.Composition.TypedParts.pkgproj
+++ b/src/libraries/System.Composition.TypedParts/pkg/System.Composition.TypedParts.pkgproj
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\src\System.Composition.TypedParts.csproj">
       <SupportedFramework>net45;netcore45;netcoreapp1.0;wp8;wpa81;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Composition/dir.props b/src/libraries/System.Composition/Directory.Build.props
similarity index 82%
rename from src/libraries/System.Composition/dir.props
rename to src/libraries/System.Composition/Directory.Build.props
index a8b5b4d45bb..410ee61a6c0 100644
--- a/src/libraries/System.Composition/dir.props
+++ b/src/libraries/System.Composition/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <PackageVersion>1.3.0</PackageVersion>
     <AssemblyVersion>1.0.34.0</AssemblyVersion>
diff --git a/src/libraries/System.Composition/pkg/System.Composition.pkgproj b/src/libraries/System.Composition/pkg/System.Composition.pkgproj
index 70113e2dbe6..7674f0ab733 100644
--- a/src/libraries/System.Composition/pkg/System.Composition.pkgproj
+++ b/src/libraries/System.Composition/pkg/System.Composition.pkgproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\..\System.Composition.AttributedModel\pkg\System.Composition.AttributedModel.pkgproj" />
     <ProjectReference Include="..\..\System.Composition.Convention\pkg\System.Composition.Convention.pkgproj" />
@@ -8,5 +8,5 @@
     <ProjectReference Include="..\..\System.Composition.Runtime\pkg\System.Composition.Runtime.pkgproj" />
     <ProjectReference Include="..\..\System.Composition.TypedParts\pkg\System.Composition.TypedParts.pkgproj" />
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.CodeDom/dir.props b/src/libraries/System.Configuration.ConfigurationManager/Directory.Build.props
similarity index 82%
rename from src/libraries/System.CodeDom/dir.props
rename to src/libraries/System.Configuration.ConfigurationManager/Directory.Build.props
index f6666544659..c4358a81dca 100644
--- a/src/libraries/System.CodeDom/dir.props
+++ b/src/libraries/System.Configuration.ConfigurationManager/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.2.0</AssemblyVersion>
     <AssemblyKey>Open</AssemblyKey>
diff --git a/src/libraries/System.Configuration.ConfigurationManager/pkg/System.Configuration.ConfigurationManager.pkgproj b/src/libraries/System.Configuration.ConfigurationManager/pkg/System.Configuration.ConfigurationManager.pkgproj
index 576f40fbafe..50ec38ffddf 100644
--- a/src/libraries/System.Configuration.ConfigurationManager/pkg/System.Configuration.ConfigurationManager.pkgproj
+++ b/src/libraries/System.Configuration.ConfigurationManager/pkg/System.Configuration.ConfigurationManager.pkgproj
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Configuration.ConfigurationManager.csproj">
       <SupportedFramework>netcoreapp2.0;net461;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Configuration.ConfigurationManager.csproj" />
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Console/Directory.Build.props b/src/libraries/System.Console/Directory.Build.props
new file mode 100644
index 00000000000..2ac6942ba72
--- /dev/null
+++ b/src/libraries/System.Console/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.1.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Console/dir.props b/src/libraries/System.Console/dir.props
deleted file mode 100644
index e0633597727..00000000000
--- a/src/libraries/System.Console/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Data.Common/dir.props b/src/libraries/System.Data.Common/Directory.Build.props
similarity index 85%
rename from src/libraries/System.Data.Common/dir.props
rename to src/libraries/System.Data.Common/Directory.Build.props
index b89fb6fc11e..c493677ae13 100644
--- a/src/libraries/System.Data.Common/dir.props
+++ b/src/libraries/System.Data.Common/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.2.1.0</AssemblyVersion>
     <AssemblyKey>MSFT</AssemblyKey>
diff --git a/src/libraries/System.Data.DataSetExtensions/dir.props b/src/libraries/System.Data.DataSetExtensions/Directory.Build.props
similarity index 82%
rename from src/libraries/System.Data.DataSetExtensions/dir.props
rename to src/libraries/System.Data.DataSetExtensions/Directory.Build.props
index 9e190a7ddeb..65ef9b22abb 100644
--- a/src/libraries/System.Data.DataSetExtensions/dir.props
+++ b/src/libraries/System.Data.DataSetExtensions/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <AssemblyKey>ECMA</AssemblyKey>
diff --git a/src/libraries/System.Data.DataSetExtensions/pkg/System.Data.DataSetExtensions.pkgproj b/src/libraries/System.Data.DataSetExtensions/pkg/System.Data.DataSetExtensions.pkgproj
index 878933ade5b..94d42b1425c 100644
--- a/src/libraries/System.Data.DataSetExtensions/pkg/System.Data.DataSetExtensions.pkgproj
+++ b/src/libraries/System.Data.DataSetExtensions/pkg/System.Data.DataSetExtensions.pkgproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Data.DataSetExtensions.csproj">
       <SupportedFramework>uap10.0.16299;netcoreapp2.0;net45;$(AllXamarinFrameworks)</SupportedFramework>
@@ -10,5 +10,5 @@
       <AsFrameworkReference>true</AsFrameworkReference>
     </InboxOnTargetFramework>
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.EventLog/dir.props b/src/libraries/System.Data.Odbc/Directory.Build.props
similarity index 82%
rename from src/libraries/System.Diagnostics.EventLog/dir.props
rename to src/libraries/System.Data.Odbc/Directory.Build.props
index af5b2933851..5d39fb280b3 100644
--- a/src/libraries/System.Diagnostics.EventLog/dir.props
+++ b/src/libraries/System.Data.Odbc/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <AssemblyKey>Open</AssemblyKey>
diff --git a/src/libraries/System.Data.Odbc/pkg/System.Data.Odbc.pkgproj b/src/libraries/System.Data.Odbc/pkg/System.Data.Odbc.pkgproj
index e4959eab6e9..18d1c1ea7bf 100644
--- a/src/libraries/System.Data.Odbc/pkg/System.Data.Odbc.pkgproj
+++ b/src/libraries/System.Data.Odbc/pkg/System.Data.Odbc.pkgproj
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Data.Odbc.csproj">
       <SupportedFramework>uap10.0.16299;net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Data.Odbc.csproj" />
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
diff --git a/src/libraries/System.Data.SqlClient/dir.props b/src/libraries/System.Data.SqlClient/Directory.Build.props
similarity index 83%
rename from src/libraries/System.Data.SqlClient/dir.props
rename to src/libraries/System.Data.SqlClient/Directory.Build.props
index 27eade76094..cfce1804452 100644
--- a/src/libraries/System.Data.SqlClient/dir.props
+++ b/src/libraries/System.Data.SqlClient/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.4.1.0</AssemblyVersion>
     <AssemblyKey>MSFT</AssemblyKey>
diff --git a/src/libraries/System.Data.SqlClient/pkg/System.Data.SqlClient.pkgproj b/src/libraries/System.Data.SqlClient/pkg/System.Data.SqlClient.pkgproj
index 66578cc3379..f741b8e8197 100644
--- a/src/libraries/System.Data.SqlClient/pkg/System.Data.SqlClient.pkgproj
+++ b/src/libraries/System.Data.SqlClient/pkg/System.Data.SqlClient.pkgproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Data.SqlClient.csproj">
       <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(UAPvNextTFM);$(AllXamarinFrameworks)</SupportedFramework>
@@ -28,5 +28,5 @@
   <ItemGroup>
     <InboxOnTargetFramework Include="$(AllXamarinFrameworks)" />
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Linq.Parallel/dir.props b/src/libraries/System.Diagnostics.Contracts/Directory.Build.props
similarity index 87%
rename from src/libraries/System.Linq.Parallel/dir.props
rename to src/libraries/System.Diagnostics.Contracts/Directory.Build.props
index ad2f0ed1395..c4419f3e6ab 100644
--- a/src/libraries/System.Linq.Parallel/dir.props
+++ b/src/libraries/System.Diagnostics.Contracts/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.3.0</AssemblyVersion>
     <AssemblyKey>MSFT</AssemblyKey>
diff --git a/src/libraries/System.Diagnostics.Debug/Directory.Build.props b/src/libraries/System.Diagnostics.Debug/Directory.Build.props
new file mode 100644
index 00000000000..2ac6942ba72
--- /dev/null
+++ b/src/libraries/System.Diagnostics.Debug/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.1.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.Debug/dir.props b/src/libraries/System.Diagnostics.Debug/dir.props
deleted file mode 100644
index e0633597727..00000000000
--- a/src/libraries/System.Diagnostics.Debug/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/dir.props b/src/libraries/System.Diagnostics.DiagnosticSource/Directory.Build.props
similarity index 86%
rename from src/libraries/System.Diagnostics.DiagnosticSource/dir.props
rename to src/libraries/System.Diagnostics.DiagnosticSource/Directory.Build.props
index 48f27877367..ab8be50ef12 100644
--- a/src/libraries/System.Diagnostics.DiagnosticSource/dir.props
+++ b/src/libraries/System.Diagnostics.DiagnosticSource/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.4.0</AssemblyVersion>
     <AssemblyKey>Open</AssemblyKey>
diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/pkg/System.Diagnostics.DiagnosticSource.pkgproj b/src/libraries/System.Diagnostics.DiagnosticSource/pkg/System.Diagnostics.DiagnosticSource.pkgproj
index 93ce39ab4ab..8f28e0d0da4 100644
--- a/src/libraries/System.Diagnostics.DiagnosticSource/pkg/System.Diagnostics.DiagnosticSource.pkgproj
+++ b/src/libraries/System.Diagnostics.DiagnosticSource/pkg/System.Diagnostics.DiagnosticSource.pkgproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\src\System.Diagnostics.DiagnosticSource.csproj">
       <SupportedFramework>net46;net45;netcore45;netcoreapp1.0;wpa81;$(AllXamarinFrameworks)</SupportedFramework>
@@ -18,5 +18,5 @@
       <Value>.NETCoreApp;UAP</Value>
     </ValidatePackageSuppression>
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Data.Odbc/dir.props b/src/libraries/System.Diagnostics.EventLog/Directory.Build.props
similarity index 82%
rename from src/libraries/System.Data.Odbc/dir.props
rename to src/libraries/System.Diagnostics.EventLog/Directory.Build.props
index af5b2933851..5d39fb280b3 100644
--- a/src/libraries/System.Data.Odbc/dir.props
+++ b/src/libraries/System.Diagnostics.EventLog/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <AssemblyKey>Open</AssemblyKey>
diff --git a/src/libraries/System.Diagnostics.EventLog/pkg/System.Diagnostics.EventLog.pkgproj b/src/libraries/System.Diagnostics.EventLog/pkg/System.Diagnostics.EventLog.pkgproj
index f5c4342a14d..b0f5b646fb3 100644
--- a/src/libraries/System.Diagnostics.EventLog/pkg/System.Diagnostics.EventLog.pkgproj
+++ b/src/libraries/System.Diagnostics.EventLog/pkg/System.Diagnostics.EventLog.pkgproj
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Diagnostics.EventLog.csproj">
       <SupportedFramework>uap10.0.16299;net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework> 
     </ProjectReference>
     <ProjectReference Include="..\src\System.Diagnostics.EventLog.csproj" />
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.InteropServices.RuntimeInformation/dir.props b/src/libraries/System.Diagnostics.FileVersionInfo/Directory.Build.props
similarity index 85%
rename from src/libraries/System.Runtime.InteropServices.RuntimeInformation/dir.props
rename to src/libraries/System.Diagnostics.FileVersionInfo/Directory.Build.props
index 85a6f1a4971..c07aec602f0 100644
--- a/src/libraries/System.Runtime.InteropServices.RuntimeInformation/dir.props
+++ b/src/libraries/System.Diagnostics.FileVersionInfo/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.3.0</AssemblyVersion>
     <AssemblyKey>MSFT</AssemblyKey>
diff --git a/src/libraries/System.Diagnostics.FileVersionInfo/tests/NativeConsoleApp/NativeConsoleApp.vcxproj b/src/libraries/System.Diagnostics.FileVersionInfo/tests/NativeConsoleApp/NativeConsoleApp.vcxproj
index 1553e024af2..5faf9da6c56 100644
--- a/src/libraries/System.Diagnostics.FileVersionInfo/tests/NativeConsoleApp/NativeConsoleApp.vcxproj
+++ b/src/libraries/System.Diagnostics.FileVersionInfo/tests/NativeConsoleApp/NativeConsoleApp.vcxproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Release|x64">
       <Configuration>Release</Configuration>
@@ -60,7 +60,7 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/src/libraries/System.Diagnostics.FileVersionInfo/tests/NativeLibrary/NativeLibrary.vcxproj b/src/libraries/System.Diagnostics.FileVersionInfo/tests/NativeLibrary/NativeLibrary.vcxproj
index 526a5d8db43..2afd2b444e4 100644
--- a/src/libraries/System.Diagnostics.FileVersionInfo/tests/NativeLibrary/NativeLibrary.vcxproj
+++ b/src/libraries/System.Diagnostics.FileVersionInfo/tests/NativeLibrary/NativeLibrary.vcxproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Release|x64">
       <Configuration>Release</Configuration>
@@ -62,7 +62,7 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/src/libraries/System.Diagnostics.FileVersionInfo/tests/SecondNativeLibrary/SecondNativeLibrary.vcxproj b/src/libraries/System.Diagnostics.FileVersionInfo/tests/SecondNativeLibrary/SecondNativeLibrary.vcxproj
index 20073436391..69c6ed60fe1 100644
--- a/src/libraries/System.Diagnostics.FileVersionInfo/tests/SecondNativeLibrary/SecondNativeLibrary.vcxproj
+++ b/src/libraries/System.Diagnostics.FileVersionInfo/tests/SecondNativeLibrary/SecondNativeLibrary.vcxproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Release|x64">
       <Configuration>Release</Configuration>
@@ -62,7 +62,7 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/System.Diagnostics.FileVersionInfo.Tests.csproj b/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/System.Diagnostics.FileVersionInfo.Tests.csproj
index 534af31dfa4..bc889d2a529 100644
--- a/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/System.Diagnostics.FileVersionInfo.Tests.csproj
+++ b/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/System.Diagnostics.FileVersionInfo.Tests.csproj
@@ -44,7 +44,7 @@
       <Name>System.Diagnostics.FileVersionInfo.TestAssembly</Name>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
   <PropertyGroup>
     <BuildDependsOn>$(BuildDependsOn);MangleTestAssemblyExtension</BuildDependsOn>
   </PropertyGroup>
diff --git a/src/libraries/System.Diagnostics.PerformanceCounter/dir.props b/src/libraries/System.Diagnostics.PerformanceCounter/Directory.Build.props
similarity index 82%
rename from src/libraries/System.Diagnostics.PerformanceCounter/dir.props
rename to src/libraries/System.Diagnostics.PerformanceCounter/Directory.Build.props
index af5b2933851..5d39fb280b3 100644
--- a/src/libraries/System.Diagnostics.PerformanceCounter/dir.props
+++ b/src/libraries/System.Diagnostics.PerformanceCounter/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <AssemblyKey>Open</AssemblyKey>
diff --git a/src/libraries/System.Diagnostics.PerformanceCounter/pkg/System.Diagnostics.PerformanceCounter.pkgproj b/src/libraries/System.Diagnostics.PerformanceCounter/pkg/System.Diagnostics.PerformanceCounter.pkgproj
index fad9022c639..81b114acfd6 100644
--- a/src/libraries/System.Diagnostics.PerformanceCounter/pkg/System.Diagnostics.PerformanceCounter.pkgproj
+++ b/src/libraries/System.Diagnostics.PerformanceCounter/pkg/System.Diagnostics.PerformanceCounter.pkgproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Diagnostics.PerformanceCounter.csproj">
       <SupportedFramework>uap10.0.16299;net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
@@ -10,5 +10,5 @@
   <ItemGroup>
     <InboxOnTargetFramework Include="$(AllXamarinFrameworks)" />
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
diff --git a/src/libraries/System.Diagnostics.Process/Directory.Build.props b/src/libraries/System.Diagnostics.Process/Directory.Build.props
new file mode 100644
index 00000000000..c493677ae13
--- /dev/null
+++ b/src/libraries/System.Diagnostics.Process/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.2.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.Process/dir.props b/src/libraries/System.Diagnostics.Process/dir.props
deleted file mode 100644
index b89fb6fc11e..00000000000
--- a/src/libraries/System.Diagnostics.Process/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.2.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.StackTrace/Directory.Build.props b/src/libraries/System.Diagnostics.StackTrace/Directory.Build.props
new file mode 100644
index 00000000000..2ac6942ba72
--- /dev/null
+++ b/src/libraries/System.Diagnostics.StackTrace/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.1.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.StackTrace/dir.props b/src/libraries/System.Diagnostics.StackTrace/dir.props
deleted file mode 100644
index e0633597727..00000000000
--- a/src/libraries/System.Diagnostics.StackTrace/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.TextWriterTraceListener/Directory.Build.props b/src/libraries/System.Diagnostics.TextWriterTraceListener/Directory.Build.props
new file mode 100644
index 00000000000..2ac6942ba72
--- /dev/null
+++ b/src/libraries/System.Diagnostics.TextWriterTraceListener/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.1.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.TextWriterTraceListener/dir.props b/src/libraries/System.Diagnostics.TextWriterTraceListener/dir.props
deleted file mode 100644
index e0633597727..00000000000
--- a/src/libraries/System.Diagnostics.TextWriterTraceListener/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.Tools/Directory.Build.props b/src/libraries/System.Diagnostics.Tools/Directory.Build.props
new file mode 100644
index 00000000000..2ac6942ba72
--- /dev/null
+++ b/src/libraries/System.Diagnostics.Tools/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.1.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.Tools/dir.props b/src/libraries/System.Diagnostics.Tools/dir.props
deleted file mode 100644
index e0633597727..00000000000
--- a/src/libraries/System.Diagnostics.Tools/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.TraceSource/Directory.Build.props b/src/libraries/System.Diagnostics.TraceSource/Directory.Build.props
new file mode 100644
index 00000000000..2ac6942ba72
--- /dev/null
+++ b/src/libraries/System.Diagnostics.TraceSource/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.1.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.TraceSource/dir.props b/src/libraries/System.Diagnostics.TraceSource/dir.props
deleted file mode 100644
index e0633597727..00000000000
--- a/src/libraries/System.Diagnostics.TraceSource/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.Tracing/Directory.Build.props b/src/libraries/System.Diagnostics.Tracing/Directory.Build.props
new file mode 100644
index 00000000000..c493677ae13
--- /dev/null
+++ b/src/libraries/System.Diagnostics.Tracing/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.2.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.Tracing/dir.props b/src/libraries/System.Diagnostics.Tracing/dir.props
deleted file mode 100644
index b89fb6fc11e..00000000000
--- a/src/libraries/System.Diagnostics.Tracing/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.2.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.DirectoryServices.AccountManagement/dir.props b/src/libraries/System.DirectoryServices.AccountManagement/Directory.Build.props
similarity index 88%
rename from src/libraries/System.DirectoryServices.AccountManagement/dir.props
rename to src/libraries/System.DirectoryServices.AccountManagement/Directory.Build.props
index 8e9ced67593..b705866c581 100644
--- a/src/libraries/System.DirectoryServices.AccountManagement/dir.props
+++ b/src/libraries/System.DirectoryServices.AccountManagement/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <!-- this assembly is inbox in desktop, do not version it unless you
          plan on shipping a new desktop version out of band. Instead add API
diff --git a/src/libraries/System.DirectoryServices.AccountManagement/pkg/System.DirectoryServices.AccountManagement.pkgproj b/src/libraries/System.DirectoryServices.AccountManagement/pkg/System.DirectoryServices.AccountManagement.pkgproj
index 52501241de9..55792c18113 100644
--- a/src/libraries/System.DirectoryServices.AccountManagement/pkg/System.DirectoryServices.AccountManagement.pkgproj
+++ b/src/libraries/System.DirectoryServices.AccountManagement/pkg/System.DirectoryServices.AccountManagement.pkgproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.DirectoryServices.AccountManagement.csproj">
       <SupportedFramework>uap10.0.16299;netcoreapp2.0;net45;$(AllXamarinFrameworks)</SupportedFramework>
@@ -13,5 +13,5 @@
       <TargetPath>runtimes/win/lib/net45</TargetPath>
     </File>
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.DirectoryServices/dir.props b/src/libraries/System.DirectoryServices.Protocols/Directory.Build.props
similarity index 88%
rename from src/libraries/System.DirectoryServices/dir.props
rename to src/libraries/System.DirectoryServices.Protocols/Directory.Build.props
index 3a2542eb5ff..46703800641 100644
--- a/src/libraries/System.DirectoryServices/dir.props
+++ b/src/libraries/System.DirectoryServices.Protocols/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <!-- this assembly is inbox in desktop, do not version it unless you
          plan on shipping a new desktop version out of band. Instead add API
diff --git a/src/libraries/System.DirectoryServices.Protocols/pkg/System.DirectoryServices.Protocols.pkgproj b/src/libraries/System.DirectoryServices.Protocols/pkg/System.DirectoryServices.Protocols.pkgproj
index 55c341f2ad2..39b7efaf0f8 100644
--- a/src/libraries/System.DirectoryServices.Protocols/pkg/System.DirectoryServices.Protocols.pkgproj
+++ b/src/libraries/System.DirectoryServices.Protocols/pkg/System.DirectoryServices.Protocols.pkgproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.DirectoryServices.Protocols.csproj">
       <SupportedFramework>uap10.0.16299;netcoreapp2.0;net45;$(AllXamarinFrameworks)</SupportedFramework>
@@ -14,5 +14,5 @@
       <TargetPath>runtimes/win/lib/net45</TargetPath>
     </File>
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Management/dir.props b/src/libraries/System.DirectoryServices/Directory.Build.props
similarity index 88%
rename from src/libraries/System.Management/dir.props
rename to src/libraries/System.DirectoryServices/Directory.Build.props
index 3a2542eb5ff..46703800641 100644
--- a/src/libraries/System.Management/dir.props
+++ b/src/libraries/System.DirectoryServices/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <!-- this assembly is inbox in desktop, do not version it unless you
          plan on shipping a new desktop version out of band. Instead add API
diff --git a/src/libraries/System.DirectoryServices/pkg/System.DirectoryServices.pkgproj b/src/libraries/System.DirectoryServices/pkg/System.DirectoryServices.pkgproj
index 989e59c0134..19a763e3dfe 100644
--- a/src/libraries/System.DirectoryServices/pkg/System.DirectoryServices.pkgproj
+++ b/src/libraries/System.DirectoryServices/pkg/System.DirectoryServices.pkgproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.DirectoryServices.csproj">
       <SupportedFramework>uap10.0.16299;netcoreapp2.0;net45;$(AllXamarinFrameworks)</SupportedFramework>
@@ -14,5 +14,5 @@
       <TargetPath>runtimes/win/lib/net45</TargetPath>
     </File>
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Drawing.Common/Directory.Build.props b/src/libraries/System.Drawing.Common/Directory.Build.props
new file mode 100644
index 00000000000..5d39fb280b3
--- /dev/null
+++ b/src/libraries/System.Drawing.Common/Directory.Build.props
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.0.1.0</AssemblyVersion>
+    <AssemblyKey>Open</AssemblyKey>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Drawing.Common/dir.props b/src/libraries/System.Drawing.Common/dir.props
deleted file mode 100644
index af5b2933851..00000000000
--- a/src/libraries/System.Drawing.Common/dir.props
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.0.1.0</AssemblyVersion>
-    <AssemblyKey>Open</AssemblyKey>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Drawing.Common/pkg/System.Drawing.Common.pkgproj b/src/libraries/System.Drawing.Common/pkg/System.Drawing.Common.pkgproj
index a0f5151c085..8eb982d14e5 100644
--- a/src/libraries/System.Drawing.Common/pkg/System.Drawing.Common.pkgproj
+++ b/src/libraries/System.Drawing.Common/pkg/System.Drawing.Common.pkgproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Drawing.Common.csproj">
       <SupportedFramework>uap10.0.16299;net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
@@ -9,5 +9,5 @@
 
     <InboxOnTargetFramework Include="$(AllXamarinFrameworks)" />
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Drawing.Common/tests/Performance/System.Drawing.Common.Performance.Tests.csproj b/src/libraries/System.Drawing.Common/tests/Performance/System.Drawing.Common.Performance.Tests.csproj
index d36e367eeaa..16d828500cf 100644
--- a/src/libraries/System.Drawing.Common/tests/Performance/System.Drawing.Common.Performance.Tests.csproj
+++ b/src/libraries/System.Drawing.Common/tests/Performance/System.Drawing.Common.Performance.Tests.csproj
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TestCategories>InnerLoop;OuterLoop</TestCategories>
     <IncludePerformanceTests>true</IncludePerformanceTests>
@@ -28,5 +27,4 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Drawing.Primitives/dir.props b/src/libraries/System.Drawing.Primitives/Directory.Build.props
similarity index 85%
rename from src/libraries/System.Drawing.Primitives/dir.props
rename to src/libraries/System.Drawing.Primitives/Directory.Build.props
index 58857e1059b..d64dd32406e 100644
--- a/src/libraries/System.Drawing.Primitives/dir.props
+++ b/src/libraries/System.Drawing.Primitives/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.2.0.0</AssemblyVersion>
     <AssemblyKey>MSFT</AssemblyKey>
diff --git a/src/libraries/System.Dynamic.Runtime/Directory.Build.props b/src/libraries/System.Dynamic.Runtime/Directory.Build.props
new file mode 100644
index 00000000000..2ac6942ba72
--- /dev/null
+++ b/src/libraries/System.Dynamic.Runtime/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.1.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Dynamic.Runtime/dir.props b/src/libraries/System.Dynamic.Runtime/dir.props
deleted file mode 100644
index e0633597727..00000000000
--- a/src/libraries/System.Dynamic.Runtime/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Globalization.Calendars/Directory.Build.props b/src/libraries/System.Globalization.Calendars/Directory.Build.props
new file mode 100644
index 00000000000..2ac6942ba72
--- /dev/null
+++ b/src/libraries/System.Globalization.Calendars/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.1.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Globalization.Calendars/dir.props b/src/libraries/System.Globalization.Calendars/dir.props
deleted file mode 100644
index e0633597727..00000000000
--- a/src/libraries/System.Globalization.Calendars/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Globalization.Calendars/tests/CalendarTestWithConfigSwitch/System.Globalization.CalendarsWithConfigSwitch.Tests.csproj b/src/libraries/System.Globalization.Calendars/tests/CalendarTestWithConfigSwitch/System.Globalization.CalendarsWithConfigSwitch.Tests.csproj
index c7b87d12119..abb813bce89 100644
--- a/src/libraries/System.Globalization.Calendars/tests/CalendarTestWithConfigSwitch/System.Globalization.CalendarsWithConfigSwitch.Tests.csproj
+++ b/src/libraries/System.Globalization.Calendars/tests/CalendarTestWithConfigSwitch/System.Globalization.CalendarsWithConfigSwitch.Tests.csproj
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <ProjectGuid>{77BE33BB-790D-4D0C-9336-E073001CBD15}</ProjectGuid>
   </PropertyGroup>
@@ -20,5 +19,4 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Globalization.Extensions/Directory.Build.props b/src/libraries/System.Globalization.Extensions/Directory.Build.props
new file mode 100644
index 00000000000..2ac6942ba72
--- /dev/null
+++ b/src/libraries/System.Globalization.Extensions/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.1.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Globalization.Extensions/dir.props b/src/libraries/System.Globalization.Extensions/dir.props
deleted file mode 100644
index e0633597727..00000000000
--- a/src/libraries/System.Globalization.Extensions/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Globalization/Directory.Build.props b/src/libraries/System.Globalization/Directory.Build.props
new file mode 100644
index 00000000000..2ac6942ba72
--- /dev/null
+++ b/src/libraries/System.Globalization/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.1.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Globalization/dir.props b/src/libraries/System.Globalization/dir.props
deleted file mode 100644
index e0633597727..00000000000
--- a/src/libraries/System.Globalization/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.IO.Compression.Brotli/dir.props b/src/libraries/System.IO.Compression.Brotli/Directory.Build.props
similarity index 85%
rename from src/libraries/System.IO.Compression.Brotli/dir.props
rename to src/libraries/System.IO.Compression.Brotli/Directory.Build.props
index 4d0d97a320e..c72432348ee 100644
--- a/src/libraries/System.IO.Compression.Brotli/dir.props
+++ b/src/libraries/System.IO.Compression.Brotli/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.2.1.0</AssemblyVersion>
     <AssemblyKey>ECMA</AssemblyKey>
diff --git a/src/libraries/System.IO.Compression.ZipFile/dir.props b/src/libraries/System.IO.Compression.ZipFile/Directory.Build.props
similarity index 85%
rename from src/libraries/System.IO.Compression.ZipFile/dir.props
rename to src/libraries/System.IO.Compression.ZipFile/Directory.Build.props
index 0e6e84e246d..30673c4e2df 100644
--- a/src/libraries/System.IO.Compression.ZipFile/dir.props
+++ b/src/libraries/System.IO.Compression.ZipFile/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.4.0</AssemblyVersion>
     <AssemblyKey>ECMA</AssemblyKey>
diff --git a/src/libraries/System.IO.Compression/dir.props b/src/libraries/System.IO.Compression/Directory.Build.props
similarity index 85%
rename from src/libraries/System.IO.Compression/dir.props
rename to src/libraries/System.IO.Compression/Directory.Build.props
index 4d0d97a320e..c72432348ee 100644
--- a/src/libraries/System.IO.Compression/dir.props
+++ b/src/libraries/System.IO.Compression/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.2.1.0</AssemblyVersion>
     <AssemblyKey>ECMA</AssemblyKey>
diff --git a/src/libraries/System.IO.FileSystem.AccessControl/dir.props b/src/libraries/System.IO.FileSystem.AccessControl/Directory.Build.props
similarity index 86%
rename from src/libraries/System.IO.FileSystem.AccessControl/dir.props
rename to src/libraries/System.IO.FileSystem.AccessControl/Directory.Build.props
index 9567f1d0e10..8bf67b61bae 100644
--- a/src/libraries/System.IO.FileSystem.AccessControl/dir.props
+++ b/src/libraries/System.IO.FileSystem.AccessControl/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.4.0</AssemblyVersion>
     <AssemblyKey>MSFT</AssemblyKey>
diff --git a/src/libraries/System.IO.FileSystem.AccessControl/pkg/System.IO.FileSystem.AccessControl.pkgproj b/src/libraries/System.IO.FileSystem.AccessControl/pkg/System.IO.FileSystem.AccessControl.pkgproj
index 5802294f6d2..4d0f2ca7bdf 100644
--- a/src/libraries/System.IO.FileSystem.AccessControl/pkg/System.IO.FileSystem.AccessControl.pkgproj
+++ b/src/libraries/System.IO.FileSystem.AccessControl/pkg/System.IO.FileSystem.AccessControl.pkgproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.IO.FileSystem.AccessControl.csproj">
       <SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
@@ -18,5 +18,5 @@
     -->
     <SuppressMetaPackage Include="NETStandard.Library" />
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.IO.FileSystem.DriveInfo/Directory.Build.props b/src/libraries/System.IO.FileSystem.DriveInfo/Directory.Build.props
new file mode 100644
index 00000000000..2ac6942ba72
--- /dev/null
+++ b/src/libraries/System.IO.FileSystem.DriveInfo/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.1.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.IO.FileSystem.DriveInfo/dir.props b/src/libraries/System.IO.FileSystem.DriveInfo/dir.props
deleted file mode 100644
index e0633597727..00000000000
--- a/src/libraries/System.IO.FileSystem.DriveInfo/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.IO.FileSystem.Primitives/Directory.Build.props b/src/libraries/System.IO.FileSystem.Primitives/Directory.Build.props
new file mode 100644
index 00000000000..2ac6942ba72
--- /dev/null
+++ b/src/libraries/System.IO.FileSystem.Primitives/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.1.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.IO.FileSystem.Primitives/dir.props b/src/libraries/System.IO.FileSystem.Primitives/dir.props
deleted file mode 100644
index e0633597727..00000000000
--- a/src/libraries/System.IO.FileSystem.Primitives/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.IO.FileSystem.Watcher/Directory.Build.props b/src/libraries/System.IO.FileSystem.Watcher/Directory.Build.props
new file mode 100644
index 00000000000..2ac6942ba72
--- /dev/null
+++ b/src/libraries/System.IO.FileSystem.Watcher/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.1.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.IO.FileSystem.Watcher/dir.props b/src/libraries/System.IO.FileSystem.Watcher/dir.props
deleted file mode 100644
index e0633597727..00000000000
--- a/src/libraries/System.IO.FileSystem.Watcher/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.IO.FileSystem/Directory.Build.props b/src/libraries/System.IO.FileSystem/Directory.Build.props
new file mode 100644
index 00000000000..2ac6942ba72
--- /dev/null
+++ b/src/libraries/System.IO.FileSystem/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.1.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.IO.FileSystem/dir.props b/src/libraries/System.IO.FileSystem/dir.props
deleted file mode 100644
index e0633597727..00000000000
--- a/src/libraries/System.IO.FileSystem/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.IO.IsolatedStorage/Directory.Build.props b/src/libraries/System.IO.IsolatedStorage/Directory.Build.props
new file mode 100644
index 00000000000..2ac6942ba72
--- /dev/null
+++ b/src/libraries/System.IO.IsolatedStorage/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.1.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.IO.IsolatedStorage/dir.props b/src/libraries/System.IO.IsolatedStorage/dir.props
deleted file mode 100644
index e0633597727..00000000000
--- a/src/libraries/System.IO.IsolatedStorage/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.IO.MemoryMappedFiles/Directory.Build.props b/src/libraries/System.IO.MemoryMappedFiles/Directory.Build.props
new file mode 100644
index 00000000000..2ac6942ba72
--- /dev/null
+++ b/src/libraries/System.IO.MemoryMappedFiles/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.1.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.IO.MemoryMappedFiles/dir.props b/src/libraries/System.IO.MemoryMappedFiles/dir.props
deleted file mode 100644
index e0633597727..00000000000
--- a/src/libraries/System.IO.MemoryMappedFiles/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Net.Http.WinHttpHandler/dir.props b/src/libraries/System.IO.Packaging/Directory.Build.props
similarity index 82%
rename from src/libraries/System.Net.Http.WinHttpHandler/dir.props
rename to src/libraries/System.IO.Packaging/Directory.Build.props
index 0d81e0a9e88..0eee85e4403 100644
--- a/src/libraries/System.Net.Http.WinHttpHandler/dir.props
+++ b/src/libraries/System.IO.Packaging/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.4.0</AssemblyVersion>
     <AssemblyKey>MSFT</AssemblyKey>
diff --git a/src/libraries/System.IO.Packaging/pkg/System.IO.Packaging.pkgproj b/src/libraries/System.IO.Packaging/pkg/System.IO.Packaging.pkgproj
index cc486349eeb..57c1ecfa727 100644
--- a/src/libraries/System.IO.Packaging/pkg/System.IO.Packaging.pkgproj
+++ b/src/libraries/System.IO.Packaging/pkg/System.IO.Packaging.pkgproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.IO.Packaging.csproj">
       <SupportedFramework>net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
@@ -13,5 +13,5 @@
     -->
     <SuppressMetaPackage Include="NETStandard.Library" />
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.IO.Pipelines/Directory.Build.props b/src/libraries/System.IO.Pipelines/Directory.Build.props
new file mode 100644
index 00000000000..5d39fb280b3
--- /dev/null
+++ b/src/libraries/System.IO.Pipelines/Directory.Build.props
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.0.1.0</AssemblyVersion>
+    <AssemblyKey>Open</AssemblyKey>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.IO.Pipelines/dir.props b/src/libraries/System.IO.Pipelines/dir.props
deleted file mode 100644
index af5b2933851..00000000000
--- a/src/libraries/System.IO.Pipelines/dir.props
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.0.1.0</AssemblyVersion>
-    <AssemblyKey>Open</AssemblyKey>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.IO.Pipelines/pkg/System.IO.Pipelines.pkgproj b/src/libraries/System.IO.Pipelines/pkg/System.IO.Pipelines.pkgproj
index 80de0bf4011..9e8ba4d84ce 100644
--- a/src/libraries/System.IO.Pipelines/pkg/System.IO.Pipelines.pkgproj
+++ b/src/libraries/System.IO.Pipelines/pkg/System.IO.Pipelines.pkgproj
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.IO.Pipelines.csproj">
         <SupportedFramework>net46;netcore50;netcoreapp1.0;$(UAPvNextTFM);$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.IO.Pipelines.csproj" />
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
diff --git a/src/libraries/System.IO.Pipes.AccessControl/dir.props b/src/libraries/System.IO.Pipes.AccessControl/Directory.Build.props
similarity index 86%
rename from src/libraries/System.IO.Pipes.AccessControl/dir.props
rename to src/libraries/System.IO.Pipes.AccessControl/Directory.Build.props
index db2dcc3ae82..febe8c8d28f 100644
--- a/src/libraries/System.IO.Pipes.AccessControl/dir.props
+++ b/src/libraries/System.IO.Pipes.AccessControl/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.4.0</AssemblyVersion>
     <AssemblyKey>MSFT</AssemblyKey>
diff --git a/src/libraries/System.IO.Pipes.AccessControl/pkg/System.IO.Pipes.AccessControl.pkgproj b/src/libraries/System.IO.Pipes.AccessControl/pkg/System.IO.Pipes.AccessControl.pkgproj
index 25c992f10d2..07d6f26952b 100644
--- a/src/libraries/System.IO.Pipes.AccessControl/pkg/System.IO.Pipes.AccessControl.pkgproj
+++ b/src/libraries/System.IO.Pipes.AccessControl/pkg/System.IO.Pipes.AccessControl.pkgproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.IO.Pipes.AccessControl.csproj">
       <SupportedFramework>net461</SupportedFramework>
@@ -16,5 +16,5 @@
       <TargetPath>runtimes/win/lib/$(UAPvNextTFM)</TargetPath>
     </File>
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.IO.Pipes/Directory.Build.props b/src/libraries/System.IO.Pipes/Directory.Build.props
new file mode 100644
index 00000000000..2ac6942ba72
--- /dev/null
+++ b/src/libraries/System.IO.Pipes/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.1.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.IO.Pipes/dir.props b/src/libraries/System.IO.Pipes/dir.props
deleted file mode 100644
index e0633597727..00000000000
--- a/src/libraries/System.IO.Pipes/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.IO.Ports/dir.props b/src/libraries/System.IO.Ports/Directory.Build.props
similarity index 83%
rename from src/libraries/System.IO.Ports/dir.props
rename to src/libraries/System.IO.Ports/Directory.Build.props
index 7d596555c1d..7ad0943497d 100644
--- a/src/libraries/System.IO.Ports/dir.props
+++ b/src/libraries/System.IO.Ports/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.2.0</AssemblyVersion>
     <AssemblyKey>Open</AssemblyKey>
diff --git a/src/libraries/System.IO.Ports/pkg/System.IO.Ports.pkgproj b/src/libraries/System.IO.Ports/pkg/System.IO.Ports.pkgproj
index af4b1b2fc14..031973506d6 100644
--- a/src/libraries/System.IO.Ports/pkg/System.IO.Ports.pkgproj
+++ b/src/libraries/System.IO.Ports/pkg/System.IO.Ports.pkgproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.IO.Ports.csproj">
       <SupportedFramework>net461</SupportedFramework>
@@ -11,5 +11,5 @@
     <InboxOnTargetFramework Include="uap10.0.16299" />
     <ProjectReference Include="..\src\System.IO.Ports.csproj" />
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.IO.UnmanagedMemoryStream/Directory.Build.props b/src/libraries/System.IO.UnmanagedMemoryStream/Directory.Build.props
new file mode 100644
index 00000000000..2ac6942ba72
--- /dev/null
+++ b/src/libraries/System.IO.UnmanagedMemoryStream/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.1.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.IO.UnmanagedMemoryStream/dir.props b/src/libraries/System.IO.UnmanagedMemoryStream/dir.props
deleted file mode 100644
index e0633597727..00000000000
--- a/src/libraries/System.IO.UnmanagedMemoryStream/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.IO/Directory.Build.props b/src/libraries/System.IO/Directory.Build.props
new file mode 100644
index 00000000000..c493677ae13
--- /dev/null
+++ b/src/libraries/System.IO/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.2.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.IO/dir.props b/src/libraries/System.IO/dir.props
deleted file mode 100644
index b89fb6fc11e..00000000000
--- a/src/libraries/System.IO/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.2.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Json/dir.props b/src/libraries/System.Json/Directory.Build.props
similarity index 82%
rename from src/libraries/System.Json/dir.props
rename to src/libraries/System.Json/Directory.Build.props
index 5b806c2ac25..743b059619d 100644
--- a/src/libraries/System.Json/dir.props
+++ b/src/libraries/System.Json/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>2.0.7.0</AssemblyVersion>
     <AssemblyKey>Open</AssemblyKey>
diff --git a/src/libraries/System.Json/pkg/System.Json.pkgproj b/src/libraries/System.Json/pkg/System.Json.pkgproj
index 407ef68a716..7e0c508e015 100644
--- a/src/libraries/System.Json/pkg/System.Json.pkgproj
+++ b/src/libraries/System.Json/pkg/System.Json.pkgproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\src\System.Json.csproj">
       <SupportedFramework>net45;netcore45;netcoreapp1.0;wp8;wpa81;$(AllXamarinFrameworks)</SupportedFramework>
@@ -25,5 +25,5 @@
       <AsFrameworkReference>true</AsFrameworkReference>
     </InboxOnTargetFramework>
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Linq.Expressions/Directory.Build.props b/src/libraries/System.Linq.Expressions/Directory.Build.props
new file mode 100644
index 00000000000..c493677ae13
--- /dev/null
+++ b/src/libraries/System.Linq.Expressions/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.2.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Linq.Expressions/dir.props b/src/libraries/System.Linq.Expressions/dir.props
deleted file mode 100644
index b89fb6fc11e..00000000000
--- a/src/libraries/System.Linq.Expressions/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.2.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Linq.Queryable/dir.props b/src/libraries/System.Linq.Parallel/Directory.Build.props
similarity index 87%
rename from src/libraries/System.Linq.Queryable/dir.props
rename to src/libraries/System.Linq.Parallel/Directory.Build.props
index ad2f0ed1395..c4419f3e6ab 100644
--- a/src/libraries/System.Linq.Queryable/dir.props
+++ b/src/libraries/System.Linq.Parallel/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.3.0</AssemblyVersion>
     <AssemblyKey>MSFT</AssemblyKey>
diff --git a/src/libraries/System.Linq.Parallel/tests/Performance/System.Linq.Parallel.Performance.Tests.csproj b/src/libraries/System.Linq.Parallel/tests/Performance/System.Linq.Parallel.Performance.Tests.csproj
index 4335523c657..966cfb5e52a 100644
--- a/src/libraries/System.Linq.Parallel/tests/Performance/System.Linq.Parallel.Performance.Tests.csproj
+++ b/src/libraries/System.Linq.Parallel/tests/Performance/System.Linq.Parallel.Performance.Tests.csproj
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IncludePerformanceTests>true</IncludePerformanceTests>
     <ProjectGuid>{11ABE2F8-4FB9-48AC-91AA-D04503059550}</ProjectGuid>
@@ -43,5 +42,4 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Diagnostics.Contracts/dir.props b/src/libraries/System.Linq.Queryable/Directory.Build.props
similarity index 87%
rename from src/libraries/System.Diagnostics.Contracts/dir.props
rename to src/libraries/System.Linq.Queryable/Directory.Build.props
index ad2f0ed1395..c4419f3e6ab 100644
--- a/src/libraries/System.Diagnostics.Contracts/dir.props
+++ b/src/libraries/System.Linq.Queryable/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.3.0</AssemblyVersion>
     <AssemblyKey>MSFT</AssemblyKey>
diff --git a/src/libraries/System.Linq/Directory.Build.props b/src/libraries/System.Linq/Directory.Build.props
new file mode 100644
index 00000000000..c493677ae13
--- /dev/null
+++ b/src/libraries/System.Linq/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.2.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Linq/dir.props b/src/libraries/System.Linq/dir.props
deleted file mode 100644
index b89fb6fc11e..00000000000
--- a/src/libraries/System.Linq/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.2.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.Caching/dir.props b/src/libraries/System.Management/Directory.Build.props
similarity index 88%
rename from src/libraries/System.Runtime.Caching/dir.props
rename to src/libraries/System.Management/Directory.Build.props
index 3a2542eb5ff..46703800641 100644
--- a/src/libraries/System.Runtime.Caching/dir.props
+++ b/src/libraries/System.Management/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <!-- this assembly is inbox in desktop, do not version it unless you
          plan on shipping a new desktop version out of band. Instead add API
diff --git a/src/libraries/System.Management/pkg/System.Management.pkgproj b/src/libraries/System.Management/pkg/System.Management.pkgproj
index 57d41105842..ab12bdb52da 100644
--- a/src/libraries/System.Management/pkg/System.Management.pkgproj
+++ b/src/libraries/System.Management/pkg/System.Management.pkgproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Management.csproj">
       <SupportedFramework>uap10.0.16299;netcoreapp2.0;net45;$(AllXamarinFrameworks)</SupportedFramework>
@@ -13,5 +13,5 @@
       <TargetPath>runtimes/win/lib/net45</TargetPath>
     </File>
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Memory/dir.props b/src/libraries/System.Memory/Directory.Build.props
similarity index 91%
rename from src/libraries/System.Memory/dir.props
rename to src/libraries/System.Memory/Directory.Build.props
index d750051a242..8bf3f2e8912 100644
--- a/src/libraries/System.Memory/dir.props
+++ b/src/libraries/System.Memory/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.2.0</AssemblyVersion>
     <!-- System.Memory has forwarded types into the runtime on netcoreapp/uap
diff --git a/src/libraries/System.Memory/pkg/System.Memory.pkgproj b/src/libraries/System.Memory/pkg/System.Memory.pkgproj
index 0820e904406..b2ef5eb7943 100644
--- a/src/libraries/System.Memory/pkg/System.Memory.pkgproj
+++ b/src/libraries/System.Memory/pkg/System.Memory.pkgproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <PackageIndex Include="$(ProjectDir)\pkg\baseline\packageBaseline.1.1.json" />
     <ProjectReference Include="..\ref\System.Memory.csproj">
@@ -11,5 +11,5 @@
     <InboxOnTargetFramework  Include="netcoreapp2.1" />
     <InboxOnTargetFramework  Include="$(UAPvNextTFM)" />
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Numerics.Vectors.WindowsRuntime/dir.props b/src/libraries/System.Net.Http.Rtc/Directory.Build.props
similarity index 83%
rename from src/libraries/System.Numerics.Vectors.WindowsRuntime/dir.props
rename to src/libraries/System.Net.Http.Rtc/Directory.Build.props
index 41debf92d39..59acc56bff7 100644
--- a/src/libraries/System.Numerics.Vectors.WindowsRuntime/dir.props
+++ b/src/libraries/System.Net.Http.Rtc/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.4.0</AssemblyVersion>
     <AssemblyKey>MSFT</AssemblyKey>
diff --git a/src/libraries/System.IO.Packaging/dir.props b/src/libraries/System.Net.Http.WinHttpHandler/Directory.Build.props
similarity index 82%
rename from src/libraries/System.IO.Packaging/dir.props
rename to src/libraries/System.Net.Http.WinHttpHandler/Directory.Build.props
index 0d81e0a9e88..0eee85e4403 100644
--- a/src/libraries/System.IO.Packaging/dir.props
+++ b/src/libraries/System.Net.Http.WinHttpHandler/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.4.0</AssemblyVersion>
     <AssemblyKey>MSFT</AssemblyKey>
diff --git a/src/libraries/System.Net.Http.WinHttpHandler/pkg/System.Net.Http.WinHttpHandler.pkgproj b/src/libraries/System.Net.Http.WinHttpHandler/pkg/System.Net.Http.WinHttpHandler.pkgproj
index bb6883ec8b1..5f27bf60a5d 100644
--- a/src/libraries/System.Net.Http.WinHttpHandler/pkg/System.Net.Http.WinHttpHandler.pkgproj
+++ b/src/libraries/System.Net.Http.WinHttpHandler/pkg/System.Net.Http.WinHttpHandler.pkgproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Net.Http.WinHttpHandler.csproj">
       <SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
@@ -12,5 +12,5 @@
     </HarvestIncludePaths>
     <HarvestIncludePaths Include="runtimes/win/lib/netstandard1.3;lib/netstandard1.3" />
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Net.Http/Directory.Build.props b/src/libraries/System.Net.Http/Directory.Build.props
new file mode 100644
index 00000000000..c493677ae13
--- /dev/null
+++ b/src/libraries/System.Net.Http/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.2.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Net.Http/dir.props b/src/libraries/System.Net.Http/dir.props
deleted file mode 100644
index b89fb6fc11e..00000000000
--- a/src/libraries/System.Net.Http/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.2.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Net.HttpListener/dir.props b/src/libraries/System.Net.HttpListener/Directory.Build.props
similarity index 85%
rename from src/libraries/System.Net.HttpListener/dir.props
rename to src/libraries/System.Net.HttpListener/Directory.Build.props
index 87260a19999..cd7809b6851 100644
--- a/src/libraries/System.Net.HttpListener/dir.props
+++ b/src/libraries/System.Net.HttpListener/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <AssemblyKey>Open</AssemblyKey>
diff --git a/src/libraries/System.Net.Mail/dir.props b/src/libraries/System.Net.Mail/Directory.Build.props
similarity index 85%
rename from src/libraries/System.Net.Mail/dir.props
rename to src/libraries/System.Net.Mail/Directory.Build.props
index 87260a19999..cd7809b6851 100644
--- a/src/libraries/System.Net.Mail/dir.props
+++ b/src/libraries/System.Net.Mail/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <AssemblyKey>Open</AssemblyKey>
diff --git a/src/libraries/System.Net.NameResolution/Directory.Build.props b/src/libraries/System.Net.NameResolution/Directory.Build.props
new file mode 100644
index 00000000000..2ac6942ba72
--- /dev/null
+++ b/src/libraries/System.Net.NameResolution/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.1.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Net.NameResolution/dir.props b/src/libraries/System.Net.NameResolution/dir.props
deleted file mode 100644
index e0633597727..00000000000
--- a/src/libraries/System.Net.NameResolution/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Net.NetworkInformation/Directory.Build.props b/src/libraries/System.Net.NetworkInformation/Directory.Build.props
new file mode 100644
index 00000000000..c493677ae13
--- /dev/null
+++ b/src/libraries/System.Net.NetworkInformation/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.2.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Net.NetworkInformation/dir.props b/src/libraries/System.Net.NetworkInformation/dir.props
deleted file mode 100644
index b89fb6fc11e..00000000000
--- a/src/libraries/System.Net.NetworkInformation/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.2.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Net.Ping/Directory.Build.props b/src/libraries/System.Net.Ping/Directory.Build.props
new file mode 100644
index 00000000000..2ac6942ba72
--- /dev/null
+++ b/src/libraries/System.Net.Ping/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.1.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Net.Ping/dir.props b/src/libraries/System.Net.Ping/dir.props
deleted file mode 100644
index e0633597727..00000000000
--- a/src/libraries/System.Net.Ping/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Net.Primitives/Directory.Build.props b/src/libraries/System.Net.Primitives/Directory.Build.props
new file mode 100644
index 00000000000..2ac6942ba72
--- /dev/null
+++ b/src/libraries/System.Net.Primitives/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.1.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Net.Primitives/dir.props b/src/libraries/System.Net.Primitives/dir.props
deleted file mode 100644
index e0633597727..00000000000
--- a/src/libraries/System.Net.Primitives/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Net.Requests/Directory.Build.props b/src/libraries/System.Net.Requests/Directory.Build.props
new file mode 100644
index 00000000000..2ac6942ba72
--- /dev/null
+++ b/src/libraries/System.Net.Requests/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.1.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Net.Requests/dir.props b/src/libraries/System.Net.Requests/dir.props
deleted file mode 100644
index e0633597727..00000000000
--- a/src/libraries/System.Net.Requests/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Net.Security/Directory.Build.props b/src/libraries/System.Net.Security/Directory.Build.props
new file mode 100644
index 00000000000..2ac6942ba72
--- /dev/null
+++ b/src/libraries/System.Net.Security/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.1.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Net.Security/dir.props b/src/libraries/System.Net.Security/dir.props
deleted file mode 100644
index e0633597727..00000000000
--- a/src/libraries/System.Net.Security/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Net.WebClient/dir.props b/src/libraries/System.Net.ServicePoint/Directory.Build.props
similarity index 85%
rename from src/libraries/System.Net.WebClient/dir.props
rename to src/libraries/System.Net.ServicePoint/Directory.Build.props
index 87260a19999..cd7809b6851 100644
--- a/src/libraries/System.Net.WebClient/dir.props
+++ b/src/libraries/System.Net.ServicePoint/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <AssemblyKey>Open</AssemblyKey>
diff --git a/src/libraries/System.Net.Sockets/Directory.Build.props b/src/libraries/System.Net.Sockets/Directory.Build.props
new file mode 100644
index 00000000000..c493677ae13
--- /dev/null
+++ b/src/libraries/System.Net.Sockets/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.2.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Net.Sockets/dir.props b/src/libraries/System.Net.Sockets/dir.props
deleted file mode 100644
index b89fb6fc11e..00000000000
--- a/src/libraries/System.Net.Sockets/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.2.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Net.ServicePoint/dir.props b/src/libraries/System.Net.WebClient/Directory.Build.props
similarity index 85%
rename from src/libraries/System.Net.ServicePoint/dir.props
rename to src/libraries/System.Net.WebClient/Directory.Build.props
index 87260a19999..cd7809b6851 100644
--- a/src/libraries/System.Net.ServicePoint/dir.props
+++ b/src/libraries/System.Net.WebClient/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <AssemblyKey>Open</AssemblyKey>
diff --git a/src/libraries/System.Net.WebHeaderCollection/Directory.Build.props b/src/libraries/System.Net.WebHeaderCollection/Directory.Build.props
new file mode 100644
index 00000000000..2ac6942ba72
--- /dev/null
+++ b/src/libraries/System.Net.WebHeaderCollection/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.1.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Net.WebHeaderCollection/dir.props b/src/libraries/System.Net.WebHeaderCollection/dir.props
deleted file mode 100644
index e0633597727..00000000000
--- a/src/libraries/System.Net.WebHeaderCollection/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Net.WebProxy/Directory.Build.props b/src/libraries/System.Net.WebProxy/Directory.Build.props
new file mode 100644
index 00000000000..cd7809b6851
--- /dev/null
+++ b/src/libraries/System.Net.WebProxy/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.0.1.0</AssemblyVersion>
+    <AssemblyKey>Open</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Net.WebProxy/dir.props b/src/libraries/System.Net.WebProxy/dir.props
deleted file mode 100644
index 87260a19999..00000000000
--- a/src/libraries/System.Net.WebProxy/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.0.1.0</AssemblyVersion>
-    <AssemblyKey>Open</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Net.WebSockets.Client/Directory.Build.props b/src/libraries/System.Net.WebSockets.Client/Directory.Build.props
new file mode 100644
index 00000000000..2ac6942ba72
--- /dev/null
+++ b/src/libraries/System.Net.WebSockets.Client/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.1.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Net.WebSockets.Client/dir.props b/src/libraries/System.Net.WebSockets.Client/dir.props
deleted file mode 100644
index e0633597727..00000000000
--- a/src/libraries/System.Net.WebSockets.Client/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Net.WebSockets.WebSocketProtocol/Directory.Build.props b/src/libraries/System.Net.WebSockets.WebSocketProtocol/Directory.Build.props
new file mode 100644
index 00000000000..5d39fb280b3
--- /dev/null
+++ b/src/libraries/System.Net.WebSockets.WebSocketProtocol/Directory.Build.props
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.0.1.0</AssemblyVersion>
+    <AssemblyKey>Open</AssemblyKey>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Net.WebSockets.WebSocketProtocol/dir.props b/src/libraries/System.Net.WebSockets.WebSocketProtocol/dir.props
deleted file mode 100644
index af5b2933851..00000000000
--- a/src/libraries/System.Net.WebSockets.WebSocketProtocol/dir.props
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.0.1.0</AssemblyVersion>
-    <AssemblyKey>Open</AssemblyKey>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Net.WebSockets.WebSocketProtocol/pkg/System.Net.WebSockets.WebSocketProtocol.pkgproj b/src/libraries/System.Net.WebSockets.WebSocketProtocol/pkg/System.Net.WebSockets.WebSocketProtocol.pkgproj
index 3a937242ec7..fad1f77d20b 100644
--- a/src/libraries/System.Net.WebSockets.WebSocketProtocol/pkg/System.Net.WebSockets.WebSocketProtocol.pkgproj
+++ b/src/libraries/System.Net.WebSockets.WebSocketProtocol/pkg/System.Net.WebSockets.WebSocketProtocol.pkgproj
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Net.WebSockets.WebSocketProtocol.csproj">
       <SupportedFramework>uap10.0.16299;net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Net.WebSockets.WebSocketProtocol.csproj" />
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Net.WebSockets/Directory.Build.props b/src/libraries/System.Net.WebSockets/Directory.Build.props
new file mode 100644
index 00000000000..2ac6942ba72
--- /dev/null
+++ b/src/libraries/System.Net.WebSockets/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.1.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Net.WebSockets/dir.props b/src/libraries/System.Net.WebSockets/dir.props
deleted file mode 100644
index e0633597727..00000000000
--- a/src/libraries/System.Net.WebSockets/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Net.Http.Rtc/dir.props b/src/libraries/System.Numerics.Vectors.WindowsRuntime/Directory.Build.props
similarity index 83%
rename from src/libraries/System.Net.Http.Rtc/dir.props
rename to src/libraries/System.Numerics.Vectors.WindowsRuntime/Directory.Build.props
index 41debf92d39..59acc56bff7 100644
--- a/src/libraries/System.Net.Http.Rtc/dir.props
+++ b/src/libraries/System.Numerics.Vectors.WindowsRuntime/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.4.0</AssemblyVersion>
     <AssemblyKey>MSFT</AssemblyKey>
diff --git a/src/libraries/System.Numerics.Vectors/dir.props b/src/libraries/System.Numerics.Vectors/Directory.Build.props
similarity index 85%
rename from src/libraries/System.Numerics.Vectors/dir.props
rename to src/libraries/System.Numerics.Vectors/Directory.Build.props
index 3b9e48d5199..1880b7ae604 100644
--- a/src/libraries/System.Numerics.Vectors/dir.props
+++ b/src/libraries/System.Numerics.Vectors/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.1.5.0</AssemblyVersion>
     <AssemblyKey>MSFT</AssemblyKey>
diff --git a/src/libraries/System.Numerics.Vectors/pkg/System.Numerics.Vectors.pkgproj b/src/libraries/System.Numerics.Vectors/pkg/System.Numerics.Vectors.pkgproj
index 5372818b7bb..a2b8ce8cfe3 100644
--- a/src/libraries/System.Numerics.Vectors/pkg/System.Numerics.Vectors.pkgproj
+++ b/src/libraries/System.Numerics.Vectors/pkg/System.Numerics.Vectors.pkgproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <PropertyGroup>
     <!-- we need to be supported on pre-nuget-3 platforms (Dev12, Dev11, etc) -->
     <MinClientVersion>2.8.6</MinClientVersion>
@@ -19,5 +19,5 @@
     <InboxOnTargetFramework Include="netcoreapp2.0" />
     <InboxOnTargetFramework Include="uap10.0.16299" />
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.ObjectModel/Directory.Build.props b/src/libraries/System.ObjectModel/Directory.Build.props
new file mode 100644
index 00000000000..2ac6942ba72
--- /dev/null
+++ b/src/libraries/System.ObjectModel/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.1.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.ObjectModel/dir.props b/src/libraries/System.ObjectModel/dir.props
deleted file mode 100644
index e0633597727..00000000000
--- a/src/libraries/System.ObjectModel/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Private.DataContractSerialization/dir.props b/src/libraries/System.Private.DataContractSerialization/Directory.Build.props
similarity index 87%
rename from src/libraries/System.Private.DataContractSerialization/dir.props
rename to src/libraries/System.Private.DataContractSerialization/Directory.Build.props
index 51d360c0ccb..c95af8c33d1 100644
--- a/src/libraries/System.Private.DataContractSerialization/dir.props
+++ b/src/libraries/System.Private.DataContractSerialization/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.1.4.0</AssemblyVersion>
     <AssemblyKey>MSFT</AssemblyKey>
diff --git a/src/libraries/System.Private.Reflection.Metadata.Ecma335/dir.props b/src/libraries/System.Private.Reflection.Metadata.Ecma335/Directory.Build.props
similarity index 85%
rename from src/libraries/System.Private.Reflection.Metadata.Ecma335/dir.props
rename to src/libraries/System.Private.Reflection.Metadata.Ecma335/Directory.Build.props
index 38f09b54aba..bff16d5b4d2 100644
--- a/src/libraries/System.Private.Reflection.Metadata.Ecma335/dir.props
+++ b/src/libraries/System.Private.Reflection.Metadata.Ecma335/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.1.4.0</AssemblyVersion>
     <AssemblyKey>Open</AssemblyKey>
diff --git a/src/libraries/System.Private.Uri/dir.props b/src/libraries/System.Private.Uri/Directory.Build.props
similarity index 86%
rename from src/libraries/System.Private.Uri/dir.props
rename to src/libraries/System.Private.Uri/Directory.Build.props
index f560fabe73f..a487d698071 100644
--- a/src/libraries/System.Private.Uri/dir.props
+++ b/src/libraries/System.Private.Uri/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.5.0</AssemblyVersion>
     <AssemblyKey>MSFT</AssemblyKey>
diff --git a/src/libraries/System.Private.Xml.Linq/dir.props b/src/libraries/System.Private.Xml.Linq/Directory.Build.props
similarity index 87%
rename from src/libraries/System.Private.Xml.Linq/dir.props
rename to src/libraries/System.Private.Xml.Linq/Directory.Build.props
index 1b884865a26..c2a7da21127 100644
--- a/src/libraries/System.Private.Xml.Linq/dir.props
+++ b/src/libraries/System.Private.Xml.Linq/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <AssemblyKey>Open</AssemblyKey>
diff --git a/src/libraries/System.Private.Xml/dir.props b/src/libraries/System.Private.Xml/Directory.Build.props
similarity index 87%
rename from src/libraries/System.Private.Xml/dir.props
rename to src/libraries/System.Private.Xml/Directory.Build.props
index 1b884865a26..c2a7da21127 100644
--- a/src/libraries/System.Private.Xml/dir.props
+++ b/src/libraries/System.Private.Xml/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <AssemblyKey>Open</AssemblyKey>
diff --git a/src/libraries/System.Reflection.Context/dir.props b/src/libraries/System.Reflection.Context/Directory.Build.props
similarity index 86%
rename from src/libraries/System.Reflection.Context/dir.props
rename to src/libraries/System.Reflection.Context/Directory.Build.props
index 24a5396d180..6b9f97fd1ee 100644
--- a/src/libraries/System.Reflection.Context/dir.props
+++ b/src/libraries/System.Reflection.Context/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.3.0</AssemblyVersion>
     <AssemblyKey>ECMA</AssemblyKey>
diff --git a/src/libraries/System.Reflection.DispatchProxy/dir.props b/src/libraries/System.Reflection.DispatchProxy/Directory.Build.props
similarity index 85%
rename from src/libraries/System.Reflection.DispatchProxy/dir.props
rename to src/libraries/System.Reflection.DispatchProxy/Directory.Build.props
index 9b4dcb5fd87..2b43aafe110 100644
--- a/src/libraries/System.Reflection.DispatchProxy/dir.props
+++ b/src/libraries/System.Reflection.DispatchProxy/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.5.0</AssemblyVersion>
     <AssemblyKey>MSFT</AssemblyKey>
diff --git a/src/libraries/System.Reflection.DispatchProxy/pkg/System.Reflection.DispatchProxy.pkgproj b/src/libraries/System.Reflection.DispatchProxy/pkg/System.Reflection.DispatchProxy.pkgproj
index 426087ed036..7f87457bf14 100644
--- a/src/libraries/System.Reflection.DispatchProxy/pkg/System.Reflection.DispatchProxy.pkgproj
+++ b/src/libraries/System.Reflection.DispatchProxy/pkg/System.Reflection.DispatchProxy.pkgproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Reflection.DispatchProxy.csproj">
       <SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
@@ -29,5 +29,5 @@
       <Value>.NETCoreApp;UAP</Value>
     </ValidatePackageSuppression>
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Reflection.Emit.ILGeneration/dir.props b/src/libraries/System.Reflection.Emit.ILGeneration/Directory.Build.props
similarity index 88%
rename from src/libraries/System.Reflection.Emit.ILGeneration/dir.props
rename to src/libraries/System.Reflection.Emit.ILGeneration/Directory.Build.props
index 9354ee6570c..65e817e9956 100644
--- a/src/libraries/System.Reflection.Emit.ILGeneration/dir.props
+++ b/src/libraries/System.Reflection.Emit.ILGeneration/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.3.0</AssemblyVersion>
     <AssemblyKey>MSFT</AssemblyKey>
diff --git a/src/libraries/System.Reflection.Emit.Lightweight/dir.props b/src/libraries/System.Reflection.Emit.Lightweight/Directory.Build.props
similarity index 88%
rename from src/libraries/System.Reflection.Emit.Lightweight/dir.props
rename to src/libraries/System.Reflection.Emit.Lightweight/Directory.Build.props
index 9354ee6570c..65e817e9956 100644
--- a/src/libraries/System.Reflection.Emit.Lightweight/dir.props
+++ b/src/libraries/System.Reflection.Emit.Lightweight/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.3.0</AssemblyVersion>
     <AssemblyKey>MSFT</AssemblyKey>
diff --git a/src/libraries/System.Reflection.Emit/dir.props b/src/libraries/System.Reflection.Emit/Directory.Build.props
similarity index 86%
rename from src/libraries/System.Reflection.Emit/dir.props
rename to src/libraries/System.Reflection.Emit/Directory.Build.props
index e4ff2b0579e..5992753ec98 100644
--- a/src/libraries/System.Reflection.Emit/dir.props
+++ b/src/libraries/System.Reflection.Emit/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <AssemblyKey>MSFT</AssemblyKey>
diff --git a/src/libraries/System.Reflection.Extensions/Directory.Build.props b/src/libraries/System.Reflection.Extensions/Directory.Build.props
new file mode 100644
index 00000000000..2ac6942ba72
--- /dev/null
+++ b/src/libraries/System.Reflection.Extensions/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.1.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Reflection.Extensions/dir.props b/src/libraries/System.Reflection.Extensions/dir.props
deleted file mode 100644
index e0633597727..00000000000
--- a/src/libraries/System.Reflection.Extensions/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Reflection.Metadata/dir.props b/src/libraries/System.Reflection.Metadata/Directory.Build.props
similarity index 86%
rename from src/libraries/System.Reflection.Metadata/dir.props
rename to src/libraries/System.Reflection.Metadata/Directory.Build.props
index d08de014db3..8deb4c801e8 100644
--- a/src/libraries/System.Reflection.Metadata/dir.props
+++ b/src/libraries/System.Reflection.Metadata/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <PackageVersion>1.7.0</PackageVersion>
     <AssemblyVersion>1.4.4.0</AssemblyVersion>
diff --git a/src/libraries/System.Reflection.Metadata/pkg/System.Reflection.Metadata.pkgproj b/src/libraries/System.Reflection.Metadata/pkg/System.Reflection.Metadata.pkgproj
index e73c04ec8ba..f1b8c12762b 100644
--- a/src/libraries/System.Reflection.Metadata/pkg/System.Reflection.Metadata.pkgproj
+++ b/src/libraries/System.Reflection.Metadata/pkg/System.Reflection.Metadata.pkgproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\src\System.Reflection.Metadata.csproj">
       <SupportedFramework>net45;netcore45;netcoreapp1.0;wpa81;$(AllXamarinFrameworks)</SupportedFramework>
@@ -15,5 +15,5 @@
       <Value>.NETCoreApp;UAP</Value>
     </ValidatePackageSuppression>
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Reflection.Primitives/Directory.Build.props b/src/libraries/System.Reflection.Primitives/Directory.Build.props
new file mode 100644
index 00000000000..2ac6942ba72
--- /dev/null
+++ b/src/libraries/System.Reflection.Primitives/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.1.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Reflection.Primitives/dir.props b/src/libraries/System.Reflection.Primitives/dir.props
deleted file mode 100644
index e0633597727..00000000000
--- a/src/libraries/System.Reflection.Primitives/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Reflection.TypeExtensions/dir.props b/src/libraries/System.Reflection.TypeExtensions/Directory.Build.props
similarity index 85%
rename from src/libraries/System.Reflection.TypeExtensions/dir.props
rename to src/libraries/System.Reflection.TypeExtensions/Directory.Build.props
index b4fda06b13e..a08bbca5fef 100644
--- a/src/libraries/System.Reflection.TypeExtensions/dir.props
+++ b/src/libraries/System.Reflection.TypeExtensions/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.1.4.0</AssemblyVersion>
     <AssemblyKey>MSFT</AssemblyKey>
diff --git a/src/libraries/System.Reflection.TypeExtensions/pkg/System.Reflection.TypeExtensions.pkgproj b/src/libraries/System.Reflection.TypeExtensions/pkg/System.Reflection.TypeExtensions.pkgproj
index 81d437092a7..c3cab2beec0 100644
--- a/src/libraries/System.Reflection.TypeExtensions/pkg/System.Reflection.TypeExtensions.pkgproj
+++ b/src/libraries/System.Reflection.TypeExtensions/pkg/System.Reflection.TypeExtensions.pkgproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Reflection.TypeExtensions.csproj">
       <SupportedFramework>net461</SupportedFramework>
@@ -26,5 +26,5 @@
          therefore it cannot reference NETStandard.Library -->
     <SuppressMetaPackage Include="NETStandard.Library" />
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Reflection/Directory.Build.props b/src/libraries/System.Reflection/Directory.Build.props
new file mode 100644
index 00000000000..c493677ae13
--- /dev/null
+++ b/src/libraries/System.Reflection/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.2.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Reflection/dir.props b/src/libraries/System.Reflection/dir.props
deleted file mode 100644
index b89fb6fc11e..00000000000
--- a/src/libraries/System.Reflection/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.2.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Resources.Reader/Directory.Build.props b/src/libraries/System.Resources.Reader/Directory.Build.props
new file mode 100644
index 00000000000..2ac6942ba72
--- /dev/null
+++ b/src/libraries/System.Resources.Reader/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.1.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Resources.Reader/dir.props b/src/libraries/System.Resources.Reader/dir.props
deleted file mode 100644
index e0633597727..00000000000
--- a/src/libraries/System.Resources.Reader/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Resources.ResourceManager/Directory.Build.props b/src/libraries/System.Resources.ResourceManager/Directory.Build.props
new file mode 100644
index 00000000000..2ac6942ba72
--- /dev/null
+++ b/src/libraries/System.Resources.ResourceManager/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.1.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Resources.ResourceManager/dir.props b/src/libraries/System.Resources.ResourceManager/dir.props
deleted file mode 100644
index e0633597727..00000000000
--- a/src/libraries/System.Resources.ResourceManager/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Resources.Writer/Directory.Build.props b/src/libraries/System.Resources.Writer/Directory.Build.props
new file mode 100644
index 00000000000..2ac6942ba72
--- /dev/null
+++ b/src/libraries/System.Resources.Writer/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.1.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Resources.Writer/dir.props b/src/libraries/System.Resources.Writer/dir.props
deleted file mode 100644
index e0633597727..00000000000
--- a/src/libraries/System.Resources.Writer/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.DirectoryServices.Protocols/dir.props b/src/libraries/System.Runtime.Caching/Directory.Build.props
similarity index 88%
rename from src/libraries/System.DirectoryServices.Protocols/dir.props
rename to src/libraries/System.Runtime.Caching/Directory.Build.props
index 3a2542eb5ff..46703800641 100644
--- a/src/libraries/System.DirectoryServices.Protocols/dir.props
+++ b/src/libraries/System.Runtime.Caching/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <!-- this assembly is inbox in desktop, do not version it unless you
          plan on shipping a new desktop version out of band. Instead add API
diff --git a/src/libraries/System.Runtime.Caching/pkg/System.Runtime.Caching.pkgproj b/src/libraries/System.Runtime.Caching/pkg/System.Runtime.Caching.pkgproj
index 946133d246b..f816ab0d893 100644
--- a/src/libraries/System.Runtime.Caching/pkg/System.Runtime.Caching.pkgproj
+++ b/src/libraries/System.Runtime.Caching/pkg/System.Runtime.Caching.pkgproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Runtime.Caching.csproj">
       <SupportedFramework>uap10.0.16299;netcoreapp2.0;net45;$(AllXamarinFrameworks)</SupportedFramework>
@@ -14,5 +14,5 @@
       <TargetPath>runtimes/win/lib/net45</TargetPath>
     </File>
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.CompilerServices.Unsafe/pkg/System.Runtime.CompilerServices.Unsafe.pkgproj b/src/libraries/System.Runtime.CompilerServices.Unsafe/pkg/System.Runtime.CompilerServices.Unsafe.pkgproj
index e7d23726e4e..ec99d138f62 100644
--- a/src/libraries/System.Runtime.CompilerServices.Unsafe/pkg/System.Runtime.CompilerServices.Unsafe.pkgproj
+++ b/src/libraries/System.Runtime.CompilerServices.Unsafe/pkg/System.Runtime.CompilerServices.Unsafe.pkgproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <PackageIndex Include="$(ProjectDir)\pkg\baseline\packageBaseline.1.1.json" />
     <ProjectReference Include="..\ref\System.Runtime.CompilerServices.Unsafe.csproj">
@@ -13,5 +13,5 @@
     <SuppressMetaPackage Include="NETStandard.Library" />
     <InboxOnTargetFramework Include="uap10.0.16300" />
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.CompilerServices.VisualC/Directory.Build.props b/src/libraries/System.Runtime.CompilerServices.VisualC/Directory.Build.props
new file mode 100644
index 00000000000..2ac6942ba72
--- /dev/null
+++ b/src/libraries/System.Runtime.CompilerServices.VisualC/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.1.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.CompilerServices.VisualC/dir.props b/src/libraries/System.Runtime.CompilerServices.VisualC/dir.props
deleted file mode 100644
index e0633597727..00000000000
--- a/src/libraries/System.Runtime.CompilerServices.VisualC/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.Extensions/Directory.Build.props b/src/libraries/System.Runtime.Extensions/Directory.Build.props
new file mode 100644
index 00000000000..c493677ae13
--- /dev/null
+++ b/src/libraries/System.Runtime.Extensions/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.2.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.Extensions/dir.props b/src/libraries/System.Runtime.Extensions/dir.props
deleted file mode 100644
index b89fb6fc11e..00000000000
--- a/src/libraries/System.Runtime.Extensions/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.2.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.Handles/Directory.Build.props b/src/libraries/System.Runtime.Handles/Directory.Build.props
new file mode 100644
index 00000000000..2ac6942ba72
--- /dev/null
+++ b/src/libraries/System.Runtime.Handles/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.1.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.Handles/dir.props b/src/libraries/System.Runtime.Handles/dir.props
deleted file mode 100644
index e0633597727..00000000000
--- a/src/libraries/System.Runtime.Handles/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.FileVersionInfo/dir.props b/src/libraries/System.Runtime.InteropServices.RuntimeInformation/Directory.Build.props
similarity index 85%
rename from src/libraries/System.Diagnostics.FileVersionInfo/dir.props
rename to src/libraries/System.Runtime.InteropServices.RuntimeInformation/Directory.Build.props
index 85a6f1a4971..c07aec602f0 100644
--- a/src/libraries/System.Diagnostics.FileVersionInfo/dir.props
+++ b/src/libraries/System.Runtime.InteropServices.RuntimeInformation/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.3.0</AssemblyVersion>
     <AssemblyKey>MSFT</AssemblyKey>
diff --git a/src/libraries/System.Runtime.InteropServices.WindowsRuntime/Directory.Build.props b/src/libraries/System.Runtime.InteropServices.WindowsRuntime/Directory.Build.props
new file mode 100644
index 00000000000..c4419f3e6ab
--- /dev/null
+++ b/src/libraries/System.Runtime.InteropServices.WindowsRuntime/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.0.3.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
diff --git a/src/libraries/System.Runtime.InteropServices.WindowsRuntime/dir.props b/src/libraries/System.Runtime.InteropServices.WindowsRuntime/dir.props
deleted file mode 100644
index ad2f0ed1395..00000000000
--- a/src/libraries/System.Runtime.InteropServices.WindowsRuntime/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.0.3.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
diff --git a/src/libraries/System.Runtime.InteropServices/Directory.Build.props b/src/libraries/System.Runtime.InteropServices/Directory.Build.props
new file mode 100644
index 00000000000..c493677ae13
--- /dev/null
+++ b/src/libraries/System.Runtime.InteropServices/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.2.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.InteropServices/dir.props b/src/libraries/System.Runtime.InteropServices/dir.props
deleted file mode 100644
index b89fb6fc11e..00000000000
--- a/src/libraries/System.Runtime.InteropServices/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.2.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.Intrinsics.Experimental/dir.props b/src/libraries/System.Runtime.Intrinsics.Experimental/Directory.Build.props
similarity index 87%
rename from src/libraries/System.Runtime.Intrinsics.Experimental/dir.props
rename to src/libraries/System.Runtime.Intrinsics.Experimental/Directory.Build.props
index 08a3568c198..f8fe757342a 100644
--- a/src/libraries/System.Runtime.Intrinsics.Experimental/dir.props
+++ b/src/libraries/System.Runtime.Intrinsics.Experimental/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <AssemblyKey>Open</AssemblyKey>
diff --git a/src/libraries/System.Runtime.Intrinsics.Experimental/pkg/System.Runtime.Intrinsics.Experimental.pkgproj b/src/libraries/System.Runtime.Intrinsics.Experimental/pkg/System.Runtime.Intrinsics.Experimental.pkgproj
index b8ebbcce2d3..a64666c93d4 100644
--- a/src/libraries/System.Runtime.Intrinsics.Experimental/pkg/System.Runtime.Intrinsics.Experimental.pkgproj
+++ b/src/libraries/System.Runtime.Intrinsics.Experimental/pkg/System.Runtime.Intrinsics.Experimental.pkgproj
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Runtime.Intrinsics.Experimental.csproj">
       <SupportedFramework>netcoreapp2.1</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Runtime.Intrinsics.Experimental.csproj" />
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
diff --git a/src/libraries/System.Runtime.Loader/dir.props b/src/libraries/System.Runtime.Loader/Directory.Build.props
similarity index 84%
rename from src/libraries/System.Runtime.Loader/dir.props
rename to src/libraries/System.Runtime.Loader/Directory.Build.props
index 2dad3f1e42e..90f338362a5 100644
--- a/src/libraries/System.Runtime.Loader/dir.props
+++ b/src/libraries/System.Runtime.Loader/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.3.0</AssemblyVersion>
     <AssemblyKey>MSFT</AssemblyKey>
diff --git a/src/libraries/System.Runtime.Numerics/Directory.Build.props b/src/libraries/System.Runtime.Numerics/Directory.Build.props
new file mode 100644
index 00000000000..2ac6942ba72
--- /dev/null
+++ b/src/libraries/System.Runtime.Numerics/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.1.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.Numerics/dir.props b/src/libraries/System.Runtime.Numerics/dir.props
deleted file mode 100644
index e0633597727..00000000000
--- a/src/libraries/System.Runtime.Numerics/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.Serialization.Formatters/dir.props b/src/libraries/System.Runtime.Serialization.Formatters/Directory.Build.props
similarity index 85%
rename from src/libraries/System.Runtime.Serialization.Formatters/dir.props
rename to src/libraries/System.Runtime.Serialization.Formatters/Directory.Build.props
index 85a6f1a4971..c07aec602f0 100644
--- a/src/libraries/System.Runtime.Serialization.Formatters/dir.props
+++ b/src/libraries/System.Runtime.Serialization.Formatters/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.3.0</AssemblyVersion>
     <AssemblyKey>MSFT</AssemblyKey>
diff --git a/src/libraries/Microsoft.CSharp/dir.props b/src/libraries/System.Runtime.Serialization.Json/Directory.Build.props
similarity index 87%
rename from src/libraries/Microsoft.CSharp/dir.props
rename to src/libraries/System.Runtime.Serialization.Json/Directory.Build.props
index 2010639bb33..8455e16f095 100644
--- a/src/libraries/Microsoft.CSharp/dir.props
+++ b/src/libraries/System.Runtime.Serialization.Json/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.4.0</AssemblyVersion>
     <AssemblyKey>MSFT</AssemblyKey>
diff --git a/src/libraries/System.Runtime.Serialization.Primitives/Directory.Build.props b/src/libraries/System.Runtime.Serialization.Primitives/Directory.Build.props
new file mode 100644
index 00000000000..c493677ae13
--- /dev/null
+++ b/src/libraries/System.Runtime.Serialization.Primitives/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.2.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.Serialization.Primitives/dir.props b/src/libraries/System.Runtime.Serialization.Primitives/dir.props
deleted file mode 100644
index b89fb6fc11e..00000000000
--- a/src/libraries/System.Runtime.Serialization.Primitives/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.2.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.Serialization.Xml/dir.props b/src/libraries/System.Runtime.Serialization.Xml/Directory.Build.props
similarity index 85%
rename from src/libraries/System.Runtime.Serialization.Xml/dir.props
rename to src/libraries/System.Runtime.Serialization.Xml/Directory.Build.props
index b4fda06b13e..a08bbca5fef 100644
--- a/src/libraries/System.Runtime.Serialization.Xml/dir.props
+++ b/src/libraries/System.Runtime.Serialization.Xml/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.1.4.0</AssemblyVersion>
     <AssemblyKey>MSFT</AssemblyKey>
diff --git a/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/dir.props b/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/Directory.Build.props
similarity index 83%
rename from src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/dir.props
rename to src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/Directory.Build.props
index 3a1d16bb30e..2346cdd5cdc 100644
--- a/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/dir.props
+++ b/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.4.0</AssemblyVersion>
     <AssemblyKey>ECMA</AssemblyKey>
diff --git a/src/libraries/System.Runtime.WindowsRuntime/dir.props b/src/libraries/System.Runtime.WindowsRuntime/Directory.Build.props
similarity index 83%
rename from src/libraries/System.Runtime.WindowsRuntime/dir.props
rename to src/libraries/System.Runtime.WindowsRuntime/Directory.Build.props
index 7d60eaf5608..380ed509222 100644
--- a/src/libraries/System.Runtime.WindowsRuntime/dir.props
+++ b/src/libraries/System.Runtime.WindowsRuntime/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.14.0</AssemblyVersion>
     <AssemblyKey>ECMA</AssemblyKey>
diff --git a/src/libraries/System.Runtime/Directory.Build.props b/src/libraries/System.Runtime/Directory.Build.props
new file mode 100644
index 00000000000..c493677ae13
--- /dev/null
+++ b/src/libraries/System.Runtime/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.2.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Runtime/dir.props b/src/libraries/System.Runtime/dir.props
deleted file mode 100644
index b89fb6fc11e..00000000000
--- a/src/libraries/System.Runtime/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.2.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Runtime/tests/TestModule/System.Reflection.TestModule.ilproj b/src/libraries/System.Runtime/tests/TestModule/System.Reflection.TestModule.ilproj
index 2be29a5d18e..e48e204b4a9 100644
--- a/src/libraries/System.Runtime/tests/TestModule/System.Reflection.TestModule.ilproj
+++ b/src/libraries/System.Runtime/tests/TestModule/System.Reflection.TestModule.ilproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>1.0.0.0</AssemblyVersion>
     <ProjectGuid>{3B7489C4-65DB-4E69-BE01-F6234133400C}</ProjectGuid>
@@ -10,5 +10,5 @@
   <ItemGroup>
     <Compile Include="System.Reflection.TestModule.il" />
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Security.AccessControl/dir.props b/src/libraries/System.Security.AccessControl/Directory.Build.props
similarity index 86%
rename from src/libraries/System.Security.AccessControl/dir.props
rename to src/libraries/System.Security.AccessControl/Directory.Build.props
index 573a8f42882..f06489972fe 100644
--- a/src/libraries/System.Security.AccessControl/dir.props
+++ b/src/libraries/System.Security.AccessControl/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.1.2.0</AssemblyVersion>
     <AssemblyKey>MSFT</AssemblyKey>
diff --git a/src/libraries/System.Security.AccessControl/pkg/System.Security.AccessControl.pkgproj b/src/libraries/System.Security.AccessControl/pkg/System.Security.AccessControl.pkgproj
index 2ef21ebc9a5..ba53facdb3a 100644
--- a/src/libraries/System.Security.AccessControl/pkg/System.Security.AccessControl.pkgproj
+++ b/src/libraries/System.Security.AccessControl/pkg/System.Security.AccessControl.pkgproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Security.AccessControl.csproj">
       <SupportedFramework>net461</SupportedFramework>
@@ -16,5 +16,5 @@
     </HarvestIncludePaths>
     <HarvestIncludePaths Include="runtimes/win/lib/netstandard1.3;lib/netstandard1.3" />
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Security.Claims/Directory.Build.props b/src/libraries/System.Security.Claims/Directory.Build.props
new file mode 100644
index 00000000000..2ac6942ba72
--- /dev/null
+++ b/src/libraries/System.Security.Claims/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.1.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Security.Claims/dir.props b/src/libraries/System.Security.Claims/dir.props
deleted file mode 100644
index e0633597727..00000000000
--- a/src/libraries/System.Security.Claims/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.Algorithms/dir.props b/src/libraries/System.Security.Cryptography.Algorithms/Directory.Build.props
similarity index 85%
rename from src/libraries/System.Security.Cryptography.Algorithms/dir.props
rename to src/libraries/System.Security.Cryptography.Algorithms/Directory.Build.props
index 70f807eaef7..5aa6241cb44 100644
--- a/src/libraries/System.Security.Cryptography.Algorithms/dir.props
+++ b/src/libraries/System.Security.Cryptography.Algorithms/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.3.1.0</AssemblyVersion>
     <AssemblyKey>MSFT</AssemblyKey>
diff --git a/src/libraries/System.Security.Cryptography.Cng/dir.props b/src/libraries/System.Security.Cryptography.Cng/Directory.Build.props
similarity index 86%
rename from src/libraries/System.Security.Cryptography.Cng/dir.props
rename to src/libraries/System.Security.Cryptography.Cng/Directory.Build.props
index d956a646a15..5deb10b173b 100644
--- a/src/libraries/System.Security.Cryptography.Cng/dir.props
+++ b/src/libraries/System.Security.Cryptography.Cng/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.3.2.0</AssemblyVersion>
     <AssemblyKey>MSFT</AssemblyKey>
diff --git a/src/libraries/System.Security.Cryptography.Cng/pkg/System.Security.Cryptography.Cng.pkgproj b/src/libraries/System.Security.Cryptography.Cng/pkg/System.Security.Cryptography.Cng.pkgproj
index 9eae8f8385c..98cc13ef69b 100644
--- a/src/libraries/System.Security.Cryptography.Cng/pkg/System.Security.Cryptography.Cng.pkgproj
+++ b/src/libraries/System.Security.Cryptography.Cng/pkg/System.Security.Cryptography.Cng.pkgproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Security.Cryptography.Cng.csproj">
       <SupportedFramework>net461</SupportedFramework>
@@ -21,5 +21,5 @@
          therefore it cannot reference NETStandard.Library -->
     <SuppressMetaPackage Include="NETStandard.Library" />
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.Csp/Directory.Build.props b/src/libraries/System.Security.Cryptography.Csp/Directory.Build.props
new file mode 100644
index 00000000000..2ac6942ba72
--- /dev/null
+++ b/src/libraries/System.Security.Cryptography.Csp/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.1.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.Csp/dir.props b/src/libraries/System.Security.Cryptography.Csp/dir.props
deleted file mode 100644
index e0633597727..00000000000
--- a/src/libraries/System.Security.Cryptography.Csp/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.Encoding/Directory.Build.props b/src/libraries/System.Security.Cryptography.Encoding/Directory.Build.props
new file mode 100644
index 00000000000..2ac6942ba72
--- /dev/null
+++ b/src/libraries/System.Security.Cryptography.Encoding/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.1.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.Encoding/dir.props b/src/libraries/System.Security.Cryptography.Encoding/dir.props
deleted file mode 100644
index e0633597727..00000000000
--- a/src/libraries/System.Security.Cryptography.Encoding/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/Microsoft.Win32.Registry/dir.props b/src/libraries/System.Security.Cryptography.OpenSsl/Directory.Build.props
similarity index 86%
rename from src/libraries/Microsoft.Win32.Registry/dir.props
rename to src/libraries/System.Security.Cryptography.OpenSsl/Directory.Build.props
index 8c1928e5835..56ea582b1e6 100644
--- a/src/libraries/Microsoft.Win32.Registry/dir.props
+++ b/src/libraries/System.Security.Cryptography.OpenSsl/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.1.2.0</AssemblyVersion>
     <AssemblyKey>MSFT</AssemblyKey>
diff --git a/src/libraries/System.Security.Cryptography.OpenSsl/pkg/System.Security.Cryptography.OpenSsl.pkgproj b/src/libraries/System.Security.Cryptography.OpenSsl/pkg/System.Security.Cryptography.OpenSsl.pkgproj
index 9908aeeb647..554fe86198f 100644
--- a/src/libraries/System.Security.Cryptography.OpenSsl/pkg/System.Security.Cryptography.OpenSsl.pkgproj
+++ b/src/libraries/System.Security.Cryptography.OpenSsl/pkg/System.Security.Cryptography.OpenSsl.pkgproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Security.Cryptography.OpenSsl.csproj">
       <!-- Removing net461 and AllXamarianFrameworks from validation because of https://github.com/dotnet/corefx/issues/25924 -->
@@ -13,5 +13,5 @@
          therefore it cannot reference NETStandard.Library -->
     <SuppressMetaPackage Include="NETStandard.Library" />
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.Pkcs/dir.props b/src/libraries/System.Security.Cryptography.Pkcs/Directory.Build.props
similarity index 82%
rename from src/libraries/System.Security.Cryptography.Pkcs/dir.props
rename to src/libraries/System.Security.Cryptography.Pkcs/Directory.Build.props
index 0d81e0a9e88..0eee85e4403 100644
--- a/src/libraries/System.Security.Cryptography.Pkcs/dir.props
+++ b/src/libraries/System.Security.Cryptography.Pkcs/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.4.0</AssemblyVersion>
     <AssemblyKey>MSFT</AssemblyKey>
diff --git a/src/libraries/System.Security.Cryptography.Pkcs/pkg/System.Security.Cryptography.Pkcs.pkgproj b/src/libraries/System.Security.Cryptography.Pkcs/pkg/System.Security.Cryptography.Pkcs.pkgproj
index 234c84175e0..b31b9c052bd 100644
--- a/src/libraries/System.Security.Cryptography.Pkcs/pkg/System.Security.Cryptography.Pkcs.pkgproj
+++ b/src/libraries/System.Security.Cryptography.Pkcs/pkg/System.Security.Cryptography.Pkcs.pkgproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Security.Cryptography.Pkcs.csproj">
       <SupportedFramework>net461;netcoreapp2.1;$(AllXamarinFrameworks)</SupportedFramework>
@@ -15,5 +15,5 @@
     -->
     <SuppressMetaPackage Include="NETStandard.Library" />
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
diff --git a/src/libraries/System.Security.Cryptography.Primitives/Directory.Build.props b/src/libraries/System.Security.Cryptography.Primitives/Directory.Build.props
new file mode 100644
index 00000000000..2ac6942ba72
--- /dev/null
+++ b/src/libraries/System.Security.Cryptography.Primitives/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.1.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.Primitives/dir.props b/src/libraries/System.Security.Cryptography.Primitives/dir.props
deleted file mode 100644
index e0633597727..00000000000
--- a/src/libraries/System.Security.Cryptography.Primitives/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.ProtectedData/Directory.Build.props b/src/libraries/System.Security.Cryptography.ProtectedData/Directory.Build.props
new file mode 100644
index 00000000000..0eee85e4403
--- /dev/null
+++ b/src/libraries/System.Security.Cryptography.ProtectedData/Directory.Build.props
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.0.4.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.ProtectedData/dir.props b/src/libraries/System.Security.Cryptography.ProtectedData/dir.props
deleted file mode 100644
index 0d81e0a9e88..00000000000
--- a/src/libraries/System.Security.Cryptography.ProtectedData/dir.props
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.0.4.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.ProtectedData/pkg/System.Security.Cryptography.ProtectedData.pkgproj b/src/libraries/System.Security.Cryptography.ProtectedData/pkg/System.Security.Cryptography.ProtectedData.pkgproj
index 7068e9d0d74..656e52ecd94 100644
--- a/src/libraries/System.Security.Cryptography.ProtectedData/pkg/System.Security.Cryptography.ProtectedData.pkgproj
+++ b/src/libraries/System.Security.Cryptography.ProtectedData/pkg/System.Security.Cryptography.ProtectedData.pkgproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Security.Cryptography.ProtectedData.csproj">
       <SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
@@ -12,5 +12,5 @@
   <ItemGroup>
     <InboxOnTargetFramework Include="$(AllXamarinFrameworks)" />
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.X509Certificates/Directory.Build.props b/src/libraries/System.Security.Cryptography.X509Certificates/Directory.Build.props
new file mode 100644
index 00000000000..c493677ae13
--- /dev/null
+++ b/src/libraries/System.Security.Cryptography.X509Certificates/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.2.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.X509Certificates/dir.props b/src/libraries/System.Security.Cryptography.X509Certificates/dir.props
deleted file mode 100644
index b89fb6fc11e..00000000000
--- a/src/libraries/System.Security.Cryptography.X509Certificates/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.2.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.Xml/dir.props b/src/libraries/System.Security.Cryptography.Xml/Directory.Build.props
similarity index 82%
rename from src/libraries/System.Security.Cryptography.Xml/dir.props
rename to src/libraries/System.Security.Cryptography.Xml/Directory.Build.props
index f6666544659..c4358a81dca 100644
--- a/src/libraries/System.Security.Cryptography.Xml/dir.props
+++ b/src/libraries/System.Security.Cryptography.Xml/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.2.0</AssemblyVersion>
     <AssemblyKey>Open</AssemblyKey>
diff --git a/src/libraries/System.Security.Cryptography.Xml/pkg/System.Security.Cryptography.Xml.pkgproj b/src/libraries/System.Security.Cryptography.Xml/pkg/System.Security.Cryptography.Xml.pkgproj
index 91094c51221..84542341167 100644
--- a/src/libraries/System.Security.Cryptography.Xml/pkg/System.Security.Cryptography.Xml.pkgproj
+++ b/src/libraries/System.Security.Cryptography.Xml/pkg/System.Security.Cryptography.Xml.pkgproj
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Security.Cryptography.Xml.csproj">
       <SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Security.Cryptography.Xml.csproj" />
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Configuration.ConfigurationManager/dir.props b/src/libraries/System.Security.Permissions/Directory.Build.props
similarity index 82%
rename from src/libraries/System.Configuration.ConfigurationManager/dir.props
rename to src/libraries/System.Security.Permissions/Directory.Build.props
index f6666544659..c4358a81dca 100644
--- a/src/libraries/System.Configuration.ConfigurationManager/dir.props
+++ b/src/libraries/System.Security.Permissions/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.2.0</AssemblyVersion>
     <AssemblyKey>Open</AssemblyKey>
diff --git a/src/libraries/System.Security.Permissions/pkg/System.Security.Permissions.pkgproj b/src/libraries/System.Security.Permissions/pkg/System.Security.Permissions.pkgproj
index 1b214007160..bb1ff256acb 100644
--- a/src/libraries/System.Security.Permissions/pkg/System.Security.Permissions.pkgproj
+++ b/src/libraries/System.Security.Permissions/pkg/System.Security.Permissions.pkgproj
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Security.Permissions.csproj">
       <SupportedFramework>netcoreapp2.0;net461;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Security.Permissions.csproj" />
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Security.Principal.Windows/dir.props b/src/libraries/System.Security.Principal.Windows/Directory.Build.props
similarity index 86%
rename from src/libraries/System.Security.Principal.Windows/dir.props
rename to src/libraries/System.Security.Principal.Windows/Directory.Build.props
index 573a8f42882..f06489972fe 100644
--- a/src/libraries/System.Security.Principal.Windows/dir.props
+++ b/src/libraries/System.Security.Principal.Windows/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.1.2.0</AssemblyVersion>
     <AssemblyKey>MSFT</AssemblyKey>
diff --git a/src/libraries/System.Security.Principal.Windows/pkg/System.Security.Principal.Windows.pkgproj b/src/libraries/System.Security.Principal.Windows/pkg/System.Security.Principal.Windows.pkgproj
index ff0f4989d9f..8ab1ae1cd2c 100644
--- a/src/libraries/System.Security.Principal.Windows/pkg/System.Security.Principal.Windows.pkgproj
+++ b/src/libraries/System.Security.Principal.Windows/pkg/System.Security.Principal.Windows.pkgproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Security.Principal.Windows.csproj">
       <SupportedFramework>net461</SupportedFramework>
@@ -16,5 +16,5 @@
          therefore it cannot reference NETStandard.Library -->
     <SuppressMetaPackage Include="NETStandard.Library" />
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Security.Principal/Directory.Build.props b/src/libraries/System.Security.Principal/Directory.Build.props
new file mode 100644
index 00000000000..2ac6942ba72
--- /dev/null
+++ b/src/libraries/System.Security.Principal/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.1.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Security.Principal/dir.props b/src/libraries/System.Security.Principal/dir.props
deleted file mode 100644
index e0633597727..00000000000
--- a/src/libraries/System.Security.Principal/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Security.SecureString/Directory.Build.props b/src/libraries/System.Security.SecureString/Directory.Build.props
new file mode 100644
index 00000000000..2ac6942ba72
--- /dev/null
+++ b/src/libraries/System.Security.SecureString/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.1.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Security.SecureString/dir.props b/src/libraries/System.Security.SecureString/dir.props
deleted file mode 100644
index e0633597727..00000000000
--- a/src/libraries/System.Security.SecureString/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.ServiceModel.Syndication/Directory.Build.props b/src/libraries/System.ServiceModel.Syndication/Directory.Build.props
new file mode 100644
index 00000000000..5d39fb280b3
--- /dev/null
+++ b/src/libraries/System.ServiceModel.Syndication/Directory.Build.props
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.0.1.0</AssemblyVersion>
+    <AssemblyKey>Open</AssemblyKey>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.ServiceModel.Syndication/dir.props b/src/libraries/System.ServiceModel.Syndication/dir.props
deleted file mode 100644
index af5b2933851..00000000000
--- a/src/libraries/System.ServiceModel.Syndication/dir.props
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.0.1.0</AssemblyVersion>
-    <AssemblyKey>Open</AssemblyKey>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.ServiceModel.Syndication/pkg/System.ServiceModel.Syndication.pkgproj b/src/libraries/System.ServiceModel.Syndication/pkg/System.ServiceModel.Syndication.pkgproj
index f3b98926740..9ae5280b4e0 100644
--- a/src/libraries/System.ServiceModel.Syndication/pkg/System.ServiceModel.Syndication.pkgproj
+++ b/src/libraries/System.ServiceModel.Syndication/pkg/System.ServiceModel.Syndication.pkgproj
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.ServiceModel.Syndication.csproj">
       <SupportedFramework>uap10.0.16299;net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.ServiceModel.Syndication.csproj" />
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.ServiceProcess.ServiceController/dir.props b/src/libraries/System.ServiceProcess.ServiceController/Directory.Build.props
similarity index 82%
rename from src/libraries/System.ServiceProcess.ServiceController/dir.props
rename to src/libraries/System.ServiceProcess.ServiceController/Directory.Build.props
index ae40a9e96fb..8308a251978 100644
--- a/src/libraries/System.ServiceProcess.ServiceController/dir.props
+++ b/src/libraries/System.ServiceProcess.ServiceController/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.2.2.0</AssemblyVersion>
     <AssemblyKey>MSFT</AssemblyKey>
diff --git a/src/libraries/System.ServiceProcess.ServiceController/pkg/System.ServiceProcess.ServiceController.pkgproj b/src/libraries/System.ServiceProcess.ServiceController/pkg/System.ServiceProcess.ServiceController.pkgproj
index 7887c3add78..08cbc4a8627 100644
--- a/src/libraries/System.ServiceProcess.ServiceController/pkg/System.ServiceProcess.ServiceController.pkgproj
+++ b/src/libraries/System.ServiceProcess.ServiceController/pkg/System.ServiceProcess.ServiceController.pkgproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.ServiceProcess.ServiceController.csproj">
       <SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
@@ -11,5 +11,5 @@
     </HarvestIncludePaths>
     <HarvestIncludePaths Include="runtimes/win/lib/netstandard1.5;lib/netstandard1.4" />
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Text.Encoding.CodePages/dir.props b/src/libraries/System.Text.Encoding.CodePages/Directory.Build.props
similarity index 83%
rename from src/libraries/System.Text.Encoding.CodePages/dir.props
rename to src/libraries/System.Text.Encoding.CodePages/Directory.Build.props
index 7b967ffb3da..7496d394405 100644
--- a/src/libraries/System.Text.Encoding.CodePages/dir.props
+++ b/src/libraries/System.Text.Encoding.CodePages/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.1.2.0</AssemblyVersion>
     <AssemblyKey>MSFT</AssemblyKey>
diff --git a/src/libraries/System.Text.Encoding.CodePages/pkg/System.Text.Encoding.CodePages.pkgproj b/src/libraries/System.Text.Encoding.CodePages/pkg/System.Text.Encoding.CodePages.pkgproj
index a798cf4fe16..f16c19c1486 100644
--- a/src/libraries/System.Text.Encoding.CodePages/pkg/System.Text.Encoding.CodePages.pkgproj
+++ b/src/libraries/System.Text.Encoding.CodePages/pkg/System.Text.Encoding.CodePages.pkgproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Text.Encoding.CodePages.csproj">
       <SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
@@ -26,5 +26,5 @@
       <Value>.NETCoreApp;UAP</Value>
     </ValidatePackageSuppression>
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Text.Encoding.Extensions/Directory.Build.props b/src/libraries/System.Text.Encoding.Extensions/Directory.Build.props
new file mode 100644
index 00000000000..2ac6942ba72
--- /dev/null
+++ b/src/libraries/System.Text.Encoding.Extensions/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.1.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Text.Encoding.Extensions/dir.props b/src/libraries/System.Text.Encoding.Extensions/dir.props
deleted file mode 100644
index e0633597727..00000000000
--- a/src/libraries/System.Text.Encoding.Extensions/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Text.Encoding/Directory.Build.props b/src/libraries/System.Text.Encoding/Directory.Build.props
new file mode 100644
index 00000000000..2ac6942ba72
--- /dev/null
+++ b/src/libraries/System.Text.Encoding/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.1.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Text.Encoding/dir.props b/src/libraries/System.Text.Encoding/dir.props
deleted file mode 100644
index e0633597727..00000000000
--- a/src/libraries/System.Text.Encoding/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Text.Encodings.Web/dir.props b/src/libraries/System.Text.Encodings.Web/Directory.Build.props
similarity index 82%
rename from src/libraries/System.Text.Encodings.Web/dir.props
rename to src/libraries/System.Text.Encodings.Web/Directory.Build.props
index 377a983db9e..1979bc4c533 100644
--- a/src/libraries/System.Text.Encodings.Web/dir.props
+++ b/src/libraries/System.Text.Encodings.Web/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.4.0</AssemblyVersion>
     <AssemblyKey>Open</AssemblyKey>
diff --git a/src/libraries/System.Text.Encodings.Web/pkg/System.Text.Encodings.Web.pkgproj b/src/libraries/System.Text.Encodings.Web/pkg/System.Text.Encodings.Web.pkgproj
index b8f908357c3..b5634e53762 100644
--- a/src/libraries/System.Text.Encodings.Web/pkg/System.Text.Encodings.Web.pkgproj
+++ b/src/libraries/System.Text.Encodings.Web/pkg/System.Text.Encodings.Web.pkgproj
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\src\System.Text.Encodings.Web.csproj">
       <SupportedFramework>net45;netcore45;wp8;wpa81;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Text.RegularExpressions/Directory.Build.props b/src/libraries/System.Text.RegularExpressions/Directory.Build.props
new file mode 100644
index 00000000000..c493677ae13
--- /dev/null
+++ b/src/libraries/System.Text.RegularExpressions/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.2.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Text.RegularExpressions/dir.props b/src/libraries/System.Text.RegularExpressions/dir.props
deleted file mode 100644
index b89fb6fc11e..00000000000
--- a/src/libraries/System.Text.RegularExpressions/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.2.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Threading.AccessControl/Directory.Build.props b/src/libraries/System.Threading.AccessControl/Directory.Build.props
new file mode 100644
index 00000000000..0eee85e4403
--- /dev/null
+++ b/src/libraries/System.Threading.AccessControl/Directory.Build.props
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.0.4.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Threading.AccessControl/dir.props b/src/libraries/System.Threading.AccessControl/dir.props
deleted file mode 100644
index 0d81e0a9e88..00000000000
--- a/src/libraries/System.Threading.AccessControl/dir.props
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.0.4.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Threading.AccessControl/pkg/System.Threading.AccessControl.pkgproj b/src/libraries/System.Threading.AccessControl/pkg/System.Threading.AccessControl.pkgproj
index 5c15d6245e6..1ec50d77055 100644
--- a/src/libraries/System.Threading.AccessControl/pkg/System.Threading.AccessControl.pkgproj
+++ b/src/libraries/System.Threading.AccessControl/pkg/System.Threading.AccessControl.pkgproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Threading.AccessControl.csproj">
       <SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
@@ -12,5 +12,5 @@
     </HarvestIncludePaths>
     <HarvestIncludePaths Include="runtimes/win/lib/netstandard1.3;lib/netstandard1.3" />
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Threading.Channels/Directory.Build.props b/src/libraries/System.Threading.Channels/Directory.Build.props
new file mode 100644
index 00000000000..5d39fb280b3
--- /dev/null
+++ b/src/libraries/System.Threading.Channels/Directory.Build.props
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.0.1.0</AssemblyVersion>
+    <AssemblyKey>Open</AssemblyKey>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Threading.Channels/dir.props b/src/libraries/System.Threading.Channels/dir.props
deleted file mode 100644
index af5b2933851..00000000000
--- a/src/libraries/System.Threading.Channels/dir.props
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.0.1.0</AssemblyVersion>
-    <AssemblyKey>Open</AssemblyKey>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Threading.Channels/pkg/System.Threading.Channels.pkgproj b/src/libraries/System.Threading.Channels/pkg/System.Threading.Channels.pkgproj
index 0ee61eec685..88314191da9 100644
--- a/src/libraries/System.Threading.Channels/pkg/System.Threading.Channels.pkgproj
+++ b/src/libraries/System.Threading.Channels/pkg/System.Threading.Channels.pkgproj
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\src\System.Threading.Channels.csproj">
       <SupportedFramework>net46;netcore50;netcoreapp1.0;$(UAPvNextTFM);$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
diff --git a/src/libraries/System.Threading.Overlapped/Directory.Build.props b/src/libraries/System.Threading.Overlapped/Directory.Build.props
new file mode 100644
index 00000000000..2ac6942ba72
--- /dev/null
+++ b/src/libraries/System.Threading.Overlapped/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.1.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Threading.Overlapped/dir.props b/src/libraries/System.Threading.Overlapped/dir.props
deleted file mode 100644
index e0633597727..00000000000
--- a/src/libraries/System.Threading.Overlapped/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Threading.Tasks.Dataflow/dir.props b/src/libraries/System.Threading.Tasks.Dataflow/Directory.Build.props
similarity index 86%
rename from src/libraries/System.Threading.Tasks.Dataflow/dir.props
rename to src/libraries/System.Threading.Tasks.Dataflow/Directory.Build.props
index 14bfc29ac76..c47b4435a29 100644
--- a/src/libraries/System.Threading.Tasks.Dataflow/dir.props
+++ b/src/libraries/System.Threading.Tasks.Dataflow/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <PackageVersion>4.10.0</PackageVersion>
     <AssemblyVersion>4.6.4.0</AssemblyVersion>
diff --git a/src/libraries/System.Threading.Tasks.Dataflow/pkg/System.Threading.Tasks.Dataflow.pkgproj b/src/libraries/System.Threading.Tasks.Dataflow/pkg/System.Threading.Tasks.Dataflow.pkgproj
index cd56866eecf..cdf94104906 100644
--- a/src/libraries/System.Threading.Tasks.Dataflow/pkg/System.Threading.Tasks.Dataflow.pkgproj
+++ b/src/libraries/System.Threading.Tasks.Dataflow/pkg/System.Threading.Tasks.Dataflow.pkgproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\src\System.Threading.Tasks.Dataflow.csproj">
       <SupportedFramework>net45;netcore45;wp8;wpa81;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
@@ -15,5 +15,5 @@
       <Value>.NETCoreApp;UAP</Value>
     </ValidatePackageSuppression>
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Threading.Tasks.Extensions/dir.props b/src/libraries/System.Threading.Tasks.Extensions/Directory.Build.props
similarity index 91%
rename from src/libraries/System.Threading.Tasks.Extensions/dir.props
rename to src/libraries/System.Threading.Tasks.Extensions/Directory.Build.props
index 4d526103b03..9b7a91f5413 100644
--- a/src/libraries/System.Threading.Tasks.Extensions/dir.props
+++ b/src/libraries/System.Threading.Tasks.Extensions/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.2.1.0</AssemblyVersion>
     <!-- System.Threading.Tasks.Extensions has forwarded types into the runtime on netcoreapp/uap
diff --git a/src/libraries/System.Threading.Tasks.Extensions/pkg/System.Threading.Tasks.Extensions.pkgproj b/src/libraries/System.Threading.Tasks.Extensions/pkg/System.Threading.Tasks.Extensions.pkgproj
index 7d2c88c4c4b..6a85ba0f2c4 100644
--- a/src/libraries/System.Threading.Tasks.Extensions/pkg/System.Threading.Tasks.Extensions.pkgproj
+++ b/src/libraries/System.Threading.Tasks.Extensions/pkg/System.Threading.Tasks.Extensions.pkgproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <PropertyGroup>
     <!-- we need to be supported on pre-nuget-3 platforms (Dev12, Dev11, etc) -->
     <MinClientVersion>2.8.6</MinClientVersion>
@@ -19,10 +19,10 @@
          therefore it cannot reference NETStandard.Library -->
     <SuppressMetaPackage Include="NETStandard.Library" />
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
   <ItemGroup>
     <!--
-      All frameworks except net45 support the frozen 4.2.0.0 api version. Need to include this after dir.targets to
+      All frameworks except net45 support the frozen 4.2.0.0 api version. Need to include this after Directory.Build.targets to
       have DefaultValidateionFramework defined. Normally this wouldn't be necessary but the harvested supported
       frameworks all complain if we don't lift the version of the assembly they support. This won't be any issue
       once the 4.5.0 package is stable and we can harvest it.
diff --git a/src/libraries/System.Threading.Tasks.Parallel/Directory.Build.props b/src/libraries/System.Threading.Tasks.Parallel/Directory.Build.props
new file mode 100644
index 00000000000..c4419f3e6ab
--- /dev/null
+++ b/src/libraries/System.Threading.Tasks.Parallel/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.0.3.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
diff --git a/src/libraries/System.Threading.Tasks.Parallel/dir.props b/src/libraries/System.Threading.Tasks.Parallel/dir.props
deleted file mode 100644
index ad2f0ed1395..00000000000
--- a/src/libraries/System.Threading.Tasks.Parallel/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.0.3.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
diff --git a/src/libraries/System.Threading.Tasks/Directory.Build.props b/src/libraries/System.Threading.Tasks/Directory.Build.props
new file mode 100644
index 00000000000..2ac6942ba72
--- /dev/null
+++ b/src/libraries/System.Threading.Tasks/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.1.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Threading.Tasks/dir.props b/src/libraries/System.Threading.Tasks/dir.props
deleted file mode 100644
index e0633597727..00000000000
--- a/src/libraries/System.Threading.Tasks/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Threading.Thread/Directory.Build.props b/src/libraries/System.Threading.Thread/Directory.Build.props
new file mode 100644
index 00000000000..2ac6942ba72
--- /dev/null
+++ b/src/libraries/System.Threading.Thread/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.1.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Threading.Thread/dir.props b/src/libraries/System.Threading.Thread/dir.props
deleted file mode 100644
index e0633597727..00000000000
--- a/src/libraries/System.Threading.Thread/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Threading.ThreadPool/Directory.Build.props b/src/libraries/System.Threading.ThreadPool/Directory.Build.props
new file mode 100644
index 00000000000..2ac6942ba72
--- /dev/null
+++ b/src/libraries/System.Threading.ThreadPool/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.1.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Threading.ThreadPool/dir.props b/src/libraries/System.Threading.ThreadPool/dir.props
deleted file mode 100644
index e0633597727..00000000000
--- a/src/libraries/System.Threading.ThreadPool/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Threading.Timer/Directory.Build.props b/src/libraries/System.Threading.Timer/Directory.Build.props
new file mode 100644
index 00000000000..2ac6942ba72
--- /dev/null
+++ b/src/libraries/System.Threading.Timer/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.1.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Threading.Timer/dir.props b/src/libraries/System.Threading.Timer/dir.props
deleted file mode 100644
index e0633597727..00000000000
--- a/src/libraries/System.Threading.Timer/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Threading/Directory.Build.props b/src/libraries/System.Threading/Directory.Build.props
new file mode 100644
index 00000000000..2ac6942ba72
--- /dev/null
+++ b/src/libraries/System.Threading/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.1.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Threading/dir.props b/src/libraries/System.Threading/dir.props
deleted file mode 100644
index e0633597727..00000000000
--- a/src/libraries/System.Threading/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Transactions.Local/Directory.Build.props b/src/libraries/System.Transactions.Local/Directory.Build.props
new file mode 100644
index 00000000000..cd7809b6851
--- /dev/null
+++ b/src/libraries/System.Transactions.Local/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.0.1.0</AssemblyVersion>
+    <AssemblyKey>Open</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Transactions.Local/dir.props b/src/libraries/System.Transactions.Local/dir.props
deleted file mode 100644
index 87260a19999..00000000000
--- a/src/libraries/System.Transactions.Local/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.0.1.0</AssemblyVersion>
-    <AssemblyKey>Open</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.ValueTuple/dir.props b/src/libraries/System.ValueTuple/Directory.Build.props
similarity index 85%
rename from src/libraries/System.ValueTuple/dir.props
rename to src/libraries/System.ValueTuple/Directory.Build.props
index 0b0f84c8bb7..8b5b4bc235c 100644
--- a/src/libraries/System.ValueTuple/dir.props
+++ b/src/libraries/System.ValueTuple/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.4.0</AssemblyVersion>
     <AssemblyKey>Open</AssemblyKey>
diff --git a/src/libraries/System.ValueTuple/pkg/System.ValueTuple.pkgproj b/src/libraries/System.ValueTuple/pkg/System.ValueTuple.pkgproj
index 7ffc6ca17fa..34f77dbc93f 100644
--- a/src/libraries/System.ValueTuple/pkg/System.ValueTuple.pkgproj
+++ b/src/libraries/System.ValueTuple/pkg/System.ValueTuple.pkgproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.ValueTuple.csproj">
       <SupportedFramework>net45</SupportedFramework>
@@ -11,5 +11,5 @@
     <InboxOnTargetFramework Include="uap10.0.16299" />
     <InboxOnTargetFramework Include="$(AllXamarinFrameworks)" />
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Web.HttpUtility/Directory.Build.props b/src/libraries/System.Web.HttpUtility/Directory.Build.props
new file mode 100644
index 00000000000..cd7809b6851
--- /dev/null
+++ b/src/libraries/System.Web.HttpUtility/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.0.1.0</AssemblyVersion>
+    <AssemblyKey>Open</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Web.HttpUtility/dir.props b/src/libraries/System.Web.HttpUtility/dir.props
deleted file mode 100644
index 87260a19999..00000000000
--- a/src/libraries/System.Web.HttpUtility/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.0.1.0</AssemblyVersion>
-    <AssemblyKey>Open</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Xml.ReaderWriter/Directory.Build.props b/src/libraries/System.Xml.ReaderWriter/Directory.Build.props
new file mode 100644
index 00000000000..c493677ae13
--- /dev/null
+++ b/src/libraries/System.Xml.ReaderWriter/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.2.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Xml.ReaderWriter/dir.props b/src/libraries/System.Xml.ReaderWriter/dir.props
deleted file mode 100644
index b89fb6fc11e..00000000000
--- a/src/libraries/System.Xml.ReaderWriter/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.2.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Xml.XDocument/Directory.Build.props b/src/libraries/System.Xml.XDocument/Directory.Build.props
new file mode 100644
index 00000000000..2ac6942ba72
--- /dev/null
+++ b/src/libraries/System.Xml.XDocument/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.1.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Xml.XDocument/dir.props b/src/libraries/System.Xml.XDocument/dir.props
deleted file mode 100644
index e0633597727..00000000000
--- a/src/libraries/System.Xml.XDocument/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Xml.XPath.XDocument/Directory.Build.props b/src/libraries/System.Xml.XPath.XDocument/Directory.Build.props
new file mode 100644
index 00000000000..2ac6942ba72
--- /dev/null
+++ b/src/libraries/System.Xml.XPath.XDocument/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.1.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Xml.XPath.XDocument/dir.props b/src/libraries/System.Xml.XPath.XDocument/dir.props
deleted file mode 100644
index e0633597727..00000000000
--- a/src/libraries/System.Xml.XPath.XDocument/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Xml.XPath/Directory.Build.props b/src/libraries/System.Xml.XPath/Directory.Build.props
new file mode 100644
index 00000000000..2ac6942ba72
--- /dev/null
+++ b/src/libraries/System.Xml.XPath/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.1.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Xml.XPath/dir.props b/src/libraries/System.Xml.XPath/dir.props
deleted file mode 100644
index e0633597727..00000000000
--- a/src/libraries/System.Xml.XPath/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Xml.XmlDocument/Directory.Build.props b/src/libraries/System.Xml.XmlDocument/Directory.Build.props
new file mode 100644
index 00000000000..2ac6942ba72
--- /dev/null
+++ b/src/libraries/System.Xml.XmlDocument/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.1.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Xml.XmlDocument/dir.props b/src/libraries/System.Xml.XmlDocument/dir.props
deleted file mode 100644
index e0633597727..00000000000
--- a/src/libraries/System.Xml.XmlDocument/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Xml.XmlSerializer/Directory.Build.props b/src/libraries/System.Xml.XmlSerializer/Directory.Build.props
new file mode 100644
index 00000000000..2ac6942ba72
--- /dev/null
+++ b/src/libraries/System.Xml.XmlSerializer/Directory.Build.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+  <PropertyGroup>
+    <AssemblyVersion>4.1.1.0</AssemblyVersion>
+    <AssemblyKey>MSFT</AssemblyKey>
+    <IsNETCoreApp>true</IsNETCoreApp>
+    <IsUAP>true</IsUAP>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Xml.XmlSerializer/dir.props b/src/libraries/System.Xml.XmlSerializer/dir.props
deleted file mode 100644
index e0633597727..00000000000
--- a/src/libraries/System.Xml.XmlSerializer/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
-    <AssemblyKey>MSFT</AssemblyKey>
-    <IsNETCoreApp>true</IsNETCoreApp>
-    <IsUAP>true</IsUAP>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/libraries/build.proj b/src/libraries/build.proj
index b1a793952c0..250f7f3f21d 100644
--- a/src/libraries/build.proj
+++ b/src/libraries/build.proj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="dir.props" />
+  <Import Project="Directory.Build.props" />
 
   <!-- required to build the projects in their specified order -->
   <PropertyGroup>
@@ -22,7 +22,7 @@
     <Project Include="src\packages.builds" Condition="'$(BuildPackages)'=='true'" />
   </ItemGroup>
 
-  <Import Project="dir.targets" />
+  <Import Project="Directory.Build.targets" />
 
   <Import Project="dir.traversal.targets" />
 
@@ -58,7 +58,7 @@
       <_projectsToExcludeFromUpdate Include="$(MSBuildThisFileDirectory)src/SharedFrameworkValidation/**/*.csproj" />
       <_projectsToUpdate Include="$(MSBuildThisFileDirectory)src/**/*.*csproj" Exclude="@(_projectsToExcludeFromUpdate)" />
       <_projectsToUpdate Include="$(MSBuildThisFileDirectory)src/**/*.*ilproj" Exclude="@(_projectsToExcludeFromUpdate)" />
-      <_solutionsToUpdateFiles Include="$(MSBuildThisFileDirectory)src/*/dir.props" />
+      <_solutionsToUpdateFiles Include="$(MSBuildThisFileDirectory)src/*/Directory.Build.props" />
       <_solutionsToUpdate Include="@(_solutionsToUpdateFiles->'%(RootDir)%(Directory)')" Exclude="@(_solutionsToExcludeFromUpdate)" />
     </ItemGroup>
     <UpdateVSConfigurations ProjectsToUpdate="@(_projectsToUpdate)" SolutionsToUpdate="@(_solutionsToUpdate)" />
diff --git a/src/libraries/dir.props b/src/libraries/dir.props
deleted file mode 100644
index 64eb54685b5..00000000000
--- a/src/libraries/dir.props
+++ /dev/null
@@ -1,3 +0,0 @@
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
-</Project>
diff --git a/src/libraries/dir.targets b/src/libraries/dir.targets
deleted file mode 100644
index 2efc115b47e..00000000000
--- a/src/libraries/dir.targets
+++ /dev/null
@@ -1,22 +0,0 @@
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ErrorIfBuildToolsRestoredFromIndividualProject Condition="!Exists('$(ToolsDir)')">true</ErrorIfBuildToolsRestoredFromIndividualProject>
-  </PropertyGroup>
-
-  <Import Project="..\dir.targets" />
-
-  <!-- Returns the assembly version of the project for consumption
-       by the NuGet package generation -->
-  <Target Name="GetAssemblyVersion"
-          Returns="$(AssemblyVersion)"/>
-
-  <!-- Returns the generated documentation file for consumption
-       by the NuGet package generation -->
-  <Target Name="GetDocumentationFile"
-          Returns="$(DocumentationFile)"/>
-
-  <Target Name="DumpTargets" BeforeTargets="ResolveProjectReferences">
-    <Message Text="DumpTargets> $(OutputPath), C=[$(Configuration)], CG=[$(ConfigurationGroup)], OG=[$(OSGroup)], TG=[$(TargetGroup)]" Importance="Low" />
-  </Target>
-
-</Project>
diff --git a/src/libraries/dirs.proj b/src/libraries/dirs.proj
index e98055b274f..24980c02649 100644
--- a/src/libraries/dirs.proj
+++ b/src/libraries/dirs.proj
@@ -1,5 +1,5 @@
 <Project ToolsVersion="14.0" DefaultTargets="BuildAndTest" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="dir.props" />
+  <Import Project="Directory.Build.props" />
 
   <!-- required to build the projects in their specified order -->
   <PropertyGroup>
@@ -43,7 +43,7 @@
     <Project Include="$(DirectoryToBuild)/**/*.csproj" />
   </ItemGroup>
 
-  <Import Project="..\dir.targets" />
+  <Import Project="..\Directory.Build.targets" />
   <Import Project="..\dir.traversal.targets" />
 
   <Import Project="$(ToolsDir)packages.targets" Condition="Exists('$(ToolsDir)packages.targets') and '$(ImportGetNuGetPackageVersions)' != 'false'" />
diff --git a/src/libraries/external/dir.props b/src/libraries/external/Directory.Build.props
similarity index 89%
rename from src/libraries/external/dir.props
rename to src/libraries/external/Directory.Build.props
index a874fd0e204..674adbbd692 100644
--- a/src/libraries/external/dir.props
+++ b/src/libraries/external/Directory.Build.props
@@ -1,5 +1,5 @@
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <IntermediateOutputPath>$(IntermediateOutputPath)$(OSGroup)-$(ArchGroup)/</IntermediateOutputPath>
     <NugetRuntimeIdentifier>None</NugetRuntimeIdentifier>
diff --git a/src/libraries/external/dir.targets b/src/libraries/external/Directory.Build.targets
similarity index 93%
rename from src/libraries/external/dir.targets
rename to src/libraries/external/Directory.Build.targets
index 83f658c87b9..7c9bff7f39c 100644
--- a/src/libraries/external/dir.targets
+++ b/src/libraries/external/Directory.Build.targets
@@ -1,5 +1,5 @@
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.targets" />
+  <Import Project="..\Directory.Build.targets" />
 
   <PropertyGroup>
     <RestorePackages>true</RestorePackages>
diff --git a/src/libraries/external/ILLink/ILLink.depproj b/src/libraries/external/ILLink/ILLink.depproj
index bf046746463..e26c39c3fc0 100644
--- a/src/libraries/external/ILLink/ILLink.depproj
+++ b/src/libraries/external/ILLink/ILLink.depproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <PropertyGroup>
     <NuGetTargetMoniker>.NETCoreApp,Version=v1.1</NuGetTargetMoniker>
     <NuGetTargetMonikerShort>netcoreapp1.1</NuGetTargetMonikerShort>
@@ -16,7 +16,7 @@
       <Version>$(ILLinkTasksPackageVersion)</Version>
     </PackageReference>
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
   <Target Name="IncludeToolsFiles"
           AfterTargets="ResolveNuGetPackages">
     <ItemGroup>
diff --git a/src/libraries/external/SharedFrameworkValidation/harvestPackages.SharedFramework.depproj b/src/libraries/external/SharedFrameworkValidation/harvestPackages.SharedFramework.depproj
index a1bc6c2d66f..70b470f9544 100644
--- a/src/libraries/external/SharedFrameworkValidation/harvestPackages.SharedFramework.depproj
+++ b/src/libraries/external/SharedFrameworkValidation/harvestPackages.SharedFramework.depproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
 
   <PropertyGroup>
     <_LatestStable>1.1.2</_LatestStable>
@@ -27,5 +27,5 @@
     <Copy SourceFiles="@(_RuntimeAssets)" DestinationFolder="$(BinDir)runtime/SharedFrameworkValidation.LKG" />
   </Target>
 
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/external/dir.proj b/src/libraries/external/dir.proj
index 43b80856fff..b4cac3744df 100644
--- a/src/libraries/external/dir.proj
+++ b/src/libraries/external/dir.proj
@@ -1,5 +1,5 @@
 <Project ToolsVersion="14.0" DefaultTargets="BuildAndTest" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="../dir.props" />
+  <Import Project="../Directory.Build.props" />
 
   <PropertyGroup>
     <AdditionalBuildConfigurations>$(AdditionalBuildConfigurations);netstandard-$(OSGroup)-$(ConfigurationGroup)-$(ArchGroup)</AdditionalBuildConfigurations>
diff --git a/src/libraries/external/docs/docs.depproj b/src/libraries/external/docs/docs.depproj
index 21f41e5384b..f65bf1482e2 100644
--- a/src/libraries/external/docs/docs.depproj
+++ b/src/libraries/external/docs/docs.depproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
 
   <PropertyGroup>
     <OutputPath>$(XmlDocDir)</OutputPath>
@@ -49,5 +49,5 @@
     <Error Condition="'%(DocFile.Culture)' == 'unknown'" Text="Unknown language folder '%(LCID)' for doc files '@(DocFile)'" />
   </Target>
 
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/external/harvestPackages/harvestPackages.depproj b/src/libraries/external/harvestPackages/harvestPackages.depproj
index 7902fc5d6ba..a4731add460 100644
--- a/src/libraries/external/harvestPackages/harvestPackages.depproj
+++ b/src/libraries/external/harvestPackages/harvestPackages.depproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
diff --git a/src/libraries/external/netcoreapp/netcoreapp.depproj b/src/libraries/external/netcoreapp/netcoreapp.depproj
index 1e076c34ae2..499360b7845 100644
--- a/src/libraries/external/netcoreapp/netcoreapp.depproj
+++ b/src/libraries/external/netcoreapp/netcoreapp.depproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <!-- This project restores and publishes the targeting pack for specific versions of .NET Core.
        With this, we are able to compile assemblies against shipped, stable versions of .NET Core. -->
   <PropertyGroup>
@@ -25,5 +25,5 @@
     <FileToExclude Include="System.ComponentModel.Composition" />
   </ItemGroup>
 
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
diff --git a/src/libraries/external/netfx/netfx.depproj b/src/libraries/external/netfx/netfx.depproj
index 4f35754e7b4..e27ff6db875 100644
--- a/src/libraries/external/netfx/netfx.depproj
+++ b/src/libraries/external/netfx/netfx.depproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <Import Project="$(SourceDir)\shims\netfxreference.props" />
   <PropertyGroup>
     <BinPlaceRef>true</BinPlaceRef>
@@ -98,5 +98,5 @@
       <Reference Include="@(_remainingReference);@(_netStandardReference)" />
     </ItemGroup>
   </Target>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
diff --git a/src/libraries/external/netstandard/netstandard.depproj b/src/libraries/external/netstandard/netstandard.depproj
index ca809861093..6fbac98f90c 100644
--- a/src/libraries/external/netstandard/netstandard.depproj
+++ b/src/libraries/external/netstandard/netstandard.depproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <PropertyGroup>
     <NETStandardVersion Condition="$(NuGetTargetMoniker.StartsWith('.NETStandard,Version=v'))">$(NuGetTargetMoniker.SubString(22))</NETStandardVersion>
     <IsNETStandard1x Condition="$(NETStandardVersion.StartsWith('1.'))">true</IsNETStandard1x>
@@ -72,5 +72,5 @@
     </ItemGroup>
   </Target>
 
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
diff --git a/src/libraries/external/portable/portable.depproj b/src/libraries/external/portable/portable.depproj
index 1ac886ed129..33dd6091fa4 100644
--- a/src/libraries/external/portable/portable.depproj
+++ b/src/libraries/external/portable/portable.depproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <PropertyGroup>
     <BinPlaceRef>true</BinPlaceRef>
     <NuGetDeploySourceItem>Reference</NuGetDeploySourceItem>
@@ -16,5 +16,5 @@
       <RefPath>$(RefPath)</RefPath>
     </BinPlaceConfiguration>
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/external/runtime/runtime.depproj b/src/libraries/external/runtime/runtime.depproj
index 39648996314..cfc627fb634 100644
--- a/src/libraries/external/runtime/runtime.depproj
+++ b/src/libraries/external/runtime/runtime.depproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <PropertyGroup>
     <NugetRuntimeIdentifier>$(PackageRID)</NugetRuntimeIdentifier>
     <RidSpecificAssets>true</RidSpecificAssets>
@@ -44,7 +44,7 @@
     </PackageReference>
   </ItemGroup>
 
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 
   <!-- Setup the testing shared framework host -->
   <Target Name="SetupTestingHost" AfterTargets="ResolveNuGetPackages" Condition="'$(BinPlaceTestSharedFramework)' == 'true'">
diff --git a/src/libraries/external/test-runtime/XUnit.Runtime.depproj b/src/libraries/external/test-runtime/XUnit.Runtime.depproj
index 44fecf2dcb7..0b760d124ff 100644
--- a/src/libraries/external/test-runtime/XUnit.Runtime.depproj
+++ b/src/libraries/external/test-runtime/XUnit.Runtime.depproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <PropertyGroup>
     <!-- Given that xunit packages bring with them part of the framework, we need to specify a runtime in order to get the assets
          The only asset that we copy which is RID-specific is sni.dll which is only used in windows, which is why we default to Windows as the RID -->
@@ -152,7 +152,7 @@
     <PackageToInclude Include="CommandLineParser" />
   </ItemGroup>
 
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 
   <!-- Retrieve the UAP Tools to the TestHost folder -->
   <Target Name="CopyUAPToolsToTestHost"
diff --git a/src/libraries/external/uap/uap.depproj b/src/libraries/external/uap/uap.depproj
index 5c75f2374f7..0cd5d7c24d6 100644
--- a/src/libraries/external/uap/uap.depproj
+++ b/src/libraries/external/uap/uap.depproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <!-- This project restores and publishes the targeting pack for specific versions of UAP.
        With this, we are able to compile assemblies against shipped, stable versions of UAP. -->
   <PropertyGroup>
@@ -35,5 +35,5 @@
     </BinPlaceConfiguration>
   </ItemGroup>
 
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/external/winrt/winrt.depproj b/src/libraries/external/winrt/winrt.depproj
index 95a9ed5c4ff..619f50965bf 100644
--- a/src/libraries/external/winrt/winrt.depproj
+++ b/src/libraries/external/winrt/winrt.depproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyName>Windows</AssemblyName>
     <TargetExt>.winmd</TargetExt>
@@ -12,5 +12,5 @@
       <Version>1.0.5</Version>
     </PackageReference>
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/packages.builds b/src/libraries/packages.builds
index 41d3c937b70..f08ae345843 100644
--- a/src/libraries/packages.builds
+++ b/src/libraries/packages.builds
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="BuildAndTest" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
 
   <PropertyGroup>
     <PackageReportDir Condition="'$(PackageReportDir)' == ''">$(BinDir)pkg/reports/</PackageReportDir>
diff --git a/src/libraries/pkg/dir.props b/src/libraries/pkg/Directory.Build.props
similarity index 98%
rename from src/libraries/pkg/dir.props
rename to src/libraries/pkg/Directory.Build.props
index 81edaa295dc..19e61cb1b23 100644
--- a/src/libraries/pkg/dir.props
+++ b/src/libraries/pkg/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
 
   <PropertyGroup>
     <!-- Used to determine if we should build some packages only once across multiple official build legs.
diff --git a/src/libraries/pkg/dir.targets b/src/libraries/pkg/Directory.Build.targets
similarity index 96%
rename from src/libraries/pkg/dir.targets
rename to src/libraries/pkg/Directory.Build.targets
index 7c12c49feac..8cad2d6bd19 100644
--- a/src/libraries/pkg/dir.targets
+++ b/src/libraries/pkg/Directory.Build.targets
@@ -3,7 +3,7 @@
 
   <Import Condition="'$(IsFrameworkPackage)' == 'true'" Project="frameworkPackage.targets" />
 
-  <Import Project="..\dir.targets" />
+  <Import Project="..\Directory.Build.targets" />
 
   <Target Name="ApplyBaselineToStaticDependencies" 
           BeforeTargets="AssignPkgProjPackageDependenciesTargetFramework"
diff --git a/src/libraries/pkg/Microsoft.NETCore.Platforms/Microsoft.NETCore.Platforms.builds b/src/libraries/pkg/Microsoft.NETCore.Platforms/Microsoft.NETCore.Platforms.builds
index 431f35e358a..5c48de18a19 100644
--- a/src/libraries/pkg/Microsoft.NETCore.Platforms/Microsoft.NETCore.Platforms.builds
+++ b/src/libraries/pkg/Microsoft.NETCore.Platforms/Microsoft.NETCore.Platforms.builds
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup Condition="'$(BuildingAnOfficialBuildLeg)' != 'true' Or '$(BuildAllConfigurations)' == 'true'">
     <Project Include="Microsoft.NETCore.Platforms.pkgproj" />
   </ItemGroup>
diff --git a/src/libraries/pkg/Microsoft.NETCore.Platforms/Microsoft.NETCore.Platforms.pkgproj b/src/libraries/pkg/Microsoft.NETCore.Platforms/Microsoft.NETCore.Platforms.pkgproj
index 242f99415dd..40d94df427b 100644
--- a/src/libraries/pkg/Microsoft.NETCore.Platforms/Microsoft.NETCore.Platforms.pkgproj
+++ b/src/libraries/pkg/Microsoft.NETCore.Platforms/Microsoft.NETCore.Platforms.pkgproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <PropertyGroup>
     <PackageVersion>2.2.0</PackageVersion>
     <SkipValidatePackage>true</SkipValidatePackage>
@@ -15,5 +15,5 @@
     </File>
   </ItemGroup>
   <Import Project="runtimeGroups.props" />
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
+</Project>
diff --git a/src/libraries/pkg/Microsoft.NETCore.Targets/Microsoft.NETCore.Targets.builds b/src/libraries/pkg/Microsoft.NETCore.Targets/Microsoft.NETCore.Targets.builds
index 0c02cbd297f..4108d430179 100644
--- a/src/libraries/pkg/Microsoft.NETCore.Targets/Microsoft.NETCore.Targets.builds
+++ b/src/libraries/pkg/Microsoft.NETCore.Targets/Microsoft.NETCore.Targets.builds
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup Condition="'$(BuildingAnOfficialBuildLeg)' != 'true' Or '$(BuildAllConfigurations)' == 'true'">
     <Project Include="Microsoft.NETCore.Targets.pkgproj"/>
   </ItemGroup>
diff --git a/src/libraries/pkg/Microsoft.NETCore.Targets/Microsoft.NETCore.Targets.pkgproj b/src/libraries/pkg/Microsoft.NETCore.Targets/Microsoft.NETCore.Targets.pkgproj
index 781dc4a7db3..69f54a6d6e5 100644
--- a/src/libraries/pkg/Microsoft.NETCore.Targets/Microsoft.NETCore.Targets.pkgproj
+++ b/src/libraries/pkg/Microsoft.NETCore.Targets/Microsoft.NETCore.Targets.pkgproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <PropertyGroup>
     <PackageVersion>2.2.0</PackageVersion>
     <SkipValidatePackage>true</SkipValidatePackage>
@@ -14,5 +14,5 @@
     </File>
     <File Include="runtime.json" />
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
+</Project>
diff --git a/src/libraries/pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.builds b/src/libraries/pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.builds
index 812457681a1..c0daa564968 100644
--- a/src/libraries/pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.builds
+++ b/src/libraries/pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.builds
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
 
   <ItemGroup>
     <!-- identity project, runtime specific projects are included through netcoreapp.rids.props -->
diff --git a/src/libraries/pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.pkgproj b/src/libraries/pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.pkgproj
index bfe81d87c98..ed8cd7119eb 100644
--- a/src/libraries/pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.pkgproj
+++ b/src/libraries/pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.pkgproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
 
   <PropertyGroup>
     <TargetFrameworkName>netcoreapp</TargetFrameworkName>
@@ -58,5 +58,5 @@
     </ValidatePackageSuppression>
   </ItemGroup>
 
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
diff --git a/src/libraries/pkg/Microsoft.Private.CoreFx.UAP/Microsoft.Private.CoreFx.UAP.builds b/src/libraries/pkg/Microsoft.Private.CoreFx.UAP/Microsoft.Private.CoreFx.UAP.builds
index 4f29ab1ba39..267975a78d2 100644
--- a/src/libraries/pkg/Microsoft.Private.CoreFx.UAP/Microsoft.Private.CoreFx.UAP.builds
+++ b/src/libraries/pkg/Microsoft.Private.CoreFx.UAP/Microsoft.Private.CoreFx.UAP.builds
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
 
   <ItemGroup>
     <!-- Identity project, runtime specific projects are included uap.rids.props. 
diff --git a/src/libraries/pkg/Microsoft.Private.CoreFx.UAP/Microsoft.Private.CoreFx.UAP.pkgproj b/src/libraries/pkg/Microsoft.Private.CoreFx.UAP/Microsoft.Private.CoreFx.UAP.pkgproj
index e6674252e28..a71089d3212 100644
--- a/src/libraries/pkg/Microsoft.Private.CoreFx.UAP/Microsoft.Private.CoreFx.UAP.pkgproj
+++ b/src/libraries/pkg/Microsoft.Private.CoreFx.UAP/Microsoft.Private.CoreFx.UAP.pkgproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <PropertyGroup>
     <PackageVersion>4.7.0</PackageVersion>
     <TargetFrameworkName>uap</TargetFrameworkName>
@@ -66,5 +66,5 @@
         </Value>
     </ValidatePackageSuppression>
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/pkg/Microsoft.Private.PackageBaseline/Microsoft.Private.PackageBaseline.builds b/src/libraries/pkg/Microsoft.Private.PackageBaseline/Microsoft.Private.PackageBaseline.builds
index 20c86231a3b..a52bfc8e36d 100644
--- a/src/libraries/pkg/Microsoft.Private.PackageBaseline/Microsoft.Private.PackageBaseline.builds
+++ b/src/libraries/pkg/Microsoft.Private.PackageBaseline/Microsoft.Private.PackageBaseline.builds
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <Project Include="Microsoft.Private.PackageBaseline.pkgproj"/>
   </ItemGroup>
diff --git a/src/libraries/pkg/Microsoft.Private.PackageBaseline/Microsoft.Private.PackageBaseline.pkgproj b/src/libraries/pkg/Microsoft.Private.PackageBaseline/Microsoft.Private.PackageBaseline.pkgproj
index 440fb15e3ec..07e5707e690 100644
--- a/src/libraries/pkg/Microsoft.Private.PackageBaseline/Microsoft.Private.PackageBaseline.pkgproj
+++ b/src/libraries/pkg/Microsoft.Private.PackageBaseline/Microsoft.Private.PackageBaseline.pkgproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <PropertyGroup>
     <HarvestStablePackage>false</HarvestStablePackage>
     <SkipPackageFileCheck>true</SkipPackageFileCheck>
@@ -43,5 +43,5 @@
                         Packages="@(AllPackages)"
                         InboxFrameworkLayoutFolders="@(FrameworkLayout)" />
   </Target>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/pkg/Microsoft.Windows.Compatibility.Shims/Microsoft.Windows.Compatibility.Shims.builds b/src/libraries/pkg/Microsoft.Windows.Compatibility.Shims/Microsoft.Windows.Compatibility.Shims.builds
index b74a5259bbf..ad70bbf5f86 100644
--- a/src/libraries/pkg/Microsoft.Windows.Compatibility.Shims/Microsoft.Windows.Compatibility.Shims.builds
+++ b/src/libraries/pkg/Microsoft.Windows.Compatibility.Shims/Microsoft.Windows.Compatibility.Shims.builds
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
 
   <!-- only build during the AllConfigurations leg because it depends on other nupkgs from this leg -->
   <ItemGroup Condition="'$(BuildAllConfigurations)' == 'true'">
diff --git a/src/libraries/pkg/Microsoft.Windows.Compatibility.Shims/Microsoft.Windows.Compatibility.Shims.pkgproj b/src/libraries/pkg/Microsoft.Windows.Compatibility.Shims/Microsoft.Windows.Compatibility.Shims.pkgproj
index 10051266356..6149d787583 100644
--- a/src/libraries/pkg/Microsoft.Windows.Compatibility.Shims/Microsoft.Windows.Compatibility.Shims.pkgproj
+++ b/src/libraries/pkg/Microsoft.Windows.Compatibility.Shims/Microsoft.Windows.Compatibility.Shims.pkgproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
 
   <PropertyGroup>
     <PackageVersion>$(CompatibilityShimsPackageVersion)</PackageVersion>
@@ -41,5 +41,5 @@
     <Message Importance="Low" Text="Added: %(ShimsToInclude.Identity) to package." />
   </Target>
 
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
diff --git a/src/libraries/pkg/Microsoft.Windows.Compatibility/Microsoft.Windows.Compatibility.builds b/src/libraries/pkg/Microsoft.Windows.Compatibility/Microsoft.Windows.Compatibility.builds
index b74a5259bbf..ad70bbf5f86 100644
--- a/src/libraries/pkg/Microsoft.Windows.Compatibility/Microsoft.Windows.Compatibility.builds
+++ b/src/libraries/pkg/Microsoft.Windows.Compatibility/Microsoft.Windows.Compatibility.builds
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
 
   <!-- only build during the AllConfigurations leg because it depends on other nupkgs from this leg -->
   <ItemGroup Condition="'$(BuildAllConfigurations)' == 'true'">
diff --git a/src/libraries/pkg/Microsoft.Windows.Compatibility/Microsoft.Windows.Compatibility.pkgproj b/src/libraries/pkg/Microsoft.Windows.Compatibility/Microsoft.Windows.Compatibility.pkgproj
index 81805cec9b6..5eee2bc15f0 100644
--- a/src/libraries/pkg/Microsoft.Windows.Compatibility/Microsoft.Windows.Compatibility.pkgproj
+++ b/src/libraries/pkg/Microsoft.Windows.Compatibility/Microsoft.Windows.Compatibility.pkgproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <PropertyGroup>
       <!-- We use the PackageVersion property defined in Packaging.props for the Prerelease packages which are using it to be built -->
     <_PreReleasePackageVersion>$(PackageVersion)</_PreReleasePackageVersion>
@@ -73,5 +73,5 @@
       <Version>$(CompatibilityShimsPackageVersion)</Version>
     </Dependency>
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/libraries/pkg/test/testPackages.proj b/src/libraries/pkg/test/testPackages.proj
index dc29aac152a..5e25f650e2a 100644
--- a/src/libraries/pkg/test/testPackages.proj
+++ b/src/libraries/pkg/test/testPackages.proj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
 
   <ItemGroup>
     <TestPackages Condition="'$(TestPackages)' != ''" Include="$(TestPackages)" />
@@ -179,5 +179,5 @@
 
   <Target Name="Build" DependsOnTargets="BuildProjects" />
 
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
diff --git a/src/libraries/post.builds b/src/libraries/post.builds
index 5957046baf9..5feec77d28f 100644
--- a/src/libraries/post.builds
+++ b/src/libraries/post.builds
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-  <Import Project="dir.props" />
-  <Import Project="..\dir.targets" />
+  <Import Project="Directory.Build.props" />
+  <Import Project="..\Directory.Build.targets" />
 
   <!-- provides a hook for executing targets after the product and tests have been built -->
   <Target Name="Build" />
diff --git a/src/libraries/publish.proj b/src/libraries/publish.proj
index 32be546c29c..60c946849e9 100644
--- a/src/libraries/publish.proj
+++ b/src/libraries/publish.proj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
-  <Import Project="..\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
+  <Import Project="..\Directory.Build.targets" />
   <Import Project="$(ToolsDir)PublishContent.targets" />
   <Import Project="$(PackagesDir)/$(FeedTasksPackage.ToLower())/$(FeedTasksPackageVersion)/build/$(FeedTasksPackage).targets" />
   <Import Project="$(PackagesDir)/$(PublishSymbolsPackage.ToLower())/$(PublishSymbolsPackageVersion)/build/PublishSymbols.targets" />
diff --git a/src/libraries/ref.builds b/src/libraries/ref.builds
index c7542be16a3..2753148a202 100644
--- a/src/libraries/ref.builds
+++ b/src/libraries/ref.builds
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
 
   <PropertyGroup>
     <AdditionalBuildConfigurations>$(AdditionalBuildConfigurations);netstandard-$(OSGroup)-$(ConfigurationGroup)-$(ArchGroup)</AdditionalBuildConfigurations>
diff --git a/src/libraries/shims/ApiCompat.proj b/src/libraries/shims/ApiCompat.proj
index f55eb98bb9c..17e1d420bb0 100644
--- a/src/libraries/shims/ApiCompat.proj
+++ b/src/libraries/shims/ApiCompat.proj
@@ -7,7 +7,7 @@
     </BuildConfigurations>
   </PropertyGroup>
 
-  <Import Project="dir.props" />
+  <Import Project="Directory.Build.props" />
 
   <PropertyGroup>
     <ApiCompatResponseFile>$(IntermediateOutputPath)/apicompat.rsp</ApiCompatResponseFile>
@@ -95,5 +95,5 @@
   </Target>
   <Target Name="Rebuild" DependsOnTargets="Clean;Build" />
 
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>
diff --git a/src/libraries/shims/dir.props b/src/libraries/shims/Directory.Build.props
similarity index 92%
rename from src/libraries/shims/dir.props
rename to src/libraries/shims/Directory.Build.props
index 42378f6ef49..f583307ae92 100644
--- a/src/libraries/shims/dir.props
+++ b/src/libraries/shims/Directory.Build.props
@@ -9,7 +9,7 @@
     </BuildConfigurations>
   </PropertyGroup>
 
-  <Import Project="..\dir.props" />
+  <Import Project="..\Directory.Build.props" />
 
   <Import Project="netfxreference.props" />
 
diff --git a/src/libraries/shims/manual/dir.props b/src/libraries/shims/manual/Directory.Build.props
similarity index 86%
rename from src/libraries/shims/manual/dir.props
rename to src/libraries/shims/manual/Directory.Build.props
index 03a82d23051..1a3e02f472e 100644
--- a/src/libraries/shims/manual/dir.props
+++ b/src/libraries/shims/manual/Directory.Build.props
@@ -8,8 +8,8 @@
     <IsNETCoreApp>true</IsNETCoreApp>
     <IsUAP>true</IsUAP>
   </PropertyGroup>
-  <!-- need to by-pass the dir.props in the shims directory for this project -->
-  <Import Project="..\..\..\dir.props" />
+  <!-- need to by-pass the Directory.Build.props in the shims directory for this project -->
+  <Import Project="..\..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <AssemblyKey>ECMA</AssemblyKey>
@@ -21,4 +21,4 @@
     <ContractAssemblyPath>$(NetFxRefPath)$(MSBuildProjectName).dll</ContractAssemblyPath>
     <DefineConstants Condition="'$(TargetGroup)' == 'netcoreapp'">$(DefineConstants);netcoreapp</DefineConstants>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/shims/shims.proj b/src/libraries/shims/shims.proj
index 216e429a6cf..12dcfcb58cf 100644
--- a/src/libraries/shims/shims.proj
+++ b/src/libraries/shims/shims.proj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
-  <Import Project="dir.props" />
+  <Import Project="Directory.Build.props" />
 
   <Target Name="GetGenFacadesInputs">
     <ItemGroup>
@@ -72,7 +72,7 @@
   </Target>
   <Target Name="Rebuild" DependsOnTargets="Clean;Build" />
 
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 
   <Target Name="SwitchItemNameForRuntimeBinplaceConfigs" AfterTargets="GetBinPlaceConfiguration">
     <ItemGroup>
diff --git a/src/libraries/sign.builds b/src/libraries/sign.builds
index d22978a41db..d3706b9899b 100644
--- a/src/libraries/sign.builds
+++ b/src/libraries/sign.builds
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-  <Import Project="dir.props" />
-  <Import Project="..\dir.targets" />
+  <Import Project="Directory.Build.props" />
+  <Import Project="..\Directory.Build.targets" />
 
   <PropertyGroup>
     <!-- The SignFiles target needs OutDir to be defined -->
diff --git a/src/libraries/src.builds b/src/libraries/src.builds
index ba21b629046..48f6eb8d6a6 100644
--- a/src/libraries/src.builds
+++ b/src/libraries/src.builds
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <Project Include="$(MSBuildThisFileDirectory)*/src/*.csproj" Exclude="@(ProjectExclusions)" />
     <Project Include="$(MSBuildThisFileDirectory)*/src/*.ilproj" Exclude="@(ProjectExclusions)" />
diff --git a/src/libraries/syncAzure.proj b/src/libraries/syncAzure.proj
index 80f1278fcd1..3f72288284e 100644
--- a/src/libraries/syncAzure.proj
+++ b/src/libraries/syncAzure.proj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
 
   <PropertyGroup>
     <ContainerName>$(ContainerName.Replace(".","-"))</ContainerName>
diff --git a/src/libraries/tests.builds b/src/libraries/tests.builds
index 833ac384c11..570076898ff 100644
--- a/src/libraries/tests.builds
+++ b/src/libraries/tests.builds
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
 
   <PropertyGroup>
     <!-- When building through build-tests.cmd tests.builds is the main project that is being built. We set IsTestProject to true when the project path has /tests/.
@@ -40,7 +40,7 @@
 
   <Import Project="$(ToolsDir)Build.Post.targets" Condition="Exists('$(ToolsDir)Build.Post.targets')" />
 
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
 
diff --git a/src/libraries/upload-tests.proj b/src/libraries/upload-tests.proj
index d39c88800d9..eb3e627fcca 100644
--- a/src/libraries/upload-tests.proj
+++ b/src/libraries/upload-tests.proj
@@ -1,5 +1,5 @@
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <!-- CoreFX-Specific Helix test submission project.
        TODOS:
          - Add support for storing test-project-specific timeouts, use this instead of default if available
-- 
GitLab