diff --git a/src/libraries/Microsoft.CSharp/pkg/Microsoft.CSharp.builds b/src/libraries/Microsoft.CSharp/pkg/Microsoft.CSharp.builds
index ff77c16c86e5af007ed735bb2069f6108899e9b5..f4e337b2e16664ef3d068d9fce9a120726158d2e 100644
--- a/src/libraries/Microsoft.CSharp/pkg/Microsoft.CSharp.builds
+++ b/src/libraries/Microsoft.CSharp/pkg/Microsoft.CSharp.builds
@@ -1,8 +1,8 @@
-
+
-
+
\ No newline at end of file
diff --git a/src/libraries/Microsoft.CSharp/pkg/Microsoft.CSharp.pkgproj b/src/libraries/Microsoft.CSharp/pkg/Microsoft.CSharp.pkgproj
index e8b3917adf6de33afba18dd874dd5cc216602dd3..05dd1d5b9bdc4509136da974bfc3891abe1cf381 100644
--- a/src/libraries/Microsoft.CSharp/pkg/Microsoft.CSharp.pkgproj
+++ b/src/libraries/Microsoft.CSharp/pkg/Microsoft.CSharp.pkgproj
@@ -1,9 +1,9 @@
-
+
- net463;netcoreapp1.1;$(AllXamarinFrameworks)
+ net463;netcoreapp2.0;$(AllXamarinFrameworks)
diff --git a/src/libraries/Microsoft.CSharp/ref/Microsoft.CSharp.csproj b/src/libraries/Microsoft.CSharp/ref/Microsoft.CSharp.csproj
index ccb67c56148c5da41915a84d3c0a4f605af12e7e..330103c0026dec21e129118a80ac98a5c5900b49 100644
--- a/src/libraries/Microsoft.CSharp/ref/Microsoft.CSharp.csproj
+++ b/src/libraries/Microsoft.CSharp/ref/Microsoft.CSharp.csproj
@@ -1,4 +1,4 @@
-
+
@@ -10,4 +10,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/Microsoft.CSharp/src/Configurations.props b/src/libraries/Microsoft.CSharp/src/Configurations.props
index fc9ef9822c01e3840af50ced2f25bdc2f5349eca..c398e42e899425ce70e3a9884633835ab6fcc66e 100644
--- a/src/libraries/Microsoft.CSharp/src/Configurations.props
+++ b/src/libraries/Microsoft.CSharp/src/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/Microsoft.CSharp/tests/Configurations.props b/src/libraries/Microsoft.CSharp/tests/Configurations.props
index 98f53209d45a12360d0bbf7cf031b29ff556fc57..c398e42e899425ce70e3a9884633835ab6fcc66e 100644
--- a/src/libraries/Microsoft.CSharp/tests/Configurations.props
+++ b/src/libraries/Microsoft.CSharp/tests/Configurations.props
@@ -1,8 +1,8 @@
-
+
- netstandard1.7;
+ netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.builds b/src/libraries/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.builds
index a5b9ec4dddeec3ff190baae58ec76814fc101fb3..c8447fb37526f5220435534c6e936bb6ff3cf0ec 100644
--- a/src/libraries/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.builds
+++ b/src/libraries/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.csproj b/src/libraries/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.csproj
index f0605160184a1e4c88512e72c3181f0f3cdf7056..8116d5f292ff82f2809cf79b0e39d70d45694355 100644
--- a/src/libraries/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.csproj
+++ b/src/libraries/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.csproj
@@ -1,4 +1,4 @@
-
+
@@ -10,4 +10,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/Microsoft.TargetingPack.Private.CoreCLR/ref/Microsoft.TargetingPack.Private.CoreCLR.depproj b/src/libraries/Microsoft.TargetingPack.Private.CoreCLR/ref/Microsoft.TargetingPack.Private.CoreCLR.depproj
index 39b1a43ac96ca9f55b9ff8df24fb64f5ddbdd2a6..dc1e837ebf71ce2c33c39fbc2f02de8724565abf 100644
--- a/src/libraries/Microsoft.TargetingPack.Private.CoreCLR/ref/Microsoft.TargetingPack.Private.CoreCLR.depproj
+++ b/src/libraries/Microsoft.TargetingPack.Private.CoreCLR/ref/Microsoft.TargetingPack.Private.CoreCLR.depproj
@@ -1,9 +1,9 @@
-
+
System.Private.CoreLib
- .NETCoreApp,Version=v1.1
+ .NETCoreApp,Version=v2.0
diff --git a/src/libraries/Microsoft.TargetingPack.Private.CoreCLR/ref/project.json b/src/libraries/Microsoft.TargetingPack.Private.CoreCLR/ref/project.json
index b3b29b50a45a415291472da4b620877339249edc..94fab1bd007229cd58b0112dbc4b26016adb1500 100644
--- a/src/libraries/Microsoft.TargetingPack.Private.CoreCLR/ref/project.json
+++ b/src/libraries/Microsoft.TargetingPack.Private.CoreCLR/ref/project.json
@@ -3,6 +3,6 @@
"Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24904-03"
},
"frameworks": {
- "netcoreapp1.1": {}
+ "netcoreapp2.0": {}
}
}
diff --git a/src/libraries/Microsoft.TargetingPack.Private.WinRT/ref/Microsoft.TargetingPack.Private.WinRT.depproj b/src/libraries/Microsoft.TargetingPack.Private.WinRT/ref/Microsoft.TargetingPack.Private.WinRT.depproj
index 5f01d724a0391c84dda27eba942deb0f0da57ac5..d2702e2b8e493ad30d36dd4ddf0f52b78a6eebb1 100644
--- a/src/libraries/Microsoft.TargetingPack.Private.WinRT/ref/Microsoft.TargetingPack.Private.WinRT.depproj
+++ b/src/libraries/Microsoft.TargetingPack.Private.WinRT/ref/Microsoft.TargetingPack.Private.WinRT.depproj
@@ -1,4 +1,4 @@
-
+
@@ -10,4 +10,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/Microsoft.VisualBasic/pkg/Microsoft.VisualBasic.builds b/src/libraries/Microsoft.VisualBasic/pkg/Microsoft.VisualBasic.builds
index 5bfdf24482820652a4b57ae46dcf0c03fbb86edf..7eee71ec8d48c92e7cb4dbc2239fc6f6882bdd1f 100644
--- a/src/libraries/Microsoft.VisualBasic/pkg/Microsoft.VisualBasic.builds
+++ b/src/libraries/Microsoft.VisualBasic/pkg/Microsoft.VisualBasic.builds
@@ -1,9 +1,9 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/src/libraries/Microsoft.VisualBasic/ref/Microsoft.VisualBasic.csproj b/src/libraries/Microsoft.VisualBasic/ref/Microsoft.VisualBasic.csproj
index 51df31f1efca032edc005345ce9d5c1ee41f395e..ee856b066f6b1c18587a509e433a6443dbe519c8 100644
--- a/src/libraries/Microsoft.VisualBasic/ref/Microsoft.VisualBasic.csproj
+++ b/src/libraries/Microsoft.VisualBasic/ref/Microsoft.VisualBasic.csproj
@@ -1,4 +1,4 @@
-
+
@@ -11,4 +11,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/Microsoft.VisualBasic/src/Configurations.props b/src/libraries/Microsoft.VisualBasic/src/Configurations.props
index f0ebe53119ec712315cfea5b151d5f0d754744f8..c3266e1e9362243b5723032465bcc7a62ae720ce 100644
--- a/src/libraries/Microsoft.VisualBasic/src/Configurations.props
+++ b/src/libraries/Microsoft.VisualBasic/src/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard1.3;
-
+
\ No newline at end of file
diff --git a/src/libraries/Microsoft.VisualBasic/src/Microsoft.VisualBasic.vbproj b/src/libraries/Microsoft.VisualBasic/src/Microsoft.VisualBasic.vbproj
index 08d3ded38340b081e713a478051ddcaf78ac2345..343c81e7fb4861866cbdaa720d806b450dc557ae 100644
--- a/src/libraries/Microsoft.VisualBasic/src/Microsoft.VisualBasic.vbproj
+++ b/src/libraries/Microsoft.VisualBasic/src/Microsoft.VisualBasic.vbproj
@@ -65,4 +65,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/Microsoft.VisualBasic/tests/Configurations.props b/src/libraries/Microsoft.VisualBasic/tests/Configurations.props
index f0ebe53119ec712315cfea5b151d5f0d754744f8..c3266e1e9362243b5723032465bcc7a62ae720ce 100644
--- a/src/libraries/Microsoft.VisualBasic/tests/Configurations.props
+++ b/src/libraries/Microsoft.VisualBasic/tests/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard1.3;
-
+
\ No newline at end of file
diff --git a/src/libraries/Microsoft.VisualBasic/tests/Microsoft.VisualBasic.Tests.builds b/src/libraries/Microsoft.VisualBasic/tests/Microsoft.VisualBasic.Tests.builds
index dd59ef67ad13cabccccccbf51f3afd55a0e8e9d5..e7a5e7cf1f019ad52a16d59cb2d6a8af702081fa 100644
--- a/src/libraries/Microsoft.VisualBasic/tests/Microsoft.VisualBasic.Tests.builds
+++ b/src/libraries/Microsoft.VisualBasic/tests/Microsoft.VisualBasic.Tests.builds
@@ -1,12 +1,12 @@
-
+
Windows_NT
- netcore50;netcoreapp1.0;netcoreapp1.1;net46;net461;net462;net463
+ netcore50;netcoreapp1.0;netcoreapp;net46;net461;net462;net463
-
+
\ No newline at end of file
diff --git a/src/libraries/Microsoft.VisualBasic/tests/Microsoft.VisualBasic.Tests.csproj b/src/libraries/Microsoft.VisualBasic/tests/Microsoft.VisualBasic.Tests.csproj
index ba77126032aa197a25c230a11caff3efc856d72b..abf36dd1b84ed9a37607b20022daf3fa764e5605 100644
--- a/src/libraries/Microsoft.VisualBasic/tests/Microsoft.VisualBasic.Tests.csproj
+++ b/src/libraries/Microsoft.VisualBasic/tests/Microsoft.VisualBasic.Tests.csproj
@@ -1,4 +1,4 @@
-
+
@@ -10,4 +10,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/Microsoft.Win32.Primitives/pkg/Microsoft.Win32.Primitives.builds b/src/libraries/Microsoft.Win32.Primitives/pkg/Microsoft.Win32.Primitives.builds
index 8f48296c6f2a3e44316516158927cd3ae83ed7e3..c155e9ebb1f92797f77ee7de46275b47cdf69eb9 100644
--- a/src/libraries/Microsoft.Win32.Primitives/pkg/Microsoft.Win32.Primitives.builds
+++ b/src/libraries/Microsoft.Win32.Primitives/pkg/Microsoft.Win32.Primitives.builds
@@ -1,4 +1,4 @@
-
+
@@ -11,5 +11,4 @@
-
-
+
\ No newline at end of file
diff --git a/src/libraries/Microsoft.Win32.Primitives/pkg/Microsoft.Win32.Primitives.pkgproj b/src/libraries/Microsoft.Win32.Primitives/pkg/Microsoft.Win32.Primitives.pkgproj
index 5d7dfcd16ad787bb1fb336c899bfb70c2fa4678f..4ca445e50dc87d8b3312d1c778fc15f6d506ef7e 100644
--- a/src/libraries/Microsoft.Win32.Primitives/pkg/Microsoft.Win32.Primitives.pkgproj
+++ b/src/libraries/Microsoft.Win32.Primitives/pkg/Microsoft.Win32.Primitives.pkgproj
@@ -1,9 +1,9 @@
-
+
- net463;uap10.1;netcoreapp1.1;$(AllXamarinFrameworks)
+ net463;uap10.1;netcoreapp2.0;$(AllXamarinFrameworks)
TargetGroup=net463
diff --git a/src/libraries/Microsoft.Win32.Primitives/pkg/unix/Microsoft.Win32.Primitives.pkgproj b/src/libraries/Microsoft.Win32.Primitives/pkg/unix/Microsoft.Win32.Primitives.pkgproj
index fa3d41b0c84f8f569d983a9397c0eac5f46535f5..3886b8703ee7f5dd4be8ecafabb912ac521bf442 100644
--- a/src/libraries/Microsoft.Win32.Primitives/pkg/unix/Microsoft.Win32.Primitives.pkgproj
+++ b/src/libraries/Microsoft.Win32.Primitives/pkg/unix/Microsoft.Win32.Primitives.pkgproj
@@ -1,17 +1,14 @@
-
+
-
unix
true
-
-
+
Unix
-
\ No newline at end of file
diff --git a/src/libraries/Microsoft.Win32.Primitives/pkg/win/Microsoft.Win32.Primitives.pkgproj b/src/libraries/Microsoft.Win32.Primitives/pkg/win/Microsoft.Win32.Primitives.pkgproj
index f8b100e7f52eb2051bf55381975434a2688be9f8..c5b6a4c4281f00a0566065312c5a5b168cef4ebd 100644
--- a/src/libraries/Microsoft.Win32.Primitives/pkg/win/Microsoft.Win32.Primitives.pkgproj
+++ b/src/libraries/Microsoft.Win32.Primitives/pkg/win/Microsoft.Win32.Primitives.pkgproj
@@ -1,20 +1,16 @@
-
+
-
win
true
-
-
+
Windows_NT
-
-
\ No newline at end of file
diff --git a/src/libraries/Microsoft.Win32.Primitives/ref/Microsoft.Win32.Primitives.csproj b/src/libraries/Microsoft.Win32.Primitives/ref/Microsoft.Win32.Primitives.csproj
index f7e77bb04f799700c197ae62b278374a90a964a6..f9181deee74aba966be8e186ba4e1a01aacc6ff3 100644
--- a/src/libraries/Microsoft.Win32.Primitives/ref/Microsoft.Win32.Primitives.csproj
+++ b/src/libraries/Microsoft.Win32.Primitives/ref/Microsoft.Win32.Primitives.csproj
@@ -1,4 +1,4 @@
-
+
@@ -8,4 +8,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/Microsoft.Win32.Primitives/src/Configurations.props b/src/libraries/Microsoft.Win32.Primitives/src/Configurations.props
index 3bb6330d9e73da4e4998b3dcba9a05936bf49b7e..4701fcd7729002100465c5249f5ddfe14f92bedd 100644
--- a/src/libraries/Microsoft.Win32.Primitives/src/Configurations.props
+++ b/src/libraries/Microsoft.Win32.Primitives/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -7,4 +7,4 @@
net463-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/Microsoft.Win32.Primitives/src/Microsoft.Win32.Primitives.csproj b/src/libraries/Microsoft.Win32.Primitives/src/Microsoft.Win32.Primitives.csproj
index 1957d70f100e7d5facae1520baa0d68927cc7d73..b50f9dc0d75ceb391e7865559a6b0354faf8b631 100644
--- a/src/libraries/Microsoft.Win32.Primitives/src/Microsoft.Win32.Primitives.csproj
+++ b/src/libraries/Microsoft.Win32.Primitives/src/Microsoft.Win32.Primitives.csproj
@@ -8,7 +8,7 @@
true
true
- netstandard1.7;uap10.1
+ netstandard;uap10.1
diff --git a/src/libraries/Microsoft.Win32.Primitives/tests/Configurations.props b/src/libraries/Microsoft.Win32.Primitives/tests/Configurations.props
index 512c938bad5364c677a3f4d9f647f1ade8c14aea..b2db637110616a495d303924e9aaf8b800db4821 100644
--- a/src/libraries/Microsoft.Win32.Primitives/tests/Configurations.props
+++ b/src/libraries/Microsoft.Win32.Primitives/tests/Configurations.props
@@ -1,9 +1,9 @@
-
+
netstandard1.3;
- netstandard1.7;
+ netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/Microsoft.Win32.Primitives/tests/Microsoft.Win32.Primitives.Tests.builds b/src/libraries/Microsoft.Win32.Primitives/tests/Microsoft.Win32.Primitives.Tests.builds
index 10446e0f5dc92cffed02bc470efb507d46f7e7bd..fc4de337ee37eecb854d7d339a7659755573260d 100644
--- a/src/libraries/Microsoft.Win32.Primitives/tests/Microsoft.Win32.Primitives.Tests.builds
+++ b/src/libraries/Microsoft.Win32.Primitives/tests/Microsoft.Win32.Primitives.Tests.builds
@@ -1,4 +1,4 @@
-
+
@@ -18,4 +18,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/Microsoft.Win32.Primitives/tests/Microsoft.Win32.Primitives.Tests.csproj b/src/libraries/Microsoft.Win32.Primitives/tests/Microsoft.Win32.Primitives.Tests.csproj
index 3001b5c3cb950bfba3c0e712d3d7c6579629962f..60266457b81a090a9b92f5ed9d539b6bc48f7f9f 100644
--- a/src/libraries/Microsoft.Win32.Primitives/tests/Microsoft.Win32.Primitives.Tests.csproj
+++ b/src/libraries/Microsoft.Win32.Primitives/tests/Microsoft.Win32.Primitives.Tests.csproj
@@ -1,4 +1,4 @@
-
+
@@ -16,4 +16,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/Microsoft.Win32.Registry.AccessControl/pkg/Microsoft.Win32.Registry.AccessControl.builds b/src/libraries/Microsoft.Win32.Registry.AccessControl/pkg/Microsoft.Win32.Registry.AccessControl.builds
index 80c58393b2ad997a5c487e1a78f5a587da2a9e59..8f40c2356404b0a4a78a6f770b336262e46974e5 100644
--- a/src/libraries/Microsoft.Win32.Registry.AccessControl/pkg/Microsoft.Win32.Registry.AccessControl.builds
+++ b/src/libraries/Microsoft.Win32.Registry.AccessControl/pkg/Microsoft.Win32.Registry.AccessControl.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
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 376e46baf807ad757829792de0db3dd0721efe65..f326238d9263d00878d06edee94a48c020f131a2 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,17 +1,14 @@
-
+
-
net46;netcoreapp1.0
-
win
-
\ No newline at end of file
diff --git a/src/libraries/Microsoft.Win32.Registry.AccessControl/ref/Microsoft.Win32.Registry.AccessControl.csproj b/src/libraries/Microsoft.Win32.Registry.AccessControl/ref/Microsoft.Win32.Registry.AccessControl.csproj
index 1e0738f89919f0a24848b979582b108c8dc42393..0fb604e7c1fbcc721a45b039aad2b0f8a14a740c 100644
--- a/src/libraries/Microsoft.Win32.Registry.AccessControl/ref/Microsoft.Win32.Registry.AccessControl.csproj
+++ b/src/libraries/Microsoft.Win32.Registry.AccessControl/ref/Microsoft.Win32.Registry.AccessControl.csproj
@@ -1,4 +1,4 @@
-
+
@@ -11,4 +11,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/Microsoft.Win32.Registry.AccessControl/src/Configurations.props b/src/libraries/Microsoft.Win32.Registry.AccessControl/src/Configurations.props
index 234a60ff3a380c3f98800084d473eb8820692def..b6945822ad86e55e4ddc80bc2127daa1969f50a9 100644
--- a/src/libraries/Microsoft.Win32.Registry.AccessControl/src/Configurations.props
+++ b/src/libraries/Microsoft.Win32.Registry.AccessControl/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -7,4 +7,4 @@
net46;
-
+
\ No newline at end of file
diff --git a/src/libraries/Microsoft.Win32.Registry.AccessControl/tests/Configurations.props b/src/libraries/Microsoft.Win32.Registry.AccessControl/tests/Configurations.props
index 5d77dc616e23f0285c9cc66f180261bfa44e69c4..5f482b878bc4a4b91da33a6a7c4906082909ec30 100644
--- a/src/libraries/Microsoft.Win32.Registry.AccessControl/tests/Configurations.props
+++ b/src/libraries/Microsoft.Win32.Registry.AccessControl/tests/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard1.3-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/Microsoft.Win32.Registry.AccessControl/tests/Microsoft.Win32.Registry.AccessControl.Tests.builds b/src/libraries/Microsoft.Win32.Registry.AccessControl/tests/Microsoft.Win32.Registry.AccessControl.Tests.builds
index 453cdfdaaf7aae8eeb6ee7ff3d4c9f70b66f1b97..3465c40e962f6ea40bbf25356ec169b11ef210a1 100644
--- a/src/libraries/Microsoft.Win32.Registry.AccessControl/tests/Microsoft.Win32.Registry.AccessControl.Tests.builds
+++ b/src/libraries/Microsoft.Win32.Registry.AccessControl/tests/Microsoft.Win32.Registry.AccessControl.Tests.builds
@@ -1,10 +1,10 @@
-
+
Windows_NT
- netcoreapp1.0;netcoreapp1.1;net46
+ netcoreapp1.0;netcoreapp;net46
diff --git a/src/libraries/Microsoft.Win32.Registry.AccessControl/tests/Microsoft.Win32.Registry.AccessControl.Tests.csproj b/src/libraries/Microsoft.Win32.Registry.AccessControl/tests/Microsoft.Win32.Registry.AccessControl.Tests.csproj
index 04bb22e419d82e447955ebbde7cd53dde2e7f805..2a1988f7c167af09c43047a024385bbd841d733c 100644
--- a/src/libraries/Microsoft.Win32.Registry.AccessControl/tests/Microsoft.Win32.Registry.AccessControl.Tests.csproj
+++ b/src/libraries/Microsoft.Win32.Registry.AccessControl/tests/Microsoft.Win32.Registry.AccessControl.Tests.csproj
@@ -1,4 +1,4 @@
-
+
@@ -10,4 +10,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/Microsoft.Win32.Registry/pkg/Microsoft.Win32.Registry.builds b/src/libraries/Microsoft.Win32.Registry/pkg/Microsoft.Win32.Registry.builds
index eaa67626968fcadc0d6d6a423bd8a7db92a169d3..e45aaf31e3116fbe7ca4bf568749b9a64543e68c 100644
--- a/src/libraries/Microsoft.Win32.Registry/pkg/Microsoft.Win32.Registry.builds
+++ b/src/libraries/Microsoft.Win32.Registry/pkg/Microsoft.Win32.Registry.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
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 1dd081491db0eb9b56484389ece24af5757bf809..bcb5c19cd58a01be1f4926fb5cf7a98e99f804ee 100644
--- a/src/libraries/Microsoft.Win32.Registry/pkg/Microsoft.Win32.Registry.pkgproj
+++ b/src/libraries/Microsoft.Win32.Registry/pkg/Microsoft.Win32.Registry.pkgproj
@@ -1,17 +1,14 @@
-
+
-
- net463;netcoreapp1.1
+ net463;netcoreapp2.0
-
win
-
\ No newline at end of file
diff --git a/src/libraries/Microsoft.Win32.Registry/ref/Microsoft.Win32.Registry.csproj b/src/libraries/Microsoft.Win32.Registry/ref/Microsoft.Win32.Registry.csproj
index 9f2e564a7921758d5bbe10a5c34d143a48873507..2edfc56661d0d1b8d576155f0cdec9e275cafe10 100644
--- a/src/libraries/Microsoft.Win32.Registry/ref/Microsoft.Win32.Registry.csproj
+++ b/src/libraries/Microsoft.Win32.Registry/ref/Microsoft.Win32.Registry.csproj
@@ -1,4 +1,4 @@
-
+
@@ -9,4 +9,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/Microsoft.Win32.Registry/src/Configurations.props b/src/libraries/Microsoft.Win32.Registry/src/Configurations.props
index 743b2ab1821df0a8d23010e49d6fddc83090bfe6..5426f5a16a248b92b6b6b81975f8d52e85c4b374 100644
--- a/src/libraries/Microsoft.Win32.Registry/src/Configurations.props
+++ b/src/libraries/Microsoft.Win32.Registry/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -7,4 +7,4 @@
net463-AnyOS;
-
+
\ No newline at end of file
diff --git a/src/libraries/Microsoft.Win32.Registry/tests/Configurations.props b/src/libraries/Microsoft.Win32.Registry/tests/Configurations.props
index 5d77dc616e23f0285c9cc66f180261bfa44e69c4..5f482b878bc4a4b91da33a6a7c4906082909ec30 100644
--- a/src/libraries/Microsoft.Win32.Registry/tests/Configurations.props
+++ b/src/libraries/Microsoft.Win32.Registry/tests/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard1.3-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.builds b/src/libraries/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.builds
index 152e6509793eae09c74735e06e72d885434f8d4f..78ef9b23a841de74928ab6443f525cb044b64afe 100644
--- a/src/libraries/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.builds
+++ b/src/libraries/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.builds
@@ -1,10 +1,10 @@
-
+
Windows_NT
- netcoreapp1.0;netcoreapp1.1;net46
+ netcoreapp1.0;netcoreapp;net46
diff --git a/src/libraries/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.csproj b/src/libraries/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.csproj
index 51389388bc1ac61eba2147c89928c486e429d124..f70c01c2ba9ce5ea20801ab7c072b99d40c265d0 100644
--- a/src/libraries/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.csproj
+++ b/src/libraries/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.csproj
@@ -1,4 +1,4 @@
-
+
@@ -54,4 +54,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/Native/pkg/runtime.native.System.Data.SqlClient.sni/runtime.native.System.Data.SqlClient.sni.builds b/src/libraries/Native/pkg/runtime.native.System.Data.SqlClient.sni/runtime.native.System.Data.SqlClient.sni.builds
index bce77a1f0d0d87596200d0f46c3b775485050446..a69db869af9c818cb6da7f7c23da40ec4c6662f6 100644
--- a/src/libraries/Native/pkg/runtime.native.System.Data.SqlClient.sni/runtime.native.System.Data.SqlClient.sni.builds
+++ b/src/libraries/Native/pkg/runtime.native.System.Data.SqlClient.sni/runtime.native.System.Data.SqlClient.sni.builds
@@ -1,4 +1,4 @@
-
+
@@ -17,4 +17,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/Native/pkg/runtime.native.System.IO.Compression/runtime.native.System.IO.Compression.builds b/src/libraries/Native/pkg/runtime.native.System.IO.Compression/runtime.native.System.IO.Compression.builds
index 9c8f6a1fbef71edd2736867900100b3bf2a6ac43..3b108eade7fa60bb3afe5f828dc24b18ff6b3a02 100644
--- a/src/libraries/Native/pkg/runtime.native.System.IO.Compression/runtime.native.System.IO.Compression.builds
+++ b/src/libraries/Native/pkg/runtime.native.System.IO.Compression/runtime.native.System.IO.Compression.builds
@@ -1,8 +1,8 @@
-
+
-
+
linux
amd64
@@ -97,4 +97,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/Native/pkg/runtime.native.System.IO.Compression/runtime.native.System.IO.Compression.pkgproj b/src/libraries/Native/pkg/runtime.native.System.IO.Compression/runtime.native.System.IO.Compression.pkgproj
index 5ffbcefeb596cf526f23d87f311a3113192cf262..175e864bc282fcf3b8e29d6221406b462622cd63 100644
--- a/src/libraries/Native/pkg/runtime.native.System.IO.Compression/runtime.native.System.IO.Compression.pkgproj
+++ b/src/libraries/Native/pkg/runtime.native.System.IO.Compression/runtime.native.System.IO.Compression.pkgproj
@@ -78,4 +78,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/Native/pkg/runtime.native.System.IO.Compression/win_aot/runtime.native.System.IO.Compression.pkgproj b/src/libraries/Native/pkg/runtime.native.System.IO.Compression/win_aot/runtime.native.System.IO.Compression.pkgproj
index 7f83549e66f757f883270bde935bdc3a35c20233..914dec8d9382beee374a93da335cb5640cdb15b5 100644
--- a/src/libraries/Native/pkg/runtime.native.System.IO.Compression/win_aot/runtime.native.System.IO.Compression.pkgproj
+++ b/src/libraries/Native/pkg/runtime.native.System.IO.Compression/win_aot/runtime.native.System.IO.Compression.pkgproj
@@ -10,4 +10,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/Native/pkg/runtime.native.System.Net.Http/runtime.native.System.Net.Http.builds b/src/libraries/Native/pkg/runtime.native.System.Net.Http/runtime.native.System.Net.Http.builds
index 2463e9415d17fe9b58b646e32d9f5f91791b8b89..023cd63d0ba58017f613013eba85ac7139626525 100644
--- a/src/libraries/Native/pkg/runtime.native.System.Net.Http/runtime.native.System.Net.Http.builds
+++ b/src/libraries/Native/pkg/runtime.native.System.Net.Http/runtime.native.System.Net.Http.builds
@@ -1,8 +1,8 @@
-
+
-
+
linux
amd64
@@ -65,4 +65,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/Native/pkg/runtime.native.System.Net.Http/runtime.native.System.Net.Http.pkgproj b/src/libraries/Native/pkg/runtime.native.System.Net.Http/runtime.native.System.Net.Http.pkgproj
index 1f090c2a0d3b83d6cfc73d30d7725b2270e17590..96772184a6228bd013242a0a443d5b634e5fee16 100644
--- a/src/libraries/Native/pkg/runtime.native.System.Net.Http/runtime.native.System.Net.Http.pkgproj
+++ b/src/libraries/Native/pkg/runtime.native.System.Net.Http/runtime.native.System.Net.Http.pkgproj
@@ -54,4 +54,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/Native/pkg/runtime.native.System.Net.Security/runtime.native.System.Net.Security.builds b/src/libraries/Native/pkg/runtime.native.System.Net.Security/runtime.native.System.Net.Security.builds
index f6d0d52ab5dbbc21057900716ff1f310a3344b4c..473b6834110c16d74f82690efba7bd53a72c9e1c 100644
--- a/src/libraries/Native/pkg/runtime.native.System.Net.Security/runtime.native.System.Net.Security.builds
+++ b/src/libraries/Native/pkg/runtime.native.System.Net.Security/runtime.native.System.Net.Security.builds
@@ -1,8 +1,8 @@
-
+
-
+
linux
amd64
@@ -65,4 +65,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/Native/pkg/runtime.native.System.Net.Security/runtime.native.System.Net.Security.pkgproj b/src/libraries/Native/pkg/runtime.native.System.Net.Security/runtime.native.System.Net.Security.pkgproj
index 856b78b74a92ca0157a02c7de2eced590d2ef2e8..738e981f0c2d667837ef572371fdcdfc9c1004ae 100644
--- a/src/libraries/Native/pkg/runtime.native.System.Net.Security/runtime.native.System.Net.Security.pkgproj
+++ b/src/libraries/Native/pkg/runtime.native.System.Net.Security/runtime.native.System.Net.Security.pkgproj
@@ -54,4 +54,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.Apple/osx/runtime.native.System.Security.Cryptography.Apple.pkgproj b/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.Apple/osx/runtime.native.System.Security.Cryptography.Apple.pkgproj
index b54a9fafd229fc399417d59efd2c1f1bf71014c1..ae1fdd3c4234e4e4051efae52ed36d9e49071438 100644
--- a/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.Apple/osx/runtime.native.System.Security.Cryptography.Apple.pkgproj
+++ b/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.Apple/osx/runtime.native.System.Security.Cryptography.Apple.pkgproj
@@ -12,4 +12,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.Apple/runtime.native.System.Security.Cryptography.Apple.builds b/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.Apple/runtime.native.System.Security.Cryptography.Apple.builds
index 220be811d79b68c747be55d36433f9638f00753b..964bdcc80cc62ab210652263c447ff80352d3b28 100644
--- a/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.Apple/runtime.native.System.Security.Cryptography.Apple.builds
+++ b/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.Apple/runtime.native.System.Security.Cryptography.Apple.builds
@@ -2,11 +2,11 @@
-
+
osx.10
amd64
-
+
\ No newline at end of file
diff --git a/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.Apple/runtime.native.System.Security.Cryptography.Apple.pkgproj b/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.Apple/runtime.native.System.Security.Cryptography.Apple.pkgproj
index 9696fefe02c16f2aaa6a02bd65ec8e5ad34e22f8..4ea2914ac993cd719684a40b74e9c03d342b0ba4 100644
--- a/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.Apple/runtime.native.System.Security.Cryptography.Apple.pkgproj
+++ b/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.Apple/runtime.native.System.Security.Cryptography.Apple.pkgproj
@@ -15,4 +15,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/alpine/3.4.3/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj b/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/alpine/3.4.3/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj
index bd26f5300b009a620f0396db99777416ead855e5..c7d128a9701871ee6a53ea453b81ee5f2f4b7511 100644
--- a/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/alpine/3.4.3/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj
+++ b/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/alpine/3.4.3/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj
@@ -12,4 +12,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/debian/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj b/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/debian/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj
index 93ac6630c70802469b6c83179b69f548945811ea..188d114d7be5a16ddc43812409219ba79ae85d29 100644
--- a/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/debian/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj
+++ b/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/debian/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj
@@ -12,4 +12,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/fedora/23/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj b/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/fedora/23/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj
index bf4dc62bb56eaed183010934a18572efe7f78589..8afb07a108cc38f7b70cfd689e74f69d62e63d94 100644
--- a/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/fedora/23/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj
+++ b/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/fedora/23/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj
@@ -12,4 +12,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/fedora/24/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj b/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/fedora/24/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj
index ff80db6a28f0e28f54467d2c86a2ec3f650ae5e1..5728baebc67cc444eec5ccb7f017b89a7e4189dc 100644
--- a/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/fedora/24/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj
+++ b/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/fedora/24/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj
@@ -12,4 +12,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/linux/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj b/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/linux/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj
index 95f30b84fbdf9cc2743d52d6eafa0cb62c3f5b8c..dd1e66c07376b0ba8506e5eebac3f9e899e4a8bb 100644
--- a/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/linux/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj
+++ b/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/linux/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj
@@ -12,4 +12,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/opensuse/13.2/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj b/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/opensuse/13.2/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj
index 587070bc2656d0c17e9172734bdfe657525d3e44..eb47efcd7827feefba93204263f556c0bf6c3d41 100644
--- a/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/opensuse/13.2/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj
+++ b/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/opensuse/13.2/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj
@@ -12,4 +12,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/opensuse/42.1/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj b/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/opensuse/42.1/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj
index c46d097cc8730a8d9e0afd4c9cdfeb87093aec39..110163154c87de1210d8f1b71138cc18d820f595 100644
--- a/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/opensuse/42.1/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj
+++ b/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/opensuse/42.1/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj
@@ -12,4 +12,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/osx/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj b/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/osx/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj
index 319a9d2ea0a707471e7849dfdfcf032f9ff80826..292713f6848f6fe140e1bd838e5304da4cf24b68 100644
--- a/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/osx/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj
+++ b/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/osx/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj
@@ -12,4 +12,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/rhel/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj b/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/rhel/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj
index b31b04dc875da745037b64b44361831b824f643c..a5fa21c91bc7c4291258a959fd71488f218d9f2e 100644
--- a/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/rhel/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj
+++ b/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/rhel/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj
@@ -12,4 +12,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/runtime.native.System.Security.Cryptography.OpenSsl.builds b/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/runtime.native.System.Security.Cryptography.OpenSsl.builds
index a0a8e719ad78d8cfeb39fbc02690fa4b4d3ac9af..442a58fe1af4689322fb46e0369ad4242f71a9db 100644
--- a/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/runtime.native.System.Security.Cryptography.OpenSsl.builds
+++ b/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/runtime.native.System.Security.Cryptography.OpenSsl.builds
@@ -1,8 +1,8 @@
-
+
-
+
linux
amd64
@@ -65,4 +65,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj b/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj
index 3f57206206ff67121745515107dbfebad7f61b32..feae2f6f1e26e2ee0b3ec320f78515554d310908 100644
--- a/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj
+++ b/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj
@@ -54,4 +54,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/ubuntu/14.04/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj b/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/ubuntu/14.04/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj
index 546d5524b03b466c501db17ab7a947508f305849..546fb720828cdc978c214fcf58cccc15d31b72b3 100644
--- a/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/ubuntu/14.04/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj
+++ b/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/ubuntu/14.04/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj
@@ -12,4 +12,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/ubuntu/16.04/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj b/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/ubuntu/16.04/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj
index 54be6d62094809c384167efc437c79da3df10537..ce2b32c3057d6391540a54cb82b09169f32ac32d 100644
--- a/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/ubuntu/16.04/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj
+++ b/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/ubuntu/16.04/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj
@@ -12,4 +12,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/ubuntu/16.10/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj b/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/ubuntu/16.10/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj
index 7dcfaaad6fdc5b4a1f97b277f322f60d6a0f8bd4..fa56c3c77858a2900d98e951534e9d573c84791a 100644
--- a/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/ubuntu/16.10/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj
+++ b/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography.OpenSsl/ubuntu/16.10/runtime.native.System.Security.Cryptography.OpenSsl.pkgproj
@@ -12,4 +12,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography/runtime.native.System.Security.Cryptography.builds b/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography/runtime.native.System.Security.Cryptography.builds
index ba8760aaea79a56b25fbf3bab9fc6648859c508e..04e48d0e93173b28aaa051aba5276d68340602ed 100644
--- a/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography/runtime.native.System.Security.Cryptography.builds
+++ b/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography/runtime.native.System.Security.Cryptography.builds
@@ -1,8 +1,8 @@
-
+
-
+
linux
amd64
@@ -65,4 +65,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography/runtime.native.System.Security.Cryptography.pkgproj b/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography/runtime.native.System.Security.Cryptography.pkgproj
index fb003be2e280f33f5f3aea956d270b780ae04ce9..d04f0402d6f9aa59c962019b3a288c10193e3961 100644
--- a/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography/runtime.native.System.Security.Cryptography.pkgproj
+++ b/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography/runtime.native.System.Security.Cryptography.pkgproj
@@ -54,4 +54,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography/ubuntu/14.04/runtime.native.System.Security.Cryptography.pkgproj b/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography/ubuntu/14.04/runtime.native.System.Security.Cryptography.pkgproj
index 04585edc99d48f55c90453d481858003611a9688..5adf468dde470a0ad95185b3d6191234d28e1c6d 100644
--- a/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography/ubuntu/14.04/runtime.native.System.Security.Cryptography.pkgproj
+++ b/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography/ubuntu/14.04/runtime.native.System.Security.Cryptography.pkgproj
@@ -1,4 +1,4 @@
-
+
@@ -12,4 +12,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/Native/pkg/runtime.native.System/runtime.native.System.builds b/src/libraries/Native/pkg/runtime.native.System/runtime.native.System.builds
index c1e25bc130e09f9f27229ff0586f677e02fe580c..26d2d8393ddf89174d0880c20b7bd3320699f95c 100644
--- a/src/libraries/Native/pkg/runtime.native.System/runtime.native.System.builds
+++ b/src/libraries/Native/pkg/runtime.native.System/runtime.native.System.builds
@@ -1,8 +1,8 @@
-
+
-
+
linux
amd64
@@ -65,4 +65,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/Native/pkg/runtime.native.System/runtime.native.System.pkgproj b/src/libraries/Native/pkg/runtime.native.System/runtime.native.System.pkgproj
index c319829caca5468ec2933ba78f0372202deeca36..bebdf263a4570bc2102bf70a51f36f00ede310e5 100644
--- a/src/libraries/Native/pkg/runtime.native.System/runtime.native.System.pkgproj
+++ b/src/libraries/Native/pkg/runtime.native.System/runtime.native.System.pkgproj
@@ -54,4 +54,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.AppContext/pkg/System.AppContext.builds b/src/libraries/System.AppContext/pkg/System.AppContext.builds
index 8d55fc313f3969b5fbe92a4371f95e209b8fb262..1e1d0c2a6d35f7845c04873057ade58a53615392 100644
--- a/src/libraries/System.AppContext/pkg/System.AppContext.builds
+++ b/src/libraries/System.AppContext/pkg/System.AppContext.builds
@@ -1,8 +1,8 @@
-
+
-
+
\ No newline at end of file
diff --git a/src/libraries/System.AppContext/pkg/System.AppContext.pkgproj b/src/libraries/System.AppContext/pkg/System.AppContext.pkgproj
index 7fee7b449aed9c688d6c1301b504416e1a4ace15..029da5833a2d17d87ee32ce4c8a26650575a86c1 100644
--- a/src/libraries/System.AppContext/pkg/System.AppContext.pkgproj
+++ b/src/libraries/System.AppContext/pkg/System.AppContext.pkgproj
@@ -6,7 +6,7 @@
- net463;netcoreapp1.1;$(AllXamarinFrameworks)
+ net463;netcoreapp2.0;$(AllXamarinFrameworks)
diff --git a/src/libraries/System.AppContext/ref/4.0.0/System.AppContext.depproj b/src/libraries/System.AppContext/ref/4.0.0/System.AppContext.depproj
index 6343408bc94d8a8172710fc9c5ddef3b38f62045..4a6bfcac64e9ba112c300a5e45ce0bdbe525befa 100644
--- a/src/libraries/System.AppContext/ref/4.0.0/System.AppContext.depproj
+++ b/src/libraries/System.AppContext/ref/4.0.0/System.AppContext.depproj
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.AppContext/ref/System.AppContext.csproj b/src/libraries/System.AppContext/ref/System.AppContext.csproj
index 8b51d5ad9117369538520f441c25df675b5358a3..156180cf1709faa5654c26999601fe9d2ce5a7ae 100644
--- a/src/libraries/System.AppContext/ref/System.AppContext.csproj
+++ b/src/libraries/System.AppContext/ref/System.AppContext.csproj
@@ -1,4 +1,4 @@
-
+
@@ -12,4 +12,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.AppContext/src/Configurations.props b/src/libraries/System.AppContext/src/Configurations.props
index f20b2fb8afb6f42cedd66e47113504fb4ac4d657..21929915a64d04f9ab66d472ea2bef0cbfd9398e 100644
--- a/src/libraries/System.AppContext/src/Configurations.props
+++ b/src/libraries/System.AppContext/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.AppContext/tests/Configurations.props b/src/libraries/System.AppContext/tests/Configurations.props
index f0ebe53119ec712315cfea5b151d5f0d754744f8..c3266e1e9362243b5723032465bcc7a62ae720ce 100644
--- a/src/libraries/System.AppContext/tests/Configurations.props
+++ b/src/libraries/System.AppContext/tests/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard1.3;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.AppContext/tests/System.AppContext.Tests.builds b/src/libraries/System.AppContext/tests/System.AppContext.Tests.builds
index 2a81e1ed5d3a9a489fe48ffa37344fb6eb9f34b3..31fa1e6fb8442b2c0343c9cd5d9bea4ed3a67914 100644
--- a/src/libraries/System.AppContext/tests/System.AppContext.Tests.builds
+++ b/src/libraries/System.AppContext/tests/System.AppContext.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.AppContext/tests/System.AppContext.Tests.csproj b/src/libraries/System.AppContext/tests/System.AppContext.Tests.csproj
index 909e3e36a6c2e4857e516c56b9de7b5dde051f0b..6163f3873537d0832e0fb424e88475bef230117d 100644
--- a/src/libraries/System.AppContext/tests/System.AppContext.Tests.csproj
+++ b/src/libraries/System.AppContext/tests/System.AppContext.Tests.csproj
@@ -1,4 +1,4 @@
-
+
@@ -11,4 +11,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Buffers/pkg/System.Buffers.builds b/src/libraries/System.Buffers/pkg/System.Buffers.builds
index 30967ca53829362829d26d9c9f94ff6c0edcccd5..e26f2fb99b258e0a415302ea181e1ac5ec61ee2f 100644
--- a/src/libraries/System.Buffers/pkg/System.Buffers.builds
+++ b/src/libraries/System.Buffers/pkg/System.Buffers.builds
@@ -1,8 +1,8 @@
-
+
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Buffers/pkg/System.Buffers.pkgproj b/src/libraries/System.Buffers/pkg/System.Buffers.pkgproj
index 7a03df52264920c74375944777f82f95690f6f10..5d2845689b18acc6f20672f4684d56a288e623f9 100644
--- a/src/libraries/System.Buffers/pkg/System.Buffers.pkgproj
+++ b/src/libraries/System.Buffers/pkg/System.Buffers.pkgproj
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Buffers/ref/System.Buffers.builds b/src/libraries/System.Buffers/ref/System.Buffers.builds
index 4f9df67634a6a403ef9f1b34c25ada8c7c82a8bc..94931a06df692d7bab7af6cd6436544e92a13639 100644
--- a/src/libraries/System.Buffers/ref/System.Buffers.builds
+++ b/src/libraries/System.Buffers/ref/System.Buffers.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Buffers/ref/System.Buffers.csproj b/src/libraries/System.Buffers/ref/System.Buffers.csproj
index 729dbb282ad556d4bf3d666f31f9135b243660f0..20884aa9805b76c930750668324460e61acf9862 100644
--- a/src/libraries/System.Buffers/ref/System.Buffers.csproj
+++ b/src/libraries/System.Buffers/ref/System.Buffers.csproj
@@ -1,4 +1,4 @@
-
+
@@ -12,4 +12,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Buffers/src/Configurations.props b/src/libraries/System.Buffers/src/Configurations.props
index e133d875b28a7ccb00fa898226419010d4c36800..09d8d895fc1d43c1872ced4d9caf5ff2396db4d1 100644
--- a/src/libraries/System.Buffers/src/Configurations.props
+++ b/src/libraries/System.Buffers/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netcoreapp;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Buffers/tests/Configurations.props b/src/libraries/System.Buffers/tests/Configurations.props
index f0ebe53119ec712315cfea5b151d5f0d754744f8..c3266e1e9362243b5723032465bcc7a62ae720ce 100644
--- a/src/libraries/System.Buffers/tests/Configurations.props
+++ b/src/libraries/System.Buffers/tests/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard1.3;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Buffers/tests/System.Buffers.Tests.builds b/src/libraries/System.Buffers/tests/System.Buffers.Tests.builds
index db3987bbfac0031c03f4a2e019996e33efe83c56..6b872b42e9930c1c44623583bee0b2d6e009475a 100644
--- a/src/libraries/System.Buffers/tests/System.Buffers.Tests.builds
+++ b/src/libraries/System.Buffers/tests/System.Buffers.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Buffers/tests/System.Buffers.Tests.csproj b/src/libraries/System.Buffers/tests/System.Buffers.Tests.csproj
index ddedd4d4cfc18cb01db19cf9307d5679a1f7c437..0cf523dd5ee66dbfeb84c1cd223b841a856ddfa5 100644
--- a/src/libraries/System.Buffers/tests/System.Buffers.Tests.csproj
+++ b/src/libraries/System.Buffers/tests/System.Buffers.Tests.csproj
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.CodeDom/pkg/System.CodeDom.builds b/src/libraries/System.CodeDom/pkg/System.CodeDom.builds
index 50a2c489bc5697f3030d67fb2b0fa4b3a3255a96..dac981e474094fc2d9e3fadafd0e0067250b7e98 100644
--- a/src/libraries/System.CodeDom/pkg/System.CodeDom.builds
+++ b/src/libraries/System.CodeDom/pkg/System.CodeDom.builds
@@ -1,8 +1,8 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/src/libraries/System.CodeDom/pkg/System.CodeDom.pkgproj b/src/libraries/System.CodeDom/pkg/System.CodeDom.pkgproj
index 97f66ff3b61670aafb2f57be982904ad7d00a305..debf4ee361c33dfda393e17b35d9b158475997a7 100644
--- a/src/libraries/System.CodeDom/pkg/System.CodeDom.pkgproj
+++ b/src/libraries/System.CodeDom/pkg/System.CodeDom.pkgproj
@@ -1,13 +1,11 @@
-
+
-
- net461;netcoreapp1.1;$(AllXamarinFrameworks)
+ net461;netcoreapp2.0;$(AllXamarinFrameworks)
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.CodeDom/ref/System.CodeDom.csproj b/src/libraries/System.CodeDom/ref/System.CodeDom.csproj
index 23dbaab9849bd768e6032a6a8955ed5c5b93f58f..fabaca9f5a351dff686567020c13d579cccf06bd 100644
--- a/src/libraries/System.CodeDom/ref/System.CodeDom.csproj
+++ b/src/libraries/System.CodeDom/ref/System.CodeDom.csproj
@@ -1,4 +1,4 @@
-
+
@@ -16,4 +16,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.CodeDom/src/Configurations.props b/src/libraries/System.CodeDom/src/Configurations.props
index 32bba83db79a523a6113529442b664aafba99999..22152c1856286fb101f30a6ca02af4587066580d 100644
--- a/src/libraries/System.CodeDom/src/Configurations.props
+++ b/src/libraries/System.CodeDom/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.CodeDom/tests/Configurations.props b/src/libraries/System.CodeDom/tests/Configurations.props
index 98f53209d45a12360d0bbf7cf031b29ff556fc57..c398e42e899425ce70e3a9884633835ab6fcc66e 100644
--- a/src/libraries/System.CodeDom/tests/Configurations.props
+++ b/src/libraries/System.CodeDom/tests/Configurations.props
@@ -1,8 +1,8 @@
-
+
- netstandard1.7;
+ netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.CodeDom/tests/System.CodeDom.Tests.builds b/src/libraries/System.CodeDom/tests/System.CodeDom.Tests.builds
index c17afe5f4c9a29108ac26ca793208cf507449b26..2f6caea74df86586fe7780dc8427d234763e1d54 100644
--- a/src/libraries/System.CodeDom/tests/System.CodeDom.Tests.builds
+++ b/src/libraries/System.CodeDom/tests/System.CodeDom.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Collections.Concurrent/pkg/System.Collections.Concurrent.builds b/src/libraries/System.Collections.Concurrent/pkg/System.Collections.Concurrent.builds
index ca46a3680948bc25f8dd6c8a3aee76be1c8346a1..2fae0668460c88d77b7a3595ed2818dd47740516 100644
--- a/src/libraries/System.Collections.Concurrent/pkg/System.Collections.Concurrent.builds
+++ b/src/libraries/System.Collections.Concurrent/pkg/System.Collections.Concurrent.builds
@@ -1,8 +1,8 @@
-
+
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Collections.Concurrent/pkg/System.Collections.Concurrent.pkgproj b/src/libraries/System.Collections.Concurrent/pkg/System.Collections.Concurrent.pkgproj
index 26019957cee72e4de32b30df93f525853a3430f2..a979ce292c7a80f41088f2de7dd0414cd062bac1 100644
--- a/src/libraries/System.Collections.Concurrent/pkg/System.Collections.Concurrent.pkgproj
+++ b/src/libraries/System.Collections.Concurrent/pkg/System.Collections.Concurrent.pkgproj
@@ -3,7 +3,7 @@
- netcoreapp1.1;$(AllXamarinFrameworks)
+ netcoreapp2.0;$(AllXamarinFrameworks)
diff --git a/src/libraries/System.Collections.Concurrent/ref/Configurations.props b/src/libraries/System.Collections.Concurrent/ref/Configurations.props
index 84eaf1100d0d6e4aff4d8960b61aa79a9ab0c132..77a4b65bc94a425ce217a1e6878bb6f236cf8abc 100644
--- a/src/libraries/System.Collections.Concurrent/ref/Configurations.props
+++ b/src/libraries/System.Collections.Concurrent/ref/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netcoreapp;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Collections.Concurrent/ref/System.Collections.Concurrent.csproj b/src/libraries/System.Collections.Concurrent/ref/System.Collections.Concurrent.csproj
index 4c2e8373f8c927bb73094c372ed9670ba0575717..2c9009a06320e8b34b2dd638e96ec5dc58c4cdd1 100644
--- a/src/libraries/System.Collections.Concurrent/ref/System.Collections.Concurrent.csproj
+++ b/src/libraries/System.Collections.Concurrent/ref/System.Collections.Concurrent.csproj
@@ -1,4 +1,4 @@
-
+
@@ -12,4 +12,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Collections.Concurrent/src/Configurations.props b/src/libraries/System.Collections.Concurrent/src/Configurations.props
index fc9ef9822c01e3840af50ced2f25bdc2f5349eca..c398e42e899425ce70e3a9884633835ab6fcc66e 100644
--- a/src/libraries/System.Collections.Concurrent/src/Configurations.props
+++ b/src/libraries/System.Collections.Concurrent/src/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Collections.Concurrent/tests/Configurations.props b/src/libraries/System.Collections.Concurrent/tests/Configurations.props
index 512c938bad5364c677a3f4d9f647f1ade8c14aea..b2db637110616a495d303924e9aaf8b800db4821 100644
--- a/src/libraries/System.Collections.Concurrent/tests/Configurations.props
+++ b/src/libraries/System.Collections.Concurrent/tests/Configurations.props
@@ -1,9 +1,9 @@
-
+
netstandard1.3;
- netstandard1.7;
+ netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Collections.Concurrent/tests/System.Collections.Concurrent.Tests.builds b/src/libraries/System.Collections.Concurrent/tests/System.Collections.Concurrent.Tests.builds
index 15a1cc3feb5b4c96f3dc82254819f7f8467dd1a7..38a1209b3e3b53decb66937e4d996a19200aa8f5 100644
--- a/src/libraries/System.Collections.Concurrent/tests/System.Collections.Concurrent.Tests.builds
+++ b/src/libraries/System.Collections.Concurrent/tests/System.Collections.Concurrent.Tests.builds
@@ -1,4 +1,4 @@
-
+
@@ -8,7 +8,7 @@
netcoreapp1.0
- netcoreapp1.1
+ netcoreapp
netstandard1.3
diff --git a/src/libraries/System.Collections.Concurrent/tests/System.Collections.Concurrent.Tests.csproj b/src/libraries/System.Collections.Concurrent/tests/System.Collections.Concurrent.Tests.csproj
index 81b81e76b8ee23fbb2233c80e6ae541bc6f40f3d..913d26cb2570419f316f02e15aa0d9ec3915e96c 100644
--- a/src/libraries/System.Collections.Concurrent/tests/System.Collections.Concurrent.Tests.csproj
+++ b/src/libraries/System.Collections.Concurrent/tests/System.Collections.Concurrent.Tests.csproj
@@ -1,4 +1,4 @@
-
+
@@ -95,4 +95,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Collections.Immutable/pkg/System.Collections.Immutable.builds b/src/libraries/System.Collections.Immutable/pkg/System.Collections.Immutable.builds
index 3c4d0d809eee1058086aed83e94c657035ebcaeb..df62b39632853ecf0aaa0028fa24362bdfe1de1f 100644
--- a/src/libraries/System.Collections.Immutable/pkg/System.Collections.Immutable.builds
+++ b/src/libraries/System.Collections.Immutable/pkg/System.Collections.Immutable.builds
@@ -1,8 +1,8 @@
-
+
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Collections.Immutable/pkg/System.Collections.Immutable.pkgproj b/src/libraries/System.Collections.Immutable/pkg/System.Collections.Immutable.pkgproj
index 27fe407485b9a30688ea7a1fcda765203542b24d..153b38b0d132ad3fc358dffb90e3218d961e786e 100644
--- a/src/libraries/System.Collections.Immutable/pkg/System.Collections.Immutable.pkgproj
+++ b/src/libraries/System.Collections.Immutable/pkg/System.Collections.Immutable.pkgproj
@@ -1,16 +1,14 @@
-
+
2.8.6
-
net45;netcore45;netcoreapp1.0;wp8;wpa81;$(AllXamarinFrameworks)
-
\ No newline at end of file
diff --git a/src/libraries/System.Collections.Immutable/src/Configurations.props b/src/libraries/System.Collections.Immutable/src/Configurations.props
index 2ec0365c0d50ed330862506ea44da4fccb7fd0a9..66fc3409d36ab9b1606b29eb2f04491b1eb10c92 100644
--- a/src/libraries/System.Collections.Immutable/src/Configurations.props
+++ b/src/libraries/System.Collections.Immutable/src/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard1.0;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Collections.Immutable/tests/Configurations.props b/src/libraries/System.Collections.Immutable/tests/Configurations.props
index f0ebe53119ec712315cfea5b151d5f0d754744f8..c3266e1e9362243b5723032465bcc7a62ae720ce 100644
--- a/src/libraries/System.Collections.Immutable/tests/Configurations.props
+++ b/src/libraries/System.Collections.Immutable/tests/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard1.3;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Collections.Immutable/tests/System.Collections.Immutable.Tests.builds b/src/libraries/System.Collections.Immutable/tests/System.Collections.Immutable.Tests.builds
index 47bfd855e4543b5455244bf19b932fcdd5a6c274..a3970f10bd345d185396e5af76d729f364b6dfc6 100644
--- a/src/libraries/System.Collections.Immutable/tests/System.Collections.Immutable.Tests.builds
+++ b/src/libraries/System.Collections.Immutable/tests/System.Collections.Immutable.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Collections.NonGeneric/pkg/System.Collections.NonGeneric.builds b/src/libraries/System.Collections.NonGeneric/pkg/System.Collections.NonGeneric.builds
index 11e6be71dbeea3107e7f30b8ebbdf97a467b68db..69cb69b19aad6c406fcaf7fe960804d3f667295c 100644
--- a/src/libraries/System.Collections.NonGeneric/pkg/System.Collections.NonGeneric.builds
+++ b/src/libraries/System.Collections.NonGeneric/pkg/System.Collections.NonGeneric.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Collections.NonGeneric/pkg/System.Collections.NonGeneric.pkgproj b/src/libraries/System.Collections.NonGeneric/pkg/System.Collections.NonGeneric.pkgproj
index 740794cb851bff59e5dce90c3a35c01828466437..66e289751c0cb1369685bcd87024c0d00a263b3d 100644
--- a/src/libraries/System.Collections.NonGeneric/pkg/System.Collections.NonGeneric.pkgproj
+++ b/src/libraries/System.Collections.NonGeneric/pkg/System.Collections.NonGeneric.pkgproj
@@ -3,7 +3,7 @@
- net463;netcoreapp1.1;$(AllXamarinFrameworks)
+ net463;netcoreapp2.0;$(AllXamarinFrameworks)
diff --git a/src/libraries/System.Collections.NonGeneric/ref/System.Collections.NonGeneric.csproj b/src/libraries/System.Collections.NonGeneric/ref/System.Collections.NonGeneric.csproj
index 68f469d1cd274b70e9d6d3d4f2717de785b2b58a..d6cfce0ef83ea451e7287a86c20316e116525b0f 100644
--- a/src/libraries/System.Collections.NonGeneric/ref/System.Collections.NonGeneric.csproj
+++ b/src/libraries/System.Collections.NonGeneric/ref/System.Collections.NonGeneric.csproj
@@ -1,4 +1,4 @@
-
+
@@ -10,4 +10,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Collections.NonGeneric/src/Configurations.props b/src/libraries/System.Collections.NonGeneric/src/Configurations.props
index 9c336c0be9e52171e2fecf14214e3373be07177d..dc837f915219bcf7ff5c38f67e01c45d5b976485 100644
--- a/src/libraries/System.Collections.NonGeneric/src/Configurations.props
+++ b/src/libraries/System.Collections.NonGeneric/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Collections.NonGeneric/tests/Configurations.props b/src/libraries/System.Collections.NonGeneric/tests/Configurations.props
index 512c938bad5364c677a3f4d9f647f1ade8c14aea..b2db637110616a495d303924e9aaf8b800db4821 100644
--- a/src/libraries/System.Collections.NonGeneric/tests/Configurations.props
+++ b/src/libraries/System.Collections.NonGeneric/tests/Configurations.props
@@ -1,9 +1,9 @@
-
+
netstandard1.3;
- netstandard1.7;
+ netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Collections.NonGeneric/tests/Performance/System.Collections.NonGeneric.Performance.Tests.csproj b/src/libraries/System.Collections.NonGeneric/tests/Performance/System.Collections.NonGeneric.Performance.Tests.csproj
index 2f2200ba3c8a46716940ea0819da84e2431896a0..6d4a15e724e0a1e40368fceb5f58eacacf5a7d5b 100644
--- a/src/libraries/System.Collections.NonGeneric/tests/Performance/System.Collections.NonGeneric.Performance.Tests.csproj
+++ b/src/libraries/System.Collections.NonGeneric/tests/Performance/System.Collections.NonGeneric.Performance.Tests.csproj
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Collections.NonGeneric/tests/System.Collections.NonGeneric.Tests.builds b/src/libraries/System.Collections.NonGeneric/tests/System.Collections.NonGeneric.Tests.builds
index 4b25e7900eb45bbb52288095e4f5b5f7b05c2eae..d9d95e0b450759256929c9e2f67d22a701cc4843 100644
--- a/src/libraries/System.Collections.NonGeneric/tests/System.Collections.NonGeneric.Tests.builds
+++ b/src/libraries/System.Collections.NonGeneric/tests/System.Collections.NonGeneric.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Collections.NonGeneric/tests/System.Collections.NonGeneric.Tests.csproj b/src/libraries/System.Collections.NonGeneric/tests/System.Collections.NonGeneric.Tests.csproj
index 95024fdca6ba192209754f1b6be4f2daa5607dde..201847afbcc473b00f6d921e64441610be29c29d 100644
--- a/src/libraries/System.Collections.NonGeneric/tests/System.Collections.NonGeneric.Tests.csproj
+++ b/src/libraries/System.Collections.NonGeneric/tests/System.Collections.NonGeneric.Tests.csproj
@@ -1,4 +1,4 @@
-
+
@@ -60,4 +60,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Collections.Specialized/pkg/System.Collections.Specialized.builds b/src/libraries/System.Collections.Specialized/pkg/System.Collections.Specialized.builds
index ac25263c07619a627460d57f462a1d54fc421d66..f3f5f99d76561270be7eb4d764bdf1903e5b18fe 100644
--- a/src/libraries/System.Collections.Specialized/pkg/System.Collections.Specialized.builds
+++ b/src/libraries/System.Collections.Specialized/pkg/System.Collections.Specialized.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Collections.Specialized/pkg/System.Collections.Specialized.pkgproj b/src/libraries/System.Collections.Specialized/pkg/System.Collections.Specialized.pkgproj
index 47067bbad398ce296367feacc2ea0bf5b5ab8c10..bbd5891674bf3f3b61e21dce5ed13070df3cacd3 100644
--- a/src/libraries/System.Collections.Specialized/pkg/System.Collections.Specialized.pkgproj
+++ b/src/libraries/System.Collections.Specialized/pkg/System.Collections.Specialized.pkgproj
@@ -3,7 +3,7 @@
- net463;netcoreapp1.1;$(AllXamarinFrameworks)
+ net463;netcoreapp2.0;$(AllXamarinFrameworks)
diff --git a/src/libraries/System.Collections.Specialized/ref/System.Collections.Specialized.csproj b/src/libraries/System.Collections.Specialized/ref/System.Collections.Specialized.csproj
index 4255e9f2d7318ea835e205a5dd53af88828a6672..4888b9ed0e1b869e96d10e11f112f1ac4aec3643 100644
--- a/src/libraries/System.Collections.Specialized/ref/System.Collections.Specialized.csproj
+++ b/src/libraries/System.Collections.Specialized/ref/System.Collections.Specialized.csproj
@@ -1,4 +1,4 @@
-
+
@@ -10,4 +10,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Collections.Specialized/src/Configurations.props b/src/libraries/System.Collections.Specialized/src/Configurations.props
index 9c336c0be9e52171e2fecf14214e3373be07177d..dc837f915219bcf7ff5c38f67e01c45d5b976485 100644
--- a/src/libraries/System.Collections.Specialized/src/Configurations.props
+++ b/src/libraries/System.Collections.Specialized/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Collections.Specialized/tests/Configurations.props b/src/libraries/System.Collections.Specialized/tests/Configurations.props
index 512c938bad5364c677a3f4d9f647f1ade8c14aea..b2db637110616a495d303924e9aaf8b800db4821 100644
--- a/src/libraries/System.Collections.Specialized/tests/Configurations.props
+++ b/src/libraries/System.Collections.Specialized/tests/Configurations.props
@@ -1,9 +1,9 @@
-
+
netstandard1.3;
- netstandard1.7;
+ netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Collections.Specialized/tests/System.Collections.Specialized.Tests.builds b/src/libraries/System.Collections.Specialized/tests/System.Collections.Specialized.Tests.builds
index a31b778413d9f278945a15149e8db6c648402e85..2458532d4ee3f3db71e16122480a0e3f760d38f0 100644
--- a/src/libraries/System.Collections.Specialized/tests/System.Collections.Specialized.Tests.builds
+++ b/src/libraries/System.Collections.Specialized/tests/System.Collections.Specialized.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Collections.Specialized/tests/System.Collections.Specialized.Tests.csproj b/src/libraries/System.Collections.Specialized/tests/System.Collections.Specialized.Tests.csproj
index c97c7ecc17f46e7425e8b7593ab7b0e357a09354..f8686b27077e3bf7bc20fadd3705c448ad886080 100644
--- a/src/libraries/System.Collections.Specialized/tests/System.Collections.Specialized.Tests.csproj
+++ b/src/libraries/System.Collections.Specialized/tests/System.Collections.Specialized.Tests.csproj
@@ -1,4 +1,4 @@
-
+
@@ -97,4 +97,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Collections/pkg/System.Collections.pkgproj b/src/libraries/System.Collections/pkg/System.Collections.pkgproj
index 2d3c0815f77f573fee22639e178c6ecc5a104ed1..7adf4815408daefb23143892ba232018558fd0fe 100644
--- a/src/libraries/System.Collections/pkg/System.Collections.pkgproj
+++ b/src/libraries/System.Collections/pkg/System.Collections.pkgproj
@@ -3,7 +3,7 @@
- netcoreapp1.1;net463;uap10.1;$(AllXamarinFrameworks)
+ netcoreapp2.0;net463;uap10.1;$(AllXamarinFrameworks)
net463
@@ -25,4 +25,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Collections/pkg/any/System.Collections.pkgproj b/src/libraries/System.Collections/pkg/any/System.Collections.pkgproj
index 583325762c938864d9bdb6778ba243695e6e2b32..93655c994c81eb8607fb3cfdc66345098d944c1b 100644
--- a/src/libraries/System.Collections/pkg/any/System.Collections.pkgproj
+++ b/src/libraries/System.Collections/pkg/any/System.Collections.pkgproj
@@ -6,16 +6,13 @@
any
true
-
-
runtimes/aot/lib/netcore50
aot
-
diff --git a/src/libraries/System.Collections/pkg/aot/System.Collections.pkgproj b/src/libraries/System.Collections/pkg/aot/System.Collections.pkgproj
index ba9c3cd6fa11830cb3cd09880eb66aaaa1f54c2c..5a96eed220ab24e0ed89c3d47e2ecfabe59b57c3 100644
--- a/src/libraries/System.Collections/pkg/aot/System.Collections.pkgproj
+++ b/src/libraries/System.Collections/pkg/aot/System.Collections.pkgproj
@@ -1,7 +1,6 @@
-
aot
true
@@ -11,6 +10,5 @@
uap101aot
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Collections/ref/Configurations.props b/src/libraries/System.Collections/ref/Configurations.props
index 33dc67c6d9279393886100b426d0319dbac72bd6..2845c11c541d1bd6029f9cf9fe5b99e4d249c8f9 100644
--- a/src/libraries/System.Collections/ref/Configurations.props
+++ b/src/libraries/System.Collections/ref/Configurations.props
@@ -1,8 +1,8 @@
-
+
netcoreapp;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Collections/ref/System.Collections.builds b/src/libraries/System.Collections/ref/System.Collections.builds
index 169e5923930dfbaf45fe24c0da1b5ad2a39d5ad5..be36a84c3968c049fd5f554814317a12542e164d 100644
--- a/src/libraries/System.Collections/ref/System.Collections.builds
+++ b/src/libraries/System.Collections/ref/System.Collections.builds
@@ -4,7 +4,7 @@
- netstandard1.7
+ netstandard
diff --git a/src/libraries/System.Collections/ref/System.Collections.csproj b/src/libraries/System.Collections/ref/System.Collections.csproj
index 41c0a988425194f5f5fa42af2eab6febf1f68a64..cc59bc06323739025248c3f61742a275c8c77c2e 100644
--- a/src/libraries/System.Collections/ref/System.Collections.csproj
+++ b/src/libraries/System.Collections/ref/System.Collections.csproj
@@ -11,4 +11,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Collections/src/Configurations.props b/src/libraries/System.Collections/src/Configurations.props
index f013d10b8ccc3f86eab07075639f01c909892d84..ed0bd2acc95b9edfd29df7e7b1e40ebe4f105079 100644
--- a/src/libraries/System.Collections/src/Configurations.props
+++ b/src/libraries/System.Collections/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -7,4 +7,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Collections/src/System.Collections.csproj b/src/libraries/System.Collections/src/System.Collections.csproj
index dfa7989ba0be12f36394d59f756697be120e0d6d..fa5c7d80be52832669625169fa1a3a25a1b9c855 100644
--- a/src/libraries/System.Collections/src/System.Collections.csproj
+++ b/src/libraries/System.Collections/src/System.Collections.csproj
@@ -8,7 +8,7 @@
true
0436
- netstandard1.7;uap10.1
+ netstandard;uap10.1
diff --git a/src/libraries/System.Collections/tests/Configurations.props b/src/libraries/System.Collections/tests/Configurations.props
index 0b1283dabb0ff26fe65ad20873f2c3bbba96768b..c3520855a078108ac6b4a9295e98b161fc2118f2 100644
--- a/src/libraries/System.Collections/tests/Configurations.props
+++ b/src/libraries/System.Collections/tests/Configurations.props
@@ -1,10 +1,10 @@
-
+
- netcoreapp1.1;
+ netcoreapp;
netstandard1.3;
- netstandard1.7;
+ netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Collections/tests/Performance/System.Collections.Performance.Tests.csproj b/src/libraries/System.Collections/tests/Performance/System.Collections.Performance.Tests.csproj
index e3851e4c44873e92a1bfebabda204382b94ff0bb..26c940e65820a1a3b4ce4d37470031a304a0a64b 100644
--- a/src/libraries/System.Collections/tests/Performance/System.Collections.Performance.Tests.csproj
+++ b/src/libraries/System.Collections/tests/Performance/System.Collections.Performance.Tests.csproj
@@ -1,12 +1,12 @@
-
+
true
-
-
+
+
diff --git a/src/libraries/System.Collections/tests/System.Collections.Tests.builds b/src/libraries/System.Collections/tests/System.Collections.Tests.builds
index a748a9a6f95dee8aee97f7f7cdc6789db7851a6e..3e205bc99fd636250b3e3d24e7439113d9c095df 100644
--- a/src/libraries/System.Collections/tests/System.Collections.Tests.builds
+++ b/src/libraries/System.Collections/tests/System.Collections.Tests.builds
@@ -1,10 +1,10 @@
-
+
- netcoreapp1.1
+ netcoreapp
netstandard1.3
diff --git a/src/libraries/System.Collections/tests/System.Collections.Tests.csproj b/src/libraries/System.Collections/tests/System.Collections.Tests.csproj
index 6313043ff39938a2eb9166a09839b04f8de62b91..4aec0d2d096cf9480ae516bc8ecce1860ae4667e 100644
--- a/src/libraries/System.Collections/tests/System.Collections.Tests.csproj
+++ b/src/libraries/System.Collections/tests/System.Collections.Tests.csproj
@@ -10,58 +10,58 @@
-
+
Common\System\Collections\CollectionAsserts.cs
-
+
Common\System\Collections\ICollection.NonGeneric.Tests.cs
-
+
Common\System\Collections\ICollection.Generic.Tests.cs
-
+
Common\System\Collections\IDictionary.NonGeneric.Tests.cs
-
+
Common\System\Collections\IDictionary.Generic.Tests.cs
-
+
Common\System\Collections\IEnumerable.NonGeneric.Tests.cs
-
+
Common\System\Collections\IEnumerable.Generic.Tests.cs
-
+
Common\System\Collections\IList.NonGeneric.Tests.cs
-
+
Common\System\Collections\IList.Generic.Tests.cs
-
+
Common\System\Collections\IGenericSharedAPI.Tests.cs
-
+
Common\System\Collections\ISet.Generic.Tests.cs
-
+
Common\System\Collections\TestBase.NonGeneric.Tests.cs
-
+
Common\System\Collections\TestBase.Generic.Tests.cs
-
+
Common\System\Collections\DebugView.Tests.cs
-
+
Common\System\Collections\TestingTypes.cs
-
+
Common\System\EnumTypes.cs
-
+
Common\System\ObjectCloner.cs
-
+
Common\System\RuntimeDetection.cs
@@ -146,12 +146,12 @@
-
+
Common\System\Collections\IEnumerable.NonGeneric.Serialization.Tests.cs
-
+
Common\System\Collections\IEnumerable.Generic.Serialization.Tests.cs
-
+
\ No newline at end of file
diff --git a/src/libraries/System.ComponentModel.Annotations/pkg/System.ComponentModel.Annotations.builds b/src/libraries/System.ComponentModel.Annotations/pkg/System.ComponentModel.Annotations.builds
index 508c2e49b420444132cecd2a7783cbcb7a75b82e..27f1f5735648b7ed899baaac0bbf8a024aca1e75 100644
--- a/src/libraries/System.ComponentModel.Annotations/pkg/System.ComponentModel.Annotations.builds
+++ b/src/libraries/System.ComponentModel.Annotations/pkg/System.ComponentModel.Annotations.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
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 6a0c1796a891377d1cea6b60084c29c02fcdffaf..9343d44caf2ce384c3a988be26bcafdf29b0780a 100644
--- a/src/libraries/System.ComponentModel.Annotations/pkg/System.ComponentModel.Annotations.pkgproj
+++ b/src/libraries/System.ComponentModel.Annotations/pkg/System.ComponentModel.Annotations.pkgproj
@@ -3,7 +3,7 @@
- net463;netcoreapp1.1;$(AllXamarinFrameworks)
+ net463;netcoreapp2.0;$(AllXamarinFrameworks)
diff --git a/src/libraries/System.ComponentModel.Annotations/ref/System.ComponentModel.Annotations.csproj b/src/libraries/System.ComponentModel.Annotations/ref/System.ComponentModel.Annotations.csproj
index daa3fcfd7b0d80acf5b3bee8a3cd9753e8ddcb05..bb4215b427c954d17ba015f6365ebd82c491397c 100644
--- a/src/libraries/System.ComponentModel.Annotations/ref/System.ComponentModel.Annotations.csproj
+++ b/src/libraries/System.ComponentModel.Annotations/ref/System.ComponentModel.Annotations.csproj
@@ -1,4 +1,4 @@
-
+
@@ -9,4 +9,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.ComponentModel.Annotations/src/Configurations.props b/src/libraries/System.ComponentModel.Annotations/src/Configurations.props
index 9c336c0be9e52171e2fecf14214e3373be07177d..dc837f915219bcf7ff5c38f67e01c45d5b976485 100644
--- a/src/libraries/System.ComponentModel.Annotations/src/Configurations.props
+++ b/src/libraries/System.ComponentModel.Annotations/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.ComponentModel.Annotations/tests/Configurations.props b/src/libraries/System.ComponentModel.Annotations/tests/Configurations.props
index 98f53209d45a12360d0bbf7cf031b29ff556fc57..c398e42e899425ce70e3a9884633835ab6fcc66e 100644
--- a/src/libraries/System.ComponentModel.Annotations/tests/Configurations.props
+++ b/src/libraries/System.ComponentModel.Annotations/tests/Configurations.props
@@ -1,8 +1,8 @@
-
+
- netstandard1.7;
+ netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.ComponentModel.Annotations/tests/System.ComponentModel.Annotations.Tests.builds b/src/libraries/System.ComponentModel.Annotations/tests/System.ComponentModel.Annotations.Tests.builds
index 43464bca11855fbd3e2bc313b87eff802792953d..d6136ab85096e9310145989886292bed6d486f71 100644
--- a/src/libraries/System.ComponentModel.Annotations/tests/System.ComponentModel.Annotations.Tests.builds
+++ b/src/libraries/System.ComponentModel.Annotations/tests/System.ComponentModel.Annotations.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.ComponentModel.EventBasedAsync/pkg/System.ComponentModel.EventBasedAsync.builds b/src/libraries/System.ComponentModel.EventBasedAsync/pkg/System.ComponentModel.EventBasedAsync.builds
index 637025120ed069597be3aac89d6933bdedbd5f84..f3720a9abe8138726c0c7fea46a6ba71ea9043d2 100644
--- a/src/libraries/System.ComponentModel.EventBasedAsync/pkg/System.ComponentModel.EventBasedAsync.builds
+++ b/src/libraries/System.ComponentModel.EventBasedAsync/pkg/System.ComponentModel.EventBasedAsync.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.ComponentModel.EventBasedAsync/pkg/System.ComponentModel.EventBasedAsync.pkgproj b/src/libraries/System.ComponentModel.EventBasedAsync/pkg/System.ComponentModel.EventBasedAsync.pkgproj
index a874b6340978ecb08ab87e270f33026b6aabc4c0..087383073a8381ca434ca8dc7d74e21760860bd4 100644
--- a/src/libraries/System.ComponentModel.EventBasedAsync/pkg/System.ComponentModel.EventBasedAsync.pkgproj
+++ b/src/libraries/System.ComponentModel.EventBasedAsync/pkg/System.ComponentModel.EventBasedAsync.pkgproj
@@ -3,7 +3,7 @@
- net463;netcoreapp1.1;$(AllXamarinFrameworks)
+ net463;netcoreapp2.0;$(AllXamarinFrameworks)
diff --git a/src/libraries/System.ComponentModel.EventBasedAsync/ref/System.ComponentModel.EventBasedAsync.csproj b/src/libraries/System.ComponentModel.EventBasedAsync/ref/System.ComponentModel.EventBasedAsync.csproj
index f61a3fbfe7b5f89726c6839ac0906d3d080c6f4e..0f63ea0ae473ab861c512ab8d04e4b9fef112378 100644
--- a/src/libraries/System.ComponentModel.EventBasedAsync/ref/System.ComponentModel.EventBasedAsync.csproj
+++ b/src/libraries/System.ComponentModel.EventBasedAsync/ref/System.ComponentModel.EventBasedAsync.csproj
@@ -1,4 +1,4 @@
-
+
@@ -11,4 +11,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.ComponentModel.EventBasedAsync/src/Configurations.props b/src/libraries/System.ComponentModel.EventBasedAsync/src/Configurations.props
index 9c336c0be9e52171e2fecf14214e3373be07177d..dc837f915219bcf7ff5c38f67e01c45d5b976485 100644
--- a/src/libraries/System.ComponentModel.EventBasedAsync/src/Configurations.props
+++ b/src/libraries/System.ComponentModel.EventBasedAsync/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.ComponentModel.EventBasedAsync/tests/Configurations.props b/src/libraries/System.ComponentModel.EventBasedAsync/tests/Configurations.props
index f0ebe53119ec712315cfea5b151d5f0d754744f8..c3266e1e9362243b5723032465bcc7a62ae720ce 100644
--- a/src/libraries/System.ComponentModel.EventBasedAsync/tests/Configurations.props
+++ b/src/libraries/System.ComponentModel.EventBasedAsync/tests/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard1.3;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.ComponentModel.EventBasedAsync/tests/System.ComponentModel.EventBasedAsync.Tests.builds b/src/libraries/System.ComponentModel.EventBasedAsync/tests/System.ComponentModel.EventBasedAsync.Tests.builds
index 46f389e113179cfe8274afe0ece80ce8be21562e..a518b863517a0093cb8551fb237c3809ea8c0b3e 100644
--- a/src/libraries/System.ComponentModel.EventBasedAsync/tests/System.ComponentModel.EventBasedAsync.Tests.builds
+++ b/src/libraries/System.ComponentModel.EventBasedAsync/tests/System.ComponentModel.EventBasedAsync.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.ComponentModel.EventBasedAsync/tests/System.ComponentModel.EventBasedAsync.Tests.csproj b/src/libraries/System.ComponentModel.EventBasedAsync/tests/System.ComponentModel.EventBasedAsync.Tests.csproj
index 76517e3955a812a2b8ec0957e4bc8504126fc6c8..6031c85c1db251b38fb70e5c304b545589b3d4be 100644
--- a/src/libraries/System.ComponentModel.EventBasedAsync/tests/System.ComponentModel.EventBasedAsync.Tests.csproj
+++ b/src/libraries/System.ComponentModel.EventBasedAsync/tests/System.ComponentModel.EventBasedAsync.Tests.csproj
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.ComponentModel.Primitives/pkg/System.ComponentModel.Primitives.builds b/src/libraries/System.ComponentModel.Primitives/pkg/System.ComponentModel.Primitives.builds
index c0c1477fad22c983ea96e102458c5642fadf6c95..5cbb34ced093cbfc91c67c83a7587d098c8478c4 100644
--- a/src/libraries/System.ComponentModel.Primitives/pkg/System.ComponentModel.Primitives.builds
+++ b/src/libraries/System.ComponentModel.Primitives/pkg/System.ComponentModel.Primitives.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.ComponentModel.Primitives/pkg/System.ComponentModel.Primitives.pkgproj b/src/libraries/System.ComponentModel.Primitives/pkg/System.ComponentModel.Primitives.pkgproj
index 9413ddc9a56259a4c11a8c3fa54e3c79faedd38e..7af100b8abfdde5fb54a4edc3bdd74423696225f 100644
--- a/src/libraries/System.ComponentModel.Primitives/pkg/System.ComponentModel.Primitives.pkgproj
+++ b/src/libraries/System.ComponentModel.Primitives/pkg/System.ComponentModel.Primitives.pkgproj
@@ -1,9 +1,9 @@
-
+
- net463;netcoreapp1.1;$(AllXamarinFrameworks)
+ net463;netcoreapp2.0;$(AllXamarinFrameworks)
diff --git a/src/libraries/System.ComponentModel.Primitives/ref/System.ComponentModel.Primitives.csproj b/src/libraries/System.ComponentModel.Primitives/ref/System.ComponentModel.Primitives.csproj
index 4eae778a3d08332412762f5438d1606eac59a3af..f091b8f216f1aedba09d3e17dd5c84eb71fb9cea 100644
--- a/src/libraries/System.ComponentModel.Primitives/ref/System.ComponentModel.Primitives.csproj
+++ b/src/libraries/System.ComponentModel.Primitives/ref/System.ComponentModel.Primitives.csproj
@@ -1,4 +1,4 @@
-
+
@@ -10,4 +10,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.ComponentModel.Primitives/src/Configurations.props b/src/libraries/System.ComponentModel.Primitives/src/Configurations.props
index 9c336c0be9e52171e2fecf14214e3373be07177d..dc837f915219bcf7ff5c38f67e01c45d5b976485 100644
--- a/src/libraries/System.ComponentModel.Primitives/src/Configurations.props
+++ b/src/libraries/System.ComponentModel.Primitives/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.ComponentModel.Primitives/tests/Configurations.props b/src/libraries/System.ComponentModel.Primitives/tests/Configurations.props
index 512c938bad5364c677a3f4d9f647f1ade8c14aea..b2db637110616a495d303924e9aaf8b800db4821 100644
--- a/src/libraries/System.ComponentModel.Primitives/tests/Configurations.props
+++ b/src/libraries/System.ComponentModel.Primitives/tests/Configurations.props
@@ -1,9 +1,9 @@
-
+
netstandard1.3;
- netstandard1.7;
+ netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.ComponentModel.Primitives/tests/System.ComponentModel.Primitives.Tests.builds b/src/libraries/System.ComponentModel.Primitives/tests/System.ComponentModel.Primitives.Tests.builds
index 34abfe12493a161f76ce254c7ce4bedefae3a6f2..c619b5a9baf9f387c54b22905a220e117a388004 100644
--- a/src/libraries/System.ComponentModel.Primitives/tests/System.ComponentModel.Primitives.Tests.builds
+++ b/src/libraries/System.ComponentModel.Primitives/tests/System.ComponentModel.Primitives.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.ComponentModel.Primitives/tests/System.ComponentModel.Primitives.Tests.csproj b/src/libraries/System.ComponentModel.Primitives/tests/System.ComponentModel.Primitives.Tests.csproj
index c69b2584259ebf322e5b4dde28d5e6b20f61b1ef..ce1990b85ffd04db5c3f2727c0bbd2fc9d184ebf 100644
--- a/src/libraries/System.ComponentModel.Primitives/tests/System.ComponentModel.Primitives.Tests.csproj
+++ b/src/libraries/System.ComponentModel.Primitives/tests/System.ComponentModel.Primitives.Tests.csproj
@@ -1,4 +1,4 @@
-
+
@@ -29,4 +29,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.ComponentModel.TypeConverter/pkg/System.ComponentModel.TypeConverter.builds b/src/libraries/System.ComponentModel.TypeConverter/pkg/System.ComponentModel.TypeConverter.builds
index 5e30a6915bd902472e1f90c2210b28d8a34ef6ec..63838aa38307c86858909775230586f18dfc04f9 100644
--- a/src/libraries/System.ComponentModel.TypeConverter/pkg/System.ComponentModel.TypeConverter.builds
+++ b/src/libraries/System.ComponentModel.TypeConverter/pkg/System.ComponentModel.TypeConverter.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.ComponentModel.TypeConverter/pkg/System.ComponentModel.TypeConverter.pkgproj b/src/libraries/System.ComponentModel.TypeConverter/pkg/System.ComponentModel.TypeConverter.pkgproj
index f80cab399b71af124b2d87d6bbd5b6153b13cf34..e71310870cd09dbb54109089443953908cd9ae55 100644
--- a/src/libraries/System.ComponentModel.TypeConverter/pkg/System.ComponentModel.TypeConverter.pkgproj
+++ b/src/libraries/System.ComponentModel.TypeConverter/pkg/System.ComponentModel.TypeConverter.pkgproj
@@ -3,7 +3,7 @@
- net463;netcoreapp1.1;$(AllXamarinFrameworks)
+ net463;netcoreapp2.0;$(AllXamarinFrameworks)
diff --git a/src/libraries/System.ComponentModel.TypeConverter/ref/System.ComponentModel.TypeConverter.csproj b/src/libraries/System.ComponentModel.TypeConverter/ref/System.ComponentModel.TypeConverter.csproj
index 5a950152b04e5713569110f11de5a5860555432f..100d244e137775c894cc41a651a10aa6eaec5fbd 100644
--- a/src/libraries/System.ComponentModel.TypeConverter/ref/System.ComponentModel.TypeConverter.csproj
+++ b/src/libraries/System.ComponentModel.TypeConverter/ref/System.ComponentModel.TypeConverter.csproj
@@ -1,4 +1,4 @@
-
+
@@ -16,6 +16,5 @@
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.ComponentModel.TypeConverter/src/Configurations.props b/src/libraries/System.ComponentModel.TypeConverter/src/Configurations.props
index 9c336c0be9e52171e2fecf14214e3373be07177d..dc837f915219bcf7ff5c38f67e01c45d5b976485 100644
--- a/src/libraries/System.ComponentModel.TypeConverter/src/Configurations.props
+++ b/src/libraries/System.ComponentModel.TypeConverter/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.ComponentModel.TypeConverter/tests/Configurations.props b/src/libraries/System.ComponentModel.TypeConverter/tests/Configurations.props
index b744993779f030cfc03be021645dfc161ff05f68..800e963c809d11f44888eedf66bad86641a54996 100644
--- a/src/libraries/System.ComponentModel.TypeConverter/tests/Configurations.props
+++ b/src/libraries/System.ComponentModel.TypeConverter/tests/Configurations.props
@@ -1,9 +1,9 @@
-
+
netstandard1.5;
- netstandard1.7;
+ netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.builds b/src/libraries/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.builds
index 341f1019cb48d61c3831e491c24832b95c361b68..8dc9f1d9083b60914f888f1c9299f329ee371d6e 100644
--- a/src/libraries/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.builds
+++ b/src/libraries/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.csproj b/src/libraries/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.csproj
index 5ebfc1b1fb21a786f54e88141eba0a9482c5a362..3bff40c0655cf3a23227422e2f4301a755b8b8b9 100644
--- a/src/libraries/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.csproj
+++ b/src/libraries/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.csproj
@@ -1,4 +1,4 @@
-
+
@@ -77,4 +77,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.ComponentModel/pkg/System.ComponentModel.builds b/src/libraries/System.ComponentModel/pkg/System.ComponentModel.builds
index c7c677167469972f270d24c13dd92143448bfd9e..6c981159458afdd92f338e56eaba97e8216ebeec 100644
--- a/src/libraries/System.ComponentModel/pkg/System.ComponentModel.builds
+++ b/src/libraries/System.ComponentModel/pkg/System.ComponentModel.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.ComponentModel/pkg/System.ComponentModel.pkgproj b/src/libraries/System.ComponentModel/pkg/System.ComponentModel.pkgproj
index b973dc122dac0589906ac196606595496822a7b2..5c28546c7465748f53c3d63e814a66661e41af90 100644
--- a/src/libraries/System.ComponentModel/pkg/System.ComponentModel.pkgproj
+++ b/src/libraries/System.ComponentModel/pkg/System.ComponentModel.pkgproj
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.ComponentModel/ref/System.ComponentModel.csproj b/src/libraries/System.ComponentModel/ref/System.ComponentModel.csproj
index facd34b330f761be9f3782fe7fc907dc81bc907b..2b7c05c1fb841dd91625ca0e39caa82bfa6d2836 100644
--- a/src/libraries/System.ComponentModel/ref/System.ComponentModel.csproj
+++ b/src/libraries/System.ComponentModel/ref/System.ComponentModel.csproj
@@ -1,4 +1,4 @@
-
+
@@ -8,4 +8,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.ComponentModel/src/Configurations.props b/src/libraries/System.ComponentModel/src/Configurations.props
index f0ebe53119ec712315cfea5b151d5f0d754744f8..c3266e1e9362243b5723032465bcc7a62ae720ce 100644
--- a/src/libraries/System.ComponentModel/src/Configurations.props
+++ b/src/libraries/System.ComponentModel/src/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard1.3;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.ComponentModel/tests/Configurations.props b/src/libraries/System.ComponentModel/tests/Configurations.props
index f0ebe53119ec712315cfea5b151d5f0d754744f8..c3266e1e9362243b5723032465bcc7a62ae720ce 100644
--- a/src/libraries/System.ComponentModel/tests/Configurations.props
+++ b/src/libraries/System.ComponentModel/tests/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard1.3;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.ComponentModel/tests/System.ComponentModel.Tests.builds b/src/libraries/System.ComponentModel/tests/System.ComponentModel.Tests.builds
index b06351111858e9dca8324f1661ff2219df70d85f..4b3f9458d03de3cd5d7cb6df0016e2cf7fa32442 100644
--- a/src/libraries/System.ComponentModel/tests/System.ComponentModel.Tests.builds
+++ b/src/libraries/System.ComponentModel/tests/System.ComponentModel.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.ComponentModel/tests/System.ComponentModel.Tests.csproj b/src/libraries/System.ComponentModel/tests/System.ComponentModel.Tests.csproj
index d217e391d2f7ba7bfe80310e925188ddcb2fd07e..581a1b9086bc32d3bd4713266104f9a6da0322e5 100644
--- a/src/libraries/System.ComponentModel/tests/System.ComponentModel.Tests.csproj
+++ b/src/libraries/System.ComponentModel/tests/System.ComponentModel.Tests.csproj
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Composition.AttributedModel/pkg/System.Composition.AttributedModel.builds b/src/libraries/System.Composition.AttributedModel/pkg/System.Composition.AttributedModel.builds
index 27b1553e6418deb7473a44ba81da8f86f0c02c2d..17e6009937d4314b07379afe36b775cb4fbdc23d 100644
--- a/src/libraries/System.Composition.AttributedModel/pkg/System.Composition.AttributedModel.builds
+++ b/src/libraries/System.Composition.AttributedModel/pkg/System.Composition.AttributedModel.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ 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 d0f6336bdde7c8812ead5c72839b8b466a212845..89aba23068821b0c61b4b8cf58b7de201106617a 100644
--- a/src/libraries/System.Composition.AttributedModel/pkg/System.Composition.AttributedModel.pkgproj
+++ b/src/libraries/System.Composition.AttributedModel/pkg/System.Composition.AttributedModel.pkgproj
@@ -1,12 +1,10 @@
-
+
-
net45;netcore45;netcoreapp1.0;wp8;wpa81;$(AllXamarinFrameworks)
-
\ No newline at end of file
diff --git a/src/libraries/System.Composition.AttributedModel/src/Configurations.props b/src/libraries/System.Composition.AttributedModel/src/Configurations.props
index 2ec0365c0d50ed330862506ea44da4fccb7fd0a9..66fc3409d36ab9b1606b29eb2f04491b1eb10c92 100644
--- a/src/libraries/System.Composition.AttributedModel/src/Configurations.props
+++ b/src/libraries/System.Composition.AttributedModel/src/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard1.0;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Composition.Convention/pkg/System.Composition.Convention.builds b/src/libraries/System.Composition.Convention/pkg/System.Composition.Convention.builds
index 5f024ad5633fd0596f0440d3c355315f8a04dc29..39e774e75dce799c34ddd7eaf25289d15b14609d 100644
--- a/src/libraries/System.Composition.Convention/pkg/System.Composition.Convention.builds
+++ b/src/libraries/System.Composition.Convention/pkg/System.Composition.Convention.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ 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 d7981fee21698619257a612cd46580d9f3d3ef37..4ecab9f885f06a8106dd956a6f043d16be9d75fb 100644
--- a/src/libraries/System.Composition.Convention/pkg/System.Composition.Convention.pkgproj
+++ b/src/libraries/System.Composition.Convention/pkg/System.Composition.Convention.pkgproj
@@ -1,12 +1,10 @@
-
+
-
net45;netcore45;netcoreapp1.0;wp8;wpa81;$(AllXamarinFrameworks)
-
\ No newline at end of file
diff --git a/src/libraries/System.Composition.Convention/src/Configurations.props b/src/libraries/System.Composition.Convention/src/Configurations.props
index 2ec0365c0d50ed330862506ea44da4fccb7fd0a9..66fc3409d36ab9b1606b29eb2f04491b1eb10c92 100644
--- a/src/libraries/System.Composition.Convention/src/Configurations.props
+++ b/src/libraries/System.Composition.Convention/src/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard1.0;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Composition.Convention/tests/Configurations.props b/src/libraries/System.Composition.Convention/tests/Configurations.props
index ec110beba61090944d3c69096317d33c62278eb0..fa32899de2a47fc96ccdf5fc1f83edc154b03d33 100644
--- a/src/libraries/System.Composition.Convention/tests/Configurations.props
+++ b/src/libraries/System.Composition.Convention/tests/Configurations.props
@@ -1,8 +1,8 @@
-
+
netcoreapp1.0;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Composition.Convention/tests/System.Composition.Convention.Tests.builds b/src/libraries/System.Composition.Convention/tests/System.Composition.Convention.Tests.builds
index 34e3e48aa71ed73a433992fb1468b1a816d4009f..7a93c52ea4c71fc882c876187a4d4418ace3a19c 100644
--- a/src/libraries/System.Composition.Convention/tests/System.Composition.Convention.Tests.builds
+++ b/src/libraries/System.Composition.Convention/tests/System.Composition.Convention.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Composition.Convention/tests/System.Composition.Convention.Tests.csproj b/src/libraries/System.Composition.Convention/tests/System.Composition.Convention.Tests.csproj
index b8283687825451d25d8542e439fa0f035c8c1f34..3fa0149f7275ff18e8166e0fb88f77a8f966557c 100644
--- a/src/libraries/System.Composition.Convention/tests/System.Composition.Convention.Tests.csproj
+++ b/src/libraries/System.Composition.Convention/tests/System.Composition.Convention.Tests.csproj
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Composition.Hosting/pkg/System.Composition.Hosting.builds b/src/libraries/System.Composition.Hosting/pkg/System.Composition.Hosting.builds
index 143affbe47db8a92a1cffba56d167305b37c172b..6b42af706746aae2998947e4a17d8636852e5713 100644
--- a/src/libraries/System.Composition.Hosting/pkg/System.Composition.Hosting.builds
+++ b/src/libraries/System.Composition.Hosting/pkg/System.Composition.Hosting.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ 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 24e92c84b974e74b7ab3367457e7fef39836f8ff..6a19efb3adfa356a387bc0084188439bb833ae95 100644
--- a/src/libraries/System.Composition.Hosting/pkg/System.Composition.Hosting.pkgproj
+++ b/src/libraries/System.Composition.Hosting/pkg/System.Composition.Hosting.pkgproj
@@ -1,12 +1,10 @@
-
+
-
net45;netcore45;netcoreapp1.0;wp8;wpa81;$(AllXamarinFrameworks)
-
\ No newline at end of file
diff --git a/src/libraries/System.Composition.Hosting/src/Configurations.props b/src/libraries/System.Composition.Hosting/src/Configurations.props
index 2ec0365c0d50ed330862506ea44da4fccb7fd0a9..66fc3409d36ab9b1606b29eb2f04491b1eb10c92 100644
--- a/src/libraries/System.Composition.Hosting/src/Configurations.props
+++ b/src/libraries/System.Composition.Hosting/src/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard1.0;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Composition.Runtime/pkg/System.Composition.Runtime.builds b/src/libraries/System.Composition.Runtime/pkg/System.Composition.Runtime.builds
index 8c944373c1060f09fa092c83d6786c4228dcdb34..4676f95a60627827efa1e1d9041a9f43a03d5a8f 100644
--- a/src/libraries/System.Composition.Runtime/pkg/System.Composition.Runtime.builds
+++ b/src/libraries/System.Composition.Runtime/pkg/System.Composition.Runtime.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ 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 3a792daef541fd6613059efe154230e1baf42858..48a297d85a881d89b627ae5270654976c38abcbc 100644
--- a/src/libraries/System.Composition.Runtime/pkg/System.Composition.Runtime.pkgproj
+++ b/src/libraries/System.Composition.Runtime/pkg/System.Composition.Runtime.pkgproj
@@ -1,12 +1,10 @@
-
+
-
net45;netcore45;netcoreapp1.0;wp8;wpa81;$(AllXamarinFrameworks)
-
\ No newline at end of file
diff --git a/src/libraries/System.Composition.Runtime/src/Configurations.props b/src/libraries/System.Composition.Runtime/src/Configurations.props
index 2ec0365c0d50ed330862506ea44da4fccb7fd0a9..66fc3409d36ab9b1606b29eb2f04491b1eb10c92 100644
--- a/src/libraries/System.Composition.Runtime/src/Configurations.props
+++ b/src/libraries/System.Composition.Runtime/src/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard1.0;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Composition.TypedParts/pkg/System.Composition.TypedParts.builds b/src/libraries/System.Composition.TypedParts/pkg/System.Composition.TypedParts.builds
index ed1ef7af756e387c20de8cb66e7bc6ba94231694..f837fecc4988244e9aaf9cbfe2eb4e9a7cd05aaa 100644
--- a/src/libraries/System.Composition.TypedParts/pkg/System.Composition.TypedParts.builds
+++ b/src/libraries/System.Composition.TypedParts/pkg/System.Composition.TypedParts.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ 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 7288dae5f6bcda5c662c02a2f99716e33006fb48..b18925094599f1ebb52898f3e03cff7ab7d4fc7c 100644
--- a/src/libraries/System.Composition.TypedParts/pkg/System.Composition.TypedParts.pkgproj
+++ b/src/libraries/System.Composition.TypedParts/pkg/System.Composition.TypedParts.pkgproj
@@ -1,12 +1,10 @@
-
+
-
net45;netcore45;netcoreapp1.0;wp8;wpa81;$(AllXamarinFrameworks)
-
\ No newline at end of file
diff --git a/src/libraries/System.Composition.TypedParts/src/Configurations.props b/src/libraries/System.Composition.TypedParts/src/Configurations.props
index 2ec0365c0d50ed330862506ea44da4fccb7fd0a9..66fc3409d36ab9b1606b29eb2f04491b1eb10c92 100644
--- a/src/libraries/System.Composition.TypedParts/src/Configurations.props
+++ b/src/libraries/System.Composition.TypedParts/src/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard1.0;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Composition/demos/Microsoft.Composition.Demos.ExtendedCollectionImports/Microsoft.Composition.Demos.ExtendedCollectionImports.csproj b/src/libraries/System.Composition/demos/Microsoft.Composition.Demos.ExtendedCollectionImports/Microsoft.Composition.Demos.ExtendedCollectionImports.csproj
index 001e47b2e69d78b208be0e334947c786dff42dca..47feef6f1cf7cf5c45cd9e71747365361481dc90 100644
--- a/src/libraries/System.Composition/demos/Microsoft.Composition.Demos.ExtendedCollectionImports/Microsoft.Composition.Demos.ExtendedCollectionImports.csproj
+++ b/src/libraries/System.Composition/demos/Microsoft.Composition.Demos.ExtendedCollectionImports/Microsoft.Composition.Demos.ExtendedCollectionImports.csproj
@@ -34,4 +34,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Composition/perftests/Microsoft.Composition.ThroughputHarness.csproj b/src/libraries/System.Composition/perftests/Microsoft.Composition.ThroughputHarness.csproj
index b47f6606f3309d1d2c4800cd0eb2c7b317cb214b..1c7981d83ebce47ae724dba2b5e70659f74c0293 100644
--- a/src/libraries/System.Composition/perftests/Microsoft.Composition.ThroughputHarness.csproj
+++ b/src/libraries/System.Composition/perftests/Microsoft.Composition.ThroughputHarness.csproj
@@ -50,4 +50,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Composition/pkg/System.Composition.builds b/src/libraries/System.Composition/pkg/System.Composition.builds
index 3809c04b74fb64d828b2437b2be422fab4be129e..bf350146a94bcf745adc0597d44e50fe7a12b65e 100644
--- a/src/libraries/System.Composition/pkg/System.Composition.builds
+++ b/src/libraries/System.Composition/pkg/System.Composition.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Composition/pkg/System.Composition.pkgproj b/src/libraries/System.Composition/pkg/System.Composition.pkgproj
index 71d2f08f8703e28f2ba87d0ece7dece51ea1d3f7..70113e2dbe6926c40a7b0ce28d77add2b3038dc2 100644
--- a/src/libraries/System.Composition/pkg/System.Composition.pkgproj
+++ b/src/libraries/System.Composition/pkg/System.Composition.pkgproj
@@ -1,7 +1,6 @@
-
+
-
@@ -9,6 +8,5 @@
-
\ No newline at end of file
diff --git a/src/libraries/System.Composition/scenarios/TestLibrary/TestLibrary.csproj b/src/libraries/System.Composition/scenarios/TestLibrary/TestLibrary.csproj
index 8376f5992c181ae4e3772b944471bd95b742453f..39fbbcc3c46f0272ea100f65e0c68ba5ee588d17 100644
--- a/src/libraries/System.Composition/scenarios/TestLibrary/TestLibrary.csproj
+++ b/src/libraries/System.Composition/scenarios/TestLibrary/TestLibrary.csproj
@@ -21,4 +21,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Composition/tests/Configurations.props b/src/libraries/System.Composition/tests/Configurations.props
index f0ebe53119ec712315cfea5b151d5f0d754744f8..c3266e1e9362243b5723032465bcc7a62ae720ce 100644
--- a/src/libraries/System.Composition/tests/Configurations.props
+++ b/src/libraries/System.Composition/tests/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard1.3;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Composition/tests/System.Composition.Tests.builds b/src/libraries/System.Composition/tests/System.Composition.Tests.builds
index f86d3e958473aa8ad431e252afdce5d9d112a461..1712b6e8c3b795e336c8a0646b5bc19ba5f5a140 100644
--- a/src/libraries/System.Composition/tests/System.Composition.Tests.builds
+++ b/src/libraries/System.Composition/tests/System.Composition.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Configuration/pkg/System.Configuration.builds b/src/libraries/System.Configuration/pkg/System.Configuration.builds
index b6ea2f4e29701d7db40a131f16c6f7d771930f73..c27c1801ac8a27ed44524b26ecbc7f5c76f6ce9a 100644
--- a/src/libraries/System.Configuration/pkg/System.Configuration.builds
+++ b/src/libraries/System.Configuration/pkg/System.Configuration.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Configuration/pkg/System.Configuration.pkgproj b/src/libraries/System.Configuration/pkg/System.Configuration.pkgproj
index eb8e5a639642b8940547fbb0a473294d088f3c9e..e03cbe3fe86f9e9ae84324a04de30a44965db2f1 100644
--- a/src/libraries/System.Configuration/pkg/System.Configuration.pkgproj
+++ b/src/libraries/System.Configuration/pkg/System.Configuration.pkgproj
@@ -1,9 +1,9 @@
-
+
- netcoreapp1.1;net461;$(AllXamarinFrameworks)
+ netcoreapp2.0;net461;$(AllXamarinFrameworks)
diff --git a/src/libraries/System.Configuration/ref/Configurations.props b/src/libraries/System.Configuration/ref/Configurations.props
index fc9ef9822c01e3840af50ced2f25bdc2f5349eca..c398e42e899425ce70e3a9884633835ab6fcc66e 100644
--- a/src/libraries/System.Configuration/ref/Configurations.props
+++ b/src/libraries/System.Configuration/ref/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Configuration/tests/System.Configuration.Tests.builds b/src/libraries/System.Configuration/tests/System.Configuration.Tests.builds
index 114e4b3a0454ea2b2eea050352ccbd5b07984874..7a2d7d0668b0200a25e7e40690e96c7bf3dc955c 100644
--- a/src/libraries/System.Configuration/tests/System.Configuration.Tests.builds
+++ b/src/libraries/System.Configuration/tests/System.Configuration.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Console/pkg/System.Console.builds b/src/libraries/System.Console/pkg/System.Console.builds
index 09ef33c9a4b7952475a3b9b854a28db602dffa99..c299839d50d3c1f92d45b3f5df83cc8e9058e486 100644
--- a/src/libraries/System.Console/pkg/System.Console.builds
+++ b/src/libraries/System.Console/pkg/System.Console.builds
@@ -1,4 +1,4 @@
-
+
@@ -11,5 +11,4 @@
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Console/pkg/System.Console.pkgproj b/src/libraries/System.Console/pkg/System.Console.pkgproj
index 4b84737378fa2103491e80497318b24a47671683..4f2f2056a896b53fa68ea3b8705fb2e70684bb72 100644
--- a/src/libraries/System.Console/pkg/System.Console.pkgproj
+++ b/src/libraries/System.Console/pkg/System.Console.pkgproj
@@ -3,7 +3,7 @@
- net463;netcoreapp1.1;$(AllXamarinFrameworks)
+ net463;netcoreapp2.0;$(AllXamarinFrameworks)
TargetGroup=net463
@@ -20,4 +20,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Console/pkg/unix/System.Console.pkgproj b/src/libraries/System.Console/pkg/unix/System.Console.pkgproj
index 4f2b33d571671bedc1e510ed7b15f2a786fd1b5c..18f61ce37c46ea73e801f6e6484246cad5995989 100644
--- a/src/libraries/System.Console/pkg/unix/System.Console.pkgproj
+++ b/src/libraries/System.Console/pkg/unix/System.Console.pkgproj
@@ -1,16 +1,14 @@
-
+
-
unix
true
-
+
Unix
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Console/pkg/win/System.Console.pkgproj b/src/libraries/System.Console/pkg/win/System.Console.pkgproj
index f1f82aad7727905ad142740be19d1881838f86a8..025bd19030d90078b4f050d02fe6745ee63de68a 100644
--- a/src/libraries/System.Console/pkg/win/System.Console.pkgproj
+++ b/src/libraries/System.Console/pkg/win/System.Console.pkgproj
@@ -1,18 +1,15 @@
-
+
-
win
true
-
-
+
Windows_NT
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Console/ref/4.0.0/System.Console.depproj b/src/libraries/System.Console/ref/4.0.0/System.Console.depproj
index 7ffc8e592fc56eefb6098a74faf7eb1f57b24783..2e7ae1ef78110530ad498eb53dd16ebc5a5e5c78 100644
--- a/src/libraries/System.Console/ref/4.0.0/System.Console.depproj
+++ b/src/libraries/System.Console/ref/4.0.0/System.Console.depproj
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Console/ref/System.Console.csproj b/src/libraries/System.Console/ref/System.Console.csproj
index 169444ee03554b34ff45148d4a99c9fd80dad25f..602414d62dca65c7d8d8cc189348186017b6cfda 100644
--- a/src/libraries/System.Console/ref/System.Console.csproj
+++ b/src/libraries/System.Console/ref/System.Console.csproj
@@ -1,4 +1,4 @@
-
+
@@ -11,4 +11,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Console/src/Configurations.props b/src/libraries/System.Console/src/Configurations.props
index 3bb6330d9e73da4e4998b3dcba9a05936bf49b7e..4701fcd7729002100465c5249f5ddfe14f92bedd 100644
--- a/src/libraries/System.Console/src/Configurations.props
+++ b/src/libraries/System.Console/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -7,4 +7,4 @@
net463-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Console/tests/Configurations.props b/src/libraries/System.Console/tests/Configurations.props
index f0ebe53119ec712315cfea5b151d5f0d754744f8..c3266e1e9362243b5723032465bcc7a62ae720ce 100644
--- a/src/libraries/System.Console/tests/Configurations.props
+++ b/src/libraries/System.Console/tests/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard1.3;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Console/tests/ManualTests/System.Console.Manual.Tests.builds b/src/libraries/System.Console/tests/ManualTests/System.Console.Manual.Tests.builds
index 4082cd28ccd019166a463f5a90913f12156f2ffe..22a1d7f424a954dde4805f11f0f76fdcfa5495da 100644
--- a/src/libraries/System.Console/tests/ManualTests/System.Console.Manual.Tests.builds
+++ b/src/libraries/System.Console/tests/ManualTests/System.Console.Manual.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Console/tests/ManualTests/System.Console.Manual.Tests.csproj b/src/libraries/System.Console/tests/ManualTests/System.Console.Manual.Tests.csproj
index 67011ce19ffbdecc4ef36d497da31ff389abd4a6..587501873c6211333facd2a9a66344c5903411d7 100644
--- a/src/libraries/System.Console/tests/ManualTests/System.Console.Manual.Tests.csproj
+++ b/src/libraries/System.Console/tests/ManualTests/System.Console.Manual.Tests.csproj
@@ -1,4 +1,4 @@
-
+
@@ -12,4 +12,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Console/tests/Performance/System.Console.Performance.Tests.csproj b/src/libraries/System.Console/tests/Performance/System.Console.Performance.Tests.csproj
index ba2a7485539b1f11ff359b5d94954781ebed3bb9..4b73ba9994c43e4901ccfd75b624e204a7dcfd57 100644
--- a/src/libraries/System.Console/tests/Performance/System.Console.Performance.Tests.csproj
+++ b/src/libraries/System.Console/tests/Performance/System.Console.Performance.Tests.csproj
@@ -1,4 +1,4 @@
-
+
@@ -18,4 +18,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Console/tests/System.Console.Tests.builds b/src/libraries/System.Console/tests/System.Console.Tests.builds
index d0d25e47f78cd1bfb46a5dfbcc2ea706358d0981..2bba1b19a8d108e4f810f4abcf437e5665e1ce8d 100644
--- a/src/libraries/System.Console/tests/System.Console.Tests.builds
+++ b/src/libraries/System.Console/tests/System.Console.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Console/tests/System.Console.Tests.csproj b/src/libraries/System.Console/tests/System.Console.Tests.csproj
index 662e650f878034d9b74e9fc4fa4c0a805ffdca50..103d93a4bc37099368addf46b729fb405b21337a 100644
--- a/src/libraries/System.Console/tests/System.Console.Tests.csproj
+++ b/src/libraries/System.Console/tests/System.Console.Tests.csproj
@@ -1,4 +1,4 @@
-
+
@@ -51,4 +51,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Data.Common/pkg/System.Data.Common.builds b/src/libraries/System.Data.Common/pkg/System.Data.Common.builds
index cc196ce7cd806afb372fd35cd2ff5d0b0d008cbf..de5cd462b131de8757ac81a42151f5bf130c63dc 100644
--- a/src/libraries/System.Data.Common/pkg/System.Data.Common.builds
+++ b/src/libraries/System.Data.Common/pkg/System.Data.Common.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Data.Common/pkg/System.Data.Common.pkgproj b/src/libraries/System.Data.Common/pkg/System.Data.Common.pkgproj
index b9e33b39214f7c84d78683439e59107037bd29dd..cfffac495783e7914fb748f959ca89e68962fbc5 100644
--- a/src/libraries/System.Data.Common/pkg/System.Data.Common.pkgproj
+++ b/src/libraries/System.Data.Common/pkg/System.Data.Common.pkgproj
@@ -1,4 +1,4 @@
-
+
@@ -6,7 +6,7 @@
- net463;netcoreapp1.1;$(AllXamarinFrameworks)
+ net463;netcoreapp2.0;$(AllXamarinFrameworks)
diff --git a/src/libraries/System.Data.Common/ref/System.Data.Common.csproj b/src/libraries/System.Data.Common/ref/System.Data.Common.csproj
index bedf62dfdd9d39d485ee4858cc881e62b30b732e..a7bca424ccc47a8fab1f96479652e8cd39512ca4 100644
--- a/src/libraries/System.Data.Common/ref/System.Data.Common.csproj
+++ b/src/libraries/System.Data.Common/ref/System.Data.Common.csproj
@@ -1,4 +1,4 @@
-
+
@@ -17,4 +17,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Data.Common/src/Configurations.props b/src/libraries/System.Data.Common/src/Configurations.props
index 9c336c0be9e52171e2fecf14214e3373be07177d..dc837f915219bcf7ff5c38f67e01c45d5b976485 100644
--- a/src/libraries/System.Data.Common/src/Configurations.props
+++ b/src/libraries/System.Data.Common/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Data.Common/tests/Configurations.props b/src/libraries/System.Data.Common/tests/Configurations.props
index 512c938bad5364c677a3f4d9f647f1ade8c14aea..b2db637110616a495d303924e9aaf8b800db4821 100644
--- a/src/libraries/System.Data.Common/tests/Configurations.props
+++ b/src/libraries/System.Data.Common/tests/Configurations.props
@@ -1,9 +1,9 @@
-
+
netstandard1.3;
- netstandard1.7;
+ netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Data.Common/tests/System.Data.Common.Tests.builds b/src/libraries/System.Data.Common/tests/System.Data.Common.Tests.builds
index ec73cbb434968cd9267aee7c305df127c4571329..6fa081f0d48b1f812c6463c28a70225732f6a8d1 100644
--- a/src/libraries/System.Data.Common/tests/System.Data.Common.Tests.builds
+++ b/src/libraries/System.Data.Common/tests/System.Data.Common.Tests.builds
@@ -1,4 +1,4 @@
-
+
@@ -13,4 +13,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Data.Common/tests/System.Data.Common.Tests.csproj b/src/libraries/System.Data.Common/tests/System.Data.Common.Tests.csproj
index b070fd91ec14acbfb87d641727dfc63f46a05709..f50fa7371ecd127b84b569853ebc53084854b965 100644
--- a/src/libraries/System.Data.Common/tests/System.Data.Common.Tests.csproj
+++ b/src/libraries/System.Data.Common/tests/System.Data.Common.Tests.csproj
@@ -109,4 +109,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Data.SqlClient/pkg/System.Data.SqlClient.builds b/src/libraries/System.Data.SqlClient/pkg/System.Data.SqlClient.builds
index 5e88014b6685a32b5e7942b25cfe06e0dc0309fb..333bdf0c2164551769ece01691be1c39512836fe 100644
--- a/src/libraries/System.Data.SqlClient/pkg/System.Data.SqlClient.builds
+++ b/src/libraries/System.Data.SqlClient/pkg/System.Data.SqlClient.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
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 24b39530473d0bdd293757fe4dd08df58a1eb671..8718423e798ad508325fc9298ec490cbbfa6070e 100644
--- a/src/libraries/System.Data.SqlClient/pkg/System.Data.SqlClient.pkgproj
+++ b/src/libraries/System.Data.SqlClient/pkg/System.Data.SqlClient.pkgproj
@@ -3,7 +3,7 @@
- net463;netcoreapp1.1;$(AllXamarinFrameworks)
+ net463;netcoreapp2.0;$(AllXamarinFrameworks)
diff --git a/src/libraries/System.Data.SqlClient/ref/4.0/System.Data.SqlClient.depproj b/src/libraries/System.Data.SqlClient/ref/4.0/System.Data.SqlClient.depproj
index f53ba940859df8ef0c4f427264d61fa911c44043..e31673aae09a2b9098d4eb920d73c8e0b962bde7 100644
--- a/src/libraries/System.Data.SqlClient/ref/4.0/System.Data.SqlClient.depproj
+++ b/src/libraries/System.Data.SqlClient/ref/4.0/System.Data.SqlClient.depproj
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Data.SqlClient/ref/System.Data.SqlClient.csproj b/src/libraries/System.Data.SqlClient/ref/System.Data.SqlClient.csproj
index 15af2484d5a1950737de0f4d632eee779baffd45..90658222acc7d012c256228e2cd70ee579ac35fa 100644
--- a/src/libraries/System.Data.SqlClient/ref/System.Data.SqlClient.csproj
+++ b/src/libraries/System.Data.SqlClient/ref/System.Data.SqlClient.csproj
@@ -1,4 +1,4 @@
-
+
@@ -20,4 +20,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Data.SqlClient/src/Configurations.props b/src/libraries/System.Data.SqlClient/src/Configurations.props
index 3bb6330d9e73da4e4998b3dcba9a05936bf49b7e..4701fcd7729002100465c5249f5ddfe14f92bedd 100644
--- a/src/libraries/System.Data.SqlClient/src/Configurations.props
+++ b/src/libraries/System.Data.SqlClient/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -7,4 +7,4 @@
net463-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Data.SqlClient/tests/System.Data.SqlClient.Tests.builds b/src/libraries/System.Data.SqlClient/tests/System.Data.SqlClient.Tests.builds
index a81aaf71ab9492b813d6c9555b2ca10bb3d47392..771767664ca46dc49ebe99af47ca681e16bdb9b8 100644
--- a/src/libraries/System.Data.SqlClient/tests/System.Data.SqlClient.Tests.builds
+++ b/src/libraries/System.Data.SqlClient/tests/System.Data.SqlClient.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Data.SqlClient/tests/Tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj b/src/libraries/System.Data.SqlClient/tests/Tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj
index 24c1df60b6ab32e72455495aa2c38902d2f7b1a0..93b1a994635fb3172fbc4d886f49390aac956750 100644
--- a/src/libraries/System.Data.SqlClient/tests/Tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj
+++ b/src/libraries/System.Data.SqlClient/tests/Tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj
@@ -52,7 +52,7 @@
-
+
diff --git a/src/libraries/System.Diagnostics.Contracts/pkg/System.Diagnostics.Contracts.builds b/src/libraries/System.Diagnostics.Contracts/pkg/System.Diagnostics.Contracts.builds
index 7b68d5b94ab22b8d8f376fe9f2005436042eea81..027c8c22fb06600e42bf274cc9f1dae9e4a3257b 100644
--- a/src/libraries/System.Diagnostics.Contracts/pkg/System.Diagnostics.Contracts.builds
+++ b/src/libraries/System.Diagnostics.Contracts/pkg/System.Diagnostics.Contracts.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.Contracts/pkg/System.Diagnostics.Contracts.pkgproj b/src/libraries/System.Diagnostics.Contracts/pkg/System.Diagnostics.Contracts.pkgproj
index b39cd4bd219e583fc501f49d2aff8699b09cecbb..d370f71ddc34f306a1b6161cb119736db405a83c 100644
--- a/src/libraries/System.Diagnostics.Contracts/pkg/System.Diagnostics.Contracts.pkgproj
+++ b/src/libraries/System.Diagnostics.Contracts/pkg/System.Diagnostics.Contracts.pkgproj
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Diagnostics.Contracts/ref/System.Diagnostics.Contracts.csproj b/src/libraries/System.Diagnostics.Contracts/ref/System.Diagnostics.Contracts.csproj
index 031315f69e4641982ed6cf11106b49a1462626b0..fd8fc5f72073e229d629b1b4fe12505408ad4e45 100644
--- a/src/libraries/System.Diagnostics.Contracts/ref/System.Diagnostics.Contracts.csproj
+++ b/src/libraries/System.Diagnostics.Contracts/ref/System.Diagnostics.Contracts.csproj
@@ -1,4 +1,4 @@
-
+
@@ -8,4 +8,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.Contracts/src/Configurations.props b/src/libraries/System.Diagnostics.Contracts/src/Configurations.props
index 21c8c4fda0ec7d8a31febb208114a918dddfc821..49902e97c574436dd26a023fe466283579c46f60 100644
--- a/src/libraries/System.Diagnostics.Contracts/src/Configurations.props
+++ b/src/libraries/System.Diagnostics.Contracts/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard1.0;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.Contracts/tests/Configurations.props b/src/libraries/System.Diagnostics.Contracts/tests/Configurations.props
index f0ebe53119ec712315cfea5b151d5f0d754744f8..c3266e1e9362243b5723032465bcc7a62ae720ce 100644
--- a/src/libraries/System.Diagnostics.Contracts/tests/Configurations.props
+++ b/src/libraries/System.Diagnostics.Contracts/tests/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard1.3;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.Contracts/tests/System.Diagnostics.Contracts.Tests.builds b/src/libraries/System.Diagnostics.Contracts/tests/System.Diagnostics.Contracts.Tests.builds
index 5fb627db0b790b010d87ed2444494c17722ba5ad..82df0eb31016977f9e42bb7ef4acafc33af698c2 100644
--- a/src/libraries/System.Diagnostics.Contracts/tests/System.Diagnostics.Contracts.Tests.builds
+++ b/src/libraries/System.Diagnostics.Contracts/tests/System.Diagnostics.Contracts.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Diagnostics.Debug/pkg/System.Diagnostics.Debug.builds b/src/libraries/System.Diagnostics.Debug/pkg/System.Diagnostics.Debug.builds
index 6ddd3d076e6c00b44b6812234425348eeeb97d8d..7a6f788aa284aed6004c15edda04a8ada30ad89e 100644
--- a/src/libraries/System.Diagnostics.Debug/pkg/System.Diagnostics.Debug.builds
+++ b/src/libraries/System.Diagnostics.Debug/pkg/System.Diagnostics.Debug.builds
@@ -1,4 +1,4 @@
-
+
@@ -11,5 +11,4 @@
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.Debug/pkg/System.Diagnostics.Debug.pkgproj b/src/libraries/System.Diagnostics.Debug/pkg/System.Diagnostics.Debug.pkgproj
index 37ab51591eb7f527de87f81a12b2c4bae3d813e8..1a924550835bea251b260d146c9dc22220dcfdb8 100644
--- a/src/libraries/System.Diagnostics.Debug/pkg/System.Diagnostics.Debug.pkgproj
+++ b/src/libraries/System.Diagnostics.Debug/pkg/System.Diagnostics.Debug.pkgproj
@@ -3,7 +3,7 @@
- net463;netcoreapp1.1;$(AllXamarinFrameworks)
+ net463;netcoreapp2.0;$(AllXamarinFrameworks)
net463
diff --git a/src/libraries/System.Diagnostics.Debug/pkg/unix/System.Diagnostics.Debug.pkgproj b/src/libraries/System.Diagnostics.Debug/pkg/unix/System.Diagnostics.Debug.pkgproj
index 2b50003320f5613f6a557b114136bc7e6b495468..67dd3d89e450254b8b5320787ca09283afd28b1e 100644
--- a/src/libraries/System.Diagnostics.Debug/pkg/unix/System.Diagnostics.Debug.pkgproj
+++ b/src/libraries/System.Diagnostics.Debug/pkg/unix/System.Diagnostics.Debug.pkgproj
@@ -1,18 +1,14 @@
-
+
-
unix
true
-
-
+
Unix
-
-
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.Debug/pkg/win/System.Diagnostics.Debug.pkgproj b/src/libraries/System.Diagnostics.Debug/pkg/win/System.Diagnostics.Debug.pkgproj
index 365c6a4df9388a7106f3ae2d5978fa4777327ed5..dfc7104ef41ccd29ded066621d785c79bfd2e622 100644
--- a/src/libraries/System.Diagnostics.Debug/pkg/win/System.Diagnostics.Debug.pkgproj
+++ b/src/libraries/System.Diagnostics.Debug/pkg/win/System.Diagnostics.Debug.pkgproj
@@ -1,12 +1,10 @@
-
+
-
win
true
-
Windows_NT
@@ -14,8 +12,7 @@
-
+
-
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.Debug/ref/System.Diagnostics.Debug.csproj b/src/libraries/System.Diagnostics.Debug/ref/System.Diagnostics.Debug.csproj
index 212acb98bf042cb96846a137d553a6457af6d8f7..164ed2782581add87d40d08b787c2b396b8b58fc 100644
--- a/src/libraries/System.Diagnostics.Debug/ref/System.Diagnostics.Debug.csproj
+++ b/src/libraries/System.Diagnostics.Debug/ref/System.Diagnostics.Debug.csproj
@@ -1,4 +1,4 @@
-
+
@@ -8,4 +8,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.Debug/src/Configurations.props b/src/libraries/System.Diagnostics.Debug/src/Configurations.props
index 3bb6330d9e73da4e4998b3dcba9a05936bf49b7e..4701fcd7729002100465c5249f5ddfe14f92bedd 100644
--- a/src/libraries/System.Diagnostics.Debug/src/Configurations.props
+++ b/src/libraries/System.Diagnostics.Debug/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -7,4 +7,4 @@
net463-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.Debug/tests/Configurations.props b/src/libraries/System.Diagnostics.Debug/tests/Configurations.props
index 90648972ae4de2dc0c8b5d90ea77497a1393147c..cfc57211a43f1efa201dcfc0a5b7dd9d7e9f2987 100644
--- a/src/libraries/System.Diagnostics.Debug/tests/Configurations.props
+++ b/src/libraries/System.Diagnostics.Debug/tests/Configurations.props
@@ -1,9 +1,9 @@
-
+
- netstandard1.7-Unix;
- netstandard1.7-Windows_NT;
+ netstandard-Unix;
+ netstandard-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.builds b/src/libraries/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.builds
index d3ca8ccec50eab49470255ab1dbd0ab54b42d5e2..a7a718c4a8b8b2785e7451b8df24770b47ab3920 100644
--- a/src/libraries/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.builds
+++ b/src/libraries/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.builds
@@ -1,4 +1,4 @@
-
+
@@ -11,4 +11,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj b/src/libraries/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj
index 00a3e8f4a423ca629d16503766383f39623d478a..74d9f37c645572f920517b5daa3c7d576fa0edac 100644
--- a/src/libraries/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj
+++ b/src/libraries/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj
@@ -25,9 +25,9 @@
-
+
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/pkg/System.Diagnostics.DiagnosticSource.builds b/src/libraries/System.Diagnostics.DiagnosticSource/pkg/System.Diagnostics.DiagnosticSource.builds
index e5e34ab5966ee15d638fbb1ec6ec076cfb19bb78..80dcec9b6fda01bd10cdd4d8aeba3fe055c1b237 100644
--- a/src/libraries/System.Diagnostics.DiagnosticSource/pkg/System.Diagnostics.DiagnosticSource.builds
+++ b/src/libraries/System.Diagnostics.DiagnosticSource/pkg/System.Diagnostics.DiagnosticSource.builds
@@ -1,8 +1,8 @@
-
+
-
+
\ No newline at end of file
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 40067c55f5803a7e98dad996068ed9f73ebb51a7..08f05504e21bb606b24de5882ec09e5d6a81d629 100644
--- a/src/libraries/System.Diagnostics.DiagnosticSource/pkg/System.Diagnostics.DiagnosticSource.pkgproj
+++ b/src/libraries/System.Diagnostics.DiagnosticSource/pkg/System.Diagnostics.DiagnosticSource.pkgproj
@@ -1,16 +1,14 @@
-
+
2.8.6
-
net46;net45;netcore45;netcoreapp1.0;wpa81;$(AllXamarinFrameworks)
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSource.csproj b/src/libraries/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSource.csproj
index d487bc507037fe4cddf85570daa8435ff237e1e0..bfaf6957d5236b71013f4110f63c94f84751e1ab 100644
--- a/src/libraries/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSource.csproj
+++ b/src/libraries/System.Diagnostics.DiagnosticSource/ref/System.Diagnostics.DiagnosticSource.csproj
@@ -1,4 +1,4 @@
-
+
@@ -11,4 +11,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/src/Configurations.props b/src/libraries/System.Diagnostics.DiagnosticSource/src/Configurations.props
index ad6ccc83416e01e63c20216908a0d1a77457986b..69e325d44064d44f612ccd7911d96168e83278bb 100644
--- a/src/libraries/System.Diagnostics.DiagnosticSource/src/Configurations.props
+++ b/src/libraries/System.Diagnostics.DiagnosticSource/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard1.3;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/tests/Configurations.props b/src/libraries/System.Diagnostics.DiagnosticSource/tests/Configurations.props
index f0ebe53119ec712315cfea5b151d5f0d754744f8..c3266e1e9362243b5723032465bcc7a62ae720ce 100644
--- a/src/libraries/System.Diagnostics.DiagnosticSource/tests/Configurations.props
+++ b/src/libraries/System.Diagnostics.DiagnosticSource/tests/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard1.3;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/tests/System.Diagnostics.DiagnosticSource.Tests.builds b/src/libraries/System.Diagnostics.DiagnosticSource/tests/System.Diagnostics.DiagnosticSource.Tests.builds
index e9689c55261993e79af1994d7c250983d16b8138..216a65acfa0767dcba7bfa787d71a6d633301725 100644
--- a/src/libraries/System.Diagnostics.DiagnosticSource/tests/System.Diagnostics.DiagnosticSource.Tests.builds
+++ b/src/libraries/System.Diagnostics.DiagnosticSource/tests/System.Diagnostics.DiagnosticSource.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/tests/System.Diagnostics.DiagnosticSource.Tests.csproj b/src/libraries/System.Diagnostics.DiagnosticSource/tests/System.Diagnostics.DiagnosticSource.Tests.csproj
index 98ba7f4a91abcc228df880d78df9eb4414f59163..2cd66ecb054607070f8ff564de79cfc61f35baef 100644
--- a/src/libraries/System.Diagnostics.DiagnosticSource/tests/System.Diagnostics.DiagnosticSource.Tests.csproj
+++ b/src/libraries/System.Diagnostics.DiagnosticSource/tests/System.Diagnostics.DiagnosticSource.Tests.csproj
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Diagnostics.FileVersionInfo/pkg/System.Diagnostics.FileVersionInfo.builds b/src/libraries/System.Diagnostics.FileVersionInfo/pkg/System.Diagnostics.FileVersionInfo.builds
index 91c7b3ae69dd8c5605370700034a88a12f3ae3df..4fda794e71fbc51eb4d8683f5613563d08b729fd 100644
--- a/src/libraries/System.Diagnostics.FileVersionInfo/pkg/System.Diagnostics.FileVersionInfo.builds
+++ b/src/libraries/System.Diagnostics.FileVersionInfo/pkg/System.Diagnostics.FileVersionInfo.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.FileVersionInfo/pkg/System.Diagnostics.FileVersionInfo.pkgproj b/src/libraries/System.Diagnostics.FileVersionInfo/pkg/System.Diagnostics.FileVersionInfo.pkgproj
index 26fcc72a677661924422c2d9b8fe6d9970e78179..7b2ac93673b2a80fc329bda2834aed9d0000de83 100644
--- a/src/libraries/System.Diagnostics.FileVersionInfo/pkg/System.Diagnostics.FileVersionInfo.pkgproj
+++ b/src/libraries/System.Diagnostics.FileVersionInfo/pkg/System.Diagnostics.FileVersionInfo.pkgproj
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Diagnostics.FileVersionInfo/ref/System.Diagnostics.FileVersionInfo.csproj b/src/libraries/System.Diagnostics.FileVersionInfo/ref/System.Diagnostics.FileVersionInfo.csproj
index 635be84c42df1fe4e7681bb3eec034b28b9e23dc..536050fe4f0ee4b2ed8becc23e4cded460be1575 100644
--- a/src/libraries/System.Diagnostics.FileVersionInfo/ref/System.Diagnostics.FileVersionInfo.csproj
+++ b/src/libraries/System.Diagnostics.FileVersionInfo/ref/System.Diagnostics.FileVersionInfo.csproj
@@ -1,4 +1,4 @@
-
+
@@ -8,4 +8,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.FileVersionInfo/src/Configurations.props b/src/libraries/System.Diagnostics.FileVersionInfo/src/Configurations.props
index 1eebe65a7894bb691f7ad0a8d7310a1960e901cb..c1932bc105f9c3eaaa30aeca4291e6a8ef7d867d 100644
--- a/src/libraries/System.Diagnostics.FileVersionInfo/src/Configurations.props
+++ b/src/libraries/System.Diagnostics.FileVersionInfo/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -8,4 +8,4 @@
netstandard1.3-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.TestAssembly/System.Diagnostics.FileVersionInfo.TestAssembly.csproj b/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.TestAssembly/System.Diagnostics.FileVersionInfo.TestAssembly.csproj
index 177480b2c155e67956e94ee3c8a43b7779307ddd..7364b8bb314201ab81e4eff534234f6e8cc59d28 100644
--- a/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.TestAssembly/System.Diagnostics.FileVersionInfo.TestAssembly.csproj
+++ b/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.TestAssembly/System.Diagnostics.FileVersionInfo.TestAssembly.csproj
@@ -1,4 +1,4 @@
-
+
Windows_Debug
@@ -26,4 +26,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests.builds b/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests.builds
index 9e7660d395b5a13552306685bbb5dfa66d233a4c..f40a138be82cf3424a7c9a350d4795f3be46da74 100644
--- a/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests.builds
+++ b/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests.builds
@@ -1,4 +1,4 @@
-
+
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 f4c8c165b47f1c5f1259cbf87101884f2f8e9137..0d3f1a420881727317968d193d57b3e65c757f65 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
@@ -1,4 +1,4 @@
-
+
Windows_Debug
@@ -30,10 +30,10 @@
-
+
ProductionCode\Common\Interop\Windows\Interop.Libraries.cs
-
+
ProductionCode\Common\Interop\Windows\kernel32\Interop.VerLanguageName.cs
@@ -45,4 +45,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.PerformanceCounter/ref/System.Diagnostics.PerformanceCounter.csproj b/src/libraries/System.Diagnostics.PerformanceCounter/ref/System.Diagnostics.PerformanceCounter.csproj
index ab87307efe586fd824b1fb8324092d53972dc911..d5a51aa14c82737749afe3c9554423d5f720e340 100644
--- a/src/libraries/System.Diagnostics.PerformanceCounter/ref/System.Diagnostics.PerformanceCounter.csproj
+++ b/src/libraries/System.Diagnostics.PerformanceCounter/ref/System.Diagnostics.PerformanceCounter.csproj
@@ -1,4 +1,4 @@
-
+
@@ -8,4 +8,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.Process/pkg/System.Diagnostics.Process.builds b/src/libraries/System.Diagnostics.Process/pkg/System.Diagnostics.Process.builds
index 8203707792a88f47c9c83cc294d9847fb235a022..38794fb808295493f3ff16b151e05ec81d63bbb5 100644
--- a/src/libraries/System.Diagnostics.Process/pkg/System.Diagnostics.Process.builds
+++ b/src/libraries/System.Diagnostics.Process/pkg/System.Diagnostics.Process.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.Process/pkg/System.Diagnostics.Process.pkgproj b/src/libraries/System.Diagnostics.Process/pkg/System.Diagnostics.Process.pkgproj
index 219f2e3f9becdffe77604e5b18a7cb45a836fb60..c7c1befdb3fec935f57808b738d94c8e1d25e267 100644
--- a/src/libraries/System.Diagnostics.Process/pkg/System.Diagnostics.Process.pkgproj
+++ b/src/libraries/System.Diagnostics.Process/pkg/System.Diagnostics.Process.pkgproj
@@ -3,7 +3,7 @@
- net463;netcoreapp1.1;$(AllXamarinFrameworks)
+ net463;netcoreapp2.0;$(AllXamarinFrameworks)
diff --git a/src/libraries/System.Diagnostics.Process/ref/System.Diagnostics.Process.csproj b/src/libraries/System.Diagnostics.Process/ref/System.Diagnostics.Process.csproj
index 730e3da36cea3778bb6096ce600718313c953f65..599ad029264cd37ab2c859822a7535cbd0d235c5 100644
--- a/src/libraries/System.Diagnostics.Process/ref/System.Diagnostics.Process.csproj
+++ b/src/libraries/System.Diagnostics.Process/ref/System.Diagnostics.Process.csproj
@@ -1,4 +1,4 @@
-
+
@@ -19,4 +19,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.Process/src/Configurations.props b/src/libraries/System.Diagnostics.Process/src/Configurations.props
index d192a53e46f2e59aaa8c7211b9c32ca46b5316a0..8682673c53983739ebca35646cf7f3c38a85259e 100644
--- a/src/libraries/System.Diagnostics.Process/src/Configurations.props
+++ b/src/libraries/System.Diagnostics.Process/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -8,4 +8,4 @@
net463-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.Process/tests/Configurations.props b/src/libraries/System.Diagnostics.Process/tests/Configurations.props
index 27a573561974d594024c5c014dff26db211026ab..2ba6d494c02d1b3abba6f3a6e1caab197ee0b497 100644
--- a/src/libraries/System.Diagnostics.Process/tests/Configurations.props
+++ b/src/libraries/System.Diagnostics.Process/tests/Configurations.props
@@ -1,9 +1,9 @@
-
+
netstandard1.4;
- netstandard1.7;
+ netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.Process/tests/Performance/System.Diagnostics.Process.Performance.Tests.csproj b/src/libraries/System.Diagnostics.Process/tests/Performance/System.Diagnostics.Process.Performance.Tests.csproj
index 313c1f342c41a3e5a65a3aed4e98b4d8e9b26594..c5148eb829a270fbf538bab3934f078326ba1737 100644
--- a/src/libraries/System.Diagnostics.Process/tests/Performance/System.Diagnostics.Process.Performance.Tests.csproj
+++ b/src/libraries/System.Diagnostics.Process/tests/Performance/System.Diagnostics.Process.Performance.Tests.csproj
@@ -1,4 +1,4 @@
-
+
@@ -28,4 +28,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.builds b/src/libraries/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.builds
index 953c60723d2decb9ee3a4eed48de1b1214656ad1..70057f7d5c7a4826223b947f17ee86c2c14db697 100644
--- a/src/libraries/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.builds
+++ b/src/libraries/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.builds
@@ -1,9 +1,9 @@
-
+
- net463;netcoreapp1.1
+ net463;netcoreapp
netstandard1.4
diff --git a/src/libraries/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj b/src/libraries/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj
index 58ea591c20f37c775515fcf0539cda7549651501..056e2cafd1e11289743ca6100291756b83583655 100644
--- a/src/libraries/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj
+++ b/src/libraries/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj
@@ -1,4 +1,4 @@
-
+
@@ -44,4 +44,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.StackTrace/pkg/System.Diagnostics.StackTrace.builds b/src/libraries/System.Diagnostics.StackTrace/pkg/System.Diagnostics.StackTrace.builds
index 97da172cfc8074d1e4274a8f6a0d90930c23d21a..95baa4812f38828c6d6c4cba1e1cf730e18ba4da 100644
--- a/src/libraries/System.Diagnostics.StackTrace/pkg/System.Diagnostics.StackTrace.builds
+++ b/src/libraries/System.Diagnostics.StackTrace/pkg/System.Diagnostics.StackTrace.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.StackTrace/pkg/System.Diagnostics.StackTrace.pkgproj b/src/libraries/System.Diagnostics.StackTrace/pkg/System.Diagnostics.StackTrace.pkgproj
index 9f3239a70e3ba19767a3fce4017d06daf43bcb41..e881de5bf7449fab98ad7449b27cf711ada97141 100644
--- a/src/libraries/System.Diagnostics.StackTrace/pkg/System.Diagnostics.StackTrace.pkgproj
+++ b/src/libraries/System.Diagnostics.StackTrace/pkg/System.Diagnostics.StackTrace.pkgproj
@@ -1,9 +1,9 @@
-
+
- net463;uap10.1;netcoreapp1.1;$(AllXamarinFrameworks)
+ net463;uap10.1;netcoreapp2.0;$(AllXamarinFrameworks)
@@ -16,4 +16,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.StackTrace/ref/System.Diagnostics.StackTrace.csproj b/src/libraries/System.Diagnostics.StackTrace/ref/System.Diagnostics.StackTrace.csproj
index 0c2f59d72e68b24cefe8ec8cf73563a349b7d6d7..c976b8d9be87b861fdf29369c16176be37ec265c 100644
--- a/src/libraries/System.Diagnostics.StackTrace/ref/System.Diagnostics.StackTrace.csproj
+++ b/src/libraries/System.Diagnostics.StackTrace/ref/System.Diagnostics.StackTrace.csproj
@@ -1,4 +1,4 @@
-
+
@@ -10,4 +10,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.StackTrace/src/Configurations.props b/src/libraries/System.Diagnostics.StackTrace/src/Configurations.props
index f013d10b8ccc3f86eab07075639f01c909892d84..ed0bd2acc95b9edfd29df7e7b1e40ebe4f105079 100644
--- a/src/libraries/System.Diagnostics.StackTrace/src/Configurations.props
+++ b/src/libraries/System.Diagnostics.StackTrace/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -7,4 +7,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.StackTrace/src/System.Diagnostics.StackTrace.csproj b/src/libraries/System.Diagnostics.StackTrace/src/System.Diagnostics.StackTrace.csproj
index 3e9a07ba86802c93852ef933b8fb270d616c03e9..4002d832f345831bb01feae5b65cdac93895984b 100644
--- a/src/libraries/System.Diagnostics.StackTrace/src/System.Diagnostics.StackTrace.csproj
+++ b/src/libraries/System.Diagnostics.StackTrace/src/System.Diagnostics.StackTrace.csproj
@@ -6,7 +6,7 @@
{02304469-722E-4723-92A1-820B9A37D275}
true
true
- netstandard1.7;uap10.1
+ netstandard;uap10.1
$(NoWarn);1685
diff --git a/src/libraries/System.Diagnostics.TextWriterTraceListener/pkg/System.Diagnostics.TextWriterTraceListener.builds b/src/libraries/System.Diagnostics.TextWriterTraceListener/pkg/System.Diagnostics.TextWriterTraceListener.builds
index 9d3f29debeb598a6f2d2a5eb0e623615b103c25b..f4e3b788fba8e24b07c40abd13770336c67264e1 100644
--- a/src/libraries/System.Diagnostics.TextWriterTraceListener/pkg/System.Diagnostics.TextWriterTraceListener.builds
+++ b/src/libraries/System.Diagnostics.TextWriterTraceListener/pkg/System.Diagnostics.TextWriterTraceListener.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.TextWriterTraceListener/pkg/System.Diagnostics.TextWriterTraceListener.pkgproj b/src/libraries/System.Diagnostics.TextWriterTraceListener/pkg/System.Diagnostics.TextWriterTraceListener.pkgproj
index 96e3a8997e6396ee8b7cb8537712f91ef49ee8c4..1cf369635f23c597eb569edcb29ae6de8a22b21e 100644
--- a/src/libraries/System.Diagnostics.TextWriterTraceListener/pkg/System.Diagnostics.TextWriterTraceListener.pkgproj
+++ b/src/libraries/System.Diagnostics.TextWriterTraceListener/pkg/System.Diagnostics.TextWriterTraceListener.pkgproj
@@ -1,9 +1,9 @@
-
+
- net463;netcoreapp1.1;$(AllXamarinFrameworks)
+ net463;netcoreapp2.0;$(AllXamarinFrameworks)
diff --git a/src/libraries/System.Diagnostics.TextWriterTraceListener/ref/System.Diagnostics.TextWriterTraceListener.csproj b/src/libraries/System.Diagnostics.TextWriterTraceListener/ref/System.Diagnostics.TextWriterTraceListener.csproj
index 4bd4825a8bfa1c5456c6ad149553409d70ab4727..65b95a5e091b31902a1704f6ceff21b02c6c4bdc 100644
--- a/src/libraries/System.Diagnostics.TextWriterTraceListener/ref/System.Diagnostics.TextWriterTraceListener.csproj
+++ b/src/libraries/System.Diagnostics.TextWriterTraceListener/ref/System.Diagnostics.TextWriterTraceListener.csproj
@@ -1,4 +1,4 @@
-
+
@@ -11,4 +11,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.TextWriterTraceListener/src/Configurations.props b/src/libraries/System.Diagnostics.TextWriterTraceListener/src/Configurations.props
index 9c336c0be9e52171e2fecf14214e3373be07177d..dc837f915219bcf7ff5c38f67e01c45d5b976485 100644
--- a/src/libraries/System.Diagnostics.TextWriterTraceListener/src/Configurations.props
+++ b/src/libraries/System.Diagnostics.TextWriterTraceListener/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.TextWriterTraceListener/tests/Configurations.props b/src/libraries/System.Diagnostics.TextWriterTraceListener/tests/Configurations.props
index 512c938bad5364c677a3f4d9f647f1ade8c14aea..b2db637110616a495d303924e9aaf8b800db4821 100644
--- a/src/libraries/System.Diagnostics.TextWriterTraceListener/tests/Configurations.props
+++ b/src/libraries/System.Diagnostics.TextWriterTraceListener/tests/Configurations.props
@@ -1,9 +1,9 @@
-
+
netstandard1.3;
- netstandard1.7;
+ netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.TextWriterTraceListener/tests/System.Diagnostics.TextWriterTraceListener.Tests.builds b/src/libraries/System.Diagnostics.TextWriterTraceListener/tests/System.Diagnostics.TextWriterTraceListener.Tests.builds
index 9bc989f27248b253f9b9ba794708665c9cfc4591..8028296999a8b875ab94aaaff5cf812a4ac63505 100644
--- a/src/libraries/System.Diagnostics.TextWriterTraceListener/tests/System.Diagnostics.TextWriterTraceListener.Tests.builds
+++ b/src/libraries/System.Diagnostics.TextWriterTraceListener/tests/System.Diagnostics.TextWriterTraceListener.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Diagnostics.TextWriterTraceListener/tests/System.Diagnostics.TextWriterTraceListener.Tests.csproj b/src/libraries/System.Diagnostics.TextWriterTraceListener/tests/System.Diagnostics.TextWriterTraceListener.Tests.csproj
index 3d154609d57330dcb3cb65c810e3dd9d9f767ff1..737e80d3ebb6e89986cbf598b21782a3ccae88b2 100644
--- a/src/libraries/System.Diagnostics.TextWriterTraceListener/tests/System.Diagnostics.TextWriterTraceListener.Tests.csproj
+++ b/src/libraries/System.Diagnostics.TextWriterTraceListener/tests/System.Diagnostics.TextWriterTraceListener.Tests.csproj
@@ -1,4 +1,4 @@
-
+
@@ -16,4 +16,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.Tools/pkg/System.Diagnostics.Tools.pkgproj b/src/libraries/System.Diagnostics.Tools/pkg/System.Diagnostics.Tools.pkgproj
index 1d9ad34d4fe3ac3fc3a2bbbf4dc889fd4d60bff2..4c6ab0556d694b8cf162ad9a67a7f2703d913068 100644
--- a/src/libraries/System.Diagnostics.Tools/pkg/System.Diagnostics.Tools.pkgproj
+++ b/src/libraries/System.Diagnostics.Tools/pkg/System.Diagnostics.Tools.pkgproj
@@ -1,9 +1,9 @@
-
+
- net463;netcoreapp1.1;$(AllXamarinFrameworks)
+ net463;netcoreapp2.0;$(AllXamarinFrameworks)
diff --git a/src/libraries/System.Diagnostics.Tools/pkg/any/System.Diagnostics.Tools.pkgproj b/src/libraries/System.Diagnostics.Tools/pkg/any/System.Diagnostics.Tools.pkgproj
index 0885d67b0f9558ce944a75a0632ed807e376e477..7bfa9d8a57aa2eae4be9ac64b4d8298e97313760 100644
--- a/src/libraries/System.Diagnostics.Tools/pkg/any/System.Diagnostics.Tools.pkgproj
+++ b/src/libraries/System.Diagnostics.Tools/pkg/any/System.Diagnostics.Tools.pkgproj
@@ -6,16 +6,13 @@
any
true
-
-
runtimes/aot/lib/netcore50
aot
-
diff --git a/src/libraries/System.Diagnostics.Tools/pkg/aot/System.Diagnostics.Tools.pkgproj b/src/libraries/System.Diagnostics.Tools/pkg/aot/System.Diagnostics.Tools.pkgproj
index 5e4737373fcc0bfa8329d4022c845d80b72e0017..e250c972055b62d8b48ba030b64572a2bce8bada 100644
--- a/src/libraries/System.Diagnostics.Tools/pkg/aot/System.Diagnostics.Tools.pkgproj
+++ b/src/libraries/System.Diagnostics.Tools/pkg/aot/System.Diagnostics.Tools.pkgproj
@@ -1,11 +1,9 @@
-
aot
true
-
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.Tools/ref/System.Diagnostics.Tools.csproj b/src/libraries/System.Diagnostics.Tools/ref/System.Diagnostics.Tools.csproj
index 389cc55ce780bfa3d0d7b231500218b814bad1ab..b68b6c0a9abb8bb5addda24f945826e310e42d8d 100644
--- a/src/libraries/System.Diagnostics.Tools/ref/System.Diagnostics.Tools.csproj
+++ b/src/libraries/System.Diagnostics.Tools/ref/System.Diagnostics.Tools.csproj
@@ -1,4 +1,4 @@
-
+
@@ -8,4 +8,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.Tools/src/Configurations.props b/src/libraries/System.Diagnostics.Tools/src/Configurations.props
index 9c336c0be9e52171e2fecf14214e3373be07177d..dc837f915219bcf7ff5c38f67e01c45d5b976485 100644
--- a/src/libraries/System.Diagnostics.Tools/src/Configurations.props
+++ b/src/libraries/System.Diagnostics.Tools/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.Tools/tests/Configurations.props b/src/libraries/System.Diagnostics.Tools/tests/Configurations.props
index 512c938bad5364c677a3f4d9f647f1ade8c14aea..b2db637110616a495d303924e9aaf8b800db4821 100644
--- a/src/libraries/System.Diagnostics.Tools/tests/Configurations.props
+++ b/src/libraries/System.Diagnostics.Tools/tests/Configurations.props
@@ -1,9 +1,9 @@
-
+
netstandard1.3;
- netstandard1.7;
+ netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.Tools/tests/System.Diagnostics.Tools.Tests.builds b/src/libraries/System.Diagnostics.Tools/tests/System.Diagnostics.Tools.Tests.builds
index cb91f3bb3654497e3a1b22591d06ffc79ff62061..132d62ef114acd5bddae04483c1677fd0e6b5a18 100644
--- a/src/libraries/System.Diagnostics.Tools/tests/System.Diagnostics.Tools.Tests.builds
+++ b/src/libraries/System.Diagnostics.Tools/tests/System.Diagnostics.Tools.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Diagnostics.Tools/tests/System.Diagnostics.Tools.Tests.csproj b/src/libraries/System.Diagnostics.Tools/tests/System.Diagnostics.Tools.Tests.csproj
index 68bc26d6ac7d3f6c7514b6ff81dcf1fa2d1f88ef..a83c24adbf1035eea317bc42265940f1c6555b40 100644
--- a/src/libraries/System.Diagnostics.Tools/tests/System.Diagnostics.Tools.Tests.csproj
+++ b/src/libraries/System.Diagnostics.Tools/tests/System.Diagnostics.Tools.Tests.csproj
@@ -1,4 +1,4 @@
-
+
@@ -17,4 +17,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.TraceSource/pkg/System.Diagnostics.TraceSource.builds b/src/libraries/System.Diagnostics.TraceSource/pkg/System.Diagnostics.TraceSource.builds
index 4e44694c35ebc2b52a534f15543649917b1ae6c8..4b24e5b17bfd3ecd2fecb470ebcb314c56e222ca 100644
--- a/src/libraries/System.Diagnostics.TraceSource/pkg/System.Diagnostics.TraceSource.builds
+++ b/src/libraries/System.Diagnostics.TraceSource/pkg/System.Diagnostics.TraceSource.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.TraceSource/pkg/System.Diagnostics.TraceSource.pkgproj b/src/libraries/System.Diagnostics.TraceSource/pkg/System.Diagnostics.TraceSource.pkgproj
index ac036825c4c100ad9647c00344a554766e1b4626..fc18853ca73cdd094bd6eca6b59dfae49856dd2b 100644
--- a/src/libraries/System.Diagnostics.TraceSource/pkg/System.Diagnostics.TraceSource.pkgproj
+++ b/src/libraries/System.Diagnostics.TraceSource/pkg/System.Diagnostics.TraceSource.pkgproj
@@ -1,9 +1,9 @@
-
+
- net463;uap10.1;netcoreapp1.1;$(AllXamarinFrameworks)
+ net463;uap10.1;netcoreapp2.0;$(AllXamarinFrameworks)
diff --git a/src/libraries/System.Diagnostics.TraceSource/ref/System.Diagnostics.TraceSource.csproj b/src/libraries/System.Diagnostics.TraceSource/ref/System.Diagnostics.TraceSource.csproj
index abc4e0556f0d8a4a4ab9f344185adbe74e153396..ddaaf3b53f3bf7bce7122503040388f55368c165 100644
--- a/src/libraries/System.Diagnostics.TraceSource/ref/System.Diagnostics.TraceSource.csproj
+++ b/src/libraries/System.Diagnostics.TraceSource/ref/System.Diagnostics.TraceSource.csproj
@@ -1,4 +1,4 @@
-
+
@@ -10,4 +10,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.TraceSource/src/Configurations.props b/src/libraries/System.Diagnostics.TraceSource/src/Configurations.props
index 3bb6330d9e73da4e4998b3dcba9a05936bf49b7e..4701fcd7729002100465c5249f5ddfe14f92bedd 100644
--- a/src/libraries/System.Diagnostics.TraceSource/src/Configurations.props
+++ b/src/libraries/System.Diagnostics.TraceSource/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -7,4 +7,4 @@
net463-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj b/src/libraries/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj
index d63e7e69dcb4cc6c5108f9d81070b52f12173a9d..0bd65d66b0b8b6ca6e61ba9c13693333fcb59e40 100644
--- a/src/libraries/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj
+++ b/src/libraries/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj
@@ -7,7 +7,7 @@
$(DefineConstants);TRACE
{5380420C-EB1D-4C53-9CFC-916578C18334}
true
- netstandard1.7;uap10.1
+ netstandard;uap10.1
diff --git a/src/libraries/System.Diagnostics.TraceSource/tests/Configurations.props b/src/libraries/System.Diagnostics.TraceSource/tests/Configurations.props
index 90648972ae4de2dc0c8b5d90ea77497a1393147c..cfc57211a43f1efa201dcfc0a5b7dd9d7e9f2987 100644
--- a/src/libraries/System.Diagnostics.TraceSource/tests/Configurations.props
+++ b/src/libraries/System.Diagnostics.TraceSource/tests/Configurations.props
@@ -1,9 +1,9 @@
-
+
- netstandard1.7-Unix;
- netstandard1.7-Windows_NT;
+ netstandard-Unix;
+ netstandard-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.TraceSource/tests/System.Diagnostics.TraceSource.Tests.builds b/src/libraries/System.Diagnostics.TraceSource/tests/System.Diagnostics.TraceSource.Tests.builds
index e605e067947cafc0c258765c04f2d25230b27d78..c091a615ba7fc26f66e0478c1abc583ec7affedd 100644
--- a/src/libraries/System.Diagnostics.TraceSource/tests/System.Diagnostics.TraceSource.Tests.builds
+++ b/src/libraries/System.Diagnostics.TraceSource/tests/System.Diagnostics.TraceSource.Tests.builds
@@ -1,4 +1,4 @@
-
+
@@ -7,7 +7,7 @@
Windows_NT
- netcoreapp1.1;net463
+ netcoreapp;net463
diff --git a/src/libraries/System.Diagnostics.TraceSource/tests/System.Diagnostics.TraceSource.Tests.csproj b/src/libraries/System.Diagnostics.TraceSource/tests/System.Diagnostics.TraceSource.Tests.csproj
index 6a3103c80f05f30a43a87c392ef22ab3aec3d3f0..7d75b7157fecd70ed64b08239fcd940c79597a7e 100644
--- a/src/libraries/System.Diagnostics.TraceSource/tests/System.Diagnostics.TraceSource.Tests.csproj
+++ b/src/libraries/System.Diagnostics.TraceSource/tests/System.Diagnostics.TraceSource.Tests.csproj
@@ -1,4 +1,4 @@
-
+
@@ -31,4 +31,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.Tracing/pkg/System.Diagnostics.Tracing.pkgproj b/src/libraries/System.Diagnostics.Tracing/pkg/System.Diagnostics.Tracing.pkgproj
index ad6b0250ea7001ff92e78b090c84da336e8acf88..afcb8402e3cc2ec7f09179b75321ae260e491444 100644
--- a/src/libraries/System.Diagnostics.Tracing/pkg/System.Diagnostics.Tracing.pkgproj
+++ b/src/libraries/System.Diagnostics.Tracing/pkg/System.Diagnostics.Tracing.pkgproj
@@ -3,7 +3,7 @@
- net461;netcoreapp1.1;$(AllXamarinFrameworks)
+ net461;netcoreapp2.0;$(AllXamarinFrameworks)
net461
diff --git a/src/libraries/System.Diagnostics.Tracing/ref/System.Diagnostics.Tracing.csproj b/src/libraries/System.Diagnostics.Tracing/ref/System.Diagnostics.Tracing.csproj
index 30f1c6ecb18834c2c81c01bcf67d71116b7865bf..bb02cbdf56b89e123aea27f414a53b9e78d94783 100644
--- a/src/libraries/System.Diagnostics.Tracing/ref/System.Diagnostics.Tracing.csproj
+++ b/src/libraries/System.Diagnostics.Tracing/ref/System.Diagnostics.Tracing.csproj
@@ -1,4 +1,4 @@
-
+
@@ -11,4 +11,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.Tracing/src/Configurations.props b/src/libraries/System.Diagnostics.Tracing/src/Configurations.props
index 53b62c64fea2475e524eb32a20b028ea109d4d41..bcfec4bbde61fa2877a42ca2e87056c258cd6c09 100644
--- a/src/libraries/System.Diagnostics.Tracing/src/Configurations.props
+++ b/src/libraries/System.Diagnostics.Tracing/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.Tracing/tests/Configurations.props b/src/libraries/System.Diagnostics.Tracing/tests/Configurations.props
index b744993779f030cfc03be021645dfc161ff05f68..800e963c809d11f44888eedf66bad86641a54996 100644
--- a/src/libraries/System.Diagnostics.Tracing/tests/Configurations.props
+++ b/src/libraries/System.Diagnostics.Tracing/tests/Configurations.props
@@ -1,9 +1,9 @@
-
+
netstandard1.5;
- netstandard1.7;
+ netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.builds b/src/libraries/System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.builds
index 6fb5bbdd2ee2c280d85253f0f91418a46e9e9bcf..61fc52157380a33d18e5d6b99f684b2cc48a8176 100644
--- a/src/libraries/System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.builds
+++ b/src/libraries/System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.csproj b/src/libraries/System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.csproj
index d1190694ee06a62a28d802c00b6fb6e3828d588c..ab21b44ee5d27c297feb28b07fec3a9390fc69d6 100644
--- a/src/libraries/System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.csproj
+++ b/src/libraries/System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.csproj
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.DirectoryServices.AccountManagement/pkg/System.DirectoryServices.AccountManagement.builds b/src/libraries/System.DirectoryServices.AccountManagement/pkg/System.DirectoryServices.AccountManagement.builds
index 71fc0db69fd1087510d737e96912693ed19785aa..fd191542700be4ff727eaba7e43efc19ff7f0520 100644
--- a/src/libraries/System.DirectoryServices.AccountManagement/pkg/System.DirectoryServices.AccountManagement.builds
+++ b/src/libraries/System.DirectoryServices.AccountManagement/pkg/System.DirectoryServices.AccountManagement.builds
@@ -1,8 +1,8 @@
-
+
-
diff --git a/src/libraries/System.DirectoryServices.AccountManagement/pkg/System.DirectoryServices.AccountManagement.pkgproj b/src/libraries/System.DirectoryServices.AccountManagement/pkg/System.DirectoryServices.AccountManagement.pkgproj
index ae3858fa9e6450071418be271fbfd9c9b9555dbf..6f7249ef15f300e3723e687673c19b0a0f65522d 100644
--- a/src/libraries/System.DirectoryServices.AccountManagement/pkg/System.DirectoryServices.AccountManagement.pkgproj
+++ b/src/libraries/System.DirectoryServices.AccountManagement/pkg/System.DirectoryServices.AccountManagement.pkgproj
@@ -3,7 +3,7 @@
- netcoreapp1.1;$(AllXamarinFrameworks)
+ netcoreapp2.0;$(AllXamarinFrameworks)
diff --git a/src/libraries/System.DirectoryServices.AccountManagement/ref/System.DirectoryServices.AccountManagement.csproj b/src/libraries/System.DirectoryServices.AccountManagement/ref/System.DirectoryServices.AccountManagement.csproj
index 9d7fb922039b2c4d5b3294ed31ec24142104ca26..1f0431363c97e59815fe23ca58dd8ea26f114216 100644
--- a/src/libraries/System.DirectoryServices.AccountManagement/ref/System.DirectoryServices.AccountManagement.csproj
+++ b/src/libraries/System.DirectoryServices.AccountManagement/ref/System.DirectoryServices.AccountManagement.csproj
@@ -8,4 +8,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.builds b/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.builds
index 005e591d07721f3cae3fa1609827a1c20578fb50..237a85d2d4bfc32dc3730b18c0fc846c7a088e7a 100644
--- a/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.builds
+++ b/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.builds
@@ -1,13 +1,12 @@
-
+
-
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj b/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj
index ec7283e3d0933768476f0b18a4a1866ba8ec0b0b..b594f2518a55a3698bd5deddd2c8de0246f3e272 100644
--- a/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj
+++ b/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj
@@ -10,7 +10,7 @@
true
$(DefineConstants);FLAVOR_WHIDBEY;PAPI_AD;PAPI_REGSAM;USE_CTX_CACHE
$(NoWarn);8073
- .NETStandard,Version=v1.7
+ .NETStandard,Version=v2.0
true
@@ -97,4 +97,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.DirectoryServices.AccountManagement/tests/System.DirectoryServices.AccountManagement.Tests.csproj b/src/libraries/System.DirectoryServices.AccountManagement/tests/System.DirectoryServices.AccountManagement.Tests.csproj
index 01bdda83c35a34100f2acf2e9f1e65a3a84d135d..3c3d01b81fb781082e97b112bd6703daea99e71e 100644
--- a/src/libraries/System.DirectoryServices.AccountManagement/tests/System.DirectoryServices.AccountManagement.Tests.csproj
+++ b/src/libraries/System.DirectoryServices.AccountManagement/tests/System.DirectoryServices.AccountManagement.Tests.csproj
@@ -1,4 +1,4 @@
-
+
Windows_Debug
@@ -10,7 +10,7 @@
{57E8F8D4-0766-4CC7-B3F9-B243B81DB6A5}
Library
System.DirectoryServices.AccountManagement.Tests
- .NETStandard,Version=v1.7
+ .NETStandard,Version=v2.0
true
@@ -40,4 +40,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.DirectoryServices.AccountManagement/tests/System.DirectoryServices.AccountManagement.builds b/src/libraries/System.DirectoryServices.AccountManagement/tests/System.DirectoryServices.AccountManagement.builds
index cfd0983ca29e20cf88a5da6c6d98d278b2afb620..8d34aedeb7efe54488e6937b21772031f12c362c 100644
--- a/src/libraries/System.DirectoryServices.AccountManagement/tests/System.DirectoryServices.AccountManagement.builds
+++ b/src/libraries/System.DirectoryServices.AccountManagement/tests/System.DirectoryServices.AccountManagement.builds
@@ -1,8 +1,8 @@
-
+
-
diff --git a/src/libraries/System.DirectoryServices.Protocols/pkg/System.DirectoryServices.Protocols.pkgproj b/src/libraries/System.DirectoryServices.Protocols/pkg/System.DirectoryServices.Protocols.pkgproj
index 39f0ecf225be8b8a0363f9f6d28c4aae2615805b..3e92d29bc3f21f76592ecf9a26dfbd7ae52e2cbc 100644
--- a/src/libraries/System.DirectoryServices.Protocols/pkg/System.DirectoryServices.Protocols.pkgproj
+++ b/src/libraries/System.DirectoryServices.Protocols/pkg/System.DirectoryServices.Protocols.pkgproj
@@ -3,7 +3,7 @@
- netcoreapp1.1;$(AllXamarinFrameworks)
+ netcoreapp2.0;$(AllXamarinFrameworks)
diff --git a/src/libraries/System.DirectoryServices.Protocols/ref/System.DirectoryServices.Protocols.csproj b/src/libraries/System.DirectoryServices.Protocols/ref/System.DirectoryServices.Protocols.csproj
index 918f7b0439dad88c961d0b2c90df1f4d009029eb..0247f16235816c25a7f8ff095cf5b24aa4071f62 100644
--- a/src/libraries/System.DirectoryServices.Protocols/ref/System.DirectoryServices.Protocols.csproj
+++ b/src/libraries/System.DirectoryServices.Protocols/ref/System.DirectoryServices.Protocols.csproj
@@ -8,4 +8,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.builds b/src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.builds
index 2f37b5f2899d899956824bc6381490aef085fa55..bd0286a2d23189050086752120836282752e1a76 100644
--- a/src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.builds
+++ b/src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.builds
@@ -1,13 +1,12 @@
-
+
-
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj b/src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj
index 2e75030d9f018dcd74ebd086e9ae13a227c8e3ce..38800a46f7bb6f47dbbf816aa0ba0f1cf4f936e1 100644
--- a/src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj
+++ b/src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj
@@ -9,7 +9,7 @@
System.DirectoryServices.Protocols
true
$(NoWarn);0649
- .NETStandard,Version=v1.7
+ .NETStandard,Version=v2.0
true
@@ -59,4 +59,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.DirectoryServices/pkg/System.DirectoryServices.builds b/src/libraries/System.DirectoryServices/pkg/System.DirectoryServices.builds
index 54e41ffa65a74b66361ab02a640cb4870f6bb084..7c29663b1e78ae820282c3580ad11b608f7957a1 100644
--- a/src/libraries/System.DirectoryServices/pkg/System.DirectoryServices.builds
+++ b/src/libraries/System.DirectoryServices/pkg/System.DirectoryServices.builds
@@ -1,8 +1,8 @@
-
+
-
diff --git a/src/libraries/System.DirectoryServices/pkg/System.DirectoryServices.pkgproj b/src/libraries/System.DirectoryServices/pkg/System.DirectoryServices.pkgproj
index 3f8ccefb0e697b049c37726a39e9361f1e5bd284..962988a260be56a29d2dfaba349116278f88d360 100644
--- a/src/libraries/System.DirectoryServices/pkg/System.DirectoryServices.pkgproj
+++ b/src/libraries/System.DirectoryServices/pkg/System.DirectoryServices.pkgproj
@@ -3,7 +3,7 @@
- netcoreapp1.1;$(AllXamarinFrameworks)
+ netcoreapp2.0;$(AllXamarinFrameworks)
diff --git a/src/libraries/System.DirectoryServices/ref/System.DirectoryServices.csproj b/src/libraries/System.DirectoryServices/ref/System.DirectoryServices.csproj
index 779620faeb51e27119acd03a009c9dc347b37e7a..f5d16e1e7155962a1ab62a21d0dfd151002486c6 100644
--- a/src/libraries/System.DirectoryServices/ref/System.DirectoryServices.csproj
+++ b/src/libraries/System.DirectoryServices/ref/System.DirectoryServices.csproj
@@ -8,4 +8,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.DirectoryServices/src/System.DirectoryServices.builds b/src/libraries/System.DirectoryServices/src/System.DirectoryServices.builds
index d4af2f99a7b298c59193516985235219dc6a334c..e5fa47b771dc04d276b663b3a967c7cc611eb419 100644
--- a/src/libraries/System.DirectoryServices/src/System.DirectoryServices.builds
+++ b/src/libraries/System.DirectoryServices/src/System.DirectoryServices.builds
@@ -1,13 +1,12 @@
-
+
-
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj b/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj
index ac93f453fb42bc9845f44cda52b65480c6764775..9bb3108c1ddd50f938197aada96ddc0fc961d17e 100644
--- a/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj
+++ b/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj
@@ -8,7 +8,7 @@
{879C23DC-D828-4DFB-8E92-ABBC11B71035}
System.DirectoryServices
true
- .NETStandard,Version=v1.7
+ .NETStandard,Version=v2.0
$(NoWarn);0649
true
@@ -28,7 +28,7 @@
-
-
-
+
runtimes/aot/lib/netcore50
aot
-
diff --git a/src/libraries/System.Globalization.Calendars/pkg/aot/System.Globalization.Calendars.pkgproj b/src/libraries/System.Globalization.Calendars/pkg/aot/System.Globalization.Calendars.pkgproj
index 95cd6f73420907971792958b5f980b424018c296..e250c972055b62d8b48ba030b64572a2bce8bada 100644
--- a/src/libraries/System.Globalization.Calendars/pkg/aot/System.Globalization.Calendars.pkgproj
+++ b/src/libraries/System.Globalization.Calendars/pkg/aot/System.Globalization.Calendars.pkgproj
@@ -1,12 +1,9 @@
-
aot
true
-
-
\ No newline at end of file
diff --git a/src/libraries/System.Globalization.Calendars/ref/System.Globalization.Calendars.csproj b/src/libraries/System.Globalization.Calendars/ref/System.Globalization.Calendars.csproj
index 68736474c3c8a676614710c844c9fcd58b9803d6..87580bbf76a6ee212e374e47b956857581977c16 100644
--- a/src/libraries/System.Globalization.Calendars/ref/System.Globalization.Calendars.csproj
+++ b/src/libraries/System.Globalization.Calendars/ref/System.Globalization.Calendars.csproj
@@ -1,4 +1,4 @@
-
+
@@ -9,4 +9,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Globalization.Calendars/src/Configurations.props b/src/libraries/System.Globalization.Calendars/src/Configurations.props
index 9c336c0be9e52171e2fecf14214e3373be07177d..dc837f915219bcf7ff5c38f67e01c45d5b976485 100644
--- a/src/libraries/System.Globalization.Calendars/src/Configurations.props
+++ b/src/libraries/System.Globalization.Calendars/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Globalization.Calendars/tests/Configurations.props b/src/libraries/System.Globalization.Calendars/tests/Configurations.props
index 512c938bad5364c677a3f4d9f647f1ade8c14aea..b2db637110616a495d303924e9aaf8b800db4821 100644
--- a/src/libraries/System.Globalization.Calendars/tests/Configurations.props
+++ b/src/libraries/System.Globalization.Calendars/tests/Configurations.props
@@ -1,9 +1,9 @@
-
+
netstandard1.3;
- netstandard1.7;
+ netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Globalization.Calendars/tests/System.Globalization.Calendars.Tests.builds b/src/libraries/System.Globalization.Calendars/tests/System.Globalization.Calendars.Tests.builds
index 72748a75ada2f14bbd6d931a0987a8c85f00bb7e..ea425bd2397dfe282a2a66b54cd7e3aa16a73b61 100644
--- a/src/libraries/System.Globalization.Calendars/tests/System.Globalization.Calendars.Tests.builds
+++ b/src/libraries/System.Globalization.Calendars/tests/System.Globalization.Calendars.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Globalization.Calendars/tests/System.Globalization.Calendars.Tests.csproj b/src/libraries/System.Globalization.Calendars/tests/System.Globalization.Calendars.Tests.csproj
index ff91abc0f792ee56c7cdba57a36dc3f30e0d4058..863e51a1c831261538b051df1dad9e1c39746759 100644
--- a/src/libraries/System.Globalization.Calendars/tests/System.Globalization.Calendars.Tests.csproj
+++ b/src/libraries/System.Globalization.Calendars/tests/System.Globalization.Calendars.Tests.csproj
@@ -1,4 +1,4 @@
-
+
@@ -128,4 +128,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Globalization.Extensions/pkg/System.Globalization.Extensions.builds b/src/libraries/System.Globalization.Extensions/pkg/System.Globalization.Extensions.builds
index 1fbf42e3d77d01fb22cad3a28eb0793fbb1a9382..29d974418d5a2eb55e5627d6cafa3946e0725426 100644
--- a/src/libraries/System.Globalization.Extensions/pkg/System.Globalization.Extensions.builds
+++ b/src/libraries/System.Globalization.Extensions/pkg/System.Globalization.Extensions.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Globalization.Extensions/pkg/System.Globalization.Extensions.pkgproj b/src/libraries/System.Globalization.Extensions/pkg/System.Globalization.Extensions.pkgproj
index 42ff146dd108970663b5bbc7ddafc377943c665a..d73029898036cd7062116154861ca828fb964145 100644
--- a/src/libraries/System.Globalization.Extensions/pkg/System.Globalization.Extensions.pkgproj
+++ b/src/libraries/System.Globalization.Extensions/pkg/System.Globalization.Extensions.pkgproj
@@ -1,9 +1,9 @@
-
+
- netcoreapp1.1;uap10.1;net463;$(AllXamarinFrameworks)
+ netcoreapp2.0;uap10.1;net463;$(AllXamarinFrameworks)
diff --git a/src/libraries/System.Globalization.Extensions/ref/System.Globalization.Extensions.csproj b/src/libraries/System.Globalization.Extensions/ref/System.Globalization.Extensions.csproj
index c49bef8f71c9566b4a21905dc674462175923e2e..8fe04787d74568726ee987008f127081785fd763 100644
--- a/src/libraries/System.Globalization.Extensions/ref/System.Globalization.Extensions.csproj
+++ b/src/libraries/System.Globalization.Extensions/ref/System.Globalization.Extensions.csproj
@@ -1,4 +1,4 @@
-
+
@@ -14,4 +14,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Globalization.Extensions/src/Configurations.props b/src/libraries/System.Globalization.Extensions/src/Configurations.props
index 0decf0d6c0f829127304e0ad0d5d8ccd423288b1..7a242f16dd37df36ff550a73f12bf8c75a3b9c05 100644
--- a/src/libraries/System.Globalization.Extensions/src/Configurations.props
+++ b/src/libraries/System.Globalization.Extensions/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -7,4 +7,4 @@
netstandard-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Globalization.Extensions/src/System.Globalization.Extensions.csproj b/src/libraries/System.Globalization.Extensions/src/System.Globalization.Extensions.csproj
index 8b30a5848770292e702147b2f5280e0149167342..f99d8128876287b956368d16c71a4b5454efe4de 100644
--- a/src/libraries/System.Globalization.Extensions/src/System.Globalization.Extensions.csproj
+++ b/src/libraries/System.Globalization.Extensions/src/System.Globalization.Extensions.csproj
@@ -9,7 +9,7 @@
true
{2B96AA10-84C0-4927-8611-8D2474B990E8}
- netstandard1.7;uap10.1
+ netstandard;uap10.1
true
diff --git a/src/libraries/System.Globalization.Extensions/tests/Configurations.props b/src/libraries/System.Globalization.Extensions/tests/Configurations.props
index 512c938bad5364c677a3f4d9f647f1ade8c14aea..b2db637110616a495d303924e9aaf8b800db4821 100644
--- a/src/libraries/System.Globalization.Extensions/tests/Configurations.props
+++ b/src/libraries/System.Globalization.Extensions/tests/Configurations.props
@@ -1,9 +1,9 @@
-
+
netstandard1.3;
- netstandard1.7;
+ netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Globalization.Extensions/tests/System.Globalization.Extensions.Tests.builds b/src/libraries/System.Globalization.Extensions/tests/System.Globalization.Extensions.Tests.builds
index 5acfbea3e4830335ade66eb749fccc4ae0aaf365..50f3dab8e8f1b64949f399700b63109d101cf610 100644
--- a/src/libraries/System.Globalization.Extensions/tests/System.Globalization.Extensions.Tests.builds
+++ b/src/libraries/System.Globalization.Extensions/tests/System.Globalization.Extensions.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Globalization.Extensions/tests/System.Globalization.Extensions.Tests.csproj b/src/libraries/System.Globalization.Extensions/tests/System.Globalization.Extensions.Tests.csproj
index 4bac4b1d752f5b56df2d3c63ee22d7ab0efe7e96..569a7582027432cc4142014dc2ed67692f109d1b 100644
--- a/src/libraries/System.Globalization.Extensions/tests/System.Globalization.Extensions.Tests.csproj
+++ b/src/libraries/System.Globalization.Extensions/tests/System.Globalization.Extensions.Tests.csproj
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Globalization/pkg/System.Globalization.pkgproj b/src/libraries/System.Globalization/pkg/System.Globalization.pkgproj
index 15413e81cde4eff5cc2db69b73e88cea71f6eb53..6aba278bea51a036d47a4d3526344038c3ef8368 100644
--- a/src/libraries/System.Globalization/pkg/System.Globalization.pkgproj
+++ b/src/libraries/System.Globalization/pkg/System.Globalization.pkgproj
@@ -3,7 +3,7 @@
- net463;netcoreapp1.1;uap10.1;$(AllXamarinFrameworks)
+ net463;netcoreapp2.0;uap10.1;$(AllXamarinFrameworks)
net463
diff --git a/src/libraries/System.Globalization/pkg/any/System.Globalization.pkgproj b/src/libraries/System.Globalization/pkg/any/System.Globalization.pkgproj
index 52f51fcc7791ef6378cddecb362a2230035a71f0..0d27fbed03a1b50308bda64d55fb5fdad8cc455a 100644
--- a/src/libraries/System.Globalization/pkg/any/System.Globalization.pkgproj
+++ b/src/libraries/System.Globalization/pkg/any/System.Globalization.pkgproj
@@ -5,16 +5,13 @@
any
true
-
-
runtimes/aot/lib/uap101
aot
-
diff --git a/src/libraries/System.Globalization/pkg/aot/System.Globalization.pkgproj b/src/libraries/System.Globalization/pkg/aot/System.Globalization.pkgproj
index 724172d456ca3a2245f864b4450afbc09e55cd90..313c5a032e2116c2e05fe298d1e9210279eb2982 100644
--- a/src/libraries/System.Globalization/pkg/aot/System.Globalization.pkgproj
+++ b/src/libraries/System.Globalization/pkg/aot/System.Globalization.pkgproj
@@ -1,17 +1,14 @@
-
aot
true
-
uap101aot
-
\ No newline at end of file
diff --git a/src/libraries/System.Globalization/ref/System.Globalization.csproj b/src/libraries/System.Globalization/ref/System.Globalization.csproj
index ef1223d59f1290379ea516461d45356a90471d56..169ba45a6e49bf319eae484e9a109cc76f461189 100644
--- a/src/libraries/System.Globalization/ref/System.Globalization.csproj
+++ b/src/libraries/System.Globalization/ref/System.Globalization.csproj
@@ -1,4 +1,4 @@
-
+
@@ -8,4 +8,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Globalization/src/Configurations.props b/src/libraries/System.Globalization/src/Configurations.props
index f013d10b8ccc3f86eab07075639f01c909892d84..ed0bd2acc95b9edfd29df7e7b1e40ebe4f105079 100644
--- a/src/libraries/System.Globalization/src/Configurations.props
+++ b/src/libraries/System.Globalization/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -7,4 +7,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Globalization/src/System.Globalization.csproj b/src/libraries/System.Globalization/src/System.Globalization.csproj
index a22f58b7d94d38b6d8d43f0820c79185ce660165..7448f99b37ee502b1550b6f891f8d9ee94d95e78 100644
--- a/src/libraries/System.Globalization/src/System.Globalization.csproj
+++ b/src/libraries/System.Globalization/src/System.Globalization.csproj
@@ -4,7 +4,7 @@
System.Globalization
true
- netstandard1.7;uap10.1
+ netstandard;uap10.1
diff --git a/src/libraries/System.Globalization/tests/Configurations.props b/src/libraries/System.Globalization/tests/Configurations.props
index 512c938bad5364c677a3f4d9f647f1ade8c14aea..b2db637110616a495d303924e9aaf8b800db4821 100644
--- a/src/libraries/System.Globalization/tests/Configurations.props
+++ b/src/libraries/System.Globalization/tests/Configurations.props
@@ -1,9 +1,9 @@
-
+
netstandard1.3;
- netstandard1.7;
+ netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Globalization/tests/Performance/System.Globalization.Performance.Tests.csproj b/src/libraries/System.Globalization/tests/Performance/System.Globalization.Performance.Tests.csproj
index bf2f1cafab0743402b8d4755ab2a1aadffa08468..56dc6cdc3f2b64ab2dbc1e3268c6ca0f216cf497 100644
--- a/src/libraries/System.Globalization/tests/Performance/System.Globalization.Performance.Tests.csproj
+++ b/src/libraries/System.Globalization/tests/Performance/System.Globalization.Performance.Tests.csproj
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Globalization/tests/System.Globalization.Tests.builds b/src/libraries/System.Globalization/tests/System.Globalization.Tests.builds
index f0f2f042e5dc71e43f069ad550a7f9003b57c44a..c1c1306be027e488821b8ca492bb3e6c25299372 100644
--- a/src/libraries/System.Globalization/tests/System.Globalization.Tests.builds
+++ b/src/libraries/System.Globalization/tests/System.Globalization.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Globalization/tests/System.Globalization.Tests.csproj b/src/libraries/System.Globalization/tests/System.Globalization.Tests.csproj
index af58da570a40874284a4322d184cc364f42e881b..50c5c4810e40b8fba5c587fa5d6f8325bd5f5aec 100644
--- a/src/libraries/System.Globalization/tests/System.Globalization.Tests.csproj
+++ b/src/libraries/System.Globalization/tests/System.Globalization.Tests.csproj
@@ -1,4 +1,4 @@
-
+
@@ -166,4 +166,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.Compression.ZipFile/pkg/System.IO.Compression.ZipFile.builds b/src/libraries/System.IO.Compression.ZipFile/pkg/System.IO.Compression.ZipFile.builds
index e10514f95edd67cd1135bab113cd5c931376740c..d6ebb987294069e4361a0234a46814773a421482 100644
--- a/src/libraries/System.IO.Compression.ZipFile/pkg/System.IO.Compression.ZipFile.builds
+++ b/src/libraries/System.IO.Compression.ZipFile/pkg/System.IO.Compression.ZipFile.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.Compression.ZipFile/pkg/System.IO.Compression.ZipFile.pkgproj b/src/libraries/System.IO.Compression.ZipFile/pkg/System.IO.Compression.ZipFile.pkgproj
index 4d92ce99346a6ec2fbad30f7d22b10869e513677..b6400d1b33b25098bdc450b9f4d35d4e8b1d0db2 100644
--- a/src/libraries/System.IO.Compression.ZipFile/pkg/System.IO.Compression.ZipFile.pkgproj
+++ b/src/libraries/System.IO.Compression.ZipFile/pkg/System.IO.Compression.ZipFile.pkgproj
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.IO.Compression.ZipFile/ref/System.IO.Compression.ZipFile.csproj b/src/libraries/System.IO.Compression.ZipFile/ref/System.IO.Compression.ZipFile.csproj
index 360c821172bcc005fb90fa184d681cca7ac8b976..fe432ab17e30d504d533c7c40342fd42dfc46be7 100644
--- a/src/libraries/System.IO.Compression.ZipFile/ref/System.IO.Compression.ZipFile.csproj
+++ b/src/libraries/System.IO.Compression.ZipFile/ref/System.IO.Compression.ZipFile.csproj
@@ -1,4 +1,4 @@
-
+
@@ -14,4 +14,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.Compression.ZipFile/src/Configurations.props b/src/libraries/System.IO.Compression.ZipFile/src/Configurations.props
index 24e575d57f008def11ea01de6d0e7d44557642fb..f9df021aefd9ab84f98c619d263a00909c6cb3ae 100644
--- a/src/libraries/System.IO.Compression.ZipFile/src/Configurations.props
+++ b/src/libraries/System.IO.Compression.ZipFile/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard1.3;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.Compression.ZipFile/tests/Configurations.props b/src/libraries/System.IO.Compression.ZipFile/tests/Configurations.props
index f0ebe53119ec712315cfea5b151d5f0d754744f8..c3266e1e9362243b5723032465bcc7a62ae720ce 100644
--- a/src/libraries/System.IO.Compression.ZipFile/tests/Configurations.props
+++ b/src/libraries/System.IO.Compression.ZipFile/tests/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard1.3;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.builds b/src/libraries/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.builds
index f49d7037cd24e15ea89ea289776800c34552f50a..dcef83a6b1bd4b8ebbd0a1529aa6f92c2c409eac 100644
--- a/src/libraries/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.builds
+++ b/src/libraries/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.IO.Compression/pkg/System.IO.Compression.builds b/src/libraries/System.IO.Compression/pkg/System.IO.Compression.builds
index be772ea06318c89c67d3c64580f65003d058aad6..58fc4e4030fd58c780c906ba01c7cfe3112a99cc 100644
--- a/src/libraries/System.IO.Compression/pkg/System.IO.Compression.builds
+++ b/src/libraries/System.IO.Compression/pkg/System.IO.Compression.builds
@@ -1,9 +1,8 @@
-
+
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.Compression/pkg/System.IO.Compression.pkgproj b/src/libraries/System.IO.Compression/pkg/System.IO.Compression.pkgproj
index ed0bb202332553222f6df3834eb58aeb4ae9e19f..383cec15b51bbfca69fffbbf62513d29238d6c30 100644
--- a/src/libraries/System.IO.Compression/pkg/System.IO.Compression.pkgproj
+++ b/src/libraries/System.IO.Compression/pkg/System.IO.Compression.pkgproj
@@ -1,9 +1,9 @@
-
+
- netcoreapp1.1;net463;$(AllXamarinFrameworks)
+ netcoreapp2.0;net463;$(AllXamarinFrameworks)
@@ -30,7 +30,6 @@
true
-
\ No newline at end of file
diff --git a/src/libraries/System.IO.Compression/ref/System.IO.Compression.csproj b/src/libraries/System.IO.Compression/ref/System.IO.Compression.csproj
index fd48b4b5312f73a5dd031e88ae8aed28ae7bbce0..03e397192cf6bfedfdfe7742d92928bb5aa4522e 100644
--- a/src/libraries/System.IO.Compression/ref/System.IO.Compression.csproj
+++ b/src/libraries/System.IO.Compression/ref/System.IO.Compression.csproj
@@ -1,4 +1,4 @@
-
+
@@ -14,4 +14,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.Compression/src/Configurations.props b/src/libraries/System.IO.Compression/src/Configurations.props
index 3bb6330d9e73da4e4998b3dcba9a05936bf49b7e..4701fcd7729002100465c5249f5ddfe14f92bedd 100644
--- a/src/libraries/System.IO.Compression/src/Configurations.props
+++ b/src/libraries/System.IO.Compression/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -7,4 +7,4 @@
net463-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.Compression/tests/Configurations.props b/src/libraries/System.IO.Compression/tests/Configurations.props
index 981075fcc557f85d80b9ef41c767e86ae0392478..fa9e1005a0a90d40a40f303f8ba07aac1c35ad19 100644
--- a/src/libraries/System.IO.Compression/tests/Configurations.props
+++ b/src/libraries/System.IO.Compression/tests/Configurations.props
@@ -1,11 +1,11 @@
-
+
netstandard1.3-Unix;
netstandard1.3-Windows_NT;
- netstandard1.7-Unix;
- netstandard1.7-Windows_NT;
+ netstandard-Unix;
+ netstandard-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.Compression/tests/Performance/Configurations.props b/src/libraries/System.IO.Compression/tests/Performance/Configurations.props
index 46f6878dcdef7f15f71b867512a99ddbfe69259a..2845c11c541d1bd6029f9cf9fe5b99e4d249c8f9 100644
--- a/src/libraries/System.IO.Compression/tests/Performance/Configurations.props
+++ b/src/libraries/System.IO.Compression/tests/Performance/Configurations.props
@@ -1,8 +1,8 @@
-
+
- netcoreapp1.1;
+ netcoreapp;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.Compression/tests/Performance/System.IO.Compression.Performance.Tests.csproj b/src/libraries/System.IO.Compression/tests/Performance/System.IO.Compression.Performance.Tests.csproj
index 84691bece90f9f0872003546b12a0f796fdc45b4..7baced43d6b77f6c3d77c7e815348a58835b6d44 100644
--- a/src/libraries/System.IO.Compression/tests/Performance/System.IO.Compression.Performance.Tests.csproj
+++ b/src/libraries/System.IO.Compression/tests/Performance/System.IO.Compression.Performance.Tests.csproj
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.IO.Compression/tests/System.IO.Compression.Tests.builds b/src/libraries/System.IO.Compression/tests/System.IO.Compression.Tests.builds
index ee7d4fd2152be29219d42f95b14b73b3f41df451..7d7447207b945cf8b6f5d972bebd80f0268f8039 100644
--- a/src/libraries/System.IO.Compression/tests/System.IO.Compression.Tests.builds
+++ b/src/libraries/System.IO.Compression/tests/System.IO.Compression.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.IO.Compression/tests/System.IO.Compression.Tests.csproj b/src/libraries/System.IO.Compression/tests/System.IO.Compression.Tests.csproj
index ea47b412874883b5d2b9b2c3c0970df94d3764d7..b601896e93a7a787544506c070b596f896024393 100644
--- a/src/libraries/System.IO.Compression/tests/System.IO.Compression.Tests.csproj
+++ b/src/libraries/System.IO.Compression/tests/System.IO.Compression.Tests.csproj
@@ -1,4 +1,4 @@
-
+
@@ -48,4 +48,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.FileSystem.AccessControl/pkg/System.IO.FileSystem.AccessControl.builds b/src/libraries/System.IO.FileSystem.AccessControl/pkg/System.IO.FileSystem.AccessControl.builds
index dc6ff97b68bd37116beb182f2fa90e0b6dc8f23d..6d04944e30139a6ea294db0ab120443e25c5fcb4 100644
--- a/src/libraries/System.IO.FileSystem.AccessControl/pkg/System.IO.FileSystem.AccessControl.builds
+++ b/src/libraries/System.IO.FileSystem.AccessControl/pkg/System.IO.FileSystem.AccessControl.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.FileSystem.AccessControl/pkg/System.IO.FileSystem.AccessControl.pkgproj b/src/libraries/System.IO.FileSystem.AccessControl/pkg/System.IO.FileSystem.AccessControl.pkgproj
index 7e85ab3a433c61f1d491eebe9813d5bf510b21d9..92ae5e245f91a414fa0b64eaba4a905ef132fa3e 100644
--- a/src/libraries/System.IO.FileSystem.AccessControl/pkg/System.IO.FileSystem.AccessControl.pkgproj
+++ b/src/libraries/System.IO.FileSystem.AccessControl/pkg/System.IO.FileSystem.AccessControl.pkgproj
@@ -1,17 +1,14 @@
-
+
-
net46;netcoreapp1.0
-
win
-
\ No newline at end of file
diff --git a/src/libraries/System.IO.FileSystem.AccessControl/ref/System.IO.FileSystem.AccessControl.csproj b/src/libraries/System.IO.FileSystem.AccessControl/ref/System.IO.FileSystem.AccessControl.csproj
index b79d22d017332c593c2db809735c6ebdb3d24f6d..f65e735d99e5b4e463bb563ce9425659f575c011 100644
--- a/src/libraries/System.IO.FileSystem.AccessControl/ref/System.IO.FileSystem.AccessControl.csproj
+++ b/src/libraries/System.IO.FileSystem.AccessControl/ref/System.IO.FileSystem.AccessControl.csproj
@@ -1,4 +1,4 @@
-
+
@@ -13,4 +13,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.FileSystem.AccessControl/src/Configurations.props b/src/libraries/System.IO.FileSystem.AccessControl/src/Configurations.props
index a6c74d0e580323818caeda4f9796888bd7d569fd..437e6acc34bd512623ac7187b99d13d100213f25 100644
--- a/src/libraries/System.IO.FileSystem.AccessControl/src/Configurations.props
+++ b/src/libraries/System.IO.FileSystem.AccessControl/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -7,4 +7,4 @@
netstandard1.3-Unix;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.FileSystem.AccessControl/tests/Configurations.props b/src/libraries/System.IO.FileSystem.AccessControl/tests/Configurations.props
index 5d77dc616e23f0285c9cc66f180261bfa44e69c4..5f482b878bc4a4b91da33a6a7c4906082909ec30 100644
--- a/src/libraries/System.IO.FileSystem.AccessControl/tests/Configurations.props
+++ b/src/libraries/System.IO.FileSystem.AccessControl/tests/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard1.3-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.FileSystem.AccessControl/tests/System.IO.FileSystem.AccessControl.Tests.builds b/src/libraries/System.IO.FileSystem.AccessControl/tests/System.IO.FileSystem.AccessControl.Tests.builds
index fb582c569b586066606a59133067db2645a76375..ed27335eaba965eb72fca26fa342d43d0fc40eaf 100644
--- a/src/libraries/System.IO.FileSystem.AccessControl/tests/System.IO.FileSystem.AccessControl.Tests.builds
+++ b/src/libraries/System.IO.FileSystem.AccessControl/tests/System.IO.FileSystem.AccessControl.Tests.builds
@@ -1,10 +1,10 @@
-
+
Windows_NT
- netcoreapp1.1;netcoreapp1.0;net46
+ netcoreapp;netcoreapp1.0;net46
diff --git a/src/libraries/System.IO.FileSystem.DriveInfo/pkg/System.IO.FileSystem.DriveInfo.builds b/src/libraries/System.IO.FileSystem.DriveInfo/pkg/System.IO.FileSystem.DriveInfo.builds
index ed795893c6f667d101f7f5af398717c78ea00c1c..d76506f3e26197e258e0043d3caad50a24aff1ae 100644
--- a/src/libraries/System.IO.FileSystem.DriveInfo/pkg/System.IO.FileSystem.DriveInfo.builds
+++ b/src/libraries/System.IO.FileSystem.DriveInfo/pkg/System.IO.FileSystem.DriveInfo.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.FileSystem.DriveInfo/pkg/System.IO.FileSystem.DriveInfo.pkgproj b/src/libraries/System.IO.FileSystem.DriveInfo/pkg/System.IO.FileSystem.DriveInfo.pkgproj
index ab187b251b994448e2a84063404835d2554f9e8b..b6c71d7948f7dd465f43e7b4adb9394e0cb59fec 100644
--- a/src/libraries/System.IO.FileSystem.DriveInfo/pkg/System.IO.FileSystem.DriveInfo.pkgproj
+++ b/src/libraries/System.IO.FileSystem.DriveInfo/pkg/System.IO.FileSystem.DriveInfo.pkgproj
@@ -1,9 +1,9 @@
-
+
- net463;netcoreapp1.1;$(AllXamarinFrameworks)
+ net463;netcoreapp2.0;$(AllXamarinFrameworks)
@@ -14,9 +14,9 @@
-
win7
-
+
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.FileSystem.DriveInfo/ref/System.IO.FileSystem.DriveInfo.csproj b/src/libraries/System.IO.FileSystem.DriveInfo/ref/System.IO.FileSystem.DriveInfo.csproj
index ef3586a78d134424f44d07ba1f35785f8a7d2a38..05bd2aa535ea7479147e8f291ddd8c7a96d32f16 100644
--- a/src/libraries/System.IO.FileSystem.DriveInfo/ref/System.IO.FileSystem.DriveInfo.csproj
+++ b/src/libraries/System.IO.FileSystem.DriveInfo/ref/System.IO.FileSystem.DriveInfo.csproj
@@ -1,4 +1,4 @@
-
+
@@ -11,4 +11,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.FileSystem.DriveInfo/src/Configurations.props b/src/libraries/System.IO.FileSystem.DriveInfo/src/Configurations.props
index 3bb6330d9e73da4e4998b3dcba9a05936bf49b7e..4701fcd7729002100465c5249f5ddfe14f92bedd 100644
--- a/src/libraries/System.IO.FileSystem.DriveInfo/src/Configurations.props
+++ b/src/libraries/System.IO.FileSystem.DriveInfo/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -7,4 +7,4 @@
net463-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.FileSystem.DriveInfo/tests/Configurations.props b/src/libraries/System.IO.FileSystem.DriveInfo/tests/Configurations.props
index 2a160a39e8e0fb8d6b51ee9d9e03c7dd30ee956c..211cd2bec829c39148b69aa2e0ab929f3d1e0b76 100644
--- a/src/libraries/System.IO.FileSystem.DriveInfo/tests/Configurations.props
+++ b/src/libraries/System.IO.FileSystem.DriveInfo/tests/Configurations.props
@@ -1,9 +1,9 @@
-
+
netstandard1.3-Windows_NT;
- netstandard1.7;
+ netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.FileSystem.DriveInfo/tests/System.IO.FileSystem.DriveInfo.Tests.builds b/src/libraries/System.IO.FileSystem.DriveInfo/tests/System.IO.FileSystem.DriveInfo.Tests.builds
index 3c752b4a6888e18654b6471d7ee7ac063399f99a..c11c58a1807a5d9e9e791a0feba97efee156370d 100644
--- a/src/libraries/System.IO.FileSystem.DriveInfo/tests/System.IO.FileSystem.DriveInfo.Tests.builds
+++ b/src/libraries/System.IO.FileSystem.DriveInfo/tests/System.IO.FileSystem.DriveInfo.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.IO.FileSystem.DriveInfo/tests/System.IO.FileSystem.DriveInfo.Tests.csproj b/src/libraries/System.IO.FileSystem.DriveInfo/tests/System.IO.FileSystem.DriveInfo.Tests.csproj
index 19ffca7f20c5d2cb2bb4b48eac04faf02c89b17e..f8df48928dc242744e2e09ac98ad83ca437703e5 100644
--- a/src/libraries/System.IO.FileSystem.DriveInfo/tests/System.IO.FileSystem.DriveInfo.Tests.csproj
+++ b/src/libraries/System.IO.FileSystem.DriveInfo/tests/System.IO.FileSystem.DriveInfo.Tests.csproj
@@ -1,4 +1,4 @@
-
+
@@ -15,4 +15,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.FileSystem.Primitives/pkg/System.IO.FileSystem.Primitives.builds b/src/libraries/System.IO.FileSystem.Primitives/pkg/System.IO.FileSystem.Primitives.builds
index d31be7fba98c4d71f4220bf81a4eda3893f738dd..353761751a28651cbbfa8a52958eaa384d8496d6 100644
--- a/src/libraries/System.IO.FileSystem.Primitives/pkg/System.IO.FileSystem.Primitives.builds
+++ b/src/libraries/System.IO.FileSystem.Primitives/pkg/System.IO.FileSystem.Primitives.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.FileSystem.Primitives/pkg/System.IO.FileSystem.Primitives.pkgproj b/src/libraries/System.IO.FileSystem.Primitives/pkg/System.IO.FileSystem.Primitives.pkgproj
index 8b62841a8951121452f15067a6b87df830f8d093..cec8b548857880f8aa76940283b5aaf69eabce65 100644
--- a/src/libraries/System.IO.FileSystem.Primitives/pkg/System.IO.FileSystem.Primitives.pkgproj
+++ b/src/libraries/System.IO.FileSystem.Primitives/pkg/System.IO.FileSystem.Primitives.pkgproj
@@ -1,9 +1,9 @@
-
+
- net463;netcoreapp1.1;$(AllXamarinFrameworks)
+ net463;netcoreapp2.0;$(AllXamarinFrameworks)
@@ -16,4 +16,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.FileSystem.Primitives/ref/System.IO.FileSystem.Primitives.csproj b/src/libraries/System.IO.FileSystem.Primitives/ref/System.IO.FileSystem.Primitives.csproj
index fe9f9314f8956763cfe71a3e10b63b99ad9c0a5c..cc5c1e617b5d0ca8badd28bd428b7c3cc8bad329 100644
--- a/src/libraries/System.IO.FileSystem.Primitives/ref/System.IO.FileSystem.Primitives.csproj
+++ b/src/libraries/System.IO.FileSystem.Primitives/ref/System.IO.FileSystem.Primitives.csproj
@@ -1,4 +1,4 @@
-
+
@@ -8,4 +8,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.FileSystem.Primitives/src/Configurations.props b/src/libraries/System.IO.FileSystem.Primitives/src/Configurations.props
index 9c336c0be9e52171e2fecf14214e3373be07177d..dc837f915219bcf7ff5c38f67e01c45d5b976485 100644
--- a/src/libraries/System.IO.FileSystem.Primitives/src/Configurations.props
+++ b/src/libraries/System.IO.FileSystem.Primitives/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.FileSystem.Primitives/tests/Configurations.props b/src/libraries/System.IO.FileSystem.Primitives/tests/Configurations.props
index 98f53209d45a12360d0bbf7cf031b29ff556fc57..c398e42e899425ce70e3a9884633835ab6fcc66e 100644
--- a/src/libraries/System.IO.FileSystem.Primitives/tests/Configurations.props
+++ b/src/libraries/System.IO.FileSystem.Primitives/tests/Configurations.props
@@ -1,8 +1,8 @@
-
+
- netstandard1.7;
+ netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.FileSystem.Primitives/tests/System.IO.FileSystem.Primitives.Tests.builds b/src/libraries/System.IO.FileSystem.Primitives/tests/System.IO.FileSystem.Primitives.Tests.builds
index c50a8f1b4b41240ee0f42318617ceccfc6473089..895fc45242e0b2dda90a22f5df741c2deb408aef 100644
--- a/src/libraries/System.IO.FileSystem.Primitives/tests/System.IO.FileSystem.Primitives.Tests.builds
+++ b/src/libraries/System.IO.FileSystem.Primitives/tests/System.IO.FileSystem.Primitives.Tests.builds
@@ -1,4 +1,4 @@
-
+
@@ -14,4 +14,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.FileSystem.Primitives/tests/System.IO.FileSystem.Primitives.Tests.csproj b/src/libraries/System.IO.FileSystem.Primitives/tests/System.IO.FileSystem.Primitives.Tests.csproj
index 02b34d731d6000854d09bb21136016e4b725794b..24a444792f92f3d9b660af02ba6a65c038dda9af 100644
--- a/src/libraries/System.IO.FileSystem.Primitives/tests/System.IO.FileSystem.Primitives.Tests.csproj
+++ b/src/libraries/System.IO.FileSystem.Primitives/tests/System.IO.FileSystem.Primitives.Tests.csproj
@@ -13,4 +13,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.FileSystem.Watcher/pkg/System.IO.FileSystem.Watcher.builds b/src/libraries/System.IO.FileSystem.Watcher/pkg/System.IO.FileSystem.Watcher.builds
index 493e64f54c2f92e2d4ef61e81de6c8dac01e61cd..19638575c3d7dbd62966a2fab8b06870eef4f03b 100644
--- a/src/libraries/System.IO.FileSystem.Watcher/pkg/System.IO.FileSystem.Watcher.builds
+++ b/src/libraries/System.IO.FileSystem.Watcher/pkg/System.IO.FileSystem.Watcher.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.FileSystem.Watcher/pkg/System.IO.FileSystem.Watcher.pkgproj b/src/libraries/System.IO.FileSystem.Watcher/pkg/System.IO.FileSystem.Watcher.pkgproj
index 5530d3d2acecd097366be7a5dc4a2c8bc748044c..ba386915885da21485e230067238df557796653e 100644
--- a/src/libraries/System.IO.FileSystem.Watcher/pkg/System.IO.FileSystem.Watcher.pkgproj
+++ b/src/libraries/System.IO.FileSystem.Watcher/pkg/System.IO.FileSystem.Watcher.pkgproj
@@ -1,9 +1,9 @@
-
+
- net463;netcoreapp1.1;$(AllXamarinFrameworks)
+ net463;netcoreapp2.0;$(AllXamarinFrameworks)
@@ -14,9 +14,9 @@
-
win7
-
+
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.FileSystem.Watcher/ref/System.IO.FileSystem.Watcher.csproj b/src/libraries/System.IO.FileSystem.Watcher/ref/System.IO.FileSystem.Watcher.csproj
index 494e5671cf7c68facfba4ecad66ba238e6504e07..913dea5c1155f8017822d0d954fb0ab134caf6e7 100644
--- a/src/libraries/System.IO.FileSystem.Watcher/ref/System.IO.FileSystem.Watcher.csproj
+++ b/src/libraries/System.IO.FileSystem.Watcher/ref/System.IO.FileSystem.Watcher.csproj
@@ -1,4 +1,4 @@
-
+
@@ -10,4 +10,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.FileSystem.Watcher/src/Configurations.props b/src/libraries/System.IO.FileSystem.Watcher/src/Configurations.props
index d192a53e46f2e59aaa8c7211b9c32ca46b5316a0..8682673c53983739ebca35646cf7f3c38a85259e 100644
--- a/src/libraries/System.IO.FileSystem.Watcher/src/Configurations.props
+++ b/src/libraries/System.IO.FileSystem.Watcher/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -8,4 +8,4 @@
net463-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.FileSystem.Watcher/tests/Configurations.props b/src/libraries/System.IO.FileSystem.Watcher/tests/Configurations.props
index df25450ab0fc9d6f8cf1be4e9f7ab5d02f5fc7af..be31938f47dc3279991bf455878f3f9233387908 100644
--- a/src/libraries/System.IO.FileSystem.Watcher/tests/Configurations.props
+++ b/src/libraries/System.IO.FileSystem.Watcher/tests/Configurations.props
@@ -1,13 +1,13 @@
-
+
netstandard1.3-Linux;
netstandard1.3-OSX;
netstandard1.3-Windows_NT;
- netstandard1.7-Linux;
- netstandard1.7-OSX;
- netstandard1.7-Windows_NT;
+ netstandard-Linux;
+ netstandard-OSX;
+ netstandard-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.builds b/src/libraries/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.builds
index bc5390472e63d6bf932e662b755f0eeadc770174..0a31998134c1a24e976c112795cdf14974bec27d 100644
--- a/src/libraries/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.builds
+++ b/src/libraries/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.csproj b/src/libraries/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.csproj
index 1604f4c4f5333ee8e6734b92492c3b9b299857aa..32f8a07230954dfac299f6afbd16030f8d3d4f52 100644
--- a/src/libraries/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.csproj
+++ b/src/libraries/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.csproj
@@ -49,4 +49,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.FileSystem/pkg/System.IO.FileSystem.builds b/src/libraries/System.IO.FileSystem/pkg/System.IO.FileSystem.builds
index 87af5d606b45eed3b99b15c4a53ec8d28804e327..e680a1318e083874f7ce7da1cc6b0b2e9d58e8b3 100644
--- a/src/libraries/System.IO.FileSystem/pkg/System.IO.FileSystem.builds
+++ b/src/libraries/System.IO.FileSystem/pkg/System.IO.FileSystem.builds
@@ -1,8 +1,8 @@
-
+
-
+
Windows_NT
diff --git a/src/libraries/System.IO.FileSystem/pkg/System.IO.FileSystem.pkgproj b/src/libraries/System.IO.FileSystem/pkg/System.IO.FileSystem.pkgproj
index 051d826c9976a291d358d86a207b243850960633..423d56757bc9064a14f01179b0e644a162cdf1c6 100644
--- a/src/libraries/System.IO.FileSystem/pkg/System.IO.FileSystem.pkgproj
+++ b/src/libraries/System.IO.FileSystem/pkg/System.IO.FileSystem.pkgproj
@@ -3,7 +3,7 @@
- netcoreapp1.1;net463;$(AllXamarinFrameworks)
+ netcoreapp2.0;net463;$(AllXamarinFrameworks)
net463
diff --git a/src/libraries/System.IO.FileSystem/pkg/unix/System.IO.FileSystem.pkgproj b/src/libraries/System.IO.FileSystem/pkg/unix/System.IO.FileSystem.pkgproj
index 77971ff05fc40e5dfacc5fde077b834ffb286e06..8b4d9b1169112cec32ea84288802090ffb3d7410 100644
--- a/src/libraries/System.IO.FileSystem/pkg/unix/System.IO.FileSystem.pkgproj
+++ b/src/libraries/System.IO.FileSystem/pkg/unix/System.IO.FileSystem.pkgproj
@@ -1,17 +1,14 @@
-
unix
true
-
Unix
-
\ No newline at end of file
diff --git a/src/libraries/System.IO.FileSystem/pkg/win/System.IO.FileSystem.pkgproj b/src/libraries/System.IO.FileSystem/pkg/win/System.IO.FileSystem.pkgproj
index 87c09cedade910b09b2d045f19a46d4b341d97f8..6aef01697c326ef07188d7aa684090c25e45b1ba 100644
--- a/src/libraries/System.IO.FileSystem/pkg/win/System.IO.FileSystem.pkgproj
+++ b/src/libraries/System.IO.FileSystem/pkg/win/System.IO.FileSystem.pkgproj
@@ -1,26 +1,20 @@
-
win
true
-
Windows_NT
-
-
-
-
\ No newline at end of file
diff --git a/src/libraries/System.IO.FileSystem/ref/4.0.1/System.IO.FileSystem.depproj b/src/libraries/System.IO.FileSystem/ref/4.0.1/System.IO.FileSystem.depproj
index a057e94de8d9dcc21acf773bba64680872dc308b..36b93c3576fbd9cfd487c08fee2197e306567249 100644
--- a/src/libraries/System.IO.FileSystem/ref/4.0.1/System.IO.FileSystem.depproj
+++ b/src/libraries/System.IO.FileSystem/ref/4.0.1/System.IO.FileSystem.depproj
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.IO.FileSystem/ref/System.IO.FileSystem.csproj b/src/libraries/System.IO.FileSystem/ref/System.IO.FileSystem.csproj
index 949503ef1fe548253f9b86a59bc1283776a2086e..d327df1b5d294ce087c3a153e8141b3198ac64b6 100644
--- a/src/libraries/System.IO.FileSystem/ref/System.IO.FileSystem.csproj
+++ b/src/libraries/System.IO.FileSystem/ref/System.IO.FileSystem.csproj
@@ -1,4 +1,4 @@
-
+
@@ -14,4 +14,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.FileSystem/src/Configurations.props b/src/libraries/System.IO.FileSystem/src/Configurations.props
index 3bb6330d9e73da4e4998b3dcba9a05936bf49b7e..4701fcd7729002100465c5249f5ddfe14f92bedd 100644
--- a/src/libraries/System.IO.FileSystem/src/Configurations.props
+++ b/src/libraries/System.IO.FileSystem/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -7,4 +7,4 @@
net463-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.FileSystem/tests/Configurations.props b/src/libraries/System.IO.FileSystem/tests/Configurations.props
index 981075fcc557f85d80b9ef41c767e86ae0392478..fa9e1005a0a90d40a40f303f8ba07aac1c35ad19 100644
--- a/src/libraries/System.IO.FileSystem/tests/Configurations.props
+++ b/src/libraries/System.IO.FileSystem/tests/Configurations.props
@@ -1,11 +1,11 @@
-
+
netstandard1.3-Unix;
netstandard1.3-Windows_NT;
- netstandard1.7-Unix;
- netstandard1.7-Windows_NT;
+ netstandard-Unix;
+ netstandard-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.FileSystem/tests/Performance/System.IO.FileSystem.Performance.Tests.csproj b/src/libraries/System.IO.FileSystem/tests/Performance/System.IO.FileSystem.Performance.Tests.csproj
index 1298befd0ee65b41e0d82ff95a14f54eadb9dbf4..95f7c58f4f219c7a7ed7b17c644c4715f0fa69e1 100644
--- a/src/libraries/System.IO.FileSystem/tests/Performance/System.IO.FileSystem.Performance.Tests.csproj
+++ b/src/libraries/System.IO.FileSystem/tests/Performance/System.IO.FileSystem.Performance.Tests.csproj
@@ -1,4 +1,4 @@
-
+
Windows_Debug
diff --git a/src/libraries/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.builds b/src/libraries/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.builds
index e457f844569baad952b21cc946aec19a69d47e13..eae0df7274b79bb80c7d899ea1bb2f5e2239884c 100644
--- a/src/libraries/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.builds
+++ b/src/libraries/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj b/src/libraries/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj
index 1140b22e5d8bfb144643a32730a9379efbbb1dc8..5d73eebcc1d04b47568968370fcffd0d7f72a212 100644
--- a/src/libraries/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj
+++ b/src/libraries/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj
@@ -1,4 +1,4 @@
-
+
@@ -156,4 +156,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.IsolatedStorage/pkg/System.IO.IsolatedStorage.builds b/src/libraries/System.IO.IsolatedStorage/pkg/System.IO.IsolatedStorage.builds
index aaa31bdad8e5fd85ec99083da724701e396d2b54..26f75ca7738f99f9db125cb13e022389ed4335f6 100644
--- a/src/libraries/System.IO.IsolatedStorage/pkg/System.IO.IsolatedStorage.builds
+++ b/src/libraries/System.IO.IsolatedStorage/pkg/System.IO.IsolatedStorage.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.IsolatedStorage/pkg/System.IO.IsolatedStorage.pkgproj b/src/libraries/System.IO.IsolatedStorage/pkg/System.IO.IsolatedStorage.pkgproj
index b38d23338e9f82a1dda02f67b1199574559800b0..a34a9be42d0d27e2ad26a485996873a14c6911b6 100644
--- a/src/libraries/System.IO.IsolatedStorage/pkg/System.IO.IsolatedStorage.pkgproj
+++ b/src/libraries/System.IO.IsolatedStorage/pkg/System.IO.IsolatedStorage.pkgproj
@@ -1,9 +1,9 @@
-
+
- uap10.1;netcoreapp1.1;net461;$(AllXamarinFrameworks)
+ uap10.1;netcoreapp2.0;net461;$(AllXamarinFrameworks)
diff --git a/src/libraries/System.IO.IsolatedStorage/ref/System.IO.IsolatedStorage.csproj b/src/libraries/System.IO.IsolatedStorage/ref/System.IO.IsolatedStorage.csproj
index 458229792edba0ffc9525e73ab39712f6e7ed701..e38c6fd87bfeb16a39249a8976b62737c3e4e64a 100644
--- a/src/libraries/System.IO.IsolatedStorage/ref/System.IO.IsolatedStorage.csproj
+++ b/src/libraries/System.IO.IsolatedStorage/ref/System.IO.IsolatedStorage.csproj
@@ -1,4 +1,4 @@
-
+
@@ -17,4 +17,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.IsolatedStorage/src/Configurations.props b/src/libraries/System.IO.IsolatedStorage/src/Configurations.props
index 53b62c64fea2475e524eb32a20b028ea109d4d41..bcfec4bbde61fa2877a42ca2e87056c258cd6c09 100644
--- a/src/libraries/System.IO.IsolatedStorage/src/Configurations.props
+++ b/src/libraries/System.IO.IsolatedStorage/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj b/src/libraries/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj
index 33d8b64976315352959dab7b2325ec03c6d40cdd..d23708dec36567c72aae5960319c031cc6fe72b9 100644
--- a/src/libraries/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj
+++ b/src/libraries/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj
@@ -7,7 +7,7 @@
true
true
None
- netstandard1.7;uap10.1
+ netstandard;uap10.1
diff --git a/src/libraries/System.IO.IsolatedStorage/tests/Configurations.props b/src/libraries/System.IO.IsolatedStorage/tests/Configurations.props
index 90648972ae4de2dc0c8b5d90ea77497a1393147c..cfc57211a43f1efa201dcfc0a5b7dd9d7e9f2987 100644
--- a/src/libraries/System.IO.IsolatedStorage/tests/Configurations.props
+++ b/src/libraries/System.IO.IsolatedStorage/tests/Configurations.props
@@ -1,9 +1,9 @@
-
+
- netstandard1.7-Unix;
- netstandard1.7-Windows_NT;
+ netstandard-Unix;
+ netstandard-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.IsolatedStorage/tests/System.IO.IsolatedStorage.Tests.builds b/src/libraries/System.IO.IsolatedStorage/tests/System.IO.IsolatedStorage.Tests.builds
index d416575ee4bc19ed20f230e31a091b8331f952e2..5b93935b0a9f7f3909f31b41cbea9b506ceb0397 100644
--- a/src/libraries/System.IO.IsolatedStorage/tests/System.IO.IsolatedStorage.Tests.builds
+++ b/src/libraries/System.IO.IsolatedStorage/tests/System.IO.IsolatedStorage.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.IO.MemoryMappedFiles/pkg/System.IO.MemoryMappedFiles.builds b/src/libraries/System.IO.MemoryMappedFiles/pkg/System.IO.MemoryMappedFiles.builds
index 19695e6b500ebdcdb3bd859a4a75a71c295de1f5..7ac3c0458e5968e31241ec6e5524578ac7f2ccbc 100644
--- a/src/libraries/System.IO.MemoryMappedFiles/pkg/System.IO.MemoryMappedFiles.builds
+++ b/src/libraries/System.IO.MemoryMappedFiles/pkg/System.IO.MemoryMappedFiles.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.MemoryMappedFiles/pkg/System.IO.MemoryMappedFiles.pkgproj b/src/libraries/System.IO.MemoryMappedFiles/pkg/System.IO.MemoryMappedFiles.pkgproj
index c1587b4cd0fe0085477d4a155b8f804578c735a4..3771f4a6a759676e28af607b71a2592322f6686c 100644
--- a/src/libraries/System.IO.MemoryMappedFiles/pkg/System.IO.MemoryMappedFiles.pkgproj
+++ b/src/libraries/System.IO.MemoryMappedFiles/pkg/System.IO.MemoryMappedFiles.pkgproj
@@ -1,9 +1,9 @@
-
+
- net463;netcoreapp1.1;$(AllXamarinFrameworks)
+ net463;netcoreapp2.0;$(AllXamarinFrameworks)
diff --git a/src/libraries/System.IO.MemoryMappedFiles/ref/System.IO.MemoryMappedFiles.csproj b/src/libraries/System.IO.MemoryMappedFiles/ref/System.IO.MemoryMappedFiles.csproj
index 138a8b18e70f10acb7ae01b68cf29b322384ca2e..2ec531dfc9df0d9160677f48ac2a464653922e8b 100644
--- a/src/libraries/System.IO.MemoryMappedFiles/ref/System.IO.MemoryMappedFiles.csproj
+++ b/src/libraries/System.IO.MemoryMappedFiles/ref/System.IO.MemoryMappedFiles.csproj
@@ -1,4 +1,4 @@
-
+
@@ -14,4 +14,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.MemoryMappedFiles/src/Configurations.props b/src/libraries/System.IO.MemoryMappedFiles/src/Configurations.props
index 3bb6330d9e73da4e4998b3dcba9a05936bf49b7e..4701fcd7729002100465c5249f5ddfe14f92bedd 100644
--- a/src/libraries/System.IO.MemoryMappedFiles/src/Configurations.props
+++ b/src/libraries/System.IO.MemoryMappedFiles/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -7,4 +7,4 @@
net463-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.MemoryMappedFiles/tests/Configurations.props b/src/libraries/System.IO.MemoryMappedFiles/tests/Configurations.props
index 0c2d77f6b79987aca732f98ec3c9b79c3e7d5906..566c16a6e1e938ef4fb41df328ff37e6bb3cc46b 100644
--- a/src/libraries/System.IO.MemoryMappedFiles/tests/Configurations.props
+++ b/src/libraries/System.IO.MemoryMappedFiles/tests/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard1.3-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.builds b/src/libraries/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.builds
index 8a3e31db74e7127edd353c084579101382f20fd2..1020a374c02b9df0eb1347efcabf2725432a7587 100644
--- a/src/libraries/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.builds
+++ b/src/libraries/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.csproj b/src/libraries/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.csproj
index a40f8df70ffa90652b471d4acb58672a1f547ac0..7bc57e5c341f9eed490f8be8f97d6eafcac30d29 100644
--- a/src/libraries/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.csproj
+++ b/src/libraries/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.csproj
@@ -1,4 +1,4 @@
-
+
@@ -37,4 +37,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.Packaging/pkg/System.IO.Packaging.builds b/src/libraries/System.IO.Packaging/pkg/System.IO.Packaging.builds
index 173451fab3f0799e1428689ae5e07859021d3c58..23ba2a13b81892910c424e9e23660e61a743ddb8 100644
--- a/src/libraries/System.IO.Packaging/pkg/System.IO.Packaging.builds
+++ b/src/libraries/System.IO.Packaging/pkg/System.IO.Packaging.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
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 34254a75b9141f07a4a15d1130a7e3f4778c3802..0d403d9c38421db5bd3ff2dd9451b5dd884aa369 100644
--- a/src/libraries/System.IO.Packaging/pkg/System.IO.Packaging.pkgproj
+++ b/src/libraries/System.IO.Packaging/pkg/System.IO.Packaging.pkgproj
@@ -1,13 +1,11 @@
-
+
-
net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)
-
\ No newline at end of file
diff --git a/src/libraries/System.IO.Packaging/ref/System.IO.Packaging.csproj b/src/libraries/System.IO.Packaging/ref/System.IO.Packaging.csproj
index 3acede683331de5386698ca81ab3813521b93dee..28f429398b444aa2de33b1d56f8e75480a494e92 100644
--- a/src/libraries/System.IO.Packaging/ref/System.IO.Packaging.csproj
+++ b/src/libraries/System.IO.Packaging/ref/System.IO.Packaging.csproj
@@ -1,4 +1,4 @@
-
+
@@ -11,4 +11,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.Packaging/src/Configurations.props b/src/libraries/System.IO.Packaging/src/Configurations.props
index 24e575d57f008def11ea01de6d0e7d44557642fb..f9df021aefd9ab84f98c619d263a00909c6cb3ae 100644
--- a/src/libraries/System.IO.Packaging/src/Configurations.props
+++ b/src/libraries/System.IO.Packaging/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard1.3;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.Packaging/tests/Configurations.props b/src/libraries/System.IO.Packaging/tests/Configurations.props
index f0ebe53119ec712315cfea5b151d5f0d754744f8..c3266e1e9362243b5723032465bcc7a62ae720ce 100644
--- a/src/libraries/System.IO.Packaging/tests/Configurations.props
+++ b/src/libraries/System.IO.Packaging/tests/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard1.3;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.Packaging/tests/System.IO.Packaging.Tests.builds b/src/libraries/System.IO.Packaging/tests/System.IO.Packaging.Tests.builds
index dc267e1f27365f43b0a2ba245f4691ed84eb9ef7..0e474eb421d3ae9aac5ccac1c7f75c11def83d9d 100644
--- a/src/libraries/System.IO.Packaging/tests/System.IO.Packaging.Tests.builds
+++ b/src/libraries/System.IO.Packaging/tests/System.IO.Packaging.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.IO.Packaging/tests/System.IO.Packaging.Tests.csproj b/src/libraries/System.IO.Packaging/tests/System.IO.Packaging.Tests.csproj
index b513b747b2a9a4f729ff7cc42ff6d933ae4818b0..fc5a51d0386e40a7ca6870f501b99f2145b8c12d 100644
--- a/src/libraries/System.IO.Packaging/tests/System.IO.Packaging.Tests.csproj
+++ b/src/libraries/System.IO.Packaging/tests/System.IO.Packaging.Tests.csproj
@@ -1,4 +1,4 @@
-
+
@@ -13,4 +13,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.Pipes.AccessControl/pkg/System.IO.Pipes.AccessControl.builds b/src/libraries/System.IO.Pipes.AccessControl/pkg/System.IO.Pipes.AccessControl.builds
index 83cff72b1c704c7cda58ecd6ac039db69470453e..2915cd9ef901aa3cfa4209e01a8d220e4bb8ff47 100644
--- a/src/libraries/System.IO.Pipes.AccessControl/pkg/System.IO.Pipes.AccessControl.builds
+++ b/src/libraries/System.IO.Pipes.AccessControl/pkg/System.IO.Pipes.AccessControl.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
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 7c13ffc98ba5b181348beb5f1e767fa7bee8ea54..b3474ef24a096164fba6ccde424c818cbbe240eb 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,17 +1,14 @@
-
+
-
net46;netcoreapp1.0
-
win
-
\ No newline at end of file
diff --git a/src/libraries/System.IO.Pipes.AccessControl/ref/System.IO.Pipes.AccessControl.csproj b/src/libraries/System.IO.Pipes.AccessControl/ref/System.IO.Pipes.AccessControl.csproj
index db47a219ee7cf5f59a48d6845427687c2c8bf82d..7dbcdd0d4d063ec203dfdbd8910f37420bf0edf6 100644
--- a/src/libraries/System.IO.Pipes.AccessControl/ref/System.IO.Pipes.AccessControl.csproj
+++ b/src/libraries/System.IO.Pipes.AccessControl/ref/System.IO.Pipes.AccessControl.csproj
@@ -1,4 +1,4 @@
-
+
@@ -13,4 +13,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.Pipes.AccessControl/src/Configurations.props b/src/libraries/System.IO.Pipes.AccessControl/src/Configurations.props
index a6c74d0e580323818caeda4f9796888bd7d569fd..437e6acc34bd512623ac7187b99d13d100213f25 100644
--- a/src/libraries/System.IO.Pipes.AccessControl/src/Configurations.props
+++ b/src/libraries/System.IO.Pipes.AccessControl/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -7,4 +7,4 @@
netstandard1.3-Unix;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.Pipes.AccessControl/tests/Configurations.props b/src/libraries/System.IO.Pipes.AccessControl/tests/Configurations.props
index 5d77dc616e23f0285c9cc66f180261bfa44e69c4..5f482b878bc4a4b91da33a6a7c4906082909ec30 100644
--- a/src/libraries/System.IO.Pipes.AccessControl/tests/Configurations.props
+++ b/src/libraries/System.IO.Pipes.AccessControl/tests/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard1.3-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.Pipes.AccessControl/tests/System.IO.Pipes.AccessControl.Tests.builds b/src/libraries/System.IO.Pipes.AccessControl/tests/System.IO.Pipes.AccessControl.Tests.builds
index 99ce057adb0e6d059a8ea247a9cc2b704917b70a..304eb6d556b22ad9b5b0fc1c8c3b214fd2ffdb9b 100644
--- a/src/libraries/System.IO.Pipes.AccessControl/tests/System.IO.Pipes.AccessControl.Tests.builds
+++ b/src/libraries/System.IO.Pipes.AccessControl/tests/System.IO.Pipes.AccessControl.Tests.builds
@@ -1,10 +1,10 @@
-
+
Windows_NT
- netcoreapp1.1;netcoreapp1.0;net46
+ netcoreapp;netcoreapp1.0;net46
diff --git a/src/libraries/System.IO.Pipes/pkg/System.IO.Pipes.builds b/src/libraries/System.IO.Pipes/pkg/System.IO.Pipes.builds
index 446c807280311f35247f2eef9c4bd0af906e78c9..45bcfd664d230845fe0cd10cb2de439986a01a5b 100644
--- a/src/libraries/System.IO.Pipes/pkg/System.IO.Pipes.builds
+++ b/src/libraries/System.IO.Pipes/pkg/System.IO.Pipes.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.Pipes/pkg/System.IO.Pipes.pkgproj b/src/libraries/System.IO.Pipes/pkg/System.IO.Pipes.pkgproj
index b4cb100f4615d0df7485a031394f1be70830bcd3..64d73d03e398e0deb3dad9a98e8125c738a744a3 100644
--- a/src/libraries/System.IO.Pipes/pkg/System.IO.Pipes.pkgproj
+++ b/src/libraries/System.IO.Pipes/pkg/System.IO.Pipes.pkgproj
@@ -1,17 +1,14 @@
-
+
-
- net463;netcoreapp1.1
+ net463;netcoreapp2.0
-
win7
-
\ No newline at end of file
diff --git a/src/libraries/System.IO.Pipes/ref/System.IO.Pipes.csproj b/src/libraries/System.IO.Pipes/ref/System.IO.Pipes.csproj
index 0cb825bf3fb0649367cb08ca1c780fbe78250652..678d2da542464534d144f24dbe9e6409fd6fe41c 100644
--- a/src/libraries/System.IO.Pipes/ref/System.IO.Pipes.csproj
+++ b/src/libraries/System.IO.Pipes/ref/System.IO.Pipes.csproj
@@ -1,4 +1,4 @@
-
+
@@ -13,4 +13,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.Pipes/src/Configurations.props b/src/libraries/System.IO.Pipes/src/Configurations.props
index 3bb6330d9e73da4e4998b3dcba9a05936bf49b7e..4701fcd7729002100465c5249f5ddfe14f92bedd 100644
--- a/src/libraries/System.IO.Pipes/src/Configurations.props
+++ b/src/libraries/System.IO.Pipes/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -7,4 +7,4 @@
net463-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.Pipes/tests/Configurations.props b/src/libraries/System.IO.Pipes/tests/Configurations.props
index 981075fcc557f85d80b9ef41c767e86ae0392478..fa9e1005a0a90d40a40f303f8ba07aac1c35ad19 100644
--- a/src/libraries/System.IO.Pipes/tests/Configurations.props
+++ b/src/libraries/System.IO.Pipes/tests/Configurations.props
@@ -1,11 +1,11 @@
-
+
netstandard1.3-Unix;
netstandard1.3-Windows_NT;
- netstandard1.7-Unix;
- netstandard1.7-Windows_NT;
+ netstandard-Unix;
+ netstandard-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.Pipes/tests/Performance/System.IO.Pipes.Performance.Tests.csproj b/src/libraries/System.IO.Pipes/tests/Performance/System.IO.Pipes.Performance.Tests.csproj
index 8815dc6eac6b72176395bf76df94823e781bd670..82c0730b8827b9f0e87a444de0ad8f052da32e7a 100644
--- a/src/libraries/System.IO.Pipes/tests/Performance/System.IO.Pipes.Performance.Tests.csproj
+++ b/src/libraries/System.IO.Pipes/tests/Performance/System.IO.Pipes.Performance.Tests.csproj
@@ -1,4 +1,4 @@
-
+
Windows_Debug
@@ -28,4 +28,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.Pipes/tests/System.IO.Pipes.Tests.builds b/src/libraries/System.IO.Pipes/tests/System.IO.Pipes.Tests.builds
index c1b89c196d729642cb2472834fe32ea853b93e15..6b5ed137ed9376b09c49cb25ac995a8bdcf41b8e 100644
--- a/src/libraries/System.IO.Pipes/tests/System.IO.Pipes.Tests.builds
+++ b/src/libraries/System.IO.Pipes/tests/System.IO.Pipes.Tests.builds
@@ -1,4 +1,4 @@
-
+
@@ -10,7 +10,7 @@
netstandard1.3
- Unix
+ Unix
netcoreapp1.0
diff --git a/src/libraries/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj b/src/libraries/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj
index c644622a0baa88846ed70da2150901e3f9b8353f..ddb4d6f088d06c431040ff1eae33e5108f88ba02 100644
--- a/src/libraries/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj
+++ b/src/libraries/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj
@@ -1,4 +1,4 @@
-
+
@@ -55,4 +55,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.UnmanagedMemoryStream/pkg/System.IO.UnmanagedMemoryStream.builds b/src/libraries/System.IO.UnmanagedMemoryStream/pkg/System.IO.UnmanagedMemoryStream.builds
index abd8532d3abf6dfd810cc3dd50f9233fedd61043..41dfab798c7dcc9f09f4f2432331ac89ba450ab1 100644
--- a/src/libraries/System.IO.UnmanagedMemoryStream/pkg/System.IO.UnmanagedMemoryStream.builds
+++ b/src/libraries/System.IO.UnmanagedMemoryStream/pkg/System.IO.UnmanagedMemoryStream.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.UnmanagedMemoryStream/pkg/System.IO.UnmanagedMemoryStream.pkgproj b/src/libraries/System.IO.UnmanagedMemoryStream/pkg/System.IO.UnmanagedMemoryStream.pkgproj
index 37c2aa1ec847ea825110c0b83dda9809d3d562c6..562f3f4894327b8848aa61fd2f2f594b813d562d 100644
--- a/src/libraries/System.IO.UnmanagedMemoryStream/pkg/System.IO.UnmanagedMemoryStream.pkgproj
+++ b/src/libraries/System.IO.UnmanagedMemoryStream/pkg/System.IO.UnmanagedMemoryStream.pkgproj
@@ -1,9 +1,9 @@
-
+
- net463;netcoreapp1.1;$(AllXamarinFrameworks)
+ net463;netcoreapp2.0;$(AllXamarinFrameworks)
@@ -16,4 +16,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.UnmanagedMemoryStream/ref/System.IO.UnmanagedMemoryStream.csproj b/src/libraries/System.IO.UnmanagedMemoryStream/ref/System.IO.UnmanagedMemoryStream.csproj
index 2c4999b05c0741c9854229b0ab31b3c670056190..57fc44748c72bde3b427b10874859b3bd7da535a 100644
--- a/src/libraries/System.IO.UnmanagedMemoryStream/ref/System.IO.UnmanagedMemoryStream.csproj
+++ b/src/libraries/System.IO.UnmanagedMemoryStream/ref/System.IO.UnmanagedMemoryStream.csproj
@@ -1,4 +1,4 @@
-
+
@@ -12,4 +12,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.UnmanagedMemoryStream/src/Configurations.props b/src/libraries/System.IO.UnmanagedMemoryStream/src/Configurations.props
index 9c336c0be9e52171e2fecf14214e3373be07177d..dc837f915219bcf7ff5c38f67e01c45d5b976485 100644
--- a/src/libraries/System.IO.UnmanagedMemoryStream/src/Configurations.props
+++ b/src/libraries/System.IO.UnmanagedMemoryStream/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.UnmanagedMemoryStream/tests/Configurations.props b/src/libraries/System.IO.UnmanagedMemoryStream/tests/Configurations.props
index 512c938bad5364c677a3f4d9f647f1ade8c14aea..b2db637110616a495d303924e9aaf8b800db4821 100644
--- a/src/libraries/System.IO.UnmanagedMemoryStream/tests/Configurations.props
+++ b/src/libraries/System.IO.UnmanagedMemoryStream/tests/Configurations.props
@@ -1,9 +1,9 @@
-
+
netstandard1.3;
- netstandard1.7;
+ netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO.UnmanagedMemoryStream/tests/System.IO.UnmanagedMemoryStream.Tests.builds b/src/libraries/System.IO.UnmanagedMemoryStream/tests/System.IO.UnmanagedMemoryStream.Tests.builds
index bc00aab3b0281c2ccb65d76bf902474c16f0459b..2f135a37b42cfcb7c5243e1b12e3893509297540 100644
--- a/src/libraries/System.IO.UnmanagedMemoryStream/tests/System.IO.UnmanagedMemoryStream.Tests.builds
+++ b/src/libraries/System.IO.UnmanagedMemoryStream/tests/System.IO.UnmanagedMemoryStream.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.IO.UnmanagedMemoryStream/tests/System.IO.UnmanagedMemoryStream.Tests.csproj b/src/libraries/System.IO.UnmanagedMemoryStream/tests/System.IO.UnmanagedMemoryStream.Tests.csproj
index 5723aa39aaa18bb69c26e71808547848c82ad3a7..6123f0487f550b88cfcbe492bde9439e3ea1c8b8 100644
--- a/src/libraries/System.IO.UnmanagedMemoryStream/tests/System.IO.UnmanagedMemoryStream.Tests.csproj
+++ b/src/libraries/System.IO.UnmanagedMemoryStream/tests/System.IO.UnmanagedMemoryStream.Tests.csproj
@@ -7,10 +7,10 @@
-
+
-
+
@@ -28,4 +28,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO/pkg/System.IO.pkgproj b/src/libraries/System.IO/pkg/System.IO.pkgproj
index ef90b8f1b0700f961622ab269e9b0891389eefab..63fc3ade912772b7973448f42aaa0e647b9bdcb9 100644
--- a/src/libraries/System.IO/pkg/System.IO.pkgproj
+++ b/src/libraries/System.IO/pkg/System.IO.pkgproj
@@ -3,7 +3,7 @@
- net461;netcoreapp1.1;uap10.1;$(AllXamarinFrameworks)
+ net461;netcoreapp2.0;uap10.1;$(AllXamarinFrameworks)
net461
@@ -29,4 +29,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO/ref/System.IO.csproj b/src/libraries/System.IO/ref/System.IO.csproj
index 7d1e17a96cfc6c9de3733139a38dfb0d1d89ab4c..ab0801cc863777c6f92e3d77515aaa9dd6ff4d33 100644
--- a/src/libraries/System.IO/ref/System.IO.csproj
+++ b/src/libraries/System.IO/ref/System.IO.csproj
@@ -1,4 +1,4 @@
-
+
@@ -10,4 +10,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO/src/Configurations.props b/src/libraries/System.IO/src/Configurations.props
index d561a2dc295c35f9f719b4173391dfffa807c143..cf22127dc5bb96c54e21ebe714d204852a1dce65 100644
--- a/src/libraries/System.IO/src/Configurations.props
+++ b/src/libraries/System.IO/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -7,4 +7,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO/src/System.IO.csproj b/src/libraries/System.IO/src/System.IO.csproj
index 2888cf81827a508abeef542cc9e190f23a90c950..4b80349b46861a481dfe8ff768d919e111d72025 100644
--- a/src/libraries/System.IO/src/System.IO.csproj
+++ b/src/libraries/System.IO/src/System.IO.csproj
@@ -5,7 +5,7 @@
System.IO
{07390899-C8F6-4e83-A3A9-6867B8CB46A0}
true
- netstandard1.7;uap10.1
+ netstandard;uap10.1
$(DefineConstants);netstandard17
CS0436
diff --git a/src/libraries/System.IO/tests/Configurations.props b/src/libraries/System.IO/tests/Configurations.props
index c5ec56bec2a94a8a8efef08d1a3d7490d84cfa80..793828d6a3fe9109593ceebc1818f0bd27682b90 100644
--- a/src/libraries/System.IO/tests/Configurations.props
+++ b/src/libraries/System.IO/tests/Configurations.props
@@ -1,10 +1,10 @@
-
+
netstandard1.5;
- netcoreapp1.1;
- netstandard1.7;
+ netcoreapp;
+ netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.IO/tests/System.IO.Tests.builds b/src/libraries/System.IO/tests/System.IO.Tests.builds
index 2a55ee1a1825e6135382a323dc40d43d387db970..288f1cdfc1ae393f0c67ffff702147508e5ac3d4 100644
--- a/src/libraries/System.IO/tests/System.IO.Tests.builds
+++ b/src/libraries/System.IO/tests/System.IO.Tests.builds
@@ -1,4 +1,4 @@
-
+
@@ -8,8 +8,8 @@
netcoreapp1.0
- netcoreapp1.1
- netcoreapp1.1
+ netcoreapp
+ netcoreapp
Windows_NT
diff --git a/src/libraries/System.IO/tests/System.IO.Tests.csproj b/src/libraries/System.IO/tests/System.IO.Tests.csproj
index cdf89a35375f0884d8af36f737ecbe2834098aad..867f9a87455a0adf6076b4226ae208dbe5031d76 100644
--- a/src/libraries/System.IO/tests/System.IO.Tests.csproj
+++ b/src/libraries/System.IO/tests/System.IO.Tests.csproj
@@ -1,4 +1,4 @@
-
+
@@ -9,8 +9,8 @@
-
-
+
+
@@ -59,4 +59,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Json/pkg/System.Json.builds b/src/libraries/System.Json/pkg/System.Json.builds
index db5f4bcceb2d5e32f623c5fd2e52096d8d3a310b..8df6176170f2fe690182ab8511ba6d3f373b02f0 100644
--- a/src/libraries/System.Json/pkg/System.Json.builds
+++ b/src/libraries/System.Json/pkg/System.Json.builds
@@ -1,8 +1,8 @@
-
+
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Json/pkg/System.Json.pkgproj b/src/libraries/System.Json/pkg/System.Json.pkgproj
index d90ac9e0e0579cd51bb013a6543b43f26a726c52..1ad70993f5fd1ebd60dc4979ea18c236fb2a1e2b 100644
--- a/src/libraries/System.Json/pkg/System.Json.pkgproj
+++ b/src/libraries/System.Json/pkg/System.Json.pkgproj
@@ -5,7 +5,6 @@
net45;netcore45;netcoreapp1.0;wp8;wpa81;$(AllXamarinFrameworks)
-
true
@@ -27,4 +26,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Json/src/Configurations.props b/src/libraries/System.Json/src/Configurations.props
index 2ec0365c0d50ed330862506ea44da4fccb7fd0a9..66fc3409d36ab9b1606b29eb2f04491b1eb10c92 100644
--- a/src/libraries/System.Json/src/Configurations.props
+++ b/src/libraries/System.Json/src/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard1.0;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Json/tests/Configurations.props b/src/libraries/System.Json/tests/Configurations.props
index ec110beba61090944d3c69096317d33c62278eb0..fa32899de2a47fc96ccdf5fc1f83edc154b03d33 100644
--- a/src/libraries/System.Json/tests/Configurations.props
+++ b/src/libraries/System.Json/tests/Configurations.props
@@ -1,8 +1,8 @@
-
+
netcoreapp1.0;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Json/tests/System.Json.Tests.builds b/src/libraries/System.Json/tests/System.Json.Tests.builds
index 023f49b19defd8585a6bdb3b2346d675d760e238..ade21f2f77219a671bb12d44d9e75e819df12d0d 100644
--- a/src/libraries/System.Json/tests/System.Json.Tests.builds
+++ b/src/libraries/System.Json/tests/System.Json.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Linq.Expressions/pkg/System.Linq.Expressions.builds b/src/libraries/System.Linq.Expressions/pkg/System.Linq.Expressions.builds
index 1e48cc34fd80b19b8e91029cbe0f2bb63e4d7242..b2b6789f03f8e0bf12977451d883180616775442 100644
--- a/src/libraries/System.Linq.Expressions/pkg/System.Linq.Expressions.builds
+++ b/src/libraries/System.Linq.Expressions/pkg/System.Linq.Expressions.builds
@@ -1,8 +1,8 @@
-
+
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Linq.Expressions/pkg/System.Linq.Expressions.pkgproj b/src/libraries/System.Linq.Expressions/pkg/System.Linq.Expressions.pkgproj
index 5db552454f14dba78ef68fa65ed8ea1c8798749c..33abbf2038cf4e80ebdc068b278d1f9ece1addd4 100644
--- a/src/libraries/System.Linq.Expressions/pkg/System.Linq.Expressions.pkgproj
+++ b/src/libraries/System.Linq.Expressions/pkg/System.Linq.Expressions.pkgproj
@@ -6,7 +6,7 @@
- net461;netcoreapp1.1;$(AllXamarinFrameworks)
+ net461;netcoreapp2.0;$(AllXamarinFrameworks)
diff --git a/src/libraries/System.Linq.Expressions/ref/4.1.0/System.Linq.Expressions.depproj b/src/libraries/System.Linq.Expressions/ref/4.1.0/System.Linq.Expressions.depproj
index a26dc33038ddeca4a1b7fccce8b975a7e56263c7..eb9b218fc48876b7e79ca31670ee37778d8f40ae 100644
--- a/src/libraries/System.Linq.Expressions/ref/4.1.0/System.Linq.Expressions.depproj
+++ b/src/libraries/System.Linq.Expressions/ref/4.1.0/System.Linq.Expressions.depproj
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Linq.Expressions/ref/System.Linq.Expressions.csproj b/src/libraries/System.Linq.Expressions/ref/System.Linq.Expressions.csproj
index d74a38084e728294a7fa52ccf6f384ddbd663e14..cc68e19fc2899a7e7a74873e1ccaebb15d3d8208 100644
--- a/src/libraries/System.Linq.Expressions/ref/System.Linq.Expressions.csproj
+++ b/src/libraries/System.Linq.Expressions/ref/System.Linq.Expressions.csproj
@@ -1,4 +1,4 @@
-
+
@@ -9,4 +9,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Linq.Expressions/src/Configurations.props b/src/libraries/System.Linq.Expressions/src/Configurations.props
index 53b62c64fea2475e524eb32a20b028ea109d4d41..bcfec4bbde61fa2877a42ca2e87056c258cd6c09 100644
--- a/src/libraries/System.Linq.Expressions/src/Configurations.props
+++ b/src/libraries/System.Linq.Expressions/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Linq.Expressions/tests/Configurations.props b/src/libraries/System.Linq.Expressions/tests/Configurations.props
index 98f53209d45a12360d0bbf7cf031b29ff556fc57..c398e42e899425ce70e3a9884633835ab6fcc66e 100644
--- a/src/libraries/System.Linq.Expressions/tests/Configurations.props
+++ b/src/libraries/System.Linq.Expressions/tests/Configurations.props
@@ -1,8 +1,8 @@
-
+
- netstandard1.7;
+ netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.builds b/src/libraries/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.builds
index 6a3893eba6dae543fe59ab54c034ce48925a0cb2..09ad7782919f454d7732d66e8ceb8e0916bf7e47 100644
--- a/src/libraries/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.builds
+++ b/src/libraries/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj b/src/libraries/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj
index 4501155e16a0b53dea31fe5227b4f5ad4376e007..b515719c5c2d6e5e10c454987c6b83c08ef127ae 100644
--- a/src/libraries/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj
+++ b/src/libraries/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj
@@ -18,12 +18,10 @@
-
-
diff --git a/src/libraries/System.Linq.Parallel/pkg/System.Linq.Parallel.builds b/src/libraries/System.Linq.Parallel/pkg/System.Linq.Parallel.builds
index 72c77ebbbd36370b44ceb633f985864e974adeaa..a0b13479c43bcefed9a4bc04f25279b8c17874e9 100644
--- a/src/libraries/System.Linq.Parallel/pkg/System.Linq.Parallel.builds
+++ b/src/libraries/System.Linq.Parallel/pkg/System.Linq.Parallel.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Linq.Parallel/pkg/System.Linq.Parallel.pkgproj b/src/libraries/System.Linq.Parallel/pkg/System.Linq.Parallel.pkgproj
index 873276af641bdda4a11f786f3c7eb2e3aff8e888..c2a0b12e4cb5eb9d252633f79f57001d226b2a3d 100644
--- a/src/libraries/System.Linq.Parallel/pkg/System.Linq.Parallel.pkgproj
+++ b/src/libraries/System.Linq.Parallel/pkg/System.Linq.Parallel.pkgproj
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Linq.Parallel/ref/System.Linq.Parallel.csproj b/src/libraries/System.Linq.Parallel/ref/System.Linq.Parallel.csproj
index 145f350afde7a5a5e7a1124e9726bbaaa1a27e23..66631e5a03d58f6924a5581119fee5d30f9cc974 100644
--- a/src/libraries/System.Linq.Parallel/ref/System.Linq.Parallel.csproj
+++ b/src/libraries/System.Linq.Parallel/ref/System.Linq.Parallel.csproj
@@ -1,4 +1,4 @@
-
+
@@ -12,4 +12,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Linq.Parallel/src/Configurations.props b/src/libraries/System.Linq.Parallel/src/Configurations.props
index f0ebe53119ec712315cfea5b151d5f0d754744f8..c3266e1e9362243b5723032465bcc7a62ae720ce 100644
--- a/src/libraries/System.Linq.Parallel/src/Configurations.props
+++ b/src/libraries/System.Linq.Parallel/src/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard1.3;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Linq.Parallel/tests/Configurations.props b/src/libraries/System.Linq.Parallel/tests/Configurations.props
index 3007f723e5dac956f14a4eb0a3cacfdbda59b445..a5a130bbdb0bed418d56eb3f5c2cf196fbd92ff1 100644
--- a/src/libraries/System.Linq.Parallel/tests/Configurations.props
+++ b/src/libraries/System.Linq.Parallel/tests/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard1.6;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Linq.Parallel/tests/System.Linq.Parallel.Tests.builds b/src/libraries/System.Linq.Parallel/tests/System.Linq.Parallel.Tests.builds
index f6a25ef2319df2acf91146804671dffdf4035474..ecf9236d38316e41f5e8d7c70cdbfbff5c3688bb 100644
--- a/src/libraries/System.Linq.Parallel/tests/System.Linq.Parallel.Tests.builds
+++ b/src/libraries/System.Linq.Parallel/tests/System.Linq.Parallel.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Linq.Parallel/tests/System.Linq.Parallel.Tests.csproj b/src/libraries/System.Linq.Parallel/tests/System.Linq.Parallel.Tests.csproj
index 9ee1796304aa17cddc408a554b052991fb85f6fe..e2170c334effe39d276b702a4402afb8171cb501 100644
--- a/src/libraries/System.Linq.Parallel/tests/System.Linq.Parallel.Tests.csproj
+++ b/src/libraries/System.Linq.Parallel/tests/System.Linq.Parallel.Tests.csproj
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Linq.Queryable/pkg/System.Linq.Queryable.builds b/src/libraries/System.Linq.Queryable/pkg/System.Linq.Queryable.builds
index 54673d9d4619b0fd22ca84cb756afe0bf5dfa38c..006639bf9332be7d28b89446bb97dbe08b0a5c2d 100644
--- a/src/libraries/System.Linq.Queryable/pkg/System.Linq.Queryable.builds
+++ b/src/libraries/System.Linq.Queryable/pkg/System.Linq.Queryable.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Linq.Queryable/pkg/System.Linq.Queryable.pkgproj b/src/libraries/System.Linq.Queryable/pkg/System.Linq.Queryable.pkgproj
index 8f46b65481d6ed89fef5396307696a8aa61820f2..fe36984b9b0337e6f1c528e056c51cd4acbde02c 100644
--- a/src/libraries/System.Linq.Queryable/pkg/System.Linq.Queryable.pkgproj
+++ b/src/libraries/System.Linq.Queryable/pkg/System.Linq.Queryable.pkgproj
@@ -1,9 +1,9 @@
-
+
- net463;netcoreapp1.1;$(AllXamarinFrameworks)
+ net463;netcoreapp2.0;$(AllXamarinFrameworks)
diff --git a/src/libraries/System.Linq.Queryable/ref/System.Linq.Queryable.csproj b/src/libraries/System.Linq.Queryable/ref/System.Linq.Queryable.csproj
index 5f458637c27d75ac7b8b0584efe8a8cd0adc8b7d..7873ee6d0da98925eda564dfc83d1816ce2bcfa4 100644
--- a/src/libraries/System.Linq.Queryable/ref/System.Linq.Queryable.csproj
+++ b/src/libraries/System.Linq.Queryable/ref/System.Linq.Queryable.csproj
@@ -1,4 +1,4 @@
-
+
@@ -10,4 +10,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Linq.Queryable/src/Configurations.props b/src/libraries/System.Linq.Queryable/src/Configurations.props
index fc9ef9822c01e3840af50ced2f25bdc2f5349eca..c398e42e899425ce70e3a9884633835ab6fcc66e 100644
--- a/src/libraries/System.Linq.Queryable/src/Configurations.props
+++ b/src/libraries/System.Linq.Queryable/src/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Linq.Queryable/tests/Configurations.props b/src/libraries/System.Linq.Queryable/tests/Configurations.props
index 98f53209d45a12360d0bbf7cf031b29ff556fc57..c398e42e899425ce70e3a9884633835ab6fcc66e 100644
--- a/src/libraries/System.Linq.Queryable/tests/Configurations.props
+++ b/src/libraries/System.Linq.Queryable/tests/Configurations.props
@@ -1,8 +1,8 @@
-
+
- netstandard1.7;
+ netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Linq.Queryable/tests/System.Linq.Queryable.Tests.builds b/src/libraries/System.Linq.Queryable/tests/System.Linq.Queryable.Tests.builds
index 33e810ff76a5ad78a01ef15af02c85108f4b78c4..89e1e125d6545b403dad44ba44a09c208b4b1b69 100644
--- a/src/libraries/System.Linq.Queryable/tests/System.Linq.Queryable.Tests.builds
+++ b/src/libraries/System.Linq.Queryable/tests/System.Linq.Queryable.Tests.builds
@@ -1,11 +1,11 @@
-
+
Windows_NT
- net463
+ net463
Windows_NT
diff --git a/src/libraries/System.Linq.Queryable/tests/System.Linq.Queryable.Tests.csproj b/src/libraries/System.Linq.Queryable/tests/System.Linq.Queryable.Tests.csproj
index 77b11bb87331b21c99442de979d3a560174bf455..17b3977ad673540f7921054d748c10135ba067fb 100644
--- a/src/libraries/System.Linq.Queryable/tests/System.Linq.Queryable.Tests.csproj
+++ b/src/libraries/System.Linq.Queryable/tests/System.Linq.Queryable.Tests.csproj
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Linq/pkg/System.Linq.builds b/src/libraries/System.Linq/pkg/System.Linq.builds
index ba7db2adf679d9fcd0a140e7643511fca53c891f..ef561797bb2b068c9f921008a99f8cd173055178 100644
--- a/src/libraries/System.Linq/pkg/System.Linq.builds
+++ b/src/libraries/System.Linq/pkg/System.Linq.builds
@@ -5,4 +5,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Linq/pkg/System.Linq.pkgproj b/src/libraries/System.Linq/pkg/System.Linq.pkgproj
index eb6fcfbcc3ff304d9f6808f661260fe619eadd59..69fcdf81e2832fa65f7a1884b151f397bcf10fbc 100644
--- a/src/libraries/System.Linq/pkg/System.Linq.pkgproj
+++ b/src/libraries/System.Linq/pkg/System.Linq.pkgproj
@@ -25,4 +25,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Linq/ref/Configurations.props b/src/libraries/System.Linq/ref/Configurations.props
index ea9ea79f787f98f2eb7eacf21b28e53742aa9228..8b803e0772f2c937b70d75006295c7d12a140a32 100644
--- a/src/libraries/System.Linq/ref/Configurations.props
+++ b/src/libraries/System.Linq/ref/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Linq/ref/System.Linq.builds b/src/libraries/System.Linq/ref/System.Linq.builds
index 9d0b64519777c286d003c42dfdd71dbdd726a238..bc894e5509497ff8c89d017567f969f2e82b7951 100644
--- a/src/libraries/System.Linq/ref/System.Linq.builds
+++ b/src/libraries/System.Linq/ref/System.Linq.builds
@@ -4,8 +4,8 @@
- netcoreapp1.1
+ netcoreapp
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Linq/ref/System.Linq.csproj b/src/libraries/System.Linq/ref/System.Linq.csproj
index 78f9a07458f52e82d0b92f2df8e106ed509b195d..38ef8265854e2ec4d1a62dc4b915aeee90c1efb7 100644
--- a/src/libraries/System.Linq/ref/System.Linq.csproj
+++ b/src/libraries/System.Linq/ref/System.Linq.csproj
@@ -1,4 +1,4 @@
-
+
@@ -12,4 +12,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Linq/src/Configurations.props b/src/libraries/System.Linq/src/Configurations.props
index a502feeae3e2249440aad819188a5e2db00ce35b..95f6174dda1eec1e198e93981b5f4398a4903dc7 100644
--- a/src/libraries/System.Linq/src/Configurations.props
+++ b/src/libraries/System.Linq/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard1.6;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Linq/tests/Configurations.props b/src/libraries/System.Linq/tests/Configurations.props
index 094b5230ab00fa89ccbb282b356c75e2a029a1ca..236495ef503e0b899956e33e6b93ac206ceab5b7 100644
--- a/src/libraries/System.Linq/tests/Configurations.props
+++ b/src/libraries/System.Linq/tests/Configurations.props
@@ -1,9 +1,9 @@
-
+
- netcoreapp1.1;
+ netcoreapp;
netstandard1.6;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Linq/tests/Performance/System.Linq.Performance.Tests.csproj b/src/libraries/System.Linq/tests/Performance/System.Linq.Performance.Tests.csproj
index f8d2f9c73da26748a9108ca109cc45ac4407c2e7..f1ea0c1fadfe8b25c918593956e303a8ee623e73 100644
--- a/src/libraries/System.Linq/tests/Performance/System.Linq.Performance.Tests.csproj
+++ b/src/libraries/System.Linq/tests/Performance/System.Linq.Performance.Tests.csproj
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Linq/tests/System.Linq.Tests.builds b/src/libraries/System.Linq/tests/System.Linq.Tests.builds
index dfdebd2eb940251cad10ec401d129cac761e5c1c..e3f5aa4aafcd13c5dfe12d266295cf04806a9d29 100644
--- a/src/libraries/System.Linq/tests/System.Linq.Tests.builds
+++ b/src/libraries/System.Linq/tests/System.Linq.Tests.builds
@@ -1,11 +1,11 @@
-
+
- netcoreapp1.1
- netcoreapp1.1
+ netcoreapp
+ netcoreapp
Windows_NT
@@ -14,4 +14,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Linq/tests/System.Linq.Tests.csproj b/src/libraries/System.Linq/tests/System.Linq.Tests.csproj
index d96c2d68a52790019779b4e528aab0987dda3715..ee54f5715c62df2d66fa41ace5f94243d6e9288e 100644
--- a/src/libraries/System.Linq/tests/System.Linq.Tests.csproj
+++ b/src/libraries/System.Linq/tests/System.Linq.Tests.csproj
@@ -76,4 +76,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Memory/pkg/System.Memory.builds b/src/libraries/System.Memory/pkg/System.Memory.builds
index ad45fd50758ba75c567c1ee94da55374cb5623ba..a7fa40ce3a808eed02f682a6eb9ba9a93715c749 100644
--- a/src/libraries/System.Memory/pkg/System.Memory.builds
+++ b/src/libraries/System.Memory/pkg/System.Memory.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Memory/pkg/System.Memory.pkgproj b/src/libraries/System.Memory/pkg/System.Memory.pkgproj
index b240b0eb9672aa5e04776a4386ba8fd124590a74..7fe6548444f95fd9aa49f1f07381e8ff29b20b47 100644
--- a/src/libraries/System.Memory/pkg/System.Memory.pkgproj
+++ b/src/libraries/System.Memory/pkg/System.Memory.pkgproj
@@ -9,4 +9,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Memory/ref/System.Memory.builds b/src/libraries/System.Memory/ref/System.Memory.builds
index 87b2f7a0539d2089b145cfbfe446a5615941ef53..0c6f508814845f15028928c139321d038cf11336 100644
--- a/src/libraries/System.Memory/ref/System.Memory.builds
+++ b/src/libraries/System.Memory/ref/System.Memory.builds
@@ -1,8 +1,8 @@
-
+
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Memory/ref/System.Memory.csproj b/src/libraries/System.Memory/ref/System.Memory.csproj
index d29e4995203873039e8e20f60eb695dde2ac53ea..609b009e8467b4c0052e364b53f7ffd56c928047 100644
--- a/src/libraries/System.Memory/ref/System.Memory.csproj
+++ b/src/libraries/System.Memory/ref/System.Memory.csproj
@@ -1,10 +1,10 @@
-
+
true
false
- 4.0.0.0
+ 4.0.0.0
{0EF9D369-7097-44F9-BEBA-C32AF5EB4756}
@@ -14,4 +14,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Memory/src/Configurations.props b/src/libraries/System.Memory/src/Configurations.props
index 584c4d47da3f1e6323e63bc7821a67735bcae18b..69dd81db58cf383b7a0ae6d3567ed529be36749f 100644
--- a/src/libraries/System.Memory/src/Configurations.props
+++ b/src/libraries/System.Memory/src/Configurations.props
@@ -1,9 +1,9 @@
-
+
netstandard1.0-Windows_NT;
- netcoreapp1.1-Windows_NT;
+ netcoreapp-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Memory/tests/Configurations.props b/src/libraries/System.Memory/tests/Configurations.props
index 2200b4369a5f3ce622b22ac0b8ff0e32802a56f1..1d8e980ad75771c8f650dcad5adf37e73d4ea0b8 100644
--- a/src/libraries/System.Memory/tests/Configurations.props
+++ b/src/libraries/System.Memory/tests/Configurations.props
@@ -1,9 +1,9 @@
-
+
- netcoreapp1.1-Windows_NT;
+ netcoreapp-Windows_NT;
netcoreapp1.0-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Memory/tests/System.Memory.Tests.builds b/src/libraries/System.Memory/tests/System.Memory.Tests.builds
index c861eb834d771587caa2f3041472a5ddd414dd13..a6d35a92c1edc15c6359d707bae630419ad2fba2 100644
--- a/src/libraries/System.Memory/tests/System.Memory.Tests.builds
+++ b/src/libraries/System.Memory/tests/System.Memory.Tests.builds
@@ -1,4 +1,4 @@
-
+
@@ -15,4 +15,4 @@
-->
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.Http.Rtc/pkg/System.Net.Http.Rtc.builds b/src/libraries/System.Net.Http.Rtc/pkg/System.Net.Http.Rtc.builds
index 801238a9d4cc493852e550b6376eed6850720ff1..c7462f2efe1bb281d37150e142fe0cfe05f36590 100644
--- a/src/libraries/System.Net.Http.Rtc/pkg/System.Net.Http.Rtc.builds
+++ b/src/libraries/System.Net.Http.Rtc/pkg/System.Net.Http.Rtc.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.Http.Rtc/pkg/System.Net.Http.Rtc.pkgproj b/src/libraries/System.Net.Http.Rtc/pkg/System.Net.Http.Rtc.pkgproj
index 17c4dbc3d1b5af5ddae077133facadb62f638914..839bea6026b0041ad60e7513e8782729a4173e28 100644
--- a/src/libraries/System.Net.Http.Rtc/pkg/System.Net.Http.Rtc.pkgproj
+++ b/src/libraries/System.Net.Http.Rtc/pkg/System.Net.Http.Rtc.pkgproj
@@ -1,16 +1,13 @@
-
+
-
netcore45
-
-
+
-
\ No newline at end of file
diff --git a/src/libraries/System.Net.Http.Rtc/ref/System.Net.Http.Rtc.csproj b/src/libraries/System.Net.Http.Rtc/ref/System.Net.Http.Rtc.csproj
index 99ff7e09b7e1db3c0ae630e88bfbefc1955d94bc..a89c7532fe9694a8204a7c8546b1d9e714ca747e 100644
--- a/src/libraries/System.Net.Http.Rtc/ref/System.Net.Http.Rtc.csproj
+++ b/src/libraries/System.Net.Http.Rtc/ref/System.Net.Http.Rtc.csproj
@@ -1,4 +1,4 @@
-
+
@@ -10,4 +10,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.Http.Rtc/src/System.Net.Http.Rtc.builds b/src/libraries/System.Net.Http.Rtc/src/System.Net.Http.Rtc.builds
index cf2567f406ab45dcc5a5ba3f171250dfbcea45de..ffa24bff2479b6d3e67eecffde373f815601da7a 100644
--- a/src/libraries/System.Net.Http.Rtc/src/System.Net.Http.Rtc.builds
+++ b/src/libraries/System.Net.Http.Rtc/src/System.Net.Http.Rtc.builds
@@ -1,4 +1,4 @@
-
+
@@ -8,5 +8,4 @@
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.Http.WinHttpHandler/pkg/System.Net.Http.WinHttpHandler.builds b/src/libraries/System.Net.Http.WinHttpHandler/pkg/System.Net.Http.WinHttpHandler.builds
index 955cc7c7f55569346b979a2f8b257867b6066698..77374ed1f6f319d86bb9b7bcd438cb53f0950864 100644
--- a/src/libraries/System.Net.Http.WinHttpHandler/pkg/System.Net.Http.WinHttpHandler.builds
+++ b/src/libraries/System.Net.Http.WinHttpHandler/pkg/System.Net.Http.WinHttpHandler.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.Http.WinHttpHandler/pkg/System.Net.Http.WinHttpHandler.pkgproj b/src/libraries/System.Net.Http.WinHttpHandler/pkg/System.Net.Http.WinHttpHandler.pkgproj
index 9b17326c19eb5bd6ff21713c0291df7973ff3a13..3a5eae106cdcce1a2ea71929f81e924839f3a350 100644
--- a/src/libraries/System.Net.Http.WinHttpHandler/pkg/System.Net.Http.WinHttpHandler.pkgproj
+++ b/src/libraries/System.Net.Http.WinHttpHandler/pkg/System.Net.Http.WinHttpHandler.pkgproj
@@ -1,17 +1,14 @@
-
+
-
net46;netcoreapp1.0
-
win
-
\ No newline at end of file
diff --git a/src/libraries/System.Net.Http.WinHttpHandler/ref/System.Net.Http.WinHttpHandler.csproj b/src/libraries/System.Net.Http.WinHttpHandler/ref/System.Net.Http.WinHttpHandler.csproj
index 5f1380ee9b230315bc0fbe141eaa67ed1939d372..47f3a981456fd0f959ff6da501d12ef4bcf37340 100644
--- a/src/libraries/System.Net.Http.WinHttpHandler/ref/System.Net.Http.WinHttpHandler.csproj
+++ b/src/libraries/System.Net.Http.WinHttpHandler/ref/System.Net.Http.WinHttpHandler.csproj
@@ -1,4 +1,4 @@
-
+
@@ -12,4 +12,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.Http.WinHttpHandler/src/Configurations.props b/src/libraries/System.Net.Http.WinHttpHandler/src/Configurations.props
index 06bd657a4ba8a2ea8012ddd167dfd3ba21f0ca31..757b994a0007ff2252e0ce99a6027e62bc3dc3f8 100644
--- a/src/libraries/System.Net.Http.WinHttpHandler/src/Configurations.props
+++ b/src/libraries/System.Net.Http.WinHttpHandler/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -7,4 +7,4 @@
net46-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/Configurations.props b/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/Configurations.props
index 5d77dc616e23f0285c9cc66f180261bfa44e69c4..5f482b878bc4a4b91da33a6a7c4906082909ec30 100644
--- a/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/Configurations.props
+++ b/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard1.3-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/System.Net.Http.WinHttpHandler.Functional.Tests.builds b/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/System.Net.Http.WinHttpHandler.Functional.Tests.builds
index 40cb1395618cc91672139f2176fe568a6f380fe5..711853795279f01a7dccfec23714ef1137687060 100644
--- a/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/System.Net.Http.WinHttpHandler.Functional.Tests.builds
+++ b/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/System.Net.Http.WinHttpHandler.Functional.Tests.builds
@@ -1,10 +1,10 @@
-
+
Windows_NT
- netcoreapp1.1;netcoreapp1.0;net46
+ netcoreapp;netcoreapp1.0;net46
diff --git a/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/Configurations.props b/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/Configurations.props
index 5d77dc616e23f0285c9cc66f180261bfa44e69c4..5f482b878bc4a4b91da33a6a7c4906082909ec30 100644
--- a/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/Configurations.props
+++ b/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard1.3-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.builds b/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.builds
index f9b3e0154330782e8051cfa64ebb0a2a69b92c85..b0b935156e4eb5e6cfc74f0f5a9c78a455f5e56e 100644
--- a/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.builds
+++ b/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.builds
@@ -1,10 +1,10 @@
-
+
Windows_NT
- netcoreapp1.1;netcoreapp1.0;net46
+ netcoreapp;netcoreapp1.0;net46
diff --git a/src/libraries/System.Net.Http/pkg/System.Net.Http.builds b/src/libraries/System.Net.Http/pkg/System.Net.Http.builds
index 3a2c20964223bc22b7b73e122391aee254e264c4..91428fe6fe928ee2412d5f1bdc870e847f91720d 100644
--- a/src/libraries/System.Net.Http/pkg/System.Net.Http.builds
+++ b/src/libraries/System.Net.Http/pkg/System.Net.Http.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.Http/pkg/System.Net.Http.pkgproj b/src/libraries/System.Net.Http/pkg/System.Net.Http.pkgproj
index e05dae3f6372d502be99e05f19f3fc256aee8c3d..03553dc198961ca4572fa4bbc37342a1d95690b8 100644
--- a/src/libraries/System.Net.Http/pkg/System.Net.Http.pkgproj
+++ b/src/libraries/System.Net.Http/pkg/System.Net.Http.pkgproj
@@ -3,7 +3,7 @@
- netcoreapp1.1;uap10.1;$(AllXamarinFrameworks)
+ netcoreapp2.0;uap10.1;$(AllXamarinFrameworks)
net46
@@ -43,4 +43,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.Http/ref/System.Net.Http.builds b/src/libraries/System.Net.Http/ref/System.Net.Http.builds
index 5be15f13efe9693aaad657a22c7f91beb0b0b67e..f48b916c5452b2befa8c9e367d7c5441c7e66454 100644
--- a/src/libraries/System.Net.Http/ref/System.Net.Http.builds
+++ b/src/libraries/System.Net.Http/ref/System.Net.Http.builds
@@ -1,4 +1,4 @@
-
+
@@ -10,5 +10,4 @@
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.Http/ref/System.Net.Http.csproj b/src/libraries/System.Net.Http/ref/System.Net.Http.csproj
index 84ad0e1d3bc92dfc10f5d92c7be408c79526e230..bc2429dee6ad21f4a31f3d303b977100fced269f 100644
--- a/src/libraries/System.Net.Http/ref/System.Net.Http.csproj
+++ b/src/libraries/System.Net.Http/ref/System.Net.Http.csproj
@@ -1,4 +1,4 @@
-
+
@@ -16,4 +16,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.Http/src/Configurations.props b/src/libraries/System.Net.Http/src/Configurations.props
index 58bd23111d95cfa7e03a6b0d93fcf4f90c798b8e..be9ff31447c7e0e58177bc6732bd4696974ab5d6 100644
--- a/src/libraries/System.Net.Http/src/Configurations.props
+++ b/src/libraries/System.Net.Http/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -8,4 +8,4 @@
netstandard-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/Configurations.props b/src/libraries/System.Net.Http/tests/FunctionalTests/Configurations.props
index 415c6d276e0ddd1f6b3ed190b20fc247f400e799..9348ce4cb3fa973900d9493d45a787f0785930fc 100644
--- a/src/libraries/System.Net.Http/tests/FunctionalTests/Configurations.props
+++ b/src/libraries/System.Net.Http/tests/FunctionalTests/Configurations.props
@@ -1,10 +1,10 @@
-
+
- netstandard1.7-Windows_NT;
- netstandard1.7-Unix;
+ netstandard-Windows_NT;
+ netstandard-Unix;
netstandard1.3-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.Http/tests/System.Net.Http.Tests.builds b/src/libraries/System.Net.Http/tests/System.Net.Http.Tests.builds
index bac2e654c6e9def15a872b26f7d5feaf2039f779..f6ffe04f50e6168a06247443d6133f3cabb4594b 100644
--- a/src/libraries/System.Net.Http/tests/System.Net.Http.Tests.builds
+++ b/src/libraries/System.Net.Http/tests/System.Net.Http.Tests.builds
@@ -1,4 +1,4 @@
-
+
@@ -7,7 +7,7 @@
Windows_NT
- netcoreapp1.1;net463
+ netcoreapp;net463
netstandard1.3
@@ -19,7 +19,7 @@
Windows_NT
- netcoreapp1.1;net463
+ netcoreapp;net463
netstandard1.3
diff --git a/src/libraries/System.Net.Http/tests/UnitTests/Configurations.props b/src/libraries/System.Net.Http/tests/UnitTests/Configurations.props
index 512c938bad5364c677a3f4d9f647f1ade8c14aea..b2db637110616a495d303924e9aaf8b800db4821 100644
--- a/src/libraries/System.Net.Http/tests/UnitTests/Configurations.props
+++ b/src/libraries/System.Net.Http/tests/UnitTests/Configurations.props
@@ -1,9 +1,9 @@
-
+
netstandard1.3;
- netstandard1.7;
+ netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj b/src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj
index 18e0c73ec5e5b9e8abc8ef9f0c67677c63a0c7cb..bdb8fb4242c467c69a0848b701c938e3f61d1269 100644
--- a/src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj
+++ b/src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj
@@ -343,4 +343,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.HttpListener/pkg/System.Net.HttpListener.builds b/src/libraries/System.Net.HttpListener/pkg/System.Net.HttpListener.builds
index 7a024271acd91fa700d5ad22aeb7c11b7dac1199..ab4c949ea766c03a3e9302e7156128882921b973 100644
--- a/src/libraries/System.Net.HttpListener/pkg/System.Net.HttpListener.builds
+++ b/src/libraries/System.Net.HttpListener/pkg/System.Net.HttpListener.builds
@@ -1,8 +1,8 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.HttpListener/pkg/System.Net.HttpListener.pkgproj b/src/libraries/System.Net.HttpListener/pkg/System.Net.HttpListener.pkgproj
index 800c1149b0315ff6ff1de33732afa075708de2f8..cee3c778745a2a8d8ffa36227235ecffff0fa48c 100644
--- a/src/libraries/System.Net.HttpListener/pkg/System.Net.HttpListener.pkgproj
+++ b/src/libraries/System.Net.HttpListener/pkg/System.Net.HttpListener.pkgproj
@@ -1,13 +1,11 @@
-
+
-
- net461;netcoreapp1.1
+ net461;netcoreapp2.0
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.HttpListener/ref/System.Net.HttpListener.csproj b/src/libraries/System.Net.HttpListener/ref/System.Net.HttpListener.csproj
index 57cfffd632dc430add4ec72b49de66eb50de59cd..57038921edd5bc477e16f4cff021e9cf38c12e05 100644
--- a/src/libraries/System.Net.HttpListener/ref/System.Net.HttpListener.csproj
+++ b/src/libraries/System.Net.HttpListener/ref/System.Net.HttpListener.csproj
@@ -1,4 +1,4 @@
-
+
@@ -19,4 +19,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.HttpListener/src/Configurations.props b/src/libraries/System.Net.HttpListener/src/Configurations.props
index 8e791109830f726635126298523fdce78b77a08a..a85f5eb18a0462f82d87f3419f29c3745bafc38d 100644
--- a/src/libraries/System.Net.HttpListener/src/Configurations.props
+++ b/src/libraries/System.Net.HttpListener/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -7,4 +7,4 @@
net461-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.HttpListener/tests/Configurations.props b/src/libraries/System.Net.HttpListener/tests/Configurations.props
index 98f53209d45a12360d0bbf7cf031b29ff556fc57..c398e42e899425ce70e3a9884633835ab6fcc66e 100644
--- a/src/libraries/System.Net.HttpListener/tests/Configurations.props
+++ b/src/libraries/System.Net.HttpListener/tests/Configurations.props
@@ -1,8 +1,8 @@
-
+
- netstandard1.7;
+ netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.HttpListener/tests/System.Net.HttpListener.Tests.builds b/src/libraries/System.Net.HttpListener/tests/System.Net.HttpListener.Tests.builds
index b21094c637e34e26e446c0259a718d4f03e3a6f9..4900675f9458b561de6af035aa8f79ee58f37fb0 100644
--- a/src/libraries/System.Net.HttpListener/tests/System.Net.HttpListener.Tests.builds
+++ b/src/libraries/System.Net.HttpListener/tests/System.Net.HttpListener.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Net.HttpListener/tests/System.Net.HttpListener.Tests.csproj b/src/libraries/System.Net.HttpListener/tests/System.Net.HttpListener.Tests.csproj
index ed1ccb05ee5f97514d20aa807b5e7268898a10c7..c62c89e1a97fe5448c9dd517f35735d87c56b1ef 100644
--- a/src/libraries/System.Net.HttpListener/tests/System.Net.HttpListener.Tests.csproj
+++ b/src/libraries/System.Net.HttpListener/tests/System.Net.HttpListener.Tests.csproj
@@ -11,7 +11,7 @@
-
+
diff --git a/src/libraries/System.Net.Mail/pkg/System.Net.Mail.builds b/src/libraries/System.Net.Mail/pkg/System.Net.Mail.builds
index a4d4bf4a52372d122a1ea6e60c93e1a90993461d..e61ce9e6e61004e58144347ddd9e5c5e8b95eb23 100644
--- a/src/libraries/System.Net.Mail/pkg/System.Net.Mail.builds
+++ b/src/libraries/System.Net.Mail/pkg/System.Net.Mail.builds
@@ -1,8 +1,8 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.Mail/pkg/System.Net.Mail.pkgproj b/src/libraries/System.Net.Mail/pkg/System.Net.Mail.pkgproj
index 4318d41e9e826017129965e93a2177bbc440eb58..e11fcdf4d3acd4fbb011d2c0ebf58958533d7d14 100644
--- a/src/libraries/System.Net.Mail/pkg/System.Net.Mail.pkgproj
+++ b/src/libraries/System.Net.Mail/pkg/System.Net.Mail.pkgproj
@@ -1,14 +1,12 @@
-
+
-
- net461;netcoreapp1.1;$(AllXamarinFrameworks)
+ net461;netcoreapp2.0;$(AllXamarinFrameworks)
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.Mail/ref/System.Net.Mail.csproj b/src/libraries/System.Net.Mail/ref/System.Net.Mail.csproj
index 986b2a980330bd961f59cfdae05e6f10bfc14004..b603a7e2a97bfb05b41b33e33227114c1a756efc 100644
--- a/src/libraries/System.Net.Mail/ref/System.Net.Mail.csproj
+++ b/src/libraries/System.Net.Mail/ref/System.Net.Mail.csproj
@@ -1,4 +1,4 @@
-
+
@@ -17,4 +17,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.Mail/src/Configurations.props b/src/libraries/System.Net.Mail/src/Configurations.props
index 4caac7c12c38648c2798210b98ada5b29bad1eea..44653059115859e85f2971d50bbe3e0abeef4bf9 100644
--- a/src/libraries/System.Net.Mail/src/Configurations.props
+++ b/src/libraries/System.Net.Mail/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -7,4 +7,4 @@
net461-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.Mail/tests/Functional/Configurations.props b/src/libraries/System.Net.Mail/tests/Functional/Configurations.props
index 98f53209d45a12360d0bbf7cf031b29ff556fc57..c398e42e899425ce70e3a9884633835ab6fcc66e 100644
--- a/src/libraries/System.Net.Mail/tests/Functional/Configurations.props
+++ b/src/libraries/System.Net.Mail/tests/Functional/Configurations.props
@@ -1,8 +1,8 @@
-
+
- netstandard1.7;
+ netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.Mail/tests/Functional/System.Net.Mail.Functional.Tests.builds b/src/libraries/System.Net.Mail/tests/Functional/System.Net.Mail.Functional.Tests.builds
index 3a0f25db18a1e5c4ab598b4aef4815b00c64559a..a585da169ea7735f56f45d4d9453af9e3456c72a 100644
--- a/src/libraries/System.Net.Mail/tests/Functional/System.Net.Mail.Functional.Tests.builds
+++ b/src/libraries/System.Net.Mail/tests/Functional/System.Net.Mail.Functional.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Net.Mail/tests/Unit/Configurations.props b/src/libraries/System.Net.Mail/tests/Unit/Configurations.props
index 98f53209d45a12360d0bbf7cf031b29ff556fc57..c398e42e899425ce70e3a9884633835ab6fcc66e 100644
--- a/src/libraries/System.Net.Mail/tests/Unit/Configurations.props
+++ b/src/libraries/System.Net.Mail/tests/Unit/Configurations.props
@@ -1,8 +1,8 @@
-
+
- netstandard1.7;
+ netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.builds b/src/libraries/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.builds
index 08f106266cad678a1a897e992adbf6a57d4510b3..d3c25cfb5723fbb0a30adec5f81ba390561cd597 100644
--- a/src/libraries/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.builds
+++ b/src/libraries/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Net.NameResolution/pkg/System.Net.NameResolution.builds b/src/libraries/System.Net.NameResolution/pkg/System.Net.NameResolution.builds
index dc841629f96bed2d46e4d3eb3736626f081580d2..4e52809e1a32a5bbdd84f4ebb2d7c4937f6681d3 100644
--- a/src/libraries/System.Net.NameResolution/pkg/System.Net.NameResolution.builds
+++ b/src/libraries/System.Net.NameResolution/pkg/System.Net.NameResolution.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.NameResolution/pkg/System.Net.NameResolution.pkgproj b/src/libraries/System.Net.NameResolution/pkg/System.Net.NameResolution.pkgproj
index 75a0cd5ccb0f6935a7cc904b8b6c9eb10f427b42..23588424a46a4c53d52e792f361b12f25c0688f3 100644
--- a/src/libraries/System.Net.NameResolution/pkg/System.Net.NameResolution.pkgproj
+++ b/src/libraries/System.Net.NameResolution/pkg/System.Net.NameResolution.pkgproj
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Net.NameResolution/ref/System.Net.NameResolution.csproj b/src/libraries/System.Net.NameResolution/ref/System.Net.NameResolution.csproj
index 19441db2e460c7dc12afb0c9a85d383e35c53fdf..a9f52b7fc48452fd0eec0b53069943fceb14551f 100644
--- a/src/libraries/System.Net.NameResolution/ref/System.Net.NameResolution.csproj
+++ b/src/libraries/System.Net.NameResolution/ref/System.Net.NameResolution.csproj
@@ -1,4 +1,4 @@
-
+
@@ -10,4 +10,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.NameResolution/src/Configurations.props b/src/libraries/System.Net.NameResolution/src/Configurations.props
index 17d5314baddb0112504025118cccea4ce82c95b6..6c325c70f5b1ed1b64044ce2c634683063b35b24 100644
--- a/src/libraries/System.Net.NameResolution/src/Configurations.props
+++ b/src/libraries/System.Net.NameResolution/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -8,4 +8,4 @@
net46-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.NameResolution/tests/FunctionalTests/Configurations.props b/src/libraries/System.Net.NameResolution/tests/FunctionalTests/Configurations.props
index a9c55e67cdf56367fb77a4bdb3e3b6a9ee65c8c9..8b21be4cd618f38d45ec46baf02dd55de2552f2f 100644
--- a/src/libraries/System.Net.NameResolution/tests/FunctionalTests/Configurations.props
+++ b/src/libraries/System.Net.NameResolution/tests/FunctionalTests/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard1.3-Unix;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.NameResolution/tests/PalTests/Configurations.props b/src/libraries/System.Net.NameResolution/tests/PalTests/Configurations.props
index cc0c0fe0618d2732b21613f91baf041090c150a3..a20c412f565650a00b003fe0ffbfb44d59b12319 100644
--- a/src/libraries/System.Net.NameResolution/tests/PalTests/Configurations.props
+++ b/src/libraries/System.Net.NameResolution/tests/PalTests/Configurations.props
@@ -1,11 +1,11 @@
-
+
netstandard1.3-Windows_NT;
netstandard1.3-Unix;
- netstandard1.7-Windows_NT;
- netstandard1.7-Unix;
+ netstandard-Windows_NT;
+ netstandard-Unix;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj b/src/libraries/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj
index 4d3479654c1425e0af603803c1a80a2034e866b1..9f82f79a78ecd6e7b7b8d193f4481a1ab8e8b563 100644
--- a/src/libraries/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj
+++ b/src/libraries/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj
@@ -169,4 +169,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.NameResolution/tests/System.Net.NameResolution.Tests.builds b/src/libraries/System.Net.NameResolution/tests/System.Net.NameResolution.Tests.builds
index 8f90b926f637f8f53e44d40bf986ea5d67c29b15..9351ab89cd32ffb06061efdfdd5894d1646cc6f4 100644
--- a/src/libraries/System.Net.NameResolution/tests/System.Net.NameResolution.Tests.builds
+++ b/src/libraries/System.Net.NameResolution/tests/System.Net.NameResolution.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Net.NameResolution/tests/UnitTests/Configurations.props b/src/libraries/System.Net.NameResolution/tests/UnitTests/Configurations.props
index a9c55e67cdf56367fb77a4bdb3e3b6a9ee65c8c9..8b21be4cd618f38d45ec46baf02dd55de2552f2f 100644
--- a/src/libraries/System.Net.NameResolution/tests/UnitTests/Configurations.props
+++ b/src/libraries/System.Net.NameResolution/tests/UnitTests/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard1.3-Unix;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.NetworkInformation/pkg/System.Net.NetworkInformation.builds b/src/libraries/System.Net.NetworkInformation/pkg/System.Net.NetworkInformation.builds
index da8dc3ed4f11031facbab46e2825afef137b5f02..c7ebb02d515ba5fc258018817946ae419317d720 100644
--- a/src/libraries/System.Net.NetworkInformation/pkg/System.Net.NetworkInformation.builds
+++ b/src/libraries/System.Net.NetworkInformation/pkg/System.Net.NetworkInformation.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.NetworkInformation/pkg/System.Net.NetworkInformation.pkgproj b/src/libraries/System.Net.NetworkInformation/pkg/System.Net.NetworkInformation.pkgproj
index e9cf2ce03d78ed8f2a8c96b9d01b1e3402cfcc46..ea006483db409590a3f539de5f0c4d399e1b5ae9 100644
--- a/src/libraries/System.Net.NetworkInformation/pkg/System.Net.NetworkInformation.pkgproj
+++ b/src/libraries/System.Net.NetworkInformation/pkg/System.Net.NetworkInformation.pkgproj
@@ -3,7 +3,7 @@
- net463;uap10.1;netcoreapp1.1;$(AllXamarinFrameworks)
+ net463;uap10.1;netcoreapp2.0;$(AllXamarinFrameworks)
diff --git a/src/libraries/System.Net.NetworkInformation/ref/System.Net.NetworkInformation.csproj b/src/libraries/System.Net.NetworkInformation/ref/System.Net.NetworkInformation.csproj
index d35900e37abc6d2c9e109d8ad113d4b7c0ecc89a..2e6813b7744561f2d909df4579c45d12cf93f601 100644
--- a/src/libraries/System.Net.NetworkInformation/ref/System.Net.NetworkInformation.csproj
+++ b/src/libraries/System.Net.NetworkInformation/ref/System.Net.NetworkInformation.csproj
@@ -1,4 +1,4 @@
-
+
@@ -11,4 +11,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.NetworkInformation/src/Configurations.props b/src/libraries/System.Net.NetworkInformation/src/Configurations.props
index f9c85b7dbb34fd07a33d82219a4525e33a790cba..6f67686d49a7d73ad0559bdf62fcc7bef18856e2 100644
--- a/src/libraries/System.Net.NetworkInformation/src/Configurations.props
+++ b/src/libraries/System.Net.NetworkInformation/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -9,4 +9,4 @@
net463-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/Configurations.props b/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/Configurations.props
index 512c938bad5364c677a3f4d9f647f1ade8c14aea..b2db637110616a495d303924e9aaf8b800db4821 100644
--- a/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/Configurations.props
+++ b/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/Configurations.props
@@ -1,9 +1,9 @@
-
+
netstandard1.3;
- netstandard1.7;
+ netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/System.Net.NetworkInformation.Functional.Tests.csproj b/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/System.Net.NetworkInformation.Functional.Tests.csproj
index b1d216442f1b70dda0e356341573ad21c7668773..46a0c5152c9e75559763b9b90cd47a0af5f655b0 100644
--- a/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/System.Net.NetworkInformation.Functional.Tests.csproj
+++ b/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/System.Net.NetworkInformation.Functional.Tests.csproj
@@ -141,4 +141,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.NetworkInformation/tests/System.Net.NetworkInformation.Tests.builds b/src/libraries/System.Net.NetworkInformation/tests/System.Net.NetworkInformation.Tests.builds
index c9b3290636af6c639aab83f83baf0cceac8c9a2d..f3411e09bb25f446c54ef3bbdf6e1ac68ce5bb56 100644
--- a/src/libraries/System.Net.NetworkInformation/tests/System.Net.NetworkInformation.Tests.builds
+++ b/src/libraries/System.Net.NetworkInformation/tests/System.Net.NetworkInformation.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Net.NetworkInformation/tests/UnitTests/Configurations.props b/src/libraries/System.Net.NetworkInformation/tests/UnitTests/Configurations.props
index 512c938bad5364c677a3f4d9f647f1ade8c14aea..b2db637110616a495d303924e9aaf8b800db4821 100644
--- a/src/libraries/System.Net.NetworkInformation/tests/UnitTests/Configurations.props
+++ b/src/libraries/System.Net.NetworkInformation/tests/UnitTests/Configurations.props
@@ -1,9 +1,9 @@
-
+
netstandard1.3;
- netstandard1.7;
+ netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.Ping/pkg/System.Net.Ping.builds b/src/libraries/System.Net.Ping/pkg/System.Net.Ping.builds
index 29d6c742f8c6cb42ff5c24f70c79e70ec932bb84..0decc01bece2b1b736e227f958a0767c7102fbdb 100644
--- a/src/libraries/System.Net.Ping/pkg/System.Net.Ping.builds
+++ b/src/libraries/System.Net.Ping/pkg/System.Net.Ping.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.Ping/pkg/System.Net.Ping.pkgproj b/src/libraries/System.Net.Ping/pkg/System.Net.Ping.pkgproj
index 546791ece268b1f3019dbc6ea038361e78498b8d..6556bb06b07f094ded2ed61be396d83f398c07e5 100644
--- a/src/libraries/System.Net.Ping/pkg/System.Net.Ping.pkgproj
+++ b/src/libraries/System.Net.Ping/pkg/System.Net.Ping.pkgproj
@@ -1,14 +1,12 @@
-
+
-
- net463;netcoreapp1.1;$(AllXamarinFrameworks)
+ net463;netcoreapp2.0;$(AllXamarinFrameworks)
-
@@ -16,11 +14,9 @@
-
win7
-
\ No newline at end of file
diff --git a/src/libraries/System.Net.Ping/ref/System.Net.Ping.csproj b/src/libraries/System.Net.Ping/ref/System.Net.Ping.csproj
index 1ad3fa2cbfd978b456605c0f252d7b4f15884f38..62b3d3ccf71f8654f57b914be839507d2268937f 100644
--- a/src/libraries/System.Net.Ping/ref/System.Net.Ping.csproj
+++ b/src/libraries/System.Net.Ping/ref/System.Net.Ping.csproj
@@ -1,4 +1,4 @@
-
+
@@ -12,4 +12,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.Ping/src/Configurations.props b/src/libraries/System.Net.Ping/src/Configurations.props
index 3bb6330d9e73da4e4998b3dcba9a05936bf49b7e..4701fcd7729002100465c5249f5ddfe14f92bedd 100644
--- a/src/libraries/System.Net.Ping/src/Configurations.props
+++ b/src/libraries/System.Net.Ping/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -7,4 +7,4 @@
net463-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.Ping/tests/FunctionalTests/Configurations.props b/src/libraries/System.Net.Ping/tests/FunctionalTests/Configurations.props
index 4a2b602706fe78d60a437d14a79bc7f14f82f00e..262631c148ec64a4e26189e5f4df0f712e2b39c2 100644
--- a/src/libraries/System.Net.Ping/tests/FunctionalTests/Configurations.props
+++ b/src/libraries/System.Net.Ping/tests/FunctionalTests/Configurations.props
@@ -1,10 +1,10 @@
-
+
- netstandard1.7-Unix;
- netstandard1.7-Windows_NT;
+ netstandard-Unix;
+ netstandard-Windows_NT;
netstandard1.3;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.Ping/tests/FunctionalTests/System.Net.Ping.Functional.Tests.csproj b/src/libraries/System.Net.Ping/tests/FunctionalTests/System.Net.Ping.Functional.Tests.csproj
index 5f5098991f136f6b0023cd38e7816081cbd99b24..30116f116beee735d89885a995ee4c7fc2d093f5 100644
--- a/src/libraries/System.Net.Ping/tests/FunctionalTests/System.Net.Ping.Functional.Tests.csproj
+++ b/src/libraries/System.Net.Ping/tests/FunctionalTests/System.Net.Ping.Functional.Tests.csproj
@@ -32,4 +32,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.Ping/tests/System.Net.Ping.Functional.Tests.builds b/src/libraries/System.Net.Ping/tests/System.Net.Ping.Functional.Tests.builds
index adf20dcc4051e68eb99559ec9c73b893fc7b38b6..cecccc91e8d867a8a070ed383800fd47622bb489 100644
--- a/src/libraries/System.Net.Ping/tests/System.Net.Ping.Functional.Tests.builds
+++ b/src/libraries/System.Net.Ping/tests/System.Net.Ping.Functional.Tests.builds
@@ -1,4 +1,4 @@
-
+
@@ -7,7 +7,7 @@
Windows_NT
- netcoreapp1.1;net463
+ netcoreapp;net463
netstandard1.3
diff --git a/src/libraries/System.Net.Primitives/pkg/System.Net.Primitives.builds b/src/libraries/System.Net.Primitives/pkg/System.Net.Primitives.builds
index fbbd00ac2a2e7ed560bb8da4fd49aaccd076f74b..d2834ff1897fa1b0d5e2ba5b06abef5e71a18582 100644
--- a/src/libraries/System.Net.Primitives/pkg/System.Net.Primitives.builds
+++ b/src/libraries/System.Net.Primitives/pkg/System.Net.Primitives.builds
@@ -1,4 +1,4 @@
-
+
@@ -11,5 +11,4 @@
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.Primitives/pkg/System.Net.Primitives.pkgproj b/src/libraries/System.Net.Primitives/pkg/System.Net.Primitives.pkgproj
index bc5f0fd17f4b72bac1bbcdd22fb79a3353e25b2b..c99fdd71f2fdfc0514fcacbd23a7846f0c26cc37 100644
--- a/src/libraries/System.Net.Primitives/pkg/System.Net.Primitives.pkgproj
+++ b/src/libraries/System.Net.Primitives/pkg/System.Net.Primitives.pkgproj
@@ -3,7 +3,7 @@
- net463;netcoreapp1.1;uap10.1;$(AllXamarinFrameworks)
+ net463;netcoreapp2.0;uap10.1;$(AllXamarinFrameworks)
net463
diff --git a/src/libraries/System.Net.Primitives/pkg/unix/System.Net.Primitives.pkgproj b/src/libraries/System.Net.Primitives/pkg/unix/System.Net.Primitives.pkgproj
index f557786c6044c077f7dbd7ba70060d5c61cfd596..1e80e74a2830f8ed7f7a578ef88939e9d66e995d 100644
--- a/src/libraries/System.Net.Primitives/pkg/unix/System.Net.Primitives.pkgproj
+++ b/src/libraries/System.Net.Primitives/pkg/unix/System.Net.Primitives.pkgproj
@@ -1,16 +1,14 @@
-
+
-
unix
true
-
+
Unix
-
\ No newline at end of file
diff --git a/src/libraries/System.Net.Primitives/pkg/win/System.Net.Primitives.pkgproj b/src/libraries/System.Net.Primitives/pkg/win/System.Net.Primitives.pkgproj
index 730e4b6fd83e4fe892a9c278024e8458f925d206..5bd67715c94a05955f96465b453a91ef905c4503 100644
--- a/src/libraries/System.Net.Primitives/pkg/win/System.Net.Primitives.pkgproj
+++ b/src/libraries/System.Net.Primitives/pkg/win/System.Net.Primitives.pkgproj
@@ -1,14 +1,12 @@
-
+
-
win
true
-
-
+
Windows_NT
@@ -18,6 +16,5 @@
-
\ No newline at end of file
diff --git a/src/libraries/System.Net.Primitives/ref/Configurations.props b/src/libraries/System.Net.Primitives/ref/Configurations.props
index de3584258036f58906f97a4f7d6ff7e5932f0b00..77a4b65bc94a425ce217a1e6878bb6f236cf8abc 100644
--- a/src/libraries/System.Net.Primitives/ref/Configurations.props
+++ b/src/libraries/System.Net.Primitives/ref/Configurations.props
@@ -1,9 +1,9 @@
-
+
- netstandard1.7;
- netcoreapp1.1;
+ netstandard;
+ netcoreapp;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.Primitives/ref/System.Net.Primitives.builds b/src/libraries/System.Net.Primitives/ref/System.Net.Primitives.builds
index 9a54406510d91914e45619b18e67c3bb08eab82b..afca28889bbc4492d346bab1f0ae37d8d3e05aba 100644
--- a/src/libraries/System.Net.Primitives/ref/System.Net.Primitives.builds
+++ b/src/libraries/System.Net.Primitives/ref/System.Net.Primitives.builds
@@ -1,10 +1,10 @@
-
+
- netcoreapp1.1
+ netcoreapp
diff --git a/src/libraries/System.Net.Primitives/ref/System.Net.Primitives.csproj b/src/libraries/System.Net.Primitives/ref/System.Net.Primitives.csproj
index 9b3920db350755a29555d103f90ce1ba89eafe1b..a88c03ad5d28eee49754cf6933e5ff3c52515248 100644
--- a/src/libraries/System.Net.Primitives/ref/System.Net.Primitives.csproj
+++ b/src/libraries/System.Net.Primitives/ref/System.Net.Primitives.csproj
@@ -1,4 +1,4 @@
-
+
@@ -14,4 +14,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.Primitives/src/Configurations.props b/src/libraries/System.Net.Primitives/src/Configurations.props
index 277edd8783c4add1919abf7457daf0a05e4313d4..411643298fb92c2b907650564f5624addc56a447 100644
--- a/src/libraries/System.Net.Primitives/src/Configurations.props
+++ b/src/libraries/System.Net.Primitives/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -8,4 +8,4 @@
net463-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.Primitives/tests/FunctionalTests/Configurations.props b/src/libraries/System.Net.Primitives/tests/FunctionalTests/Configurations.props
index fa858a20eb30c5ce4e803bed981ba85c27257e17..186604c3feea777de38197383f890925e36d7ebd 100644
--- a/src/libraries/System.Net.Primitives/tests/FunctionalTests/Configurations.props
+++ b/src/libraries/System.Net.Primitives/tests/FunctionalTests/Configurations.props
@@ -1,10 +1,10 @@
-
+
- netstandard1.7-Unix;
- netstandard1.7-Windows_NT;
+ netstandard-Unix;
+ netstandard-Windows_NT;
netstandard1.3-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.Primitives/tests/FunctionalTests/System.Net.Primitives.Functional.Tests.csproj b/src/libraries/System.Net.Primitives/tests/FunctionalTests/System.Net.Primitives.Functional.Tests.csproj
index 39d50b7a82fd547b8ab7510dbbd7eb1112b4ee30..548f3513d0472fd6508f229d075e3a531ea1a304 100644
--- a/src/libraries/System.Net.Primitives/tests/FunctionalTests/System.Net.Primitives.Functional.Tests.csproj
+++ b/src/libraries/System.Net.Primitives/tests/FunctionalTests/System.Net.Primitives.Functional.Tests.csproj
@@ -54,4 +54,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.Primitives/tests/PalTests/Configurations.props b/src/libraries/System.Net.Primitives/tests/PalTests/Configurations.props
index fa858a20eb30c5ce4e803bed981ba85c27257e17..186604c3feea777de38197383f890925e36d7ebd 100644
--- a/src/libraries/System.Net.Primitives/tests/PalTests/Configurations.props
+++ b/src/libraries/System.Net.Primitives/tests/PalTests/Configurations.props
@@ -1,10 +1,10 @@
-
+
- netstandard1.7-Unix;
- netstandard1.7-Windows_NT;
+ netstandard-Unix;
+ netstandard-Windows_NT;
netstandard1.3-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj b/src/libraries/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj
index 8c8a2ae877a6ee68f1cbb8963c7a1112ec63c685..7ca0772cefb3506d198f596ac5eae7fd3afd2cc7 100644
--- a/src/libraries/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj
+++ b/src/libraries/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj
@@ -170,4 +170,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.Primitives/tests/PerformanceTests/Configurations.props b/src/libraries/System.Net.Primitives/tests/PerformanceTests/Configurations.props
index fa858a20eb30c5ce4e803bed981ba85c27257e17..186604c3feea777de38197383f890925e36d7ebd 100644
--- a/src/libraries/System.Net.Primitives/tests/PerformanceTests/Configurations.props
+++ b/src/libraries/System.Net.Primitives/tests/PerformanceTests/Configurations.props
@@ -1,10 +1,10 @@
-
+
- netstandard1.7-Unix;
- netstandard1.7-Windows_NT;
+ netstandard-Unix;
+ netstandard-Windows_NT;
netstandard1.3-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.Primitives/tests/System.Net.Primitives.Tests.builds b/src/libraries/System.Net.Primitives/tests/System.Net.Primitives.Tests.builds
index 4b17ae30b14a56f6a3990dd3486161ec72b6025a..539f86b939d8e6da91b8df7fb3b058dc8cb21b04 100644
--- a/src/libraries/System.Net.Primitives/tests/System.Net.Primitives.Tests.builds
+++ b/src/libraries/System.Net.Primitives/tests/System.Net.Primitives.Tests.builds
@@ -1,4 +1,4 @@
-
+
@@ -7,7 +7,7 @@
Windows_NT
- netcoreapp1.1;net463
+ netcoreapp;net463
netstandard1.3
@@ -19,7 +19,7 @@
Windows_NT
- netcoreapp1.1;net463
+ netcoreapp;net463
netstandard1.3
@@ -31,7 +31,7 @@
Windows_NT
- netcoreapp1.1;net463
+ netcoreapp;net463
netstandard1.3
@@ -43,7 +43,7 @@
Windows_NT
- netcoreapp1.1;net463
+ netcoreapp;net463
netstandard1.3
diff --git a/src/libraries/System.Net.Primitives/tests/UnitTests/Configurations.props b/src/libraries/System.Net.Primitives/tests/UnitTests/Configurations.props
index 415c6d276e0ddd1f6b3ed190b20fc247f400e799..9348ce4cb3fa973900d9493d45a787f0785930fc 100644
--- a/src/libraries/System.Net.Primitives/tests/UnitTests/Configurations.props
+++ b/src/libraries/System.Net.Primitives/tests/UnitTests/Configurations.props
@@ -1,10 +1,10 @@
-
+
- netstandard1.7-Windows_NT;
- netstandard1.7-Unix;
+ netstandard-Windows_NT;
+ netstandard-Unix;
netstandard1.3-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj b/src/libraries/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj
index e91540f72c3de0011fdfdc1be5108326ed622db6..5e1325dacf7f81998b674bec435e656fdbbe06fe 100644
--- a/src/libraries/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj
+++ b/src/libraries/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj
@@ -129,4 +129,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.Requests/pkg/System.Net.Requests.builds b/src/libraries/System.Net.Requests/pkg/System.Net.Requests.builds
index 4e44341fd09f7e9abd16b745bf77d235ccd94b86..ba16e03adb9220cba51351ab1dda03a214173d39 100644
--- a/src/libraries/System.Net.Requests/pkg/System.Net.Requests.builds
+++ b/src/libraries/System.Net.Requests/pkg/System.Net.Requests.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.Requests/pkg/System.Net.Requests.pkgproj b/src/libraries/System.Net.Requests/pkg/System.Net.Requests.pkgproj
index efc55c00a04c975d437f3451e18e1a84a7d0ce57..fa73acdb15a3b4c3ea8bd53af01ee17c6865c5e3 100644
--- a/src/libraries/System.Net.Requests/pkg/System.Net.Requests.pkgproj
+++ b/src/libraries/System.Net.Requests/pkg/System.Net.Requests.pkgproj
@@ -3,7 +3,7 @@
- net463;netcoreapp1.1;$(AllXamarinFrameworks)
+ net463;netcoreapp2.0;$(AllXamarinFrameworks)
diff --git a/src/libraries/System.Net.Requests/ref/System.Net.Requests.csproj b/src/libraries/System.Net.Requests/ref/System.Net.Requests.csproj
index 9d5d6603097ec008e0098ab01c25974bc4e54e39..3bbafc3a3bd89877585bd95f5e2cf3f554a0273a 100644
--- a/src/libraries/System.Net.Requests/ref/System.Net.Requests.csproj
+++ b/src/libraries/System.Net.Requests/ref/System.Net.Requests.csproj
@@ -1,4 +1,4 @@
-
+
@@ -18,4 +18,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.Requests/src/Configurations.props b/src/libraries/System.Net.Requests/src/Configurations.props
index 3bb6330d9e73da4e4998b3dcba9a05936bf49b7e..4701fcd7729002100465c5249f5ddfe14f92bedd 100644
--- a/src/libraries/System.Net.Requests/src/Configurations.props
+++ b/src/libraries/System.Net.Requests/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -7,4 +7,4 @@
net463-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.Requests/tests/Configurations.props b/src/libraries/System.Net.Requests/tests/Configurations.props
index 512c938bad5364c677a3f4d9f647f1ade8c14aea..b2db637110616a495d303924e9aaf8b800db4821 100644
--- a/src/libraries/System.Net.Requests/tests/Configurations.props
+++ b/src/libraries/System.Net.Requests/tests/Configurations.props
@@ -1,9 +1,9 @@
-
+
netstandard1.3;
- netstandard1.7;
+ netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.Requests/tests/System.Net.Requests.Tests.builds b/src/libraries/System.Net.Requests/tests/System.Net.Requests.Tests.builds
index d4b9ffceea39fe8191c223487603a4e3bc2399f8..7abee784a7a2b525f7418f874bdd1a405dc3f4a9 100644
--- a/src/libraries/System.Net.Requests/tests/System.Net.Requests.Tests.builds
+++ b/src/libraries/System.Net.Requests/tests/System.Net.Requests.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Net.Requests/tests/System.Net.Requests.Tests.csproj b/src/libraries/System.Net.Requests/tests/System.Net.Requests.Tests.csproj
index fa96b07adbc90ab73e5a436a37f544e6bf2e05c4..8e32215109c452b78d269e998f6c5e3733b6cb78 100644
--- a/src/libraries/System.Net.Requests/tests/System.Net.Requests.Tests.csproj
+++ b/src/libraries/System.Net.Requests/tests/System.Net.Requests.Tests.csproj
@@ -56,4 +56,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.Security/pkg/System.Net.Security.builds b/src/libraries/System.Net.Security/pkg/System.Net.Security.builds
index 16ab53070dd2caf556ec85f90541919ca9675aee..93055eda0fc95d62b81158c8fa4043d8467cf28e 100644
--- a/src/libraries/System.Net.Security/pkg/System.Net.Security.builds
+++ b/src/libraries/System.Net.Security/pkg/System.Net.Security.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.Security/pkg/System.Net.Security.pkgproj b/src/libraries/System.Net.Security/pkg/System.Net.Security.pkgproj
index a57469bbeafa19535444c9cd59bcc891e8822970..49bfbca1d4b9b341f6b63a5376118ca806125c34 100644
--- a/src/libraries/System.Net.Security/pkg/System.Net.Security.pkgproj
+++ b/src/libraries/System.Net.Security/pkg/System.Net.Security.pkgproj
@@ -1,9 +1,9 @@
-
+
- net463;netcoreapp1.1;$(AllXamarinFrameworks)
+ net463;netcoreapp2.0;$(AllXamarinFrameworks)
@@ -14,11 +14,9 @@
-
win7
-
\ No newline at end of file
diff --git a/src/libraries/System.Net.Security/ref/Configurations.props b/src/libraries/System.Net.Security/ref/Configurations.props
index de3584258036f58906f97a4f7d6ff7e5932f0b00..77a4b65bc94a425ce217a1e6878bb6f236cf8abc 100644
--- a/src/libraries/System.Net.Security/ref/Configurations.props
+++ b/src/libraries/System.Net.Security/ref/Configurations.props
@@ -1,9 +1,9 @@
-
+
- netstandard1.7;
- netcoreapp1.1;
+ netstandard;
+ netcoreapp;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.Security/ref/System.Net.Security.builds b/src/libraries/System.Net.Security/ref/System.Net.Security.builds
index 17b0b64743b32dd08c610cc1d6528648898b051c..71efd4e2edc285d7267204655b4d658ca8e8ec13 100644
--- a/src/libraries/System.Net.Security/ref/System.Net.Security.builds
+++ b/src/libraries/System.Net.Security/ref/System.Net.Security.builds
@@ -1,10 +1,10 @@
-
+
- netcoreapp1.1
+ netcoreapp
diff --git a/src/libraries/System.Net.Security/ref/System.Net.Security.csproj b/src/libraries/System.Net.Security/ref/System.Net.Security.csproj
index f34255481bb39dfdc7166e726123ecd3de544394..87061c1764447d083d1d7cd6fb4bf646ebb59722 100644
--- a/src/libraries/System.Net.Security/ref/System.Net.Security.csproj
+++ b/src/libraries/System.Net.Security/ref/System.Net.Security.csproj
@@ -1,4 +1,4 @@
-
+
@@ -18,4 +18,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.Security/src/Configurations.props b/src/libraries/System.Net.Security/src/Configurations.props
index 3bb6330d9e73da4e4998b3dcba9a05936bf49b7e..4701fcd7729002100465c5249f5ddfe14f92bedd 100644
--- a/src/libraries/System.Net.Security/src/Configurations.props
+++ b/src/libraries/System.Net.Security/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -7,4 +7,4 @@
net463-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.Security/tests/FunctionalTests/Configurations.props b/src/libraries/System.Net.Security/tests/FunctionalTests/Configurations.props
index 2b3220d6962aa7c72188dfb18d740b7ed0d68a23..6e69be526f72c794e3252d37a4584bc8ebb4f8e1 100644
--- a/src/libraries/System.Net.Security/tests/FunctionalTests/Configurations.props
+++ b/src/libraries/System.Net.Security/tests/FunctionalTests/Configurations.props
@@ -1,13 +1,13 @@
-
+
- netstandard1.7-Unix;
- netstandard1.7-Windows_NT;
- netstandard1.7-OSX;
- netcoreapp1.1-Windows_NT;
- netcoreapp1.1-Unix;
- netcoreapp1.1-OSX;
+ netstandard-Unix;
+ netstandard-Windows_NT;
+ netstandard-OSX;
+ netcoreapp-Windows_NT;
+ netcoreapp-Unix;
+ netcoreapp-OSX;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj b/src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj
index 9698f9c414a06bd12edb4a0892849fa18c480092..d4ac8f82ea456f0a942c8787378b4fc33a195d0c 100644
--- a/src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj
+++ b/src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj
@@ -150,4 +150,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.Security/tests/System.Net.Security.Tests.builds b/src/libraries/System.Net.Security/tests/System.Net.Security.Tests.builds
index 342b29c48b87a0f750f7748a5f0d95d9dcb730c0..e9291ef79c269ed4dedb49d864889cde235cd95b 100644
--- a/src/libraries/System.Net.Security/tests/System.Net.Security.Tests.builds
+++ b/src/libraries/System.Net.Security/tests/System.Net.Security.Tests.builds
@@ -1,37 +1,37 @@
-
+
Linux
- netcoreapp1.1
- netcoreapp1.1
+ netcoreapp
+ netcoreapp
Linux
- netstandard1.7
- netcoreapp1.1
+ netstandard
+ netcoreapp
OSX
- netcoreapp1.1
- netcoreapp1.1
+ netcoreapp
+ netcoreapp
OSX
- netstandard1.7
- netcoreapp1.1
+ netstandard
+ netcoreapp
Windows_NT
- netcoreapp1.1
+ netcoreapp
- netcoreapp1.1
+ netcoreapp
Windows_NT
- netstandard1.7
- netcoreapp1.1;net462
+ netstandard
+ netcoreapp;net462
Unix
diff --git a/src/libraries/System.Net.Security/tests/UnitTests/Configurations.props b/src/libraries/System.Net.Security/tests/UnitTests/Configurations.props
index 90648972ae4de2dc0c8b5d90ea77497a1393147c..cfc57211a43f1efa201dcfc0a5b7dd9d7e9f2987 100644
--- a/src/libraries/System.Net.Security/tests/UnitTests/Configurations.props
+++ b/src/libraries/System.Net.Security/tests/UnitTests/Configurations.props
@@ -1,9 +1,9 @@
-
+
- netstandard1.7-Unix;
- netstandard1.7-Windows_NT;
+ netstandard-Unix;
+ netstandard-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.ServicePoint/pkg/System.Net.ServicePoint.builds b/src/libraries/System.Net.ServicePoint/pkg/System.Net.ServicePoint.builds
index d82852a2d9f10f6633e483cec075963a4f9b8470..84aacf5395ef1c0e5baacf93e2c9d9426784f182 100644
--- a/src/libraries/System.Net.ServicePoint/pkg/System.Net.ServicePoint.builds
+++ b/src/libraries/System.Net.ServicePoint/pkg/System.Net.ServicePoint.builds
@@ -1,8 +1,8 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.ServicePoint/pkg/System.Net.ServicePoint.pkgproj b/src/libraries/System.Net.ServicePoint/pkg/System.Net.ServicePoint.pkgproj
index 7f72c06e938af45193906ccab5018ea790637101..7f05994ec04f30a82c359e58687bff320e2ee37a 100644
--- a/src/libraries/System.Net.ServicePoint/pkg/System.Net.ServicePoint.pkgproj
+++ b/src/libraries/System.Net.ServicePoint/pkg/System.Net.ServicePoint.pkgproj
@@ -1,14 +1,12 @@
-
+
-
- net461;netcoreapp1.1;$(AllXamarinFrameworks)
+ net461;netcoreapp2.0;$(AllXamarinFrameworks)
-
@@ -17,6 +15,5 @@
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.ServicePoint/ref/System.Net.ServicePoint.builds b/src/libraries/System.Net.ServicePoint/ref/System.Net.ServicePoint.builds
index 4c8d0efd6594f8c78ef8f9906344faac893ee786..d3b89c3f9e21dbded0c6eb177b0dd2bad6f9b254 100644
--- a/src/libraries/System.Net.ServicePoint/ref/System.Net.ServicePoint.builds
+++ b/src/libraries/System.Net.ServicePoint/ref/System.Net.ServicePoint.builds
@@ -1,10 +1,10 @@
-
+
- netcoreapp1.1
+ netcoreapp
diff --git a/src/libraries/System.Net.ServicePoint/ref/System.Net.ServicePoint.csproj b/src/libraries/System.Net.ServicePoint/ref/System.Net.ServicePoint.csproj
index a5d114694c418dc82a12985340e147574e92e90a..7d5a508003a1aff2496302e4e22dcbed38bde2cb 100644
--- a/src/libraries/System.Net.ServicePoint/ref/System.Net.ServicePoint.csproj
+++ b/src/libraries/System.Net.ServicePoint/ref/System.Net.ServicePoint.csproj
@@ -1,4 +1,4 @@
-
+
@@ -14,4 +14,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.ServicePoint/src/Configurations.props b/src/libraries/System.Net.ServicePoint/src/Configurations.props
index 53b62c64fea2475e524eb32a20b028ea109d4d41..bcfec4bbde61fa2877a42ca2e87056c258cd6c09 100644
--- a/src/libraries/System.Net.ServicePoint/src/Configurations.props
+++ b/src/libraries/System.Net.ServicePoint/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.ServicePoint/tests/Configurations.props b/src/libraries/System.Net.ServicePoint/tests/Configurations.props
index de3584258036f58906f97a4f7d6ff7e5932f0b00..77a4b65bc94a425ce217a1e6878bb6f236cf8abc 100644
--- a/src/libraries/System.Net.ServicePoint/tests/Configurations.props
+++ b/src/libraries/System.Net.ServicePoint/tests/Configurations.props
@@ -1,9 +1,9 @@
-
+
- netstandard1.7;
- netcoreapp1.1;
+ netstandard;
+ netcoreapp;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.ServicePoint/tests/System.Net.ServicePoint.Tests.builds b/src/libraries/System.Net.ServicePoint/tests/System.Net.ServicePoint.Tests.builds
index e8db26023e3ca76e0251e28f84c8c698d30a811c..f4b38619675b8f8a91a436744c14fce6acb722b0 100644
--- a/src/libraries/System.Net.ServicePoint/tests/System.Net.ServicePoint.Tests.builds
+++ b/src/libraries/System.Net.ServicePoint/tests/System.Net.ServicePoint.Tests.builds
@@ -1,15 +1,15 @@
-
+
- netstandard1.7
- netcoreapp1.1
+ netstandard
+ netcoreapp
- netcoreapp1.1
+ netcoreapp
- netcoreapp1.1
+ netcoreapp
Windows_NT
diff --git a/src/libraries/System.Net.ServicePoint/tests/System.Net.ServicePoint.Tests.csproj b/src/libraries/System.Net.ServicePoint/tests/System.Net.ServicePoint.Tests.csproj
index 23429b3d141cb957da2811083457605cdb26342f..510c709bee68a6877d3d31a53d6605a5f205fb9e 100644
--- a/src/libraries/System.Net.ServicePoint/tests/System.Net.ServicePoint.Tests.csproj
+++ b/src/libraries/System.Net.ServicePoint/tests/System.Net.ServicePoint.Tests.csproj
@@ -14,4 +14,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.Sockets/pkg/System.Net.Sockets.builds b/src/libraries/System.Net.Sockets/pkg/System.Net.Sockets.builds
index cce03bb8836b6c448294a3084f34acf306d7f1f2..7367f9db94b7f78e2abefcba9477486116d80313 100644
--- a/src/libraries/System.Net.Sockets/pkg/System.Net.Sockets.builds
+++ b/src/libraries/System.Net.Sockets/pkg/System.Net.Sockets.builds
@@ -1,4 +1,4 @@
-
+
@@ -11,5 +11,4 @@
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.Sockets/pkg/System.Net.Sockets.pkgproj b/src/libraries/System.Net.Sockets/pkg/System.Net.Sockets.pkgproj
index d5e633b5fd97d369c9cfdf34a8e87946e80b21f0..a573bde5265f90d0707208f67dc64e318e7d7659 100644
--- a/src/libraries/System.Net.Sockets/pkg/System.Net.Sockets.pkgproj
+++ b/src/libraries/System.Net.Sockets/pkg/System.Net.Sockets.pkgproj
@@ -1,9 +1,9 @@
-
+
- net463;netcoreapp1.1;$(AllXamarinFrameworks)
+ net463;netcoreapp2.0;$(AllXamarinFrameworks)
net463
diff --git a/src/libraries/System.Net.Sockets/pkg/unix/System.Net.Sockets.pkgproj b/src/libraries/System.Net.Sockets/pkg/unix/System.Net.Sockets.pkgproj
index 66b092b9227f026e3b73962e673d90fa929c26ee..c1396e68dafbe4c3b73b286c27070f1807ee3bc6 100644
--- a/src/libraries/System.Net.Sockets/pkg/unix/System.Net.Sockets.pkgproj
+++ b/src/libraries/System.Net.Sockets/pkg/unix/System.Net.Sockets.pkgproj
@@ -1,17 +1,14 @@
-
+
-
unix
true
-
-
+
Unix
-
\ No newline at end of file
diff --git a/src/libraries/System.Net.Sockets/pkg/win/System.Net.Sockets.pkgproj b/src/libraries/System.Net.Sockets/pkg/win/System.Net.Sockets.pkgproj
index 7f2a108a23d2bd72032a6c7b79a10abf8702ca33..28f119b0f40dd94692276c7c67fd66c95759bad9 100644
--- a/src/libraries/System.Net.Sockets/pkg/win/System.Net.Sockets.pkgproj
+++ b/src/libraries/System.Net.Sockets/pkg/win/System.Net.Sockets.pkgproj
@@ -1,12 +1,10 @@
-
+
-
win
true
-
Windows_NT
@@ -18,6 +16,5 @@
-
\ No newline at end of file
diff --git a/src/libraries/System.Net.Sockets/ref/System.Net.Sockets.csproj b/src/libraries/System.Net.Sockets/ref/System.Net.Sockets.csproj
index c04b4915fb7ca74d0c0f845320a0c00a45cc67c6..825aae248f503176b67c567b7b8e14804b0ded57 100644
--- a/src/libraries/System.Net.Sockets/ref/System.Net.Sockets.csproj
+++ b/src/libraries/System.Net.Sockets/ref/System.Net.Sockets.csproj
@@ -1,4 +1,4 @@
-
+
@@ -12,4 +12,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.Sockets/src/Configurations.props b/src/libraries/System.Net.Sockets/src/Configurations.props
index a2712c363bef1337a3f2142c5470d2284d7d4e93..5c4fd7778a301381e413e4f0c9cfe8ea1f52945d 100644
--- a/src/libraries/System.Net.Sockets/src/Configurations.props
+++ b/src/libraries/System.Net.Sockets/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -8,4 +8,4 @@
net463-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.Sockets/tests/FunctionalTests/Configurations.props b/src/libraries/System.Net.Sockets/tests/FunctionalTests/Configurations.props
index 98f53209d45a12360d0bbf7cf031b29ff556fc57..c398e42e899425ce70e3a9884633835ab6fcc66e 100644
--- a/src/libraries/System.Net.Sockets/tests/FunctionalTests/Configurations.props
+++ b/src/libraries/System.Net.Sockets/tests/FunctionalTests/Configurations.props
@@ -1,8 +1,8 @@
-
+
- netstandard1.7;
+ netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj b/src/libraries/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj
index cdebd96900cd7936f2ff860de4f7e9813bfa66f4..ca015306b7b7023d3c9a85c685d38d4d1919c885 100644
--- a/src/libraries/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj
+++ b/src/libraries/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj
@@ -104,7 +104,7 @@
-
+
{69e46a6f-9966-45a5-8945-2559fe337827}
RemoteExecutorConsoleApp
diff --git a/src/libraries/System.Net.Sockets/tests/PerformanceTests/Configurations.props b/src/libraries/System.Net.Sockets/tests/PerformanceTests/Configurations.props
index a9c55e67cdf56367fb77a4bdb3e3b6a9ee65c8c9..8b21be4cd618f38d45ec46baf02dd55de2552f2f 100644
--- a/src/libraries/System.Net.Sockets/tests/PerformanceTests/Configurations.props
+++ b/src/libraries/System.Net.Sockets/tests/PerformanceTests/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard1.3-Unix;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.Sockets/tests/System.Net.Sockets.Tests.builds b/src/libraries/System.Net.Sockets/tests/System.Net.Sockets.Tests.builds
index 112bdc3272ba53f991590f178b5c2008e323637e..1ec047c6213df5d37efd89e62542ec3c141d2543 100644
--- a/src/libraries/System.Net.Sockets/tests/System.Net.Sockets.Tests.builds
+++ b/src/libraries/System.Net.Sockets/tests/System.Net.Sockets.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Net.WebClient/pkg/System.Net.WebClient.builds b/src/libraries/System.Net.WebClient/pkg/System.Net.WebClient.builds
index ec53b94c0cede728e312ceda024e644bbb05ab9b..2a5d63c96713fdf4d9b64cb7bd611fe699ef836c 100644
--- a/src/libraries/System.Net.WebClient/pkg/System.Net.WebClient.builds
+++ b/src/libraries/System.Net.WebClient/pkg/System.Net.WebClient.builds
@@ -1,8 +1,8 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.WebClient/pkg/System.Net.WebClient.pkgproj b/src/libraries/System.Net.WebClient/pkg/System.Net.WebClient.pkgproj
index c096c97d8c6518954b19ce16a8612a9a79028051..f9bbdbc7041f0890e56a25f92f15d84311810d11 100644
--- a/src/libraries/System.Net.WebClient/pkg/System.Net.WebClient.pkgproj
+++ b/src/libraries/System.Net.WebClient/pkg/System.Net.WebClient.pkgproj
@@ -1,13 +1,11 @@
-
+
-
- net461;netcoreapp1.1;$(AllXamarinFrameworks)
+ net461;netcoreapp2.0;$(AllXamarinFrameworks)
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.WebClient/ref/System.Net.WebClient.csproj b/src/libraries/System.Net.WebClient/ref/System.Net.WebClient.csproj
index 1e791d02eb31a08c47984574b241dbfb76b6d6d7..93f99e503d00a0648fe746f7de1ffe01696140cc 100644
--- a/src/libraries/System.Net.WebClient/ref/System.Net.WebClient.csproj
+++ b/src/libraries/System.Net.WebClient/ref/System.Net.WebClient.csproj
@@ -1,4 +1,4 @@
-
+
@@ -18,4 +18,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.WebClient/src/Configurations.props b/src/libraries/System.Net.WebClient/src/Configurations.props
index 53b62c64fea2475e524eb32a20b028ea109d4d41..bcfec4bbde61fa2877a42ca2e87056c258cd6c09 100644
--- a/src/libraries/System.Net.WebClient/src/Configurations.props
+++ b/src/libraries/System.Net.WebClient/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.WebClient/tests/Configurations.props b/src/libraries/System.Net.WebClient/tests/Configurations.props
index 98f53209d45a12360d0bbf7cf031b29ff556fc57..c398e42e899425ce70e3a9884633835ab6fcc66e 100644
--- a/src/libraries/System.Net.WebClient/tests/Configurations.props
+++ b/src/libraries/System.Net.WebClient/tests/Configurations.props
@@ -1,8 +1,8 @@
-
+
- netstandard1.7;
+ netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.WebClient/tests/System.Net.WebClient.Tests.builds b/src/libraries/System.Net.WebClient/tests/System.Net.WebClient.Tests.builds
index e456e44a6fe0dd747e0d2864d807880be90672c1..e39edecdfa2aa14b29969d421b1efbe77addeddc 100644
--- a/src/libraries/System.Net.WebClient/tests/System.Net.WebClient.Tests.builds
+++ b/src/libraries/System.Net.WebClient/tests/System.Net.WebClient.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Net.WebHeaderCollection/pkg/System.Net.WebHeaderCollection.builds b/src/libraries/System.Net.WebHeaderCollection/pkg/System.Net.WebHeaderCollection.builds
index a8ee0763efc8de6d17f79cec9b1df6263397e124..e67054922789fc8fe08ba0432fc68dee1f362040 100644
--- a/src/libraries/System.Net.WebHeaderCollection/pkg/System.Net.WebHeaderCollection.builds
+++ b/src/libraries/System.Net.WebHeaderCollection/pkg/System.Net.WebHeaderCollection.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.WebHeaderCollection/pkg/System.Net.WebHeaderCollection.pkgproj b/src/libraries/System.Net.WebHeaderCollection/pkg/System.Net.WebHeaderCollection.pkgproj
index f954a82522207b81a9ed425998dd832e1c41fc1f..e71d6adb05a99587655b2a7d8d19554cbdd40176 100644
--- a/src/libraries/System.Net.WebHeaderCollection/pkg/System.Net.WebHeaderCollection.pkgproj
+++ b/src/libraries/System.Net.WebHeaderCollection/pkg/System.Net.WebHeaderCollection.pkgproj
@@ -1,9 +1,9 @@
-
+
- net463;netcoreapp1.1;$(AllXamarinFrameworks)
+ net463;netcoreapp2.0;$(AllXamarinFrameworks)
diff --git a/src/libraries/System.Net.WebHeaderCollection/ref/System.Net.WebHeaderCollection.csproj b/src/libraries/System.Net.WebHeaderCollection/ref/System.Net.WebHeaderCollection.csproj
index 99b045400cbedf71a02d7bfc5749ee16c147f821..4809e5aa5d4a06af10fef3ad19d9d53201c23d2b 100644
--- a/src/libraries/System.Net.WebHeaderCollection/ref/System.Net.WebHeaderCollection.csproj
+++ b/src/libraries/System.Net.WebHeaderCollection/ref/System.Net.WebHeaderCollection.csproj
@@ -1,4 +1,4 @@
-
+
@@ -9,4 +9,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.WebHeaderCollection/src/Configurations.props b/src/libraries/System.Net.WebHeaderCollection/src/Configurations.props
index 9c336c0be9e52171e2fecf14214e3373be07177d..dc837f915219bcf7ff5c38f67e01c45d5b976485 100644
--- a/src/libraries/System.Net.WebHeaderCollection/src/Configurations.props
+++ b/src/libraries/System.Net.WebHeaderCollection/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.WebHeaderCollection/tests/Configurations.props b/src/libraries/System.Net.WebHeaderCollection/tests/Configurations.props
index 2a160a39e8e0fb8d6b51ee9d9e03c7dd30ee956c..211cd2bec829c39148b69aa2e0ab929f3d1e0b76 100644
--- a/src/libraries/System.Net.WebHeaderCollection/tests/Configurations.props
+++ b/src/libraries/System.Net.WebHeaderCollection/tests/Configurations.props
@@ -1,9 +1,9 @@
-
+
netstandard1.3-Windows_NT;
- netstandard1.7;
+ netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.WebHeaderCollection/tests/System.Net.WebHeaderCollection.Tests.builds b/src/libraries/System.Net.WebHeaderCollection/tests/System.Net.WebHeaderCollection.Tests.builds
index 55b11e71aa19015fdcb3bf2c9ccb8b62287c00e7..017a22f312c2ac98e10a657a07328ad97f70b0cb 100644
--- a/src/libraries/System.Net.WebHeaderCollection/tests/System.Net.WebHeaderCollection.Tests.builds
+++ b/src/libraries/System.Net.WebHeaderCollection/tests/System.Net.WebHeaderCollection.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Net.WebHeaderCollection/tests/System.Net.WebHeaderCollection.Tests.csproj b/src/libraries/System.Net.WebHeaderCollection/tests/System.Net.WebHeaderCollection.Tests.csproj
index 717969ab08b94fbffaf26455c439fcc9b2c8d30d..489c57b6574b064a9bf600ec79f093042c67698b 100644
--- a/src/libraries/System.Net.WebHeaderCollection/tests/System.Net.WebHeaderCollection.Tests.csproj
+++ b/src/libraries/System.Net.WebHeaderCollection/tests/System.Net.WebHeaderCollection.Tests.csproj
@@ -18,4 +18,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.WebProxy/pkg/System.Net.WebProxy.builds b/src/libraries/System.Net.WebProxy/pkg/System.Net.WebProxy.builds
index a03bbc640130506273d7e92dbc207a1c58633fc9..d2efaf4924e9e53f4050266d828ecfb6aea7db20 100644
--- a/src/libraries/System.Net.WebProxy/pkg/System.Net.WebProxy.builds
+++ b/src/libraries/System.Net.WebProxy/pkg/System.Net.WebProxy.builds
@@ -1,8 +1,8 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.WebProxy/pkg/System.Net.WebProxy.pkgproj b/src/libraries/System.Net.WebProxy/pkg/System.Net.WebProxy.pkgproj
index 5a16a2f3e6e6ce67aa9c8ebdfb4095ac0548d7d0..c7722057ba876fd013319e6c99786765ed350172 100644
--- a/src/libraries/System.Net.WebProxy/pkg/System.Net.WebProxy.pkgproj
+++ b/src/libraries/System.Net.WebProxy/pkg/System.Net.WebProxy.pkgproj
@@ -1,13 +1,11 @@
-
+
-
- net461;netcoreapp1.1;$(AllXamarinFrameworks)
+ net461;netcoreapp2.0;$(AllXamarinFrameworks)
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.WebProxy/ref/System.Net.WebProxy.csproj b/src/libraries/System.Net.WebProxy/ref/System.Net.WebProxy.csproj
index 3d4b79ab8cd360a8e95f5c099218441565dcf255..10158db0eb9082273e0ce61f1a24f0c43f7f1a57 100644
--- a/src/libraries/System.Net.WebProxy/ref/System.Net.WebProxy.csproj
+++ b/src/libraries/System.Net.WebProxy/ref/System.Net.WebProxy.csproj
@@ -1,4 +1,4 @@
-
+
@@ -11,4 +11,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.WebProxy/src/Configurations.props b/src/libraries/System.Net.WebProxy/src/Configurations.props
index 53b62c64fea2475e524eb32a20b028ea109d4d41..bcfec4bbde61fa2877a42ca2e87056c258cd6c09 100644
--- a/src/libraries/System.Net.WebProxy/src/Configurations.props
+++ b/src/libraries/System.Net.WebProxy/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.WebProxy/tests/Configurations.props b/src/libraries/System.Net.WebProxy/tests/Configurations.props
index 98f53209d45a12360d0bbf7cf031b29ff556fc57..c398e42e899425ce70e3a9884633835ab6fcc66e 100644
--- a/src/libraries/System.Net.WebProxy/tests/Configurations.props
+++ b/src/libraries/System.Net.WebProxy/tests/Configurations.props
@@ -1,8 +1,8 @@
-
+
- netstandard1.7;
+ netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.WebProxy/tests/System.Net.WebProxy.Tests.builds b/src/libraries/System.Net.WebProxy/tests/System.Net.WebProxy.Tests.builds
index fa5f48834fb88885cc77933b115d7cf592805a39..90bf363abdbf0878f40587d06778b662f04f5618 100644
--- a/src/libraries/System.Net.WebProxy/tests/System.Net.WebProxy.Tests.builds
+++ b/src/libraries/System.Net.WebProxy/tests/System.Net.WebProxy.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Net.WebSockets.Client/pkg/System.Net.WebSockets.Client.builds b/src/libraries/System.Net.WebSockets.Client/pkg/System.Net.WebSockets.Client.builds
index 57f06c788005f874d51d6240a74401add849a13d..c030fff6da261b3d31c640f222194a492bacf14e 100644
--- a/src/libraries/System.Net.WebSockets.Client/pkg/System.Net.WebSockets.Client.builds
+++ b/src/libraries/System.Net.WebSockets.Client/pkg/System.Net.WebSockets.Client.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.WebSockets.Client/pkg/System.Net.WebSockets.Client.pkgproj b/src/libraries/System.Net.WebSockets.Client/pkg/System.Net.WebSockets.Client.pkgproj
index 3081e1bce283a727eeb0bbe1441b936c3d97f8d2..776f94159c2ccdea1fe60c45d17714c5402ec3e6 100644
--- a/src/libraries/System.Net.WebSockets.Client/pkg/System.Net.WebSockets.Client.pkgproj
+++ b/src/libraries/System.Net.WebSockets.Client/pkg/System.Net.WebSockets.Client.pkgproj
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Net.WebSockets.Client/ref/System.Net.WebSockets.Client.csproj b/src/libraries/System.Net.WebSockets.Client/ref/System.Net.WebSockets.Client.csproj
index 9e8cc516e636e739facd47cb032598725dd7fef1..55682acf9d944d146150e82fcc3fd27abd1188d0 100644
--- a/src/libraries/System.Net.WebSockets.Client/ref/System.Net.WebSockets.Client.csproj
+++ b/src/libraries/System.Net.WebSockets.Client/ref/System.Net.WebSockets.Client.csproj
@@ -1,4 +1,4 @@
-
+
@@ -12,4 +12,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.WebSockets.Client/src/Configurations.props b/src/libraries/System.Net.WebSockets.Client/src/Configurations.props
index 7ba33a3388964c9cfb12cc20d920cbd0ee5baaa0..97415704bbe02bd446ca3b29e3ceac2e4740ba25 100644
--- a/src/libraries/System.Net.WebSockets.Client/src/Configurations.props
+++ b/src/libraries/System.Net.WebSockets.Client/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -8,4 +8,4 @@
net46-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.WebSockets.Client/tests/Configurations.props b/src/libraries/System.Net.WebSockets.Client/tests/Configurations.props
index 0c2d77f6b79987aca732f98ec3c9b79c3e7d5906..566c16a6e1e938ef4fb41df328ff37e6bb3cc46b 100644
--- a/src/libraries/System.Net.WebSockets.Client/tests/Configurations.props
+++ b/src/libraries/System.Net.WebSockets.Client/tests/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard1.3-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.builds b/src/libraries/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.builds
index 6d8cda612676de06e9b6841b525711a9adc26e86..ae33dead69dbfdb6d283c061d8f6f37ed262c241 100644
--- a/src/libraries/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.builds
+++ b/src/libraries/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Net.WebSockets/pkg/System.Net.WebSockets.builds b/src/libraries/System.Net.WebSockets/pkg/System.Net.WebSockets.builds
index fdf8453916eecb03c1f0a148ca16e7bd20763974..8506c9388def9d7c81c8e2d2a531c2f265343818 100644
--- a/src/libraries/System.Net.WebSockets/pkg/System.Net.WebSockets.builds
+++ b/src/libraries/System.Net.WebSockets/pkg/System.Net.WebSockets.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.WebSockets/pkg/System.Net.WebSockets.pkgproj b/src/libraries/System.Net.WebSockets/pkg/System.Net.WebSockets.pkgproj
index f0228f8cb2e5924aefed91cc0b94b29fe9a16e9c..e89b627959440217e9ea9c30aaae651404b75f1b 100644
--- a/src/libraries/System.Net.WebSockets/pkg/System.Net.WebSockets.pkgproj
+++ b/src/libraries/System.Net.WebSockets/pkg/System.Net.WebSockets.pkgproj
@@ -1,9 +1,9 @@
-
+
- net463;netcoreapp1.1;$(AllXamarinFrameworks)
+ net463;netcoreapp2.0;$(AllXamarinFrameworks)
diff --git a/src/libraries/System.Net.WebSockets/ref/System.Net.WebSockets.csproj b/src/libraries/System.Net.WebSockets/ref/System.Net.WebSockets.csproj
index 71dbfebf641eaf552eb53b75933e9118ca3db4c8..4edd70ab38e211c53a1e76e8b8882766cf23ffd4 100644
--- a/src/libraries/System.Net.WebSockets/ref/System.Net.WebSockets.csproj
+++ b/src/libraries/System.Net.WebSockets/ref/System.Net.WebSockets.csproj
@@ -1,4 +1,4 @@
-
+
@@ -14,4 +14,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.WebSockets/src/Configurations.props b/src/libraries/System.Net.WebSockets/src/Configurations.props
index 9c336c0be9e52171e2fecf14214e3373be07177d..dc837f915219bcf7ff5c38f67e01c45d5b976485 100644
--- a/src/libraries/System.Net.WebSockets/src/Configurations.props
+++ b/src/libraries/System.Net.WebSockets/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.WebSockets/tests/Configurations.props b/src/libraries/System.Net.WebSockets/tests/Configurations.props
index 98f53209d45a12360d0bbf7cf031b29ff556fc57..c398e42e899425ce70e3a9884633835ab6fcc66e 100644
--- a/src/libraries/System.Net.WebSockets/tests/Configurations.props
+++ b/src/libraries/System.Net.WebSockets/tests/Configurations.props
@@ -1,8 +1,8 @@
-
+
- netstandard1.7;
+ netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Net.WebSockets/tests/System.Net.WebSockets.Tests.builds b/src/libraries/System.Net.WebSockets/tests/System.Net.WebSockets.Tests.builds
index 9b9dd0127d9ae68ae1679863495e90d57a77514c..e8548b57289bc4bc2f919fb5829ac9b64a829948 100644
--- a/src/libraries/System.Net.WebSockets/tests/System.Net.WebSockets.Tests.builds
+++ b/src/libraries/System.Net.WebSockets/tests/System.Net.WebSockets.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Net.WebSockets/tests/System.Net.WebSockets.Tests.csproj b/src/libraries/System.Net.WebSockets/tests/System.Net.WebSockets.Tests.csproj
index 93278014372f88ada0fe38086c81547eb420708b..8ffc13af1fd9210ddb6ce78efb89a21bc2beefcf 100644
--- a/src/libraries/System.Net.WebSockets/tests/System.Net.WebSockets.Tests.csproj
+++ b/src/libraries/System.Net.WebSockets/tests/System.Net.WebSockets.Tests.csproj
@@ -15,4 +15,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Numerics.Vectors.WindowsRuntime/pkg/System.Numerics.Vectors.WindowsRuntime.builds b/src/libraries/System.Numerics.Vectors.WindowsRuntime/pkg/System.Numerics.Vectors.WindowsRuntime.builds
index b4f3e9b9fb71a562ec169241b2f61dc02ed4f0d3..2aa8fc1575a27a71ce2861f77d35bac6146390d4 100644
--- a/src/libraries/System.Numerics.Vectors.WindowsRuntime/pkg/System.Numerics.Vectors.WindowsRuntime.builds
+++ b/src/libraries/System.Numerics.Vectors.WindowsRuntime/pkg/System.Numerics.Vectors.WindowsRuntime.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Numerics.Vectors.WindowsRuntime/pkg/System.Numerics.Vectors.WindowsRuntime.pkgproj b/src/libraries/System.Numerics.Vectors.WindowsRuntime/pkg/System.Numerics.Vectors.WindowsRuntime.pkgproj
index b0fb6549eb2f704d56795fc25cc8dac6bca820fe..b6c34f29a96fdb3def61d15c4f05f17afded5f77 100644
--- a/src/libraries/System.Numerics.Vectors.WindowsRuntime/pkg/System.Numerics.Vectors.WindowsRuntime.pkgproj
+++ b/src/libraries/System.Numerics.Vectors.WindowsRuntime/pkg/System.Numerics.Vectors.WindowsRuntime.pkgproj
@@ -1,7 +1,6 @@
-
+
-
uap10.0
diff --git a/src/libraries/System.Numerics.Vectors.WindowsRuntime/src/System.Numerics.Vectors.WindowsRuntime.builds b/src/libraries/System.Numerics.Vectors.WindowsRuntime/src/System.Numerics.Vectors.WindowsRuntime.builds
index c78a6022e364075495711bbb21764ab31a29864a..81498874e3de5c281e113cd72a37599bfa965bbd 100644
--- a/src/libraries/System.Numerics.Vectors.WindowsRuntime/src/System.Numerics.Vectors.WindowsRuntime.builds
+++ b/src/libraries/System.Numerics.Vectors.WindowsRuntime/src/System.Numerics.Vectors.WindowsRuntime.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Numerics.Vectors/pkg/System.Numerics.Vectors.builds b/src/libraries/System.Numerics.Vectors/pkg/System.Numerics.Vectors.builds
index 1e08c3e5eea15800be5ee0bbcc1ca526215a860f..0205f9ff36b95eaab5f105b32f81adff7b20637b 100644
--- a/src/libraries/System.Numerics.Vectors/pkg/System.Numerics.Vectors.builds
+++ b/src/libraries/System.Numerics.Vectors/pkg/System.Numerics.Vectors.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Numerics.Vectors/pkg/System.Numerics.Vectors.pkgproj b/src/libraries/System.Numerics.Vectors/pkg/System.Numerics.Vectors.pkgproj
index f16a9985b66fa5be30a97a35f4ee3dbaaaf5ec6b..fc850b3b6aed65fe0c00c08785f507cdf624b5e6 100644
--- a/src/libraries/System.Numerics.Vectors/pkg/System.Numerics.Vectors.pkgproj
+++ b/src/libraries/System.Numerics.Vectors/pkg/System.Numerics.Vectors.pkgproj
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Numerics.Vectors/ref/System.Numerics.Vectors.csproj b/src/libraries/System.Numerics.Vectors/ref/System.Numerics.Vectors.csproj
index 5a1489d30eb9ff2863dc49a444053777b894d040..75ccd8fde39842c06c5d39cacf53b258d43a5c62 100644
--- a/src/libraries/System.Numerics.Vectors/ref/System.Numerics.Vectors.csproj
+++ b/src/libraries/System.Numerics.Vectors/ref/System.Numerics.Vectors.csproj
@@ -1,4 +1,4 @@
-
+
@@ -8,4 +8,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Numerics.Vectors/src/Configurations.props b/src/libraries/System.Numerics.Vectors/src/Configurations.props
index 67b41e20496873698a4c5495943102866e347954..40a36ccda6f99485681a6c7c45d4ac27cc864b99 100644
--- a/src/libraries/System.Numerics.Vectors/src/Configurations.props
+++ b/src/libraries/System.Numerics.Vectors/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard1.0;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Numerics.Vectors/tests/Configurations.props b/src/libraries/System.Numerics.Vectors/tests/Configurations.props
index f0ebe53119ec712315cfea5b151d5f0d754744f8..c3266e1e9362243b5723032465bcc7a62ae720ce 100644
--- a/src/libraries/System.Numerics.Vectors/tests/Configurations.props
+++ b/src/libraries/System.Numerics.Vectors/tests/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard1.3;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Numerics.Vectors/tests/System.Numerics.Vectors.Tests.builds b/src/libraries/System.Numerics.Vectors/tests/System.Numerics.Vectors.Tests.builds
index afc50f9f7912a45af0e3e30385575052f4b5c3da..f6b80b7c2d60a1ba42d9d854d4e6c696e9e76c68 100644
--- a/src/libraries/System.Numerics.Vectors/tests/System.Numerics.Vectors.Tests.builds
+++ b/src/libraries/System.Numerics.Vectors/tests/System.Numerics.Vectors.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.ObjectModel/pkg/System.ObjectModel.builds b/src/libraries/System.ObjectModel/pkg/System.ObjectModel.builds
index 94b0a2e8c844f9902ec5a08ce39a63fe96fe832d..8499df7e2b797e06437d35ed1a6c795879840081 100644
--- a/src/libraries/System.ObjectModel/pkg/System.ObjectModel.builds
+++ b/src/libraries/System.ObjectModel/pkg/System.ObjectModel.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.ObjectModel/pkg/System.ObjectModel.pkgproj b/src/libraries/System.ObjectModel/pkg/System.ObjectModel.pkgproj
index 9e8d34a80fec24ca1ac77900001edf9d8d20a6b7..d6e8922e5a8775f986cd33c7a29cbb0246420165 100644
--- a/src/libraries/System.ObjectModel/pkg/System.ObjectModel.pkgproj
+++ b/src/libraries/System.ObjectModel/pkg/System.ObjectModel.pkgproj
@@ -3,7 +3,7 @@
- net463;netcoreapp1.1;$(AllXamarinFrameworks)
+ net463;netcoreapp2.0;$(AllXamarinFrameworks)
diff --git a/src/libraries/System.ObjectModel/ref/Configurations.props b/src/libraries/System.ObjectModel/ref/Configurations.props
index ea9ea79f787f98f2eb7eacf21b28e53742aa9228..8b803e0772f2c937b70d75006295c7d12a140a32 100644
--- a/src/libraries/System.ObjectModel/ref/Configurations.props
+++ b/src/libraries/System.ObjectModel/ref/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.ObjectModel/ref/System.ObjectModel.csproj b/src/libraries/System.ObjectModel/ref/System.ObjectModel.csproj
index f8c8efff1a87d4ca79fdcc96cc17cbcaba6ea082..ce60d6721d2aca1c61e3d6285cd34d2867b3c8ec 100644
--- a/src/libraries/System.ObjectModel/ref/System.ObjectModel.csproj
+++ b/src/libraries/System.ObjectModel/ref/System.ObjectModel.csproj
@@ -1,4 +1,4 @@
-
+
@@ -12,4 +12,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.ObjectModel/src/Configurations.props b/src/libraries/System.ObjectModel/src/Configurations.props
index 9c336c0be9e52171e2fecf14214e3373be07177d..dc837f915219bcf7ff5c38f67e01c45d5b976485 100644
--- a/src/libraries/System.ObjectModel/src/Configurations.props
+++ b/src/libraries/System.ObjectModel/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.ObjectModel/tests/Configurations.props b/src/libraries/System.ObjectModel/tests/Configurations.props
index 11a862f3301a61858108329b4716b88a3ef1eff4..4c498002c4c7daca55140b1ffb9f876fc8469e4f 100644
--- a/src/libraries/System.ObjectModel/tests/Configurations.props
+++ b/src/libraries/System.ObjectModel/tests/Configurations.props
@@ -1,10 +1,10 @@
-
+
netstandard1.3;
- netstandard1.7;
- netcoreapp1.1;
+ netstandard;
+ netcoreapp;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.ObjectModel/tests/System.ObjectModel.Tests.builds b/src/libraries/System.ObjectModel/tests/System.ObjectModel.Tests.builds
index d7483f92b3ad45556c3e4459772aa3fc97375615..72d285ec170edebc880f9a3ca769f7f9383ba3ac 100644
--- a/src/libraries/System.ObjectModel/tests/System.ObjectModel.Tests.builds
+++ b/src/libraries/System.ObjectModel/tests/System.ObjectModel.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.ObjectModel/tests/System.ObjectModel.Tests.csproj b/src/libraries/System.ObjectModel/tests/System.ObjectModel.Tests.csproj
index 757464cfcfb666f83c64a8c7b5e17e48262bcf13..55d772b55fa4970ac2a53fed38f77916fc61d8bf 100644
--- a/src/libraries/System.ObjectModel/tests/System.ObjectModel.Tests.csproj
+++ b/src/libraries/System.ObjectModel/tests/System.ObjectModel.Tests.csproj
@@ -54,4 +54,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Private.DataContractSerialization/pkg/System.Private.DataContractSerialization.builds b/src/libraries/System.Private.DataContractSerialization/pkg/System.Private.DataContractSerialization.builds
index c55d4307eb6217c9d9df66fe430e7ef8623bdc56..24c45bc040f143cb91aedd1b4919fb14c9f455a0 100644
--- a/src/libraries/System.Private.DataContractSerialization/pkg/System.Private.DataContractSerialization.builds
+++ b/src/libraries/System.Private.DataContractSerialization/pkg/System.Private.DataContractSerialization.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Private.DataContractSerialization/src/Configurations.props b/src/libraries/System.Private.DataContractSerialization/src/Configurations.props
index fc9ef9822c01e3840af50ced2f25bdc2f5349eca..c398e42e899425ce70e3a9884633835ab6fcc66e 100644
--- a/src/libraries/System.Private.DataContractSerialization/src/Configurations.props
+++ b/src/libraries/System.Private.DataContractSerialization/src/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Private.Uri/pkg/System.Private.Uri.builds b/src/libraries/System.Private.Uri/pkg/System.Private.Uri.builds
index f10b0b34b041cea5ca485c1810ca36923133c874..3a104218412430af4651e29b943a6d7f22cbf20f 100644
--- a/src/libraries/System.Private.Uri/pkg/System.Private.Uri.builds
+++ b/src/libraries/System.Private.Uri/pkg/System.Private.Uri.builds
@@ -1,8 +1,8 @@
-
+
-
+
Windows_NT
diff --git a/src/libraries/System.Private.Uri/pkg/unix/System.Private.Uri.pkgproj b/src/libraries/System.Private.Uri/pkg/unix/System.Private.Uri.pkgproj
index 4dd94eacffc0af2b220495ee72006ff593eb1f1f..6b47b0b819812bc11bf823e33660f7d747810073 100644
--- a/src/libraries/System.Private.Uri/pkg/unix/System.Private.Uri.pkgproj
+++ b/src/libraries/System.Private.Uri/pkg/unix/System.Private.Uri.pkgproj
@@ -1,13 +1,12 @@
-
+
-
unix
true
-
+
Unix
@@ -15,6 +14,5 @@
Unix
-
\ No newline at end of file
diff --git a/src/libraries/System.Private.Uri/pkg/win/System.Private.Uri.pkgproj b/src/libraries/System.Private.Uri/pkg/win/System.Private.Uri.pkgproj
index fe9ac10f723620072ba59daa37bc2ee5aad8eb48..45a174b236a67f758b57d1a5f9f513828c39ea99 100644
--- a/src/libraries/System.Private.Uri/pkg/win/System.Private.Uri.pkgproj
+++ b/src/libraries/System.Private.Uri/pkg/win/System.Private.Uri.pkgproj
@@ -19,4 +19,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Private.Uri/src/Configurations.props b/src/libraries/System.Private.Uri/src/Configurations.props
index f2122dc3ce14424ebdf5d9eb459f3461b4a06652..f1d74a5c3ed9d68f2563093383e487bf7e35ccbf 100644
--- a/src/libraries/System.Private.Uri/src/Configurations.props
+++ b/src/libraries/System.Private.Uri/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -9,4 +9,4 @@
netcoreapp1.2corert-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Private.Uri/tests/FunctionalTests/System.Private.Uri.Functional.Tests.csproj b/src/libraries/System.Private.Uri/tests/FunctionalTests/System.Private.Uri.Functional.Tests.csproj
index 504b5543ab78ad58c260296ab6c76bce7180106f..5e5cf8f6a845764bf9b5bcda845aa5606dd77f84 100644
--- a/src/libraries/System.Private.Uri/tests/FunctionalTests/System.Private.Uri.Functional.Tests.csproj
+++ b/src/libraries/System.Private.Uri/tests/FunctionalTests/System.Private.Uri.Functional.Tests.csproj
@@ -34,4 +34,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Private.Uri/tests/System.Private.Uri.Tests.builds b/src/libraries/System.Private.Uri/tests/System.Private.Uri.Tests.builds
index 1cea1b3e8cef5194ce7df819051cd9bef98efd5a..702cafe2c3daed4af21f908c7ea6fd596adfec42 100644
--- a/src/libraries/System.Private.Uri/tests/System.Private.Uri.Tests.builds
+++ b/src/libraries/System.Private.Uri/tests/System.Private.Uri.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Private.Xml.Linq/pkg/System.Private.Xml.Linq.builds b/src/libraries/System.Private.Xml.Linq/pkg/System.Private.Xml.Linq.builds
index 497c57c6d5513927b611134e54b29ab348e5aa6b..b3597c9962c7a44358705a9800da6e2a4655c58a 100644
--- a/src/libraries/System.Private.Xml.Linq/pkg/System.Private.Xml.Linq.builds
+++ b/src/libraries/System.Private.Xml.Linq/pkg/System.Private.Xml.Linq.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Private.Xml.Linq/src/Configurations.props b/src/libraries/System.Private.Xml.Linq/src/Configurations.props
index 9c336c0be9e52171e2fecf14214e3373be07177d..dc837f915219bcf7ff5c38f67e01c45d5b976485 100644
--- a/src/libraries/System.Private.Xml.Linq/src/Configurations.props
+++ b/src/libraries/System.Private.Xml.Linq/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Private.Xml.Linq/tests/System.Private.Xml.Linq.Tests.builds b/src/libraries/System.Private.Xml.Linq/tests/System.Private.Xml.Linq.Tests.builds
index 562f456691ea1c16a98e7be82db4c4719507e0e2..4dfda95e2651bf8e23a11b16df1e74c2bd147323 100644
--- a/src/libraries/System.Private.Xml.Linq/tests/System.Private.Xml.Linq.Tests.builds
+++ b/src/libraries/System.Private.Xml.Linq/tests/System.Private.Xml.Linq.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Private.Xml.Linq/tests/TreeManipulation/System.Xml.Linq.TreeManipulation.Tests.csproj b/src/libraries/System.Private.Xml.Linq/tests/TreeManipulation/System.Xml.Linq.TreeManipulation.Tests.csproj
index 2c78626fb6aa3d038f71bcad08b649ba322778a1..94d5f4d7a7025e9c16d90e274f644f6ee70ebebe 100644
--- a/src/libraries/System.Private.Xml.Linq/tests/TreeManipulation/System.Xml.Linq.TreeManipulation.Tests.csproj
+++ b/src/libraries/System.Private.Xml.Linq/tests/TreeManipulation/System.Xml.Linq.TreeManipulation.Tests.csproj
@@ -60,4 +60,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Private.Xml.Linq/tests/XDocument.Common/Configurations.props b/src/libraries/System.Private.Xml.Linq/tests/XDocument.Common/Configurations.props
index f0ebe53119ec712315cfea5b151d5f0d754744f8..c3266e1e9362243b5723032465bcc7a62ae720ce 100644
--- a/src/libraries/System.Private.Xml.Linq/tests/XDocument.Common/Configurations.props
+++ b/src/libraries/System.Private.Xml.Linq/tests/XDocument.Common/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard1.3;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Private.Xml.Linq/tests/events/Configurations.props b/src/libraries/System.Private.Xml.Linq/tests/events/Configurations.props
index f0ebe53119ec712315cfea5b151d5f0d754744f8..c3266e1e9362243b5723032465bcc7a62ae720ce 100644
--- a/src/libraries/System.Private.Xml.Linq/tests/events/Configurations.props
+++ b/src/libraries/System.Private.Xml.Linq/tests/events/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard1.3;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Private.Xml/pkg/System.Private.Xml.builds b/src/libraries/System.Private.Xml/pkg/System.Private.Xml.builds
index d3737b06198c0975a4796c33d9a2d7ed9d63187d..9eba815c824f314901bb29c88cd942f3958d5824 100644
--- a/src/libraries/System.Private.Xml/pkg/System.Private.Xml.builds
+++ b/src/libraries/System.Private.Xml/pkg/System.Private.Xml.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Private.Xml/src/Configurations.props b/src/libraries/System.Private.Xml/src/Configurations.props
index 58b5995845ebfce2df94ed7db71f2ad38a0a9410..f333d20c1aaa0def1effff2d5dec5aa1ce22767a 100644
--- a/src/libraries/System.Private.Xml/src/Configurations.props
+++ b/src/libraries/System.Private.Xml/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard-Unix;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Private.Xml/tests/System.Private.Xml.Tests.builds b/src/libraries/System.Private.Xml/tests/System.Private.Xml.Tests.builds
index 06b5cf7ebedd94208cabad60325bd2088e7b74f6..c29e81fb965cc44252b3a5222dd260ed3a2ecd55 100644
--- a/src/libraries/System.Private.Xml/tests/System.Private.Xml.Tests.builds
+++ b/src/libraries/System.Private.Xml/tests/System.Private.Xml.Tests.builds
@@ -1,4 +1,4 @@
-
+
@@ -97,7 +97,7 @@
netcoreapp1.0;net46
- netcoreapp1.1
+ netcoreapp
diff --git a/src/libraries/System.Private.Xml/tests/XmlSerializer/ReflectionOnly/System.Xml.XmlSerializer.ReflectionOnly.Tests.csproj b/src/libraries/System.Private.Xml/tests/XmlSerializer/ReflectionOnly/System.Xml.XmlSerializer.ReflectionOnly.Tests.csproj
index 1db27992b8d7c4f1f07c19663a4948ebb1ed0f39..b999ccf18ce62fc0d3a151d280edc4b1f70c7fd5 100644
--- a/src/libraries/System.Private.Xml/tests/XmlSerializer/ReflectionOnly/System.Xml.XmlSerializer.ReflectionOnly.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/XmlSerializer/ReflectionOnly/System.Xml.XmlSerializer.ReflectionOnly.Tests.csproj
@@ -1,11 +1,12 @@
-
+
-
+
$(DefineConstants);ReflectionOnly
System.Xml.XmlSerializer.ReflectionOnly.Tests
System.Xml.XmlSerializer.ReflectionOnly.Tests
- {4050F1D1-1DD2-4B48-A17B-E3F955518C4B}
+ {4050F1D1-1DD2-4B48-A17B-E3F955518C4B}
+ .NETStandard,Version=v2.0
@@ -18,4 +19,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Reflection.Context/pkg/System.Reflection.Context.builds b/src/libraries/System.Reflection.Context/pkg/System.Reflection.Context.builds
index 242a90983df5f985a8e8077f7597032780d82b89..7cd0fa93ca69247c93efbd93330930c9b844906b 100644
--- a/src/libraries/System.Reflection.Context/pkg/System.Reflection.Context.builds
+++ b/src/libraries/System.Reflection.Context/pkg/System.Reflection.Context.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Reflection.Context/ref/System.Reflection.Context.csproj b/src/libraries/System.Reflection.Context/ref/System.Reflection.Context.csproj
index e0aa96f6a1bf83169363b51c8aefd5f43579113b..8775e64b6a8ea4168818d242d4b2a2eb9bf1ca84 100644
--- a/src/libraries/System.Reflection.Context/ref/System.Reflection.Context.csproj
+++ b/src/libraries/System.Reflection.Context/ref/System.Reflection.Context.csproj
@@ -1,4 +1,4 @@
-
+
@@ -13,4 +13,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Reflection.Context/src/Configurations.props b/src/libraries/System.Reflection.Context/src/Configurations.props
index 46f8a8ce697ac78e74d94f3db160d1b9c76fbcda..0a63ad210a40ba7d58aecefef1e69a9496a3ede2 100644
--- a/src/libraries/System.Reflection.Context/src/Configurations.props
+++ b/src/libraries/System.Reflection.Context/src/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard1.1;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Reflection.Context/tests/Configurations.props b/src/libraries/System.Reflection.Context/tests/Configurations.props
index f0ebe53119ec712315cfea5b151d5f0d754744f8..c3266e1e9362243b5723032465bcc7a62ae720ce 100644
--- a/src/libraries/System.Reflection.Context/tests/Configurations.props
+++ b/src/libraries/System.Reflection.Context/tests/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard1.3;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Reflection.Context/tests/System.Reflection.Context.Tests.builds b/src/libraries/System.Reflection.Context/tests/System.Reflection.Context.Tests.builds
index 1f0fb9eb83831bca9b5af6c90c6daa194af51f99..a004efb1dd3b7162ddab310ee62d036be65c186c 100644
--- a/src/libraries/System.Reflection.Context/tests/System.Reflection.Context.Tests.builds
+++ b/src/libraries/System.Reflection.Context/tests/System.Reflection.Context.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Reflection.DispatchProxy/pkg/System.Reflection.DispatchProxy.builds b/src/libraries/System.Reflection.DispatchProxy/pkg/System.Reflection.DispatchProxy.builds
index be6753dbdf31f6d2d669471692318638d79c79db..6652077af0203773e2115b156f6b73123d5a3fc0 100644
--- a/src/libraries/System.Reflection.DispatchProxy/pkg/System.Reflection.DispatchProxy.builds
+++ b/src/libraries/System.Reflection.DispatchProxy/pkg/System.Reflection.DispatchProxy.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
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 ef7a75e3a13386e3ca7fffe646303f15a91c0619..054a662200c94b682c5d5ee9eeae4d4f958e575a 100644
--- a/src/libraries/System.Reflection.DispatchProxy/pkg/System.Reflection.DispatchProxy.pkgproj
+++ b/src/libraries/System.Reflection.DispatchProxy/pkg/System.Reflection.DispatchProxy.pkgproj
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Reflection.DispatchProxy/ref/System.Reflection.DispatchProxy.csproj b/src/libraries/System.Reflection.DispatchProxy/ref/System.Reflection.DispatchProxy.csproj
index 453c235dd3237c4030fa89715ad5d76556abd6a9..b258a1d273a392c7991b108eaf24a987ea580a88 100644
--- a/src/libraries/System.Reflection.DispatchProxy/ref/System.Reflection.DispatchProxy.csproj
+++ b/src/libraries/System.Reflection.DispatchProxy/ref/System.Reflection.DispatchProxy.csproj
@@ -1,4 +1,4 @@
-
+
@@ -13,4 +13,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Reflection.DispatchProxy/src/Configurations.props b/src/libraries/System.Reflection.DispatchProxy/src/Configurations.props
index faaee17d9594720fdeeff768621b64a7db6e885c..385111b849345f9572b369cc8ad037f501f7f242 100644
--- a/src/libraries/System.Reflection.DispatchProxy/src/Configurations.props
+++ b/src/libraries/System.Reflection.DispatchProxy/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard1.3;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Reflection.DispatchProxy/tests/Configurations.props b/src/libraries/System.Reflection.DispatchProxy/tests/Configurations.props
index f0ebe53119ec712315cfea5b151d5f0d754744f8..c3266e1e9362243b5723032465bcc7a62ae720ce 100644
--- a/src/libraries/System.Reflection.DispatchProxy/tests/Configurations.props
+++ b/src/libraries/System.Reflection.DispatchProxy/tests/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard1.3;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Reflection.DispatchProxy/tests/System.Reflection.DispatchProxy.Tests.builds b/src/libraries/System.Reflection.DispatchProxy/tests/System.Reflection.DispatchProxy.Tests.builds
index 12c39021d42cddb40bcb4026da0f70481d83fad6..97a65cab500884eeaaa9ccee63fe4ee7853bce16 100644
--- a/src/libraries/System.Reflection.DispatchProxy/tests/System.Reflection.DispatchProxy.Tests.builds
+++ b/src/libraries/System.Reflection.DispatchProxy/tests/System.Reflection.DispatchProxy.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Reflection.Emit.ILGeneration/pkg/System.Reflection.Emit.ILGeneration.builds b/src/libraries/System.Reflection.Emit.ILGeneration/pkg/System.Reflection.Emit.ILGeneration.builds
index ed0c12b133a543666887a3b2290afc5c8dbf52fb..e7448458c51340a851c64464cc1f9f48527d3a51 100644
--- a/src/libraries/System.Reflection.Emit.ILGeneration/pkg/System.Reflection.Emit.ILGeneration.builds
+++ b/src/libraries/System.Reflection.Emit.ILGeneration/pkg/System.Reflection.Emit.ILGeneration.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Reflection.Emit.ILGeneration/ref/System.Reflection.Emit.ILGeneration.csproj b/src/libraries/System.Reflection.Emit.ILGeneration/ref/System.Reflection.Emit.ILGeneration.csproj
index d8396c3a9863115517e69fd314016f5daeb5e5e4..e066ba3632441dbb5c846f07c77e7495dc5a6b42 100644
--- a/src/libraries/System.Reflection.Emit.ILGeneration/ref/System.Reflection.Emit.ILGeneration.csproj
+++ b/src/libraries/System.Reflection.Emit.ILGeneration/ref/System.Reflection.Emit.ILGeneration.csproj
@@ -1,4 +1,4 @@
-
+
@@ -10,4 +10,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Reflection.Emit.ILGeneration/src/Configurations.props b/src/libraries/System.Reflection.Emit.ILGeneration/src/Configurations.props
index f0ebe53119ec712315cfea5b151d5f0d754744f8..c3266e1e9362243b5723032465bcc7a62ae720ce 100644
--- a/src/libraries/System.Reflection.Emit.ILGeneration/src/Configurations.props
+++ b/src/libraries/System.Reflection.Emit.ILGeneration/src/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard1.3;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Reflection.Emit.ILGeneration/tests/Configurations.props b/src/libraries/System.Reflection.Emit.ILGeneration/tests/Configurations.props
index f0ebe53119ec712315cfea5b151d5f0d754744f8..c3266e1e9362243b5723032465bcc7a62ae720ce 100644
--- a/src/libraries/System.Reflection.Emit.ILGeneration/tests/Configurations.props
+++ b/src/libraries/System.Reflection.Emit.ILGeneration/tests/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard1.3;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Reflection.Emit.ILGeneration/tests/System.Reflection.Emit.ILGeneration.Tests.builds b/src/libraries/System.Reflection.Emit.ILGeneration/tests/System.Reflection.Emit.ILGeneration.Tests.builds
index 4b5faaf87a05d373735b45e750db12fdc45b20ea..32cd7387862aee639aba9bb3cda1fce17c14fc79 100644
--- a/src/libraries/System.Reflection.Emit.ILGeneration/tests/System.Reflection.Emit.ILGeneration.Tests.builds
+++ b/src/libraries/System.Reflection.Emit.ILGeneration/tests/System.Reflection.Emit.ILGeneration.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Reflection.Emit.Lightweight/pkg/System.Reflection.Emit.Lightweight.builds b/src/libraries/System.Reflection.Emit.Lightweight/pkg/System.Reflection.Emit.Lightweight.builds
index 0b9baf62051661ad4d38c2a01edbd50d7a95abb6..966676a5be18f05549240985410c2f7600cc5954 100644
--- a/src/libraries/System.Reflection.Emit.Lightweight/pkg/System.Reflection.Emit.Lightweight.builds
+++ b/src/libraries/System.Reflection.Emit.Lightweight/pkg/System.Reflection.Emit.Lightweight.builds
@@ -1,8 +1,8 @@
-
+
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Reflection.Emit.Lightweight/pkg/System.Reflection.Emit.Lightweight.pkgproj b/src/libraries/System.Reflection.Emit.Lightweight/pkg/System.Reflection.Emit.Lightweight.pkgproj
index d6fa0ae25b9e9312dd9e8ee2c7d5fe7f5544a34a..94f7306f2bacd495f8de857a8a6fd1bae5edefe2 100644
--- a/src/libraries/System.Reflection.Emit.Lightweight/pkg/System.Reflection.Emit.Lightweight.pkgproj
+++ b/src/libraries/System.Reflection.Emit.Lightweight/pkg/System.Reflection.Emit.Lightweight.pkgproj
@@ -29,4 +29,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Reflection.Emit.Lightweight/ref/System.Reflection.Emit.Lightweight.csproj b/src/libraries/System.Reflection.Emit.Lightweight/ref/System.Reflection.Emit.Lightweight.csproj
index 8471275d45983761f2cbb09c35b2a4dc13898c7d..908d46002c96874ac41e490261848af0331bb336 100644
--- a/src/libraries/System.Reflection.Emit.Lightweight/ref/System.Reflection.Emit.Lightweight.csproj
+++ b/src/libraries/System.Reflection.Emit.Lightweight/ref/System.Reflection.Emit.Lightweight.csproj
@@ -1,4 +1,4 @@
-
+
@@ -9,4 +9,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Reflection.Emit.Lightweight/src/Configurations.props b/src/libraries/System.Reflection.Emit.Lightweight/src/Configurations.props
index f0ebe53119ec712315cfea5b151d5f0d754744f8..c3266e1e9362243b5723032465bcc7a62ae720ce 100644
--- a/src/libraries/System.Reflection.Emit.Lightweight/src/Configurations.props
+++ b/src/libraries/System.Reflection.Emit.Lightweight/src/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard1.3;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Reflection.Emit.Lightweight/tests/Configurations.props b/src/libraries/System.Reflection.Emit.Lightweight/tests/Configurations.props
index f0ebe53119ec712315cfea5b151d5f0d754744f8..c3266e1e9362243b5723032465bcc7a62ae720ce 100644
--- a/src/libraries/System.Reflection.Emit.Lightweight/tests/Configurations.props
+++ b/src/libraries/System.Reflection.Emit.Lightweight/tests/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard1.3;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Reflection.Emit.Lightweight/tests/System.Reflection.Emit.Lightweight.Tests.builds b/src/libraries/System.Reflection.Emit.Lightweight/tests/System.Reflection.Emit.Lightweight.Tests.builds
index 28a101c79fff9b268acc159cfdc55f82ba0acd11..7c20446f451921ae38d9e6573d3c9677ea4f3991 100644
--- a/src/libraries/System.Reflection.Emit.Lightweight/tests/System.Reflection.Emit.Lightweight.Tests.builds
+++ b/src/libraries/System.Reflection.Emit.Lightweight/tests/System.Reflection.Emit.Lightweight.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Reflection.Emit/pkg/System.Reflection.Emit.builds b/src/libraries/System.Reflection.Emit/pkg/System.Reflection.Emit.builds
index 540a61d0997b93d5160cca10fdc7ee95899c1e52..2174cb0d38739c63c82903498b92a67e5f6298bd 100644
--- a/src/libraries/System.Reflection.Emit/pkg/System.Reflection.Emit.builds
+++ b/src/libraries/System.Reflection.Emit/pkg/System.Reflection.Emit.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Reflection.Emit/ref/System.Reflection.Emit.csproj b/src/libraries/System.Reflection.Emit/ref/System.Reflection.Emit.csproj
index 6941527b232724e953561bd2509c59372b9a8224..2660739dbfc5b809d83469ec34da9638638d363f 100644
--- a/src/libraries/System.Reflection.Emit/ref/System.Reflection.Emit.csproj
+++ b/src/libraries/System.Reflection.Emit/ref/System.Reflection.Emit.csproj
@@ -1,4 +1,4 @@
-
+
@@ -10,4 +10,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Reflection.Emit/src/Configurations.props b/src/libraries/System.Reflection.Emit/src/Configurations.props
index f0ebe53119ec712315cfea5b151d5f0d754744f8..c3266e1e9362243b5723032465bcc7a62ae720ce 100644
--- a/src/libraries/System.Reflection.Emit/src/Configurations.props
+++ b/src/libraries/System.Reflection.Emit/src/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard1.3;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Reflection.Emit/tests/Configurations.props b/src/libraries/System.Reflection.Emit/tests/Configurations.props
index f0ebe53119ec712315cfea5b151d5f0d754744f8..c3266e1e9362243b5723032465bcc7a62ae720ce 100644
--- a/src/libraries/System.Reflection.Emit/tests/Configurations.props
+++ b/src/libraries/System.Reflection.Emit/tests/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard1.3;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Reflection.Emit/tests/System.Reflection.Emit.Tests.builds b/src/libraries/System.Reflection.Emit/tests/System.Reflection.Emit.Tests.builds
index f56457980e3682bfd7ebc669a267745d9742d68b..a08c5f61e510b99165fdc4221f74c95be480733e 100644
--- a/src/libraries/System.Reflection.Emit/tests/System.Reflection.Emit.Tests.builds
+++ b/src/libraries/System.Reflection.Emit/tests/System.Reflection.Emit.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Reflection.Extensions/pkg/System.Reflection.Extensions.builds b/src/libraries/System.Reflection.Extensions/pkg/System.Reflection.Extensions.builds
index cd976c3f7a52f956e275541c0fc5a8cccd80ea38..cdeedb450c574ae9f8fe1751daf22b0240304f29 100644
--- a/src/libraries/System.Reflection.Extensions/pkg/System.Reflection.Extensions.builds
+++ b/src/libraries/System.Reflection.Extensions/pkg/System.Reflection.Extensions.builds
@@ -5,4 +5,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Reflection.Extensions/pkg/System.Reflection.Extensions.pkgproj b/src/libraries/System.Reflection.Extensions/pkg/System.Reflection.Extensions.pkgproj
index 79825a4aaa559c946c264e258e7929f4d3aca0d5..c93a2f6e8a7bc77daf0ddd529d737b013651a008 100644
--- a/src/libraries/System.Reflection.Extensions/pkg/System.Reflection.Extensions.pkgproj
+++ b/src/libraries/System.Reflection.Extensions/pkg/System.Reflection.Extensions.pkgproj
@@ -1,9 +1,9 @@
-
+
- net463;netcoreapp1.1;uap10.1;$(AllXamarinFrameworks)
+ net463;netcoreapp2.0;uap10.1;$(AllXamarinFrameworks)
@@ -24,7 +24,7 @@
ref/netstandard
4.3.0
-
+
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Reflection.Extensions/ref/System.Reflection.Extensions.csproj b/src/libraries/System.Reflection.Extensions/ref/System.Reflection.Extensions.csproj
index b27943b305e9ce3c4c1ae3d19f7aeedf4602e1d9..18afdb09a661bc0aa699245bd694adac73cec9cb 100644
--- a/src/libraries/System.Reflection.Extensions/ref/System.Reflection.Extensions.csproj
+++ b/src/libraries/System.Reflection.Extensions/ref/System.Reflection.Extensions.csproj
@@ -1,4 +1,4 @@
-
+
@@ -10,4 +10,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Reflection.Extensions/src/Configurations.props b/src/libraries/System.Reflection.Extensions/src/Configurations.props
index f013d10b8ccc3f86eab07075639f01c909892d84..ed0bd2acc95b9edfd29df7e7b1e40ebe4f105079 100644
--- a/src/libraries/System.Reflection.Extensions/src/Configurations.props
+++ b/src/libraries/System.Reflection.Extensions/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -7,4 +7,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Reflection.Extensions/src/System.Reflection.Extensions.csproj b/src/libraries/System.Reflection.Extensions/src/System.Reflection.Extensions.csproj
index 45d563ebc440d884cccd7d6f333b4976aebd720c..1675e21c5c992fb7ffc11c4dd5853bc9a3a2eee9 100644
--- a/src/libraries/System.Reflection.Extensions/src/System.Reflection.Extensions.csproj
+++ b/src/libraries/System.Reflection.Extensions/src/System.Reflection.Extensions.csproj
@@ -8,7 +8,7 @@
true
true
- netstandard1.7;uap10.1
+ netstandard;uap10.1
diff --git a/src/libraries/System.Reflection.Extensions/tests/Configurations.props b/src/libraries/System.Reflection.Extensions/tests/Configurations.props
index f0ebe53119ec712315cfea5b151d5f0d754744f8..c3266e1e9362243b5723032465bcc7a62ae720ce 100644
--- a/src/libraries/System.Reflection.Extensions/tests/Configurations.props
+++ b/src/libraries/System.Reflection.Extensions/tests/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard1.3;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Reflection.Extensions/tests/System.Reflection.Extensions.Tests.builds b/src/libraries/System.Reflection.Extensions/tests/System.Reflection.Extensions.Tests.builds
index 100b4aacfed101115f5feff973da0ae510c8ea37..0a1a36f94bcbabc11792d70e390708e1e8a5127e 100644
--- a/src/libraries/System.Reflection.Extensions/tests/System.Reflection.Extensions.Tests.builds
+++ b/src/libraries/System.Reflection.Extensions/tests/System.Reflection.Extensions.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Reflection.Metadata/pkg/System.Reflection.Metadata.builds b/src/libraries/System.Reflection.Metadata/pkg/System.Reflection.Metadata.builds
index 2ee524940b70a2e2cb0e3dcdaa747d647f68786a..7cb2252b174ea17035ce0fb46837a418be996bb3 100644
--- a/src/libraries/System.Reflection.Metadata/pkg/System.Reflection.Metadata.builds
+++ b/src/libraries/System.Reflection.Metadata/pkg/System.Reflection.Metadata.builds
@@ -1,8 +1,8 @@
-
+
-
+
\ No newline at end of file
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 1d7a554709ed8c3cc74523d587316b15c9330824..b5c6ffae107cbdb0527335abab050951ecfad577 100644
--- a/src/libraries/System.Reflection.Metadata/pkg/System.Reflection.Metadata.pkgproj
+++ b/src/libraries/System.Reflection.Metadata/pkg/System.Reflection.Metadata.pkgproj
@@ -1,11 +1,10 @@
-
+
2.8.6
-
net45;netcore45;netcoreapp1.0;wpa81;$(AllXamarinFrameworks)
@@ -15,6 +14,5 @@
1.1.37
-
\ No newline at end of file
diff --git a/src/libraries/System.Reflection.Metadata/src/Configurations.props b/src/libraries/System.Reflection.Metadata/src/Configurations.props
index 46f8a8ce697ac78e74d94f3db160d1b9c76fbcda..0a63ad210a40ba7d58aecefef1e69a9496a3ede2 100644
--- a/src/libraries/System.Reflection.Metadata/src/Configurations.props
+++ b/src/libraries/System.Reflection.Metadata/src/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard1.1;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Reflection.Metadata/tests/Configurations.props b/src/libraries/System.Reflection.Metadata/tests/Configurations.props
index 30186bb80bd8c011c0ddf7189005a59fca562194..2c5652de538d40d79af656d1d583ae53740199b5 100644
--- a/src/libraries/System.Reflection.Metadata/tests/Configurations.props
+++ b/src/libraries/System.Reflection.Metadata/tests/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard1.5;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.builds b/src/libraries/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.builds
index 18cf7c3756636bcaf0428b31f995a155170ffb8d..4b92b459d4a1a0537e6cce4e0a9619b3965bea5b 100644
--- a/src/libraries/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.builds
+++ b/src/libraries/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Reflection.Primitives/pkg/System.Reflection.Primitives.pkgproj b/src/libraries/System.Reflection.Primitives/pkg/System.Reflection.Primitives.pkgproj
index d12153b910e64962f0d654f149189fcf6a571b79..9c9b4dd2b56dcd6f5a2171395a57af11cc626e7c 100644
--- a/src/libraries/System.Reflection.Primitives/pkg/System.Reflection.Primitives.pkgproj
+++ b/src/libraries/System.Reflection.Primitives/pkg/System.Reflection.Primitives.pkgproj
@@ -1,11 +1,11 @@
-
+
- net463;netcoreapp1.1;uap10.1;$(AllXamarinFrameworks)
+ net463;netcoreapp2.0;uap10.1;$(AllXamarinFrameworks)
-
+
net463
@@ -15,8 +15,8 @@
-
+
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Reflection.Primitives/pkg/any/System.Reflection.Primitives.pkgproj b/src/libraries/System.Reflection.Primitives/pkg/any/System.Reflection.Primitives.pkgproj
index fc802c927999918682d11036502ff7d3bdf6eaa9..6fbcf7989ae63f3c9aa49a47d0a0fb7826d1e99a 100644
--- a/src/libraries/System.Reflection.Primitives/pkg/any/System.Reflection.Primitives.pkgproj
+++ b/src/libraries/System.Reflection.Primitives/pkg/any/System.Reflection.Primitives.pkgproj
@@ -5,10 +5,8 @@
any
true
-
-
@@ -23,4 +21,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Reflection.Primitives/pkg/aot/System.Reflection.Primitives.pkgproj b/src/libraries/System.Reflection.Primitives/pkg/aot/System.Reflection.Primitives.pkgproj
index ae4bf2b1dbd784d7d1c2937c34ab224654f678b2..4a406c788c1d7fbb55726f9027d617d161e22f07 100644
--- a/src/libraries/System.Reflection.Primitives/pkg/aot/System.Reflection.Primitives.pkgproj
+++ b/src/libraries/System.Reflection.Primitives/pkg/aot/System.Reflection.Primitives.pkgproj
@@ -5,12 +5,10 @@
aot
true
-
uap101aot
-
@@ -23,4 +21,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Reflection.Primitives/ref/System.Reflection.Primitives.csproj b/src/libraries/System.Reflection.Primitives/ref/System.Reflection.Primitives.csproj
index 6cfd0adabf5adbe906900fdd754fbb10f1884070..df688a70e334ba8aa089acfd168939d5bf68e085 100644
--- a/src/libraries/System.Reflection.Primitives/ref/System.Reflection.Primitives.csproj
+++ b/src/libraries/System.Reflection.Primitives/ref/System.Reflection.Primitives.csproj
@@ -1,4 +1,4 @@
-
+
@@ -8,4 +8,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Reflection.Primitives/src/Configurations.props b/src/libraries/System.Reflection.Primitives/src/Configurations.props
index f013d10b8ccc3f86eab07075639f01c909892d84..ed0bd2acc95b9edfd29df7e7b1e40ebe4f105079 100644
--- a/src/libraries/System.Reflection.Primitives/src/Configurations.props
+++ b/src/libraries/System.Reflection.Primitives/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -7,4 +7,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Reflection.Primitives/src/System.Reflection.Primitives.csproj b/src/libraries/System.Reflection.Primitives/src/System.Reflection.Primitives.csproj
index 183640ab4e0c8b62a0150c62972a64220da02224..c5992cb6dbb15c4b24ead2f6990d5cd2c85225b5 100644
--- a/src/libraries/System.Reflection.Primitives/src/System.Reflection.Primitives.csproj
+++ b/src/libraries/System.Reflection.Primitives/src/System.Reflection.Primitives.csproj
@@ -4,7 +4,7 @@
System.Reflection.Primitives
true
- netstandard1.7;uap10.1
+ netstandard;uap10.1
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 9632c093cac8868f67196d469c1109b8289b5322..cbc2b74dbc873f12df56a77891fa3589e2729959 100644
--- a/src/libraries/System.Reflection.TypeExtensions/pkg/System.Reflection.TypeExtensions.pkgproj
+++ b/src/libraries/System.Reflection.TypeExtensions/pkg/System.Reflection.TypeExtensions.pkgproj
@@ -17,4 +17,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Reflection.TypeExtensions/ref/System.Reflection.TypeExtensions.csproj b/src/libraries/System.Reflection.TypeExtensions/ref/System.Reflection.TypeExtensions.csproj
index 65c3e3dd5423a7266bc0628eb3995eabe0f06c49..1cc630e8047d202fa3a667612beb94589eab3817 100644
--- a/src/libraries/System.Reflection.TypeExtensions/ref/System.Reflection.TypeExtensions.csproj
+++ b/src/libraries/System.Reflection.TypeExtensions/ref/System.Reflection.TypeExtensions.csproj
@@ -1,4 +1,4 @@
-
+
@@ -10,4 +10,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Reflection.TypeExtensions/src/Configurations.props b/src/libraries/System.Reflection.TypeExtensions/src/Configurations.props
index bd5a53e86b0b791ba40e08299c658fba01fbec5b..7849d935083d11c4acffa2544232498845d6a8ee 100644
--- a/src/libraries/System.Reflection.TypeExtensions/src/Configurations.props
+++ b/src/libraries/System.Reflection.TypeExtensions/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -7,4 +7,4 @@
netstandard1.5;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Reflection.TypeExtensions/tests/Configurations.props b/src/libraries/System.Reflection.TypeExtensions/tests/Configurations.props
index 30186bb80bd8c011c0ddf7189005a59fca562194..2c5652de538d40d79af656d1d583ae53740199b5 100644
--- a/src/libraries/System.Reflection.TypeExtensions/tests/Configurations.props
+++ b/src/libraries/System.Reflection.TypeExtensions/tests/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard1.5;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Reflection.TypeExtensions/tests/System.Reflection.TypeExtensions.Tests.builds b/src/libraries/System.Reflection.TypeExtensions/tests/System.Reflection.TypeExtensions.Tests.builds
index 8a7e645a047bb3d2e650712a46ececb94c4777f7..1c4de0d2c89c6cc8afcc3793d062ea37c01e8cf0 100644
--- a/src/libraries/System.Reflection.TypeExtensions/tests/System.Reflection.TypeExtensions.Tests.builds
+++ b/src/libraries/System.Reflection.TypeExtensions/tests/System.Reflection.TypeExtensions.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Reflection/pkg/System.Reflection.pkgproj b/src/libraries/System.Reflection/pkg/System.Reflection.pkgproj
index 8b31beb7688af0933d6b46359000e3d6a41c9be4..0eb93faf47e6d982ac5dc85809fcfed5a6370789 100644
--- a/src/libraries/System.Reflection/pkg/System.Reflection.pkgproj
+++ b/src/libraries/System.Reflection/pkg/System.Reflection.pkgproj
@@ -1,9 +1,9 @@
-
+
- net461;netcoreapp1.1;uap10.1;$(AllXamarinFrameworks)
+ net461;netcoreapp2.0;uap10.1;$(AllXamarinFrameworks)
net461
@@ -27,4 +27,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Reflection/pkg/any/System.Reflection.pkgproj b/src/libraries/System.Reflection/pkg/any/System.Reflection.pkgproj
index 350eb65fab2750ecd28f609068bcca9f214b8dd7..e7e635a2a5f9f29d4ec9d8453984d4e3e8c77d9a 100644
--- a/src/libraries/System.Reflection/pkg/any/System.Reflection.pkgproj
+++ b/src/libraries/System.Reflection/pkg/any/System.Reflection.pkgproj
@@ -5,10 +5,8 @@
any
true
-
-
diff --git a/src/libraries/System.Reflection/pkg/aot/System.Reflection.pkgproj b/src/libraries/System.Reflection/pkg/aot/System.Reflection.pkgproj
index 44ce6fde61eef05c89a6c55a2a6de79c8fef9302..7cf7eed5950287b9f012237907bd07a26855f9f8 100644
--- a/src/libraries/System.Reflection/pkg/aot/System.Reflection.pkgproj
+++ b/src/libraries/System.Reflection/pkg/aot/System.Reflection.pkgproj
@@ -1,17 +1,14 @@
-
aot
true
-
uap101aot
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Reflection/ref/System.Reflection.csproj b/src/libraries/System.Reflection/ref/System.Reflection.csproj
index ac24a564e25e8e6502d6a31baef7203b965d72a1..384452fccaf0d103b90ed9e65d9627588e07d3be 100644
--- a/src/libraries/System.Reflection/ref/System.Reflection.csproj
+++ b/src/libraries/System.Reflection/ref/System.Reflection.csproj
@@ -1,4 +1,4 @@
-
+
@@ -9,4 +9,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Reflection/src/Configurations.props b/src/libraries/System.Reflection/src/Configurations.props
index d561a2dc295c35f9f719b4173391dfffa807c143..cf22127dc5bb96c54e21ebe714d204852a1dce65 100644
--- a/src/libraries/System.Reflection/src/Configurations.props
+++ b/src/libraries/System.Reflection/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -7,4 +7,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Reflection/src/System.Reflection.csproj b/src/libraries/System.Reflection/src/System.Reflection.csproj
index d84d416c2ab7cd430c861325df9942d549d1553b..90e5b87cb1220d1df63cc81a1fdf70aee09bf884 100644
--- a/src/libraries/System.Reflection/src/System.Reflection.csproj
+++ b/src/libraries/System.Reflection/src/System.Reflection.csproj
@@ -4,7 +4,7 @@
System.Reflection
true
- netstandard1.7;uap10.1
+ netstandard;uap10.1
diff --git a/src/libraries/System.Reflection/tests/Configurations.props b/src/libraries/System.Reflection/tests/Configurations.props
index 30186bb80bd8c011c0ddf7189005a59fca562194..2c5652de538d40d79af656d1d583ae53740199b5 100644
--- a/src/libraries/System.Reflection/tests/Configurations.props
+++ b/src/libraries/System.Reflection/tests/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard1.5;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Reflection/tests/System.Reflection.Tests.builds b/src/libraries/System.Reflection/tests/System.Reflection.Tests.builds
index b086d3e4346e7611657b474b32dca6b8770f1a1f..f3df174644791b45a76da45caa342b0560865662 100644
--- a/src/libraries/System.Reflection/tests/System.Reflection.Tests.builds
+++ b/src/libraries/System.Reflection/tests/System.Reflection.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Resources.Reader/pkg/System.Resources.Reader.builds b/src/libraries/System.Resources.Reader/pkg/System.Resources.Reader.builds
index 93bb4d8081908975e216db002112e9a7a18fcc40..a10c4880bc4c06072075b519cc383b935156d85d 100644
--- a/src/libraries/System.Resources.Reader/pkg/System.Resources.Reader.builds
+++ b/src/libraries/System.Resources.Reader/pkg/System.Resources.Reader.builds
@@ -1,8 +1,8 @@
-
+
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Resources.Reader/pkg/System.Resources.Reader.pkgproj b/src/libraries/System.Resources.Reader/pkg/System.Resources.Reader.pkgproj
index da2db612a468ce7819aa78ac33a4b01f01a11cd6..120098f6f9672efdcc1da0ad0bc9bb9999afc2b8 100644
--- a/src/libraries/System.Resources.Reader/pkg/System.Resources.Reader.pkgproj
+++ b/src/libraries/System.Resources.Reader/pkg/System.Resources.Reader.pkgproj
@@ -1,12 +1,10 @@
-
+
-
net461;netcoreapp1.1;$(AllXamarinFrameworks)
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Resources.Reader/ref/System.Resources.Reader.csproj b/src/libraries/System.Resources.Reader/ref/System.Resources.Reader.csproj
index 33781f940ddc3e645b0c1b3a846f693d8352ce17..f4088a0fb920c5832d82d532428eb108994da3d8 100644
--- a/src/libraries/System.Resources.Reader/ref/System.Resources.Reader.csproj
+++ b/src/libraries/System.Resources.Reader/ref/System.Resources.Reader.csproj
@@ -1,4 +1,4 @@
-
+
@@ -10,4 +10,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Resources.Reader/src/Configurations.props b/src/libraries/System.Resources.Reader/src/Configurations.props
index fc9ef9822c01e3840af50ced2f25bdc2f5349eca..c398e42e899425ce70e3a9884633835ab6fcc66e 100644
--- a/src/libraries/System.Resources.Reader/src/Configurations.props
+++ b/src/libraries/System.Resources.Reader/src/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Resources.Reader/tests/Configurations.props b/src/libraries/System.Resources.Reader/tests/Configurations.props
index 512c938bad5364c677a3f4d9f647f1ade8c14aea..b2db637110616a495d303924e9aaf8b800db4821 100644
--- a/src/libraries/System.Resources.Reader/tests/Configurations.props
+++ b/src/libraries/System.Resources.Reader/tests/Configurations.props
@@ -1,9 +1,9 @@
-
+
netstandard1.3;
- netstandard1.7;
+ netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Resources.Reader/tests/System.Resources.Reader.Tests.builds b/src/libraries/System.Resources.Reader/tests/System.Resources.Reader.Tests.builds
index eff35d58291ce2ebd794c9b76492cf2ab008233e..f35801a5c8ddb9126ab1b521d50621a1a014a174 100644
--- a/src/libraries/System.Resources.Reader/tests/System.Resources.Reader.Tests.builds
+++ b/src/libraries/System.Resources.Reader/tests/System.Resources.Reader.Tests.builds
@@ -1,4 +1,4 @@
-
+
@@ -13,4 +13,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Resources.ResourceManager/pkg/System.Resources.ResourceManager.builds b/src/libraries/System.Resources.ResourceManager/pkg/System.Resources.ResourceManager.builds
index 3484094c4ab17b8455599a7d44589e5ab8be7a20..fec056f6f4262d39d17448908d46455ef62aee51 100644
--- a/src/libraries/System.Resources.ResourceManager/pkg/System.Resources.ResourceManager.builds
+++ b/src/libraries/System.Resources.ResourceManager/pkg/System.Resources.ResourceManager.builds
@@ -1,4 +1,4 @@
-
+
@@ -7,5 +7,4 @@
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Resources.ResourceManager/pkg/System.Resources.ResourceManager.pkgproj b/src/libraries/System.Resources.ResourceManager/pkg/System.Resources.ResourceManager.pkgproj
index dfbd9dcde94d628f2ddcf03d57fd923a9266bec0..e3f9241aab8612434d82bbbddbf44947e3f61351 100644
--- a/src/libraries/System.Resources.ResourceManager/pkg/System.Resources.ResourceManager.pkgproj
+++ b/src/libraries/System.Resources.ResourceManager/pkg/System.Resources.ResourceManager.pkgproj
@@ -1,9 +1,9 @@
-
+
- net463;netcoreapp1.1;uap10.1;$(AllXamarinFrameworks)
+ net463;netcoreapp2.0;uap10.1;$(AllXamarinFrameworks)
@@ -18,4 +18,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Resources.ResourceManager/pkg/aot/System.Resources.ResourceManager.pkgproj b/src/libraries/System.Resources.ResourceManager/pkg/aot/System.Resources.ResourceManager.pkgproj
index 60277b2a0aaf65ffc2ae74b0d88dea7e3a3f0f69..2a43728f92973f9df68c71917c9c556f6031fcde 100644
--- a/src/libraries/System.Resources.ResourceManager/pkg/aot/System.Resources.ResourceManager.pkgproj
+++ b/src/libraries/System.Resources.ResourceManager/pkg/aot/System.Resources.ResourceManager.pkgproj
@@ -11,4 +11,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Resources.ResourceManager/ref/System.Resources.ResourceManager.csproj b/src/libraries/System.Resources.ResourceManager/ref/System.Resources.ResourceManager.csproj
index 14551c77a0698a8e2f452fc117f5f30f33034f87..e487829ba8ab2b800c60f77451178167aea0bc8b 100644
--- a/src/libraries/System.Resources.ResourceManager/ref/System.Resources.ResourceManager.csproj
+++ b/src/libraries/System.Resources.ResourceManager/ref/System.Resources.ResourceManager.csproj
@@ -1,4 +1,4 @@
-
+
@@ -11,4 +11,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Resources.ResourceManager/src/Configurations.props b/src/libraries/System.Resources.ResourceManager/src/Configurations.props
index f013d10b8ccc3f86eab07075639f01c909892d84..ed0bd2acc95b9edfd29df7e7b1e40ebe4f105079 100644
--- a/src/libraries/System.Resources.ResourceManager/src/Configurations.props
+++ b/src/libraries/System.Resources.ResourceManager/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -7,4 +7,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Resources.ResourceManager/src/System.Resources.ResourceManager.csproj b/src/libraries/System.Resources.ResourceManager/src/System.Resources.ResourceManager.csproj
index f3aa85261b1e5ab3308d2e0f2c82cfea4bc191f4..c63ba50a8a11aa404a6ce7dc829f537bafa7ad54 100644
--- a/src/libraries/System.Resources.ResourceManager/src/System.Resources.ResourceManager.csproj
+++ b/src/libraries/System.Resources.ResourceManager/src/System.Resources.ResourceManager.csproj
@@ -7,7 +7,7 @@
None
true
true
- netstandard1.7;uap10.1
+ netstandard;uap10.1
diff --git a/src/libraries/System.Resources.ResourceManager/tests/Configurations.props b/src/libraries/System.Resources.ResourceManager/tests/Configurations.props
index 512c938bad5364c677a3f4d9f647f1ade8c14aea..b2db637110616a495d303924e9aaf8b800db4821 100644
--- a/src/libraries/System.Resources.ResourceManager/tests/Configurations.props
+++ b/src/libraries/System.Resources.ResourceManager/tests/Configurations.props
@@ -1,9 +1,9 @@
-
+
netstandard1.3;
- netstandard1.7;
+ netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.builds b/src/libraries/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.builds
index f0f367ded081485a9f2310fb4b92291846c46218..6ce228ac7b46e28854f06395e8b9f45c7fc984c3 100644
--- a/src/libraries/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.builds
+++ b/src/libraries/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.builds
@@ -1,4 +1,4 @@
-
+
@@ -13,4 +13,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.csproj b/src/libraries/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.csproj
index d43a93c5ad8760c9e478fc38f99886ad8cb77cda..c85d18a2798cb2a241f91bc83141ac35d935160a 100644
--- a/src/libraries/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.csproj
+++ b/src/libraries/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.csproj
@@ -44,4 +44,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Resources.Writer/pkg/System.Resources.Writer.builds b/src/libraries/System.Resources.Writer/pkg/System.Resources.Writer.builds
index 25dceed06e84bbf083a195eb16f3168bcf7f7838..575cc0736f3d39c25752db255487548ee2840102 100644
--- a/src/libraries/System.Resources.Writer/pkg/System.Resources.Writer.builds
+++ b/src/libraries/System.Resources.Writer/pkg/System.Resources.Writer.builds
@@ -1,8 +1,8 @@
-
+
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Resources.Writer/pkg/System.Resources.Writer.pkgproj b/src/libraries/System.Resources.Writer/pkg/System.Resources.Writer.pkgproj
index 403252aff8488beba5c717ae8659284b648bf6cb..1c2bc801d8204d59c5f20fa231cc1acc4486ce3d 100644
--- a/src/libraries/System.Resources.Writer/pkg/System.Resources.Writer.pkgproj
+++ b/src/libraries/System.Resources.Writer/pkg/System.Resources.Writer.pkgproj
@@ -1,12 +1,10 @@
-
+
-
net461;netcoreapp1.1;$(AllXamarinFrameworks)
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Resources.Writer/ref/System.Resources.Writer.csproj b/src/libraries/System.Resources.Writer/ref/System.Resources.Writer.csproj
index 018bb6f66b434bb5da708ff2ccf10702f6fe4b1c..b598481bdd9b31584116e1311e6ea6b64b44d5e8 100644
--- a/src/libraries/System.Resources.Writer/ref/System.Resources.Writer.csproj
+++ b/src/libraries/System.Resources.Writer/ref/System.Resources.Writer.csproj
@@ -1,4 +1,4 @@
-
+
@@ -9,4 +9,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Resources.Writer/src/Configurations.props b/src/libraries/System.Resources.Writer/src/Configurations.props
index fc9ef9822c01e3840af50ced2f25bdc2f5349eca..c398e42e899425ce70e3a9884633835ab6fcc66e 100644
--- a/src/libraries/System.Resources.Writer/src/Configurations.props
+++ b/src/libraries/System.Resources.Writer/src/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Resources.Writer/tests/Configurations.props b/src/libraries/System.Resources.Writer/tests/Configurations.props
index 512c938bad5364c677a3f4d9f647f1ade8c14aea..b2db637110616a495d303924e9aaf8b800db4821 100644
--- a/src/libraries/System.Resources.Writer/tests/Configurations.props
+++ b/src/libraries/System.Resources.Writer/tests/Configurations.props
@@ -1,9 +1,9 @@
-
+
netstandard1.3;
- netstandard1.7;
+ netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Resources.Writer/tests/System.Resources.Writer.Tests.builds b/src/libraries/System.Resources.Writer/tests/System.Resources.Writer.Tests.builds
index dafb05519d9a2928d9f682865c6b60044bb6f764..a48563412c15f9adea34275b14aadfe6a4d003d5 100644
--- a/src/libraries/System.Resources.Writer/tests/System.Resources.Writer.Tests.builds
+++ b/src/libraries/System.Resources.Writer/tests/System.Resources.Writer.Tests.builds
@@ -1,4 +1,4 @@
-
+
@@ -13,4 +13,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.CompilerServices.Unsafe/pkg/System.Runtime.CompilerServices.Unsafe.builds b/src/libraries/System.Runtime.CompilerServices.Unsafe/pkg/System.Runtime.CompilerServices.Unsafe.builds
index 39c1b297431590f561ea00c92e7b62571547f52f..7d9f421110e022f9ac71de7c6826183b346c37ef 100644
--- a/src/libraries/System.Runtime.CompilerServices.Unsafe/pkg/System.Runtime.CompilerServices.Unsafe.builds
+++ b/src/libraries/System.Runtime.CompilerServices.Unsafe/pkg/System.Runtime.CompilerServices.Unsafe.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.CompilerServices.Unsafe/tests/Configurations.props b/src/libraries/System.Runtime.CompilerServices.Unsafe/tests/Configurations.props
index f0ebe53119ec712315cfea5b151d5f0d754744f8..c3266e1e9362243b5723032465bcc7a62ae720ce 100644
--- a/src/libraries/System.Runtime.CompilerServices.Unsafe/tests/Configurations.props
+++ b/src/libraries/System.Runtime.CompilerServices.Unsafe/tests/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard1.3;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.CompilerServices.Unsafe/tests/System.Runtime.CompilerServices.Unsafe.Tests.builds b/src/libraries/System.Runtime.CompilerServices.Unsafe/tests/System.Runtime.CompilerServices.Unsafe.Tests.builds
index d16b1c0f2a4fc9f75481d905c21513a37bf54c17..2aa47187edb2420042e39298709b18d3de711e62 100644
--- a/src/libraries/System.Runtime.CompilerServices.Unsafe/tests/System.Runtime.CompilerServices.Unsafe.Tests.builds
+++ b/src/libraries/System.Runtime.CompilerServices.Unsafe/tests/System.Runtime.CompilerServices.Unsafe.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Runtime.CompilerServices.Unsafe/tests/System.Runtime.CompilerServices.Unsafe.Tests.csproj b/src/libraries/System.Runtime.CompilerServices.Unsafe/tests/System.Runtime.CompilerServices.Unsafe.Tests.csproj
index 762ad6b96bf55b2d23b056a24080ce9fea9dea1f..8f74ecabd40d4c0d8e648b58416aa45794ba56ad 100644
--- a/src/libraries/System.Runtime.CompilerServices.Unsafe/tests/System.Runtime.CompilerServices.Unsafe.Tests.csproj
+++ b/src/libraries/System.Runtime.CompilerServices.Unsafe/tests/System.Runtime.CompilerServices.Unsafe.Tests.csproj
@@ -11,4 +11,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.CompilerServices.VisualC/pkg/System.Runtime.CompilerServices.VisualC.builds b/src/libraries/System.Runtime.CompilerServices.VisualC/pkg/System.Runtime.CompilerServices.VisualC.builds
index 31948f85b835e452f2b4b5b0ed2bb505b35c32b4..f7cc3e0e68df5a6bed5e9c6700317dd1175384a8 100644
--- a/src/libraries/System.Runtime.CompilerServices.VisualC/pkg/System.Runtime.CompilerServices.VisualC.builds
+++ b/src/libraries/System.Runtime.CompilerServices.VisualC/pkg/System.Runtime.CompilerServices.VisualC.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.CompilerServices.VisualC/pkg/System.Runtime.CompilerServices.VisualC.pkgproj b/src/libraries/System.Runtime.CompilerServices.VisualC/pkg/System.Runtime.CompilerServices.VisualC.pkgproj
index c017d5a55bf6e24b12ace498a36e429bf7a7f9c7..eb5ae14e303eb13241bf2f0e96b107101a742d89 100644
--- a/src/libraries/System.Runtime.CompilerServices.VisualC/pkg/System.Runtime.CompilerServices.VisualC.pkgproj
+++ b/src/libraries/System.Runtime.CompilerServices.VisualC/pkg/System.Runtime.CompilerServices.VisualC.pkgproj
@@ -1,9 +1,9 @@
-
+
- net463;netcoreapp1.1;$(AllXamarinFrameworks)
+ net463;netcoreapp2.0;$(AllXamarinFrameworks)
@@ -17,4 +17,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.CompilerServices.VisualC/ref/System.Runtime.CompilerServices.VisualC.csproj b/src/libraries/System.Runtime.CompilerServices.VisualC/ref/System.Runtime.CompilerServices.VisualC.csproj
index 22f858335665b6c484143d833edcd71a6337b54a..462c7154d910080b0a47747d587a3cda305f8a00 100644
--- a/src/libraries/System.Runtime.CompilerServices.VisualC/ref/System.Runtime.CompilerServices.VisualC.csproj
+++ b/src/libraries/System.Runtime.CompilerServices.VisualC/ref/System.Runtime.CompilerServices.VisualC.csproj
@@ -1,4 +1,4 @@
-
+
@@ -8,4 +8,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.CompilerServices.VisualC/src/Configurations.props b/src/libraries/System.Runtime.CompilerServices.VisualC/src/Configurations.props
index 9c336c0be9e52171e2fecf14214e3373be07177d..dc837f915219bcf7ff5c38f67e01c45d5b976485 100644
--- a/src/libraries/System.Runtime.CompilerServices.VisualC/src/Configurations.props
+++ b/src/libraries/System.Runtime.CompilerServices.VisualC/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.Extensions/pkg/System.Runtime.Extensions.builds b/src/libraries/System.Runtime.Extensions/pkg/System.Runtime.Extensions.builds
index d12f4c80eba3f32fe0d3429469d080b3351a56fa..651417a95cd966d035fd10a17b58b96f6c4415b3 100644
--- a/src/libraries/System.Runtime.Extensions/pkg/System.Runtime.Extensions.builds
+++ b/src/libraries/System.Runtime.Extensions/pkg/System.Runtime.Extensions.builds
@@ -1,8 +1,8 @@
-
+
-
+
Windows_NT
diff --git a/src/libraries/System.Runtime.Extensions/pkg/System.Runtime.Extensions.pkgproj b/src/libraries/System.Runtime.Extensions/pkg/System.Runtime.Extensions.pkgproj
index 4464e4d91cb8b9e9043ce33b00828e09317a1034..8669b07e552e3276abc08f96fc055a4f58816eab 100644
--- a/src/libraries/System.Runtime.Extensions/pkg/System.Runtime.Extensions.pkgproj
+++ b/src/libraries/System.Runtime.Extensions/pkg/System.Runtime.Extensions.pkgproj
@@ -3,7 +3,7 @@
- netcoreapp1.1;uap10.1;net461;$(AllXamarinFrameworks)
+ netcoreapp2.0;uap10.1;net461;$(AllXamarinFrameworks)
net461
diff --git a/src/libraries/System.Runtime.Extensions/pkg/unix/System.Runtime.Extensions.pkgproj b/src/libraries/System.Runtime.Extensions/pkg/unix/System.Runtime.Extensions.pkgproj
index fe8cf2606e9089df90ba8fc7e5d09628cd98a5f9..0052ce949d11aa8e87b8876d27b7e34f2d6e0bfb 100644
--- a/src/libraries/System.Runtime.Extensions/pkg/unix/System.Runtime.Extensions.pkgproj
+++ b/src/libraries/System.Runtime.Extensions/pkg/unix/System.Runtime.Extensions.pkgproj
@@ -1,17 +1,14 @@
-
unix
true
-
Unix
-
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.Extensions/ref/4.1.0/System.Runtime.Extensions.depproj b/src/libraries/System.Runtime.Extensions/ref/4.1.0/System.Runtime.Extensions.depproj
index ecf00eb3cb800cbeecafee4be9882aa898a213ac..1ff7ec1f85a9a5dafe5bc588074717b15cd8a3f9 100644
--- a/src/libraries/System.Runtime.Extensions/ref/4.1.0/System.Runtime.Extensions.depproj
+++ b/src/libraries/System.Runtime.Extensions/ref/4.1.0/System.Runtime.Extensions.depproj
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Runtime.Extensions/ref/Configurations.props b/src/libraries/System.Runtime.Extensions/ref/Configurations.props
index ea9ea79f787f98f2eb7eacf21b28e53742aa9228..8b803e0772f2c937b70d75006295c7d12a140a32 100644
--- a/src/libraries/System.Runtime.Extensions/ref/Configurations.props
+++ b/src/libraries/System.Runtime.Extensions/ref/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.Extensions/ref/System.Runtime.Extensions.builds b/src/libraries/System.Runtime.Extensions/ref/System.Runtime.Extensions.builds
index 9034d82ac31a5e65329af2d84322cb770f9e5f0e..4c8688069cfddcde86c7c9395b5179b8f93a7b2e 100644
--- a/src/libraries/System.Runtime.Extensions/ref/System.Runtime.Extensions.builds
+++ b/src/libraries/System.Runtime.Extensions/ref/System.Runtime.Extensions.builds
@@ -1,10 +1,10 @@
-
+
- netstandard1.7
+ netstandard
diff --git a/src/libraries/System.Runtime.Extensions/ref/System.Runtime.Extensions.csproj b/src/libraries/System.Runtime.Extensions/ref/System.Runtime.Extensions.csproj
index 4eb594ad365aa6464a913fdcffdf2e16a0a44204..0efde6ac42fac1fa8e50673a4216668762b69697 100644
--- a/src/libraries/System.Runtime.Extensions/ref/System.Runtime.Extensions.csproj
+++ b/src/libraries/System.Runtime.Extensions/ref/System.Runtime.Extensions.csproj
@@ -1,4 +1,4 @@
-
+
@@ -13,4 +13,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.Extensions/src/Configurations.props b/src/libraries/System.Runtime.Extensions/src/Configurations.props
index 8659b03c29d34b0bd99795b6b4d99c36c336497d..0aa95fe1abc12b49f0497fb064671b97ae60f437 100644
--- a/src/libraries/System.Runtime.Extensions/src/Configurations.props
+++ b/src/libraries/System.Runtime.Extensions/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -8,4 +8,4 @@
uap101aot-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj b/src/libraries/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj
index b2a04d7925b6952f8dbf4450e783c1e393baffd1..38ae68e10fffd4a5d56e7d70f8c014964a6d2371 100644
--- a/src/libraries/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj
+++ b/src/libraries/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj
@@ -10,7 +10,7 @@
0436
- netstandard1.7;uap10.1
+ netstandard;uap10.1
true
diff --git a/src/libraries/System.Runtime.Extensions/tests/AssemblyResolveTests/AssemblyResolveTests.csproj b/src/libraries/System.Runtime.Extensions/tests/AssemblyResolveTests/AssemblyResolveTests.csproj
index f2cd5ffd7440a07d7b401732bea251293939099f..b0d7ff791c5200d21d8da58434700fdbaf7fcc41 100644
--- a/src/libraries/System.Runtime.Extensions/tests/AssemblyResolveTests/AssemblyResolveTests.csproj
+++ b/src/libraries/System.Runtime.Extensions/tests/AssemblyResolveTests/AssemblyResolveTests.csproj
@@ -1,4 +1,4 @@
-
+
@@ -27,4 +27,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.Extensions/tests/Configurations.props b/src/libraries/System.Runtime.Extensions/tests/Configurations.props
index dec1ed007e301dbbdb4589fcd57262378339d7c2..ad85f94e9eb4f9dd07b6e0b3c99a3c55093839d3 100644
--- a/src/libraries/System.Runtime.Extensions/tests/Configurations.props
+++ b/src/libraries/System.Runtime.Extensions/tests/Configurations.props
@@ -1,11 +1,11 @@
-
+
- netcoreapp1.1-Windows_NT;
- netcoreapp1.1-Unix;
+ netcoreapp-Windows_NT;
+ netcoreapp-Unix;
netstandard1.5-Unix;
netstandard1.5-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.builds b/src/libraries/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.builds
index a47a51584e3f98963f80bbedd04089c7e6c8352a..dd247a0173f4c91e6c647f3ee23bdd6065b90521 100644
--- a/src/libraries/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.builds
+++ b/src/libraries/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.builds
@@ -1,4 +1,4 @@
-
+
@@ -22,11 +22,11 @@
-->
- netcoreapp1.1
+ netcoreapp
Windows_NT
- netcoreapp1.1
+ netcoreapp
Unix
diff --git a/src/libraries/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj b/src/libraries/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj
index 58bf73f74e656e9373eb89185c8a57135712bf27..edc63fdb8112c528821b2542bbfa617302d2151b 100644
--- a/src/libraries/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj
+++ b/src/libraries/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj
@@ -133,4 +133,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/VoidMainWithExitCodeApp.csproj b/src/libraries/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/VoidMainWithExitCodeApp.csproj
index bdfdc1bf424dfb2ae1ca38c5fd57a338635c36d4..2cc3736ddb62f77e37fe73ef39c040bdaa8758b3 100644
--- a/src/libraries/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/VoidMainWithExitCodeApp.csproj
+++ b/src/libraries/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/VoidMainWithExitCodeApp.csproj
@@ -17,7 +17,7 @@
-
+
Common\System\Diagnostics\CodeAnalysis\ExcludeFromCodeCoverageAttribute.cs
@@ -28,4 +28,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.Handles/pkg/System.Runtime.Handles.pkgproj b/src/libraries/System.Runtime.Handles/pkg/System.Runtime.Handles.pkgproj
index 41a0254c2ae869fc26e1b42b6662a05aefe475c3..03592255d807660df418d1eb6e2868295fe3cffc 100644
--- a/src/libraries/System.Runtime.Handles/pkg/System.Runtime.Handles.pkgproj
+++ b/src/libraries/System.Runtime.Handles/pkg/System.Runtime.Handles.pkgproj
@@ -1,9 +1,9 @@
-
+
- net463;netcoreapp1.1;uap10.1;$(AllXamarinFrameworks)
+ net463;netcoreapp2.0;uap10.1;$(AllXamarinFrameworks)
net463
@@ -18,4 +18,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.Handles/pkg/any/System.Runtime.Handles.pkgproj b/src/libraries/System.Runtime.Handles/pkg/any/System.Runtime.Handles.pkgproj
index 0072c035f8ca9da9b0ef17be57416a5e05f4610d..09ca8eae080a29971cbc186d0328930759d3cbc1 100644
--- a/src/libraries/System.Runtime.Handles/pkg/any/System.Runtime.Handles.pkgproj
+++ b/src/libraries/System.Runtime.Handles/pkg/any/System.Runtime.Handles.pkgproj
@@ -5,16 +5,13 @@
any
true
-
-
runtimes/aot/lib/netcore50
aot
-
diff --git a/src/libraries/System.Runtime.Handles/pkg/aot/System.Runtime.Handles.pkgproj b/src/libraries/System.Runtime.Handles/pkg/aot/System.Runtime.Handles.pkgproj
index df4808f505618e58674ce790ea9491e001726d46..c796ab01b4d2625e8976190d5e9049f489ed8453 100644
--- a/src/libraries/System.Runtime.Handles/pkg/aot/System.Runtime.Handles.pkgproj
+++ b/src/libraries/System.Runtime.Handles/pkg/aot/System.Runtime.Handles.pkgproj
@@ -1,17 +1,14 @@
-
aot
true
-
uap101aot
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.Handles/ref/System.Runtime.Handles.csproj b/src/libraries/System.Runtime.Handles/ref/System.Runtime.Handles.csproj
index 99493e3f15298fdb24b72ed9f16fddfb9300b932..aa4f54e73e731f320e3e8783555bd12a3c4420cf 100644
--- a/src/libraries/System.Runtime.Handles/ref/System.Runtime.Handles.csproj
+++ b/src/libraries/System.Runtime.Handles/ref/System.Runtime.Handles.csproj
@@ -1,4 +1,4 @@
-
+
@@ -8,4 +8,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.Handles/src/Configurations.props b/src/libraries/System.Runtime.Handles/src/Configurations.props
index f013d10b8ccc3f86eab07075639f01c909892d84..ed0bd2acc95b9edfd29df7e7b1e40ebe4f105079 100644
--- a/src/libraries/System.Runtime.Handles/src/Configurations.props
+++ b/src/libraries/System.Runtime.Handles/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -7,4 +7,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.Handles/src/System.Runtime.Handles.csproj b/src/libraries/System.Runtime.Handles/src/System.Runtime.Handles.csproj
index 39fc936e06cff93b2eca2e914cda4b6435050d4f..0a33f6eff27aacb90827cc3679330217e5a8d865 100644
--- a/src/libraries/System.Runtime.Handles/src/System.Runtime.Handles.csproj
+++ b/src/libraries/System.Runtime.Handles/src/System.Runtime.Handles.csproj
@@ -5,7 +5,7 @@
{D85EE71C-F05B-4331-9300-8E2833D49E19}
System.Runtime.Handles
true
- netstandard1.7;uap10.1
+ netstandard;uap10.1
diff --git a/src/libraries/System.Runtime.Handles/tests/Configurations.props b/src/libraries/System.Runtime.Handles/tests/Configurations.props
index 98f53209d45a12360d0bbf7cf031b29ff556fc57..c398e42e899425ce70e3a9884633835ab6fcc66e 100644
--- a/src/libraries/System.Runtime.Handles/tests/Configurations.props
+++ b/src/libraries/System.Runtime.Handles/tests/Configurations.props
@@ -1,8 +1,8 @@
-
+
- netstandard1.7;
+ netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.Handles/tests/System.Runtime.Handles.Tests.builds b/src/libraries/System.Runtime.Handles/tests/System.Runtime.Handles.Tests.builds
index f8f4552dde0a4a30e2eb459a34300605511fae78..3f457a5c5075453b18ca38b901590f45f18857ca 100644
--- a/src/libraries/System.Runtime.Handles/tests/System.Runtime.Handles.Tests.builds
+++ b/src/libraries/System.Runtime.Handles/tests/System.Runtime.Handles.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Runtime.Handles/tests/System.Runtime.Handles.Tests.csproj b/src/libraries/System.Runtime.Handles/tests/System.Runtime.Handles.Tests.csproj
index 836b12e3becc45aee746dd76585f18d5a089d0fd..39b0f1a94f31ceba5557553324685f76539375e3 100644
--- a/src/libraries/System.Runtime.Handles/tests/System.Runtime.Handles.Tests.csproj
+++ b/src/libraries/System.Runtime.Handles/tests/System.Runtime.Handles.Tests.csproj
@@ -20,4 +20,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.InteropServices.RuntimeInformation/pkg/System.Runtime.InteropServices.RuntimeInformation.builds b/src/libraries/System.Runtime.InteropServices.RuntimeInformation/pkg/System.Runtime.InteropServices.RuntimeInformation.builds
index fb3f824b636d7de5881e2a55686145449c422ecb..1db434bfe66457ca72aa3b6a3b7684a27760055b 100644
--- a/src/libraries/System.Runtime.InteropServices.RuntimeInformation/pkg/System.Runtime.InteropServices.RuntimeInformation.builds
+++ b/src/libraries/System.Runtime.InteropServices.RuntimeInformation/pkg/System.Runtime.InteropServices.RuntimeInformation.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.InteropServices.RuntimeInformation/pkg/System.Runtime.InteropServices.RuntimeInformation.pkgproj b/src/libraries/System.Runtime.InteropServices.RuntimeInformation/pkg/System.Runtime.InteropServices.RuntimeInformation.pkgproj
index 200007925792eb7c6f8d5446172118b5c7561926..e41603277560b40a8db1dba15c78103c8d479ce2 100644
--- a/src/libraries/System.Runtime.InteropServices.RuntimeInformation/pkg/System.Runtime.InteropServices.RuntimeInformation.pkgproj
+++ b/src/libraries/System.Runtime.InteropServices.RuntimeInformation/pkg/System.Runtime.InteropServices.RuntimeInformation.pkgproj
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Runtime.InteropServices.RuntimeInformation/ref/System.Runtime.InteropServices.RuntimeInformation.csproj b/src/libraries/System.Runtime.InteropServices.RuntimeInformation/ref/System.Runtime.InteropServices.RuntimeInformation.csproj
index ca07fc756e04116b198a0e42f21a6ab7e27b8a73..337da775ed8003a2fc09735e5897c9dd635f45a3 100644
--- a/src/libraries/System.Runtime.InteropServices.RuntimeInformation/ref/System.Runtime.InteropServices.RuntimeInformation.csproj
+++ b/src/libraries/System.Runtime.InteropServices.RuntimeInformation/ref/System.Runtime.InteropServices.RuntimeInformation.csproj
@@ -1,4 +1,4 @@
-
+
@@ -8,4 +8,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.InteropServices.RuntimeInformation/src/Configurations.props b/src/libraries/System.Runtime.InteropServices.RuntimeInformation/src/Configurations.props
index 3178cd309feb56f362b5d7216020765fe200d594..9ac6930b159389e926b9620f7bb0de74cb6394ba 100644
--- a/src/libraries/System.Runtime.InteropServices.RuntimeInformation/src/Configurations.props
+++ b/src/libraries/System.Runtime.InteropServices.RuntimeInformation/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -11,4 +11,4 @@
netstandard1.1-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.InteropServices.RuntimeInformation/tests/Configurations.props b/src/libraries/System.Runtime.InteropServices.RuntimeInformation/tests/Configurations.props
index 0c2d77f6b79987aca732f98ec3c9b79c3e7d5906..566c16a6e1e938ef4fb41df328ff37e6bb3cc46b 100644
--- a/src/libraries/System.Runtime.InteropServices.RuntimeInformation/tests/Configurations.props
+++ b/src/libraries/System.Runtime.InteropServices.RuntimeInformation/tests/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard1.3-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.InteropServices.RuntimeInformation/tests/System.Runtime.InteropServices.RuntimeInformation.Tests.builds b/src/libraries/System.Runtime.InteropServices.RuntimeInformation/tests/System.Runtime.InteropServices.RuntimeInformation.Tests.builds
index a02e68c430ecd626f7e292f0acd80e4a8777b165..938b643adb9354a7d8763a91d5a0cccf593ae85b 100644
--- a/src/libraries/System.Runtime.InteropServices.RuntimeInformation/tests/System.Runtime.InteropServices.RuntimeInformation.Tests.builds
+++ b/src/libraries/System.Runtime.InteropServices.RuntimeInformation/tests/System.Runtime.InteropServices.RuntimeInformation.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Runtime.InteropServices.WindowsRuntime/pkg/System.Runtime.InteropServices.WindowsRuntime.builds b/src/libraries/System.Runtime.InteropServices.WindowsRuntime/pkg/System.Runtime.InteropServices.WindowsRuntime.builds
index 58684e14f5dc9da9a35b86796bf6e02bb72ed12a..b9814f0bcaaf00987d6853e91d814a48f035414f 100644
--- a/src/libraries/System.Runtime.InteropServices.WindowsRuntime/pkg/System.Runtime.InteropServices.WindowsRuntime.builds
+++ b/src/libraries/System.Runtime.InteropServices.WindowsRuntime/pkg/System.Runtime.InteropServices.WindowsRuntime.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.InteropServices.WindowsRuntime/pkg/System.Runtime.InteropServices.WindowsRuntime.pkgproj b/src/libraries/System.Runtime.InteropServices.WindowsRuntime/pkg/System.Runtime.InteropServices.WindowsRuntime.pkgproj
index 8f6901c9639b00c482d3b2fa10b49cb900b42ffe..99672d160484641b11fbca600fed496d2b2068ad 100644
--- a/src/libraries/System.Runtime.InteropServices.WindowsRuntime/pkg/System.Runtime.InteropServices.WindowsRuntime.pkgproj
+++ b/src/libraries/System.Runtime.InteropServices.WindowsRuntime/pkg/System.Runtime.InteropServices.WindowsRuntime.pkgproj
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Runtime.InteropServices.WindowsRuntime/ref/System.Runtime.InteropServices.WindowsRuntime.csproj b/src/libraries/System.Runtime.InteropServices.WindowsRuntime/ref/System.Runtime.InteropServices.WindowsRuntime.csproj
index 1f54d3ed2e3e0414671dda75f59915303934be55..78cbedea50f488702285588b7b5a924d1241a5a3 100644
--- a/src/libraries/System.Runtime.InteropServices.WindowsRuntime/ref/System.Runtime.InteropServices.WindowsRuntime.csproj
+++ b/src/libraries/System.Runtime.InteropServices.WindowsRuntime/ref/System.Runtime.InteropServices.WindowsRuntime.csproj
@@ -1,4 +1,4 @@
-
+
@@ -8,4 +8,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.InteropServices.WindowsRuntime/src/Configurations.props b/src/libraries/System.Runtime.InteropServices.WindowsRuntime/src/Configurations.props
index faaee17d9594720fdeeff768621b64a7db6e885c..385111b849345f9572b369cc8ad037f501f7f242 100644
--- a/src/libraries/System.Runtime.InteropServices.WindowsRuntime/src/Configurations.props
+++ b/src/libraries/System.Runtime.InteropServices.WindowsRuntime/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard1.3;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.InteropServices/pkg/System.Runtime.InteropServices.pkgproj b/src/libraries/System.Runtime.InteropServices/pkg/System.Runtime.InteropServices.pkgproj
index d27acfc81e827b76fa5c7f2f6132c2bd83161564..f9eb49e73fdb183a5d743f40524a29a3f6bd4cca 100644
--- a/src/libraries/System.Runtime.InteropServices/pkg/System.Runtime.InteropServices.pkgproj
+++ b/src/libraries/System.Runtime.InteropServices/pkg/System.Runtime.InteropServices.pkgproj
@@ -1,9 +1,9 @@
-
+
- net461;netcoreapp1.1;uap10.1;$(AllXamarinFrameworks)
+ net461;netcoreapp2.0;uap10.1;$(AllXamarinFrameworks)
net461
diff --git a/src/libraries/System.Runtime.InteropServices/pkg/any/System.Runtime.InteropServices.pkgproj b/src/libraries/System.Runtime.InteropServices/pkg/any/System.Runtime.InteropServices.pkgproj
index 0b5c2510d5f20710a157a301b0435522e072d00f..d748093ffb7cc4b6f9efa9aef8a7419bc85c73b4 100644
--- a/src/libraries/System.Runtime.InteropServices/pkg/any/System.Runtime.InteropServices.pkgproj
+++ b/src/libraries/System.Runtime.InteropServices/pkg/any/System.Runtime.InteropServices.pkgproj
@@ -5,10 +5,8 @@
any
true
-
-
diff --git a/src/libraries/System.Runtime.InteropServices/pkg/aot/System.Runtime.InteropServices.pkgproj b/src/libraries/System.Runtime.InteropServices/pkg/aot/System.Runtime.InteropServices.pkgproj
index f5af6157357dc51d719c46695992c265978b0201..2325ce35d1434f632a8aa1e5fa7a4335be22818b 100644
--- a/src/libraries/System.Runtime.InteropServices/pkg/aot/System.Runtime.InteropServices.pkgproj
+++ b/src/libraries/System.Runtime.InteropServices/pkg/aot/System.Runtime.InteropServices.pkgproj
@@ -1,18 +1,15 @@
-
aot
true
-
Windows_NT
uap101aot
-
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.builds b/src/libraries/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.builds
index 9108ddf37fc365c44d496d3a5dbbce4e7f872496..cdde6952c1de6ead3419cbb07422953f95a654ca 100644
--- a/src/libraries/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.builds
+++ b/src/libraries/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.builds
@@ -1,10 +1,10 @@
-
+
- netstandard1.7
+ netstandard
diff --git a/src/libraries/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.csproj b/src/libraries/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.csproj
index eb2df3faa0973059fcac2c49f10663007055cfd5..e1c4dd09c3dffd7057b23f84315cabbd53564713 100644
--- a/src/libraries/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.csproj
+++ b/src/libraries/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.csproj
@@ -1,4 +1,4 @@
-
+
@@ -18,4 +18,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.InteropServices/src/Configurations.props b/src/libraries/System.Runtime.InteropServices/src/Configurations.props
index f2a0c6d114b0eae41d7e9fb4834da839012dff59..df6e10bdc7300c977d70653abb35a8934b6f9997 100644
--- a/src/libraries/System.Runtime.InteropServices/src/Configurations.props
+++ b/src/libraries/System.Runtime.InteropServices/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -7,4 +7,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.InteropServices/src/System.Runtime.InteropServices.csproj b/src/libraries/System.Runtime.InteropServices/src/System.Runtime.InteropServices.csproj
index 390777252475d36be0210e083243320132f49f6d..859375bd450974d15c1adb2ae27dbae1fc22508e 100644
--- a/src/libraries/System.Runtime.InteropServices/src/System.Runtime.InteropServices.csproj
+++ b/src/libraries/System.Runtime.InteropServices/src/System.Runtime.InteropServices.csproj
@@ -9,7 +9,7 @@
$(GenFacadesArgs) -ignoreMissingTypes
None
- netstandard1.7;uap10.1
+ netstandard;uap10.1
diff --git a/src/libraries/System.Runtime.InteropServices/tests/Configurations.props b/src/libraries/System.Runtime.InteropServices/tests/Configurations.props
index 98f53209d45a12360d0bbf7cf031b29ff556fc57..c398e42e899425ce70e3a9884633835ab6fcc66e 100644
--- a/src/libraries/System.Runtime.InteropServices/tests/Configurations.props
+++ b/src/libraries/System.Runtime.InteropServices/tests/Configurations.props
@@ -1,8 +1,8 @@
-
+
- netstandard1.7;
+ netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.Tests.builds b/src/libraries/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.Tests.builds
index 619399b6b6ddff5f6d8e1fed4cba4098cda50d79..5585152b200bc53e53299a4529edd3221814f882 100644
--- a/src/libraries/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.Tests.builds
+++ b/src/libraries/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.Tests.builds
@@ -1,11 +1,11 @@
-
+
Windows_NT
- netstandard1.7
+ netstandard
netcoreapp1.0;netcore50;net46
diff --git a/src/libraries/System.Runtime.Loader/pkg/System.Runtime.Loader.builds b/src/libraries/System.Runtime.Loader/pkg/System.Runtime.Loader.builds
index abe0426534e6b34e686ed785fb19892da4671c9b..cbf91524161482777be4ab81f12b44001a40ee8f 100644
--- a/src/libraries/System.Runtime.Loader/pkg/System.Runtime.Loader.builds
+++ b/src/libraries/System.Runtime.Loader/pkg/System.Runtime.Loader.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.Loader/pkg/System.Runtime.Loader.pkgproj b/src/libraries/System.Runtime.Loader/pkg/System.Runtime.Loader.pkgproj
index d4f33b0d0f0db72e99d297faef113f25377ba614..4ce96cd2f0af793a6d710f324c32e1f09f73a480 100644
--- a/src/libraries/System.Runtime.Loader/pkg/System.Runtime.Loader.pkgproj
+++ b/src/libraries/System.Runtime.Loader/pkg/System.Runtime.Loader.pkgproj
@@ -1,16 +1,13 @@
-
+
-
netcoreapp1.0
-
-
+
-
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.Loader/ref/System.Runtime.Loader.csproj b/src/libraries/System.Runtime.Loader/ref/System.Runtime.Loader.csproj
index 2a9c25d02cb754c35f0c584251d05169af8fda49..1fd2a907fa889467964a4b0cba3e100a02ebedf1 100644
--- a/src/libraries/System.Runtime.Loader/ref/System.Runtime.Loader.csproj
+++ b/src/libraries/System.Runtime.Loader/ref/System.Runtime.Loader.csproj
@@ -1,4 +1,4 @@
-
+
@@ -14,4 +14,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.Loader/src/Configurations.props b/src/libraries/System.Runtime.Loader/src/Configurations.props
index 30186bb80bd8c011c0ddf7189005a59fca562194..2c5652de538d40d79af656d1d583ae53740199b5 100644
--- a/src/libraries/System.Runtime.Loader/src/Configurations.props
+++ b/src/libraries/System.Runtime.Loader/src/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard1.5;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.Loader/tests/Configurations.props b/src/libraries/System.Runtime.Loader/tests/Configurations.props
index 3007f723e5dac956f14a4eb0a3cacfdbda59b445..a5a130bbdb0bed418d56eb3f5c2cf196fbd92ff1 100644
--- a/src/libraries/System.Runtime.Loader/tests/Configurations.props
+++ b/src/libraries/System.Runtime.Loader/tests/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard1.6;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Noop.Assembly/System.Runtime.Loader.Noop.Assembly.csproj b/src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Noop.Assembly/System.Runtime.Loader.Noop.Assembly.csproj
index 0353b91c2dd6fccf1d2bbff54cc3b430704adfa8..4ecda1b213d28e540ea4d5e495d56d4c36d92be4 100644
--- a/src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Noop.Assembly/System.Runtime.Loader.Noop.Assembly.csproj
+++ b/src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Noop.Assembly/System.Runtime.Loader.Noop.Assembly.csproj
@@ -3,7 +3,7 @@
{396D6EBF-60BD-4DAF-8783-FB403E070A57}
-
+
true
true
0436
diff --git a/src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Tests.builds b/src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Tests.builds
index 1f806ed45c73de9921eee92ae7e393fae31ec112..a7b8abb3e22dca2364b919db347ff6ea1dc62cbe 100644
--- a/src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Tests.builds
+++ b/src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Runtime.Numerics/pkg/System.Runtime.Numerics.builds b/src/libraries/System.Runtime.Numerics/pkg/System.Runtime.Numerics.builds
index 3e7f0b77758d4e3758f87334861f98225cccbc23..2025d6daabe6acb9f2fa005fdf5b531621998c73 100644
--- a/src/libraries/System.Runtime.Numerics/pkg/System.Runtime.Numerics.builds
+++ b/src/libraries/System.Runtime.Numerics/pkg/System.Runtime.Numerics.builds
@@ -5,4 +5,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.Numerics/pkg/System.Runtime.Numerics.pkgproj b/src/libraries/System.Runtime.Numerics/pkg/System.Runtime.Numerics.pkgproj
index 33dd28436de80e2cd8004d1714b6191c3a786dcb..eeee713ddea1d9cdf8e129a80c24a0760f993dcd 100644
--- a/src/libraries/System.Runtime.Numerics/pkg/System.Runtime.Numerics.pkgproj
+++ b/src/libraries/System.Runtime.Numerics/pkg/System.Runtime.Numerics.pkgproj
@@ -1,9 +1,9 @@
-
+
- net463;netcoreapp1.1;$(AllXamarinFrameworks)
+ net463;netcoreapp2.0;$(AllXamarinFrameworks)
diff --git a/src/libraries/System.Runtime.Numerics/ref/System.Runtime.Numerics.csproj b/src/libraries/System.Runtime.Numerics/ref/System.Runtime.Numerics.csproj
index dd1fedb0c582cafe4410a3bcf871c2622396ad92..1c302429a5937c3592912cbdcfe39eab77b7e72e 100644
--- a/src/libraries/System.Runtime.Numerics/ref/System.Runtime.Numerics.csproj
+++ b/src/libraries/System.Runtime.Numerics/ref/System.Runtime.Numerics.csproj
@@ -1,4 +1,4 @@
-
+
@@ -8,4 +8,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.Numerics/src/Configurations.props b/src/libraries/System.Runtime.Numerics/src/Configurations.props
index 9c336c0be9e52171e2fecf14214e3373be07177d..dc837f915219bcf7ff5c38f67e01c45d5b976485 100644
--- a/src/libraries/System.Runtime.Numerics/src/Configurations.props
+++ b/src/libraries/System.Runtime.Numerics/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.Numerics/tests/Configurations.props b/src/libraries/System.Runtime.Numerics/tests/Configurations.props
index 2a160a39e8e0fb8d6b51ee9d9e03c7dd30ee956c..211cd2bec829c39148b69aa2e0ab929f3d1e0b76 100644
--- a/src/libraries/System.Runtime.Numerics/tests/Configurations.props
+++ b/src/libraries/System.Runtime.Numerics/tests/Configurations.props
@@ -1,9 +1,9 @@
-
+
netstandard1.3-Windows_NT;
- netstandard1.7;
+ netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.Numerics/tests/System.Runtime.Numerics.Tests.builds b/src/libraries/System.Runtime.Numerics/tests/System.Runtime.Numerics.Tests.builds
index e9111e6075df2b00cdb2697aeac8a3e71a91faa5..3032198cdaf24b0ada64855f14afd07f7a2b62e6 100644
--- a/src/libraries/System.Runtime.Numerics/tests/System.Runtime.Numerics.Tests.builds
+++ b/src/libraries/System.Runtime.Numerics/tests/System.Runtime.Numerics.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Runtime.Serialization.Formatters/pkg/System.Runtime.Serialization.Formatters.builds b/src/libraries/System.Runtime.Serialization.Formatters/pkg/System.Runtime.Serialization.Formatters.builds
index f555588b18682fd167f6685c987f14429a793956..16eb8ceabd967b0f1288a2b16261c511ce464d54 100644
--- a/src/libraries/System.Runtime.Serialization.Formatters/pkg/System.Runtime.Serialization.Formatters.builds
+++ b/src/libraries/System.Runtime.Serialization.Formatters/pkg/System.Runtime.Serialization.Formatters.builds
@@ -5,4 +5,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.Serialization.Formatters/pkg/System.Runtime.Serialization.Formatters.pkgproj b/src/libraries/System.Runtime.Serialization.Formatters/pkg/System.Runtime.Serialization.Formatters.pkgproj
index 19e418b991f38b0512d34371764c1c24671115f6..e6db74950a64b3d619b6d008a0381714c59a4b64 100644
--- a/src/libraries/System.Runtime.Serialization.Formatters/pkg/System.Runtime.Serialization.Formatters.pkgproj
+++ b/src/libraries/System.Runtime.Serialization.Formatters/pkg/System.Runtime.Serialization.Formatters.pkgproj
@@ -1,9 +1,9 @@
-
+
-
+
- net463;netcoreapp1.1;$(AllXamarinFrameworks)
+ net463;netcoreapp2.0;$(AllXamarinFrameworks)
diff --git a/src/libraries/System.Runtime.Serialization.Formatters/ref/System.Runtime.Serialization.Formatters.csproj b/src/libraries/System.Runtime.Serialization.Formatters/ref/System.Runtime.Serialization.Formatters.csproj
index 23ca3e7da7b8f9afdda9d6e57569f20bb0f029c5..0f991f9958f8eef0c64588456d211bbc8cb75148 100644
--- a/src/libraries/System.Runtime.Serialization.Formatters/ref/System.Runtime.Serialization.Formatters.csproj
+++ b/src/libraries/System.Runtime.Serialization.Formatters/ref/System.Runtime.Serialization.Formatters.csproj
@@ -1,4 +1,4 @@
-
+
@@ -13,4 +13,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.Serialization.Formatters/src/Configurations.props b/src/libraries/System.Runtime.Serialization.Formatters/src/Configurations.props
index a548d6bec7c6ad24f892e5d2894f0df8875e70e3..854b83ee230dad431df89c0ce04a9d419e1c7f74 100644
--- a/src/libraries/System.Runtime.Serialization.Formatters/src/Configurations.props
+++ b/src/libraries/System.Runtime.Serialization.Formatters/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -7,4 +7,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.Serialization.Formatters/tests/Configurations.props b/src/libraries/System.Runtime.Serialization.Formatters/tests/Configurations.props
index 98f53209d45a12360d0bbf7cf031b29ff556fc57..c398e42e899425ce70e3a9884633835ab6fcc66e 100644
--- a/src/libraries/System.Runtime.Serialization.Formatters/tests/Configurations.props
+++ b/src/libraries/System.Runtime.Serialization.Formatters/tests/Configurations.props
@@ -1,8 +1,8 @@
-
+
- netstandard1.7;
+ netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.Serialization.Formatters/tests/System.Runtime.Serialization.Formatters.Tests.builds b/src/libraries/System.Runtime.Serialization.Formatters/tests/System.Runtime.Serialization.Formatters.Tests.builds
index 869ffaaec2439a6e0bb2aeba91d249e179a6a71d..ae2a07ae5c5fab89040adcc115a949e65a5818ac 100644
--- a/src/libraries/System.Runtime.Serialization.Formatters/tests/System.Runtime.Serialization.Formatters.Tests.builds
+++ b/src/libraries/System.Runtime.Serialization.Formatters/tests/System.Runtime.Serialization.Formatters.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Runtime.Serialization.Json/pkg/System.Runtime.Serialization.Json.builds b/src/libraries/System.Runtime.Serialization.Json/pkg/System.Runtime.Serialization.Json.builds
index 6e7903eaa8e22f045fdd853f6ae3143b0830bd4a..e987cee5ec9dc67629ea11fe939d4b623e31a4f9 100644
--- a/src/libraries/System.Runtime.Serialization.Json/pkg/System.Runtime.Serialization.Json.builds
+++ b/src/libraries/System.Runtime.Serialization.Json/pkg/System.Runtime.Serialization.Json.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.Serialization.Json/pkg/System.Runtime.Serialization.Json.pkgproj b/src/libraries/System.Runtime.Serialization.Json/pkg/System.Runtime.Serialization.Json.pkgproj
index 6d59b990385fdd04623085c1a5f71be6aba4aa06..70df083d2bc36d573d834fdb84c7fda577ef6b6e 100644
--- a/src/libraries/System.Runtime.Serialization.Json/pkg/System.Runtime.Serialization.Json.pkgproj
+++ b/src/libraries/System.Runtime.Serialization.Json/pkg/System.Runtime.Serialization.Json.pkgproj
@@ -1,9 +1,9 @@
-
+
- net463;netcoreapp1.1;uap10.1;$(AllXamarinFrameworks)
+ net463;netcoreapp2.0;uap10.1;$(AllXamarinFrameworks)
diff --git a/src/libraries/System.Runtime.Serialization.Json/ref/System.Runtime.Serialization.Json.csproj b/src/libraries/System.Runtime.Serialization.Json/ref/System.Runtime.Serialization.Json.csproj
index c181713305ead442a8d517a9626c81e8805b88ea..a7850ebcfb6180e1290d25c4523b6111aab50d21 100644
--- a/src/libraries/System.Runtime.Serialization.Json/ref/System.Runtime.Serialization.Json.csproj
+++ b/src/libraries/System.Runtime.Serialization.Json/ref/System.Runtime.Serialization.Json.csproj
@@ -1,4 +1,4 @@
-
+
@@ -13,4 +13,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.Serialization.Json/src/Configurations.props b/src/libraries/System.Runtime.Serialization.Json/src/Configurations.props
index fc9ef9822c01e3840af50ced2f25bdc2f5349eca..c398e42e899425ce70e3a9884633835ab6fcc66e 100644
--- a/src/libraries/System.Runtime.Serialization.Json/src/Configurations.props
+++ b/src/libraries/System.Runtime.Serialization.Json/src/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.Serialization.Json/tests/Configurations.props b/src/libraries/System.Runtime.Serialization.Json/tests/Configurations.props
index 98f53209d45a12360d0bbf7cf031b29ff556fc57..c398e42e899425ce70e3a9884633835ab6fcc66e 100644
--- a/src/libraries/System.Runtime.Serialization.Json/tests/Configurations.props
+++ b/src/libraries/System.Runtime.Serialization.Json/tests/Configurations.props
@@ -1,8 +1,8 @@
-
+
- netstandard1.7;
+ netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.Serialization.Json/tests/System.Runtime.Serialization.Json.Tests.builds b/src/libraries/System.Runtime.Serialization.Json/tests/System.Runtime.Serialization.Json.Tests.builds
index f232a413eda39d25b151b0182ba08f97e4ace998..56a5d7ca8549154c96eefcf7a612926e9cfa3dca 100644
--- a/src/libraries/System.Runtime.Serialization.Json/tests/System.Runtime.Serialization.Json.Tests.builds
+++ b/src/libraries/System.Runtime.Serialization.Json/tests/System.Runtime.Serialization.Json.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Runtime.Serialization.Primitives/pkg/System.Runtime.Serialization.Primitives.builds b/src/libraries/System.Runtime.Serialization.Primitives/pkg/System.Runtime.Serialization.Primitives.builds
index 85cf9046fbf6f48eb91b78770a331601a68e5cb4..af81430476f98333620673827cf4eedbaa2a32e3 100644
--- a/src/libraries/System.Runtime.Serialization.Primitives/pkg/System.Runtime.Serialization.Primitives.builds
+++ b/src/libraries/System.Runtime.Serialization.Primitives/pkg/System.Runtime.Serialization.Primitives.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Runtime.Serialization.Primitives/pkg/System.Runtime.Serialization.Primitives.pkgproj b/src/libraries/System.Runtime.Serialization.Primitives/pkg/System.Runtime.Serialization.Primitives.pkgproj
index 2acf6b5f0f268005c58359e5e672883f16a4a9b2..01d18a859efe5e838043956ecda85f3241276fbf 100644
--- a/src/libraries/System.Runtime.Serialization.Primitives/pkg/System.Runtime.Serialization.Primitives.pkgproj
+++ b/src/libraries/System.Runtime.Serialization.Primitives/pkg/System.Runtime.Serialization.Primitives.pkgproj
@@ -3,7 +3,7 @@
- net463;netcoreapp1.1;uap10.1;$(AllXamarinFrameworks)
+ net463;netcoreapp2.0;uap10.1;$(AllXamarinFrameworks)
diff --git a/src/libraries/System.Runtime.Serialization.Primitives/ref/System.Runtime.Serialization.Primitives.csproj b/src/libraries/System.Runtime.Serialization.Primitives/ref/System.Runtime.Serialization.Primitives.csproj
index 0b331177f61290eb25a5bd503c81d50be4fa8942..0130f913fd4d4f4bcc62ee8b816ea56e84c1502b 100644
--- a/src/libraries/System.Runtime.Serialization.Primitives/ref/System.Runtime.Serialization.Primitives.csproj
+++ b/src/libraries/System.Runtime.Serialization.Primitives/ref/System.Runtime.Serialization.Primitives.csproj
@@ -1,4 +1,4 @@
-
+
@@ -8,4 +8,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.Serialization.Primitives/src/Configurations.props b/src/libraries/System.Runtime.Serialization.Primitives/src/Configurations.props
index 4e4f5d7e7b3527ae875b3326270e1513b1c6cfde..b2079602f2ba37f0e47d7d97d60c4e07c2f9b1a8 100644
--- a/src/libraries/System.Runtime.Serialization.Primitives/src/Configurations.props
+++ b/src/libraries/System.Runtime.Serialization.Primitives/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -9,4 +9,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj b/src/libraries/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj
index 71baab0b308f0a59388a1b3143cf769b6df938e8..edafd24ea521d250642124259da6cc1eb8bcb575 100644
--- a/src/libraries/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj
+++ b/src/libraries/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj
@@ -12,7 +12,7 @@
AnyCPU
{CDF0ACB5-1361-4E48-8ECB-22E8022F5F01}
true
- netstandard1.7;uap10.1
+ netstandard;uap10.1
netstandard1.3;netcore50
diff --git a/src/libraries/System.Runtime.Serialization.Xml/pkg/System.Runtime.Serialization.Xml.builds b/src/libraries/System.Runtime.Serialization.Xml/pkg/System.Runtime.Serialization.Xml.builds
index a4acdb92e9859c1e8d1c91632d15cb3528bea848..a4cd370d9a3f51f39f083bfddc711cfda422e933 100644
--- a/src/libraries/System.Runtime.Serialization.Xml/pkg/System.Runtime.Serialization.Xml.builds
+++ b/src/libraries/System.Runtime.Serialization.Xml/pkg/System.Runtime.Serialization.Xml.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Runtime.Serialization.Xml/pkg/System.Runtime.Serialization.Xml.pkgproj b/src/libraries/System.Runtime.Serialization.Xml/pkg/System.Runtime.Serialization.Xml.pkgproj
index cd6a1c9c853535918657ba4eca7514b48d4488d2..88bf93b83a45e63985923f61cb6fdb685eacae62 100644
--- a/src/libraries/System.Runtime.Serialization.Xml/pkg/System.Runtime.Serialization.Xml.pkgproj
+++ b/src/libraries/System.Runtime.Serialization.Xml/pkg/System.Runtime.Serialization.Xml.pkgproj
@@ -3,7 +3,7 @@
- net463;netcoreapp1.1;$(AllXamarinFrameworks)
+ net463;netcoreapp2.0;$(AllXamarinFrameworks)
diff --git a/src/libraries/System.Runtime.Serialization.Xml/ref/System.Runtime.Serialization.Xml.csproj b/src/libraries/System.Runtime.Serialization.Xml/ref/System.Runtime.Serialization.Xml.csproj
index 165f0640b2b2916927ca4382e28c25f310ca9999..0352983d1f2b097362540328b27e11c12114c289 100644
--- a/src/libraries/System.Runtime.Serialization.Xml/ref/System.Runtime.Serialization.Xml.csproj
+++ b/src/libraries/System.Runtime.Serialization.Xml/ref/System.Runtime.Serialization.Xml.csproj
@@ -1,4 +1,4 @@
-
+
@@ -15,4 +15,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.Serialization.Xml/src/Configurations.props b/src/libraries/System.Runtime.Serialization.Xml/src/Configurations.props
index 9c336c0be9e52171e2fecf14214e3373be07177d..dc837f915219bcf7ff5c38f67e01c45d5b976485 100644
--- a/src/libraries/System.Runtime.Serialization.Xml/src/Configurations.props
+++ b/src/libraries/System.Runtime.Serialization.Xml/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.Serialization.Xml/tests/Configurations.props b/src/libraries/System.Runtime.Serialization.Xml/tests/Configurations.props
index 98f53209d45a12360d0bbf7cf031b29ff556fc57..c398e42e899425ce70e3a9884633835ab6fcc66e 100644
--- a/src/libraries/System.Runtime.Serialization.Xml/tests/Configurations.props
+++ b/src/libraries/System.Runtime.Serialization.Xml/tests/Configurations.props
@@ -1,8 +1,8 @@
-
+
- netstandard1.7;
+ netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.Serialization.Xml/tests/System.Runtime.Serialization.Xml.Tests.builds b/src/libraries/System.Runtime.Serialization.Xml/tests/System.Runtime.Serialization.Xml.Tests.builds
index 3023525cb575bb4a57b6dbc7e80b8b4c4f82046b..a52e681b1f1343127d38007ec40241385261546c 100644
--- a/src/libraries/System.Runtime.Serialization.Xml/tests/System.Runtime.Serialization.Xml.Tests.builds
+++ b/src/libraries/System.Runtime.Serialization.Xml/tests/System.Runtime.Serialization.Xml.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/pkg/System.Runtime.WindowsRuntime.UI.Xaml.builds b/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/pkg/System.Runtime.WindowsRuntime.UI.Xaml.builds
index 839d1aae9cf0778bb946e5bebf86f416bdaa76d9..b0bc7b8ca99a350fc8e95353395e40b42fc13220 100644
--- a/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/pkg/System.Runtime.WindowsRuntime.UI.Xaml.builds
+++ b/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/pkg/System.Runtime.WindowsRuntime.UI.Xaml.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/pkg/System.Runtime.WindowsRuntime.UI.Xaml.pkgproj b/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/pkg/System.Runtime.WindowsRuntime.UI.Xaml.pkgproj
index 72a06cd6bd37ab4b638998f1c8941a3139350471..4aa2b2240acf604b7c2f16296290efad9cd8592c 100644
--- a/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/pkg/System.Runtime.WindowsRuntime.UI.Xaml.pkgproj
+++ b/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/pkg/System.Runtime.WindowsRuntime.UI.Xaml.pkgproj
@@ -1,16 +1,14 @@
-
+
-
netcore45;wpa81
-
-
-
+
+
diff --git a/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/ref/System.Runtime.WindowsRuntime.UI.Xaml.csproj b/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/ref/System.Runtime.WindowsRuntime.UI.Xaml.csproj
index aa8ab8c02bbbc7d0efb7a8d5f46d270a9a4fc802..fa3f5b713c1a5c5dc199339ad795b63ca0499813 100644
--- a/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/ref/System.Runtime.WindowsRuntime.UI.Xaml.csproj
+++ b/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/ref/System.Runtime.WindowsRuntime.UI.Xaml.csproj
@@ -1,4 +1,4 @@
-
+
@@ -12,4 +12,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/src/System.Runtime.WindowsRuntime.UI.Xaml.builds b/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/src/System.Runtime.WindowsRuntime.UI.Xaml.builds
index 8883ecbed52e929cfd19d210f40d52f0502bc955..3b6f5952f452998874322f6dbf297edd53145778 100644
--- a/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/src/System.Runtime.WindowsRuntime.UI.Xaml.builds
+++ b/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/src/System.Runtime.WindowsRuntime.UI.Xaml.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.WindowsRuntime/pkg/System.Runtime.WindowsRuntime.builds b/src/libraries/System.Runtime.WindowsRuntime/pkg/System.Runtime.WindowsRuntime.builds
index 484bc3243d8e9e684ab2e7b9d7e391ff2fe9305a..3c3bfc693c0dac0583d550e4b2d27c76cd354806 100644
--- a/src/libraries/System.Runtime.WindowsRuntime/pkg/System.Runtime.WindowsRuntime.builds
+++ b/src/libraries/System.Runtime.WindowsRuntime/pkg/System.Runtime.WindowsRuntime.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj b/src/libraries/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj
index ac384978d6268e23c3fa09fcbcba9379f2aa9071..41885250e6c10a27150fe8879fa3b6120e1950cb 100644
--- a/src/libraries/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj
+++ b/src/libraries/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj
@@ -1,4 +1,4 @@
-
+
@@ -28,4 +28,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.builds b/src/libraries/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.builds
index 039200da4af6fe23b53e577bf0e907001b8fa805..55c28ce390eddd8cc35378c699d806ed565bae2a 100644
--- a/src/libraries/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.builds
+++ b/src/libraries/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.builds
@@ -1,4 +1,4 @@
-
+
@@ -11,5 +11,4 @@
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime/pkg/System.Runtime.pkgproj b/src/libraries/System.Runtime/pkg/System.Runtime.pkgproj
index f87ccc1094017f8aabf0d64fa1b848882c5c25eb..25750c2bbfefbe6f7f2c882c7dd652846e8b9d1d 100644
--- a/src/libraries/System.Runtime/pkg/System.Runtime.pkgproj
+++ b/src/libraries/System.Runtime/pkg/System.Runtime.pkgproj
@@ -3,7 +3,7 @@
- net461;netcoreapp1.1;uap10.1;$(AllXamarinFrameworks)
+ net461;netcoreapp2.0;uap10.1;$(AllXamarinFrameworks)
net461
@@ -29,4 +29,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime/pkg/any/System.Runtime.pkgproj b/src/libraries/System.Runtime/pkg/any/System.Runtime.pkgproj
index 968fa69639a9c100d0263e484aa7120a954ae7e4..c6d5bcd3d6d2490cb803c20d4f42a494552a0355 100644
--- a/src/libraries/System.Runtime/pkg/any/System.Runtime.pkgproj
+++ b/src/libraries/System.Runtime/pkg/any/System.Runtime.pkgproj
@@ -30,4 +30,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime/ref/4.1.0/System.Runtime.depproj b/src/libraries/System.Runtime/ref/4.1.0/System.Runtime.depproj
index 98a6cb8982b7d15e75a24dd84fe340b6e39d5d6a..e3932a41e6647d0625a7ea0d5c3cb05fca16add2 100644
--- a/src/libraries/System.Runtime/ref/4.1.0/System.Runtime.depproj
+++ b/src/libraries/System.Runtime/ref/4.1.0/System.Runtime.depproj
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Runtime/ref/Configurations.props b/src/libraries/System.Runtime/ref/Configurations.props
index ea9ea79f787f98f2eb7eacf21b28e53742aa9228..8b803e0772f2c937b70d75006295c7d12a140a32 100644
--- a/src/libraries/System.Runtime/ref/Configurations.props
+++ b/src/libraries/System.Runtime/ref/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime/ref/System.Runtime.csproj b/src/libraries/System.Runtime/ref/System.Runtime.csproj
index 37a403ccd4cac5c0453b19fe141815c3b1a23bfa..8981eadc6a691a135ea5b769c40a1aa5e60c8525 100644
--- a/src/libraries/System.Runtime/ref/System.Runtime.csproj
+++ b/src/libraries/System.Runtime/ref/System.Runtime.csproj
@@ -15,4 +15,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime/src/Configurations.props b/src/libraries/System.Runtime/src/Configurations.props
index 323984f16b9d219873be8c6e5fb9ebd0d3c354de..f71bd28c11b83ce55bc376f5d7b50ad6c7efb2cc 100644
--- a/src/libraries/System.Runtime/src/Configurations.props
+++ b/src/libraries/System.Runtime/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -9,4 +9,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime/tests/Configurations.props b/src/libraries/System.Runtime/tests/Configurations.props
index c5ec56bec2a94a8a8efef08d1a3d7490d84cfa80..793828d6a3fe9109593ceebc1818f0bd27682b90 100644
--- a/src/libraries/System.Runtime/tests/Configurations.props
+++ b/src/libraries/System.Runtime/tests/Configurations.props
@@ -1,10 +1,10 @@
-
+
netstandard1.5;
- netcoreapp1.1;
- netstandard1.7;
+ netcoreapp;
+ netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime/tests/System.Runtime.Tests.builds b/src/libraries/System.Runtime/tests/System.Runtime.Tests.builds
index e041fc835f5e786fa954e134058a547424027042..c2d105fb2bf2973b5c8e7443b258ef75f3732a99 100644
--- a/src/libraries/System.Runtime/tests/System.Runtime.Tests.builds
+++ b/src/libraries/System.Runtime/tests/System.Runtime.Tests.builds
@@ -1,4 +1,4 @@
-
+
@@ -8,8 +8,8 @@
netcoreapp1.0
- netcoreapp1.1
- netcoreapp1.1
+ netcoreapp
+ netcoreapp
netstandard1.5
diff --git a/src/libraries/System.Runtime/tests/System.Runtime.Tests.csproj b/src/libraries/System.Runtime/tests/System.Runtime.Tests.csproj
index cfaa4316586bbccb37917197748999e88acc283f..7c00479a827684d4226541091b9d77d912d21f9c 100644
--- a/src/libraries/System.Runtime/tests/System.Runtime.Tests.csproj
+++ b/src/libraries/System.Runtime/tests/System.Runtime.Tests.csproj
@@ -242,4 +242,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime/tests/TestAssembly/TestAssembly.csproj b/src/libraries/System.Runtime/tests/TestAssembly/TestAssembly.csproj
index 605a2b1218fd09a58f836c3def4f278cd484237b..d46332d88b5a280ef2fc110e5032db1b246f57b6 100644
--- a/src/libraries/System.Runtime/tests/TestAssembly/TestAssembly.csproj
+++ b/src/libraries/System.Runtime/tests/TestAssembly/TestAssembly.csproj
@@ -16,7 +16,7 @@
-
+
Common\System\Diagnostics\CodeAnalysis\ExcludeFromCodeCoverageAttribute.cs
@@ -30,4 +30,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Runtime/tests/TestLoadAssembly/TestLoadAssembly.csproj b/src/libraries/System.Runtime/tests/TestLoadAssembly/TestLoadAssembly.csproj
index 26b4701a442c6ba1ce30f7fd3f68504d7f925c43..783319d48e8cfbd55171b619c2b30a100a80d875 100644
--- a/src/libraries/System.Runtime/tests/TestLoadAssembly/TestLoadAssembly.csproj
+++ b/src/libraries/System.Runtime/tests/TestLoadAssembly/TestLoadAssembly.csproj
@@ -25,4 +25,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.AccessControl/pkg/System.Security.AccessControl.builds b/src/libraries/System.Security.AccessControl/pkg/System.Security.AccessControl.builds
index eb4340497aa030ae13a37a42abc1a970d4635ada..b94a3c10b6459417c8bbd96933ee5ad4d18f04a1 100644
--- a/src/libraries/System.Security.AccessControl/pkg/System.Security.AccessControl.builds
+++ b/src/libraries/System.Security.AccessControl/pkg/System.Security.AccessControl.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.AccessControl/pkg/System.Security.AccessControl.pkgproj b/src/libraries/System.Security.AccessControl/pkg/System.Security.AccessControl.pkgproj
index f616721af40695eff58676b22f477d931d886c9e..dcf0b8bf82304c62dd63856e958269025c5cbc3d 100644
--- a/src/libraries/System.Security.AccessControl/pkg/System.Security.AccessControl.pkgproj
+++ b/src/libraries/System.Security.AccessControl/pkg/System.Security.AccessControl.pkgproj
@@ -1,16 +1,14 @@
-
+
- net463;netcoreapp1.1
+ net463;netcoreapp2.0
-
win
-
+
-
\ No newline at end of file
diff --git a/src/libraries/System.Security.AccessControl/ref/System.Security.AccessControl.csproj b/src/libraries/System.Security.AccessControl/ref/System.Security.AccessControl.csproj
index efbe83ff6ddfe32e1c8a6fe61c7c14ef1977d1bd..ab04991998e377a46664d085eaf811c7597f3dab 100644
--- a/src/libraries/System.Security.AccessControl/ref/System.Security.AccessControl.csproj
+++ b/src/libraries/System.Security.AccessControl/ref/System.Security.AccessControl.csproj
@@ -1,4 +1,4 @@
-
+
@@ -11,4 +11,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.AccessControl/src/Configurations.props b/src/libraries/System.Security.AccessControl/src/Configurations.props
index 54621aaa2596fd3b447bf744593de03f022ef9c0..ade796f1bf8b0af7e8b8d665d40540d9908b8d46 100644
--- a/src/libraries/System.Security.AccessControl/src/Configurations.props
+++ b/src/libraries/System.Security.AccessControl/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -7,4 +7,4 @@
netstandard-Unix;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.AccessControl/tests/System.Security.AccessControl.builds b/src/libraries/System.Security.AccessControl/tests/System.Security.AccessControl.builds
index d847468c544d9aa55cb39abd86258e2cf6878ff2..5c38ca9ce990bff1be3f967863c576a4b3c1a11f 100644
--- a/src/libraries/System.Security.AccessControl/tests/System.Security.AccessControl.builds
+++ b/src/libraries/System.Security.AccessControl/tests/System.Security.AccessControl.builds
@@ -1,9 +1,9 @@
-
+
- netcoreapp1.1;net463
+ netcoreapp;net463
Windows_NT
@@ -13,5 +13,4 @@
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Claims/pkg/System.Security.Claims.builds b/src/libraries/System.Security.Claims/pkg/System.Security.Claims.builds
index 34ed30d13ce6bffefc9f0643dfc52affb9ef22dc..f057fec707c506e51347823b18d70a275be350cd 100644
--- a/src/libraries/System.Security.Claims/pkg/System.Security.Claims.builds
+++ b/src/libraries/System.Security.Claims/pkg/System.Security.Claims.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Claims/pkg/System.Security.Claims.pkgproj b/src/libraries/System.Security.Claims/pkg/System.Security.Claims.pkgproj
index c3143cac97fdb996f523fe13181fa35e263985a0..f5f5ecac61957e223d9800485a393cf864020b29 100644
--- a/src/libraries/System.Security.Claims/pkg/System.Security.Claims.pkgproj
+++ b/src/libraries/System.Security.Claims/pkg/System.Security.Claims.pkgproj
@@ -1,9 +1,9 @@
-
+
- net463;netcoreapp1.1;$(AllXamarinFrameworks)
+ net463;netcoreapp2.0;$(AllXamarinFrameworks)
diff --git a/src/libraries/System.Security.Claims/ref/System.Security.Claims.csproj b/src/libraries/System.Security.Claims/ref/System.Security.Claims.csproj
index 00d133cf4ed309532e85794d115c0970d14d8190..fa0cc064305b8ad787d64d829976e0a249b18648 100644
--- a/src/libraries/System.Security.Claims/ref/System.Security.Claims.csproj
+++ b/src/libraries/System.Security.Claims/ref/System.Security.Claims.csproj
@@ -1,4 +1,4 @@
-
+
@@ -12,4 +12,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Claims/src/Configurations.props b/src/libraries/System.Security.Claims/src/Configurations.props
index 9c336c0be9e52171e2fecf14214e3373be07177d..dc837f915219bcf7ff5c38f67e01c45d5b976485 100644
--- a/src/libraries/System.Security.Claims/src/Configurations.props
+++ b/src/libraries/System.Security.Claims/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Claims/tests/Configurations.props b/src/libraries/System.Security.Claims/tests/Configurations.props
index 98f53209d45a12360d0bbf7cf031b29ff556fc57..c398e42e899425ce70e3a9884633835ab6fcc66e 100644
--- a/src/libraries/System.Security.Claims/tests/Configurations.props
+++ b/src/libraries/System.Security.Claims/tests/Configurations.props
@@ -1,8 +1,8 @@
-
+
- netstandard1.7;
+ netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Claims/tests/System.Security.Claims.Tests.builds b/src/libraries/System.Security.Claims/tests/System.Security.Claims.Tests.builds
index fcad90e56dceb51ee65c8141b3215aadec3ac7be..013e214cf86ed8c52aea7c82904b7dfabcb373ed 100644
--- a/src/libraries/System.Security.Claims/tests/System.Security.Claims.Tests.builds
+++ b/src/libraries/System.Security.Claims/tests/System.Security.Claims.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Security.Cryptography.Algorithms/pkg/System.Security.Cryptography.Algorithms.builds b/src/libraries/System.Security.Cryptography.Algorithms/pkg/System.Security.Cryptography.Algorithms.builds
index 224887ff060c0dba5226e376cfba8d5798970f94..70ff17e4765e46e866991416330cea2b58345d6e 100644
--- a/src/libraries/System.Security.Cryptography.Algorithms/pkg/System.Security.Cryptography.Algorithms.builds
+++ b/src/libraries/System.Security.Cryptography.Algorithms/pkg/System.Security.Cryptography.Algorithms.builds
@@ -1,8 +1,8 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.Algorithms/pkg/System.Security.Cryptography.Algorithms.pkgproj b/src/libraries/System.Security.Cryptography.Algorithms/pkg/System.Security.Cryptography.Algorithms.pkgproj
index d26561d20db3c8dcfd90b6ae63132af9ffc8acc2..8ec38dd1d321795c3154253dddaf162a83fc5b36 100644
--- a/src/libraries/System.Security.Cryptography.Algorithms/pkg/System.Security.Cryptography.Algorithms.pkgproj
+++ b/src/libraries/System.Security.Cryptography.Algorithms/pkg/System.Security.Cryptography.Algorithms.pkgproj
@@ -1,9 +1,9 @@
-
+
- net463;netcoreapp1.1;$(AllXamarinFrameworks)
+ net463;netcoreapp2.0;$(AllXamarinFrameworks)
@@ -14,4 +14,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.Algorithms/ref/System.Security.Cryptography.Algorithms.csproj b/src/libraries/System.Security.Cryptography.Algorithms/ref/System.Security.Cryptography.Algorithms.csproj
index b56c2f122cd7c1c1b0b3423cfbe8204a7300273b..757d5ce898c2e2a2b68ce2dc2d792abe9ed18044 100644
--- a/src/libraries/System.Security.Cryptography.Algorithms/ref/System.Security.Cryptography.Algorithms.csproj
+++ b/src/libraries/System.Security.Cryptography.Algorithms/ref/System.Security.Cryptography.Algorithms.csproj
@@ -1,4 +1,4 @@
-
+
@@ -12,4 +12,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.Algorithms/src/Configurations.props b/src/libraries/System.Security.Cryptography.Algorithms/src/Configurations.props
index 6b92af3b022d6420d826f4cbe18faceaf9a91da4..ecc6342ceef4fff21b2ab1ba2837c0654a5581c6 100644
--- a/src/libraries/System.Security.Cryptography.Algorithms/src/Configurations.props
+++ b/src/libraries/System.Security.Cryptography.Algorithms/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -8,4 +8,4 @@
netstandard-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.Algorithms/tests/Configurations.props b/src/libraries/System.Security.Cryptography.Algorithms/tests/Configurations.props
index a98856d37e6c4eb001c7fee573fd3aac7a5279c3..dbe4492ae378bd80c82c128e11c7eb915101e892 100644
--- a/src/libraries/System.Security.Cryptography.Algorithms/tests/Configurations.props
+++ b/src/libraries/System.Security.Cryptography.Algorithms/tests/Configurations.props
@@ -1,11 +1,11 @@
-
+
netstandard1.6-Unix;
netstandard1.6-Windows_NT;
- netstandard1.7-Unix;
- netstandard1.7-Windows_NT;
+ netstandard-Unix;
+ netstandard-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.Algorithms/tests/System.Security.Cryptography.Algorithms.Tests.builds b/src/libraries/System.Security.Cryptography.Algorithms/tests/System.Security.Cryptography.Algorithms.Tests.builds
index 69d861d255d05a56471ec82088c775cc25150474..323e90a9fc7306bb6b9f510c61d3116200ed77e6 100644
--- a/src/libraries/System.Security.Cryptography.Algorithms/tests/System.Security.Cryptography.Algorithms.Tests.builds
+++ b/src/libraries/System.Security.Cryptography.Algorithms/tests/System.Security.Cryptography.Algorithms.Tests.builds
@@ -1,4 +1,4 @@
-
+
@@ -7,7 +7,7 @@
Windows_NT
- netcoreapp1.1;net463
+ netcoreapp;net463
netstandard1.6
diff --git a/src/libraries/System.Security.Cryptography.Algorithms/tests/System.Security.Cryptography.Algorithms.Tests.csproj b/src/libraries/System.Security.Cryptography.Algorithms/tests/System.Security.Cryptography.Algorithms.Tests.csproj
index 81215a39fe69bc476f9d02c2751a4e3a9dea4816..6764224aeb65f0479f4268a3537e069af2626d67 100644
--- a/src/libraries/System.Security.Cryptography.Algorithms/tests/System.Security.Cryptography.Algorithms.Tests.csproj
+++ b/src/libraries/System.Security.Cryptography.Algorithms/tests/System.Security.Cryptography.Algorithms.Tests.csproj
@@ -206,4 +206,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.Cng/pkg/System.Security.Cryptography.Cng.builds b/src/libraries/System.Security.Cryptography.Cng/pkg/System.Security.Cryptography.Cng.builds
index d24a5097590faf49e16ac54db9f6b60632e1fbb4..30ee5f3fb4aea354163e4a285c1467c4c1a50274 100644
--- a/src/libraries/System.Security.Cryptography.Cng/pkg/System.Security.Cryptography.Cng.builds
+++ b/src/libraries/System.Security.Cryptography.Cng/pkg/System.Security.Cryptography.Cng.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.Cng/pkg/System.Security.Cryptography.Cng.pkgproj b/src/libraries/System.Security.Cryptography.Cng/pkg/System.Security.Cryptography.Cng.pkgproj
index 35ca0445e2b2d2124c5b90a4971b59a1f8b96266..540120e5dde89dcb53d7546bb2125952c48f0b06 100644
--- a/src/libraries/System.Security.Cryptography.Cng/pkg/System.Security.Cryptography.Cng.pkgproj
+++ b/src/libraries/System.Security.Cryptography.Cng/pkg/System.Security.Cryptography.Cng.pkgproj
@@ -1,11 +1,11 @@
-
+
- net463;netcoreapp1.1
+ net463;netcoreapp2.0
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.Cng/ref/System.Security.Cryptography.Cng.csproj b/src/libraries/System.Security.Cryptography.Cng/ref/System.Security.Cryptography.Cng.csproj
index b78c16793320972dc6c195f65fbf03caedce5372..e67e91b6565ed2ef55608512ed3372c6c4e62974 100644
--- a/src/libraries/System.Security.Cryptography.Cng/ref/System.Security.Cryptography.Cng.csproj
+++ b/src/libraries/System.Security.Cryptography.Cng/ref/System.Security.Cryptography.Cng.csproj
@@ -1,4 +1,4 @@
-
+
@@ -12,4 +12,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.Cng/src/Configurations.props b/src/libraries/System.Security.Cryptography.Cng/src/Configurations.props
index 54621aaa2596fd3b447bf744593de03f022ef9c0..ade796f1bf8b0af7e8b8d665d40540d9908b8d46 100644
--- a/src/libraries/System.Security.Cryptography.Cng/src/Configurations.props
+++ b/src/libraries/System.Security.Cryptography.Cng/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -7,4 +7,4 @@
netstandard-Unix;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.Cng/tests/Configurations.props b/src/libraries/System.Security.Cryptography.Cng/tests/Configurations.props
index 8ac8400156bbfb346500e04fc9d45e7e8a909061..1772b8de4d7de251da2d0a75e685045837fcf76f 100644
--- a/src/libraries/System.Security.Cryptography.Cng/tests/Configurations.props
+++ b/src/libraries/System.Security.Cryptography.Cng/tests/Configurations.props
@@ -1,9 +1,9 @@
-
+
netstandard1.6-Windows_NT;
- netstandard1.7-Windows_NT;
+ netstandard-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.builds b/src/libraries/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.builds
index 1427fe5786eadca92b0a6af4510b9c4881c9d7d8..c633af3c0e9a175229341ed95d95e4477fc0ab86 100644
--- a/src/libraries/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.builds
+++ b/src/libraries/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.builds
@@ -1,10 +1,10 @@
-
+
Windows_NT
- netcoreapp1.1;net463
+ netcoreapp;net463
netstandard1.6
diff --git a/src/libraries/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj b/src/libraries/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj
index 6de4fbd57e6006024f949e5f2bfd9e712176f585..c64ad5cdbe8f0a81fd22d8cd4c26c2045eeca86d 100644
--- a/src/libraries/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj
+++ b/src/libraries/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj
@@ -154,4 +154,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.Csp/pkg/System.Security.Cryptography.Csp.builds b/src/libraries/System.Security.Cryptography.Csp/pkg/System.Security.Cryptography.Csp.builds
index e0f34f1215e60c1b0d2497994ac44dd145179ff5..9494f8792bd7764a23f6b0d0d1616b75fa4cc350 100644
--- a/src/libraries/System.Security.Cryptography.Csp/pkg/System.Security.Cryptography.Csp.builds
+++ b/src/libraries/System.Security.Cryptography.Csp/pkg/System.Security.Cryptography.Csp.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.Csp/pkg/System.Security.Cryptography.Csp.pkgproj b/src/libraries/System.Security.Cryptography.Csp/pkg/System.Security.Cryptography.Csp.pkgproj
index 24b55c28e08d9de310994a71750b9fa98dfa6b9c..9459c45a47506b0a8da06303b63ccb9ff1cb6b83 100644
--- a/src/libraries/System.Security.Cryptography.Csp/pkg/System.Security.Cryptography.Csp.pkgproj
+++ b/src/libraries/System.Security.Cryptography.Csp/pkg/System.Security.Cryptography.Csp.pkgproj
@@ -1,9 +1,9 @@
-
+
- net463;netcoreapp1.1;$(AllXamarinFrameworks)
+ net463;netcoreapp2.0;$(AllXamarinFrameworks)
diff --git a/src/libraries/System.Security.Cryptography.Csp/ref/System.Security.Cryptography.Csp.csproj b/src/libraries/System.Security.Cryptography.Csp/ref/System.Security.Cryptography.Csp.csproj
index e38c4ebb8821d22b9db8f46490214a49710040da..e87ffabe698e0f0a3e7512b5d3d562928f886290 100644
--- a/src/libraries/System.Security.Cryptography.Csp/ref/System.Security.Cryptography.Csp.csproj
+++ b/src/libraries/System.Security.Cryptography.Csp/ref/System.Security.Cryptography.Csp.csproj
@@ -1,4 +1,4 @@
-
+
@@ -12,4 +12,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.Csp/src/Configurations.props b/src/libraries/System.Security.Cryptography.Csp/src/Configurations.props
index 54621aaa2596fd3b447bf744593de03f022ef9c0..ade796f1bf8b0af7e8b8d665d40540d9908b8d46 100644
--- a/src/libraries/System.Security.Cryptography.Csp/src/Configurations.props
+++ b/src/libraries/System.Security.Cryptography.Csp/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -7,4 +7,4 @@
netstandard-Unix;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.Csp/tests/Configurations.props b/src/libraries/System.Security.Cryptography.Csp/tests/Configurations.props
index 9899767269c70344818f48037a578315199b0f6a..cf10431a14f043f0ac5e3f5732b39212a8cfea3c 100644
--- a/src/libraries/System.Security.Cryptography.Csp/tests/Configurations.props
+++ b/src/libraries/System.Security.Cryptography.Csp/tests/Configurations.props
@@ -1,9 +1,9 @@
-
+
netstandard1.3-Windows_NT;
- netstandard1.7-Windows_NT;
+ netstandard-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.builds b/src/libraries/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.builds
index 503eb163c697a897e6eb21fd5921ba22e91e12b4..e37186b49bfce562e5fef9f2dce58c7b6903efc5 100644
--- a/src/libraries/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.builds
+++ b/src/libraries/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.csproj b/src/libraries/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.csproj
index cc5dd26df2ac16333ea23dd471e73fba0def359a..37c9ba4efccebc5f2a95e0383e3809929fcc3689 100644
--- a/src/libraries/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.csproj
+++ b/src/libraries/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.csproj
@@ -109,4 +109,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.Encoding/pkg/System.Security.Cryptography.Encoding.builds b/src/libraries/System.Security.Cryptography.Encoding/pkg/System.Security.Cryptography.Encoding.builds
index bea58651a7d615b2c0b4e076dd3abd8de7c2806a..bbb60403ab25a6168612d572a14ace5eccc253b3 100644
--- a/src/libraries/System.Security.Cryptography.Encoding/pkg/System.Security.Cryptography.Encoding.builds
+++ b/src/libraries/System.Security.Cryptography.Encoding/pkg/System.Security.Cryptography.Encoding.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.Encoding/pkg/System.Security.Cryptography.Encoding.pkgproj b/src/libraries/System.Security.Cryptography.Encoding/pkg/System.Security.Cryptography.Encoding.pkgproj
index e1ead3bbc11eeba72bd55c48d5f0272c7900b35c..88463cb064f87c9c55da87041063300d126e7662 100644
--- a/src/libraries/System.Security.Cryptography.Encoding/pkg/System.Security.Cryptography.Encoding.pkgproj
+++ b/src/libraries/System.Security.Cryptography.Encoding/pkg/System.Security.Cryptography.Encoding.pkgproj
@@ -1,12 +1,11 @@
-
+
- net463;netcoreapp1.1;$(AllXamarinFrameworks)
+ net463;netcoreapp2.0;$(AllXamarinFrameworks)
-
diff --git a/src/libraries/System.Security.Cryptography.Encoding/ref/System.Security.Cryptography.Encoding.csproj b/src/libraries/System.Security.Cryptography.Encoding/ref/System.Security.Cryptography.Encoding.csproj
index 8e9071fa74aaf12aa91704b24206bee611d99c8e..daaca689ceb8b7e5a4c73b5d994ecc074754e1af 100644
--- a/src/libraries/System.Security.Cryptography.Encoding/ref/System.Security.Cryptography.Encoding.csproj
+++ b/src/libraries/System.Security.Cryptography.Encoding/ref/System.Security.Cryptography.Encoding.csproj
@@ -1,4 +1,4 @@
-
+
@@ -9,4 +9,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.Encoding/src/Configurations.props b/src/libraries/System.Security.Cryptography.Encoding/src/Configurations.props
index 0decf0d6c0f829127304e0ad0d5d8ccd423288b1..7a242f16dd37df36ff550a73f12bf8c75a3b9c05 100644
--- a/src/libraries/System.Security.Cryptography.Encoding/src/Configurations.props
+++ b/src/libraries/System.Security.Cryptography.Encoding/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -7,4 +7,4 @@
netstandard-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.Encoding/tests/Configurations.props b/src/libraries/System.Security.Cryptography.Encoding/tests/Configurations.props
index 981075fcc557f85d80b9ef41c767e86ae0392478..fa9e1005a0a90d40a40f303f8ba07aac1c35ad19 100644
--- a/src/libraries/System.Security.Cryptography.Encoding/tests/Configurations.props
+++ b/src/libraries/System.Security.Cryptography.Encoding/tests/Configurations.props
@@ -1,11 +1,11 @@
-
+
netstandard1.3-Unix;
netstandard1.3-Windows_NT;
- netstandard1.7-Unix;
- netstandard1.7-Windows_NT;
+ netstandard-Unix;
+ netstandard-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.Encoding/tests/System.Security.Cryptography.Encoding.Tests.builds b/src/libraries/System.Security.Cryptography.Encoding/tests/System.Security.Cryptography.Encoding.Tests.builds
index 415df219301130effd8ab3be8093abca02869ee5..0459ec4475cbe742f02acf6f5f0265d85f127d38 100644
--- a/src/libraries/System.Security.Cryptography.Encoding/tests/System.Security.Cryptography.Encoding.Tests.builds
+++ b/src/libraries/System.Security.Cryptography.Encoding/tests/System.Security.Cryptography.Encoding.Tests.builds
@@ -1,4 +1,4 @@
-
+
@@ -7,7 +7,7 @@
Windows_NT
- netcoreapp1.1;net463
+ netcoreapp;net463
netstandard1.3
diff --git a/src/libraries/System.Security.Cryptography.Encoding/tests/System.Security.Cryptography.Encoding.Tests.csproj b/src/libraries/System.Security.Cryptography.Encoding/tests/System.Security.Cryptography.Encoding.Tests.csproj
index e9533df24af249a974e0d21f9e692dc7a41df98e..b3ca593a184620978f696ea1785a320b6cab7697 100644
--- a/src/libraries/System.Security.Cryptography.Encoding/tests/System.Security.Cryptography.Encoding.Tests.csproj
+++ b/src/libraries/System.Security.Cryptography.Encoding/tests/System.Security.Cryptography.Encoding.Tests.csproj
@@ -27,4 +27,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.OpenSsl/pkg/System.Security.Cryptography.OpenSsl.builds b/src/libraries/System.Security.Cryptography.OpenSsl/pkg/System.Security.Cryptography.OpenSsl.builds
index 54cb0748261d2160bb303fa63dc63f3f44e85be0..8e0011f41a644ed41f882c835740dcd1b0fb1569 100644
--- a/src/libraries/System.Security.Cryptography.OpenSsl/pkg/System.Security.Cryptography.OpenSsl.builds
+++ b/src/libraries/System.Security.Cryptography.OpenSsl/pkg/System.Security.Cryptography.OpenSsl.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
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 b4c0484f81b82d9c7801a31c1bc12b6bfaf9be31..488e9cd23ce1912be0e9076a018b6f724bda6c1e 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,11 +1,11 @@
-
+
- net461;netcoreapp1.1;$(AllXamarinFrameworks)
+ net461;netcoreapp2.0;$(AllXamarinFrameworks)
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.OpenSsl/ref/System.Security.Cryptography.OpenSsl.csproj b/src/libraries/System.Security.Cryptography.OpenSsl/ref/System.Security.Cryptography.OpenSsl.csproj
index ea7bf9007787c58a8a2064396c59381c6ac53899..a61c822a5f91efc152942a30096fe664304f3bba 100644
--- a/src/libraries/System.Security.Cryptography.OpenSsl/ref/System.Security.Cryptography.OpenSsl.csproj
+++ b/src/libraries/System.Security.Cryptography.OpenSsl/ref/System.Security.Cryptography.OpenSsl.csproj
@@ -1,4 +1,4 @@
-
+
@@ -12,4 +12,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.OpenSsl/src/Configurations.props b/src/libraries/System.Security.Cryptography.OpenSsl/src/Configurations.props
index 3d4674aeac3099b4b2c39ad0205545c2d2fd558d..cfc57211a43f1efa201dcfc0a5b7dd9d7e9f2987 100644
--- a/src/libraries/System.Security.Cryptography.OpenSsl/src/Configurations.props
+++ b/src/libraries/System.Security.Cryptography.OpenSsl/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.OpenSsl/tests/Configurations.props b/src/libraries/System.Security.Cryptography.OpenSsl/tests/Configurations.props
index ca3d74da1dad5172cacd787ba726982ddea20361..b975ea34b64c9d3ac3e615c3cd203f46a527c8e9 100644
--- a/src/libraries/System.Security.Cryptography.OpenSsl/tests/Configurations.props
+++ b/src/libraries/System.Security.Cryptography.OpenSsl/tests/Configurations.props
@@ -1,9 +1,9 @@
-
+
netstandard1.6-Unix;
- netstandard1.7-Unix;
+ netstandard-Unix;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.builds b/src/libraries/System.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.builds
index 872501374040d2f7051782c25e112e6058b47ff8..74f8de447d99837549c85945b8a14f1dc231e142 100644
--- a/src/libraries/System.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.builds
+++ b/src/libraries/System.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.csproj b/src/libraries/System.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.csproj
index 1bca7912be59487a40d6f489a3d3cf4737f396e8..435363591f03a044ee9db162e1cc15c6a16f198d 100644
--- a/src/libraries/System.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.csproj
+++ b/src/libraries/System.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.csproj
@@ -111,4 +111,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.Pkcs/pkg/System.Security.Cryptography.Pkcs.builds b/src/libraries/System.Security.Cryptography.Pkcs/pkg/System.Security.Cryptography.Pkcs.builds
index bb8c1cd8aba7102f42943242b12f7a56277a97e4..4ef5604e0d1f8a5e6f4d49644b950fc307727668 100644
--- a/src/libraries/System.Security.Cryptography.Pkcs/pkg/System.Security.Cryptography.Pkcs.builds
+++ b/src/libraries/System.Security.Cryptography.Pkcs/pkg/System.Security.Cryptography.Pkcs.builds
@@ -1,8 +1,8 @@
-
+
-
+
\ No newline at end of file
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 f85aca140345e5a8aac3518a6fec41d64ea73021..3dfd243c7dd9c21d79a724d09f3863c8566d58b4 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,17 +1,14 @@
-
+
-
net46;netcore50;netcoreapp1.0
-
<_xamarinFrameworks Include="$(AllXamarinFrameworks)" />
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.Pkcs/ref/System.Security.Cryptography.Pkcs.csproj b/src/libraries/System.Security.Cryptography.Pkcs/ref/System.Security.Cryptography.Pkcs.csproj
index 26a71de65671b7197d81a5ecca8266f174eac0d4..4765c864c58ea459bae7df63c55ccf4815bd079c 100644
--- a/src/libraries/System.Security.Cryptography.Pkcs/ref/System.Security.Cryptography.Pkcs.csproj
+++ b/src/libraries/System.Security.Cryptography.Pkcs/ref/System.Security.Cryptography.Pkcs.csproj
@@ -1,4 +1,4 @@
-
+
@@ -10,4 +10,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.Pkcs/src/Configurations.props b/src/libraries/System.Security.Cryptography.Pkcs/src/Configurations.props
index 17d5314baddb0112504025118cccea4ce82c95b6..6c325c70f5b1ed1b64044ce2c634683063b35b24 100644
--- a/src/libraries/System.Security.Cryptography.Pkcs/src/Configurations.props
+++ b/src/libraries/System.Security.Cryptography.Pkcs/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -8,4 +8,4 @@
net46-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.Pkcs/tests/Configurations.props b/src/libraries/System.Security.Cryptography.Pkcs/tests/Configurations.props
index 33bfeee701c8b882b51fa333de530e828b789c89..c51fd14e1d9ee92bcea2eb3426c96af991073d35 100644
--- a/src/libraries/System.Security.Cryptography.Pkcs/tests/Configurations.props
+++ b/src/libraries/System.Security.Cryptography.Pkcs/tests/Configurations.props
@@ -1,9 +1,9 @@
-
+
- netcoreapp1.1-Windows_NT;
+ netcoreapp-Windows_NT;
netstandard1.3-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.builds b/src/libraries/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.builds
index 96de070dd7ee9d71a8f8e076f4f3276e06bd03df..d66aa452a4b9b473000e73da2a8cbbb50f2f6dde 100644
--- a/src/libraries/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.builds
+++ b/src/libraries/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.builds
@@ -1,4 +1,4 @@
-
+
@@ -7,10 +7,10 @@
netcore50;netcoreapp1.0;net46
- netcoreapp1.1
+ netcoreapp
Windows_NT
- netcoreapp1.1
+ netcoreapp
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.csproj b/src/libraries/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.csproj
index 7b9af1de1bec3f978d6bdc870ea0ec2ad7b7d4c9..c3602e05dced6bdd695218d3a9841c18b98fd65f 100644
--- a/src/libraries/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.csproj
+++ b/src/libraries/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.csproj
@@ -42,4 +42,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.Primitives/pkg/System.Security.Cryptography.Primitives.builds b/src/libraries/System.Security.Cryptography.Primitives/pkg/System.Security.Cryptography.Primitives.builds
index f04223c2bc7522586130d9d4e6649f10a5064c9f..114e3d313600dfa69b2391efaddb46931dc520ed 100644
--- a/src/libraries/System.Security.Cryptography.Primitives/pkg/System.Security.Cryptography.Primitives.builds
+++ b/src/libraries/System.Security.Cryptography.Primitives/pkg/System.Security.Cryptography.Primitives.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.Primitives/pkg/System.Security.Cryptography.Primitives.pkgproj b/src/libraries/System.Security.Cryptography.Primitives/pkg/System.Security.Cryptography.Primitives.pkgproj
index 11ddde4e5e3bd77bf91999e96ad1fc8ad63a7ee0..2eae5c74e7c19e7d2c2a18d139166f952604bbb7 100644
--- a/src/libraries/System.Security.Cryptography.Primitives/pkg/System.Security.Cryptography.Primitives.pkgproj
+++ b/src/libraries/System.Security.Cryptography.Primitives/pkg/System.Security.Cryptography.Primitives.pkgproj
@@ -1,9 +1,9 @@
-
+
- net463;netcoreapp1.1;$(AllXamarinFrameworks)
+ net463;netcoreapp2.0;$(AllXamarinFrameworks)
@@ -16,4 +16,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.Primitives/ref/Configurations.props b/src/libraries/System.Security.Cryptography.Primitives/ref/Configurations.props
index 84eaf1100d0d6e4aff4d8960b61aa79a9ab0c132..77a4b65bc94a425ce217a1e6878bb6f236cf8abc 100644
--- a/src/libraries/System.Security.Cryptography.Primitives/ref/Configurations.props
+++ b/src/libraries/System.Security.Cryptography.Primitives/ref/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netcoreapp;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.Primitives/ref/System.Security.Cryptography.Primitives.builds b/src/libraries/System.Security.Cryptography.Primitives/ref/System.Security.Cryptography.Primitives.builds
index cdccdb8113857f732c6b3911fd9a8517a05e7cc7..5c71c7c2437a8a753cb1135eb7cc2ac540e378e7 100644
--- a/src/libraries/System.Security.Cryptography.Primitives/ref/System.Security.Cryptography.Primitives.builds
+++ b/src/libraries/System.Security.Cryptography.Primitives/ref/System.Security.Cryptography.Primitives.builds
@@ -1,11 +1,11 @@
-
+
- netstandard1.7
+ netstandard
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.Primitives/ref/System.Security.Cryptography.Primitives.csproj b/src/libraries/System.Security.Cryptography.Primitives/ref/System.Security.Cryptography.Primitives.csproj
index 88d688841671a685922e0f01850aad177ef2d041..0fb1b16e2b4d2ba3ab6592cec275a770ac6def45 100644
--- a/src/libraries/System.Security.Cryptography.Primitives/ref/System.Security.Cryptography.Primitives.csproj
+++ b/src/libraries/System.Security.Cryptography.Primitives/ref/System.Security.Cryptography.Primitives.csproj
@@ -1,4 +1,4 @@
-
+
@@ -13,4 +13,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.Primitives/src/Configurations.props b/src/libraries/System.Security.Cryptography.Primitives/src/Configurations.props
index 9c336c0be9e52171e2fecf14214e3373be07177d..dc837f915219bcf7ff5c38f67e01c45d5b976485 100644
--- a/src/libraries/System.Security.Cryptography.Primitives/src/Configurations.props
+++ b/src/libraries/System.Security.Cryptography.Primitives/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.Primitives/tests/Configurations.props b/src/libraries/System.Security.Cryptography.Primitives/tests/Configurations.props
index c5a04c70ce16b48c9fad89f1558330f04e6f7663..d529158e05178577d5a8ec6e4a0559f516918f26 100644
--- a/src/libraries/System.Security.Cryptography.Primitives/tests/Configurations.props
+++ b/src/libraries/System.Security.Cryptography.Primitives/tests/Configurations.props
@@ -1,10 +1,10 @@
-
+
netstandard1.3-Windows_NT;
- netcoreapp1.1;
- netstandard1.7;
+ netcoreapp;
+ netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.Primitives/tests/System.Security.Cryptography.Primitives.Tests.builds b/src/libraries/System.Security.Cryptography.Primitives/tests/System.Security.Cryptography.Primitives.Tests.builds
index 8d8aae0cba92f9d5af378c8a4a1a8ba80b185d15..97db9afdafd672d7644a259eb30ff457af49c69d 100644
--- a/src/libraries/System.Security.Cryptography.Primitives/tests/System.Security.Cryptography.Primitives.Tests.builds
+++ b/src/libraries/System.Security.Cryptography.Primitives/tests/System.Security.Cryptography.Primitives.Tests.builds
@@ -1,18 +1,17 @@
-
+
-
+
netstandard1.3
Windows_NT
netcoreapp1.0
- netcoreapp1.1
- netcoreapp1.1
+ netcoreapp
+ netcoreapp
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.Primitives/tests/System.Security.Cryptography.Primitives.Tests.csproj b/src/libraries/System.Security.Cryptography.Primitives/tests/System.Security.Cryptography.Primitives.Tests.csproj
index babad56a6f5fbfa9aaa8cb768b7e535e7589da61..d0a7caa1b436cafa2e16777b0488ee276ca4a580 100644
--- a/src/libraries/System.Security.Cryptography.Primitives/tests/System.Security.Cryptography.Primitives.Tests.csproj
+++ b/src/libraries/System.Security.Cryptography.Primitives/tests/System.Security.Cryptography.Primitives.Tests.csproj
@@ -26,4 +26,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.ProtectedData/pkg/System.Security.Cryptography.ProtectedData.builds b/src/libraries/System.Security.Cryptography.ProtectedData/pkg/System.Security.Cryptography.ProtectedData.builds
index e22c184ab8d82a321e9e6ef1f96210b1d1999347..e05653ab0e3470b6b5d3fea7b314d8c11337d6c8 100644
--- a/src/libraries/System.Security.Cryptography.ProtectedData/pkg/System.Security.Cryptography.ProtectedData.builds
+++ b/src/libraries/System.Security.Cryptography.ProtectedData/pkg/System.Security.Cryptography.ProtectedData.builds
@@ -1,4 +1,4 @@
-
+
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 d827a558844dc4111d999c001aea54722c091e3f..400606da08724b7e40d9ff09f8a27ba59e793759 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,7 +1,6 @@
-
+
-
net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)
@@ -16,6 +15,5 @@
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.ProtectedData/ref/System.Security.Cryptography.ProtectedData.csproj b/src/libraries/System.Security.Cryptography.ProtectedData/ref/System.Security.Cryptography.ProtectedData.csproj
index 90eeb762557348b59350137333a191a0dd9971f7..c895be3bb585dfff1d58cf7ad6a23bbf1e0c0d21 100644
--- a/src/libraries/System.Security.Cryptography.ProtectedData/ref/System.Security.Cryptography.ProtectedData.csproj
+++ b/src/libraries/System.Security.Cryptography.ProtectedData/ref/System.Security.Cryptography.ProtectedData.csproj
@@ -1,4 +1,4 @@
-
+
@@ -8,4 +8,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.ProtectedData/src/Configurations.props b/src/libraries/System.Security.Cryptography.ProtectedData/src/Configurations.props
index a6c74d0e580323818caeda4f9796888bd7d569fd..437e6acc34bd512623ac7187b99d13d100213f25 100644
--- a/src/libraries/System.Security.Cryptography.ProtectedData/src/Configurations.props
+++ b/src/libraries/System.Security.Cryptography.ProtectedData/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -7,4 +7,4 @@
netstandard1.3-Unix;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.ProtectedData/tests/Configurations.props b/src/libraries/System.Security.Cryptography.ProtectedData/tests/Configurations.props
index 5d77dc616e23f0285c9cc66f180261bfa44e69c4..5f482b878bc4a4b91da33a6a7c4906082909ec30 100644
--- a/src/libraries/System.Security.Cryptography.ProtectedData/tests/Configurations.props
+++ b/src/libraries/System.Security.Cryptography.ProtectedData/tests/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard1.3-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.ProtectedData/tests/System.Security.Cryptography.ProtectedData.Tests.builds b/src/libraries/System.Security.Cryptography.ProtectedData/tests/System.Security.Cryptography.ProtectedData.Tests.builds
index 8a4e09bdba4a0d525d92772a1093eb4cbb6cdf15..2af018bcaf9b2459df16432a4bfdb22c1daced51 100644
--- a/src/libraries/System.Security.Cryptography.ProtectedData/tests/System.Security.Cryptography.ProtectedData.Tests.builds
+++ b/src/libraries/System.Security.Cryptography.ProtectedData/tests/System.Security.Cryptography.ProtectedData.Tests.builds
@@ -1,10 +1,10 @@
-
+
Windows_NT
- netcoreapp1.1;netcore50;netcoreapp1.0;net46
+ netcoreapp;netcore50;netcoreapp1.0;net46
diff --git a/src/libraries/System.Security.Cryptography.X509Certificates/pkg/System.Security.Cryptography.X509Certificates.builds b/src/libraries/System.Security.Cryptography.X509Certificates/pkg/System.Security.Cryptography.X509Certificates.builds
index 50a4c5725370fb0b73f1aee34a858094bb30edff..d4ab7f454af0c04235181750d88f086f8ae506ae 100644
--- a/src/libraries/System.Security.Cryptography.X509Certificates/pkg/System.Security.Cryptography.X509Certificates.builds
+++ b/src/libraries/System.Security.Cryptography.X509Certificates/pkg/System.Security.Cryptography.X509Certificates.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.X509Certificates/pkg/System.Security.Cryptography.X509Certificates.pkgproj b/src/libraries/System.Security.Cryptography.X509Certificates/pkg/System.Security.Cryptography.X509Certificates.pkgproj
index 61f12e2d412f7445016a8370e7f31269dcd470c9..dd0b6cde776a1d4dae79a9309b1ee72718389d98 100644
--- a/src/libraries/System.Security.Cryptography.X509Certificates/pkg/System.Security.Cryptography.X509Certificates.pkgproj
+++ b/src/libraries/System.Security.Cryptography.X509Certificates/pkg/System.Security.Cryptography.X509Certificates.pkgproj
@@ -1,9 +1,9 @@
-
+
- net463;netcoreapp1.1;$(AllXamarinFrameworks)
+ net463;netcoreapp2.0;$(AllXamarinFrameworks)
@@ -18,4 +18,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.X509Certificates/ref/Configurations.props b/src/libraries/System.Security.Cryptography.X509Certificates/ref/Configurations.props
index de3584258036f58906f97a4f7d6ff7e5932f0b00..77a4b65bc94a425ce217a1e6878bb6f236cf8abc 100644
--- a/src/libraries/System.Security.Cryptography.X509Certificates/ref/Configurations.props
+++ b/src/libraries/System.Security.Cryptography.X509Certificates/ref/Configurations.props
@@ -1,9 +1,9 @@
-
+
- netstandard1.7;
- netcoreapp1.1;
+ netstandard;
+ netcoreapp;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.X509Certificates/ref/System.Security.Cryptography.X509Certificates.builds b/src/libraries/System.Security.Cryptography.X509Certificates/ref/System.Security.Cryptography.X509Certificates.builds
index f67c87c1bb927eda971c3bacd7ef18b6ea9b2653..49f6d04ccbccf14781fd129155ec2cde737c5331 100644
--- a/src/libraries/System.Security.Cryptography.X509Certificates/ref/System.Security.Cryptography.X509Certificates.builds
+++ b/src/libraries/System.Security.Cryptography.X509Certificates/ref/System.Security.Cryptography.X509Certificates.builds
@@ -1,11 +1,11 @@
-
+
- netcoreapp1.1
+ netcoreapp
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.X509Certificates/ref/System.Security.Cryptography.X509Certificates.csproj b/src/libraries/System.Security.Cryptography.X509Certificates/ref/System.Security.Cryptography.X509Certificates.csproj
index 7716141c25063d482112af6ffa85d62b1cd659c7..c773f7e8045ed3af7c9579ae3125051a54f7745f 100644
--- a/src/libraries/System.Security.Cryptography.X509Certificates/ref/System.Security.Cryptography.X509Certificates.csproj
+++ b/src/libraries/System.Security.Cryptography.X509Certificates/ref/System.Security.Cryptography.X509Certificates.csproj
@@ -1,4 +1,4 @@
-
+
@@ -16,4 +16,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.X509Certificates/src/Configurations.props b/src/libraries/System.Security.Cryptography.X509Certificates/src/Configurations.props
index 8471cda58b23221a9e7e2fb9e718159f95e26662..8e905c573a8943654eb618ac8ffc16106aff455a 100644
--- a/src/libraries/System.Security.Cryptography.X509Certificates/src/Configurations.props
+++ b/src/libraries/System.Security.Cryptography.X509Certificates/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -9,4 +9,4 @@
netcoreapp-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.X509Certificates/tests/Configurations.props b/src/libraries/System.Security.Cryptography.X509Certificates/tests/Configurations.props
index 5f727fa2c5d97c91283163b5d911457fc86bf17e..b3d37a4be4b1f073b7a1f1fe678aac5cb9f4e4b7 100644
--- a/src/libraries/System.Security.Cryptography.X509Certificates/tests/Configurations.props
+++ b/src/libraries/System.Security.Cryptography.X509Certificates/tests/Configurations.props
@@ -1,13 +1,13 @@
-
+
netstandard1.6-Unix;
- netcoreapp1.1-Unix;
+ netcoreapp-Unix;
netstandard1.6-Windows_NT;
- netcoreapp1.1-Windows_NT;
- netstandard1.7-Unix;
- netstandard1.7-Windows_NT;
+ netcoreapp-Windows_NT;
+ netstandard-Unix;
+ netstandard-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.builds b/src/libraries/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.builds
index 6ff4fb9b73bdbc62c53044ef12b3cd043c935ab3..335c931385747240971384eef6d086d084cf1c9e 100644
--- a/src/libraries/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.builds
+++ b/src/libraries/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.builds
@@ -1,4 +1,4 @@
-
+
@@ -11,7 +11,7 @@
Unix
- netcoreapp1.1
+ netcoreapp
Unix
@@ -20,13 +20,13 @@
netcoreapp1.0
- netcoreapp1.1
+ netcoreapp
Windows_NT
Windows_NT
- netcoreapp1.1;net463
+ netcoreapp;net463
-
-
-
+
+
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj b/src/libraries/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj
index 93077124d37b10543d5a1203809af1b1f8d840ee..965995f992e62d4a375f440fd8de317e368338f6 100644
--- a/src/libraries/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj
+++ b/src/libraries/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj
@@ -72,4 +72,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.Xml/pkg/System.Security.Cryptography.Xml.builds b/src/libraries/System.Security.Cryptography.Xml/pkg/System.Security.Cryptography.Xml.builds
index 9533fbb23c65f689c8fb32b4c6c22f98e08926e9..47f0c3bc2b4b87792235b44c0452ab8eed521dac 100644
--- a/src/libraries/System.Security.Cryptography.Xml/pkg/System.Security.Cryptography.Xml.builds
+++ b/src/libraries/System.Security.Cryptography.Xml/pkg/System.Security.Cryptography.Xml.builds
@@ -1,8 +1,8 @@
-
+
-
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 84b587e17829cdd6872d2e19e1fa0db8c710409b..4c2ac82cf3aab8081b9357a887bbad0cc07f971b 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
@@ -3,7 +3,7 @@
- net462;netcoreapp1.1;$(AllXamarinFrameworks)
+ net462;netcoreapp2.0;$(AllXamarinFrameworks)
@@ -16,4 +16,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.Xml/ref/System.Security.Cryptography.Xml.builds b/src/libraries/System.Security.Cryptography.Xml/ref/System.Security.Cryptography.Xml.builds
index f7b01e5eb3a20cbd14a6af8c5c57835fcd728f70..3b9758d5e4eff6908189c988e1f968e91c4e30a6 100644
--- a/src/libraries/System.Security.Cryptography.Xml/ref/System.Security.Cryptography.Xml.builds
+++ b/src/libraries/System.Security.Cryptography.Xml/ref/System.Security.Cryptography.Xml.builds
@@ -1,10 +1,10 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.Xml/ref/System.Security.Cryptography.Xml.csproj b/src/libraries/System.Security.Cryptography.Xml/ref/System.Security.Cryptography.Xml.csproj
index db4462dab5d6c33d1f8516cb5eab219ef9741459..1e6bae4486ac759e78512ec099fa29e5494c76fd 100644
--- a/src/libraries/System.Security.Cryptography.Xml/ref/System.Security.Cryptography.Xml.csproj
+++ b/src/libraries/System.Security.Cryptography.Xml/ref/System.Security.Cryptography.Xml.csproj
@@ -8,4 +8,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.Xml/src/System.Security.Cryptography.Xml.builds b/src/libraries/System.Security.Cryptography.Xml/src/System.Security.Cryptography.Xml.builds
index 1dfbdf3a00284e3a934edb8582492966796b5679..a39023007b8c0b13d64a284e5b54eb4d481cdf9d 100644
--- a/src/libraries/System.Security.Cryptography.Xml/src/System.Security.Cryptography.Xml.builds
+++ b/src/libraries/System.Security.Cryptography.Xml/src/System.Security.Cryptography.Xml.builds
@@ -1,4 +1,4 @@
-
+
@@ -7,5 +7,4 @@
-->
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.Xml/src/System.Security.Cryptography.Xml.csproj b/src/libraries/System.Security.Cryptography.Xml/src/System.Security.Cryptography.Xml.csproj
index 6f71be6193e405005ad1c1fecb6820363e644bcb..838a9c361990386bfdb8b8a5ecf20a8376114487 100644
--- a/src/libraries/System.Security.Cryptography.Xml/src/System.Security.Cryptography.Xml.csproj
+++ b/src/libraries/System.Security.Cryptography.Xml/src/System.Security.Cryptography.Xml.csproj
@@ -9,7 +9,7 @@
System.Security.Cryptography.Xml
true
true
- .NETStandard,Version=v1.7
+ .NETStandard,Version=v2.0
diff --git a/src/libraries/System.Security.Cryptography.Xml/tests/System.Security.Cryptography.Xml.Tests.builds b/src/libraries/System.Security.Cryptography.Xml/tests/System.Security.Cryptography.Xml.Tests.builds
index 1c628f12426765be42f2969de5b58467527da916..9c64fc6fb0591c89bb92cd5e705970f5eec56870 100644
--- a/src/libraries/System.Security.Cryptography.Xml/tests/System.Security.Cryptography.Xml.Tests.builds
+++ b/src/libraries/System.Security.Cryptography.Xml/tests/System.Security.Cryptography.Xml.Tests.builds
@@ -1,11 +1,10 @@
-
+
-
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.Xml/tests/System.Security.Cryptography.Xml.Tests.csproj b/src/libraries/System.Security.Cryptography.Xml/tests/System.Security.Cryptography.Xml.Tests.csproj
index 3dbd1449d416e6f751c6ee06cbc92450191335ec..21c41d288d50b91846196a2760ea061a579e9c24 100644
--- a/src/libraries/System.Security.Cryptography.Xml/tests/System.Security.Cryptography.Xml.Tests.csproj
+++ b/src/libraries/System.Security.Cryptography.Xml/tests/System.Security.Cryptography.Xml.Tests.csproj
@@ -1,4 +1,4 @@
-
+
@@ -23,4 +23,4 @@
-->
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Permissions/pkg/System.Security.Permissions.builds b/src/libraries/System.Security.Permissions/pkg/System.Security.Permissions.builds
index 560b379fb104af0d9136ab445c7fd9dea7b4e8fc..c11415233c0f0d996d1dd3b2b1f40e38ddc1d786 100644
--- a/src/libraries/System.Security.Permissions/pkg/System.Security.Permissions.builds
+++ b/src/libraries/System.Security.Permissions/pkg/System.Security.Permissions.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
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 3c5efa6ff44422d4e18bb1fad93506cb79e10b5e..b3ff6e297e00c255ada19fe1dae676d7ef191c53 100644
--- a/src/libraries/System.Security.Permissions/pkg/System.Security.Permissions.pkgproj
+++ b/src/libraries/System.Security.Permissions/pkg/System.Security.Permissions.pkgproj
@@ -3,7 +3,7 @@
- netcoreapp1.1;net461;$(AllXamarinFrameworks)
+ netcoreapp2.0;net461;$(AllXamarinFrameworks)
diff --git a/src/libraries/System.Security.Permissions/ref/System.Security.Permissions.csproj b/src/libraries/System.Security.Permissions/ref/System.Security.Permissions.csproj
index b962a1e34c9a1b997805b7ed9d5edbb20d6642ee..3a00b602ad8e39d1cb970921586d86b4e2940892 100644
--- a/src/libraries/System.Security.Permissions/ref/System.Security.Permissions.csproj
+++ b/src/libraries/System.Security.Permissions/ref/System.Security.Permissions.csproj
@@ -1,4 +1,4 @@
-
+
@@ -16,4 +16,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Permissions/src/Configurations.props b/src/libraries/System.Security.Permissions/src/Configurations.props
index 53b62c64fea2475e524eb32a20b028ea109d4d41..bcfec4bbde61fa2877a42ca2e87056c258cd6c09 100644
--- a/src/libraries/System.Security.Permissions/src/Configurations.props
+++ b/src/libraries/System.Security.Permissions/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Permissions/src/System.Security.Permissions.csproj b/src/libraries/System.Security.Permissions/src/System.Security.Permissions.csproj
index 26dc45e3f800c22d36b8a0c1da2bf17a54857186..668bc833f2517fe83d1cb53e7cdf8a2ef21aa350 100644
--- a/src/libraries/System.Security.Permissions/src/System.Security.Permissions.csproj
+++ b/src/libraries/System.Security.Permissions/src/System.Security.Permissions.csproj
@@ -5,7 +5,7 @@
{07390899-C8F6-4E83-A3A9-6867B8CB46A0}
System.Security.Permissions
System.Security.Permissions
- netstandard1.7
+ netstandard
true
true
diff --git a/src/libraries/System.Security.Permissions/tests/Configurations.props b/src/libraries/System.Security.Permissions/tests/Configurations.props
index 98f53209d45a12360d0bbf7cf031b29ff556fc57..c398e42e899425ce70e3a9884633835ab6fcc66e 100644
--- a/src/libraries/System.Security.Permissions/tests/Configurations.props
+++ b/src/libraries/System.Security.Permissions/tests/Configurations.props
@@ -1,8 +1,8 @@
-
+
- netstandard1.7;
+ netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Permissions/tests/System.Security.Permissions.Tests.builds b/src/libraries/System.Security.Permissions/tests/System.Security.Permissions.Tests.builds
index 267e782df2ecb2362526dc1097f47b5ac2119251..3af080561a1a7dcf4877f63d080565a95225dca5 100644
--- a/src/libraries/System.Security.Permissions/tests/System.Security.Permissions.Tests.builds
+++ b/src/libraries/System.Security.Permissions/tests/System.Security.Permissions.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Security.Permissions/tests/System.Security.Permissions.Tests.csproj b/src/libraries/System.Security.Permissions/tests/System.Security.Permissions.Tests.csproj
index fd2598cc23cbcd0b2e3c6595203d02ef42a29a3f..13be7ec9308f59027f4b3dcc2f4577ae2255ea0c 100644
--- a/src/libraries/System.Security.Permissions/tests/System.Security.Permissions.Tests.csproj
+++ b/src/libraries/System.Security.Permissions/tests/System.Security.Permissions.Tests.csproj
@@ -31,4 +31,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Principal.Windows/pkg/System.Security.Principal.Windows.builds b/src/libraries/System.Security.Principal.Windows/pkg/System.Security.Principal.Windows.builds
index e6df5ad55083406b2f283e748fc2d68276b682f3..475a8585929f19b57779fcd7a720c9c791fa5632 100644
--- a/src/libraries/System.Security.Principal.Windows/pkg/System.Security.Principal.Windows.builds
+++ b/src/libraries/System.Security.Principal.Windows/pkg/System.Security.Principal.Windows.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
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 7a6067538e88d7bad9856f497dd5d146f3125fd4..59716c104c8580fdd206eab01a75d221e6cb872d 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,13 +1,11 @@
-
+
-
- net463;netcoreapp1.1
+ net463;netcoreapp2.0
-
\ No newline at end of file
diff --git a/src/libraries/System.Security.Principal.Windows/ref/System.Security.Principal.Windows.csproj b/src/libraries/System.Security.Principal.Windows/ref/System.Security.Principal.Windows.csproj
index 5642bae11b4b3df6adc8fa4841173817c588023f..f1d83de3961fc097fa3914bda8d6cdbce9e58975 100644
--- a/src/libraries/System.Security.Principal.Windows/ref/System.Security.Principal.Windows.csproj
+++ b/src/libraries/System.Security.Principal.Windows/ref/System.Security.Principal.Windows.csproj
@@ -1,4 +1,4 @@
-
+
@@ -11,4 +11,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Principal.Windows/src/Configurations.props b/src/libraries/System.Security.Principal.Windows/src/Configurations.props
index 2d365bdaa4f3b95f8d39494c86985e10083a0411..78decb9342402ebaee4c1d0ad8fd4cc6b62628eb 100644
--- a/src/libraries/System.Security.Principal.Windows/src/Configurations.props
+++ b/src/libraries/System.Security.Principal.Windows/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -7,4 +7,4 @@
net463-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Principal.Windows/tests/Configurations.props b/src/libraries/System.Security.Principal.Windows/tests/Configurations.props
index e82727004a1022af506d1969384bdbccdc791ec8..249c8c18b46b6b1f635e514858f87051d9d8b17a 100644
--- a/src/libraries/System.Security.Principal.Windows/tests/Configurations.props
+++ b/src/libraries/System.Security.Principal.Windows/tests/Configurations.props
@@ -1,8 +1,8 @@
-
+
- netstandard1.7-Windows_NT;
+ netstandard-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Principal.Windows/tests/System.Security.Principal.Windows.Tests.builds b/src/libraries/System.Security.Principal.Windows/tests/System.Security.Principal.Windows.Tests.builds
index ec4ae7216bbaa18bb00a1f01fcf0705f463ac170..737007cab1555f181cf7dfecb17f2f09b4d08318 100644
--- a/src/libraries/System.Security.Principal.Windows/tests/System.Security.Principal.Windows.Tests.builds
+++ b/src/libraries/System.Security.Principal.Windows/tests/System.Security.Principal.Windows.Tests.builds
@@ -1,10 +1,10 @@
-
+
Windows_NT
- netcore50;netcoreapp1.0;net46;netcoreapp1.1;net463
+ netcore50;netcoreapp1.0;net46;netcoreapp;net463
diff --git a/src/libraries/System.Security.Principal/pkg/System.Security.Principal.builds b/src/libraries/System.Security.Principal/pkg/System.Security.Principal.builds
index 650cc9b30fc7062fa348b6654f77bffd0b2f21b2..c41c832284519ab668deb563ac0cb5a2215aaa40 100644
--- a/src/libraries/System.Security.Principal/pkg/System.Security.Principal.builds
+++ b/src/libraries/System.Security.Principal/pkg/System.Security.Principal.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Principal/pkg/System.Security.Principal.pkgproj b/src/libraries/System.Security.Principal/pkg/System.Security.Principal.pkgproj
index a4d6197c2ea19f923dee644532533249ad0165ac..bb18ed6492504c79a8e9ddceba290cca84033b45 100644
--- a/src/libraries/System.Security.Principal/pkg/System.Security.Principal.pkgproj
+++ b/src/libraries/System.Security.Principal/pkg/System.Security.Principal.pkgproj
@@ -1,9 +1,9 @@
-
+
- net463;netcoreapp1.1;uap10.1;$(AllXamarinFrameworks)
+ net463;netcoreapp2.0;uap10.1;$(AllXamarinFrameworks)
diff --git a/src/libraries/System.Security.Principal/ref/System.Security.Principal.csproj b/src/libraries/System.Security.Principal/ref/System.Security.Principal.csproj
index de83507c1b306cd3a81cced2dabe7293cc9bab2b..8078077032a6cdf78a6d69dbecb3f5ba5780fd56 100644
--- a/src/libraries/System.Security.Principal/ref/System.Security.Principal.csproj
+++ b/src/libraries/System.Security.Principal/ref/System.Security.Principal.csproj
@@ -1,4 +1,4 @@
-
+
@@ -8,4 +8,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Principal/src/Configurations.props b/src/libraries/System.Security.Principal/src/Configurations.props
index f013d10b8ccc3f86eab07075639f01c909892d84..ed0bd2acc95b9edfd29df7e7b1e40ebe4f105079 100644
--- a/src/libraries/System.Security.Principal/src/Configurations.props
+++ b/src/libraries/System.Security.Principal/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -7,4 +7,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.Principal/src/System.Security.Principal.csproj b/src/libraries/System.Security.Principal/src/System.Security.Principal.csproj
index b5ddfdadd464200a3f1d39b6f17d0c0df1b7e745..d629143c45eb9d407bf5dbb8fb4ecbdd287e6bf7 100644
--- a/src/libraries/System.Security.Principal/src/System.Security.Principal.csproj
+++ b/src/libraries/System.Security.Principal/src/System.Security.Principal.csproj
@@ -8,7 +8,7 @@
true
None
- netstandard1.7;uap10.1
+ netstandard;uap10.1
diff --git a/src/libraries/System.Security.SecureString/pkg/System.Security.SecureString.builds b/src/libraries/System.Security.SecureString/pkg/System.Security.SecureString.builds
index d5b30bb52244faa35d8d27e2c8b90fd66ad928ef..a86a948ecd6dac7c40d569dea2b44cb51399d2b7 100644
--- a/src/libraries/System.Security.SecureString/pkg/System.Security.SecureString.builds
+++ b/src/libraries/System.Security.SecureString/pkg/System.Security.SecureString.builds
@@ -1,8 +1,8 @@
-
+
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.SecureString/pkg/System.Security.SecureString.pkgproj b/src/libraries/System.Security.SecureString/pkg/System.Security.SecureString.pkgproj
index 30b3cd55a728a6197bd0d54c76847e8733c336c9..22c1f06fec693f157a941c59554b5e9e93962619 100644
--- a/src/libraries/System.Security.SecureString/pkg/System.Security.SecureString.pkgproj
+++ b/src/libraries/System.Security.SecureString/pkg/System.Security.SecureString.pkgproj
@@ -1,9 +1,9 @@
-
+
- net463;netcoreapp1.1;$(AllXamarinFrameworks)
+ net463;netcoreapp2.0;$(AllXamarinFrameworks)
@@ -14,4 +14,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.SecureString/ref/System.Security.SecureString.csproj b/src/libraries/System.Security.SecureString/ref/System.Security.SecureString.csproj
index b1023e1d01081f400acc6b1a83d896c170af51de..3149deca2d5beeedec93f8d89f2023695188d06e 100644
--- a/src/libraries/System.Security.SecureString/ref/System.Security.SecureString.csproj
+++ b/src/libraries/System.Security.SecureString/ref/System.Security.SecureString.csproj
@@ -1,4 +1,4 @@
-
+
@@ -12,4 +12,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.SecureString/src/Configurations.props b/src/libraries/System.Security.SecureString/src/Configurations.props
index 9c336c0be9e52171e2fecf14214e3373be07177d..dc837f915219bcf7ff5c38f67e01c45d5b976485 100644
--- a/src/libraries/System.Security.SecureString/src/Configurations.props
+++ b/src/libraries/System.Security.SecureString/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.SecureString/tests/Configurations.props b/src/libraries/System.Security.SecureString/tests/Configurations.props
index f0ebe53119ec712315cfea5b151d5f0d754744f8..c3266e1e9362243b5723032465bcc7a62ae720ce 100644
--- a/src/libraries/System.Security.SecureString/tests/Configurations.props
+++ b/src/libraries/System.Security.SecureString/tests/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard1.3;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Security.SecureString/tests/System.Security.SecureString.Tests.builds b/src/libraries/System.Security.SecureString/tests/System.Security.SecureString.Tests.builds
index 75073301a5ed079a2fe3930e5599ce7bb3e74061..f58ee8e0dace5b18f4a5633f6ad8a07be13aac19 100644
--- a/src/libraries/System.Security.SecureString/tests/System.Security.SecureString.Tests.builds
+++ b/src/libraries/System.Security.SecureString/tests/System.Security.SecureString.Tests.builds
@@ -1,9 +1,9 @@
-
+
- netcoreapp1.1;netcore50;netcoreapp1.0;net46
+ netcoreapp;netcore50;netcoreapp1.0;net46
diff --git a/src/libraries/System.ServiceProcess.ServiceController/pkg/System.ServiceProcess.ServiceController.builds b/src/libraries/System.ServiceProcess.ServiceController/pkg/System.ServiceProcess.ServiceController.builds
index b7a7648e6cb35eceb50af68a92a4985598b93d41..8170dd862ad8c66e50844f7e9833950b53406e26 100644
--- a/src/libraries/System.ServiceProcess.ServiceController/pkg/System.ServiceProcess.ServiceController.builds
+++ b/src/libraries/System.ServiceProcess.ServiceController/pkg/System.ServiceProcess.ServiceController.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
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 d1c0ff6bfc6c172aba4275d1d8257d99b9b6891c..a571ea8161a4ca704c3e1937aa063b148b47f982 100644
--- a/src/libraries/System.ServiceProcess.ServiceController/pkg/System.ServiceProcess.ServiceController.pkgproj
+++ b/src/libraries/System.ServiceProcess.ServiceController/pkg/System.ServiceProcess.ServiceController.pkgproj
@@ -1,17 +1,14 @@
-
+
-
- net463;netcoreapp1.1
+ net463;netcoreapp2.0
-
win
-
\ No newline at end of file
diff --git a/src/libraries/System.ServiceProcess.ServiceController/ref/System.ServiceProcess.ServiceController.csproj b/src/libraries/System.ServiceProcess.ServiceController/ref/System.ServiceProcess.ServiceController.csproj
index d9bd903b9a727095fb1cb336df391cb509b4a0eb..213270cbc398b92afded4fde7df28ff3f1c82c18 100644
--- a/src/libraries/System.ServiceProcess.ServiceController/ref/System.ServiceProcess.ServiceController.csproj
+++ b/src/libraries/System.ServiceProcess.ServiceController/ref/System.ServiceProcess.ServiceController.csproj
@@ -1,4 +1,4 @@
-
+
@@ -9,4 +9,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.ServiceProcess.ServiceController/src/Configurations.props b/src/libraries/System.ServiceProcess.ServiceController/src/Configurations.props
index 2d365bdaa4f3b95f8d39494c86985e10083a0411..78decb9342402ebaee4c1d0ad8fd4cc6b62628eb 100644
--- a/src/libraries/System.ServiceProcess.ServiceController/src/Configurations.props
+++ b/src/libraries/System.ServiceProcess.ServiceController/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -7,4 +7,4 @@
net463-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.Tests/Configurations.props b/src/libraries/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.Tests/Configurations.props
index 502bd149bb327ca1db60091cc9c19d8ff4f03ee6..7389b3f5b81a210359b16ec4c117ca6a5d895f33 100644
--- a/src/libraries/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.Tests/Configurations.props
+++ b/src/libraries/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.Tests/Configurations.props
@@ -1,9 +1,9 @@
-
+
netstandard1.4-Windows_NT;
- netstandard1.7-Windows_NT;
+ netstandard-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.Tests/System.ServiceProcess.ServiceController.Tests.builds b/src/libraries/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.Tests/System.ServiceProcess.ServiceController.Tests.builds
index dc2c1145de7fca8013d5b621a9f732fbfa383003..f3ace706bf8eab338ac1ca5b9dc77ae5d017f9c4 100644
--- a/src/libraries/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.Tests/System.ServiceProcess.ServiceController.Tests.builds
+++ b/src/libraries/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.Tests/System.ServiceProcess.ServiceController.Tests.builds
@@ -1,10 +1,10 @@
-
+
Windows_NT
- netcoreapp1.1;net463
+ netcoreapp;net463
netstandard1.4
diff --git a/src/libraries/System.Text.Encoding.CodePages/pkg/System.Text.Encoding.CodePages.builds b/src/libraries/System.Text.Encoding.CodePages/pkg/System.Text.Encoding.CodePages.builds
index 1f4f75258fc35268ec3e8984665a91198b9a853f..4179e5c316ca720035ed4dacf5c0a03c7459e1b9 100644
--- a/src/libraries/System.Text.Encoding.CodePages/pkg/System.Text.Encoding.CodePages.builds
+++ b/src/libraries/System.Text.Encoding.CodePages/pkg/System.Text.Encoding.CodePages.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
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 6f246a87d35368c21dc42b13d16908839968b07f..1a25584488db76f30c8d4fa8cddbebcb0fcc3cd0 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,9 +1,9 @@
-
+
- net461;netcoreapp1.1;$(AllXamarinFrameworks)
+ net461;netcoreapp2.0;$(AllXamarinFrameworks)
diff --git a/src/libraries/System.Text.Encoding.CodePages/ref/System.Text.Encoding.CodePages.csproj b/src/libraries/System.Text.Encoding.CodePages/ref/System.Text.Encoding.CodePages.csproj
index b323a7a095effe1d4e8e2232e2c2dcb22b737822..8e80236524f0a32dcb5c3b955b37c6ee6b7d1247 100644
--- a/src/libraries/System.Text.Encoding.CodePages/ref/System.Text.Encoding.CodePages.csproj
+++ b/src/libraries/System.Text.Encoding.CodePages/ref/System.Text.Encoding.CodePages.csproj
@@ -1,4 +1,4 @@
-
+
@@ -9,4 +9,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Text.Encoding.CodePages/src/Configurations.props b/src/libraries/System.Text.Encoding.CodePages/src/Configurations.props
index 3d4674aeac3099b4b2c39ad0205545c2d2fd558d..cfc57211a43f1efa201dcfc0a5b7dd9d7e9f2987 100644
--- a/src/libraries/System.Text.Encoding.CodePages/src/Configurations.props
+++ b/src/libraries/System.Text.Encoding.CodePages/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Text.Encoding.CodePages/tests/Configurations.props b/src/libraries/System.Text.Encoding.CodePages/tests/Configurations.props
index 2a160a39e8e0fb8d6b51ee9d9e03c7dd30ee956c..211cd2bec829c39148b69aa2e0ab929f3d1e0b76 100644
--- a/src/libraries/System.Text.Encoding.CodePages/tests/Configurations.props
+++ b/src/libraries/System.Text.Encoding.CodePages/tests/Configurations.props
@@ -1,9 +1,9 @@
-
+
netstandard1.3-Windows_NT;
- netstandard1.7;
+ netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Text.Encoding.CodePages/tests/System.Text.Encoding.CodePages.Tests.builds b/src/libraries/System.Text.Encoding.CodePages/tests/System.Text.Encoding.CodePages.Tests.builds
index b0115568bec7c4e5905f1ecd6716a76687734b3b..c3b34a7bfc4c825258f40d28dc71a320f8f44362 100644
--- a/src/libraries/System.Text.Encoding.CodePages/tests/System.Text.Encoding.CodePages.Tests.builds
+++ b/src/libraries/System.Text.Encoding.CodePages/tests/System.Text.Encoding.CodePages.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Text.Encoding.CodePages/tests/System.Text.Encoding.CodePages.Tests.csproj b/src/libraries/System.Text.Encoding.CodePages/tests/System.Text.Encoding.CodePages.Tests.csproj
index df021fabd5df71c99b975b6f18b9e0132f6f32a0..7582bb26ca332e6c683a6ea75d84479a24bdb679 100644
--- a/src/libraries/System.Text.Encoding.CodePages/tests/System.Text.Encoding.CodePages.Tests.csproj
+++ b/src/libraries/System.Text.Encoding.CodePages/tests/System.Text.Encoding.CodePages.Tests.csproj
@@ -17,4 +17,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Text.Encoding.Extensions/pkg/System.Text.Encoding.Extensions.pkgproj b/src/libraries/System.Text.Encoding.Extensions/pkg/System.Text.Encoding.Extensions.pkgproj
index aedd68e82b1752aa98f6fc2767d38bbbce38e89e..9835ead72337f11408f3c3741b6ab7f0577150b6 100644
--- a/src/libraries/System.Text.Encoding.Extensions/pkg/System.Text.Encoding.Extensions.pkgproj
+++ b/src/libraries/System.Text.Encoding.Extensions/pkg/System.Text.Encoding.Extensions.pkgproj
@@ -3,7 +3,7 @@
- net463;netcoreapp1.1;$(AllXamarinFrameworks)
+ net463;netcoreapp2.0;$(AllXamarinFrameworks)
net463
diff --git a/src/libraries/System.Text.Encoding.Extensions/pkg/any/System.Text.Encoding.Extensions.pkgproj b/src/libraries/System.Text.Encoding.Extensions/pkg/any/System.Text.Encoding.Extensions.pkgproj
index b12f4b344460e73a3f0fefa4033a70f28fa9c612..419de086c9361079015dff40f219f9d1af3b8b7b 100644
--- a/src/libraries/System.Text.Encoding.Extensions/pkg/any/System.Text.Encoding.Extensions.pkgproj
+++ b/src/libraries/System.Text.Encoding.Extensions/pkg/any/System.Text.Encoding.Extensions.pkgproj
@@ -5,19 +5,16 @@
any
true
-
net463
-
runtimes/aot/lib/netcore50
aot
-
diff --git a/src/libraries/System.Text.Encoding.Extensions/pkg/aot/System.Text.Encoding.Extensions.pkgproj b/src/libraries/System.Text.Encoding.Extensions/pkg/aot/System.Text.Encoding.Extensions.pkgproj
index 5e4737373fcc0bfa8329d4022c845d80b72e0017..e250c972055b62d8b48ba030b64572a2bce8bada 100644
--- a/src/libraries/System.Text.Encoding.Extensions/pkg/aot/System.Text.Encoding.Extensions.pkgproj
+++ b/src/libraries/System.Text.Encoding.Extensions/pkg/aot/System.Text.Encoding.Extensions.pkgproj
@@ -1,11 +1,9 @@
-
aot
true
-
\ No newline at end of file
diff --git a/src/libraries/System.Text.Encoding.Extensions/ref/System.Text.Encoding.Extensions.csproj b/src/libraries/System.Text.Encoding.Extensions/ref/System.Text.Encoding.Extensions.csproj
index 740e35dbd5cae49da85e84cd9efcd3d31e905f4f..264665cf8d522e367b0d46ec06f692d166b2821b 100644
--- a/src/libraries/System.Text.Encoding.Extensions/ref/System.Text.Encoding.Extensions.csproj
+++ b/src/libraries/System.Text.Encoding.Extensions/ref/System.Text.Encoding.Extensions.csproj
@@ -1,4 +1,4 @@
-
+
@@ -12,4 +12,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Text.Encoding.Extensions/src/Configurations.props b/src/libraries/System.Text.Encoding.Extensions/src/Configurations.props
index 9c336c0be9e52171e2fecf14214e3373be07177d..dc837f915219bcf7ff5c38f67e01c45d5b976485 100644
--- a/src/libraries/System.Text.Encoding.Extensions/src/Configurations.props
+++ b/src/libraries/System.Text.Encoding.Extensions/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Text.Encoding.Extensions/tests/Configurations.props b/src/libraries/System.Text.Encoding.Extensions/tests/Configurations.props
index 512c938bad5364c677a3f4d9f647f1ade8c14aea..b2db637110616a495d303924e9aaf8b800db4821 100644
--- a/src/libraries/System.Text.Encoding.Extensions/tests/Configurations.props
+++ b/src/libraries/System.Text.Encoding.Extensions/tests/Configurations.props
@@ -1,9 +1,9 @@
-
+
netstandard1.3;
- netstandard1.7;
+ netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Text.Encoding.Extensions/tests/System.Text.Encoding.Extensions.Tests.builds b/src/libraries/System.Text.Encoding.Extensions/tests/System.Text.Encoding.Extensions.Tests.builds
index e99c4aff413919010e0bcd2bb68a5fd77042984f..2d1b236baf8a39676a2b07b70a0cfc0eb8e27eec 100644
--- a/src/libraries/System.Text.Encoding.Extensions/tests/System.Text.Encoding.Extensions.Tests.builds
+++ b/src/libraries/System.Text.Encoding.Extensions/tests/System.Text.Encoding.Extensions.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Text.Encoding/pkg/System.Text.Encoding.pkgproj b/src/libraries/System.Text.Encoding/pkg/System.Text.Encoding.pkgproj
index a3cf1aa63c0f2921101984be14a9395f4b8b3caa..39340d7a23f798a21550585a4494e724f3aa11aa 100644
--- a/src/libraries/System.Text.Encoding/pkg/System.Text.Encoding.pkgproj
+++ b/src/libraries/System.Text.Encoding/pkg/System.Text.Encoding.pkgproj
@@ -1,9 +1,9 @@
-
+
- netcoreapp1.1;uap10.1;net463;$(AllXamarinFrameworks)
+ netcoreapp2.0;uap10.1;net463;$(AllXamarinFrameworks)
net463
diff --git a/src/libraries/System.Text.Encoding/pkg/any/System.Text.Encoding.pkgproj b/src/libraries/System.Text.Encoding/pkg/any/System.Text.Encoding.pkgproj
index cf4a07f75d4af949edbfead02ca355b8ff2c0d8c..14c86c6803b621e9345e5cd5138324a0ed1843ea 100644
--- a/src/libraries/System.Text.Encoding/pkg/any/System.Text.Encoding.pkgproj
+++ b/src/libraries/System.Text.Encoding/pkg/any/System.Text.Encoding.pkgproj
@@ -5,16 +5,13 @@
any
true
-
-
runtimes/aot/lib/netcore50
aot
-
diff --git a/src/libraries/System.Text.Encoding/pkg/aot/System.Text.Encoding.pkgproj b/src/libraries/System.Text.Encoding/pkg/aot/System.Text.Encoding.pkgproj
index 3833b11367ecf61c11d6f574694e7c3c9193b339..35737b689c9326d9c30acf5bada61124c5c2b18a 100644
--- a/src/libraries/System.Text.Encoding/pkg/aot/System.Text.Encoding.pkgproj
+++ b/src/libraries/System.Text.Encoding/pkg/aot/System.Text.Encoding.pkgproj
@@ -1,12 +1,10 @@
-
aot
true
-
Windows_NT
diff --git a/src/libraries/System.Text.Encoding/ref/System.Text.Encoding.csproj b/src/libraries/System.Text.Encoding/ref/System.Text.Encoding.csproj
index 38910a3980791b25aa3fb5332f100269fb7d3c08..8c71227428b66353a1d89e7c891a58086d6f6a05 100644
--- a/src/libraries/System.Text.Encoding/ref/System.Text.Encoding.csproj
+++ b/src/libraries/System.Text.Encoding/ref/System.Text.Encoding.csproj
@@ -1,4 +1,4 @@
-
+
@@ -11,4 +11,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Text.Encoding/src/Configurations.props b/src/libraries/System.Text.Encoding/src/Configurations.props
index a25a6691e355f553367c3b8b6f209d4e9c8b11a9..6446d96dd37280d84349117225b60cdf0d9d6004 100644
--- a/src/libraries/System.Text.Encoding/src/Configurations.props
+++ b/src/libraries/System.Text.Encoding/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -7,4 +7,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Text.Encoding/src/System.Text.Encoding.csproj b/src/libraries/System.Text.Encoding/src/System.Text.Encoding.csproj
index ab4480a116e3708a13a633aabfddfb4c9db94fdf..37e0bfb2f8689ccec79634c29b8d9caf0c8a6c21 100644
--- a/src/libraries/System.Text.Encoding/src/System.Text.Encoding.csproj
+++ b/src/libraries/System.Text.Encoding/src/System.Text.Encoding.csproj
@@ -5,7 +5,7 @@
System.Text.Encoding
true
- netstandard1.7;uap10.1
+ netstandard;uap10.1
diff --git a/src/libraries/System.Text.Encoding/tests/Configurations.props b/src/libraries/System.Text.Encoding/tests/Configurations.props
index 512c938bad5364c677a3f4d9f647f1ade8c14aea..b2db637110616a495d303924e9aaf8b800db4821 100644
--- a/src/libraries/System.Text.Encoding/tests/Configurations.props
+++ b/src/libraries/System.Text.Encoding/tests/Configurations.props
@@ -1,9 +1,9 @@
-
+
netstandard1.3;
- netstandard1.7;
+ netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Text.Encoding/tests/System.Text.Encoding.Tests.builds b/src/libraries/System.Text.Encoding/tests/System.Text.Encoding.Tests.builds
index 3a4a111947c35e63634d509ebefc875286b2eac6..471ce0ed351d52741b678ae5b7fcc617ea8015b3 100644
--- a/src/libraries/System.Text.Encoding/tests/System.Text.Encoding.Tests.builds
+++ b/src/libraries/System.Text.Encoding/tests/System.Text.Encoding.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Text.Encoding/tests/System.Text.Encoding.Tests.csproj b/src/libraries/System.Text.Encoding/tests/System.Text.Encoding.Tests.csproj
index b5a5a5e4dfd8cc3dcde41323ee4369ae0402cfc7..07f052e53fa319f584aa4f04d4c2d12bbebd7860 100644
--- a/src/libraries/System.Text.Encoding/tests/System.Text.Encoding.Tests.csproj
+++ b/src/libraries/System.Text.Encoding/tests/System.Text.Encoding.Tests.csproj
@@ -85,4 +85,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Text.Encodings.Web/pkg/System.Text.Encodings.Web.builds b/src/libraries/System.Text.Encodings.Web/pkg/System.Text.Encodings.Web.builds
index d5fd30b1b185795244df00835c4f4d38ba4c6396..36baad39a46395fd1ebcf6599cdf568317078855 100644
--- a/src/libraries/System.Text.Encodings.Web/pkg/System.Text.Encodings.Web.builds
+++ b/src/libraries/System.Text.Encodings.Web/pkg/System.Text.Encodings.Web.builds
@@ -1,8 +1,8 @@
-
+
-
+
\ No newline at end of file
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 dc74ee4902b27aebc24acb7880c5b427b77f2b31..1c2c71f449d151a965127083ff95e84b0e165194 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,12 +1,10 @@
-
+
-
net45;netcore45;wp8;wpa81;netcoreapp1.0;$(AllXamarinFrameworks)
-
\ No newline at end of file
diff --git a/src/libraries/System.Text.Encodings.Web/src/Configurations.props b/src/libraries/System.Text.Encodings.Web/src/Configurations.props
index 2ec0365c0d50ed330862506ea44da4fccb7fd0a9..66fc3409d36ab9b1606b29eb2f04491b1eb10c92 100644
--- a/src/libraries/System.Text.Encodings.Web/src/Configurations.props
+++ b/src/libraries/System.Text.Encodings.Web/src/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard1.0;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Text.Encodings.Web/tests/Configurations.props b/src/libraries/System.Text.Encodings.Web/tests/Configurations.props
index f0ebe53119ec712315cfea5b151d5f0d754744f8..c3266e1e9362243b5723032465bcc7a62ae720ce 100644
--- a/src/libraries/System.Text.Encodings.Web/tests/Configurations.props
+++ b/src/libraries/System.Text.Encodings.Web/tests/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard1.3;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Text.Encodings.Web/tests/System.Text.Encodings.Web.Tests.builds b/src/libraries/System.Text.Encodings.Web/tests/System.Text.Encodings.Web.Tests.builds
index 76c86a8636ef4b270d6115f6879d882b10c08d9b..c9eb22240f7a75001f167e40a539b647e1663cb1 100644
--- a/src/libraries/System.Text.Encodings.Web/tests/System.Text.Encodings.Web.Tests.builds
+++ b/src/libraries/System.Text.Encodings.Web/tests/System.Text.Encodings.Web.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Text.RegularExpressions/pkg/System.Text.RegularExpressions.builds b/src/libraries/System.Text.RegularExpressions/pkg/System.Text.RegularExpressions.builds
index 0a8c06c9abdee9b49f6c2f501008f1e0709b1349..96da8c0245ace5b831faea1f17bb6c6071a01daa 100644
--- a/src/libraries/System.Text.RegularExpressions/pkg/System.Text.RegularExpressions.builds
+++ b/src/libraries/System.Text.RegularExpressions/pkg/System.Text.RegularExpressions.builds
@@ -5,4 +5,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Text.RegularExpressions/pkg/System.Text.RegularExpressions.pkgproj b/src/libraries/System.Text.RegularExpressions/pkg/System.Text.RegularExpressions.pkgproj
index 602af001ca17da3606d5dba6a86c08a250555994..32f267af6462fdf1778972443a8808313dfeb106 100644
--- a/src/libraries/System.Text.RegularExpressions/pkg/System.Text.RegularExpressions.pkgproj
+++ b/src/libraries/System.Text.RegularExpressions/pkg/System.Text.RegularExpressions.pkgproj
@@ -3,7 +3,7 @@
- net461;netcoreapp1.1;$(AllXamarinFrameworks)
+ net461;netcoreapp2.0;$(AllXamarinFrameworks)
@@ -25,4 +25,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Text.RegularExpressions/ref/System.Text.RegularExpressions.builds b/src/libraries/System.Text.RegularExpressions/ref/System.Text.RegularExpressions.builds
index 6abb3c22155b0993d13baa4aaae8ea20c56585c8..f81515dbf137723e39b22d4bceb430b59c201e0c 100644
--- a/src/libraries/System.Text.RegularExpressions/ref/System.Text.RegularExpressions.builds
+++ b/src/libraries/System.Text.RegularExpressions/ref/System.Text.RegularExpressions.builds
@@ -1,11 +1,11 @@
-
+
- netstandard1.7
+ netstandard
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Text.RegularExpressions/ref/System.Text.RegularExpressions.csproj b/src/libraries/System.Text.RegularExpressions/ref/System.Text.RegularExpressions.csproj
index fd3f48818f57287f57133abe26d556496c4adef6..933ee636326c8434bbbd08a0886fa6912f198bac 100644
--- a/src/libraries/System.Text.RegularExpressions/ref/System.Text.RegularExpressions.csproj
+++ b/src/libraries/System.Text.RegularExpressions/ref/System.Text.RegularExpressions.csproj
@@ -1,4 +1,4 @@
-
+
@@ -11,4 +11,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Text.RegularExpressions/src/Configurations.props b/src/libraries/System.Text.RegularExpressions/src/Configurations.props
index 53b62c64fea2475e524eb32a20b028ea109d4d41..bcfec4bbde61fa2877a42ca2e87056c258cd6c09 100644
--- a/src/libraries/System.Text.RegularExpressions/src/Configurations.props
+++ b/src/libraries/System.Text.RegularExpressions/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Text.RegularExpressions/tests/Configurations.props b/src/libraries/System.Text.RegularExpressions/tests/Configurations.props
index cf92a56f649389620ad97ca46cf67130b8ce376a..ba950076e5a47854c32bc340eeece1ae7b5b3633 100644
--- a/src/libraries/System.Text.RegularExpressions/tests/Configurations.props
+++ b/src/libraries/System.Text.RegularExpressions/tests/Configurations.props
@@ -1,10 +1,10 @@
-
+
netstandard1.6;
- netcoreapp1.1;
- netstandard1.7;
+ netcoreapp;
+ netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.builds b/src/libraries/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.builds
index c698dcddcee86f927fba6d22649aa552d0b1d8ee..a060e5e41027d93f336e2b64497235f3c361b418 100644
--- a/src/libraries/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.builds
+++ b/src/libraries/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.builds
@@ -1,4 +1,4 @@
-
+
@@ -8,8 +8,8 @@
netcoreapp1.0
- netcoreapp1.1
- netcoreapp1.1
+ netcoreapp
+ netcoreapp
netstandard1.6
diff --git a/src/libraries/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.csproj b/src/libraries/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.csproj
index fbaa47175d32939c7150b411d033239ec31dcb56..de765a85cdddc21aef1c490ff7d76a650f4385fa 100644
--- a/src/libraries/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.csproj
+++ b/src/libraries/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.csproj
@@ -44,4 +44,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Threading.AccessControl/pkg/System.Threading.AccessControl.builds b/src/libraries/System.Threading.AccessControl/pkg/System.Threading.AccessControl.builds
index d09cd62f9e0cff62f7f1ffd8ba6cd5699284edbd..b7dfe3825c8ec8cb69fc824a1747a801f4d768a7 100644
--- a/src/libraries/System.Threading.AccessControl/pkg/System.Threading.AccessControl.builds
+++ b/src/libraries/System.Threading.AccessControl/pkg/System.Threading.AccessControl.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ 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 7ea58843a906a60801edc0c6ebaddf682cd9802a..8633e60222985f691d635cf9d7243832b14e6f33 100644
--- a/src/libraries/System.Threading.AccessControl/pkg/System.Threading.AccessControl.pkgproj
+++ b/src/libraries/System.Threading.AccessControl/pkg/System.Threading.AccessControl.pkgproj
@@ -1,17 +1,14 @@
-
+
-
net46;netcoreapp1.0
-
win
-
\ No newline at end of file
diff --git a/src/libraries/System.Threading.AccessControl/ref/System.Threading.AccessControl.csproj b/src/libraries/System.Threading.AccessControl/ref/System.Threading.AccessControl.csproj
index c43ef00ca96bb76131effa0b4f056a5a886a9aa9..54d66ee151a68336fe5226bb473ce40df110b509 100644
--- a/src/libraries/System.Threading.AccessControl/ref/System.Threading.AccessControl.csproj
+++ b/src/libraries/System.Threading.AccessControl/ref/System.Threading.AccessControl.csproj
@@ -1,4 +1,4 @@
-
+
@@ -13,4 +13,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Threading.AccessControl/src/Configurations.props b/src/libraries/System.Threading.AccessControl/src/Configurations.props
index a6c74d0e580323818caeda4f9796888bd7d569fd..437e6acc34bd512623ac7187b99d13d100213f25 100644
--- a/src/libraries/System.Threading.AccessControl/src/Configurations.props
+++ b/src/libraries/System.Threading.AccessControl/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -7,4 +7,4 @@
netstandard1.3-Unix;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Threading.AccessControl/tests/Configurations.props b/src/libraries/System.Threading.AccessControl/tests/Configurations.props
index 5d77dc616e23f0285c9cc66f180261bfa44e69c4..5f482b878bc4a4b91da33a6a7c4906082909ec30 100644
--- a/src/libraries/System.Threading.AccessControl/tests/Configurations.props
+++ b/src/libraries/System.Threading.AccessControl/tests/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard1.3-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Threading.AccessControl/tests/System.Threading.AccessControl.Tests.builds b/src/libraries/System.Threading.AccessControl/tests/System.Threading.AccessControl.Tests.builds
index cd45348b5b6ae6f791fbd0236aa4e1177d7cc598..91d84fd1bb41c26350f46f079814e3ff7026e5b2 100644
--- a/src/libraries/System.Threading.AccessControl/tests/System.Threading.AccessControl.Tests.builds
+++ b/src/libraries/System.Threading.AccessControl/tests/System.Threading.AccessControl.Tests.builds
@@ -1,10 +1,10 @@
-
+
Windows_NT
- netcoreapp1.1;netcoreapp1.0;net46
+ netcoreapp;netcoreapp1.0;net46
diff --git a/src/libraries/System.Threading.Overlapped/pkg/System.Threading.Overlapped.builds b/src/libraries/System.Threading.Overlapped/pkg/System.Threading.Overlapped.builds
index 2f6a1c296babe48c7c415985f77b1f2d20b1f30b..b2228b3c61c54dbad9d645e80f9ed881a60160cb 100644
--- a/src/libraries/System.Threading.Overlapped/pkg/System.Threading.Overlapped.builds
+++ b/src/libraries/System.Threading.Overlapped/pkg/System.Threading.Overlapped.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Threading.Overlapped/pkg/System.Threading.Overlapped.pkgproj b/src/libraries/System.Threading.Overlapped/pkg/System.Threading.Overlapped.pkgproj
index aeb1755afdb6d4f79e20c9049df9333bd166e186..663b16eac212f34b3dce65214479b51992f8158c 100644
--- a/src/libraries/System.Threading.Overlapped/pkg/System.Threading.Overlapped.pkgproj
+++ b/src/libraries/System.Threading.Overlapped/pkg/System.Threading.Overlapped.pkgproj
@@ -1,13 +1,11 @@
-
+
-
- net463;netcoreapp1.1
+ net463;netcoreapp2.0
-
\ No newline at end of file
diff --git a/src/libraries/System.Threading.Overlapped/ref/System.Threading.Overlapped.csproj b/src/libraries/System.Threading.Overlapped/ref/System.Threading.Overlapped.csproj
index 3e43ac771ab336eebb2afc4e7a77b861b33858c7..96ee3e0336804f312fbfb796977628c145ac54e3 100644
--- a/src/libraries/System.Threading.Overlapped/ref/System.Threading.Overlapped.csproj
+++ b/src/libraries/System.Threading.Overlapped/ref/System.Threading.Overlapped.csproj
@@ -1,4 +1,4 @@
-
+
@@ -11,4 +11,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Threading.Overlapped/src/Configurations.props b/src/libraries/System.Threading.Overlapped/src/Configurations.props
index 54621aaa2596fd3b447bf744593de03f022ef9c0..ade796f1bf8b0af7e8b8d665d40540d9908b8d46 100644
--- a/src/libraries/System.Threading.Overlapped/src/Configurations.props
+++ b/src/libraries/System.Threading.Overlapped/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -7,4 +7,4 @@
netstandard-Unix;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Threading.Overlapped/tests/Configurations.props b/src/libraries/System.Threading.Overlapped/tests/Configurations.props
index 9899767269c70344818f48037a578315199b0f6a..cf10431a14f043f0ac5e3f5732b39212a8cfea3c 100644
--- a/src/libraries/System.Threading.Overlapped/tests/Configurations.props
+++ b/src/libraries/System.Threading.Overlapped/tests/Configurations.props
@@ -1,9 +1,9 @@
-
+
netstandard1.3-Windows_NT;
- netstandard1.7-Windows_NT;
+ netstandard-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Threading.Overlapped/tests/System.Threading.Overlapped.Tests.builds b/src/libraries/System.Threading.Overlapped/tests/System.Threading.Overlapped.Tests.builds
index bdc8fad699fc109f484c588530f73fc45a7864c4..9caea576854440a7df81006937b4047405b66dac 100644
--- a/src/libraries/System.Threading.Overlapped/tests/System.Threading.Overlapped.Tests.builds
+++ b/src/libraries/System.Threading.Overlapped/tests/System.Threading.Overlapped.Tests.builds
@@ -1,4 +1,4 @@
-
+
@@ -12,4 +12,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Threading.Overlapped/tests/System.Threading.Overlapped.Tests.csproj b/src/libraries/System.Threading.Overlapped/tests/System.Threading.Overlapped.Tests.csproj
index 0499f24083750cd2fc3fdc7ff9637ec944afe626..4ce0cbd4d8ed68c13c37a2f72d2b9a0c3e27156f 100644
--- a/src/libraries/System.Threading.Overlapped/tests/System.Threading.Overlapped.Tests.csproj
+++ b/src/libraries/System.Threading.Overlapped/tests/System.Threading.Overlapped.Tests.csproj
@@ -27,4 +27,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Threading.Tasks.Dataflow/pkg/System.Threading.Tasks.Dataflow.builds b/src/libraries/System.Threading.Tasks.Dataflow/pkg/System.Threading.Tasks.Dataflow.builds
index 18f41cec99987fa79cff65031beab8b6b3f324cb..2e4509446ff80388a2fb22291ae9687f11a4bf74 100644
--- a/src/libraries/System.Threading.Tasks.Dataflow/pkg/System.Threading.Tasks.Dataflow.builds
+++ b/src/libraries/System.Threading.Tasks.Dataflow/pkg/System.Threading.Tasks.Dataflow.builds
@@ -1,8 +1,8 @@
-
+
-
+
\ No newline at end of file
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 86a1a110c352ebd2dc3cf123eb6fc6a752f5519d..d969844ff2586ee027dc81ef62ea151f88bf9647 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,16 +1,14 @@
-
+
2.8.6
-
net45;netcore45;wp8;wpa81;netcoreapp1.0;$(AllXamarinFrameworks)
-
\ No newline at end of file
diff --git a/src/libraries/System.Threading.Tasks.Dataflow/src/Configurations.props b/src/libraries/System.Threading.Tasks.Dataflow/src/Configurations.props
index 2467da4a1e24e3438bc71ce807ad058353f2cf54..6b3d50a13c574fb4b54232234ca58d1cb706d18e 100644
--- a/src/libraries/System.Threading.Tasks.Dataflow/src/Configurations.props
+++ b/src/libraries/System.Threading.Tasks.Dataflow/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard1.1;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Threading.Tasks.Dataflow/tests/Configurations.props b/src/libraries/System.Threading.Tasks.Dataflow/tests/Configurations.props
index f0ebe53119ec712315cfea5b151d5f0d754744f8..c3266e1e9362243b5723032465bcc7a62ae720ce 100644
--- a/src/libraries/System.Threading.Tasks.Dataflow/tests/Configurations.props
+++ b/src/libraries/System.Threading.Tasks.Dataflow/tests/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard1.3;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Threading.Tasks.Dataflow/tests/System.Threading.Tasks.Dataflow.Tests.builds b/src/libraries/System.Threading.Tasks.Dataflow/tests/System.Threading.Tasks.Dataflow.Tests.builds
index 7dfed2d4701573cca8054202dbc903b08756f608..fbb3959474e30ea7b027e2d665c17e4d61eb05a1 100644
--- a/src/libraries/System.Threading.Tasks.Dataflow/tests/System.Threading.Tasks.Dataflow.Tests.builds
+++ b/src/libraries/System.Threading.Tasks.Dataflow/tests/System.Threading.Tasks.Dataflow.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Threading.Tasks.Extensions/pkg/System.Threading.Tasks.Extensions.builds b/src/libraries/System.Threading.Tasks.Extensions/pkg/System.Threading.Tasks.Extensions.builds
index 5c2a62f662d17e2185f3c05d4badd5c7b31a23ca..664e9ea1ebdea5619f054892f1af14165d10d660 100644
--- a/src/libraries/System.Threading.Tasks.Extensions/pkg/System.Threading.Tasks.Extensions.builds
+++ b/src/libraries/System.Threading.Tasks.Extensions/pkg/System.Threading.Tasks.Extensions.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Threading.Tasks.Extensions/pkg/System.Threading.Tasks.Extensions.pkgproj b/src/libraries/System.Threading.Tasks.Extensions/pkg/System.Threading.Tasks.Extensions.pkgproj
index 92879410d547f1fad1a65080337b0992624f134d..ad0dcf946ec3319f62c27d795f1ef09c782576bd 100644
--- a/src/libraries/System.Threading.Tasks.Extensions/pkg/System.Threading.Tasks.Extensions.pkgproj
+++ b/src/libraries/System.Threading.Tasks.Extensions/pkg/System.Threading.Tasks.Extensions.pkgproj
@@ -1,16 +1,14 @@
-
+
2.8.6
-
-
+
net45;netcore45;netcoreapp1.0;wpa81;wp8;$(AllXamarinFrameworks)
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Threading.Tasks.Extensions/src/Configurations.props b/src/libraries/System.Threading.Tasks.Extensions/src/Configurations.props
index 2ec0365c0d50ed330862506ea44da4fccb7fd0a9..66fc3409d36ab9b1606b29eb2f04491b1eb10c92 100644
--- a/src/libraries/System.Threading.Tasks.Extensions/src/Configurations.props
+++ b/src/libraries/System.Threading.Tasks.Extensions/src/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard1.0;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Threading.Tasks.Extensions/tests/Configurations.props b/src/libraries/System.Threading.Tasks.Extensions/tests/Configurations.props
index f0ebe53119ec712315cfea5b151d5f0d754744f8..c3266e1e9362243b5723032465bcc7a62ae720ce 100644
--- a/src/libraries/System.Threading.Tasks.Extensions/tests/Configurations.props
+++ b/src/libraries/System.Threading.Tasks.Extensions/tests/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard1.3;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Threading.Tasks.Extensions/tests/System.Threading.Tasks.Extensions.Tests.builds b/src/libraries/System.Threading.Tasks.Extensions/tests/System.Threading.Tasks.Extensions.Tests.builds
index 2e735693c71a715a887b0bd77abd2ab5458fc420..507ee9f72b778cc182cbddcd223735c1cc239e70 100644
--- a/src/libraries/System.Threading.Tasks.Extensions/tests/System.Threading.Tasks.Extensions.Tests.builds
+++ b/src/libraries/System.Threading.Tasks.Extensions/tests/System.Threading.Tasks.Extensions.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Threading.Tasks.Parallel/pkg/System.Threading.Tasks.Parallel.builds b/src/libraries/System.Threading.Tasks.Parallel/pkg/System.Threading.Tasks.Parallel.builds
index 9355a9b6c86bc4701ee00aa6e507ec834b46b41a..3f11260f2298e42c0e252e58a716ac48c333b718 100644
--- a/src/libraries/System.Threading.Tasks.Parallel/pkg/System.Threading.Tasks.Parallel.builds
+++ b/src/libraries/System.Threading.Tasks.Parallel/pkg/System.Threading.Tasks.Parallel.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Threading.Tasks.Parallel/pkg/System.Threading.Tasks.Parallel.pkgproj b/src/libraries/System.Threading.Tasks.Parallel/pkg/System.Threading.Tasks.Parallel.pkgproj
index 661b3382168553afe269e9337d776578f1eed441..da58c5bc045f8819f4ebb63eced83956b36f918c 100644
--- a/src/libraries/System.Threading.Tasks.Parallel/pkg/System.Threading.Tasks.Parallel.pkgproj
+++ b/src/libraries/System.Threading.Tasks.Parallel/pkg/System.Threading.Tasks.Parallel.pkgproj
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Threading.Tasks.Parallel/ref/System.Threading.Tasks.Parallel.csproj b/src/libraries/System.Threading.Tasks.Parallel/ref/System.Threading.Tasks.Parallel.csproj
index e39f2210ffeacc3c515cace82200d44dc419cd5d..6a4fb8329f05ad005a3a4efaf0b20050b772e37c 100644
--- a/src/libraries/System.Threading.Tasks.Parallel/ref/System.Threading.Tasks.Parallel.csproj
+++ b/src/libraries/System.Threading.Tasks.Parallel/ref/System.Threading.Tasks.Parallel.csproj
@@ -1,4 +1,4 @@
-
+
@@ -10,4 +10,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Threading.Tasks.Parallel/src/Configurations.props b/src/libraries/System.Threading.Tasks.Parallel/src/Configurations.props
index f0ebe53119ec712315cfea5b151d5f0d754744f8..c3266e1e9362243b5723032465bcc7a62ae720ce 100644
--- a/src/libraries/System.Threading.Tasks.Parallel/src/Configurations.props
+++ b/src/libraries/System.Threading.Tasks.Parallel/src/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard1.3;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Threading.Tasks.Parallel/tests/Configurations.props b/src/libraries/System.Threading.Tasks.Parallel/tests/Configurations.props
index 30186bb80bd8c011c0ddf7189005a59fca562194..2c5652de538d40d79af656d1d583ae53740199b5 100644
--- a/src/libraries/System.Threading.Tasks.Parallel/tests/Configurations.props
+++ b/src/libraries/System.Threading.Tasks.Parallel/tests/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard1.5;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Threading.Tasks.Parallel/tests/System.Threading.Tasks.Parallel.Tests.builds b/src/libraries/System.Threading.Tasks.Parallel/tests/System.Threading.Tasks.Parallel.Tests.builds
index 64dc47551e671dfcd08a8e33feb0d1ec9726baec..bdd7a1f28335c796d711b3fc9eff339ef6a10bee 100644
--- a/src/libraries/System.Threading.Tasks.Parallel/tests/System.Threading.Tasks.Parallel.Tests.builds
+++ b/src/libraries/System.Threading.Tasks.Parallel/tests/System.Threading.Tasks.Parallel.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Threading.Tasks/pkg/System.Threading.Tasks.pkgproj b/src/libraries/System.Threading.Tasks/pkg/System.Threading.Tasks.pkgproj
index bf3ed5a5a9ac97298fc27a94fa05eab37aba081f..962c1576184d35f21ac3c95f2754f64a1f4efc54 100644
--- a/src/libraries/System.Threading.Tasks/pkg/System.Threading.Tasks.pkgproj
+++ b/src/libraries/System.Threading.Tasks/pkg/System.Threading.Tasks.pkgproj
@@ -1,9 +1,9 @@
-
+
- net463;netcoreapp1.1;uap10.1;$(AllXamarinFrameworks)
+ net463;netcoreapp2.0;uap10.1;$(AllXamarinFrameworks)
net463
diff --git a/src/libraries/System.Threading.Tasks/pkg/any/System.Threading.Tasks.pkgproj b/src/libraries/System.Threading.Tasks/pkg/any/System.Threading.Tasks.pkgproj
index 52054bf57f501ad78a54dd69b0451fcc442808f6..363dcda5a3dbafaa70a4725163242411c7f28b88 100644
--- a/src/libraries/System.Threading.Tasks/pkg/any/System.Threading.Tasks.pkgproj
+++ b/src/libraries/System.Threading.Tasks/pkg/any/System.Threading.Tasks.pkgproj
@@ -5,10 +5,8 @@
any
true
-
-
diff --git a/src/libraries/System.Threading.Tasks/pkg/aot/System.Threading.Tasks.pkgproj b/src/libraries/System.Threading.Tasks/pkg/aot/System.Threading.Tasks.pkgproj
index 0b879f53a61014a4ff22ce4c6edef8c1e20fe55a..86f33d6bd92e220ab282bd0f45a0a83937fad4cd 100644
--- a/src/libraries/System.Threading.Tasks/pkg/aot/System.Threading.Tasks.pkgproj
+++ b/src/libraries/System.Threading.Tasks/pkg/aot/System.Threading.Tasks.pkgproj
@@ -1,17 +1,14 @@
-
aot
true
-
uap101aot
-
\ No newline at end of file
diff --git a/src/libraries/System.Threading.Tasks/ref/System.Threading.Tasks.csproj b/src/libraries/System.Threading.Tasks/ref/System.Threading.Tasks.csproj
index 98faf370a86ba40b058180c5aae278e14c7ba8a7..911018d1080795097f3e2a5c926347b9279b22c3 100644
--- a/src/libraries/System.Threading.Tasks/ref/System.Threading.Tasks.csproj
+++ b/src/libraries/System.Threading.Tasks/ref/System.Threading.Tasks.csproj
@@ -1,4 +1,4 @@
-
+
@@ -8,4 +8,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Threading.Tasks/src/Configurations.props b/src/libraries/System.Threading.Tasks/src/Configurations.props
index a25a6691e355f553367c3b8b6f209d4e9c8b11a9..6446d96dd37280d84349117225b60cdf0d9d6004 100644
--- a/src/libraries/System.Threading.Tasks/src/Configurations.props
+++ b/src/libraries/System.Threading.Tasks/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -7,4 +7,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Threading.Tasks/src/System.Threading.Tasks.csproj b/src/libraries/System.Threading.Tasks/src/System.Threading.Tasks.csproj
index f32a7a3c25b9aa22ba06bad1d93c16bcddb55ea3..c6fd018ca95fffb55e838d6928ee6d18d09b7b5e 100644
--- a/src/libraries/System.Threading.Tasks/src/System.Threading.Tasks.csproj
+++ b/src/libraries/System.Threading.Tasks/src/System.Threading.Tasks.csproj
@@ -5,7 +5,7 @@
{3BCAEAA6-3A29-49EC-B334-6E7BE8BE9ABA}
System.Threading.Tasks
true
- netstandard1.7;uap10.1
+ netstandard;uap10.1
diff --git a/src/libraries/System.Threading.Tasks/tests/Configurations.props b/src/libraries/System.Threading.Tasks/tests/Configurations.props
index b744993779f030cfc03be021645dfc161ff05f68..800e963c809d11f44888eedf66bad86641a54996 100644
--- a/src/libraries/System.Threading.Tasks/tests/Configurations.props
+++ b/src/libraries/System.Threading.Tasks/tests/Configurations.props
@@ -1,9 +1,9 @@
-
+
netstandard1.5;
- netstandard1.7;
+ netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Threading.Tasks/tests/System.Threading.Tasks.Tests.builds b/src/libraries/System.Threading.Tasks/tests/System.Threading.Tasks.Tests.builds
index 27fa7ead1b0deef3c5bb4c2e39975abff08be66d..ebde12ed2f7bb0e6c5983df5961984fcb724fca8 100644
--- a/src/libraries/System.Threading.Tasks/tests/System.Threading.Tasks.Tests.builds
+++ b/src/libraries/System.Threading.Tasks/tests/System.Threading.Tasks.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Threading.Tasks/tests/System.Threading.Tasks.Tests.csproj b/src/libraries/System.Threading.Tasks/tests/System.Threading.Tasks.Tests.csproj
index 98851dc3fbc67e78a5f3c8221be21073f6a8090e..481816574e538fe55bcc349843b30c345c34758b 100644
--- a/src/libraries/System.Threading.Tasks/tests/System.Threading.Tasks.Tests.csproj
+++ b/src/libraries/System.Threading.Tasks/tests/System.Threading.Tasks.Tests.csproj
@@ -53,4 +53,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Threading.Thread/pkg/System.Threading.Thread.builds b/src/libraries/System.Threading.Thread/pkg/System.Threading.Thread.builds
index da5399c203c45f68e22d2455a9c331ce4fe5e89d..9fb34e81ebf049f4a9d4018958c468dbd61db7b8 100644
--- a/src/libraries/System.Threading.Thread/pkg/System.Threading.Thread.builds
+++ b/src/libraries/System.Threading.Thread/pkg/System.Threading.Thread.builds
@@ -1,8 +1,8 @@
-
+
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Threading.Thread/pkg/System.Threading.Thread.pkgproj b/src/libraries/System.Threading.Thread/pkg/System.Threading.Thread.pkgproj
index 75b1faf883ee734d587e886868de63b59840e5e6..7a0f8dc27c3db0d999f532c091b59e3ccf006d7a 100644
--- a/src/libraries/System.Threading.Thread/pkg/System.Threading.Thread.pkgproj
+++ b/src/libraries/System.Threading.Thread/pkg/System.Threading.Thread.pkgproj
@@ -3,7 +3,7 @@
- net461;netcoreapp1.1;uap10.1;$(AllXamarinFrameworks)
+ net461;netcoreapp2.0;uap10.1;$(AllXamarinFrameworks)
@@ -14,18 +14,16 @@
lib/netstandard2.0
-
-
UAP,Version=v10.1
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Threading.Thread/ref/System.Threading.Thread.csproj b/src/libraries/System.Threading.Thread/ref/System.Threading.Thread.csproj
index cf611b21bf0c0618135748da2009b73260e5b4ac..53c870530222e83c2e95d39621f4286af8ab6c77 100644
--- a/src/libraries/System.Threading.Thread/ref/System.Threading.Thread.csproj
+++ b/src/libraries/System.Threading.Thread/ref/System.Threading.Thread.csproj
@@ -1,4 +1,4 @@
-
+
@@ -11,4 +11,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Threading.Thread/src/Configurations.props b/src/libraries/System.Threading.Thread/src/Configurations.props
index d9529542a7e5cda8b4a2b70ceefc79f8775da707..c600b915db538245bd77640e5edf32e592d56836 100644
--- a/src/libraries/System.Threading.Thread/src/Configurations.props
+++ b/src/libraries/System.Threading.Thread/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -8,4 +8,4 @@
net461-Windows_NT;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Threading.Thread/src/System.Threading.Thread.csproj b/src/libraries/System.Threading.Thread/src/System.Threading.Thread.csproj
index 137d6c096324b59d1aadac089136c57313e0319c..2b87e2f079280c9f0bed761ae269def58e96107f 100644
--- a/src/libraries/System.Threading.Thread/src/System.Threading.Thread.csproj
+++ b/src/libraries/System.Threading.Thread/src/System.Threading.Thread.csproj
@@ -5,7 +5,7 @@
System.Threading.Thread
Library
true
- netstandard1.7;uap10.1
+ netstandard;uap10.1
true
diff --git a/src/libraries/System.Threading.Thread/tests/Configurations.props b/src/libraries/System.Threading.Thread/tests/Configurations.props
index 98f53209d45a12360d0bbf7cf031b29ff556fc57..c398e42e899425ce70e3a9884633835ab6fcc66e 100644
--- a/src/libraries/System.Threading.Thread/tests/Configurations.props
+++ b/src/libraries/System.Threading.Thread/tests/Configurations.props
@@ -1,8 +1,8 @@
-
+
- netstandard1.7;
+ netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Threading.Thread/tests/System.Threading.Thread.Tests.builds b/src/libraries/System.Threading.Thread/tests/System.Threading.Thread.Tests.builds
index d70f294226b0351f1e54b0e12fdb2e8fe41d196a..4ceee39a49cab2fe4d5dc194a4786abf8054133b 100644
--- a/src/libraries/System.Threading.Thread/tests/System.Threading.Thread.Tests.builds
+++ b/src/libraries/System.Threading.Thread/tests/System.Threading.Thread.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Threading.ThreadPool/pkg/System.Threading.ThreadPool.builds b/src/libraries/System.Threading.ThreadPool/pkg/System.Threading.ThreadPool.builds
index 9ae14e48a9c1d49b0917f11ee24a92a89835c753..44789802a722b384ff34b74dcfc9ef84522e2bca 100644
--- a/src/libraries/System.Threading.ThreadPool/pkg/System.Threading.ThreadPool.builds
+++ b/src/libraries/System.Threading.ThreadPool/pkg/System.Threading.ThreadPool.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Threading.ThreadPool/pkg/System.Threading.ThreadPool.pkgproj b/src/libraries/System.Threading.ThreadPool/pkg/System.Threading.ThreadPool.pkgproj
index eefca9bb2b990cbf3e88795f12a9109a10bcb8ef..03f29666bb0160a6e63b786ad72075d1b2068b6a 100644
--- a/src/libraries/System.Threading.ThreadPool/pkg/System.Threading.ThreadPool.pkgproj
+++ b/src/libraries/System.Threading.ThreadPool/pkg/System.Threading.ThreadPool.pkgproj
@@ -1,9 +1,9 @@
-
+
- net463;netcoreapp1.1;$(AllXamarinFrameworks)
+ net463;netcoreapp2.0;$(AllXamarinFrameworks)
@@ -17,4 +17,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Threading.ThreadPool/ref/System.Threading.ThreadPool.csproj b/src/libraries/System.Threading.ThreadPool/ref/System.Threading.ThreadPool.csproj
index 4568c2ed7b07d977359b57d1b1ab3934a64081ce..1e97189d36918fdc4a258a7845e6cffec336834e 100644
--- a/src/libraries/System.Threading.ThreadPool/ref/System.Threading.ThreadPool.csproj
+++ b/src/libraries/System.Threading.ThreadPool/ref/System.Threading.ThreadPool.csproj
@@ -1,4 +1,4 @@
-
+
@@ -13,4 +13,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Threading.ThreadPool/src/Configurations.props b/src/libraries/System.Threading.ThreadPool/src/Configurations.props
index 9c336c0be9e52171e2fecf14214e3373be07177d..dc837f915219bcf7ff5c38f67e01c45d5b976485 100644
--- a/src/libraries/System.Threading.ThreadPool/src/Configurations.props
+++ b/src/libraries/System.Threading.ThreadPool/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Threading.ThreadPool/tests/Configurations.props b/src/libraries/System.Threading.ThreadPool/tests/Configurations.props
index 98f53209d45a12360d0bbf7cf031b29ff556fc57..c398e42e899425ce70e3a9884633835ab6fcc66e 100644
--- a/src/libraries/System.Threading.ThreadPool/tests/Configurations.props
+++ b/src/libraries/System.Threading.ThreadPool/tests/Configurations.props
@@ -1,8 +1,8 @@
-
+
- netstandard1.7;
+ netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Threading.ThreadPool/tests/System.Threading.ThreadPool.Tests.builds b/src/libraries/System.Threading.ThreadPool/tests/System.Threading.ThreadPool.Tests.builds
index 8762fb624609794ef6290b2594f14e8c6701a2a8..5c93d67cb984c7ba4f5f23f54ec1defca61557fc 100644
--- a/src/libraries/System.Threading.ThreadPool/tests/System.Threading.ThreadPool.Tests.builds
+++ b/src/libraries/System.Threading.ThreadPool/tests/System.Threading.ThreadPool.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Threading.Timer/pkg/System.Threading.Timer.pkgproj b/src/libraries/System.Threading.Timer/pkg/System.Threading.Timer.pkgproj
index b6c34d5df5938d004cb25b6746a6e1760ae6378b..33370cf52f41bead14ff6218e1bf2113734a4385 100644
--- a/src/libraries/System.Threading.Timer/pkg/System.Threading.Timer.pkgproj
+++ b/src/libraries/System.Threading.Timer/pkg/System.Threading.Timer.pkgproj
@@ -1,9 +1,9 @@
-
+
- net463;netcoreapp1.1;$(AllXamarinFrameworks)
+ net463;netcoreapp2.0;$(AllXamarinFrameworks)
net463
diff --git a/src/libraries/System.Threading.Timer/pkg/any/System.Threading.Timer.pkgproj b/src/libraries/System.Threading.Timer/pkg/any/System.Threading.Timer.pkgproj
index 922af191f018f81de9951547a904318a10db892e..b439f36e7594f6a5ef7b54b73c5805ce671072ac 100644
--- a/src/libraries/System.Threading.Timer/pkg/any/System.Threading.Timer.pkgproj
+++ b/src/libraries/System.Threading.Timer/pkg/any/System.Threading.Timer.pkgproj
@@ -5,16 +5,13 @@
any
true
-
-
runtimes/aot/lib/netcore50
aot
-
diff --git a/src/libraries/System.Threading.Timer/pkg/aot/System.Threading.Timer.pkgproj b/src/libraries/System.Threading.Timer/pkg/aot/System.Threading.Timer.pkgproj
index 5e4737373fcc0bfa8329d4022c845d80b72e0017..e250c972055b62d8b48ba030b64572a2bce8bada 100644
--- a/src/libraries/System.Threading.Timer/pkg/aot/System.Threading.Timer.pkgproj
+++ b/src/libraries/System.Threading.Timer/pkg/aot/System.Threading.Timer.pkgproj
@@ -1,11 +1,9 @@
-
aot
true
-
\ No newline at end of file
diff --git a/src/libraries/System.Threading.Timer/ref/System.Threading.Timer.csproj b/src/libraries/System.Threading.Timer/ref/System.Threading.Timer.csproj
index 8fb34f13dc8fa6e7df9d1447909bd5686bc54a36..5ecf84196632d1575dcb474adca6bc7e70044696 100644
--- a/src/libraries/System.Threading.Timer/ref/System.Threading.Timer.csproj
+++ b/src/libraries/System.Threading.Timer/ref/System.Threading.Timer.csproj
@@ -1,4 +1,4 @@
-
+
@@ -8,4 +8,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Threading.Timer/src/Configurations.props b/src/libraries/System.Threading.Timer/src/Configurations.props
index 9c336c0be9e52171e2fecf14214e3373be07177d..dc837f915219bcf7ff5c38f67e01c45d5b976485 100644
--- a/src/libraries/System.Threading.Timer/src/Configurations.props
+++ b/src/libraries/System.Threading.Timer/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Threading.Timer/tests/Configurations.props b/src/libraries/System.Threading.Timer/tests/Configurations.props
index 512c938bad5364c677a3f4d9f647f1ade8c14aea..b2db637110616a495d303924e9aaf8b800db4821 100644
--- a/src/libraries/System.Threading.Timer/tests/Configurations.props
+++ b/src/libraries/System.Threading.Timer/tests/Configurations.props
@@ -1,9 +1,9 @@
-
+
netstandard1.3;
- netstandard1.7;
+ netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Threading.Timer/tests/System.Threading.Timer.Tests.builds b/src/libraries/System.Threading.Timer/tests/System.Threading.Timer.Tests.builds
index 8608b46a3ca82788a53da290c15f84728396d44f..56f88c103c25682b74fe98c8a0354f7e3f18354c 100644
--- a/src/libraries/System.Threading.Timer/tests/System.Threading.Timer.Tests.builds
+++ b/src/libraries/System.Threading.Timer/tests/System.Threading.Timer.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Threading.Timer/tests/System.Threading.Timer.Tests.csproj b/src/libraries/System.Threading.Timer/tests/System.Threading.Timer.Tests.csproj
index 17c6b5794dac6ceef9892fb6f721addde2ad0f6d..9834ece4b72011e796134178260cdbdec3e086af 100644
--- a/src/libraries/System.Threading.Timer/tests/System.Threading.Timer.Tests.csproj
+++ b/src/libraries/System.Threading.Timer/tests/System.Threading.Timer.Tests.csproj
@@ -18,4 +18,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Threading/pkg/System.Threading.builds b/src/libraries/System.Threading/pkg/System.Threading.builds
index d0a79615bebe003e700c7e7fc02bd6225ccc74cc..68f95c6e40831e469c243f940f4addd5a5e1bdee 100644
--- a/src/libraries/System.Threading/pkg/System.Threading.builds
+++ b/src/libraries/System.Threading/pkg/System.Threading.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Threading/pkg/System.Threading.pkgproj b/src/libraries/System.Threading/pkg/System.Threading.pkgproj
index 2655b1b8ca7fd20622b752ca7021d1e72b40ea2c..4ad1cb51e5d5af6b406cd48f4423d14381657a90 100644
--- a/src/libraries/System.Threading/pkg/System.Threading.pkgproj
+++ b/src/libraries/System.Threading/pkg/System.Threading.pkgproj
@@ -3,7 +3,7 @@
- net463;netcoreapp1.1;$(AllXamarinFrameworks)
+ net463;netcoreapp2.0;$(AllXamarinFrameworks)
diff --git a/src/libraries/System.Threading/ref/System.Threading.csproj b/src/libraries/System.Threading/ref/System.Threading.csproj
index d599fbf68691f65bd3953a3c19de167d74cdf12b..5dd8b56bc176a4359cc0194eac2a9f8e553c3ccb 100644
--- a/src/libraries/System.Threading/ref/System.Threading.csproj
+++ b/src/libraries/System.Threading/ref/System.Threading.csproj
@@ -1,4 +1,4 @@
-
+
@@ -8,4 +8,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Threading/src/Configurations.props b/src/libraries/System.Threading/src/Configurations.props
index 9c336c0be9e52171e2fecf14214e3373be07177d..dc837f915219bcf7ff5c38f67e01c45d5b976485 100644
--- a/src/libraries/System.Threading/src/Configurations.props
+++ b/src/libraries/System.Threading/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Threading/tests/Configurations.props b/src/libraries/System.Threading/tests/Configurations.props
index 512c938bad5364c677a3f4d9f647f1ade8c14aea..b2db637110616a495d303924e9aaf8b800db4821 100644
--- a/src/libraries/System.Threading/tests/Configurations.props
+++ b/src/libraries/System.Threading/tests/Configurations.props
@@ -1,9 +1,9 @@
-
+
netstandard1.3;
- netstandard1.7;
+ netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Threading/tests/System.Threading.Tests.builds b/src/libraries/System.Threading/tests/System.Threading.Tests.builds
index 8b473e68120670b8a8f4c5deaf8d2209ace6f172..d3c383990a46f6707c5f79f34540c4c5e016aecf 100644
--- a/src/libraries/System.Threading/tests/System.Threading.Tests.builds
+++ b/src/libraries/System.Threading/tests/System.Threading.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Threading/tests/System.Threading.Tests.csproj b/src/libraries/System.Threading/tests/System.Threading.Tests.csproj
index af449363eb598611b54c7079abd5b5c19c5af3f7..2fe10cfbe4412a1e44e365c643ecee88db43b188 100644
--- a/src/libraries/System.Threading/tests/System.Threading.Tests.csproj
+++ b/src/libraries/System.Threading/tests/System.Threading.Tests.csproj
@@ -64,4 +64,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Transactions/pkg/System.Transactions.builds b/src/libraries/System.Transactions/pkg/System.Transactions.builds
index 047a2fa6683fa2ccf2798d65de82e75cd0afb92b..599463dd002708122526f6ebba5be6f1f6bfa42b 100644
--- a/src/libraries/System.Transactions/pkg/System.Transactions.builds
+++ b/src/libraries/System.Transactions/pkg/System.Transactions.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Transactions/pkg/System.Transactions.pkgproj b/src/libraries/System.Transactions/pkg/System.Transactions.pkgproj
index 54752ef1d6e20435a797350cb8067e112e380960..9c6082425f19a9b93cbdac03594b98d1dcf15e80 100644
--- a/src/libraries/System.Transactions/pkg/System.Transactions.pkgproj
+++ b/src/libraries/System.Transactions/pkg/System.Transactions.pkgproj
@@ -1,16 +1,14 @@
-
+
- net461;netcoreapp1.1;$(AllXamarinFrameworks)
+ net461;netcoreapp2.0;$(AllXamarinFrameworks)
-
true
-
true
@@ -30,10 +28,9 @@
true
-
win7
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Transactions/ref/System.Transactions.csproj b/src/libraries/System.Transactions/ref/System.Transactions.csproj
index 93e504d46e3f3684ff4e433079e75b57f1231c90..d69b0830b39a2d9efabce12ea960a2ea95fb20f5 100644
--- a/src/libraries/System.Transactions/ref/System.Transactions.csproj
+++ b/src/libraries/System.Transactions/ref/System.Transactions.csproj
@@ -1,10 +1,9 @@
-
+
-
- 4.0.0.0
- Library
- netstandard1.7
+
+ 4.0.0.0
+ Library
@@ -15,4 +14,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Transactions/src/Configurations.props b/src/libraries/System.Transactions/src/Configurations.props
index fc9ef9822c01e3840af50ced2f25bdc2f5349eca..c398e42e899425ce70e3a9884633835ab6fcc66e 100644
--- a/src/libraries/System.Transactions/src/Configurations.props
+++ b/src/libraries/System.Transactions/src/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Transactions/src/System.Transactions.csproj b/src/libraries/System.Transactions/src/System.Transactions.csproj
index c987c65ff9af0beca3e3c1510d5eba4efe099519..a92d682e854827245b6b1581f4cba70e598d84a8 100644
--- a/src/libraries/System.Transactions/src/System.Transactions.csproj
+++ b/src/libraries/System.Transactions/src/System.Transactions.csproj
@@ -5,7 +5,7 @@
4.0.0.0
{2ADDB484-6F57-4D71-A3FE-A57EC6329A2B}
true
- netstandard1.7
+ netstandard
true
diff --git a/src/libraries/System.Transactions/tests/Configurations.props b/src/libraries/System.Transactions/tests/Configurations.props
index 98f53209d45a12360d0bbf7cf031b29ff556fc57..c398e42e899425ce70e3a9884633835ab6fcc66e 100644
--- a/src/libraries/System.Transactions/tests/Configurations.props
+++ b/src/libraries/System.Transactions/tests/Configurations.props
@@ -1,8 +1,8 @@
-
+
- netstandard1.7;
+ netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Transactions/tests/System.Transactions.Tests.builds b/src/libraries/System.Transactions/tests/System.Transactions.Tests.builds
index 4fe3c31fe8cabb4cbc6ba981c0eb929d85f74700..3fb6aea47033f8790eba4d67386a9a6d74acdf35 100644
--- a/src/libraries/System.Transactions/tests/System.Transactions.Tests.builds
+++ b/src/libraries/System.Transactions/tests/System.Transactions.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.ValueTuple/pkg/System.ValueTuple.builds b/src/libraries/System.ValueTuple/pkg/System.ValueTuple.builds
index 132e32be1ddf66944e285e2c9c08c76fa8def211..65e4460eae9ab2e9c92b64da3005d1c3d9a39d83 100644
--- a/src/libraries/System.ValueTuple/pkg/System.ValueTuple.builds
+++ b/src/libraries/System.ValueTuple/pkg/System.ValueTuple.builds
@@ -1,8 +1,8 @@
-
+
-
+
\ No newline at end of file
diff --git a/src/libraries/System.ValueTuple/pkg/System.ValueTuple.pkgproj b/src/libraries/System.ValueTuple/pkg/System.ValueTuple.pkgproj
index b142d27702c6498c5ce7007d9698710899b18f1d..18d80db3691ea9ba0a241017a7ce8d2938618488 100644
--- a/src/libraries/System.ValueTuple/pkg/System.ValueTuple.pkgproj
+++ b/src/libraries/System.ValueTuple/pkg/System.ValueTuple.pkgproj
@@ -1,12 +1,10 @@
-
+
-
net45;netcore45;netcoreapp1.0;wp8;wpa81;$(AllXamarinFrameworks)
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.ValueTuple/src/Configurations.props b/src/libraries/System.ValueTuple/src/Configurations.props
index a531bf696c91d76878576036516b9e157d53e6d0..e5cac42e2a31e1e5085de6cecd305ddb91d2f96b 100644
--- a/src/libraries/System.ValueTuple/src/Configurations.props
+++ b/src/libraries/System.ValueTuple/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard1.0;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.ValueTuple/tests/Configurations.props b/src/libraries/System.ValueTuple/tests/Configurations.props
index f0ebe53119ec712315cfea5b151d5f0d754744f8..c3266e1e9362243b5723032465bcc7a62ae720ce 100644
--- a/src/libraries/System.ValueTuple/tests/Configurations.props
+++ b/src/libraries/System.ValueTuple/tests/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard1.3;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.ValueTuple/tests/System.ValueTuple.Tests.builds b/src/libraries/System.ValueTuple/tests/System.ValueTuple.Tests.builds
index 885f55110fd166017af0ffc4011ccfe5cfcaa8c0..4fba6a103f8c8eaaf3a834590d12c63386e972db 100644
--- a/src/libraries/System.ValueTuple/tests/System.ValueTuple.Tests.builds
+++ b/src/libraries/System.ValueTuple/tests/System.ValueTuple.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Web.HttpUtility/pkg/System.Web.HttpUtility.builds b/src/libraries/System.Web.HttpUtility/pkg/System.Web.HttpUtility.builds
index 21b0720969261bf327d6ceedcfb9d1c6df95cbc0..f8d0c2dd16616ee8ee0e35b469dab2c726df1254 100644
--- a/src/libraries/System.Web.HttpUtility/pkg/System.Web.HttpUtility.builds
+++ b/src/libraries/System.Web.HttpUtility/pkg/System.Web.HttpUtility.builds
@@ -1,8 +1,8 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Web.HttpUtility/pkg/System.Web.HttpUtility.pkgproj b/src/libraries/System.Web.HttpUtility/pkg/System.Web.HttpUtility.pkgproj
index 5d15f9279bc42e0100b3f6c222bdd5b43345cbf2..7d1c2d84f9552be7698c58fa4bd73ad9d530e10e 100644
--- a/src/libraries/System.Web.HttpUtility/pkg/System.Web.HttpUtility.pkgproj
+++ b/src/libraries/System.Web.HttpUtility/pkg/System.Web.HttpUtility.pkgproj
@@ -1,13 +1,11 @@
-
+
-
net46;netcore50;netcoreapp1.0;$(AllXamarinFrameworks)
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Web.HttpUtility/ref/System.Web.HttpUtility.csproj b/src/libraries/System.Web.HttpUtility/ref/System.Web.HttpUtility.csproj
index 0534648a36f63be9881b24b62404374e7c027925..45e872767a80017b76869dddd3eaf653b717da59 100644
--- a/src/libraries/System.Web.HttpUtility/ref/System.Web.HttpUtility.csproj
+++ b/src/libraries/System.Web.HttpUtility/ref/System.Web.HttpUtility.csproj
@@ -1,4 +1,4 @@
-
+
@@ -12,4 +12,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Web.HttpUtility/src/Configurations.props b/src/libraries/System.Web.HttpUtility/src/Configurations.props
index 24e575d57f008def11ea01de6d0e7d44557642fb..f9df021aefd9ab84f98c619d263a00909c6cb3ae 100644
--- a/src/libraries/System.Web.HttpUtility/src/Configurations.props
+++ b/src/libraries/System.Web.HttpUtility/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard1.3;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Web.HttpUtility/tests/Configurations.props b/src/libraries/System.Web.HttpUtility/tests/Configurations.props
index f0ebe53119ec712315cfea5b151d5f0d754744f8..c3266e1e9362243b5723032465bcc7a62ae720ce 100644
--- a/src/libraries/System.Web.HttpUtility/tests/Configurations.props
+++ b/src/libraries/System.Web.HttpUtility/tests/Configurations.props
@@ -1,8 +1,8 @@
-
+
netstandard1.3;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Web.HttpUtility/tests/System.Web.HttpUtility.Tests.builds b/src/libraries/System.Web.HttpUtility/tests/System.Web.HttpUtility.Tests.builds
index db711fefefd9c29a57076e3f41397ae765b47c56..035461282c3770a2443681d7de7cf4ee66f4982f 100644
--- a/src/libraries/System.Web.HttpUtility/tests/System.Web.HttpUtility.Tests.builds
+++ b/src/libraries/System.Web.HttpUtility/tests/System.Web.HttpUtility.Tests.builds
@@ -1,9 +1,9 @@
-
+
- netcoreapp1.1;netcoreapp1.0;net46
+ netcoreapp;netcoreapp1.0;net46
diff --git a/src/libraries/System.Xml.ReaderWriter/pkg/System.Xml.ReaderWriter.builds b/src/libraries/System.Xml.ReaderWriter/pkg/System.Xml.ReaderWriter.builds
index 0a6f39567fa28a5a7cc8dcb3fea11a137da26377..b9b605d1ccfe968211ce98161b2642e6a410276f 100644
--- a/src/libraries/System.Xml.ReaderWriter/pkg/System.Xml.ReaderWriter.builds
+++ b/src/libraries/System.Xml.ReaderWriter/pkg/System.Xml.ReaderWriter.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Xml.ReaderWriter/pkg/System.Xml.ReaderWriter.pkgproj b/src/libraries/System.Xml.ReaderWriter/pkg/System.Xml.ReaderWriter.pkgproj
index 18814331577af365b59a72f7622bc45a3b9e0173..a9ad42597a36dc988918422a8dcc4739c8b42887 100644
--- a/src/libraries/System.Xml.ReaderWriter/pkg/System.Xml.ReaderWriter.pkgproj
+++ b/src/libraries/System.Xml.ReaderWriter/pkg/System.Xml.ReaderWriter.pkgproj
@@ -3,7 +3,7 @@
- net463;netcoreapp1.1;$(AllXamarinFrameworks)
+ net463;netcoreapp2.0;$(AllXamarinFrameworks)
diff --git a/src/libraries/System.Xml.ReaderWriter/ref/System.Xml.ReaderWriter.csproj b/src/libraries/System.Xml.ReaderWriter/ref/System.Xml.ReaderWriter.csproj
index 90e1d2d00671675b3904867e6a080e2204107e41..0b57e3c94d3b01dc55ff964a7c2935a92f45ff3c 100644
--- a/src/libraries/System.Xml.ReaderWriter/ref/System.Xml.ReaderWriter.csproj
+++ b/src/libraries/System.Xml.ReaderWriter/ref/System.Xml.ReaderWriter.csproj
@@ -1,4 +1,4 @@
-
+
@@ -15,4 +15,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Xml.ReaderWriter/src/Configurations.props b/src/libraries/System.Xml.ReaderWriter/src/Configurations.props
index 9c336c0be9e52171e2fecf14214e3373be07177d..dc837f915219bcf7ff5c38f67e01c45d5b976485 100644
--- a/src/libraries/System.Xml.ReaderWriter/src/Configurations.props
+++ b/src/libraries/System.Xml.ReaderWriter/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Xml.ReaderWriter/tests/System.Xml.ReaderWriter.Tests.builds b/src/libraries/System.Xml.ReaderWriter/tests/System.Xml.ReaderWriter.Tests.builds
index 58540c8539077e7ed1cecb3def2f355e227c8718..d752dd91b51ba9c277f403abda1c72a126b17591 100644
--- a/src/libraries/System.Xml.ReaderWriter/tests/System.Xml.ReaderWriter.Tests.builds
+++ b/src/libraries/System.Xml.ReaderWriter/tests/System.Xml.ReaderWriter.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Xml.XDocument/pkg/System.Xml.XDocument.builds b/src/libraries/System.Xml.XDocument/pkg/System.Xml.XDocument.builds
index 52b338f7688eba262317956b6015d0ae5a5ba6ab..a44c6dbd27e78b6978947193dfc8c7b8eb3f679b 100644
--- a/src/libraries/System.Xml.XDocument/pkg/System.Xml.XDocument.builds
+++ b/src/libraries/System.Xml.XDocument/pkg/System.Xml.XDocument.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Xml.XDocument/pkg/System.Xml.XDocument.pkgproj b/src/libraries/System.Xml.XDocument/pkg/System.Xml.XDocument.pkgproj
index 02327217eefbb994c2d1d9cfafef791296cdc9df..7548281588d6d0c517b640beaa2dbcb9afa5dc3c 100644
--- a/src/libraries/System.Xml.XDocument/pkg/System.Xml.XDocument.pkgproj
+++ b/src/libraries/System.Xml.XDocument/pkg/System.Xml.XDocument.pkgproj
@@ -3,7 +3,7 @@
- net463;netcoreapp1.1;$(AllXamarinFrameworks)
+ net463;netcoreapp2.0;$(AllXamarinFrameworks)
diff --git a/src/libraries/System.Xml.XDocument/ref/Configurations.props b/src/libraries/System.Xml.XDocument/ref/Configurations.props
index 33939fe0896f469d5ba9456aa097e08ebd903daa..77a4b65bc94a425ce217a1e6878bb6f236cf8abc 100644
--- a/src/libraries/System.Xml.XDocument/ref/Configurations.props
+++ b/src/libraries/System.Xml.XDocument/ref/Configurations.props
@@ -1,9 +1,9 @@
-
+
- netstandard;
- netcoreapp;
+ netstandard;
+ netcoreapp;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Xml.XDocument/ref/System.Xml.XDocument.csproj b/src/libraries/System.Xml.XDocument/ref/System.Xml.XDocument.csproj
index 412c6c3bb5802d8ef9a138a2964239d3cdc3ac5a..710ca6b66a33de49796ab2f8da89bb6f60bdf5ea 100644
--- a/src/libraries/System.Xml.XDocument/ref/System.Xml.XDocument.csproj
+++ b/src/libraries/System.Xml.XDocument/ref/System.Xml.XDocument.csproj
@@ -1,4 +1,4 @@
-
+
@@ -15,4 +15,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Xml.XDocument/src/Configurations.props b/src/libraries/System.Xml.XDocument/src/Configurations.props
index 9c336c0be9e52171e2fecf14214e3373be07177d..dc837f915219bcf7ff5c38f67e01c45d5b976485 100644
--- a/src/libraries/System.Xml.XDocument/src/Configurations.props
+++ b/src/libraries/System.Xml.XDocument/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Xml.XDocument/tests/System.Xml.XDocument.Tests.builds b/src/libraries/System.Xml.XDocument/tests/System.Xml.XDocument.Tests.builds
index 58540c8539077e7ed1cecb3def2f355e227c8718..d752dd91b51ba9c277f403abda1c72a126b17591 100644
--- a/src/libraries/System.Xml.XDocument/tests/System.Xml.XDocument.Tests.builds
+++ b/src/libraries/System.Xml.XDocument/tests/System.Xml.XDocument.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Xml.XPath.XDocument/pkg/System.Xml.XPath.XDocument.builds b/src/libraries/System.Xml.XPath.XDocument/pkg/System.Xml.XPath.XDocument.builds
index a151e0b90fb4407e58d2fbe1aab1a2b20d5b94bf..4901a86ebf09594716e9c19b6d3d4db356d2c28d 100644
--- a/src/libraries/System.Xml.XPath.XDocument/pkg/System.Xml.XPath.XDocument.builds
+++ b/src/libraries/System.Xml.XPath.XDocument/pkg/System.Xml.XPath.XDocument.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Xml.XPath.XDocument/pkg/System.Xml.XPath.XDocument.pkgproj b/src/libraries/System.Xml.XPath.XDocument/pkg/System.Xml.XPath.XDocument.pkgproj
index 41cf0c002906eed3cff7a18c1c7c5dbe839ca62b..cabdedd84f3315b598ee9c55faa1f07af09cf4d2 100644
--- a/src/libraries/System.Xml.XPath.XDocument/pkg/System.Xml.XPath.XDocument.pkgproj
+++ b/src/libraries/System.Xml.XPath.XDocument/pkg/System.Xml.XPath.XDocument.pkgproj
@@ -1,9 +1,9 @@
-
+
- net463;netcoreapp1.1;$(AllXamarinFrameworks)
+ net463;netcoreapp2.0;$(AllXamarinFrameworks)
diff --git a/src/libraries/System.Xml.XPath.XDocument/ref/System.Xml.XPath.XDocument.csproj b/src/libraries/System.Xml.XPath.XDocument/ref/System.Xml.XPath.XDocument.csproj
index 4350855048709e075c678b1af1347e59988705fd..d5ae3c3e1d239e4de20444cac800db3d323e31dd 100644
--- a/src/libraries/System.Xml.XPath.XDocument/ref/System.Xml.XPath.XDocument.csproj
+++ b/src/libraries/System.Xml.XPath.XDocument/ref/System.Xml.XPath.XDocument.csproj
@@ -1,4 +1,4 @@
-
+
@@ -12,4 +12,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Xml.XPath.XDocument/src/Configurations.props b/src/libraries/System.Xml.XPath.XDocument/src/Configurations.props
index 9c336c0be9e52171e2fecf14214e3373be07177d..dc837f915219bcf7ff5c38f67e01c45d5b976485 100644
--- a/src/libraries/System.Xml.XPath.XDocument/src/Configurations.props
+++ b/src/libraries/System.Xml.XPath.XDocument/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Xml.XPath.XDocument/tests/System.Xml.XPath.XDocument.Tests.builds b/src/libraries/System.Xml.XPath.XDocument/tests/System.Xml.XPath.XDocument.Tests.builds
index 58540c8539077e7ed1cecb3def2f355e227c8718..d752dd91b51ba9c277f403abda1c72a126b17591 100644
--- a/src/libraries/System.Xml.XPath.XDocument/tests/System.Xml.XPath.XDocument.Tests.builds
+++ b/src/libraries/System.Xml.XPath.XDocument/tests/System.Xml.XPath.XDocument.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Xml.XPath.XmlDocument/pkg/System.Xml.XPath.XmlDocument.builds b/src/libraries/System.Xml.XPath.XmlDocument/pkg/System.Xml.XPath.XmlDocument.builds
index 3eb71cc19fbc6f9ce04faefd5cd5d5726dbb3e7f..a2b7f9d987aa914db4f8b8a7cba0d87b043b9c5b 100644
--- a/src/libraries/System.Xml.XPath.XmlDocument/pkg/System.Xml.XPath.XmlDocument.builds
+++ b/src/libraries/System.Xml.XPath.XmlDocument/pkg/System.Xml.XPath.XmlDocument.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Xml.XPath.XmlDocument/pkg/System.Xml.XPath.XmlDocument.pkgproj b/src/libraries/System.Xml.XPath.XmlDocument/pkg/System.Xml.XPath.XmlDocument.pkgproj
index ded2e805d2c93a03468737b005ffae9acba38388..667eb9873ddd3f4cd67c2dd38ea1d570c201ce84 100644
--- a/src/libraries/System.Xml.XPath.XmlDocument/pkg/System.Xml.XPath.XmlDocument.pkgproj
+++ b/src/libraries/System.Xml.XPath.XmlDocument/pkg/System.Xml.XPath.XmlDocument.pkgproj
@@ -1,9 +1,9 @@
-
+
- net461;netcoreapp1.1;$(AllXamarinFrameworks)
+ net461;netcoreapp2.0;$(AllXamarinFrameworks)
diff --git a/src/libraries/System.Xml.XPath.XmlDocument/ref/System.Xml.XPath.XmlDocument.csproj b/src/libraries/System.Xml.XPath.XmlDocument/ref/System.Xml.XPath.XmlDocument.csproj
index 24b6327b315aea2e23b1292e4a7bdd12b23639ec..6e0f1014cc711c0808f0a4b57d45ce52a864acfa 100644
--- a/src/libraries/System.Xml.XPath.XmlDocument/ref/System.Xml.XPath.XmlDocument.csproj
+++ b/src/libraries/System.Xml.XPath.XmlDocument/ref/System.Xml.XPath.XmlDocument.csproj
@@ -1,4 +1,4 @@
-
+
@@ -11,4 +11,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Xml.XPath.XmlDocument/src/Configurations.props b/src/libraries/System.Xml.XPath.XmlDocument/src/Configurations.props
index 53b62c64fea2475e524eb32a20b028ea109d4d41..bcfec4bbde61fa2877a42ca2e87056c258cd6c09 100644
--- a/src/libraries/System.Xml.XPath.XmlDocument/src/Configurations.props
+++ b/src/libraries/System.Xml.XPath.XmlDocument/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Xml.XPath.XmlDocument/tests/System.Xml.XPath.XmlDocument.Tests.builds b/src/libraries/System.Xml.XPath.XmlDocument/tests/System.Xml.XPath.XmlDocument.Tests.builds
index 58540c8539077e7ed1cecb3def2f355e227c8718..d752dd91b51ba9c277f403abda1c72a126b17591 100644
--- a/src/libraries/System.Xml.XPath.XmlDocument/tests/System.Xml.XPath.XmlDocument.Tests.builds
+++ b/src/libraries/System.Xml.XPath.XmlDocument/tests/System.Xml.XPath.XmlDocument.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Xml.XPath/pkg/System.Xml.XPath.builds b/src/libraries/System.Xml.XPath/pkg/System.Xml.XPath.builds
index 3846d30b3694c7e9baabfe180aca4c815357e8c9..53fbdec9d29c395c4d8f584c6188fc60e28c758d 100644
--- a/src/libraries/System.Xml.XPath/pkg/System.Xml.XPath.builds
+++ b/src/libraries/System.Xml.XPath/pkg/System.Xml.XPath.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Xml.XPath/pkg/System.Xml.XPath.pkgproj b/src/libraries/System.Xml.XPath/pkg/System.Xml.XPath.pkgproj
index 1ec6d0ca9770e673f7a19f44af68beaaeb886d41..5bb6fefa389446ba5ca14667496b2787f58a4992 100644
--- a/src/libraries/System.Xml.XPath/pkg/System.Xml.XPath.pkgproj
+++ b/src/libraries/System.Xml.XPath/pkg/System.Xml.XPath.pkgproj
@@ -1,9 +1,9 @@
-
+
- net463;netcoreapp1.1;$(AllXamarinFrameworks)
+ net463;netcoreapp2.0;$(AllXamarinFrameworks)
diff --git a/src/libraries/System.Xml.XPath/ref/System.Xml.XPath.csproj b/src/libraries/System.Xml.XPath/ref/System.Xml.XPath.csproj
index 68b8a812ea381809ec6915a9100a102688f41bfb..b0f2f3f4d3fe685b8ecfba09af8f0a8937750ca8 100644
--- a/src/libraries/System.Xml.XPath/ref/System.Xml.XPath.csproj
+++ b/src/libraries/System.Xml.XPath/ref/System.Xml.XPath.csproj
@@ -1,4 +1,4 @@
-
+
@@ -11,4 +11,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Xml.XPath/src/Configurations.props b/src/libraries/System.Xml.XPath/src/Configurations.props
index 9c336c0be9e52171e2fecf14214e3373be07177d..dc837f915219bcf7ff5c38f67e01c45d5b976485 100644
--- a/src/libraries/System.Xml.XPath/src/Configurations.props
+++ b/src/libraries/System.Xml.XPath/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Xml.XPath/tests/System.Xml.XPath.Tests.builds b/src/libraries/System.Xml.XPath/tests/System.Xml.XPath.Tests.builds
index 58540c8539077e7ed1cecb3def2f355e227c8718..d752dd91b51ba9c277f403abda1c72a126b17591 100644
--- a/src/libraries/System.Xml.XPath/tests/System.Xml.XPath.Tests.builds
+++ b/src/libraries/System.Xml.XPath/tests/System.Xml.XPath.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Xml.XmlDocument/pkg/System.Xml.XmlDocument.builds b/src/libraries/System.Xml.XmlDocument/pkg/System.Xml.XmlDocument.builds
index 75ec8b9c683b3bf168addbf58b6636eb5e9a0663..046353f98f914f17db78a957435c1b9dc89331c8 100644
--- a/src/libraries/System.Xml.XmlDocument/pkg/System.Xml.XmlDocument.builds
+++ b/src/libraries/System.Xml.XmlDocument/pkg/System.Xml.XmlDocument.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Xml.XmlDocument/pkg/System.Xml.XmlDocument.pkgproj b/src/libraries/System.Xml.XmlDocument/pkg/System.Xml.XmlDocument.pkgproj
index 7021945e9f8022923f42fcbc5c15b3c41456e6b8..5cc9994e4ff6e93cca80f1d067a072426996a49d 100644
--- a/src/libraries/System.Xml.XmlDocument/pkg/System.Xml.XmlDocument.pkgproj
+++ b/src/libraries/System.Xml.XmlDocument/pkg/System.Xml.XmlDocument.pkgproj
@@ -1,9 +1,9 @@
-
+
- net463;netcoreapp1.1;$(AllXamarinFrameworks)
+ net463;netcoreapp2.0;$(AllXamarinFrameworks)
diff --git a/src/libraries/System.Xml.XmlDocument/ref/System.Xml.XmlDocument.csproj b/src/libraries/System.Xml.XmlDocument/ref/System.Xml.XmlDocument.csproj
index cb12427f19328118783697be132fd89e1ba50438..416147f38e095cfae4da6b3bd02fbb1eb1853b2a 100644
--- a/src/libraries/System.Xml.XmlDocument/ref/System.Xml.XmlDocument.csproj
+++ b/src/libraries/System.Xml.XmlDocument/ref/System.Xml.XmlDocument.csproj
@@ -1,4 +1,4 @@
-
+
@@ -9,4 +9,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Xml.XmlDocument/src/Configurations.props b/src/libraries/System.Xml.XmlDocument/src/Configurations.props
index 9c336c0be9e52171e2fecf14214e3373be07177d..dc837f915219bcf7ff5c38f67e01c45d5b976485 100644
--- a/src/libraries/System.Xml.XmlDocument/src/Configurations.props
+++ b/src/libraries/System.Xml.XmlDocument/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Xml.XmlDocument/tests/System.Xml.XmlDocument.Tests.builds b/src/libraries/System.Xml.XmlDocument/tests/System.Xml.XmlDocument.Tests.builds
index 58540c8539077e7ed1cecb3def2f355e227c8718..d752dd91b51ba9c277f403abda1c72a126b17591 100644
--- a/src/libraries/System.Xml.XmlDocument/tests/System.Xml.XmlDocument.Tests.builds
+++ b/src/libraries/System.Xml.XmlDocument/tests/System.Xml.XmlDocument.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/System.Xml.XmlSerializer/pkg/System.Xml.XmlSerializer.builds b/src/libraries/System.Xml.XmlSerializer/pkg/System.Xml.XmlSerializer.builds
index 28d784f72d8bf85e416a6e3b194bfb686440fb1d..d2fb014ecfd270523d97694399c3fed7920f7a33 100644
--- a/src/libraries/System.Xml.XmlSerializer/pkg/System.Xml.XmlSerializer.builds
+++ b/src/libraries/System.Xml.XmlSerializer/pkg/System.Xml.XmlSerializer.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Xml.XmlSerializer/pkg/System.Xml.XmlSerializer.pkgproj b/src/libraries/System.Xml.XmlSerializer/pkg/System.Xml.XmlSerializer.pkgproj
index 933cc4026bf73f7fe9b9912d802089762d01ae31..6c5cc158bb8a251dfd1ba37d0e800be5fb029063 100644
--- a/src/libraries/System.Xml.XmlSerializer/pkg/System.Xml.XmlSerializer.pkgproj
+++ b/src/libraries/System.Xml.XmlSerializer/pkg/System.Xml.XmlSerializer.pkgproj
@@ -3,7 +3,7 @@
- net463;netcoreapp1.1;$(AllXamarinFrameworks)
+ net463;netcoreapp2.0;$(AllXamarinFrameworks)
diff --git a/src/libraries/System.Xml.XmlSerializer/ref/System.Xml.XmlSerializer.csproj b/src/libraries/System.Xml.XmlSerializer/ref/System.Xml.XmlSerializer.csproj
index 83187fda0479082d88be4b8b05ad0c9afa504023..2f2445268df188bd7d36a2bd4061070ba189f9fa 100644
--- a/src/libraries/System.Xml.XmlSerializer/ref/System.Xml.XmlSerializer.csproj
+++ b/src/libraries/System.Xml.XmlSerializer/ref/System.Xml.XmlSerializer.csproj
@@ -1,4 +1,4 @@
-
+
@@ -15,4 +15,4 @@
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Xml.XmlSerializer/src/Configurations.props b/src/libraries/System.Xml.XmlSerializer/src/Configurations.props
index 9c336c0be9e52171e2fecf14214e3373be07177d..dc837f915219bcf7ff5c38f67e01c45d5b976485 100644
--- a/src/libraries/System.Xml.XmlSerializer/src/Configurations.props
+++ b/src/libraries/System.Xml.XmlSerializer/src/Configurations.props
@@ -1,4 +1,4 @@
-
+
@@ -6,4 +6,4 @@
netstandard;
-
+
\ No newline at end of file
diff --git a/src/libraries/System.Xml.XmlSerializer/tests/System.Xml.XmlSerializer.Tests.builds b/src/libraries/System.Xml.XmlSerializer/tests/System.Xml.XmlSerializer.Tests.builds
index 58540c8539077e7ed1cecb3def2f355e227c8718..d752dd91b51ba9c277f403abda1c72a126b17591 100644
--- a/src/libraries/System.Xml.XmlSerializer/tests/System.Xml.XmlSerializer.Tests.builds
+++ b/src/libraries/System.Xml.XmlSerializer/tests/System.Xml.XmlSerializer.Tests.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/Tools/CoreFx.Tools/CoreFx.Tools.builds b/src/libraries/Tools/CoreFx.Tools/CoreFx.Tools.builds
index 4f6bd85184216ddbaf9710cfbc725a86cc1bc64c..078f8f3531ed54b8d6e7b1f7683d2ce3b0dd06f9 100644
--- a/src/libraries/Tools/CoreFx.Tools/CoreFx.Tools.builds
+++ b/src/libraries/Tools/CoreFx.Tools/CoreFx.Tools.builds
@@ -1,4 +1,4 @@
-
+
@@ -8,5 +8,4 @@
-
-
+
\ No newline at end of file
diff --git a/src/libraries/Tools/CoreFx.Tools/project.json b/src/libraries/Tools/CoreFx.Tools/project.json
index 947ee2d4e079062b91775307c8e7f575f2d55826..a8c8d252d0fd7b8ca8deaa782a7f4d7a9cd966a2 100644
--- a/src/libraries/Tools/CoreFx.Tools/project.json
+++ b/src/libraries/Tools/CoreFx.Tools/project.json
@@ -1,4 +1,4 @@
-{
+{
"dependencies": {
"Microsoft.DotNet.PlatformAbstractions": "1.2.0-beta-001090",
"NETStandard.Library": "1.6.0"
@@ -15,7 +15,10 @@
"exclude": "all"
}
},
- "imports": [ "dnxcore50", "portable-net45+win8+wpa81" ]
+ "imports": [
+ "dnxcore50",
+ "portable-net45+win8+wpa81"
+ ]
},
"net45": {
"dependencies": {
diff --git a/src/libraries/Tools/tools.builds b/src/libraries/Tools/tools.builds
index 86086037f1c492375c782d6444d55cde23c8de7f..c1b247146ad7f29c77722b5912acfb0373c8ad5d 100644
--- a/src/libraries/Tools/tools.builds
+++ b/src/libraries/Tools/tools.builds
@@ -1,4 +1,4 @@
-
+
diff --git a/src/libraries/mscorlib.WinRT-Facade/mscorlib.WinRT-Facade.builds b/src/libraries/mscorlib.WinRT-Facade/mscorlib.WinRT-Facade.builds
index ea501d91bb9a40b8ef1803c81801a53f2887e73d..60bb1873ba515ff6b76d9fd796bce1ae91949646 100644
--- a/src/libraries/mscorlib.WinRT-Facade/mscorlib.WinRT-Facade.builds
+++ b/src/libraries/mscorlib.WinRT-Facade/mscorlib.WinRT-Facade.builds
@@ -1,9 +1,8 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/libraries/mscorlib.WinRT-Facade/project.json b/src/libraries/mscorlib.WinRT-Facade/project.json
index 9673cb677d6f4a1afad339e009e91ec9a2f3d548..6cd2e5b33ad2c6a63b5633520db17158fba04775 100644
--- a/src/libraries/mscorlib.WinRT-Facade/project.json
+++ b/src/libraries/mscorlib.WinRT-Facade/project.json
@@ -5,4 +5,4 @@
"frameworks": {
"netcore50": {}
}
-}
\ No newline at end of file
+}