diff --git a/src/libraries/BuildToolsVersion.txt b/src/libraries/BuildToolsVersion.txt
index 3bad84b87032dd45f5974583bac3fef2b42b0bf8..b91b92475b1f9e05bc1f658a38df87d66e274647 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 5721456d1d0e6b5de54ce301213b57d2395dfd2c..84179fc84dc3ce6428a1f534a2cbc456c245dd5a 100644
--- a/src/libraries/CoreFx.Private.TestUtilities/dir.props
+++ b/src/libraries/CoreFx.Private.TestUtilities/Directory.Build.props
@@ -1,10 +1,10 @@
-
+
1.0.1.0
Test
true
-
\ No newline at end of file
+
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 2f9f2405ba46a8a770d6f154ee0ebc34fdd24b0e..d231608c2270a8678308c60b6bdc8ae34058b6c7 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 @@
-
+
uap10.0.16299;netcoreapp2.0;net461;$(AllXamarinFrameworks)
-
+
diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props
index 2dd9df93c903c45ae4a4f65c6f31d364a54a7b35..78036970dc28d21cf5a2b57d43ffab0e5ab32767 100644
--- a/src/libraries/Directory.Build.props
+++ b/src/libraries/Directory.Build.props
@@ -1,6 +1,6 @@
-
+
false
CS3021;$(NoWarn)
diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets
index e1f18fc6f19833585bc8e555cf257f6f14f2d4a6..fcb0ff4021cddb84d94c5d79199a7f678ea1301e 100644
--- a/src/libraries/Directory.Build.targets
+++ b/src/libraries/Directory.Build.targets
@@ -1,6 +1,11 @@
-
+
+ true
+
+
+
+
@@ -22,6 +27,21 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
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 2010639bb33d9e3fa5ed16654e21894a7cd5ddb8..8455e16f095a2d3a2e1051281c6d7d9d5591199e 100644
--- a/src/libraries/System.Runtime.Serialization.Json/dir.props
+++ b/src/libraries/Microsoft.CSharp/Directory.Build.props
@@ -1,6 +1,6 @@
-
+
4.0.4.0
MSFT
diff --git a/src/libraries/Microsoft.CSharp/pkg/Microsoft.CSharp.pkgproj b/src/libraries/Microsoft.CSharp/pkg/Microsoft.CSharp.pkgproj
index 45d2d8dd310999605021dbd485b2fab5c2cf3dc3..01f313e3cb18dc45a733c22e31826000208c0b08 100644
--- a/src/libraries/Microsoft.CSharp/pkg/Microsoft.CSharp.pkgproj
+++ b/src/libraries/Microsoft.CSharp/pkg/Microsoft.CSharp.pkgproj
@@ -1,6 +1,6 @@
-
+
net461;netcoreapp2.0;$(AllXamarinFrameworks)
@@ -41,5 +41,5 @@
.NETStandard,Version=v1.0;.NETStandard,Version=v1.1;.NETStandard,Version=v1.2
-
+
\ 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 56f0349243e22663ac104f09ef505b65ce8e6623..70e1444a150676e1eae3b016a40782d812e30b91 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 @@
-
+
2.1.0
2.0.2.0
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 3379276bae7eb192b1f9264865701473f8e879b0..f13488f3158c72509dc17d4fbdfc0c9d4f386589 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 @@
-
+
@@ -13,5 +13,5 @@
true
-
+
\ 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 5a8b968b5654d725110c7d5fcb62696a74690dc3..5ffb2c097551713331b816ba28ebd6d26a92ae31 100644
--- a/src/libraries/Microsoft.VisualBasic/pkg/Microsoft.VisualBasic.pkgproj
+++ b/src/libraries/Microsoft.VisualBasic/pkg/Microsoft.VisualBasic.pkgproj
@@ -1,6 +1,6 @@
-
+
net45;netcore45;netcoreapp1.0;wpa81;$(AllXamarinFrameworks)
@@ -22,5 +22,5 @@
.NETStandard,Version=v1.1;.NETStandard,Version=v1.2
-
-
\ No newline at end of file
+
+
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 e06335977277f4eb38c4264f7b974228ab1595fa..2ac6942ba72955ad2725d7042025eabff5763c4c 100644
--- a/src/libraries/System.Collections/dir.props
+++ b/src/libraries/Microsoft.Win32.Primitives/Directory.Build.props
@@ -1,6 +1,6 @@
-
+
4.1.1.0
MSFT
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 0d81e0a9e8804478eccc00c5183a4bf0a20da093..0eee85e44031a25de4c3edf44e2346e6953aedd1 100644
--- a/src/libraries/Microsoft.Win32.Registry.AccessControl/dir.props
+++ b/src/libraries/Microsoft.Win32.Registry.AccessControl/Directory.Build.props
@@ -1,6 +1,6 @@
-
+
4.0.4.0
MSFT
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 2b744f20912dad4b026ff7da53bc1a1d92dd8dfe..2d8e3dbf318e85484fb94f103e4a2ad940da6c6e 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 @@
-
+
net461;netcoreapp2.0;$(AllXamarinFrameworks)
@@ -12,5 +12,5 @@
-
+
\ 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 8c1928e58356184c5695399c3f851cf924d3fe42..56ea582b1e6bdc11517fd08898d4255d3b394761 100644
--- a/src/libraries/System.Security.Cryptography.OpenSsl/dir.props
+++ b/src/libraries/Microsoft.Win32.Registry/Directory.Build.props
@@ -1,6 +1,6 @@
-
+
4.1.2.0
MSFT
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 e444f293b3e011a0dba8a53aaf8f96487e6a192e..684d0f0c3fa5f6b51145c4e71d935b132c2e6842 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 @@
-
+
net461;netcoreapp2.0;$(AllXamarinFrameworks)
@@ -12,5 +12,5 @@
-
+
\ 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 af5b29338515107f9bed1d625fc5c9d8da6e5ffc..5d39fb280b39a07e7a307e11903ae5f8c172b7ba 100644
--- a/src/libraries/Microsoft.Win32.SystemEvents/dir.props
+++ b/src/libraries/Microsoft.Win32.SystemEvents/Directory.Build.props
@@ -1,6 +1,6 @@
-
+
4.0.1.0
Open
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 22c2e1d90dfc1dd4514be1de768321d5089d23c6..b3259258fdaf4e32c5c1466089060059823b7bbc 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 @@
-
+
uap10.0.16299;net461;netcoreapp2.0;$(AllXamarinFrameworks)
-
+
\ 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 66b1e87a746ab6f3e6cbd87981630629b2240f13..698a7c9dc659335a6e62546ecfe2b5a85b8523aa 100644
--- a/src/libraries/Microsoft.XmlSerializer.Generator/dir.props
+++ b/src/libraries/Microsoft.XmlSerializer.Generator/Directory.Build.props
@@ -1,6 +1,6 @@
-
+
2.0.0
true
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 1278907b244584404bde3fb1373b3a63548a30f9..b10b6e00b7a72eedc8b360812398e86c237f9a72 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 @@
-
+
@@ -19,6 +19,6 @@
\lib\netstandard2.0\
-
+
\ No newline at end of file
diff --git a/src/libraries/Native/build-native.cmd b/src/libraries/Native/build-native.cmd
index 641b710951ae00c61793f85a5b931c683f52cb3a..6d66e1aa89926129f1efba0282b0eb5a2b959e69 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= ^
+ ^^^ ^
+ ^^^
+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 f66558ee7e2065655afb588d2493141353387c45..b0b5e52aba19b14bc533669596376c8adfe545ad 100644
--- a/src/libraries/Native/native-binplace.proj
+++ b/src/libraries/Native/native-binplace.proj
@@ -9,12 +9,12 @@
netfx;
-
+
-
+
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 f89dc1deb2eca7c1699f71561c0b5f72a3412f1e..8c670f037e0ef3820b8431fe1fc2f536299b4471 100644
--- a/src/libraries/Native/pkg/dir.props
+++ b/src/libraries/Native/pkg/Directory.Build.props
@@ -1,5 +1,5 @@
-
+
2.8.6
@@ -19,5 +19,5 @@
.NETCoreApp;UAP
-
+
\ 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 e06335977277f4eb38c4264f7b974228ab1595fa..2ac6942ba72955ad2725d7042025eabff5763c4c 100644
--- a/src/libraries/System.Collections.Specialized/dir.props
+++ b/src/libraries/System.Collections.NonGeneric/Directory.Build.props
@@ -1,6 +1,6 @@
-
+
4.1.1.0
MSFT
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 e06335977277f4eb38c4264f7b974228ab1595fa..2ac6942ba72955ad2725d7042025eabff5763c4c 100644
--- a/src/libraries/System.Collections.NonGeneric/dir.props
+++ b/src/libraries/System.Collections.Specialized/Directory.Build.props
@@ -1,6 +1,6 @@
-
+
4.1.1.0
MSFT
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 e06335977277f4eb38c4264f7b974228ab1595fa..2ac6942ba72955ad2725d7042025eabff5763c4c 100644
--- a/src/libraries/Microsoft.Win32.Primitives/dir.props
+++ b/src/libraries/System.Collections/Directory.Build.props
@@ -1,6 +1,6 @@
-
+
4.1.1.0
MSFT
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 ef58836411cfb47aebf3175a5196f35b24c5abc0..712fde9d57e00da4792fbd137596df5c5eb0fc0c 100644
--- a/src/libraries/System.ComponentModel.Annotations/dir.props
+++ b/src/libraries/System.ComponentModel.Annotations/Directory.Build.props
@@ -1,6 +1,6 @@
-
+
4.2.2.0
MSFT
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 122946a22676beb74e52e025ea737aef3e1565b1..c9e4d8f08f4cdc152b6b8432aee4bbe0aa6d97ea 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 @@
-
+
net461
@@ -23,5 +23,5 @@
.NETStandard,Version=v1.1;.NETStandard,Version=v1.2;.NETStandard,Version=v1.3
-
+
\ 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 95204c770a2af709806b4bd5b79c168c2ce23c17..189dfc22441d11c8e1897e3dda657fadca937b35 100644
--- a/src/libraries/System.ComponentModel.Composition/dir.props
+++ b/src/libraries/System.ComponentModel.Composition/Directory.Build.props
@@ -1,6 +1,6 @@
-
+
4.0.0.0
ECMA
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 8b79a972cc69632d330f88263c7c4c1c2b266388..ae3641d6a1586e0e69e950cd15d2a5931e6a2d4a 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 @@
-
+
uap10.0.16299;netcoreapp2.0;net45;$(AllXamarinFrameworks)
@@ -12,5 +12,5 @@
-
+
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 0000000000000000000000000000000000000000..2ac6942ba72955ad2725d7042025eabff5763c4c
--- /dev/null
+++ b/src/libraries/System.ComponentModel.EventBasedAsync/Directory.Build.props
@@ -0,0 +1,10 @@
+
+
+
+
+ 4.1.1.0
+ MSFT
+ true
+ true
+
+
\ 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 e06335977277f4eb38c4264f7b974228ab1595fa..0000000000000000000000000000000000000000
--- a/src/libraries/System.ComponentModel.EventBasedAsync/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- 4.1.1.0
- MSFT
- true
- true
-
-
\ 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 b89fb6fc11e5ba095e3a2620a249d197fdc715cd..c493677ae13c6d9159e5bd8c907fbebdaeac8945 100644
--- a/src/libraries/System.ComponentModel.Primitives/dir.props
+++ b/src/libraries/System.ComponentModel.Primitives/Directory.Build.props
@@ -1,6 +1,6 @@
-
+
4.2.1.0
MSFT
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 b89fb6fc11e5ba095e3a2620a249d197fdc715cd..c493677ae13c6d9159e5bd8c907fbebdaeac8945 100644
--- a/src/libraries/System.ComponentModel.TypeConverter/dir.props
+++ b/src/libraries/System.ComponentModel.TypeConverter/Directory.Build.props
@@ -1,6 +1,6 @@
-
+
4.2.1.0
MSFT
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 ad2f0ed13956d3625fe23bd154f70795b28476cd..c4419f3e6abb39c8d10daf6884771f39f27d680b 100644
--- a/src/libraries/System.ComponentModel/dir.props
+++ b/src/libraries/System.ComponentModel/Directory.Build.props
@@ -1,6 +1,6 @@
-
+
4.0.3.0
MSFT
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 587d769112d9060c4309559f69c31bc5a9475a43..a73f4a74fb4db26417c2afdd28d3383c0b0bf93e 100644
--- a/src/libraries/System.Composition.Convention/dir.props
+++ b/src/libraries/System.Composition.AttributedModel/Directory.Build.props
@@ -1,4 +1,4 @@
-
+
\ 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 af4245af96a6f2c54ecf9a93f52aef201cc4d8dc..b7d4b2e73121e92ffc5d589737eefd7f14acef1d 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 @@
-
+
net45;netcore45;netcoreapp1.0;wp8;wpa81;$(AllXamarinFrameworks)
-
+
\ 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 587d769112d9060c4309559f69c31bc5a9475a43..a73f4a74fb4db26417c2afdd28d3383c0b0bf93e 100644
--- a/src/libraries/System.Composition.Hosting/dir.props
+++ b/src/libraries/System.Composition.Convention/Directory.Build.props
@@ -1,4 +1,4 @@
-
+
\ 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 336a7db611e1f564594347477595cb4628a267e4..e4698f19b2e3c03af074488c744ecc365e89916c 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 @@
-
+
net45;netcore45;netcoreapp1.0;wp8;wpa81;$(AllXamarinFrameworks)
-
+
\ 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 587d769112d9060c4309559f69c31bc5a9475a43..a73f4a74fb4db26417c2afdd28d3383c0b0bf93e 100644
--- a/src/libraries/System.Composition.AttributedModel/dir.props
+++ b/src/libraries/System.Composition.Hosting/Directory.Build.props
@@ -1,4 +1,4 @@
-
+
\ 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 c5cf0cfd59df8a8aabd9785e244576dcb75a06b6..c0742f5eb9d1b2edec0684909dafd2fd25b866d5 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 @@
-
+
net45;netcore45;netcoreapp1.0;wp8;wpa81;$(AllXamarinFrameworks)
-
+
\ 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 587d769112d9060c4309559f69c31bc5a9475a43..a73f4a74fb4db26417c2afdd28d3383c0b0bf93e 100644
--- a/src/libraries/System.Composition.Runtime/dir.props
+++ b/src/libraries/System.Composition.Runtime/Directory.Build.props
@@ -1,4 +1,4 @@
-
+
\ 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 35d60022440cb98e71e8ff0747366cd4f736016c..335729f97592086a64cf803055b9579d7455ae7c 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 @@
-
+
net45;netcore45;netcoreapp1.0;wp8;wpa81;$(AllXamarinFrameworks)
-
+
\ 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 0000000000000000000000000000000000000000..a73f4a74fb4db26417c2afdd28d3383c0b0bf93e
--- /dev/null
+++ b/src/libraries/System.Composition.TypedParts/Directory.Build.props
@@ -0,0 +1,4 @@
+
+
+
+
\ 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 587d769112d9060c4309559f69c31bc5a9475a43..0000000000000000000000000000000000000000
--- a/src/libraries/System.Composition.TypedParts/dir.props
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ 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 89f31ff87cf27e12361c01dc7e35749250356bf9..8a7072751dd49cf4b97ca650c806148af0c61afa 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 @@
-
+
net45;netcore45;netcoreapp1.0;wp8;wpa81;$(AllXamarinFrameworks)
-
+
\ 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 a8b5b4d45bbdb4601d5519805b565bc5d222bb4a..410ee61a6c08a7155e46593caf416b53c8e8175f 100644
--- a/src/libraries/System.Composition/dir.props
+++ b/src/libraries/System.Composition/Directory.Build.props
@@ -1,6 +1,6 @@
-
+
1.3.0
1.0.34.0
diff --git a/src/libraries/System.Composition/pkg/System.Composition.pkgproj b/src/libraries/System.Composition/pkg/System.Composition.pkgproj
index 70113e2dbe6926c40a7b0ce28d77add2b3038dc2..7674f0ab733dc9ccc02b1019932fa41743169e60 100644
--- a/src/libraries/System.Composition/pkg/System.Composition.pkgproj
+++ b/src/libraries/System.Composition/pkg/System.Composition.pkgproj
@@ -1,6 +1,6 @@
-
+
@@ -8,5 +8,5 @@
-
+
\ 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 f6666544659dbad1ad5f6f90116387d2515f0b5a..c4358a81dca164e3a6c2b70ceddee380dbaa75c8 100644
--- a/src/libraries/System.CodeDom/dir.props
+++ b/src/libraries/System.Configuration.ConfigurationManager/Directory.Build.props
@@ -1,6 +1,6 @@
-
+
4.0.2.0
Open
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 576f40fbafe7e6af36e6715f5ea70d73e24f5ed5..50ec38ffddf21cca21fec2b7f29b80127bc8f04a 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 @@
-
+
netcoreapp2.0;net461;$(AllXamarinFrameworks)
-
+
\ 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 0000000000000000000000000000000000000000..2ac6942ba72955ad2725d7042025eabff5763c4c
--- /dev/null
+++ b/src/libraries/System.Console/Directory.Build.props
@@ -0,0 +1,10 @@
+
+
+
+
+ 4.1.1.0
+ MSFT
+ true
+ true
+
+
\ 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 e06335977277f4eb38c4264f7b974228ab1595fa..0000000000000000000000000000000000000000
--- a/src/libraries/System.Console/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- 4.1.1.0
- MSFT
- true
- true
-
-
\ 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 b89fb6fc11e5ba095e3a2620a249d197fdc715cd..c493677ae13c6d9159e5bd8c907fbebdaeac8945 100644
--- a/src/libraries/System.Data.Common/dir.props
+++ b/src/libraries/System.Data.Common/Directory.Build.props
@@ -1,6 +1,6 @@
-
+
4.2.1.0
MSFT
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 9e190a7ddebd8bd99b1363d79b2d6eac1f120385..65ef9b22abbb40d01aedac06fcb5d269da99f7c0 100644
--- a/src/libraries/System.Data.DataSetExtensions/dir.props
+++ b/src/libraries/System.Data.DataSetExtensions/Directory.Build.props
@@ -1,6 +1,6 @@
-
+
4.0.0.0
ECMA
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 878933ade5be8e0ccc78bf77ca58c1f1757b97bf..94d42b1425cf1a8a73782fa53b98c4d6e9233c80 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 @@
-
+
uap10.0.16299;netcoreapp2.0;net45;$(AllXamarinFrameworks)
@@ -10,5 +10,5 @@
true
-
+
\ 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 af5b29338515107f9bed1d625fc5c9d8da6e5ffc..5d39fb280b39a07e7a307e11903ae5f8c172b7ba 100644
--- a/src/libraries/System.Diagnostics.EventLog/dir.props
+++ b/src/libraries/System.Data.Odbc/Directory.Build.props
@@ -1,6 +1,6 @@
-
+
4.0.1.0
Open
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 e4959eab6e91f2d178f6931de8ded650281c32e5..18d1c1ea7bfba222ad149210bb72b220718e59aa 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 @@
-
+
uap10.0.16299;net461;netcoreapp2.0;$(AllXamarinFrameworks)
-
+
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 27eade76094b80f804a458084f68f1cd8b8a3cb9..cfce1804452e37350cd415347bc464d7b3de6229 100644
--- a/src/libraries/System.Data.SqlClient/dir.props
+++ b/src/libraries/System.Data.SqlClient/Directory.Build.props
@@ -1,6 +1,6 @@
-
+
4.4.1.0
MSFT
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 66578cc337980f7b31640aee4bd537ef47ca9ed4..f741b8e8197870344ebff9e424fe382ff8e94b75 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 @@
-
+
net461;netcoreapp2.0;uap10.0.16299;$(UAPvNextTFM);$(AllXamarinFrameworks)
@@ -28,5 +28,5 @@
-
+
\ 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 ad2f0ed13956d3625fe23bd154f70795b28476cd..c4419f3e6abb39c8d10daf6884771f39f27d680b 100644
--- a/src/libraries/System.Linq.Parallel/dir.props
+++ b/src/libraries/System.Diagnostics.Contracts/Directory.Build.props
@@ -1,6 +1,6 @@
-
+
4.0.3.0
MSFT
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 0000000000000000000000000000000000000000..2ac6942ba72955ad2725d7042025eabff5763c4c
--- /dev/null
+++ b/src/libraries/System.Diagnostics.Debug/Directory.Build.props
@@ -0,0 +1,10 @@
+
+
+
+
+ 4.1.1.0
+ MSFT
+ true
+ true
+
+
\ 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 e06335977277f4eb38c4264f7b974228ab1595fa..0000000000000000000000000000000000000000
--- a/src/libraries/System.Diagnostics.Debug/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- 4.1.1.0
- MSFT
- true
- true
-
-
\ 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 48f27877367e1a96a2179e0d402a303223da93cf..ab8be50ef12c203a187b950a45d595235e369e53 100644
--- a/src/libraries/System.Diagnostics.DiagnosticSource/dir.props
+++ b/src/libraries/System.Diagnostics.DiagnosticSource/Directory.Build.props
@@ -1,6 +1,6 @@
-
+
4.0.4.0
Open
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 93ce39ab4ab88ac17d3d3d8e18ffd2c796812492..8f28e0d0da486540122deaebf238855aaa3560b2 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 @@
-
+
net46;net45;netcore45;netcoreapp1.0;wpa81;$(AllXamarinFrameworks)
@@ -18,5 +18,5 @@
.NETCoreApp;UAP
-
+
\ 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 af5b29338515107f9bed1d625fc5c9d8da6e5ffc..5d39fb280b39a07e7a307e11903ae5f8c172b7ba 100644
--- a/src/libraries/System.Data.Odbc/dir.props
+++ b/src/libraries/System.Diagnostics.EventLog/Directory.Build.props
@@ -1,6 +1,6 @@
-
+
4.0.1.0
Open
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 f5c4342a14d3634e0a5197daec2e08df0be295ba..b0f5b646fb3bc6134ddbcae73365b8f87db7e4f4 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 @@
-
+
uap10.0.16299;net461;netcoreapp2.0;$(AllXamarinFrameworks)
-
+
\ 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 85a6f1a497174fc4ef07da0f0233828baaecf501..c07aec602f0ca784ead099b32550a4e78a809c75 100644
--- a/src/libraries/System.Runtime.InteropServices.RuntimeInformation/dir.props
+++ b/src/libraries/System.Diagnostics.FileVersionInfo/Directory.Build.props
@@ -1,6 +1,6 @@
-
+
4.0.3.0
MSFT
diff --git a/src/libraries/System.Diagnostics.FileVersionInfo/tests/NativeConsoleApp/NativeConsoleApp.vcxproj b/src/libraries/System.Diagnostics.FileVersionInfo/tests/NativeConsoleApp/NativeConsoleApp.vcxproj
index 1553e024af22ef4149d0e3460ac4b5759ba2c666..5faf9da6c56d87a090b8a84f5d64aba3f2b21518 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 @@
-
+
Release
@@ -60,7 +60,7 @@
PreserveNewest
-
+
diff --git a/src/libraries/System.Diagnostics.FileVersionInfo/tests/NativeLibrary/NativeLibrary.vcxproj b/src/libraries/System.Diagnostics.FileVersionInfo/tests/NativeLibrary/NativeLibrary.vcxproj
index 526a5d8db43e8a3fb6f610d49cbfb21d83432cf1..2afd2b444e482e24a29f85a3329d83e6c44c3248 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 @@
-
+
Release
@@ -62,7 +62,7 @@
PreserveNewest
-
+
diff --git a/src/libraries/System.Diagnostics.FileVersionInfo/tests/SecondNativeLibrary/SecondNativeLibrary.vcxproj b/src/libraries/System.Diagnostics.FileVersionInfo/tests/SecondNativeLibrary/SecondNativeLibrary.vcxproj
index 20073436391bd26ee942b69b77c333e40dbc89d2..69c6ed60fe12c8ca23694ee242aac1b791d064c9 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 @@
-
+
Release
@@ -62,7 +62,7 @@
PreserveNewest
-
+
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 534af31dfa4c6e2011f5a7cd4a010594c934a7cc..bc889d2a52943f5e32a27dc4d9a18f6560767b83 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 @@
System.Diagnostics.FileVersionInfo.TestAssembly
-
+
$(BuildDependsOn);MangleTestAssemblyExtension
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 af5b29338515107f9bed1d625fc5c9d8da6e5ffc..5d39fb280b39a07e7a307e11903ae5f8c172b7ba 100644
--- a/src/libraries/System.Diagnostics.PerformanceCounter/dir.props
+++ b/src/libraries/System.Diagnostics.PerformanceCounter/Directory.Build.props
@@ -1,6 +1,6 @@
-
+
4.0.1.0
Open
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 fad9022c6398c987883a38ab73561241fcd259e0..81b114acfd6a23a1984b2807eb46774cc390cd30 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 @@
-
+
uap10.0.16299;net461;netcoreapp2.0;$(AllXamarinFrameworks)
@@ -10,5 +10,5 @@
-
+
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 0000000000000000000000000000000000000000..c493677ae13c6d9159e5bd8c907fbebdaeac8945
--- /dev/null
+++ b/src/libraries/System.Diagnostics.Process/Directory.Build.props
@@ -0,0 +1,10 @@
+
+
+
+
+ 4.2.1.0
+ MSFT
+ true
+ true
+
+
\ 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 b89fb6fc11e5ba095e3a2620a249d197fdc715cd..0000000000000000000000000000000000000000
--- a/src/libraries/System.Diagnostics.Process/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- 4.2.1.0
- MSFT
- true
- true
-
-
\ 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 0000000000000000000000000000000000000000..2ac6942ba72955ad2725d7042025eabff5763c4c
--- /dev/null
+++ b/src/libraries/System.Diagnostics.StackTrace/Directory.Build.props
@@ -0,0 +1,10 @@
+
+
+
+
+ 4.1.1.0
+ MSFT
+ true
+ true
+
+
\ 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 e06335977277f4eb38c4264f7b974228ab1595fa..0000000000000000000000000000000000000000
--- a/src/libraries/System.Diagnostics.StackTrace/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- 4.1.1.0
- MSFT
- true
- true
-
-
\ 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 0000000000000000000000000000000000000000..2ac6942ba72955ad2725d7042025eabff5763c4c
--- /dev/null
+++ b/src/libraries/System.Diagnostics.TextWriterTraceListener/Directory.Build.props
@@ -0,0 +1,10 @@
+
+
+
+
+ 4.1.1.0
+ MSFT
+ true
+ true
+
+
\ 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 e06335977277f4eb38c4264f7b974228ab1595fa..0000000000000000000000000000000000000000
--- a/src/libraries/System.Diagnostics.TextWriterTraceListener/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- 4.1.1.0
- MSFT
- true
- true
-
-
\ 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 0000000000000000000000000000000000000000..2ac6942ba72955ad2725d7042025eabff5763c4c
--- /dev/null
+++ b/src/libraries/System.Diagnostics.Tools/Directory.Build.props
@@ -0,0 +1,10 @@
+
+
+
+
+ 4.1.1.0
+ MSFT
+ true
+ true
+
+
\ 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 e06335977277f4eb38c4264f7b974228ab1595fa..0000000000000000000000000000000000000000
--- a/src/libraries/System.Diagnostics.Tools/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- 4.1.1.0
- MSFT
- true
- true
-
-
\ 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 0000000000000000000000000000000000000000..2ac6942ba72955ad2725d7042025eabff5763c4c
--- /dev/null
+++ b/src/libraries/System.Diagnostics.TraceSource/Directory.Build.props
@@ -0,0 +1,10 @@
+
+
+
+
+ 4.1.1.0
+ MSFT
+ true
+ true
+
+
\ 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 e06335977277f4eb38c4264f7b974228ab1595fa..0000000000000000000000000000000000000000
--- a/src/libraries/System.Diagnostics.TraceSource/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- 4.1.1.0
- MSFT
- true
- true
-
-
\ 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 0000000000000000000000000000000000000000..c493677ae13c6d9159e5bd8c907fbebdaeac8945
--- /dev/null
+++ b/src/libraries/System.Diagnostics.Tracing/Directory.Build.props
@@ -0,0 +1,10 @@
+
+
+
+
+ 4.2.1.0
+ MSFT
+ true
+ true
+
+
\ 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 b89fb6fc11e5ba095e3a2620a249d197fdc715cd..0000000000000000000000000000000000000000
--- a/src/libraries/System.Diagnostics.Tracing/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- 4.2.1.0
- MSFT
- true
- true
-
-
\ 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 8e9ced67593026770bbeff169f577b5e7aa9418b..b705866c581e23abf99207275d1cef92a7a94b29 100644
--- a/src/libraries/System.DirectoryServices.AccountManagement/dir.props
+++ b/src/libraries/System.DirectoryServices.AccountManagement/Directory.Build.props
@@ -1,6 +1,6 @@
-
+
-
+
\ 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 0000000000000000000000000000000000000000..2ac6942ba72955ad2725d7042025eabff5763c4c
--- /dev/null
+++ b/src/libraries/System.IO.FileSystem.DriveInfo/Directory.Build.props
@@ -0,0 +1,10 @@
+
+
+
+
+ 4.1.1.0
+ MSFT
+ true
+ true
+
+
\ 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 e06335977277f4eb38c4264f7b974228ab1595fa..0000000000000000000000000000000000000000
--- a/src/libraries/System.IO.FileSystem.DriveInfo/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- 4.1.1.0
- MSFT
- true
- true
-
-
\ 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 0000000000000000000000000000000000000000..2ac6942ba72955ad2725d7042025eabff5763c4c
--- /dev/null
+++ b/src/libraries/System.IO.FileSystem.Primitives/Directory.Build.props
@@ -0,0 +1,10 @@
+
+
+
+
+ 4.1.1.0
+ MSFT
+ true
+ true
+
+
\ 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 e06335977277f4eb38c4264f7b974228ab1595fa..0000000000000000000000000000000000000000
--- a/src/libraries/System.IO.FileSystem.Primitives/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- 4.1.1.0
- MSFT
- true
- true
-
-
\ 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 0000000000000000000000000000000000000000..2ac6942ba72955ad2725d7042025eabff5763c4c
--- /dev/null
+++ b/src/libraries/System.IO.FileSystem.Watcher/Directory.Build.props
@@ -0,0 +1,10 @@
+
+
+
+
+ 4.1.1.0
+ MSFT
+ true
+ true
+
+
\ 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 e06335977277f4eb38c4264f7b974228ab1595fa..0000000000000000000000000000000000000000
--- a/src/libraries/System.IO.FileSystem.Watcher/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- 4.1.1.0
- MSFT
- true
- true
-
-
\ 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 0000000000000000000000000000000000000000..2ac6942ba72955ad2725d7042025eabff5763c4c
--- /dev/null
+++ b/src/libraries/System.IO.FileSystem/Directory.Build.props
@@ -0,0 +1,10 @@
+
+
+
+
+ 4.1.1.0
+ MSFT
+ true
+ true
+
+
\ 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 e06335977277f4eb38c4264f7b974228ab1595fa..0000000000000000000000000000000000000000
--- a/src/libraries/System.IO.FileSystem/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- 4.1.1.0
- MSFT
- true
- true
-
-
\ 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 0000000000000000000000000000000000000000..2ac6942ba72955ad2725d7042025eabff5763c4c
--- /dev/null
+++ b/src/libraries/System.IO.IsolatedStorage/Directory.Build.props
@@ -0,0 +1,10 @@
+
+
+
+
+ 4.1.1.0
+ MSFT
+ true
+ true
+
+
\ 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 e06335977277f4eb38c4264f7b974228ab1595fa..0000000000000000000000000000000000000000
--- a/src/libraries/System.IO.IsolatedStorage/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- 4.1.1.0
- MSFT
- true
- true
-
-
\ 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 0000000000000000000000000000000000000000..2ac6942ba72955ad2725d7042025eabff5763c4c
--- /dev/null
+++ b/src/libraries/System.IO.MemoryMappedFiles/Directory.Build.props
@@ -0,0 +1,10 @@
+
+
+
+
+ 4.1.1.0
+ MSFT
+ true
+ true
+
+
\ 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 e06335977277f4eb38c4264f7b974228ab1595fa..0000000000000000000000000000000000000000
--- a/src/libraries/System.IO.MemoryMappedFiles/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- 4.1.1.0
- MSFT
- true
- true
-
-
\ 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 0d81e0a9e8804478eccc00c5183a4bf0a20da093..0eee85e44031a25de4c3edf44e2346e6953aedd1 100644
--- a/src/libraries/System.Net.Http.WinHttpHandler/dir.props
+++ b/src/libraries/System.IO.Packaging/Directory.Build.props
@@ -1,6 +1,6 @@
-
+
4.0.4.0
MSFT
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 cc486349eeb955c80ef2582addc947a67da75a36..57c1ecfa7271472e8110fb6d604360319b260afd 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 @@
-
+
net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)
@@ -13,5 +13,5 @@
-->
-
+
\ 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 0000000000000000000000000000000000000000..5d39fb280b39a07e7a307e11903ae5f8c172b7ba
--- /dev/null
+++ b/src/libraries/System.IO.Pipelines/Directory.Build.props
@@ -0,0 +1,8 @@
+
+
+
+
+ 4.0.1.0
+ Open
+
+
\ 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 af5b29338515107f9bed1d625fc5c9d8da6e5ffc..0000000000000000000000000000000000000000
--- a/src/libraries/System.IO.Pipelines/dir.props
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- 4.0.1.0
- Open
-
-
\ 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 80de0bf4011b0ecb966147f0e798adfde86b4094..9e8ba4d84ce5bc69c0cb8f4cb895bbf496b3670d 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 @@
-
+
net46;netcore50;netcoreapp1.0;$(UAPvNextTFM);$(AllXamarinFrameworks)
-
+
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 db2dcc3ae8209bcc0b40eb4559968d2be6e5bc9b..febe8c8d28f87d59c249b46d1c92bf890c060556 100644
--- a/src/libraries/System.IO.Pipes.AccessControl/dir.props
+++ b/src/libraries/System.IO.Pipes.AccessControl/Directory.Build.props
@@ -1,6 +1,6 @@
-
+
4.0.4.0
MSFT
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 25c992f10d2f0e2eabf6196488949da6b42d807c..07d6f26952b34d9fa094a6e5b5f35f4f30f7d1d0 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 @@
-
+
net461
@@ -16,5 +16,5 @@
runtimes/win/lib/$(UAPvNextTFM)
-
+
\ 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 0000000000000000000000000000000000000000..2ac6942ba72955ad2725d7042025eabff5763c4c
--- /dev/null
+++ b/src/libraries/System.IO.Pipes/Directory.Build.props
@@ -0,0 +1,10 @@
+
+
+
+
+ 4.1.1.0
+ MSFT
+ true
+ true
+
+
\ 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 e06335977277f4eb38c4264f7b974228ab1595fa..0000000000000000000000000000000000000000
--- a/src/libraries/System.IO.Pipes/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- 4.1.1.0
- MSFT
- true
- true
-
-
\ 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 7d596555c1dcdd02683c0d6c719628c146fb4bf5..7ad0943497da11114c9cda054c5915cf4a4d50f1 100644
--- a/src/libraries/System.IO.Ports/dir.props
+++ b/src/libraries/System.IO.Ports/Directory.Build.props
@@ -1,6 +1,6 @@
-
+
4.0.2.0
Open
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 af4b1b2fc1472740d0863fa8fbbe44b6badb750b..031973506d69b73ad46b4f18fa3061b1fd2aac57 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 @@
-
+
net461
@@ -11,5 +11,5 @@
-
+
\ 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 0000000000000000000000000000000000000000..2ac6942ba72955ad2725d7042025eabff5763c4c
--- /dev/null
+++ b/src/libraries/System.IO.UnmanagedMemoryStream/Directory.Build.props
@@ -0,0 +1,10 @@
+
+
+
+
+ 4.1.1.0
+ MSFT
+ true
+ true
+
+
\ 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 e06335977277f4eb38c4264f7b974228ab1595fa..0000000000000000000000000000000000000000
--- a/src/libraries/System.IO.UnmanagedMemoryStream/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- 4.1.1.0
- MSFT
- true
- true
-
-
\ 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 0000000000000000000000000000000000000000..c493677ae13c6d9159e5bd8c907fbebdaeac8945
--- /dev/null
+++ b/src/libraries/System.IO/Directory.Build.props
@@ -0,0 +1,10 @@
+
+
+
+
+ 4.2.1.0
+ MSFT
+ true
+ true
+
+
\ 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 b89fb6fc11e5ba095e3a2620a249d197fdc715cd..0000000000000000000000000000000000000000
--- a/src/libraries/System.IO/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- 4.2.1.0
- MSFT
- true
- true
-
-
\ 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 5b806c2ac25e2c72aaf62ba198365bd49a902c06..743b059619dab46f82e20de9fbd2a1f718281175 100644
--- a/src/libraries/System.Json/dir.props
+++ b/src/libraries/System.Json/Directory.Build.props
@@ -1,6 +1,6 @@
-
+
2.0.7.0
Open
diff --git a/src/libraries/System.Json/pkg/System.Json.pkgproj b/src/libraries/System.Json/pkg/System.Json.pkgproj
index 407ef68a716061bc4c5cf52f18cadfcc2a0cee37..7e0c508e01512ad8ea812c19b21ad71cc7b7b8f2 100644
--- a/src/libraries/System.Json/pkg/System.Json.pkgproj
+++ b/src/libraries/System.Json/pkg/System.Json.pkgproj
@@ -1,6 +1,6 @@
-
+
net45;netcore45;netcoreapp1.0;wp8;wpa81;$(AllXamarinFrameworks)
@@ -25,5 +25,5 @@
true
-
+
\ 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 0000000000000000000000000000000000000000..c493677ae13c6d9159e5bd8c907fbebdaeac8945
--- /dev/null
+++ b/src/libraries/System.Linq.Expressions/Directory.Build.props
@@ -0,0 +1,10 @@
+
+
+
+
+ 4.2.1.0
+ MSFT
+ true
+ true
+
+
\ 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 b89fb6fc11e5ba095e3a2620a249d197fdc715cd..0000000000000000000000000000000000000000
--- a/src/libraries/System.Linq.Expressions/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- 4.2.1.0
- MSFT
- true
- true
-
-
\ 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 ad2f0ed13956d3625fe23bd154f70795b28476cd..c4419f3e6abb39c8d10daf6884771f39f27d680b 100644
--- a/src/libraries/System.Linq.Queryable/dir.props
+++ b/src/libraries/System.Linq.Parallel/Directory.Build.props
@@ -1,6 +1,6 @@
-
+
4.0.3.0
MSFT
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 4335523c657505c5b6d1bdf173ea1b2df1497e96..966cfb5e52a92cb37c5b6b45b682b936c8160ffe 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 @@
-
-
+
true
{11ABE2F8-4FB9-48AC-91AA-D04503059550}
@@ -43,5 +42,4 @@
-
-
\ No newline at end of file
+
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 ad2f0ed13956d3625fe23bd154f70795b28476cd..c4419f3e6abb39c8d10daf6884771f39f27d680b 100644
--- a/src/libraries/System.Diagnostics.Contracts/dir.props
+++ b/src/libraries/System.Linq.Queryable/Directory.Build.props
@@ -1,6 +1,6 @@
-
+
4.0.3.0
MSFT
diff --git a/src/libraries/System.Linq/Directory.Build.props b/src/libraries/System.Linq/Directory.Build.props
new file mode 100644
index 0000000000000000000000000000000000000000..c493677ae13c6d9159e5bd8c907fbebdaeac8945
--- /dev/null
+++ b/src/libraries/System.Linq/Directory.Build.props
@@ -0,0 +1,10 @@
+
+
+
+
+ 4.2.1.0
+ MSFT
+ true
+ true
+
+
\ 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 b89fb6fc11e5ba095e3a2620a249d197fdc715cd..0000000000000000000000000000000000000000
--- a/src/libraries/System.Linq/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- 4.2.1.0
- MSFT
- true
- true
-
-
\ 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 3a2542eb5ffbef4fae69a78dce95f98fbc892079..46703800641d50d0224c5981bfb5ba3687c01429 100644
--- a/src/libraries/System.Runtime.Caching/dir.props
+++ b/src/libraries/System.Management/Directory.Build.props
@@ -1,6 +1,6 @@
-
+
2.8.6
@@ -19,5 +19,5 @@
-
+
\ 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 0000000000000000000000000000000000000000..2ac6942ba72955ad2725d7042025eabff5763c4c
--- /dev/null
+++ b/src/libraries/System.ObjectModel/Directory.Build.props
@@ -0,0 +1,10 @@
+
+
+
+
+ 4.1.1.0
+ MSFT
+ true
+ true
+
+
\ 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 e06335977277f4eb38c4264f7b974228ab1595fa..0000000000000000000000000000000000000000
--- a/src/libraries/System.ObjectModel/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- 4.1.1.0
- MSFT
- true
- true
-
-
\ 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 51d360c0ccbfa2684d3f60d91196800792bad1c4..c95af8c33d117659135f3c8ecacc219da8be01d2 100644
--- a/src/libraries/System.Private.DataContractSerialization/dir.props
+++ b/src/libraries/System.Private.DataContractSerialization/Directory.Build.props
@@ -1,6 +1,6 @@
-
+
4.1.4.0
MSFT
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 38f09b54aba5bffb5a2fdfa06333a04cd934c162..bff16d5b4d25e1ed78359af6f4b5024104d03084 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 @@
-
+
4.1.4.0
Open
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 f560fabe73f390f3d5323b25c3b9b435d3062782..a487d69807142eb307464b32a29741034274c4ae 100644
--- a/src/libraries/System.Private.Uri/dir.props
+++ b/src/libraries/System.Private.Uri/Directory.Build.props
@@ -1,6 +1,6 @@
-
+
4.0.5.0
MSFT
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 1b884865a26063188f5bb7afae38a8c1f30c9915..c2a7da21127cc26c3609308be0091e227ab4e438 100644
--- a/src/libraries/System.Private.Xml.Linq/dir.props
+++ b/src/libraries/System.Private.Xml.Linq/Directory.Build.props
@@ -1,6 +1,6 @@
-
+
4.0.1.0
Open
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 1b884865a26063188f5bb7afae38a8c1f30c9915..c2a7da21127cc26c3609308be0091e227ab4e438 100644
--- a/src/libraries/System.Private.Xml/dir.props
+++ b/src/libraries/System.Private.Xml/Directory.Build.props
@@ -1,6 +1,6 @@
-
+
4.0.1.0
Open
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 24a5396d180a567a449207ff15842a742d9ee1f6..6b9f97fd1eedd05f46cb2cd7d09ae0725b35b7db 100644
--- a/src/libraries/System.Reflection.Context/dir.props
+++ b/src/libraries/System.Reflection.Context/Directory.Build.props
@@ -1,6 +1,6 @@
-
+
4.0.3.0
ECMA
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 9b4dcb5fd87f02f9173d961e71546e156526616f..2b43aafe1102c07c554e8aab30f4d89c39987002 100644
--- a/src/libraries/System.Reflection.DispatchProxy/dir.props
+++ b/src/libraries/System.Reflection.DispatchProxy/Directory.Build.props
@@ -1,6 +1,6 @@
-
+
4.0.5.0
MSFT
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 426087ed03653323543e7ced2d4f47ded6195e4a..7f87457bf14727bcfa6753dd5da3797f3821f994 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 @@
-
+
net461;netcoreapp2.0;$(AllXamarinFrameworks)
@@ -29,5 +29,5 @@
.NETCoreApp;UAP
-
+
\ 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 9354ee6570cb2b56978655ce4eb0c0c81f644e24..65e817e99563a272fa9adc4023e62305d70bde20 100644
--- a/src/libraries/System.Reflection.Emit.ILGeneration/dir.props
+++ b/src/libraries/System.Reflection.Emit.ILGeneration/Directory.Build.props
@@ -1,6 +1,6 @@
-
+
4.0.3.0
MSFT
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 9354ee6570cb2b56978655ce4eb0c0c81f644e24..65e817e99563a272fa9adc4023e62305d70bde20 100644
--- a/src/libraries/System.Reflection.Emit.Lightweight/dir.props
+++ b/src/libraries/System.Reflection.Emit.Lightweight/Directory.Build.props
@@ -1,6 +1,6 @@
-
+
4.0.3.0
MSFT
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 e4ff2b0579e467edfff789d7e02468f74217d477..5992753ec98600cb44c3a5f9a1229fd7a61e07e4 100644
--- a/src/libraries/System.Reflection.Emit/dir.props
+++ b/src/libraries/System.Reflection.Emit/Directory.Build.props
@@ -1,6 +1,6 @@
-
+
4.1.1.0
MSFT
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 0000000000000000000000000000000000000000..2ac6942ba72955ad2725d7042025eabff5763c4c
--- /dev/null
+++ b/src/libraries/System.Reflection.Extensions/Directory.Build.props
@@ -0,0 +1,10 @@
+
+
+
+
+ 4.1.1.0
+ MSFT
+ true
+ true
+
+
\ 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 e06335977277f4eb38c4264f7b974228ab1595fa..0000000000000000000000000000000000000000
--- a/src/libraries/System.Reflection.Extensions/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- 4.1.1.0
- MSFT
- true
- true
-
-
\ 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 d08de014db3ae2a32ef9134d4903cd5f3f8f19af..8deb4c801e8b8e799bf819f2d57147dbd37ec9a2 100644
--- a/src/libraries/System.Reflection.Metadata/dir.props
+++ b/src/libraries/System.Reflection.Metadata/Directory.Build.props
@@ -1,6 +1,6 @@
-
+
1.7.0
1.4.4.0
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 e73c04ec8bab56053dd6049bf971a1486691c118..f1b8c12762b6c42b155cd8955701c5b7c691d8a5 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 @@
-
+
net45;netcore45;netcoreapp1.0;wpa81;$(AllXamarinFrameworks)
@@ -15,5 +15,5 @@
.NETCoreApp;UAP
-
+
\ 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 0000000000000000000000000000000000000000..2ac6942ba72955ad2725d7042025eabff5763c4c
--- /dev/null
+++ b/src/libraries/System.Reflection.Primitives/Directory.Build.props
@@ -0,0 +1,10 @@
+
+
+
+
+ 4.1.1.0
+ MSFT
+ true
+ true
+
+
\ 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 e06335977277f4eb38c4264f7b974228ab1595fa..0000000000000000000000000000000000000000
--- a/src/libraries/System.Reflection.Primitives/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- 4.1.1.0
- MSFT
- true
- true
-
-
\ 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 b4fda06b13e8d88a9ae12db85d7d3e25a562fac7..a08bbca5fef83a84b69524270e657e2c5daa5883 100644
--- a/src/libraries/System.Reflection.TypeExtensions/dir.props
+++ b/src/libraries/System.Reflection.TypeExtensions/Directory.Build.props
@@ -1,6 +1,6 @@
-
+
4.1.4.0
MSFT
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 81d437092a7577d206e6e74041b2816be7f3b444..c3cab2beec0e33a5c7c3fcb913e6653600651a4d 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 @@
-
+
net461
@@ -26,5 +26,5 @@
therefore it cannot reference NETStandard.Library -->
-
+
\ 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 0000000000000000000000000000000000000000..c493677ae13c6d9159e5bd8c907fbebdaeac8945
--- /dev/null
+++ b/src/libraries/System.Reflection/Directory.Build.props
@@ -0,0 +1,10 @@
+
+
+
+
+ 4.2.1.0
+ MSFT
+ true
+ true
+
+
\ 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 b89fb6fc11e5ba095e3a2620a249d197fdc715cd..0000000000000000000000000000000000000000
--- a/src/libraries/System.Reflection/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- 4.2.1.0
- MSFT
- true
- true
-
-
\ 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 0000000000000000000000000000000000000000..2ac6942ba72955ad2725d7042025eabff5763c4c
--- /dev/null
+++ b/src/libraries/System.Resources.Reader/Directory.Build.props
@@ -0,0 +1,10 @@
+
+
+
+
+ 4.1.1.0
+ MSFT
+ true
+ true
+
+
\ 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 e06335977277f4eb38c4264f7b974228ab1595fa..0000000000000000000000000000000000000000
--- a/src/libraries/System.Resources.Reader/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- 4.1.1.0
- MSFT
- true
- true
-
-
\ 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 0000000000000000000000000000000000000000..2ac6942ba72955ad2725d7042025eabff5763c4c
--- /dev/null
+++ b/src/libraries/System.Resources.ResourceManager/Directory.Build.props
@@ -0,0 +1,10 @@
+
+
+
+
+ 4.1.1.0
+ MSFT
+ true
+ true
+
+
\ 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 e06335977277f4eb38c4264f7b974228ab1595fa..0000000000000000000000000000000000000000
--- a/src/libraries/System.Resources.ResourceManager/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- 4.1.1.0
- MSFT
- true
- true
-
-
\ 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 0000000000000000000000000000000000000000..2ac6942ba72955ad2725d7042025eabff5763c4c
--- /dev/null
+++ b/src/libraries/System.Resources.Writer/Directory.Build.props
@@ -0,0 +1,10 @@
+
+
+
+
+ 4.1.1.0
+ MSFT
+ true
+ true
+
+
\ 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 e06335977277f4eb38c4264f7b974228ab1595fa..0000000000000000000000000000000000000000
--- a/src/libraries/System.Resources.Writer/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- 4.1.1.0
- MSFT
- true
- true
-
-
\ 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 3a2542eb5ffbef4fae69a78dce95f98fbc892079..46703800641d50d0224c5981bfb5ba3687c01429 100644
--- a/src/libraries/System.DirectoryServices.Protocols/dir.props
+++ b/src/libraries/System.Runtime.Caching/Directory.Build.props
@@ -1,6 +1,6 @@
-
+
-
+
\ 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 0000000000000000000000000000000000000000..2ac6942ba72955ad2725d7042025eabff5763c4c
--- /dev/null
+++ b/src/libraries/System.Security.Cryptography.Csp/Directory.Build.props
@@ -0,0 +1,10 @@
+
+
+
+
+ 4.1.1.0
+ MSFT
+ true
+ true
+
+
\ 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 e06335977277f4eb38c4264f7b974228ab1595fa..0000000000000000000000000000000000000000
--- a/src/libraries/System.Security.Cryptography.Csp/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- 4.1.1.0
- MSFT
- true
- true
-
-
\ 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 0000000000000000000000000000000000000000..2ac6942ba72955ad2725d7042025eabff5763c4c
--- /dev/null
+++ b/src/libraries/System.Security.Cryptography.Encoding/Directory.Build.props
@@ -0,0 +1,10 @@
+
+
+
+
+ 4.1.1.0
+ MSFT
+ true
+ true
+
+
\ 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 e06335977277f4eb38c4264f7b974228ab1595fa..0000000000000000000000000000000000000000
--- a/src/libraries/System.Security.Cryptography.Encoding/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- 4.1.1.0
- MSFT
- true
- true
-
-
\ 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 8c1928e58356184c5695399c3f851cf924d3fe42..56ea582b1e6bdc11517fd08898d4255d3b394761 100644
--- a/src/libraries/Microsoft.Win32.Registry/dir.props
+++ b/src/libraries/System.Security.Cryptography.OpenSsl/Directory.Build.props
@@ -1,6 +1,6 @@
-
+
4.1.2.0
MSFT
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 9908aeeb6475ff24fba70b8e4197872bfd2b49f2..554fe86198f2caa137d51a6ec57aeb6c4415cc6d 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 @@
-
+
@@ -13,5 +13,5 @@
therefore it cannot reference NETStandard.Library -->
-
+
\ 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 0d81e0a9e8804478eccc00c5183a4bf0a20da093..0eee85e44031a25de4c3edf44e2346e6953aedd1 100644
--- a/src/libraries/System.Security.Cryptography.Pkcs/dir.props
+++ b/src/libraries/System.Security.Cryptography.Pkcs/Directory.Build.props
@@ -1,6 +1,6 @@
-
+
4.0.4.0
MSFT
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 234c84175e0f895a2ddd11926c43ffa669a0f443..b31b9c052bdecaa402dcdbc6551769c2797b4f60 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 @@
-
+
net461;netcoreapp2.1;$(AllXamarinFrameworks)
@@ -15,5 +15,5 @@
-->
-
+
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 0000000000000000000000000000000000000000..2ac6942ba72955ad2725d7042025eabff5763c4c
--- /dev/null
+++ b/src/libraries/System.Security.Cryptography.Primitives/Directory.Build.props
@@ -0,0 +1,10 @@
+
+
+
+
+ 4.1.1.0
+ MSFT
+ true
+ true
+
+
\ 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 e06335977277f4eb38c4264f7b974228ab1595fa..0000000000000000000000000000000000000000
--- a/src/libraries/System.Security.Cryptography.Primitives/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- 4.1.1.0
- MSFT
- true
- true
-
-
\ 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 0000000000000000000000000000000000000000..0eee85e44031a25de4c3edf44e2346e6953aedd1
--- /dev/null
+++ b/src/libraries/System.Security.Cryptography.ProtectedData/Directory.Build.props
@@ -0,0 +1,8 @@
+
+
+
+
+ 4.0.4.0
+ MSFT
+
+
\ 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 0d81e0a9e8804478eccc00c5183a4bf0a20da093..0000000000000000000000000000000000000000
--- a/src/libraries/System.Security.Cryptography.ProtectedData/dir.props
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- 4.0.4.0
- MSFT
-
-
\ 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 7068e9d0d7476637750014d07f8dd6acbe0629a7..656e52ecd94758dd3727baaed9f38017a7aad6a8 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 @@
-
+
net461;netcoreapp2.0;$(AllXamarinFrameworks)
@@ -12,5 +12,5 @@
-
+
\ 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 0000000000000000000000000000000000000000..c493677ae13c6d9159e5bd8c907fbebdaeac8945
--- /dev/null
+++ b/src/libraries/System.Security.Cryptography.X509Certificates/Directory.Build.props
@@ -0,0 +1,10 @@
+
+
+
+
+ 4.2.1.0
+ MSFT
+ true
+ true
+
+
\ 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 b89fb6fc11e5ba095e3a2620a249d197fdc715cd..0000000000000000000000000000000000000000
--- a/src/libraries/System.Security.Cryptography.X509Certificates/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- 4.2.1.0
- MSFT
- true
- true
-
-
\ 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 f6666544659dbad1ad5f6f90116387d2515f0b5a..c4358a81dca164e3a6c2b70ceddee380dbaa75c8 100644
--- a/src/libraries/System.Security.Cryptography.Xml/dir.props
+++ b/src/libraries/System.Security.Cryptography.Xml/Directory.Build.props
@@ -1,6 +1,6 @@
-
+
4.0.2.0
Open
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 91094c512215bdf872a18d59f7535230a1058d27..8454234116750185b3502c944326a28d5704b543 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 @@
-
+
net461;netcoreapp2.0;$(AllXamarinFrameworks)
-
+
\ 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 f6666544659dbad1ad5f6f90116387d2515f0b5a..c4358a81dca164e3a6c2b70ceddee380dbaa75c8 100644
--- a/src/libraries/System.Configuration.ConfigurationManager/dir.props
+++ b/src/libraries/System.Security.Permissions/Directory.Build.props
@@ -1,6 +1,6 @@
-
+
4.0.2.0
Open
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 1b214007160ce11e60a157a4440266dfdf785ce0..bb1ff256acb489c3ccd569d6ce9957babbf72e5e 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 @@
-
+
netcoreapp2.0;net461;$(AllXamarinFrameworks)
-
+
\ 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 573a8f4288298096844df21bc0fdd3967879924a..f06489972fe6c3bfe3588aabedfedd53d26f0518 100644
--- a/src/libraries/System.Security.Principal.Windows/dir.props
+++ b/src/libraries/System.Security.Principal.Windows/Directory.Build.props
@@ -1,6 +1,6 @@
-
+
4.1.2.0
MSFT
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 ff0f4989d9f2e346a6080f0a5752a0aedc8d04d9..8ab1ae1cd2ca40dbf4d0da1f0aa56a8cb2a1d814 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 @@
-
+
net461
@@ -16,5 +16,5 @@
therefore it cannot reference NETStandard.Library -->
-
+
\ 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 0000000000000000000000000000000000000000..2ac6942ba72955ad2725d7042025eabff5763c4c
--- /dev/null
+++ b/src/libraries/System.Security.Principal/Directory.Build.props
@@ -0,0 +1,10 @@
+
+
+
+
+ 4.1.1.0
+ MSFT
+ true
+ true
+
+
\ 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 e06335977277f4eb38c4264f7b974228ab1595fa..0000000000000000000000000000000000000000
--- a/src/libraries/System.Security.Principal/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- 4.1.1.0
- MSFT
- true
- true
-
-
\ 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 0000000000000000000000000000000000000000..2ac6942ba72955ad2725d7042025eabff5763c4c
--- /dev/null
+++ b/src/libraries/System.Security.SecureString/Directory.Build.props
@@ -0,0 +1,10 @@
+
+
+
+
+ 4.1.1.0
+ MSFT
+ true
+ true
+
+
\ 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 e06335977277f4eb38c4264f7b974228ab1595fa..0000000000000000000000000000000000000000
--- a/src/libraries/System.Security.SecureString/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- 4.1.1.0
- MSFT
- true
- true
-
-
\ 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 0000000000000000000000000000000000000000..5d39fb280b39a07e7a307e11903ae5f8c172b7ba
--- /dev/null
+++ b/src/libraries/System.ServiceModel.Syndication/Directory.Build.props
@@ -0,0 +1,8 @@
+
+
+
+
+ 4.0.1.0
+ Open
+
+
\ 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 af5b29338515107f9bed1d625fc5c9d8da6e5ffc..0000000000000000000000000000000000000000
--- a/src/libraries/System.ServiceModel.Syndication/dir.props
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- 4.0.1.0
- Open
-
-
\ 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 f3b989267402e4f96f5d7074d5797d34e380a47a..9ae5280b4e06196fbc078020fa524e732d692ec5 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 @@
-
+
uap10.0.16299;net461;netcoreapp2.0;$(AllXamarinFrameworks)
-
+
\ 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 ae40a9e96fb08052f51b13b3de85ce8ad434b861..8308a251978241d3dfc57cc7dae40f0b44eb8a48 100644
--- a/src/libraries/System.ServiceProcess.ServiceController/dir.props
+++ b/src/libraries/System.ServiceProcess.ServiceController/Directory.Build.props
@@ -1,6 +1,6 @@
-
+
4.2.2.0
MSFT
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 7887c3add78b475b7cf454396af1a66c39b4a7bb..08cbc4a86278c19b2c19d8af475b1362714e636c 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 @@
-
+
net461;netcoreapp2.0;$(AllXamarinFrameworks)
@@ -11,5 +11,5 @@
-
+
\ 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 7b967ffb3da202775f8d6b02aa3e4b903e71c7ad..7496d394405d08a959229db09bf9d7e59de90920 100644
--- a/src/libraries/System.Text.Encoding.CodePages/dir.props
+++ b/src/libraries/System.Text.Encoding.CodePages/Directory.Build.props
@@ -1,6 +1,6 @@
-
+
4.1.2.0
MSFT
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 a798cf4fe1649206b6a9f11ec78cc671d80afe51..f16c19c14865450ac3edd247a40df90f9cecf796 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 @@
-
+
net461;netcoreapp2.0;$(AllXamarinFrameworks)
@@ -26,5 +26,5 @@
.NETCoreApp;UAP
-
+
\ 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 0000000000000000000000000000000000000000..2ac6942ba72955ad2725d7042025eabff5763c4c
--- /dev/null
+++ b/src/libraries/System.Text.Encoding.Extensions/Directory.Build.props
@@ -0,0 +1,10 @@
+
+
+
+
+ 4.1.1.0
+ MSFT
+ true
+ true
+
+
\ 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 e06335977277f4eb38c4264f7b974228ab1595fa..0000000000000000000000000000000000000000
--- a/src/libraries/System.Text.Encoding.Extensions/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- 4.1.1.0
- MSFT
- true
- true
-
-
\ 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 0000000000000000000000000000000000000000..2ac6942ba72955ad2725d7042025eabff5763c4c
--- /dev/null
+++ b/src/libraries/System.Text.Encoding/Directory.Build.props
@@ -0,0 +1,10 @@
+
+
+
+
+ 4.1.1.0
+ MSFT
+ true
+ true
+
+
\ 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 e06335977277f4eb38c4264f7b974228ab1595fa..0000000000000000000000000000000000000000
--- a/src/libraries/System.Text.Encoding/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- 4.1.1.0
- MSFT
- true
- true
-
-
\ 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 377a983db9ea7784542e8b9b1a281328b25636f9..1979bc4c5335588988e9c667d26b2f9fac1a2bd5 100644
--- a/src/libraries/System.Text.Encodings.Web/dir.props
+++ b/src/libraries/System.Text.Encodings.Web/Directory.Build.props
@@ -1,6 +1,6 @@
-
+
4.0.4.0
Open
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 b8f908357c3fd4dd983a726e6e80ee83189d51e6..b5634e537621947e9771a5ee08e2a1df29b01c78 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 @@
-
+
net45;netcore45;wp8;wpa81;netcoreapp1.0;$(AllXamarinFrameworks)
-
+
\ 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 0000000000000000000000000000000000000000..c493677ae13c6d9159e5bd8c907fbebdaeac8945
--- /dev/null
+++ b/src/libraries/System.Text.RegularExpressions/Directory.Build.props
@@ -0,0 +1,10 @@
+
+
+
+
+ 4.2.1.0
+ MSFT
+ true
+ true
+
+
\ 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 b89fb6fc11e5ba095e3a2620a249d197fdc715cd..0000000000000000000000000000000000000000
--- a/src/libraries/System.Text.RegularExpressions/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- 4.2.1.0
- MSFT
- true
- true
-
-
\ 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 0000000000000000000000000000000000000000..0eee85e44031a25de4c3edf44e2346e6953aedd1
--- /dev/null
+++ b/src/libraries/System.Threading.AccessControl/Directory.Build.props
@@ -0,0 +1,8 @@
+
+
+
+
+ 4.0.4.0
+ MSFT
+
+
\ 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 0d81e0a9e8804478eccc00c5183a4bf0a20da093..0000000000000000000000000000000000000000
--- a/src/libraries/System.Threading.AccessControl/dir.props
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- 4.0.4.0
- MSFT
-
-
\ 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 5c15d6245e6e6b57ee2a05f8403f22a10610ceb9..1ec50d77055076776ed30b571d4bce8deb821cc7 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 @@
-
+
net461;netcoreapp2.0;$(AllXamarinFrameworks)
@@ -12,5 +12,5 @@
-
+
\ 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 0000000000000000000000000000000000000000..5d39fb280b39a07e7a307e11903ae5f8c172b7ba
--- /dev/null
+++ b/src/libraries/System.Threading.Channels/Directory.Build.props
@@ -0,0 +1,8 @@
+
+
+
+
+ 4.0.1.0
+ Open
+
+
\ 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 af5b29338515107f9bed1d625fc5c9d8da6e5ffc..0000000000000000000000000000000000000000
--- a/src/libraries/System.Threading.Channels/dir.props
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- 4.0.1.0
- Open
-
-
\ 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 0ee61eec68586d2d30f880e12de5e88fc2d87843..88314191da9d0d15cc26aecc7dbf040f0b514cbf 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 @@
-
+
net46;netcore50;netcoreapp1.0;$(UAPvNextTFM);$(AllXamarinFrameworks)
-
+
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 0000000000000000000000000000000000000000..2ac6942ba72955ad2725d7042025eabff5763c4c
--- /dev/null
+++ b/src/libraries/System.Threading.Overlapped/Directory.Build.props
@@ -0,0 +1,10 @@
+
+
+
+
+ 4.1.1.0
+ MSFT
+ true
+ true
+
+
\ 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 e06335977277f4eb38c4264f7b974228ab1595fa..0000000000000000000000000000000000000000
--- a/src/libraries/System.Threading.Overlapped/dir.props
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- 4.1.1.0
- MSFT
- true
- true
-
-
\ 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 14bfc29ac76cdac8fe43eeeaf1045817281fa363..c47b4435a2984b48fb92db8f7b8ca599a3e91cc7 100644
--- a/src/libraries/System.Threading.Tasks.Dataflow/dir.props
+++ b/src/libraries/System.Threading.Tasks.Dataflow/Directory.Build.props
@@ -1,6 +1,6 @@
-
+
4.10.0
4.6.4.0
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 cd56866eecfebd61b87306bbdb12d652a0beeb02..cdf941049060f2608d5c6d4245d3198a83a0d234 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 @@
-
+
net45;netcore45;wp8;wpa81;netcoreapp1.0;$(AllXamarinFrameworks)
@@ -15,5 +15,5 @@
.NETCoreApp;UAP
-
+
\ 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 4d526103b03c6e9dfdc4cb40707d3c2b1ae592a7..9b7a91f5413e7b14b67461ddc4d2a71da2926a2a 100644
--- a/src/libraries/System.Threading.Tasks.Extensions/dir.props
+++ b/src/libraries/System.Threading.Tasks.Extensions/Directory.Build.props
@@ -1,6 +1,6 @@
-
+
4.2.1.0
2.8.6
@@ -19,10 +19,10 @@
therefore it cannot reference NETStandard.Library -->
-
+
@@ -22,7 +22,7 @@
-
+
@@ -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)" />
diff --git a/src/libraries/dir.props b/src/libraries/dir.props
deleted file mode 100644
index 64eb54685b5dd007f128fcc9bf6eaf50de81fcd4..0000000000000000000000000000000000000000
--- a/src/libraries/dir.props
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/src/libraries/dir.targets b/src/libraries/dir.targets
deleted file mode 100644
index 2efc115b47e1b3b957510ccad52dec7b8c2a5478..0000000000000000000000000000000000000000
--- a/src/libraries/dir.targets
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
- true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/libraries/dirs.proj b/src/libraries/dirs.proj
index e98055b274f31b8940a3c2d6a363e927af7e3276..24980c02649a00e657742d88293a5a2088a260f7 100644
--- a/src/libraries/dirs.proj
+++ b/src/libraries/dirs.proj
@@ -1,5 +1,5 @@
-
+
@@ -43,7 +43,7 @@
-
+
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 a874fd0e204fb691eaf73fdd40f6e1435253ea9b..674adbbd69236f17d58b5a48d3740ef8f845a2e3 100644
--- a/src/libraries/external/dir.props
+++ b/src/libraries/external/Directory.Build.props
@@ -1,5 +1,5 @@
-
+
$(IntermediateOutputPath)$(OSGroup)-$(ArchGroup)/
None
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 83f658c87b994b232fe2c38e37aa51aa5b3b5fa5..7c9bff7f39c3fc1efe9e32cd636e9be85543ba42 100644
--- a/src/libraries/external/dir.targets
+++ b/src/libraries/external/Directory.Build.targets
@@ -1,5 +1,5 @@
-
+
true
diff --git a/src/libraries/external/ILLink/ILLink.depproj b/src/libraries/external/ILLink/ILLink.depproj
index bf0467464635da76ad8d2aadfad1dfb83074b7a7..e26c39c3fc01190f33ad8662069bb24f012b168c 100644
--- a/src/libraries/external/ILLink/ILLink.depproj
+++ b/src/libraries/external/ILLink/ILLink.depproj
@@ -1,6 +1,6 @@
-
+
.NETCoreApp,Version=v1.1
netcoreapp1.1
@@ -16,7 +16,7 @@
$(ILLinkTasksPackageVersion)
-
+
diff --git a/src/libraries/external/SharedFrameworkValidation/harvestPackages.SharedFramework.depproj b/src/libraries/external/SharedFrameworkValidation/harvestPackages.SharedFramework.depproj
index a1bc6c2d66f40a7af3e39d00fcb1c0ea7ba6de95..70b470f954413aeef95696d94ac169d99f65f265 100644
--- a/src/libraries/external/SharedFrameworkValidation/harvestPackages.SharedFramework.depproj
+++ b/src/libraries/external/SharedFrameworkValidation/harvestPackages.SharedFramework.depproj
@@ -1,6 +1,6 @@
-
+
<_LatestStable>1.1.2
@@ -27,5 +27,5 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/external/dir.proj b/src/libraries/external/dir.proj
index 43b80856fff0485f5de9346e4f862ed5757f86d9..b4cac3744df079a54c87f2e6af8db34c0eb5b29a 100644
--- a/src/libraries/external/dir.proj
+++ b/src/libraries/external/dir.proj
@@ -1,5 +1,5 @@
-
+
$(AdditionalBuildConfigurations);netstandard-$(OSGroup)-$(ConfigurationGroup)-$(ArchGroup)
diff --git a/src/libraries/external/docs/docs.depproj b/src/libraries/external/docs/docs.depproj
index 21f41e5384b8308226e725a90c403e1fe2bb95c2..f65bf1482e20184f3406efece82d7ec96ad5fa1a 100644
--- a/src/libraries/external/docs/docs.depproj
+++ b/src/libraries/external/docs/docs.depproj
@@ -1,6 +1,6 @@
-
+
$(XmlDocDir)
@@ -49,5 +49,5 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/external/harvestPackages/harvestPackages.depproj b/src/libraries/external/harvestPackages/harvestPackages.depproj
index 7902fc5d6ba36cbb98de4c83ca7e3cff92e632e6..a4731add4603ae8d59b3d888560d5ac21088451f 100644
--- a/src/libraries/external/harvestPackages/harvestPackages.depproj
+++ b/src/libraries/external/harvestPackages/harvestPackages.depproj
@@ -1,7 +1,7 @@
-
-
+
+
netstandard2.0
diff --git a/src/libraries/external/netcoreapp/netcoreapp.depproj b/src/libraries/external/netcoreapp/netcoreapp.depproj
index 1e076c34ae2aadba4df19cb05ac79acb15383919..499360b7845a45791af9e225ff0fb93a654b70af 100644
--- a/src/libraries/external/netcoreapp/netcoreapp.depproj
+++ b/src/libraries/external/netcoreapp/netcoreapp.depproj
@@ -1,6 +1,6 @@
-
+
@@ -25,5 +25,5 @@
-
+
diff --git a/src/libraries/external/netfx/netfx.depproj b/src/libraries/external/netfx/netfx.depproj
index 4f35754e7b4b7e23877a531690a252405f650617..e27ff6db875527a2f9fa1e73df200779f080d177 100644
--- a/src/libraries/external/netfx/netfx.depproj
+++ b/src/libraries/external/netfx/netfx.depproj
@@ -1,6 +1,6 @@
-
+
true
@@ -98,5 +98,5 @@
-
+
diff --git a/src/libraries/external/netstandard/netstandard.depproj b/src/libraries/external/netstandard/netstandard.depproj
index ca8098610936c610682b8dbbaab1ef6d61b49d3c..6fbac98f90cc85d1b497a457ba5a11b0f5721f14 100644
--- a/src/libraries/external/netstandard/netstandard.depproj
+++ b/src/libraries/external/netstandard/netstandard.depproj
@@ -1,6 +1,6 @@
-
+
$(NuGetTargetMoniker.SubString(22))
true
@@ -72,5 +72,5 @@
-
+
diff --git a/src/libraries/external/portable/portable.depproj b/src/libraries/external/portable/portable.depproj
index 1ac886ed1299d687e9609912bdf04912d6c6e3a8..33dd6091fa4de4feca486146540389ba8a6e4368 100644
--- a/src/libraries/external/portable/portable.depproj
+++ b/src/libraries/external/portable/portable.depproj
@@ -1,6 +1,6 @@
-
+
true
Reference
@@ -16,5 +16,5 @@
$(RefPath)
-
+
\ No newline at end of file
diff --git a/src/libraries/external/runtime/runtime.depproj b/src/libraries/external/runtime/runtime.depproj
index 396489963149d2e192261cae98911ea1d3584025..cfc627fb634cc0ef9846fd3a5def28fe952cb990 100644
--- a/src/libraries/external/runtime/runtime.depproj
+++ b/src/libraries/external/runtime/runtime.depproj
@@ -1,6 +1,6 @@
-
+
$(PackageRID)
true
@@ -44,7 +44,7 @@
-
+
diff --git a/src/libraries/external/test-runtime/XUnit.Runtime.depproj b/src/libraries/external/test-runtime/XUnit.Runtime.depproj
index 44fecf2dcb7e5c1ea9fe241a8c94d8614ac039bc..0b760d124ff72dd2def8bda1f1a01a11f1f4efeb 100644
--- a/src/libraries/external/test-runtime/XUnit.Runtime.depproj
+++ b/src/libraries/external/test-runtime/XUnit.Runtime.depproj
@@ -1,6 +1,6 @@
-
+
@@ -152,7 +152,7 @@
-
+
-
+
@@ -35,5 +35,5 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/external/winrt/winrt.depproj b/src/libraries/external/winrt/winrt.depproj
index 95a9ed5c4ff2ccaff2d7b34ea85637a1f1c6edb9..619f50965bf3ef486a5aa68bf783fe811d56699f 100644
--- a/src/libraries/external/winrt/winrt.depproj
+++ b/src/libraries/external/winrt/winrt.depproj
@@ -1,6 +1,6 @@
-
+
Windows
.winmd
@@ -12,5 +12,5 @@
1.0.5
-
+
\ No newline at end of file
diff --git a/src/libraries/packages.builds b/src/libraries/packages.builds
index 41d3c937b70e088ba1cf42b8795ae6e5c7b405a3..f08ae34584305872ff214b44a6d7bf72a86ef919 100644
--- a/src/libraries/packages.builds
+++ b/src/libraries/packages.builds
@@ -1,6 +1,6 @@
-
+
$(BinDir)pkg/reports/
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 81edaa295dc60dfc3f201f2b3e39139f509d0204..19e61cb1b2306b78aa38974fb8969e86ca0d11fb 100644
--- a/src/libraries/pkg/dir.props
+++ b/src/libraries/pkg/Directory.Build.props
@@ -1,6 +1,6 @@
-
+
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 bfe81d87c985ea94ab798b74ff7f937af565c5be..ed8cd7119eb7a4aa498bd741899dad1300173eb0 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 @@
-
+
netcoreapp
@@ -58,5 +58,5 @@
-
+
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 4f29ab1ba39afe5971183de51cd2fd25c87244d2..267975a78d2b6637588b1d0b838a3324fc1aa46e 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 @@
-
+
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 10051266356a8827cb5b8bcc9cefe3d03a72acfa..6149d787583c0007653a1ba3d994baefb1c2347d 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 @@
-
+
$(CompatibilityShimsPackageVersion)
@@ -41,5 +41,5 @@
-
+
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 b74a5259bbf0ebd1c34cab7ced25f341e5982465..ad70bbf5f865691ab1a1dec88100dc586d825087 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 @@
-
+
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 81805cec9b6a3a73b5ea11ba70ac949ef017f7ae..5eee2bc15f0c1b19513152eab452ac389049dc34 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 @@
-
+
<_PreReleasePackageVersion>$(PackageVersion)
@@ -73,5 +73,5 @@
$(CompatibilityShimsPackageVersion)
-
+
\ No newline at end of file
diff --git a/src/libraries/pkg/test/testPackages.proj b/src/libraries/pkg/test/testPackages.proj
index dc29aac152a76f614100e21b85f70c957f075203..5e25f650e2a3ff35580c802c899185101d3f0c7a 100644
--- a/src/libraries/pkg/test/testPackages.proj
+++ b/src/libraries/pkg/test/testPackages.proj
@@ -1,6 +1,6 @@
-
+
@@ -179,5 +179,5 @@
-
+
diff --git a/src/libraries/post.builds b/src/libraries/post.builds
index 5957046baf9ce00ada97cd41c63e9c0a91ec53bf..5feec77d28fa692ebe6dff2196ca2db625744dd8 100644
--- a/src/libraries/post.builds
+++ b/src/libraries/post.builds
@@ -1,8 +1,8 @@
-
-
+
+
diff --git a/src/libraries/publish.proj b/src/libraries/publish.proj
index 32be546c29c395107d4a082d4e0a46c5245d9b84..60c946849e948942619f321400bf93315a62f416 100644
--- a/src/libraries/publish.proj
+++ b/src/libraries/publish.proj
@@ -1,7 +1,7 @@
-
-
+
+
diff --git a/src/libraries/ref.builds b/src/libraries/ref.builds
index c7542be16a37f72f6073afc91c1a043f0df5b916..2753148a202f9e1bc2d7f21d55e99794fc6a9d29 100644
--- a/src/libraries/ref.builds
+++ b/src/libraries/ref.builds
@@ -1,6 +1,6 @@
-
+
$(AdditionalBuildConfigurations);netstandard-$(OSGroup)-$(ConfigurationGroup)-$(ArchGroup)
diff --git a/src/libraries/shims/ApiCompat.proj b/src/libraries/shims/ApiCompat.proj
index f55eb98bb9c3a5df562a6a2273c85b9fbfdef312..17e1d420bb05734f2affcfb529e2116081910b4a 100644
--- a/src/libraries/shims/ApiCompat.proj
+++ b/src/libraries/shims/ApiCompat.proj
@@ -7,7 +7,7 @@
-
+
$(IntermediateOutputPath)/apicompat.rsp
@@ -95,5 +95,5 @@
-
+
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 42378f6ef4962ca0dd924b70fa664c3daa7042e3..f583307ae92ae06b19ff259f8f6762eb93e345f5 100644
--- a/src/libraries/shims/dir.props
+++ b/src/libraries/shims/Directory.Build.props
@@ -9,7 +9,7 @@
-
+
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 03a82d2305118a01813c86feeb82c2d949e78128..1a3e02f472e511118bd3f8743db6db65547cacb3 100644
--- a/src/libraries/shims/manual/dir.props
+++ b/src/libraries/shims/manual/Directory.Build.props
@@ -8,8 +8,8 @@
true
true
-
-
+
+
4.0.0.0
ECMA
@@ -21,4 +21,4 @@
$(NetFxRefPath)$(MSBuildProjectName).dll
$(DefineConstants);netcoreapp
-
\ No newline at end of file
+
diff --git a/src/libraries/shims/shims.proj b/src/libraries/shims/shims.proj
index 216e429a6cf5b6e91e3aacc69450b78f1ae79d0b..12dcfcb58cf76e9fd4a7f457791d2709c8fde83a 100644
--- a/src/libraries/shims/shims.proj
+++ b/src/libraries/shims/shims.proj
@@ -1,6 +1,6 @@
-
+
@@ -72,7 +72,7 @@
-
+
diff --git a/src/libraries/sign.builds b/src/libraries/sign.builds
index d22978a41db523ffe38b4ccc49d50f1dfe6cfb7a..d3706b9899bbe51550c5b83e4346558f26305539 100644
--- a/src/libraries/sign.builds
+++ b/src/libraries/sign.builds
@@ -1,8 +1,8 @@
-
-
+
+
diff --git a/src/libraries/src.builds b/src/libraries/src.builds
index ba21b62904640f756f07886fed8b3b21f631c757..48f6eb8d6a621328c5e3d2e847fca7dae1b83d54 100644
--- a/src/libraries/src.builds
+++ b/src/libraries/src.builds
@@ -1,6 +1,6 @@
-
+
diff --git a/src/libraries/syncAzure.proj b/src/libraries/syncAzure.proj
index 80f1278fcd1da8a4161a1190058cc3b0f18d7e72..3f72288284ece769e9f2708d070428e20193c5f4 100644
--- a/src/libraries/syncAzure.proj
+++ b/src/libraries/syncAzure.proj
@@ -1,6 +1,6 @@
-
+
$(ContainerName.Replace(".","-"))
diff --git a/src/libraries/tests.builds b/src/libraries/tests.builds
index 833ac384c11c8639f72bfdba0c9f89132dd65b09..570076898ff2861f890caa3474bbf03d33fb9b69 100644
--- a/src/libraries/tests.builds
+++ b/src/libraries/tests.builds
@@ -1,6 +1,6 @@
-
+