From 5a74e8768605fa8cf08652b1c99d94f70c594575 Mon Sep 17 00:00:00 2001 From: dotnet-bot Date: Tue, 9 Feb 2016 14:20:02 -0800 Subject: [PATCH 1/5] Adds custom xplat nuget that can restore from VSTS feed, adds the VSTS feed, and upgrades project.jsons throughout NDP\FxCore to pass new nuget compatability checks. Some fixes (adding imports, adding Platforms package) were tooled, but more complex ones (forking project.jsons, editing csproj's) were not. Also makes dependency version validation rules case-insensitive. (I used this fix to update the versions of some packages.) [tfs-changeset: 1573868] --- build.proj | 14 +++++-- dir.props | 37 ++++++++++++------- .../lib/netcore50/project.json | 13 +++++++ .../System.Collections/lib/project.json | 9 +---- .../lib/netcore50/project.json | 13 +++++++ .../lib/project.json | 10 ++--- .../lib/netcore50/project.json | 13 +++++++ .../System.Dynamic.Runtime/lib/project.json | 10 ++--- .../System.IO/lib/netcore50/project.json | 13 +++++++ pkg/redist/System.IO/lib/project.json | 10 ++--- .../lib/netcore50/project.json | 13 +++++++ .../System.Linq.Expressions/lib/project.json | 10 ++--- .../lib/netcore50/project.json | 13 +++++++ .../lib/project.json | 10 ++--- .../lib/netcore50/project.json | 13 +++++++ .../lib/project.json | 10 ++--- .../lib/netcore50/project.json | 13 +++++++ .../lib/project.json | 10 ++--- .../lib/netcore50/project.json | 13 +++++++ .../lib/project.json | 10 ++--- .../lib/netcore50/project.json | 13 +++++++ .../lib/project.json | 9 +---- .../System.Runtime/lib/netcore50/project.json | 13 +++++++ pkg/redist/System.Runtime/lib/project.json | 9 +---- pkg/redist/dir.props | 4 ++ .../RemoteExecutorConsoleApp/project.json | 1 + .../tests/System/Xml/ModuleCore/project.json | 9 +++-- .../tests/System/Xml/XmlCoreTest/project.json | 11 +++--- .../tests/System/Xml/XmlDiff/project.json | 9 +++-- src/Common/tests/project.json | 1 + src/Microsoft.CSharp/src/project.json | 3 +- src/Microsoft.CSharp/tests/project.json | 7 +++- src/Microsoft.VisualBasic/tests/project.json | 7 +++- .../src/facade/project.json | 2 +- .../src/project.json | 3 +- .../tests/project.json | 1 + .../src/project.json | 5 ++- .../tests/project.json | 7 +++- .../src/facade/project.json | 2 +- src/Microsoft.Win32.Registry/src/project.json | 3 +- .../tests/project.json | 1 + src/NuGet.config | 1 - .../InterProcessCommunication/project.json | 1 + .../src/netcore50/project.json | 18 +++++++++ src/System.AppContext/src/project.json | 11 +----- src/System.AppContext/tests/project.json | 3 +- src/System.Buffers/src/project.json | 1 + src/System.Buffers/tests/project.json | 1 + .../src/facade/project.json | 2 +- .../src/project.json | 9 +++-- .../tests/project.json | 1 + .../tests/project.json | 1 + .../src/facade/project.json | 2 +- .../src/project.json | 3 +- .../tests/project.json | 1 + .../src/facade/project.json | 2 +- .../src/project.json | 3 +- .../tests/project.json | 1 + src/System.Collections/src/project.json | 8 ++-- src/System.Collections/tests/project.json | 1 + .../System.ComponentModel.Annotations.csproj | 1 + .../src/project.json | 2 +- .../tests/project.json | 1 + .../src/facade/project.json | 2 +- .../src/project.json | 3 +- .../tests/project.json | 1 + .../System.ComponentModel.Primitives.csproj | 1 + .../src/project.json | 2 +- .../tests/project.json | 1 + ...System.ComponentModel.TypeConverter.csproj | 1 + .../src/project.json | 2 +- .../tests/project.json | 1 + .../src/facade/project.json | 2 +- src/System.ComponentModel/tests/project.json | 1 + .../tests/project.json | 1 + src/System.Composition/perftests/project.json | 1 + src/System.Composition/tests/project.json | 1 + src/System.Console/src/facade/project.json | 2 +- src/System.Console/src/project.json | 3 +- src/System.Console/tests/project.json | 1 + src/System.Data.Common/src/project.json | 5 ++- src/System.Data.Common/tests/project.json | 11 ++++-- .../src/facade/project.json | 2 +- src/System.Data.SqlClient/src/project.json | 9 +++-- src/System.Data.SqlClient/tests/project.json | 1 + .../src/project.json | 2 +- .../tests/project.json | 1 + src/System.Diagnostics.Debug/src/project.json | 2 +- .../tests/project.json | 1 + .../src/project.json | 7 ++-- .../tests/project.json | 1 + .../src/facade/project.json | 2 +- .../src/project.json | 3 +- .../project.json | 1 + .../src/System.Diagnostics.Process.csproj | 1 + .../src/project.json | 4 +- .../tests/project.json | 3 +- .../src/project.json | 2 +- .../src/facade/project.json | 2 +- .../src/project.json | 1 + .../tests/project.json | 1 + src/System.Diagnostics.Tools/src/project.json | 2 +- .../tests/project.json | 1 + .../src/facade/project.json | 2 +- .../src/project.json | 3 +- .../tests/project.json | 1 + .../src/project.json | 4 +- .../tests/BasicEventSourceTest/project.json | 3 +- .../tests/project.json | 13 ++++--- .../src/project.json | 7 ++-- .../tests/project.json | 20 +++++----- .../src/System.Dynamic.Runtime.csproj | 5 ++- .../{netcore50aot => netcore50}/project.json | 3 +- src/System.Dynamic.Runtime/src/project.json | 5 ++- src/System.Dynamic.Runtime/tests/project.json | 1 + .../src/project.json | 2 +- .../tests/project.json | 5 ++- .../System.Globalization.Extensions.csproj | 1 + .../src/project.json | 2 +- .../tests/project.json | 1 + src/System.Globalization/src/project.json | 2 +- src/System.Globalization/tests/project.json | 1 + .../src/project.json | 3 +- .../tests/project.json | 1 + src/System.IO.Compression/src/project.json | 3 +- src/System.IO.Compression/tests/project.json | 1 + .../System.IO.FileSystem.AccessControl.csproj | 1 + .../src/project.json | 2 +- .../tests/project.json | 5 ++- .../src/facade/project.json | 2 +- .../src/project.json | 3 +- .../tests/project.json | 1 + .../src/facade/project.json | 2 +- .../tests/project.json | 1 + .../src/facade/project.json | 2 +- .../src/project.json | 1 + .../tests/project.json | 1 + .../src/facade/project.json | 2 +- .../src/netcore50/project.json | 37 +++++++++++++++++++ src/System.IO.FileSystem/src/project.json | 12 +----- src/System.IO.FileSystem/tests/project.json | 3 +- .../src/project.json | 7 +++- .../src/facade/project.json | 2 +- .../src/project.json | 3 +- .../tests/project.json | 1 + .../src/System.IO.Packaging.csproj | 1 + src/System.IO.Packaging/src/project.json | 2 +- src/System.IO.Packaging/tests/project.json | 3 +- src/System.IO.Pipes/src/facade/project.json | 2 +- src/System.IO.Pipes/src/project.json | 1 + src/System.IO.Pipes/tests/project.json | 3 +- .../src/facade/project.json | 2 +- .../src/project.json | 1 + .../tests/project.json | 1 + src/System.IO/src/project.json | 8 ++-- src/System.IO/tests/project.json | 3 +- .../src/Facade/project.json | 2 +- .../src/System.Linq.Expressions.csproj | 5 ++- .../{netcore50aot => netcore50}/project.json | 4 ++ src/System.Linq.Expressions/src/project.json | 12 +++--- .../tests/project.json | 1 + .../src/facade/project.json | 2 +- src/System.Linq.Parallel/src/project.json | 19 +++++----- src/System.Linq.Parallel/tests/project.json | 1 + .../src/facade/project.json | 2 +- src/System.Linq.Queryable/src/project.json | 3 +- src/System.Linq.Queryable/tests/project.json | 1 + src/System.Linq/src/facade/project.json | 2 +- src/System.Linq/src/project.json | 3 +- src/System.Linq/tests/project.json | 5 ++- .../src/netcore50/project.json | 15 ++++++++ src/System.Net.Http.Rtc/src/project.json | 10 ----- .../src/project.json | 1 + .../tests/FunctionalTests/project.json | 1 + .../tests/UnitTests/project.json | 1 + .../src/System.Net.Http.csproj | 4 ++ .../src/netcore50/project.json | 24 ++++++++++++ src/System.Net.Http/src/project.json | 19 +--------- src/System.Net.Http/src/unix/project.json | 29 +++++++++++++++ .../tests/FunctionalTests/project.json | 1 + .../tests/UnitTests/project.json | 1 + .../src/netcore50/project.json | 28 ++++++++++++++ .../src/project.json | 23 +----------- .../tests/FunctionalTests/project.json | 3 +- .../tests/PalTests/project.json | 25 +++++++------ .../src/netcore50/project.json | 17 +++++++++ .../src/project.json | 11 +----- .../tests/FunctionalTests/project.json | 1 + .../tests/UnitTests/project.json | 1 + src/System.Net.Ping/src/facade/project.json | 2 +- src/System.Net.Ping/src/project.json | 3 +- .../tests/FunctionalTests/project.json | 3 +- .../src/netcore50/project.json | 29 +++++++++++++++ src/System.Net.Primitives/src/project.json | 27 ++------------ .../tests/FunctionalTests/project.json | 1 + .../tests/PalTests/project.json | 1 + .../tests/UnitTests/project.json | 3 +- .../src/facade/project.json | 2 +- src/System.Net.Requests/src/project.json | 5 ++- src/System.Net.Requests/tests/project.json | 3 +- .../src/facade/project.json | 2 +- src/System.Net.Security/src/unix/project.json | 11 ++++-- src/System.Net.Security/src/win/project.json | 7 ++-- .../tests/FunctionalTests/unix/project.json | 3 +- .../tests/FunctionalTests/win/project.json | 3 +- .../tests/UnitTests/project.json | 1 + .../tests/FunctionalTests/project.json | 3 +- .../tests/PerformanceTests/project.json | 1 + .../src/netcore50/project.json | 32 ++++++++++++++++ src/System.Net.Sockets/src/project.json | 32 ++-------------- .../tests/FunctionalTests/project.json | 1 + .../tests/PerformanceTests/project.json | 1 + .../src/facade/project.json | 2 +- .../src/project.json | 3 +- .../tests/project.json | 1 + .../src/facade/project.json | 2 +- .../src/netcore50/project.json | 27 ++++++++++++++ .../src/project.json | 19 +--------- .../tests/project.json | 1 + .../src/facade/project.json | 2 +- src/System.Net.WebSockets/src/project.json | 3 +- src/System.Net.WebSockets/tests/project.json | 1 + .../src/project.json | 9 ++++- .../ref/4.0.0/project.json | 4 +- .../src/System.Numerics.Vectors.csproj | 1 + src/System.Numerics.Vectors/src/project.json | 2 +- .../tests/project.json | 13 ++++--- .../src/facade/project.json | 2 +- src/System.ObjectModel/src/project.json | 11 +++--- src/System.ObjectModel/tests/project.json | 3 +- .../src/netcore50aot/project.json | 37 +++++++++++++++++++ .../src/project.json | 29 +-------------- .../src/System.Private.Uri.csproj | 1 + .../tests/project.json | 9 +++-- .../src/project.json | 3 +- .../tests/project.json | 1 + .../src/project.json | 2 +- .../tests/project.json | 9 +++-- .../src/project.json | 2 +- .../tests/project.json | 3 +- src/System.Reflection.Emit/src/project.json | 2 +- src/System.Reflection.Emit/tests/project.json | 9 +++-- .../src/project.json | 4 +- .../tests/project.json | 5 ++- .../src/project.json | 21 ++++++----- .../tests/project.json | 1 + .../src/System.Reflection.Primitives.csproj | 1 + .../src/project.json | 4 +- .../src/project.json | 8 ++-- .../tests/CoreCLR/project.json | 1 + .../tests/project.json | 1 + src/System.Reflection/src/project.json | 2 +- .../tests/CoreCLR/project.json | 1 + .../tests/TestExe/project.json | 1 + src/System.Reflection/tests/project.json | 1 + src/System.Resources.Reader/src/project.json | 3 +- .../tests/project.json | 1 + .../src/facade/project.json | 2 +- .../src/project.json | 3 +- .../tests/project.json | 1 + .../src/netcore50aot/project.json | 5 ++- .../src/project.json | 2 +- .../tests/project.json | 1 + src/System.Resources.Writer/src/project.json | 3 +- .../tests/project.json | 1 + .../src/project.json | 2 +- .../src/project.json | 4 +- .../tests/project.json | 5 ++- src/System.Runtime.Handles/src/project.json | 2 +- src/System.Runtime.Handles/tests/project.json | 1 + .../src/project.json | 2 +- .../tests/project.json | 1 + .../src/project.json | 11 +++--- .../tests/project.json | 3 +- ...time.InteropServices.WindowsRuntime.csproj | 1 + .../src/project.json | 2 +- .../src/project.json | 2 +- .../tests/project.json | 1 + .../tests/DefaultContext/project.json | 3 +- src/System.Runtime.Loader/tests/project.json | 3 +- .../src/facade/project.json | 2 +- src/System.Runtime.Numerics/src/project.json | 15 ++++---- .../tests/project.json | 1 + .../src/project.json | 2 +- .../tests/project.json | 1 + ...em.Runtime.Serialization.Primitives.csproj | 1 + .../src/project.json | 2 +- .../src/project.json | 2 +- .../tests/project.json | 1 + .../ref/project.json | 2 +- .../src/System.Runtime.WindowsRuntime.csproj | 1 + .../src/netcore50aot/project.json | 28 ++++++++++++++ .../src/project.json | 21 +---------- src/System.Runtime/src/project.json | 2 +- src/System.Runtime/tests/project.json | 1 + .../src/System.Security.AccessControl.csproj | 1 + .../src/project.json | 4 +- .../src/System.Security.Claims.csproj | 1 + src/System.Security.Claims/src/project.json | 2 +- src/System.Security.Claims/tests/project.json | 7 +++- ...em.Security.Cryptography.Algorithms.csproj | 1 + .../src/project.json | 2 +- .../tests/project.json | 1 + .../src/facade/project.json | 2 +- .../src/project.json | 1 + .../tests/project.json | 1 + .../src/facade/project.json | 2 +- .../src/project.json | 1 + .../tests/project.json | 1 + .../src/facade/project.json | 2 +- .../src/project.json | 1 + .../tests/project.json | 1 + .../src/project.json | 3 +- .../tests/project.json | 1 + .../src/facade/project.json | 2 +- .../src/project.json | 5 ++- .../tests/project.json | 1 + .../src/net461/project.json | 2 +- .../src/netcore50/project.json | 6 ++- .../src/unix/project.json | 5 +++ .../src/win/project.json | 1 + .../tests/project.json | 3 +- .../src/facade/project.json | 2 +- .../src/project.json | 3 +- .../tests/project.json | 1 + .../src/facade/project.json | 2 +- .../tests/project.json | 1 + .../src/facade/project.json | 2 +- .../src/project.json | 3 +- .../project.json | 1 + .../src/project.json | 11 +++--- .../tests/project.json | 1 + .../src/project.json | 2 +- .../tests/project.json | 1 + src/System.Text.Encoding/src/project.json | 2 +- src/System.Text.Encoding/tests/project.json | 3 +- .../src/project.json | 3 +- .../tests/project.json | 1 + .../src/facade/project.json | 2 +- .../src/project.json | 3 +- .../tests/project.json | 1 + .../src/System.Threading.AccessControl.csproj | 1 + .../src/project.json | 2 +- .../tests/project.json | 7 +++- .../src/System.Threading.Overlapped.csproj | 1 + .../src/project.json | 4 +- .../tests/project.json | 1 + .../tests/project.json | 1 + .../src/project.json | 3 +- .../tests/project.json | 3 +- .../src/facade/project.json | 2 +- .../src/project.json | 9 +++-- .../tests/project.json | 1 + src/System.Threading.Tasks/src/project.json | 2 +- src/System.Threading.Tasks/tests/project.json | 1 + src/System.Threading.Thread/src/project.json | 2 +- .../src/project.json | 2 +- src/System.Threading.Timer/src/project.json | 2 +- src/System.Threading.Timer/tests/project.json | 1 + src/System.Threading/src/project.json | 2 +- src/System.Threading/tests/project.json | 1 + .../src/facade/project.json | 2 +- src/System.Xml.ReaderWriter/src/project.json | 19 +++++----- .../Readers/CharCheckingReader/project.json | 3 +- .../tests/Readers/CustomReader/project.json | 3 +- .../tests/Readers/FactoryReader/project.json | 3 +- .../tests/Readers/NameTable/project.json | 5 ++- .../tests/Readers/ReaderSettings/project.json | 5 ++- .../tests/Readers/SubtreeReader/project.json | 3 +- .../tests/Readers/WrappedReader/project.json | 3 +- .../tests/Writers/RwFactory/project.json | 7 ++-- .../tests/Writers/XmlWriterApi/project.json | 7 ++-- .../tests/XmlConvert/project.json | 3 +- .../XmlReader/ReadContentAs/project.json | 3 +- .../tests/XmlReader/Tests/project.json | 3 +- .../tests/XmlReader/XmlResolver/project.json | 5 ++- .../tests/XmlReaderLib/project.json | 3 +- .../tests/XmlWriter/project.json | 3 +- .../src/facade/project.json | 2 +- .../tests/Properties/project.json | 9 +++-- .../tests/SDMSample/project.json | 9 +++-- .../tests/Streaming/project.json | 5 ++- .../tests/TreeManipulation/project.json | 7 ++-- .../tests/XDocument.Common/project.json | 9 +++-- .../XDocument.Test.ModuleCore/project.json | 9 +++-- .../tests/axes/project.json | 1 + .../tests/events/project.json | 3 +- .../tests/misc/project.json | 5 ++- .../tests/xNodeBuilder/project.json | 11 +++--- .../tests/xNodeReader/project.json | 7 ++-- .../src/System.Xml.XPath.XDocument.csproj | 1 + .../src/project.json | 2 +- .../tests/project.json | 1 + .../src/project.json | 3 +- .../tests/project.json | 1 + src/System.Xml.XPath/src/facade/project.json | 2 +- src/System.Xml.XPath/src/project.json | 15 ++++---- src/System.Xml.XPath/tests/project.json | 11 +++--- .../src/facade/project.json | 2 +- src/System.Xml.XmlDocument/src/project.json | 17 +++++---- src/System.Xml.XmlDocument/tests/project.json | 1 + .../src/facade/project.json | 2 +- .../tests/project.json | 3 +- 403 files changed, 1279 insertions(+), 702 deletions(-) create mode 100644 pkg/redist/System.Collections/lib/netcore50/project.json create mode 100644 pkg/redist/System.Diagnostics.Tracing/lib/netcore50/project.json create mode 100644 pkg/redist/System.Dynamic.Runtime/lib/netcore50/project.json create mode 100644 pkg/redist/System.IO/lib/netcore50/project.json create mode 100644 pkg/redist/System.Linq.Expressions/lib/netcore50/project.json create mode 100644 pkg/redist/System.Reflection.Extensions/lib/netcore50/project.json create mode 100644 pkg/redist/System.Reflection.Primitives/lib/netcore50/project.json create mode 100644 pkg/redist/System.Reflection.TypeExtensions/lib/netcore50/project.json create mode 100644 pkg/redist/System.Resources.ResourceManager/lib/netcore50/project.json create mode 100644 pkg/redist/System.Runtime.Extensions/lib/netcore50/project.json create mode 100644 pkg/redist/System.Runtime/lib/netcore50/project.json create mode 100644 src/System.AppContext/src/netcore50/project.json rename src/System.Dynamic.Runtime/src/{netcore50aot => netcore50}/project.json (93%) create mode 100644 src/System.IO.FileSystem/src/netcore50/project.json rename src/System.Linq.Expressions/src/{netcore50aot => netcore50}/project.json (81%) create mode 100644 src/System.Net.Http.Rtc/src/netcore50/project.json delete mode 100644 src/System.Net.Http.Rtc/src/project.json create mode 100644 src/System.Net.Http/src/netcore50/project.json create mode 100644 src/System.Net.Http/src/unix/project.json create mode 100644 src/System.Net.NameResolution/src/netcore50/project.json create mode 100644 src/System.Net.NetworkInformation/src/netcore50/project.json create mode 100644 src/System.Net.Primitives/src/netcore50/project.json create mode 100644 src/System.Net.Sockets/src/netcore50/project.json create mode 100644 src/System.Net.WebSockets.Client/src/netcore50/project.json create mode 100644 src/System.Private.DataContractSerialization/src/netcore50aot/project.json create mode 100644 src/System.Runtime.WindowsRuntime/src/netcore50aot/project.json diff --git a/build.proj b/build.proj index 9a4e59816563..4d35d10993af 100644 --- a/build.proj +++ b/build.proj @@ -57,9 +57,17 @@ ItemName="ExpandedDnuRestoreDir" /> - - - + + + diff --git a/dir.props b/dir.props index 2d2649935495..fa60c5c92f86 100644 --- a/dir.props +++ b/dir.props @@ -73,16 +73,16 @@ - + rc3-23808 - - 1.0.0 + + 1.0.1 - + 2.1.0 - + 1.0.0-prerelease-00123 @@ -99,19 +99,19 @@ - - + + - + - - - - - - + + + + + + @@ -129,11 +129,13 @@ $(DnuRestoreCommand) --parallel $(DnuRestoreCommand) --packages "$(PackagesDir.TrimEnd('/\'.ToCharArray()))" $(DnuRestoreSource) $(DnuRestoreCommand) --lock + $(DnuRestoreCommand) --configFile $(NuGetConfigPath) + @@ -354,6 +356,13 @@ + + + $(MSBuildProjectDirectory)/$(TargetGroup)/project.json + + $(MSBuildProjectDirectory)/$(TargetGroup)/project.lock.json + + win7-x64 diff --git a/pkg/redist/System.Collections/lib/netcore50/project.json b/pkg/redist/System.Collections/lib/netcore50/project.json new file mode 100644 index 000000000000..831a5dca51de --- /dev/null +++ b/pkg/redist/System.Collections/lib/netcore50/project.json @@ -0,0 +1,13 @@ +{ + "dependencies": { + "Microsoft.NETCore.Targets": "1.0.0", + "System.Collections": "4.0.10" + }, + "frameworks": { + "netcore50": {} + }, + "runtimes": { + "win8": {}, + "win8-aot": {} + } +} diff --git a/pkg/redist/System.Collections/lib/project.json b/pkg/redist/System.Collections/lib/project.json index 2c71505fbcab..eb0268f7d240 100644 --- a/pkg/redist/System.Collections/lib/project.json +++ b/pkg/redist/System.Collections/lib/project.json @@ -3,11 +3,6 @@ "System.Collections": "4.0.10" }, "frameworks": { - "dnxcore50": {}, - "netcore50": {} - }, - "runtimes": { - "win8": {}, - "win8-aot": {} + "dnxcore50": {} } -} \ No newline at end of file +} diff --git a/pkg/redist/System.Diagnostics.Tracing/lib/netcore50/project.json b/pkg/redist/System.Diagnostics.Tracing/lib/netcore50/project.json new file mode 100644 index 000000000000..68e32126eb2e --- /dev/null +++ b/pkg/redist/System.Diagnostics.Tracing/lib/netcore50/project.json @@ -0,0 +1,13 @@ +{ + "dependencies": { + "Microsoft.NETCore.Targets": "1.0.0", + "System.Diagnostics.Tracing": "4.0.20" + }, + "frameworks": { + "netcore50": {} + }, + "runtimes": { + "win8": {}, + "win8-aot": {} + } +} diff --git a/pkg/redist/System.Diagnostics.Tracing/lib/project.json b/pkg/redist/System.Diagnostics.Tracing/lib/project.json index 818cac47c1cd..01cbc9b261fd 100644 --- a/pkg/redist/System.Diagnostics.Tracing/lib/project.json +++ b/pkg/redist/System.Diagnostics.Tracing/lib/project.json @@ -1,13 +1,9 @@ { "dependencies": { + "Microsoft.NETCore.Targets": "1.0.0", "System.Diagnostics.Tracing": "4.0.20" }, "frameworks": { - "dnxcore50": {}, - "netcore50": {} - }, - "runtimes": { - "win8": {}, - "win8-aot": {} + "dnxcore50": {} } -} \ No newline at end of file +} diff --git a/pkg/redist/System.Dynamic.Runtime/lib/netcore50/project.json b/pkg/redist/System.Dynamic.Runtime/lib/netcore50/project.json new file mode 100644 index 000000000000..045f41632e19 --- /dev/null +++ b/pkg/redist/System.Dynamic.Runtime/lib/netcore50/project.json @@ -0,0 +1,13 @@ +{ + "dependencies": { + "Microsoft.NETCore.Targets": "1.0.0", + "System.Dynamic.Runtime": "4.0.10" + }, + "frameworks": { + "netcore50": {} + }, + "runtimes": { + "win8": {}, + "win8-aot": {} + } +} diff --git a/pkg/redist/System.Dynamic.Runtime/lib/project.json b/pkg/redist/System.Dynamic.Runtime/lib/project.json index 12c29a67810f..ade44e745d06 100644 --- a/pkg/redist/System.Dynamic.Runtime/lib/project.json +++ b/pkg/redist/System.Dynamic.Runtime/lib/project.json @@ -1,13 +1,9 @@ { "dependencies": { + "Microsoft.NETCore.Targets": "1.0.0", "System.Dynamic.Runtime": "4.0.10" }, "frameworks": { - "dnxcore50": {}, - "netcore50": {} - }, - "runtimes": { - "win8": {}, - "win8-aot": {} + "dnxcore50": {} } -} \ No newline at end of file +} diff --git a/pkg/redist/System.IO/lib/netcore50/project.json b/pkg/redist/System.IO/lib/netcore50/project.json new file mode 100644 index 000000000000..58dffdddcf22 --- /dev/null +++ b/pkg/redist/System.IO/lib/netcore50/project.json @@ -0,0 +1,13 @@ +{ + "dependencies": { + "Microsoft.NETCore.Targets": "1.0.0", + "System.IO": "4.0.10" + }, + "frameworks": { + "netcore50": {} + }, + "runtimes": { + "win8": {}, + "win8-aot": {} + } +} diff --git a/pkg/redist/System.IO/lib/project.json b/pkg/redist/System.IO/lib/project.json index 8901bf295ce0..1b7049203de1 100644 --- a/pkg/redist/System.IO/lib/project.json +++ b/pkg/redist/System.IO/lib/project.json @@ -1,13 +1,9 @@ { "dependencies": { + "Microsoft.NETCore.Targets": "1.0.0", "System.IO": "4.0.10" }, "frameworks": { - "dnxcore50": {}, - "netcore50": {} - }, - "runtimes": { - "win8": {}, - "win8-aot": {} + "dnxcore50": {} } -} \ No newline at end of file +} diff --git a/pkg/redist/System.Linq.Expressions/lib/netcore50/project.json b/pkg/redist/System.Linq.Expressions/lib/netcore50/project.json new file mode 100644 index 000000000000..a283cf121516 --- /dev/null +++ b/pkg/redist/System.Linq.Expressions/lib/netcore50/project.json @@ -0,0 +1,13 @@ +{ + "dependencies": { + "Microsoft.NETCore.Targets": "1.0.0", + "System.Linq.Expressions": "4.0.10" + }, + "frameworks": { + "netcore50": {} + }, + "runtimes": { + "win8": {}, + "win8-aot": {} + } +} diff --git a/pkg/redist/System.Linq.Expressions/lib/project.json b/pkg/redist/System.Linq.Expressions/lib/project.json index 9341f1589bc5..10deddb31e72 100644 --- a/pkg/redist/System.Linq.Expressions/lib/project.json +++ b/pkg/redist/System.Linq.Expressions/lib/project.json @@ -1,13 +1,9 @@ { "dependencies": { + "Microsoft.NETCore.Targets": "1.0.0", "System.Linq.Expressions": "4.0.10" }, "frameworks": { - "dnxcore50": {}, - "netcore50": {} - }, - "runtimes": { - "win8": {}, - "win8-aot": {} + "dnxcore50": {} } -} \ No newline at end of file +} diff --git a/pkg/redist/System.Reflection.Extensions/lib/netcore50/project.json b/pkg/redist/System.Reflection.Extensions/lib/netcore50/project.json new file mode 100644 index 000000000000..78e6afd48d67 --- /dev/null +++ b/pkg/redist/System.Reflection.Extensions/lib/netcore50/project.json @@ -0,0 +1,13 @@ +{ + "dependencies": { + "Microsoft.NETCore.Targets": "1.0.0", + "System.Reflection.Extensions": "4.0.0" + }, + "frameworks": { + "netcore50": {} + }, + "runtimes": { + "win8": {}, + "win8-aot": {} + } +} diff --git a/pkg/redist/System.Reflection.Extensions/lib/project.json b/pkg/redist/System.Reflection.Extensions/lib/project.json index 30e50ed9a577..9676f8b03116 100644 --- a/pkg/redist/System.Reflection.Extensions/lib/project.json +++ b/pkg/redist/System.Reflection.Extensions/lib/project.json @@ -1,13 +1,9 @@ { "dependencies": { + "Microsoft.NETCore.Targets": "1.0.0", "System.Reflection.Extensions": "4.0.0" }, "frameworks": { - "dnxcore50": {}, - "netcore50": {} - }, - "runtimes": { - "win8": {}, - "win8-aot": {} + "dnxcore50": {} } -} \ No newline at end of file +} diff --git a/pkg/redist/System.Reflection.Primitives/lib/netcore50/project.json b/pkg/redist/System.Reflection.Primitives/lib/netcore50/project.json new file mode 100644 index 000000000000..13fee452c215 --- /dev/null +++ b/pkg/redist/System.Reflection.Primitives/lib/netcore50/project.json @@ -0,0 +1,13 @@ +{ + "dependencies": { + "Microsoft.NETCore.Targets": "1.0.0", + "System.Reflection.Primitives": "4.0.0" + }, + "frameworks": { + "netcore50": {} + }, + "runtimes": { + "win8": {}, + "win8-aot": {} + } +} diff --git a/pkg/redist/System.Reflection.Primitives/lib/project.json b/pkg/redist/System.Reflection.Primitives/lib/project.json index 969968175f48..88a37855e9b6 100644 --- a/pkg/redist/System.Reflection.Primitives/lib/project.json +++ b/pkg/redist/System.Reflection.Primitives/lib/project.json @@ -1,13 +1,9 @@ { "dependencies": { + "Microsoft.NETCore.Targets": "1.0.0", "System.Reflection.Primitives": "4.0.0" }, "frameworks": { - "dnxcore50": {}, - "netcore50": {} - }, - "runtimes": { - "win8": {}, - "win8-aot": {} + "dnxcore50": {} } -} \ No newline at end of file +} diff --git a/pkg/redist/System.Reflection.TypeExtensions/lib/netcore50/project.json b/pkg/redist/System.Reflection.TypeExtensions/lib/netcore50/project.json new file mode 100644 index 000000000000..01c84f5daa27 --- /dev/null +++ b/pkg/redist/System.Reflection.TypeExtensions/lib/netcore50/project.json @@ -0,0 +1,13 @@ +{ + "dependencies": { + "Microsoft.NETCore.Targets": "1.0.0", + "System.Reflection.TypeExtensions": "4.0.0" + }, + "frameworks": { + "netcore50": {} + }, + "runtimes": { + "win8": {}, + "win8-aot": {} + } +} diff --git a/pkg/redist/System.Reflection.TypeExtensions/lib/project.json b/pkg/redist/System.Reflection.TypeExtensions/lib/project.json index b3c8a429a362..c0029e5578c4 100644 --- a/pkg/redist/System.Reflection.TypeExtensions/lib/project.json +++ b/pkg/redist/System.Reflection.TypeExtensions/lib/project.json @@ -1,14 +1,10 @@ { "dependencies": { + "Microsoft.NETCore.Targets": "1.0.0", "System.Reflection.TypeExtensions": "4.0.0" }, "frameworks": { "net46": {}, - "dnxcore50": {}, - "netcore50": {} - }, - "runtimes": { - "win8": {}, - "win8-aot": {} + "dnxcore50": {} } -} \ No newline at end of file +} diff --git a/pkg/redist/System.Resources.ResourceManager/lib/netcore50/project.json b/pkg/redist/System.Resources.ResourceManager/lib/netcore50/project.json new file mode 100644 index 000000000000..a72c37e58267 --- /dev/null +++ b/pkg/redist/System.Resources.ResourceManager/lib/netcore50/project.json @@ -0,0 +1,13 @@ +{ + "dependencies": { + "Microsoft.NETCore.Targets": "1.0.0", + "System.Resources.ResourceManager": "4.0.0" + }, + "frameworks": { + "netcore50": {} + }, + "runtimes": { + "win8": {}, + "win8-aot": {} + } +} diff --git a/pkg/redist/System.Resources.ResourceManager/lib/project.json b/pkg/redist/System.Resources.ResourceManager/lib/project.json index 94b720ab0229..4042a723513c 100644 --- a/pkg/redist/System.Resources.ResourceManager/lib/project.json +++ b/pkg/redist/System.Resources.ResourceManager/lib/project.json @@ -1,13 +1,9 @@ { "dependencies": { + "Microsoft.NETCore.Targets": "1.0.0", "System.Resources.ResourceManager": "4.0.0" }, "frameworks": { - "dnxcore50": {}, - "netcore50": {} - }, - "runtimes": { - "win8": {}, - "win8-aot": {} + "dnxcore50": {} } -} \ No newline at end of file +} diff --git a/pkg/redist/System.Runtime.Extensions/lib/netcore50/project.json b/pkg/redist/System.Runtime.Extensions/lib/netcore50/project.json new file mode 100644 index 000000000000..bb34ba0c6268 --- /dev/null +++ b/pkg/redist/System.Runtime.Extensions/lib/netcore50/project.json @@ -0,0 +1,13 @@ +{ + "dependencies": { + "Microsoft.NETCore.Targets": "1.0.0", + "System.Runtime.Extensions": "4.0.10" + }, + "frameworks": { + "netcore50": {} + }, + "runtimes": { + "win8": {}, + "win8-aot": {} + } +} diff --git a/pkg/redist/System.Runtime.Extensions/lib/project.json b/pkg/redist/System.Runtime.Extensions/lib/project.json index 7475f6f8e116..3bbad6ca792a 100644 --- a/pkg/redist/System.Runtime.Extensions/lib/project.json +++ b/pkg/redist/System.Runtime.Extensions/lib/project.json @@ -3,11 +3,6 @@ "System.Runtime.Extensions": "4.0.10" }, "frameworks": { - "dnxcore50": {}, - "netcore50": {} - }, - "runtimes": { - "win8": {}, - "win8-aot": {} + "dnxcore50": {} } -} \ No newline at end of file +} diff --git a/pkg/redist/System.Runtime/lib/netcore50/project.json b/pkg/redist/System.Runtime/lib/netcore50/project.json new file mode 100644 index 000000000000..4f82564fbd6b --- /dev/null +++ b/pkg/redist/System.Runtime/lib/netcore50/project.json @@ -0,0 +1,13 @@ +{ + "dependencies": { + "Microsoft.NETCore.Targets": "1.0.0", + "System.Runtime": "4.0.20" + }, + "frameworks": { + "netcore50": {} + }, + "runtimes": { + "win8": {}, + "win8-aot": {} + } +} diff --git a/pkg/redist/System.Runtime/lib/project.json b/pkg/redist/System.Runtime/lib/project.json index 6d5d5bd77d13..478ec445cfe6 100644 --- a/pkg/redist/System.Runtime/lib/project.json +++ b/pkg/redist/System.Runtime/lib/project.json @@ -3,11 +3,6 @@ "System.Runtime": "4.0.20" }, "frameworks": { - "dnxcore50": {}, - "netcore50": {} - }, - "runtimes": { - "win8": {}, - "win8-aot": {} + "dnxcore50": {} } -} \ No newline at end of file +} diff --git a/pkg/redist/dir.props b/pkg/redist/dir.props index 03d3298ce765..699f165b79c4 100644 --- a/pkg/redist/dir.props +++ b/pkg/redist/dir.props @@ -3,6 +3,10 @@ -redist + + $(MSBuildProjectDirectory)/netcore50/project.json + $(MSBuildProjectDirectory)/netcore50/project.lock.json + $(BaseOutputPath)redist/$(OSPlatformConfig)/$(MSBuildProjectName)/$(TargetOutputRelPath) $(BaseIntermediateOutputPath)redist/$(OSPlatformConfig)/$(MSBuildProjectName)/$(TargetOutputRelPath) diff --git a/src/Common/tests/System/Diagnostics/RemoteExecutorConsoleApp/project.json b/src/Common/tests/System/Diagnostics/RemoteExecutorConsoleApp/project.json index d652dcb38c43..94c8d0a1d012 100644 --- a/src/Common/tests/System/Diagnostics/RemoteExecutorConsoleApp/project.json +++ b/src/Common/tests/System/Diagnostics/RemoteExecutorConsoleApp/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Console": "4.0.0-rc3-23808", "System.IO": "4.0.10", "System.Reflection": "4.0.0", diff --git a/src/Common/tests/System/Xml/ModuleCore/project.json b/src/Common/tests/System/Xml/ModuleCore/project.json index c28371cc9c84..cb9809923875 100644 --- a/src/Common/tests/System/Xml/ModuleCore/project.json +++ b/src/Common/tests/System/Xml/ModuleCore/project.json @@ -1,11 +1,12 @@ { "dependencies": { - "System.Runtime": "4.0.20", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", - "System.Text.Encoding": "4.0.10", - "System.IO": "4.0.10", "System.Console": "4.0.0-rc3-23808", - "System.Diagnostics.Debug": "4.0.10" + "System.Diagnostics.Debug": "4.0.10", + "System.IO": "4.0.10", + "System.Runtime": "4.0.20", + "System.Text.Encoding": "4.0.10" }, "frameworks": { "dnxcore50": {} diff --git a/src/Common/tests/System/Xml/XmlCoreTest/project.json b/src/Common/tests/System/Xml/XmlCoreTest/project.json index 708eea4f7554..3fef915d5af4 100644 --- a/src/Common/tests/System/Xml/XmlCoreTest/project.json +++ b/src/Common/tests/System/Xml/XmlCoreTest/project.json @@ -1,14 +1,15 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", + "System.Collections": "4.0.10", + "System.IO": "4.0.10", "System.Runtime": "4.0.20", "System.Runtime.Extensions": "4.0.10", - "System.IO": "4.0.10", - "System.Threading.Tasks": "4.0.10", - "System.Xml.ReaderWriter": "4.0.10", "System.Text.Encoding": "4.0.10", - "System.Collections": "4.0.10" + "System.Threading.Tasks": "4.0.10", + "System.Xml.ReaderWriter": "4.0.10" }, "frameworks": { "dnxcore50": {} } -} \ No newline at end of file +} diff --git a/src/Common/tests/System/Xml/XmlDiff/project.json b/src/Common/tests/System/Xml/XmlDiff/project.json index 09a905086040..bcb6bcc86013 100644 --- a/src/Common/tests/System/Xml/XmlDiff/project.json +++ b/src/Common/tests/System/Xml/XmlDiff/project.json @@ -1,11 +1,12 @@ { "dependencies": { - "System.Runtime": "4.0.20", - "System.Xml.ReaderWriter": "4.0.10", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", + "System.Diagnostics.Debug": "4.0.10", "System.IO": "4.0.10", - "System.Diagnostics.Debug": "4.0.10" + "System.Runtime": "4.0.20", + "System.Xml.ReaderWriter": "4.0.10" }, "frameworks": { "dnxcore50": {} } -} \ No newline at end of file +} diff --git a/src/Common/tests/project.json b/src/Common/tests/project.json index a5eb898d0303..1bc7b02fd9df 100644 --- a/src/Common/tests/project.json +++ b/src/Common/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections.Concurrent": "4.0.10", "System.Diagnostics.Contracts": "4.0.0", "System.Diagnostics.Debug": "4.0.10", diff --git a/src/Microsoft.CSharp/src/project.json b/src/Microsoft.CSharp/src/project.json index 9b9fc32c8309..1ba73fa2ce93 100644 --- a/src/Microsoft.CSharp/src/project.json +++ b/src/Microsoft.CSharp/src/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", "System.Diagnostics.Debug": "4.0.10", "System.Diagnostics.Tools": "4.0.0", @@ -22,4 +23,4 @@ "frameworks": { "dnxcore50": {} } -} \ No newline at end of file +} diff --git a/src/Microsoft.CSharp/tests/project.json b/src/Microsoft.CSharp/tests/project.json index 414a467f9f3e..30537faad9cb 100644 --- a/src/Microsoft.CSharp/tests/project.json +++ b/src/Microsoft.CSharp/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", "System.Diagnostics.Debug": "4.0.10", "System.Diagnostics.Tools": "4.0.0", @@ -22,6 +23,8 @@ "xunit.netcore.extensions": "1.0.0-prerelease-00123" }, "frameworks": { - "dnxcore50": {} + "dnxcore50": { + "imports": "portable-net45+win8" + } } -} \ No newline at end of file +} diff --git a/src/Microsoft.VisualBasic/tests/project.json b/src/Microsoft.VisualBasic/tests/project.json index 1b5822770d22..bc2d436182e2 100644 --- a/src/Microsoft.VisualBasic/tests/project.json +++ b/src/Microsoft.VisualBasic/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", "System.Diagnostics.Debug": "4.0.10", "System.Dynamic.Runtime": "4.0.10", @@ -24,6 +25,8 @@ "xunit.netcore.extensions": "1.0.0-prerelease-00123" }, "frameworks": { - "dnxcore50": {} + "dnxcore50": { + "imports": "portable-net45+win8" + } } -} \ No newline at end of file +} diff --git a/src/Microsoft.Win32.Primitives/src/facade/project.json b/src/Microsoft.Win32.Primitives/src/facade/project.json index f15d78c42d41..2d26366fff58 100644 --- a/src/Microsoft.Win32.Primitives/src/facade/project.json +++ b/src/Microsoft.Win32.Primitives/src/facade/project.json @@ -2,7 +2,7 @@ "frameworks": { "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23530" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/Microsoft.Win32.Primitives/src/project.json b/src/Microsoft.Win32.Primitives/src/project.json index df4715b819cc..763642bd13ed 100644 --- a/src/Microsoft.Win32.Primitives/src/project.json +++ b/src/Microsoft.Win32.Primitives/src/project.json @@ -1,9 +1,10 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Runtime": "4.0.20", "System.Runtime.InteropServices": "4.0.20" }, "frameworks": { "dnxcore50": {} } -} \ No newline at end of file +} diff --git a/src/Microsoft.Win32.Primitives/tests/project.json b/src/Microsoft.Win32.Primitives/tests/project.json index a66fb165b31c..7f6a2f0cf4f9 100644 --- a/src/Microsoft.Win32.Primitives/tests/project.json +++ b/src/Microsoft.Win32.Primitives/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Runtime": "4.0.20", "System.Runtime.InteropServices": "4.0.20", "xunit": "2.1.0", diff --git a/src/Microsoft.Win32.Registry.AccessControl/src/project.json b/src/Microsoft.Win32.Registry.AccessControl/src/project.json index c10b57b99a5b..22a05c8b228f 100644 --- a/src/Microsoft.Win32.Registry.AccessControl/src/project.json +++ b/src/Microsoft.Win32.Registry.AccessControl/src/project.json @@ -2,11 +2,12 @@ "frameworks": { "dnxcore50": { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "Microsoft.Win32.Registry": "4.0.0-rc3-23808", "System.IO": "4.0.10", - "System.Runtime.Handles": "4.0.00", "System.Resources.ResourceManager": "4.0.0", "System.Runtime": "4.0.20", + "System.Runtime.Handles": "4.0.0", "System.Runtime.InteropServices": "4.0.20", "System.Security.AccessControl": "4.0.0-rc3-23808", "System.Security.Principal.Windows": "4.0.0-rc3-23808" @@ -14,7 +15,7 @@ }, "net46": { "dependencies": { - "Microsoft.TargetingPack.NetFramework.v4.6": "1.0.0" + "Microsoft.TargetingPack.NetFramework.v4.6": "1.0.1" } } } diff --git a/src/Microsoft.Win32.Registry.AccessControl/tests/project.json b/src/Microsoft.Win32.Registry.AccessControl/tests/project.json index ad7f2859bbea..973c340378e3 100644 --- a/src/Microsoft.Win32.Registry.AccessControl/tests/project.json +++ b/src/Microsoft.Win32.Registry.AccessControl/tests/project.json @@ -1,10 +1,11 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "Microsoft.Win32.Registry": "4.0.0-rc3-23808", "System.IO": "4.0.10", - "System.Runtime.Handles": "4.0.00", "System.Resources.ResourceManager": "4.0.0", "System.Runtime": "4.0.20", + "System.Runtime.Handles": "4.0.0", "System.Runtime.InteropServices": "4.0.20", "System.Security.AccessControl": "4.0.0-rc3-23808", "System.Security.Principal.Windows": "4.0.0-rc3-23808", @@ -12,6 +13,8 @@ "xunit.netcore.extensions": "1.0.0-prerelease-00123" }, "frameworks": { - "dnxcore50": {} + "dnxcore50": { + "imports": "portable-net45+win8" + } } } diff --git a/src/Microsoft.Win32.Registry/src/facade/project.json b/src/Microsoft.Win32.Registry/src/facade/project.json index f15d78c42d41..2d26366fff58 100644 --- a/src/Microsoft.Win32.Registry/src/facade/project.json +++ b/src/Microsoft.Win32.Registry/src/facade/project.json @@ -2,7 +2,7 @@ "frameworks": { "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23530" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/Microsoft.Win32.Registry/src/project.json b/src/Microsoft.Win32.Registry/src/project.json index 3cdf3c34a561..81a58b4b45f6 100644 --- a/src/Microsoft.Win32.Registry/src/project.json +++ b/src/Microsoft.Win32.Registry/src/project.json @@ -1,11 +1,12 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", "System.Diagnostics.Contracts": "4.0.0", "System.Diagnostics.Debug": "4.0.10", "System.Diagnostics.Tools": "4.0.0", - "System.IO": "4.0.10", "System.Globalization": "4.0.10", + "System.IO": "4.0.10", "System.Resources.ResourceManager": "4.0.0", "System.Runtime": "4.0.20", "System.Runtime.Extensions": "4.0.10", diff --git a/src/Microsoft.Win32.Registry/tests/project.json b/src/Microsoft.Win32.Registry/tests/project.json index 45c86f14ab13..b5753cde6525 100644 --- a/src/Microsoft.Win32.Registry/tests/project.json +++ b/src/Microsoft.Win32.Registry/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "Microsoft.Win32.Registry": "4.0.0-rc3-23808", "System.Collections": "4.0.10", "System.Linq": "4.0.0", diff --git a/src/NuGet.config b/src/NuGet.config index ef1920d674ae..c8759d1409aa 100644 --- a/src/NuGet.config +++ b/src/NuGet.config @@ -3,7 +3,6 @@ - diff --git a/src/Scenarios/tests/InterProcessCommunication/project.json b/src/Scenarios/tests/InterProcessCommunication/project.json index 47440ea5a356..23d76c53841d 100644 --- a/src/Scenarios/tests/InterProcessCommunication/project.json +++ b/src/Scenarios/tests/InterProcessCommunication/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Globalization": "4.0.10", "System.IO": "4.0.10", "System.IO.FileSystem": "4.0.0", diff --git a/src/System.AppContext/src/netcore50/project.json b/src/System.AppContext/src/netcore50/project.json new file mode 100644 index 000000000000..cb7b3436afae --- /dev/null +++ b/src/System.AppContext/src/netcore50/project.json @@ -0,0 +1,18 @@ +{ + "frameworks": { + "netcore50": { + "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", + "Microsoft.TargetingPack.Private.WinRT": "1.0.1", + "System.Collections": "4.0.0", + "System.Resources.ResourceManager": "4.0.0", + "System.Runtime": "4.0.20", + "System.Threading": "4.0.0" + } + } + }, + "runtimes": { + "win8-x86": {}, + "win8-x64": {} + } +} diff --git a/src/System.AppContext/src/project.json b/src/System.AppContext/src/project.json index 033eba4b002c..0e5ddb7fee7e 100644 --- a/src/System.AppContext/src/project.json +++ b/src/System.AppContext/src/project.json @@ -5,18 +5,9 @@ "Microsoft.TargetingPack.Private.CoreCLR": "1.0.0-rc3-23808" } }, - "netcore50": { - "dependencies": { - "Microsoft.TargetingPack.Private.WinRT": "1.0.0", - "System.Collections": "4.0.0", - "System.Resources.ResourceManager": "4.0.0", - "System.Runtime": "4.0.20", - "System.Threading": "4.0.0" - } - }, "net462": { "dependencies": { - "Microsoft.TargetingPack.NetFramework.v4.6": "1.0.0" + "Microsoft.TargetingPack.NetFramework.v4.6": "1.0.1" } } } diff --git a/src/System.AppContext/tests/project.json b/src/System.AppContext/tests/project.json index 5077a31edc9a..9f3e999ea4e0 100644 --- a/src/System.AppContext/tests/project.json +++ b/src/System.AppContext/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.AppContext": "4.0.0", "System.Runtime": "4.0.20", "xunit": "2.1.0", @@ -10,4 +11,4 @@ "imports": "portable-net45+win8" } } -} \ No newline at end of file +} diff --git a/src/System.Buffers/src/project.json b/src/System.Buffers/src/project.json index 60af1dbaf283..ad2371eadbb1 100644 --- a/src/System.Buffers/src/project.json +++ b/src/System.Buffers/src/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Diagnostics.Debug": "4.0.0", "System.Diagnostics.Tracing": "4.0.0", "System.Resources.ResourceManager": "4.0.0", diff --git a/src/System.Buffers/tests/project.json b/src/System.Buffers/tests/project.json index 4aad29f65d89..21b69a2a419d 100644 --- a/src/System.Buffers/tests/project.json +++ b/src/System.Buffers/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Diagnostics.Tracing": "4.0.10", "System.Runtime": "4.0.21-rc3-23808", "System.Runtime.Extensions": "4.0.11-rc3-23808", diff --git a/src/System.Collections.Concurrent/src/facade/project.json b/src/System.Collections.Concurrent/src/facade/project.json index f15d78c42d41..2d26366fff58 100644 --- a/src/System.Collections.Concurrent/src/facade/project.json +++ b/src/System.Collections.Concurrent/src/facade/project.json @@ -2,7 +2,7 @@ "frameworks": { "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23530" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Collections.Concurrent/src/project.json b/src/System.Collections.Concurrent/src/project.json index 21c559312a31..823160fbaa48 100644 --- a/src/System.Collections.Concurrent/src/project.json +++ b/src/System.Collections.Concurrent/src/project.json @@ -1,19 +1,20 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", "System.Diagnostics.Contracts": "4.0.0", "System.Diagnostics.Debug": "4.0.10", "System.Diagnostics.Tools": "4.0.0", "System.Diagnostics.Tracing": "4.0.20", "System.Globalization": "4.0.10", - "System.Reflection":"4.0.10", + "System.Reflection": "4.0.10", + "System.Resources.ResourceManager": "4.0.0", "System.Runtime": "4.0.20", "System.Runtime.Extensions": "4.0.10", "System.Threading": "4.0.10", - "System.Threading.Tasks": "4.0.10", - "System.Resources.ResourceManager": "4.0.0" + "System.Threading.Tasks": "4.0.10" }, "frameworks": { "dnxcore50": {} } -} \ No newline at end of file +} diff --git a/src/System.Collections.Concurrent/tests/project.json b/src/System.Collections.Concurrent/tests/project.json index a8e8a1413b40..329290d8eb62 100644 --- a/src/System.Collections.Concurrent/tests/project.json +++ b/src/System.Collections.Concurrent/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", "System.Collections.Concurrent": "4.0.10", "System.Console": "4.0.0-rc3-23808", diff --git a/src/System.Collections.Immutable/tests/project.json b/src/System.Collections.Immutable/tests/project.json index 0f0fe04f4185..245fd90f6bae 100644 --- a/src/System.Collections.Immutable/tests/project.json +++ b/src/System.Collections.Immutable/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Diagnostics.Contracts": "4.0.0", "System.Reflection.Emit": "4.0.0", "System.Reflection.Emit.Lightweight": "4.0.0", diff --git a/src/System.Collections.NonGeneric/src/facade/project.json b/src/System.Collections.NonGeneric/src/facade/project.json index f15d78c42d41..2d26366fff58 100644 --- a/src/System.Collections.NonGeneric/src/facade/project.json +++ b/src/System.Collections.NonGeneric/src/facade/project.json @@ -2,7 +2,7 @@ "frameworks": { "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23530" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Collections.NonGeneric/src/project.json b/src/System.Collections.NonGeneric/src/project.json index 6e5ad0242cae..6b418dc6ef7f 100644 --- a/src/System.Collections.NonGeneric/src/project.json +++ b/src/System.Collections.NonGeneric/src/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Diagnostics.Contracts": "4.0.0", "System.Diagnostics.Debug": "4.0.10", "System.Diagnostics.Tools": "4.0.0", @@ -12,4 +13,4 @@ "frameworks": { "dnxcore50": {} } -} \ No newline at end of file +} diff --git a/src/System.Collections.NonGeneric/tests/project.json b/src/System.Collections.NonGeneric/tests/project.json index 52f9110ceec8..87437771f0d7 100644 --- a/src/System.Collections.NonGeneric/tests/project.json +++ b/src/System.Collections.NonGeneric/tests/project.json @@ -1,6 +1,7 @@ { "dependencies": { "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0028", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", "System.Console": "4.0.0-rc3-23808", "System.Diagnostics.Debug": "4.0.10", diff --git a/src/System.Collections.Specialized/src/facade/project.json b/src/System.Collections.Specialized/src/facade/project.json index f15d78c42d41..2d26366fff58 100644 --- a/src/System.Collections.Specialized/src/facade/project.json +++ b/src/System.Collections.Specialized/src/facade/project.json @@ -2,7 +2,7 @@ "frameworks": { "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23530" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Collections.Specialized/src/project.json b/src/System.Collections.Specialized/src/project.json index c7717ede758f..ceefc55ce4ac 100644 --- a/src/System.Collections.Specialized/src/project.json +++ b/src/System.Collections.Specialized/src/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections.NonGeneric": "4.0.0", "System.Diagnostics.Debug": "4.0.10", "System.Diagnostics.Tools": "4.0.0", @@ -14,4 +15,4 @@ "frameworks": { "dnxcore50": {} } -} \ No newline at end of file +} diff --git a/src/System.Collections.Specialized/tests/project.json b/src/System.Collections.Specialized/tests/project.json index 597cdeb79d7b..ebc63b4cbf81 100644 --- a/src/System.Collections.Specialized/tests/project.json +++ b/src/System.Collections.Specialized/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", "System.Collections.NonGeneric": "4.0.0", "System.Console": "4.0.0-rc3-23808", diff --git a/src/System.Collections/src/project.json b/src/System.Collections/src/project.json index 737e7c1ed942..ccbd96e0351b 100644 --- a/src/System.Collections/src/project.json +++ b/src/System.Collections/src/project.json @@ -2,23 +2,25 @@ "frameworks": { "dnxcore50": { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "Microsoft.TargetingPack.Private.CoreCLR": "1.0.0-rc3-23808" } }, "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } }, "netcore50": { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Diagnostics.Contracts": "4.0.0", "System.Diagnostics.Debug": "4.0.0", "System.Diagnostics.Tools": "4.0.0", - "System.Threading": "4.0.0", "System.Resources.ResourceManager": "4.0.0", "System.Runtime": "4.0.20", - "System.Runtime.Extensions": "4.0.0" + "System.Runtime.Extensions": "4.0.0", + "System.Threading": "4.0.0" } } } diff --git a/src/System.Collections/tests/project.json b/src/System.Collections/tests/project.json index 8dae24495ea9..4d599344152d 100644 --- a/src/System.Collections/tests/project.json +++ b/src/System.Collections/tests/project.json @@ -1,6 +1,7 @@ { "dependencies": { "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0028", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", "System.Console": "4.0.0-rc3-23808", "System.Globalization": "4.0.10", diff --git a/src/System.ComponentModel.Annotations/src/System.ComponentModel.Annotations.csproj b/src/System.ComponentModel.Annotations/src/System.ComponentModel.Annotations.csproj index 9be4990c9eb1..ac95fedc9ad1 100644 --- a/src/System.ComponentModel.Annotations/src/System.ComponentModel.Annotations.csproj +++ b/src/System.ComponentModel.Annotations/src/System.ComponentModel.Annotations.csproj @@ -8,6 +8,7 @@ 4.1.0.0 dotnet5.4 true + .NETPlatform,Version=v5.4 diff --git a/src/System.ComponentModel.Annotations/src/project.json b/src/System.ComponentModel.Annotations/src/project.json index b4a750753a24..56250e3a889f 100644 --- a/src/System.ComponentModel.Annotations/src/project.json +++ b/src/System.ComponentModel.Annotations/src/project.json @@ -20,7 +20,7 @@ }, "net46":{ "dependencies": { - "Microsoft.TargetingPack.NetFramework.v4.6": "1.0.0", + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1", } } } diff --git a/src/System.ComponentModel.Annotations/tests/project.json b/src/System.ComponentModel.Annotations/tests/project.json index 22e198a2ec45..2d4e2b5af2ff 100644 --- a/src/System.ComponentModel.Annotations/tests/project.json +++ b/src/System.ComponentModel.Annotations/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", "System.ComponentModel": "4.0.0", "System.ComponentModel.Annotations": "4.0.10", diff --git a/src/System.ComponentModel.EventBasedAsync/src/facade/project.json b/src/System.ComponentModel.EventBasedAsync/src/facade/project.json index f15d78c42d41..2d26366fff58 100644 --- a/src/System.ComponentModel.EventBasedAsync/src/facade/project.json +++ b/src/System.ComponentModel.EventBasedAsync/src/facade/project.json @@ -2,7 +2,7 @@ "frameworks": { "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23530" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.ComponentModel.EventBasedAsync/src/project.json b/src/System.ComponentModel.EventBasedAsync/src/project.json index e6f4082a9182..09405a669d97 100644 --- a/src/System.ComponentModel.EventBasedAsync/src/project.json +++ b/src/System.ComponentModel.EventBasedAsync/src/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Diagnostics.Contracts": "4.0.0", "System.Diagnostics.Debug": "4.0.10", "System.Diagnostics.Tools": "4.0.0", @@ -11,4 +12,4 @@ "frameworks": { "dnxcore50": {} } -} \ No newline at end of file +} diff --git a/src/System.ComponentModel.EventBasedAsync/tests/project.json b/src/System.ComponentModel.EventBasedAsync/tests/project.json index 6938c3d98a93..31e27f484691 100644 --- a/src/System.ComponentModel.EventBasedAsync/tests/project.json +++ b/src/System.ComponentModel.EventBasedAsync/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Runtime": "4.0.20", "System.Threading": "4.0.10", "System.Threading.Tasks": "4.0.10", diff --git a/src/System.ComponentModel.Primitives/src/System.ComponentModel.Primitives.csproj b/src/System.ComponentModel.Primitives/src/System.ComponentModel.Primitives.csproj index e901866b8b3f..a125daa7df9a 100644 --- a/src/System.ComponentModel.Primitives/src/System.ComponentModel.Primitives.csproj +++ b/src/System.ComponentModel.Primitives/src/System.ComponentModel.Primitives.csproj @@ -8,6 +8,7 @@ 4.0.1.0 dotnet5.1 true + .NETPlatform,Version=v5.1 diff --git a/src/System.ComponentModel.Primitives/src/project.json b/src/System.ComponentModel.Primitives/src/project.json index 0551496e75b8..ab456b0ed9ad 100644 --- a/src/System.ComponentModel.Primitives/src/project.json +++ b/src/System.ComponentModel.Primitives/src/project.json @@ -8,7 +8,7 @@ }, "net45":{ "dependencies": { - "Microsoft.TargetingPack.NetFramework.v4.5": "1.0.0", + "Microsoft.TargetingPack.NetFramework.v4.5": "1.0.1", } } } diff --git a/src/System.ComponentModel.Primitives/tests/project.json b/src/System.ComponentModel.Primitives/tests/project.json index 712f5f424493..51920a667f5d 100644 --- a/src/System.ComponentModel.Primitives/tests/project.json +++ b/src/System.ComponentModel.Primitives/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.ComponentModel": "4.0.0", "System.Runtime": "4.0.20", "xunit": "2.1.0", diff --git a/src/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj b/src/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj index 3f1a615fe3ce..db40284a6c53 100644 --- a/src/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj +++ b/src/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj @@ -8,6 +8,7 @@ 4.0.1.0 dotnet5.1 true + .NETPlatform,Version=v5.1 diff --git a/src/System.ComponentModel.TypeConverter/src/project.json b/src/System.ComponentModel.TypeConverter/src/project.json index 3b20f1213f54..aa60c194b6af 100644 --- a/src/System.ComponentModel.TypeConverter/src/project.json +++ b/src/System.ComponentModel.TypeConverter/src/project.json @@ -19,7 +19,7 @@ }, "net45":{ "dependencies": { - "Microsoft.TargetingPack.NetFramework.v4.5": "1.0.0", + "Microsoft.TargetingPack.NetFramework.v4.5": "1.0.1", } } } diff --git a/src/System.ComponentModel.TypeConverter/tests/project.json b/src/System.ComponentModel.TypeConverter/tests/project.json index 2f4e2a36033c..8c7f9a4dd0f1 100644 --- a/src/System.ComponentModel.TypeConverter/tests/project.json +++ b/src/System.ComponentModel.TypeConverter/tests/project.json @@ -1,6 +1,7 @@ { "dependencies": { "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0028", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.ComponentModel": "4.0.0", "System.ComponentModel.Primitives": "4.0.0", "System.Globalization": "4.0.10", diff --git a/src/System.ComponentModel/src/facade/project.json b/src/System.ComponentModel/src/facade/project.json index f15d78c42d41..2d26366fff58 100644 --- a/src/System.ComponentModel/src/facade/project.json +++ b/src/System.ComponentModel/src/facade/project.json @@ -2,7 +2,7 @@ "frameworks": { "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23530" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.ComponentModel/tests/project.json b/src/System.ComponentModel/tests/project.json index d836114ab0bd..a1b54c6e7c25 100644 --- a/src/System.ComponentModel/tests/project.json +++ b/src/System.ComponentModel/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Runtime": "4.0.20", "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00123" diff --git a/src/System.Composition.Convention/tests/project.json b/src/System.Composition.Convention/tests/project.json index 6e5150d46772..c421a82c1aad 100644 --- a/src/System.Composition.Convention/tests/project.json +++ b/src/System.Composition.Convention/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Linq.Expressions": "4.0.10", "System.Runtime": "4.0.20", "xunit": "2.1.0", diff --git a/src/System.Composition/perftests/project.json b/src/System.Composition/perftests/project.json index 203298f54b0d..cbc3c6380ec5 100644 --- a/src/System.Composition/perftests/project.json +++ b/src/System.Composition/perftests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", "System.Collections.Concurrent": "4.0.10", "System.Console": "4.0.0-rc3-23808", diff --git a/src/System.Composition/tests/project.json b/src/System.Composition/tests/project.json index 6e5150d46772..c421a82c1aad 100644 --- a/src/System.Composition/tests/project.json +++ b/src/System.Composition/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Linq.Expressions": "4.0.10", "System.Runtime": "4.0.20", "xunit": "2.1.0", diff --git a/src/System.Console/src/facade/project.json b/src/System.Console/src/facade/project.json index f15d78c42d41..2d26366fff58 100644 --- a/src/System.Console/src/facade/project.json +++ b/src/System.Console/src/facade/project.json @@ -2,7 +2,7 @@ "frameworks": { "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23530" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Console/src/project.json b/src/System.Console/src/project.json index 7622efad83af..18e7b4b95cf9 100644 --- a/src/System.Console/src/project.json +++ b/src/System.Console/src/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.0", "System.Diagnostics.Contracts": "4.0.0", "System.Diagnostics.Debug": "4.0.10", @@ -18,4 +19,4 @@ "frameworks": { "dnxcore50": {} } -} \ No newline at end of file +} diff --git a/src/System.Console/tests/project.json b/src/System.Console/tests/project.json index 33fc407b8aaa..0a9a68543e89 100644 --- a/src/System.Console/tests/project.json +++ b/src/System.Console/tests/project.json @@ -1,6 +1,7 @@ { "dependencies": { "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0028", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Diagnostics.Process": "4.1.0-rc3-23808", "System.IO": "4.0.10", "System.IO.FileSystem": "4.0.0", diff --git a/src/System.Data.Common/src/project.json b/src/System.Data.Common/src/project.json index 58064cd1d458..a4ba0a92f1fe 100644 --- a/src/System.Data.Common/src/project.json +++ b/src/System.Data.Common/src/project.json @@ -2,6 +2,7 @@ "frameworks": { "dotnet5.1": { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.0", "System.Diagnostics.Debug": "4.0.0", "System.Diagnostics.Tools": "4.0.0", @@ -16,8 +17,8 @@ }, "net45": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.5": "1.0.0" + "Microsoft.TargetingPack.NETFramework.v4.5": "1.0.1" } } } -} \ No newline at end of file +} diff --git a/src/System.Data.Common/tests/project.json b/src/System.Data.Common/tests/project.json index b6693c60cb2a..9260d78d0638 100644 --- a/src/System.Data.Common/tests/project.json +++ b/src/System.Data.Common/tests/project.json @@ -1,19 +1,22 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", "System.Collections.NonGeneric": "4.0.0", + "System.Diagnostics.Tools": "4.0.0", "System.Globalization": "4.0.0", "System.IO": "4.0.0", "System.Resources.ResourceManager": "4.0.0", - "System.Text.RegularExpressions": "4.0.0", "System.Runtime": "4.0.20", "System.Runtime.Extensions": "4.0.10", + "System.Text.RegularExpressions": "4.0.0", "System.Threading.Tasks": "4.0.10", - "System.Diagnostics.Tools": "4.0.0", "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00123" }, "frameworks": { - "dnxcore50": {} + "dnxcore50": { + "imports": "portable-net45+win8" + } } -} \ No newline at end of file +} diff --git a/src/System.Data.SqlClient/src/facade/project.json b/src/System.Data.SqlClient/src/facade/project.json index f15d78c42d41..2d26366fff58 100644 --- a/src/System.Data.SqlClient/src/facade/project.json +++ b/src/System.Data.SqlClient/src/facade/project.json @@ -2,7 +2,7 @@ "frameworks": { "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23530" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Data.SqlClient/src/project.json b/src/System.Data.SqlClient/src/project.json index 65e42ba17fd5..8307cd695696 100644 --- a/src/System.Data.SqlClient/src/project.json +++ b/src/System.Data.SqlClient/src/project.json @@ -1,15 +1,17 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "Microsoft.Win32.Primitives": "4.0.0", "System.Collections": "4.0.10", "System.Collections.Concurrent": "4.0.0", "System.Collections.NonGeneric": "4.0.0", "System.Data.Common": "4.0.0", "System.Diagnostics.Debug": "4.0.10", + "System.Diagnostics.Tools": "4.0.0", "System.Globalization": "4.0.10", - "System.Linq": "4.0.0", "System.IO": "4.0.10", "System.IO.Pipes": "4.0.0-rc3-23808", + "System.Linq": "4.0.0", "System.Net.NameResolution": "4.0.0-rc3-23808", "System.Net.Primitives": "4.0.10", "System.Net.Security": "4.0.0-rc3-23808", @@ -18,8 +20,8 @@ "System.Reflection.TypeExtensions": "4.0.0", "System.Resources.ResourceManager": "4.0.0", "System.Runtime": "4.0.20", - "System.Runtime.Handles": "4.0.0", "System.Runtime.Extensions": "4.0.10", + "System.Runtime.Handles": "4.0.0", "System.Runtime.InteropServices": "4.0.20", "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc3-23808", "System.Security.Principal.Windows": "4.0.0-rc3-23808", @@ -32,8 +34,7 @@ "System.Threading.Thread": "4.0.0-rc3-23808", "System.Threading.ThreadPool": "4.0.10-rc3-23808", "System.Threading.Timer": "4.0.0", - "System.Xml.ReaderWriter": "4.0.0", - "System.Diagnostics.Tools": "4.0.0" + "System.Xml.ReaderWriter": "4.0.0" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.Data.SqlClient/tests/project.json b/src/System.Data.SqlClient/tests/project.json index c790557569f8..d0668d4ef8a8 100644 --- a/src/System.Data.SqlClient/tests/project.json +++ b/src/System.Data.SqlClient/tests/project.json @@ -1,6 +1,7 @@ { "dependencies": { "Microsoft.CSharp": "4.0.1-rc3-23808", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Data.Common": "4.0.1-rc3-23808", "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00123" diff --git a/src/System.Diagnostics.Contracts/src/project.json b/src/System.Diagnostics.Contracts/src/project.json index c88b7da44fad..070ee62c662e 100644 --- a/src/System.Diagnostics.Contracts/src/project.json +++ b/src/System.Diagnostics.Contracts/src/project.json @@ -12,7 +12,7 @@ }, "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23616" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Diagnostics.Contracts/tests/project.json b/src/System.Diagnostics.Contracts/tests/project.json index bec3da2d8e5b..22b7f3ab5a1f 100644 --- a/src/System.Diagnostics.Contracts/tests/project.json +++ b/src/System.Diagnostics.Contracts/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Diagnostics.Contracts": "4.0.0", "System.Linq": "4.0.0", "System.Runtime": "4.0.20", diff --git a/src/System.Diagnostics.Debug/src/project.json b/src/System.Diagnostics.Debug/src/project.json index 4765e77c79a5..871dbfad8fe2 100644 --- a/src/System.Diagnostics.Debug/src/project.json +++ b/src/System.Diagnostics.Debug/src/project.json @@ -12,7 +12,7 @@ }, "net46": { "dependencies": { - "Microsoft.TargetingPack.NetFramework.v4.6": "1.0.0" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Diagnostics.Debug/tests/project.json b/src/System.Diagnostics.Debug/tests/project.json index 132a796ba370..25b630d2053b 100644 --- a/src/System.Diagnostics.Debug/tests/project.json +++ b/src/System.Diagnostics.Debug/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "Microsoft.TargetingPack.Private.CoreCLR": "1.0.0-rc3-23808", "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00123" diff --git a/src/System.Diagnostics.DiagnosticSource/src/project.json b/src/System.Diagnostics.DiagnosticSource/src/project.json index 065ba163da4a..8e674fd9519c 100644 --- a/src/System.Diagnostics.DiagnosticSource/src/project.json +++ b/src/System.Diagnostics.DiagnosticSource/src/project.json @@ -1,11 +1,12 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Diagnostics.Debug": "4.0.0", + "System.Diagnostics.Tracing": "4.0.0", "System.Runtime": "4.0.0", - "System.Threading": "4.0.0", - "System.Diagnostics.Tracing": "4.0.0" + "System.Threading": "4.0.0" }, "frameworks": { "dnxcore50": {} } -} \ No newline at end of file +} diff --git a/src/System.Diagnostics.DiagnosticSource/tests/project.json b/src/System.Diagnostics.DiagnosticSource/tests/project.json index 41f1a7d90f29..15768899ef4f 100644 --- a/src/System.Diagnostics.DiagnosticSource/tests/project.json +++ b/src/System.Diagnostics.DiagnosticSource/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", "System.Diagnostics.Debug": "4.0.10", "System.Runtime": "4.0.20", diff --git a/src/System.Diagnostics.FileVersionInfo/src/facade/project.json b/src/System.Diagnostics.FileVersionInfo/src/facade/project.json index f15d78c42d41..2d26366fff58 100644 --- a/src/System.Diagnostics.FileVersionInfo/src/facade/project.json +++ b/src/System.Diagnostics.FileVersionInfo/src/facade/project.json @@ -2,7 +2,7 @@ "frameworks": { "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23530" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Diagnostics.FileVersionInfo/src/project.json b/src/System.Diagnostics.FileVersionInfo/src/project.json index 269d9356bc98..162c4a64e749 100644 --- a/src/System.Diagnostics.FileVersionInfo/src/project.json +++ b/src/System.Diagnostics.FileVersionInfo/src/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Diagnostics.Tools": "4.0.0", "System.Globalization": "4.0.10", "System.IO.FileSystem": "4.0.0", @@ -11,4 +12,4 @@ "frameworks": { "dnxcore50": {} } -} \ No newline at end of file +} diff --git a/src/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/project.json b/src/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/project.json index fd68fc1d1643..8b26e1a7c11d 100644 --- a/src/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/project.json +++ b/src/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Globalization": "4.0.10", "System.IO.FileSystem": "4.0.0", "System.Runtime": "4.0.20", diff --git a/src/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj b/src/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj index c53666f7dc88..f217cbf0f2cb 100644 --- a/src/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj +++ b/src/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj @@ -16,6 +16,7 @@ dotnet5.5 true true + .NETPlatform,Version=v5.5 diff --git a/src/System.Diagnostics.Process/src/project.json b/src/System.Diagnostics.Process/src/project.json index 6076177e2280..4e96b538a08f 100644 --- a/src/System.Diagnostics.Process/src/project.json +++ b/src/System.Diagnostics.Process/src/project.json @@ -27,12 +27,12 @@ }, "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } }, "net461": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.1": "1.0.0" + "Microsoft.TargetingPack.NETFramework.v4.6.1": "1.0.1" } } } diff --git a/src/System.Diagnostics.Process/tests/project.json b/src/System.Diagnostics.Process/tests/project.json index 7c2ff63b590e..84fad5decf10 100644 --- a/src/System.Diagnostics.Process/tests/project.json +++ b/src/System.Diagnostics.Process/tests/project.json @@ -1,6 +1,7 @@ { "dependencies": { "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0028", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "Microsoft.Win32.Primitives": "4.0.0", "Microsoft.Win32.Registry": "4.0.0-rc3-23808", "System.Collections": "4.0.10", @@ -11,9 +12,9 @@ "System.Reflection.Extensions": "4.0.0", "System.Runtime": "4.0.20", "System.Runtime.Extensions": "4.0.10", + "System.Runtime.Handles": "4.0.0", "System.Runtime.InteropServices": "4.0.20", "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc3-23808", - "System.Runtime.Handles": "4.0.0", "System.Security.Principal.Windows": "4.0.0-rc3-23808", "System.Text.Encoding": "4.0.10", "System.Text.Encoding.CodePages": "4.0.0", diff --git a/src/System.Diagnostics.StackTrace/src/project.json b/src/System.Diagnostics.StackTrace/src/project.json index 4765e77c79a5..871dbfad8fe2 100644 --- a/src/System.Diagnostics.StackTrace/src/project.json +++ b/src/System.Diagnostics.StackTrace/src/project.json @@ -12,7 +12,7 @@ }, "net46": { "dependencies": { - "Microsoft.TargetingPack.NetFramework.v4.6": "1.0.0" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Diagnostics.TextWriterTraceListener/src/facade/project.json b/src/System.Diagnostics.TextWriterTraceListener/src/facade/project.json index f15d78c42d41..2d26366fff58 100644 --- a/src/System.Diagnostics.TextWriterTraceListener/src/facade/project.json +++ b/src/System.Diagnostics.TextWriterTraceListener/src/facade/project.json @@ -2,7 +2,7 @@ "frameworks": { "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23530" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Diagnostics.TextWriterTraceListener/src/project.json b/src/System.Diagnostics.TextWriterTraceListener/src/project.json index 97a4fa5a3fa0..8e350896e3f2 100644 --- a/src/System.Diagnostics.TextWriterTraceListener/src/project.json +++ b/src/System.Diagnostics.TextWriterTraceListener/src/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Diagnostics.Tools": "4.0.0", "System.Diagnostics.TraceSource": "4.0.0-rc3-23808", "System.Globalization": "4.0.10", diff --git a/src/System.Diagnostics.TextWriterTraceListener/tests/project.json b/src/System.Diagnostics.TextWriterTraceListener/tests/project.json index 48a3d106fe00..37696dce97cd 100644 --- a/src/System.Diagnostics.TextWriterTraceListener/tests/project.json +++ b/src/System.Diagnostics.TextWriterTraceListener/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Diagnostics.TraceSource": "4.0.0-rc3-23808", "System.Globalization": "4.0.10", "System.IO": "4.0.10", diff --git a/src/System.Diagnostics.Tools/src/project.json b/src/System.Diagnostics.Tools/src/project.json index aec67ec844a5..0cc03501890b 100644 --- a/src/System.Diagnostics.Tools/src/project.json +++ b/src/System.Diagnostics.Tools/src/project.json @@ -7,7 +7,7 @@ }, "net46": { "dependencies": { - "Microsoft.TargetingPack.NetFramework.v4.6": "1.0.0" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } }, "netcore50": { diff --git a/src/System.Diagnostics.Tools/tests/project.json b/src/System.Diagnostics.Tools/tests/project.json index 13e3bd1eb21f..d348119c2fd9 100644 --- a/src/System.Diagnostics.Tools/tests/project.json +++ b/src/System.Diagnostics.Tools/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Diagnostics.Tools": "4.0.0", "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00123" diff --git a/src/System.Diagnostics.TraceSource/src/facade/project.json b/src/System.Diagnostics.TraceSource/src/facade/project.json index f15d78c42d41..2d26366fff58 100644 --- a/src/System.Diagnostics.TraceSource/src/facade/project.json +++ b/src/System.Diagnostics.TraceSource/src/facade/project.json @@ -2,7 +2,7 @@ "frameworks": { "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23530" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Diagnostics.TraceSource/src/project.json b/src/System.Diagnostics.TraceSource/src/project.json index d451ada11d01..b516ec92e9cb 100644 --- a/src/System.Diagnostics.TraceSource/src/project.json +++ b/src/System.Diagnostics.TraceSource/src/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", "System.Diagnostics.Debug": "4.0.10", "System.Diagnostics.Tools": "4.0.0", @@ -14,4 +15,4 @@ "frameworks": { "dnxcore50": {} } -} \ No newline at end of file +} diff --git a/src/System.Diagnostics.TraceSource/tests/project.json b/src/System.Diagnostics.TraceSource/tests/project.json index 3a3a22e1cbfa..5d03ba456315 100644 --- a/src/System.Diagnostics.TraceSource/tests/project.json +++ b/src/System.Diagnostics.TraceSource/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Diagnostics.Process": "4.1.0-rc3-23808", "System.Globalization": "4.0.10", "System.IO": "4.0.10", diff --git a/src/System.Diagnostics.Tracing/src/project.json b/src/System.Diagnostics.Tracing/src/project.json index 80a970d329c1..cd45f8761e15 100644 --- a/src/System.Diagnostics.Tracing/src/project.json +++ b/src/System.Diagnostics.Tracing/src/project.json @@ -2,11 +2,13 @@ "frameworks": { "dnxcore50": { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "Microsoft.TargetingPack.Private.CoreCLR": "1.0.0-rc3-23808" } }, "netcore50": { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10.0", "System.Diagnostics.Contracts": "4.0.0.0", "System.Diagnostics.Debug": "4.0.0.0", @@ -24,7 +26,7 @@ }, "net462": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.1": "1.0.0-rc2-23530" + "Microsoft.TargetingPack.NETFramework.v4.6.1": "1.0.1" } } } diff --git a/src/System.Diagnostics.Tracing/tests/BasicEventSourceTest/project.json b/src/System.Diagnostics.Tracing/tests/BasicEventSourceTest/project.json index b3e3c068a132..3654dac8939d 100644 --- a/src/System.Diagnostics.Tracing/tests/BasicEventSourceTest/project.json +++ b/src/System.Diagnostics.Tracing/tests/BasicEventSourceTest/project.json @@ -1,6 +1,7 @@ { "dependencies": { "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0028", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Globalization": "4.0.10", "System.Globalization.Calendars": "4.0.0", "System.Runtime": "4.0.20", @@ -14,4 +15,4 @@ "imports": "portable-net45+win8" } } -} \ No newline at end of file +} diff --git a/src/System.Diagnostics.Tracing/tests/project.json b/src/System.Diagnostics.Tracing/tests/project.json index cee4e6970834..f4b7231498a5 100644 --- a/src/System.Diagnostics.Tracing/tests/project.json +++ b/src/System.Diagnostics.Tracing/tests/project.json @@ -1,15 +1,16 @@ { "dependencies": { - "System.Diagnostics.Tracing": "4.1.0-rc3-23808", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", + "System.Console": "4.0.0-rc3-23808", "System.Diagnostics.Contracts": "4.0.0", "System.Diagnostics.Process": "4.1.0-rc3-23808", - "System.Console": "4.0.0-rc3-23808", + "System.Diagnostics.Tracing": "4.1.0-rc3-23808", "System.IO.FileSystem": "4.0.0", - "System.Runtime": "4.0.20", - "System.Runtime.Extensions": "4.0.10", "System.Reflection": "4.1.0-rc3-23808", "System.Reflection.Extensions": "4.0.0", "System.Reflection.TypeExtensions": "4.1.0-rc3-23808", + "System.Runtime": "4.0.20", + "System.Runtime.Extensions": "4.0.10", "System.Threading": "4.0.10", "System.Threading.Tasks": "4.0.10", "System.Threading.Thread": "4.0.0-rc3-23808", @@ -17,6 +18,8 @@ "xunit.netcore.extensions": "1.0.0-prerelease-00123" }, "frameworks": { - "dnxcore50": {} + "dnxcore50": { + "imports": "portable-net45+win8" + } } } diff --git a/src/System.Drawing.Primitives/src/project.json b/src/System.Drawing.Primitives/src/project.json index df7ff7694b80..c97fcb81b668 100644 --- a/src/System.Drawing.Primitives/src/project.json +++ b/src/System.Drawing.Primitives/src/project.json @@ -2,14 +2,15 @@ "frameworks": { "dnxcore50": { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", + "System.Diagnostics.Contracts": "4.0.1-rc3-23808", "System.Runtime": "4.0.0", - "System.Runtime.Extensions": "4.0.0", - "System.Diagnostics.Contracts": "4.0.1-rc3-23808" + "System.Runtime.Extensions": "4.0.0" } }, "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Drawing.Primitives/tests/project.json b/src/System.Drawing.Primitives/tests/project.json index 2a1657031e6b..c6d6deb912b2 100644 --- a/src/System.Drawing.Primitives/tests/project.json +++ b/src/System.Drawing.Primitives/tests/project.json @@ -1,12 +1,14 @@ { - "dependencies": { - "System.Runtime": "4.0.20", - "System.Globalization": "4.0.0", - "xunit": "2.1.0", - "xunit.netcore.extensions": "1.0.0-prerelease-00123" - }, - "frameworks": { - "dnxcore50": { } + "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", + "System.Globalization": "4.0.0", + "System.Runtime": "4.0.20", + "xunit": "2.1.0", + "xunit.netcore.extensions": "1.0.0-prerelease-00123" + }, + "frameworks": { + "dnxcore50": { + "imports": "portable-net45+win8" } + } } - diff --git a/src/System.Dynamic.Runtime/src/System.Dynamic.Runtime.csproj b/src/System.Dynamic.Runtime/src/System.Dynamic.Runtime.csproj index d5717d446fff..f0815e96aa78 100644 --- a/src/System.Dynamic.Runtime/src/System.Dynamic.Runtime.csproj +++ b/src/System.Dynamic.Runtime/src/System.Dynamic.Runtime.csproj @@ -21,9 +21,10 @@ + - netcore50aot/project.json - netcore50aot/project.lock.json + netcore50/project.json + netcore50/project.lock.json $(DefineConstants);FEATURE_DYNAMIC_DELEGATE diff --git a/src/System.Dynamic.Runtime/src/netcore50aot/project.json b/src/System.Dynamic.Runtime/src/netcore50/project.json similarity index 93% rename from src/System.Dynamic.Runtime/src/netcore50aot/project.json rename to src/System.Dynamic.Runtime/src/netcore50/project.json index 84343bed0e66..e9a6c7901a06 100644 --- a/src/System.Dynamic.Runtime/src/netcore50aot/project.json +++ b/src/System.Dynamic.Runtime/src/netcore50/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", "System.Diagnostics.Contracts": "4.0.0", "System.Diagnostics.Debug": "4.0.10", @@ -22,4 +23,4 @@ "frameworks": { "netcore50": {} } -} \ No newline at end of file +} diff --git a/src/System.Dynamic.Runtime/src/project.json b/src/System.Dynamic.Runtime/src/project.json index 256f50f4fa28..4ce175338bf0 100644 --- a/src/System.Dynamic.Runtime/src/project.json +++ b/src/System.Dynamic.Runtime/src/project.json @@ -2,6 +2,7 @@ "frameworks": { "dnxcore50": { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", "System.Diagnostics.Contracts": "4.0.0", "System.Diagnostics.Debug": "4.0.10", @@ -24,8 +25,8 @@ }, "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } -} \ No newline at end of file +} diff --git a/src/System.Dynamic.Runtime/tests/project.json b/src/System.Dynamic.Runtime/tests/project.json index d69718628db8..bdeb141ac79b 100644 --- a/src/System.Dynamic.Runtime/tests/project.json +++ b/src/System.Dynamic.Runtime/tests/project.json @@ -1,6 +1,7 @@ { "dependencies": { "Microsoft.CSharp": "4.0.0", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", "System.Console": "4.0.0-rc3-23808", "System.Diagnostics.Contracts": "4.0.0", diff --git a/src/System.Globalization.Calendars/src/project.json b/src/System.Globalization.Calendars/src/project.json index 7e5e0697264a..070ee62c662e 100644 --- a/src/System.Globalization.Calendars/src/project.json +++ b/src/System.Globalization.Calendars/src/project.json @@ -12,7 +12,7 @@ }, "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23530" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Globalization.Calendars/tests/project.json b/src/System.Globalization.Calendars/tests/project.json index 961bc45f6419..3141f2c8c0cd 100644 --- a/src/System.Globalization.Calendars/tests/project.json +++ b/src/System.Globalization.Calendars/tests/project.json @@ -1,9 +1,10 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Globalization": "4.0.10", - "System.Threading.Tasks": "4.0.10", - "System.Runtime.Extensions": "4.0.10", "System.Globalization.Calendars": "4.0.0", + "System.Runtime.Extensions": "4.0.10", + "System.Threading.Tasks": "4.0.10", "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00123" }, diff --git a/src/System.Globalization.Extensions/src/System.Globalization.Extensions.csproj b/src/System.Globalization.Extensions/src/System.Globalization.Extensions.csproj index 456b7fd88ca7..f69c629d5c3a 100644 --- a/src/System.Globalization.Extensions/src/System.Globalization.Extensions.csproj +++ b/src/System.Globalization.Extensions/src/System.Globalization.Extensions.csproj @@ -15,6 +15,7 @@ dotnet5.4 true true + .NETPlatform,Version=v5.4 diff --git a/src/System.Globalization.Extensions/src/project.json b/src/System.Globalization.Extensions/src/project.json index 2cf388ceeee1..dd59e7bc28ca 100644 --- a/src/System.Globalization.Extensions/src/project.json +++ b/src/System.Globalization.Extensions/src/project.json @@ -15,7 +15,7 @@ }, "net46":{ "dependencies": { - "Microsoft.TargetingPack.NetFramework.v4.6": "1.0.0", + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1", } } } diff --git a/src/System.Globalization.Extensions/tests/project.json b/src/System.Globalization.Extensions/tests/project.json index 2ffbf9bcca83..d1b0817cf9c3 100644 --- a/src/System.Globalization.Extensions/tests/project.json +++ b/src/System.Globalization.Extensions/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Console": "4.0.0-rc3-23808", "System.Globalization.Extensions": "4.0.0", "System.IO": "4.0.10", diff --git a/src/System.Globalization/src/project.json b/src/System.Globalization/src/project.json index 7e5e0697264a..070ee62c662e 100644 --- a/src/System.Globalization/src/project.json +++ b/src/System.Globalization/src/project.json @@ -12,7 +12,7 @@ }, "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23530" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Globalization/tests/project.json b/src/System.Globalization/tests/project.json index af44d099d651..3654dac8939d 100644 --- a/src/System.Globalization/tests/project.json +++ b/src/System.Globalization/tests/project.json @@ -1,6 +1,7 @@ { "dependencies": { "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0028", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Globalization": "4.0.10", "System.Globalization.Calendars": "4.0.0", "System.Runtime": "4.0.20", diff --git a/src/System.IO.Compression.ZipFile/src/project.json b/src/System.IO.Compression.ZipFile/src/project.json index 7b779dce82bc..27bad180be6d 100644 --- a/src/System.IO.Compression.ZipFile/src/project.json +++ b/src/System.IO.Compression.ZipFile/src/project.json @@ -2,6 +2,7 @@ "frameworks": { "dnxcore50": { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Buffers": "4.0.0-rc3-23808", "System.Diagnostics.Contracts": "4.0.0", "System.Diagnostics.Debug": "4.0.10", @@ -18,7 +19,7 @@ }, "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.IO.Compression.ZipFile/tests/project.json b/src/System.IO.Compression.ZipFile/tests/project.json index 3add63aa9957..b061542780ff 100644 --- a/src/System.IO.Compression.ZipFile/tests/project.json +++ b/src/System.IO.Compression.ZipFile/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Buffers": "4.0.0-rc3-23808", "System.Collections": "4.0.10", "System.Console": "4.0.0-rc3-23808", diff --git a/src/System.IO.Compression/src/project.json b/src/System.IO.Compression/src/project.json index 847efdc95210..03cb31a56b32 100644 --- a/src/System.IO.Compression/src/project.json +++ b/src/System.IO.Compression/src/project.json @@ -2,6 +2,7 @@ "frameworks": { "dnxcore50": { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Buffers": "4.0.0-rc3-23808", "System.Collections": "4.0.10", "System.Diagnostics.Contracts": "4.0.0", @@ -20,7 +21,7 @@ }, "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0", + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1", "System.Buffers": "4.0.0-rc3-23808" } } diff --git a/src/System.IO.Compression/tests/project.json b/src/System.IO.Compression/tests/project.json index 4cf77e8cee0d..b23884779ef0 100644 --- a/src/System.IO.Compression/tests/project.json +++ b/src/System.IO.Compression/tests/project.json @@ -1,6 +1,7 @@ { "dependencies": { "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0028", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Buffers": "4.0.0-rc3-23808", "System.Collections": "4.0.10", "System.Console": "4.0.0-rc3-23808", diff --git a/src/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj b/src/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj index bb50284f7916..2c70b991fee8 100644 --- a/src/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj +++ b/src/System.IO.FileSystem.AccessControl/src/System.IO.FileSystem.AccessControl.csproj @@ -8,6 +8,7 @@ true dotnet5.4 true + .NETPlatform,Version=v5.4 diff --git a/src/System.IO.FileSystem.AccessControl/src/project.json b/src/System.IO.FileSystem.AccessControl/src/project.json index 9cd6bfb06269..6ffa150925db 100644 --- a/src/System.IO.FileSystem.AccessControl/src/project.json +++ b/src/System.IO.FileSystem.AccessControl/src/project.json @@ -20,7 +20,7 @@ }, "net46": { "dependencies": { - "Microsoft.TargetingPack.NetFramework.v4.6": "1.0.0" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.IO.FileSystem.AccessControl/tests/project.json b/src/System.IO.FileSystem.AccessControl/tests/project.json index 2472f928e2d0..a43372dafa4c 100644 --- a/src/System.IO.FileSystem.AccessControl/tests/project.json +++ b/src/System.IO.FileSystem.AccessControl/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", "System.Diagnostics.Contracts": "4.0.0", "System.Diagnostics.Debug": "4.0.10", @@ -18,6 +19,8 @@ "xunit.netcore.extensions": "1.0.0-prerelease-00123" }, "frameworks": { - "dnxcore50": {} + "dnxcore50": { + "imports": "portable-net45+win8" + } } } diff --git a/src/System.IO.FileSystem.DriveInfo/src/facade/project.json b/src/System.IO.FileSystem.DriveInfo/src/facade/project.json index f15d78c42d41..2d26366fff58 100644 --- a/src/System.IO.FileSystem.DriveInfo/src/facade/project.json +++ b/src/System.IO.FileSystem.DriveInfo/src/facade/project.json @@ -2,7 +2,7 @@ "frameworks": { "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23530" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.IO.FileSystem.DriveInfo/src/project.json b/src/System.IO.FileSystem.DriveInfo/src/project.json index 46362bf81906..3e62eec93773 100644 --- a/src/System.IO.FileSystem.DriveInfo/src/project.json +++ b/src/System.IO.FileSystem.DriveInfo/src/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Diagnostics.Contracts": "4.0.0", "System.Diagnostics.Debug": "4.0.10", "System.Diagnostics.Tools": "4.0.0", @@ -14,4 +15,4 @@ "frameworks": { "dnxcore50": {} } -} \ No newline at end of file +} diff --git a/src/System.IO.FileSystem.DriveInfo/tests/project.json b/src/System.IO.FileSystem.DriveInfo/tests/project.json index 6154e1761833..781ebb32bdb8 100644 --- a/src/System.IO.FileSystem.DriveInfo/tests/project.json +++ b/src/System.IO.FileSystem.DriveInfo/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", "System.IO.FileSystem": "4.0.0", "System.Linq": "4.0.0", diff --git a/src/System.IO.FileSystem.Primitives/src/facade/project.json b/src/System.IO.FileSystem.Primitives/src/facade/project.json index f15d78c42d41..2d26366fff58 100644 --- a/src/System.IO.FileSystem.Primitives/src/facade/project.json +++ b/src/System.IO.FileSystem.Primitives/src/facade/project.json @@ -2,7 +2,7 @@ "frameworks": { "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23530" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.IO.FileSystem.Primitives/tests/project.json b/src/System.IO.FileSystem.Primitives/tests/project.json index d836114ab0bd..a1b54c6e7c25 100644 --- a/src/System.IO.FileSystem.Primitives/tests/project.json +++ b/src/System.IO.FileSystem.Primitives/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Runtime": "4.0.20", "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00123" diff --git a/src/System.IO.FileSystem.Watcher/src/facade/project.json b/src/System.IO.FileSystem.Watcher/src/facade/project.json index f15d78c42d41..2d26366fff58 100644 --- a/src/System.IO.FileSystem.Watcher/src/facade/project.json +++ b/src/System.IO.FileSystem.Watcher/src/facade/project.json @@ -2,7 +2,7 @@ "frameworks": { "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23530" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.IO.FileSystem.Watcher/src/project.json b/src/System.IO.FileSystem.Watcher/src/project.json index c06b4169b653..9e9b52fcfc7a 100644 --- a/src/System.IO.FileSystem.Watcher/src/project.json +++ b/src/System.IO.FileSystem.Watcher/src/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "Microsoft.Win32.Primitives": "4.0.0", "System.Diagnostics.Debug": "4.0.10", "System.Diagnostics.Tools": "4.0.0", diff --git a/src/System.IO.FileSystem.Watcher/tests/project.json b/src/System.IO.FileSystem.Watcher/tests/project.json index 4bdea88f2083..2646a4468078 100644 --- a/src/System.IO.FileSystem.Watcher/tests/project.json +++ b/src/System.IO.FileSystem.Watcher/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.IO": "4.0.10", "System.IO.FileSystem": "4.0.0", "System.IO.FileSystem.Primitives": "4.0.0", diff --git a/src/System.IO.FileSystem/src/facade/project.json b/src/System.IO.FileSystem/src/facade/project.json index f15d78c42d41..2d26366fff58 100644 --- a/src/System.IO.FileSystem/src/facade/project.json +++ b/src/System.IO.FileSystem/src/facade/project.json @@ -2,7 +2,7 @@ "frameworks": { "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23530" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.IO.FileSystem/src/netcore50/project.json b/src/System.IO.FileSystem/src/netcore50/project.json new file mode 100644 index 000000000000..0e3247f3f77d --- /dev/null +++ b/src/System.IO.FileSystem/src/netcore50/project.json @@ -0,0 +1,37 @@ +{ + "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", + "System.Collections": "4.0.10", + "System.Diagnostics.Contracts": "4.0.0", + "System.Diagnostics.Debug": "4.0.10", + "System.Diagnostics.Tools": "4.0.0", + "System.IO": "4.0.10", + "System.IO.FileSystem.Primitives": "4.0.0", + "System.Resources.ResourceManager": "4.0.0", + "System.Runtime": "4.0.20", + "System.Runtime.Extensions": "4.0.10", + "System.Runtime.Handles": "4.0.0", + "System.Runtime.InteropServices": "4.0.20", + "System.Text.Encoding": "4.0.10", + "System.Text.Encoding.Extensions": "4.0.10", + "System.Threading": "4.0.10", + "System.Threading.Overlapped": "4.0.0", + "System.Threading.Tasks": "4.0.10" + }, + "frameworks": { + "netcore50": { + "dependencies": { + "Microsoft.TargetingPack.Private.NetNative": "1.0.0-rc3-23808", + "Microsoft.TargetingPack.Private.WinRT": "1.0.1", + "System.Globalization": "4.0.10", + "System.Reflection": "4.0.10", + "System.Reflection.Primitives": "4.0.0", + "System.Runtime.WindowsRuntime": "4.0.0" + } + } + }, + "runtimes": { + "win8-x86": {}, + "win8-x64": {} + } +} diff --git a/src/System.IO.FileSystem/src/project.json b/src/System.IO.FileSystem/src/project.json index bf181868e3bb..de0210e1d1e8 100644 --- a/src/System.IO.FileSystem/src/project.json +++ b/src/System.IO.FileSystem/src/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Buffers": "4.0.0-rc3-23808", "System.Collections": "4.0.10", "System.Diagnostics.Contracts": "4.0.0", @@ -21,17 +22,6 @@ "frameworks": { "dnxcore50": { "dependencies": {} - }, - "netcore50": { - "dependencies": { - "Microsoft.TargetingPack.Private.NetNative": "1.0.0-rc3-23808", - "Microsoft.TargetingPack.Private.WinRT": "1.0.0", - "System.Globalization": "4.0.10", - "System.Reflection": "4.0.10", - "System.Reflection.Primitives": "4.0.0", - "System.Runtime.WindowsRuntime": "4.0.0", - "System.Threading.ThreadPool": "4.0.10-rc3-23808" - } } } } diff --git a/src/System.IO.FileSystem/tests/project.json b/src/System.IO.FileSystem/tests/project.json index a3e14dec5492..832ebe11810b 100644 --- a/src/System.IO.FileSystem/tests/project.json +++ b/src/System.IO.FileSystem/tests/project.json @@ -1,10 +1,11 @@ { "dependencies": { "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0028", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", "System.Console": "4.0.0-rc3-23808", "System.Diagnostics.Debug": "4.0.10", - "System.Diagnostics.Process": "4.0.0", + "System.Diagnostics.Process": "4.1.0-rc3-23808", "System.Globalization": "4.0.10", "System.IO": "4.0.10", "System.IO.FileSystem.Primitives": "4.0.0", diff --git a/src/System.IO.IsolatedStorage/src/project.json b/src/System.IO.IsolatedStorage/src/project.json index 1454fa5acf0c..2fd6239a21bb 100644 --- a/src/System.IO.IsolatedStorage/src/project.json +++ b/src/System.IO.IsolatedStorage/src/project.json @@ -2,8 +2,9 @@ "frameworks": { "netcore50": { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "Microsoft.TargetingPack.Private.NetNative": "1.0.0-rc3-23808", - "Microsoft.TargetingPack.Private.WinRt": "1.0.0", + "Microsoft.TargetingPack.Private.WinRt": "1.0.1", "System.Collections": "4.0.0.0", "System.Diagnostics.Contracts": "4.0.0.0", "System.IO": "4.0.10.0", @@ -17,5 +18,9 @@ "System.Threading.Tasks": "4.0.10.0" } } + }, + "runtimes": { + "win8-x86": {}, + "win8-x64": {} } } diff --git a/src/System.IO.MemoryMappedFiles/src/facade/project.json b/src/System.IO.MemoryMappedFiles/src/facade/project.json index f15d78c42d41..2d26366fff58 100644 --- a/src/System.IO.MemoryMappedFiles/src/facade/project.json +++ b/src/System.IO.MemoryMappedFiles/src/facade/project.json @@ -2,7 +2,7 @@ "frameworks": { "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23530" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.IO.MemoryMappedFiles/src/project.json b/src/System.IO.MemoryMappedFiles/src/project.json index 5a540066e66c..6709579a6903 100644 --- a/src/System.IO.MemoryMappedFiles/src/project.json +++ b/src/System.IO.MemoryMappedFiles/src/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Diagnostics.Debug": "4.0.10", "System.Diagnostics.Tools": "4.0.0", "System.IO": "4.0.10", @@ -16,4 +17,4 @@ "frameworks": { "dnxcore50": {} } -} \ No newline at end of file +} diff --git a/src/System.IO.MemoryMappedFiles/tests/project.json b/src/System.IO.MemoryMappedFiles/tests/project.json index a10f93f73ea6..25f22fd627d6 100644 --- a/src/System.IO.MemoryMappedFiles/tests/project.json +++ b/src/System.IO.MemoryMappedFiles/tests/project.json @@ -1,6 +1,7 @@ { "dependencies": { "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0028", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.IO": "4.0.10", "System.IO.FileSystem": "4.0.0", "System.IO.FileSystem.Primitives": "4.0.0", diff --git a/src/System.IO.Packaging/src/System.IO.Packaging.csproj b/src/System.IO.Packaging/src/System.IO.Packaging.csproj index 051383d9d569..3aeb58563203 100644 --- a/src/System.IO.Packaging/src/System.IO.Packaging.csproj +++ b/src/System.IO.Packaging/src/System.IO.Packaging.csproj @@ -9,6 +9,7 @@ true dotnet5.4 true + .NETPlatform,Version=v5.4 diff --git a/src/System.IO.Packaging/src/project.json b/src/System.IO.Packaging/src/project.json index 8e066c7e36ee..94e68223e1a8 100644 --- a/src/System.IO.Packaging/src/project.json +++ b/src/System.IO.Packaging/src/project.json @@ -13,7 +13,7 @@ }, "net46":{ "dependencies": { - "Microsoft.TargetingPack.NetFramework.v4.6": "1.0.0", + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1", } } } diff --git a/src/System.IO.Packaging/tests/project.json b/src/System.IO.Packaging/tests/project.json index 2134b6714b19..0f28638567b8 100644 --- a/src/System.IO.Packaging/tests/project.json +++ b/src/System.IO.Packaging/tests/project.json @@ -1,8 +1,9 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", - "System.IO.FileSystem.Primitives": "4.0.0", "System.IO.FileSystem": "4.0.0", + "System.IO.FileSystem.Primitives": "4.0.0", "System.IO.Packaging.TestData": "1.0.0-prerelease", "System.Linq": "4.0.0", "System.Runtime": "4.0.20", diff --git a/src/System.IO.Pipes/src/facade/project.json b/src/System.IO.Pipes/src/facade/project.json index f15d78c42d41..2d26366fff58 100644 --- a/src/System.IO.Pipes/src/facade/project.json +++ b/src/System.IO.Pipes/src/facade/project.json @@ -2,7 +2,7 @@ "frameworks": { "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23530" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.IO.Pipes/src/project.json b/src/System.IO.Pipes/src/project.json index 4e0d59a4240b..021d303713ea 100644 --- a/src/System.IO.Pipes/src/project.json +++ b/src/System.IO.Pipes/src/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Buffers": "4.0.0-rc3-23808", "System.Diagnostics.Contracts": "4.0.0", "System.Diagnostics.Debug": "4.0.10", diff --git a/src/System.IO.Pipes/tests/project.json b/src/System.IO.Pipes/tests/project.json index e013a07b9edd..694a76ea769e 100644 --- a/src/System.IO.Pipes/tests/project.json +++ b/src/System.IO.Pipes/tests/project.json @@ -1,6 +1,7 @@ { "dependencies": { "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0028", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Diagnostics.Debug": "4.0.10", "System.IO": "4.0.10", "System.IO.FileSystem": "4.0.0", @@ -10,8 +11,8 @@ "System.Runtime.InteropServices": "4.0.20", "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc3-23808", "System.Security.Principal": "4.0.0", - "System.Threading.Tasks": "4.0.10", "System.Threading.Overlapped": "4.0.0", + "System.Threading.Tasks": "4.0.10", "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00123" }, diff --git a/src/System.IO.UnmanagedMemoryStream/src/facade/project.json b/src/System.IO.UnmanagedMemoryStream/src/facade/project.json index f15d78c42d41..2d26366fff58 100644 --- a/src/System.IO.UnmanagedMemoryStream/src/facade/project.json +++ b/src/System.IO.UnmanagedMemoryStream/src/facade/project.json @@ -2,7 +2,7 @@ "frameworks": { "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23530" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.IO.UnmanagedMemoryStream/src/project.json b/src/System.IO.UnmanagedMemoryStream/src/project.json index f1ad8e9f3a51..fa4dcaee32cf 100644 --- a/src/System.IO.UnmanagedMemoryStream/src/project.json +++ b/src/System.IO.UnmanagedMemoryStream/src/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Buffers": "4.0.0-rc3-23808", "System.Diagnostics.Contracts": "4.0.0", "System.Diagnostics.Debug": "4.0.10", diff --git a/src/System.IO.UnmanagedMemoryStream/tests/project.json b/src/System.IO.UnmanagedMemoryStream/tests/project.json index 443c379a2618..41fabf06e513 100644 --- a/src/System.IO.UnmanagedMemoryStream/tests/project.json +++ b/src/System.IO.UnmanagedMemoryStream/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", "System.Diagnostics.Debug": "4.0.10", "System.IO": "4.0.10", diff --git a/src/System.IO/src/project.json b/src/System.IO/src/project.json index a6188837b582..944330e6a14c 100644 --- a/src/System.IO/src/project.json +++ b/src/System.IO/src/project.json @@ -2,11 +2,14 @@ "frameworks": { "dnxcore50": { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "Microsoft.TargetingPack.Private.CoreCLR": "1.0.0-rc3-23808" } }, "netcore50": { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", + "Microsoft.TargetingPack.Private.NetNative": "1.0.0-rc3-23808", "System.Diagnostics.Contracts": "4.0.0", "System.Diagnostics.Debug": "4.0.10", "System.Diagnostics.Tools": "4.0.0", @@ -14,13 +17,12 @@ "System.Runtime.Extensions": "4.0.10", "System.Text.Encoding.Extensions": "4.0.0", "System.Threading": "4.0.0", - "System.Threading.Tasks": "4.0.10", - "Microsoft.TargetingPack.Private.NetNative": "1.0.0-rc3-23808" + "System.Threading.Tasks": "4.0.10" } }, "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.IO/tests/project.json b/src/System.IO/tests/project.json index e3f488916d52..70920462029e 100644 --- a/src/System.IO/tests/project.json +++ b/src/System.IO/tests/project.json @@ -1,7 +1,8 @@ { "dependencies": { - "System.IO": "4.1.0-rc3-23808", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Globalization": "4.0.10", + "System.IO": "4.1.0-rc3-23808", "System.Text.Encoding.CodePages": "4.0.0", "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00123" diff --git a/src/System.Linq.Expressions/src/Facade/project.json b/src/System.Linq.Expressions/src/Facade/project.json index f15d78c42d41..2d26366fff58 100644 --- a/src/System.Linq.Expressions/src/Facade/project.json +++ b/src/System.Linq.Expressions/src/Facade/project.json @@ -2,7 +2,7 @@ "frameworks": { "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23530" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Linq.Expressions/src/System.Linq.Expressions.csproj b/src/System.Linq.Expressions/src/System.Linq.Expressions.csproj index 4e03c88b6870..308ab7036698 100644 --- a/src/System.Linq.Expressions/src/System.Linq.Expressions.csproj +++ b/src/System.Linq.Expressions/src/System.Linq.Expressions.csproj @@ -24,9 +24,10 @@ + - netcore50aot/project.json - netcore50aot/project.lock.json + netcore50/project.json + netcore50/project.lock.json $(DefineConstants);FEATURE_DYNAMIC_DELEGATE diff --git a/src/System.Linq.Expressions/src/netcore50aot/project.json b/src/System.Linq.Expressions/src/netcore50/project.json similarity index 81% rename from src/System.Linq.Expressions/src/netcore50aot/project.json rename to src/System.Linq.Expressions/src/netcore50/project.json index 5432c25bc7f7..e7e2dd932cd9 100644 --- a/src/System.Linq.Expressions/src/netcore50aot/project.json +++ b/src/System.Linq.Expressions/src/netcore50/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "Microsoft.TargetingPack.Private.NetNative": "1.0.0-rc3-23808", "System.Collections": "4.0.10", "System.Diagnostics.Contracts": "4.0.0", @@ -10,6 +11,9 @@ "System.Linq": "4.0.0", "System.ObjectModel": "4.0.10", "System.Reflection": "4.0.10", + "System.Reflection.Emit": "4.0.0", + "System.Reflection.Emit.ILGeneration": "4.0.0", + "System.Reflection.Emit.Lightweight": "4.0.0", "System.Reflection.Extensions": "4.0.0", "System.Reflection.Primitives": "4.0.0", "System.Reflection.TypeExtensions": "4.0.0", diff --git a/src/System.Linq.Expressions/src/project.json b/src/System.Linq.Expressions/src/project.json index cb55ef3a99d0..c6860cdb180d 100644 --- a/src/System.Linq.Expressions/src/project.json +++ b/src/System.Linq.Expressions/src/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", "System.Diagnostics.Contracts": "4.0.0", "System.Diagnostics.Debug": "4.0.10", @@ -23,13 +24,12 @@ }, "frameworks": { "dnxcore50": { - "dependencies": { - } + "dependencies": {} }, "net46": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23530" - } + "dependencies": { + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" + } } } -} \ No newline at end of file +} diff --git a/src/System.Linq.Expressions/tests/project.json b/src/System.Linq.Expressions/tests/project.json index fe9d251e371a..5da5c1b9af8d 100644 --- a/src/System.Linq.Expressions/tests/project.json +++ b/src/System.Linq.Expressions/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", "System.Console": "4.0.0-rc3-23808", "System.Globalization": "4.0.10", diff --git a/src/System.Linq.Parallel/src/facade/project.json b/src/System.Linq.Parallel/src/facade/project.json index f15d78c42d41..2d26366fff58 100644 --- a/src/System.Linq.Parallel/src/facade/project.json +++ b/src/System.Linq.Parallel/src/facade/project.json @@ -2,7 +2,7 @@ "frameworks": { "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23530" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Linq.Parallel/src/project.json b/src/System.Linq.Parallel/src/project.json index cc831016615c..4c3c2e88526e 100644 --- a/src/System.Linq.Parallel/src/project.json +++ b/src/System.Linq.Parallel/src/project.json @@ -1,19 +1,20 @@ { "dependencies": { - "System.Runtime": "4.0.20", - "System.Linq": "4.0.0", - "System.Threading": "4.0.10", - "System.Diagnostics.Tracing": "4.0.20", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", - "System.Resources.ResourceManager": "4.0.0", - "System.Threading.Tasks": "4.0.10", "System.Collections.Concurrent": "4.0.10", - "System.Diagnostics.Tools": "4.0.0", + "System.Diagnostics.Contracts": "4.0.0", "System.Diagnostics.Debug": "4.0.10", + "System.Diagnostics.Tools": "4.0.0", + "System.Diagnostics.Tracing": "4.0.20", + "System.Linq": "4.0.0", + "System.Resources.ResourceManager": "4.0.0", + "System.Runtime": "4.0.20", "System.Runtime.Extensions": "4.0.10", - "System.Diagnostics.Contracts": "4.0.0" + "System.Threading": "4.0.10", + "System.Threading.Tasks": "4.0.10" }, "frameworks": { "dnxcore50": {} } -} \ No newline at end of file +} diff --git a/src/System.Linq.Parallel/tests/project.json b/src/System.Linq.Parallel/tests/project.json index 2ecea3654679..8fd2bce97c72 100644 --- a/src/System.Linq.Parallel/tests/project.json +++ b/src/System.Linq.Parallel/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", "System.Collections.Concurrent": "4.0.10", "System.Diagnostics.Debug": "4.0.10", diff --git a/src/System.Linq.Queryable/src/facade/project.json b/src/System.Linq.Queryable/src/facade/project.json index f15d78c42d41..2d26366fff58 100644 --- a/src/System.Linq.Queryable/src/facade/project.json +++ b/src/System.Linq.Queryable/src/facade/project.json @@ -2,7 +2,7 @@ "frameworks": { "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23530" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Linq.Queryable/src/project.json b/src/System.Linq.Queryable/src/project.json index e49c9246c2d8..82a32850069e 100644 --- a/src/System.Linq.Queryable/src/project.json +++ b/src/System.Linq.Queryable/src/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", "System.Linq": "4.0.0", "System.Linq.Expressions": "4.0.10", @@ -12,4 +13,4 @@ "frameworks": { "dnxcore50": {} } -} \ No newline at end of file +} diff --git a/src/System.Linq.Queryable/tests/project.json b/src/System.Linq.Queryable/tests/project.json index c0bde298ba79..39edb749b128 100644 --- a/src/System.Linq.Queryable/tests/project.json +++ b/src/System.Linq.Queryable/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", "System.Linq": "4.0.0", "System.Linq.Expressions": "4.0.10", diff --git a/src/System.Linq/src/facade/project.json b/src/System.Linq/src/facade/project.json index f15d78c42d41..2d26366fff58 100644 --- a/src/System.Linq/src/facade/project.json +++ b/src/System.Linq/src/facade/project.json @@ -2,7 +2,7 @@ "frameworks": { "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23530" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Linq/src/project.json b/src/System.Linq/src/project.json index 72c5bcd97b94..99cae3def1ae 100644 --- a/src/System.Linq/src/project.json +++ b/src/System.Linq/src/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", "System.Diagnostics.Debug": "4.0.10", "System.Resources.ResourceManager": "4.0.0", @@ -10,4 +11,4 @@ "frameworks": { "dnxcore50": {} } -} \ No newline at end of file +} diff --git a/src/System.Linq/tests/project.json b/src/System.Linq/tests/project.json index 7e50fb791bde..50cadfa9eb6f 100644 --- a/src/System.Linq/tests/project.json +++ b/src/System.Linq/tests/project.json @@ -1,11 +1,12 @@ { "dependencies": { "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0028", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", + "System.Console": "4.0.0-rc3-23808", + "System.Diagnostics.Debug": "4.0.10", "System.Runtime": "4.0.20", "System.Runtime.Extensions": "4.0.10", - "System.Diagnostics.Debug": "4.0.10", - "System.Console": "4.0.0-rc3-23808", "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00123" }, diff --git a/src/System.Net.Http.Rtc/src/netcore50/project.json b/src/System.Net.Http.Rtc/src/netcore50/project.json new file mode 100644 index 000000000000..7ca159ca97d3 --- /dev/null +++ b/src/System.Net.Http.Rtc/src/netcore50/project.json @@ -0,0 +1,15 @@ +{ + "frameworks": { + "netcore50": { + "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", + "System.Net.Http": "4.0.0", + "System.Runtime": "4.0.20" + } + } + }, + "runtimes": { + "win8-x86": {}, + "win8-x64": {} + } +} diff --git a/src/System.Net.Http.Rtc/src/project.json b/src/System.Net.Http.Rtc/src/project.json deleted file mode 100644 index fad4a31770cc..000000000000 --- a/src/System.Net.Http.Rtc/src/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "frameworks": { - "netcore50": { - "dependencies": { - "System.Net.Http": "4.0.0", - "System.Runtime": "4.0.20", - } - } - } -} diff --git a/src/System.Net.Http.WinHttpHandler/src/project.json b/src/System.Net.Http.WinHttpHandler/src/project.json index fb373fbed663..9dd6fc8a3f4d 100644 --- a/src/System.Net.Http.WinHttpHandler/src/project.json +++ b/src/System.Net.Http.WinHttpHandler/src/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "Microsoft.Win32.Primitives": "4.0.0", "System.Globalization": "4.0.10", "System.IO": "4.0.10", diff --git a/src/System.Net.Http.WinHttpHandler/tests/FunctionalTests/project.json b/src/System.Net.Http.WinHttpHandler/tests/FunctionalTests/project.json index 7fc896e20af9..7dd75642946c 100644 --- a/src/System.Net.Http.WinHttpHandler/tests/FunctionalTests/project.json +++ b/src/System.Net.Http.WinHttpHandler/tests/FunctionalTests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "Microsoft.Win32.Primitives": "4.0.0", "System.Net.Http": "4.0.0", "System.Net.Primitives": "4.0.11-rc3-23808", diff --git a/src/System.Net.Http.WinHttpHandler/tests/UnitTests/project.json b/src/System.Net.Http.WinHttpHandler/tests/UnitTests/project.json index e5ea20f66981..4bc191f732c1 100644 --- a/src/System.Net.Http.WinHttpHandler/tests/UnitTests/project.json +++ b/src/System.Net.Http.WinHttpHandler/tests/UnitTests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "Microsoft.Win32.Primitives": "4.0.0", "System.Globalization": "4.0.10", "System.IO": "4.0.10", diff --git a/src/System.Net.Http/src/System.Net.Http.csproj b/src/System.Net.Http/src/System.Net.Http.csproj index e7844d157878..fdaf6f916a0b 100644 --- a/src/System.Net.Http/src/System.Net.Http.csproj +++ b/src/System.Net.Http/src/System.Net.Http.csproj @@ -15,6 +15,10 @@ dotnet5.4 true + + unix/project.json + unix/project.lock.json + diff --git a/src/System.Net.Http/src/netcore50/project.json b/src/System.Net.Http/src/netcore50/project.json new file mode 100644 index 000000000000..efe720adddba --- /dev/null +++ b/src/System.Net.Http/src/netcore50/project.json @@ -0,0 +1,24 @@ +{ + "frameworks": { + "netcore50": { + "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", + "Microsoft.TargetingPack.Private.WinRT": "1.0.1", + "System.Diagnostics.Contracts": "4.0.0", + "System.Diagnostics.Debug": "4.0.10", + "System.Diagnostics.Tools": "4.0.0", + "System.Diagnostics.Tracing": "4.0.0", + "System.Net.Primitives": "4.0.10", + "System.Resources.ResourceManager": "4.0.0", + "System.Runtime.Extensions": "4.0.10", + "System.Runtime.WindowsRuntime": "4.0.10", + "System.Text.Encoding.Extensions": "4.0.10", + "System.Threading.Tasks": "4.0.10" + } + } + }, + "runtimes": { + "win8-x86": {}, + "win8-x64": {} + } +} diff --git a/src/System.Net.Http/src/project.json b/src/System.Net.Http/src/project.json index 851b18b64f9a..ed2fba9761d2 100644 --- a/src/System.Net.Http/src/project.json +++ b/src/System.Net.Http/src/project.json @@ -2,6 +2,7 @@ "frameworks": { "dnxcore50": { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "Microsoft.Win32.Primitives": "4.0.0", "System.Diagnostics.Contracts": "4.0.0", "System.Diagnostics.Tools": "4.0.0", @@ -14,7 +15,6 @@ "System.Runtime.Handles": "4.0.0", "System.Runtime.InteropServices": "4.0.20", "System.Security.Cryptography.X509Certificates": "4.0.0-rc3-23808", - "System.Security.Cryptography.OpenSsl": "4.0.0-rc3-23808", "System.Text.Encoding": "4.0.10", "System.Threading": "4.0.0", "System.Threading.Tasks": "4.0.10" @@ -22,22 +22,7 @@ }, "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0" - } - }, - "netcore50": { - "dependencies": { - "Microsoft.TargetingPack.Private.WinRT": "1.0.0", - "System.Diagnostics.Contracts": "4.0.0", - "System.Diagnostics.Debug": "4.0.10", - "System.Diagnostics.Tools": "4.0.0", - "System.Diagnostics.Tracing": "4.0.0", - "System.Net.Primitives": "4.0.10", - "System.Resources.ResourceManager": "4.0.0", - "System.Runtime.Extensions": "4.0.10", - "System.Runtime.WindowsRuntime": "4.0.10", - "System.Text.Encoding.Extensions": "4.0.10", - "System.Threading.Tasks": "4.0.10" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Net.Http/src/unix/project.json b/src/System.Net.Http/src/unix/project.json new file mode 100644 index 000000000000..0b233ce8c5ca --- /dev/null +++ b/src/System.Net.Http/src/unix/project.json @@ -0,0 +1,29 @@ +{ + "frameworks": { + "dnxcore50": { + "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", + "Microsoft.Win32.Primitives": "4.0.0", + "System.Diagnostics.Contracts": "4.0.0", + "System.Diagnostics.Tools": "4.0.0", + "System.Globalization": "4.0.10", + "System.IO": "4.0.10", + "System.IO.Compression": "4.0.0", + "System.Net.Primitives": "4.0.10", + "System.Resources.ResourceManager": "4.0.0", + "System.Runtime.Extensions": "4.0.10", + "System.Runtime.Handles": "4.0.0", + "System.Runtime.InteropServices": "4.0.20", + "System.Security.Cryptography.OpenSsl": "4.0.0-rc3-23808", + "System.Security.Cryptography.X509Certificates": "4.0.0-rc3-23808", + "System.Text.Encoding": "4.0.10", + "System.Threading": "4.0.0", + "System.Threading.Tasks": "4.0.10" + } + } + }, + "runtimes": { + "ubuntu.14.04-x64": {}, + "osx.10.10-x64": {} + } +} diff --git a/src/System.Net.Http/tests/FunctionalTests/project.json b/src/System.Net.Http/tests/FunctionalTests/project.json index ad956792a6f9..2a5b7d4b9d28 100644 --- a/src/System.Net.Http/tests/FunctionalTests/project.json +++ b/src/System.Net.Http/tests/FunctionalTests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Globalization": "4.0.10", "System.IO": "4.0.10", "System.IO.FileSystem": "4.0.0", diff --git a/src/System.Net.Http/tests/UnitTests/project.json b/src/System.Net.Http/tests/UnitTests/project.json index 1dccc707850c..38f54235b5df 100644 --- a/src/System.Net.Http/tests/UnitTests/project.json +++ b/src/System.Net.Http/tests/UnitTests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Diagnostics.Contracts": "4.0.0", "System.Diagnostics.Tools": "4.0.0", "System.Linq": "4.0.0", diff --git a/src/System.Net.NameResolution/src/netcore50/project.json b/src/System.Net.NameResolution/src/netcore50/project.json new file mode 100644 index 000000000000..60105e0ba811 --- /dev/null +++ b/src/System.Net.NameResolution/src/netcore50/project.json @@ -0,0 +1,28 @@ +{ + "frameworks": { + "netcore50": { + "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", + "Microsoft.TargetingPack.Private.WinRT": "1.0.1", + "System.Collections": "4.0.0", + "System.Diagnostics.Contracts": "4.0.0", + "System.Diagnostics.Debug": "4.0.10", + "System.Diagnostics.Tracing": "4.0.0", + "System.Globalization": "4.0.0", + "System.Net.Primitives": "4.0.10", + "System.Resources.ResourceManager": "4.0.0", + "System.Runtime": "4.0.20", + "System.Runtime.Extensions": "4.0.10", + "System.Runtime.Handles": "4.0.0", + "System.Runtime.InteropServices": "4.0.20", + "System.Runtime.WindowsRuntime": "4.0.0", + "System.Threading": "4.0.10", + "System.Threading.Tasks": "4.0.0" + } + } + }, + "runtimes": { + "win8-x86": {}, + "win8-x64": {} + } +} diff --git a/src/System.Net.NameResolution/src/project.json b/src/System.Net.NameResolution/src/project.json index 6cfdc9001ad9..a10c27b5308a 100644 --- a/src/System.Net.NameResolution/src/project.json +++ b/src/System.Net.NameResolution/src/project.json @@ -2,6 +2,7 @@ "frameworks": { "dnxcore50": { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.0", "System.Diagnostics.Contracts": "4.0.0", "System.Diagnostics.Debug": "4.0.10", @@ -20,27 +21,7 @@ }, "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0" - } - }, - "netcore50": { - "dependencies": { - "Microsoft.TargetingPack.Private.WinRT": "1.0.0", - "System.Collections": "4.0.0", - "System.Diagnostics.Contracts": "4.0.0", - "System.Diagnostics.Debug": "4.0.10", - "System.Diagnostics.Tracing": "4.0.0", - "System.Globalization": "4.0.0", - "System.Net.Primitives": "4.0.10", - "System.Resources.ResourceManager": "4.0.0", - "System.Runtime": "4.0.20", - "System.Runtime.Extensions": "4.0.10", - "System.Runtime.Handles": "4.0.0", - "System.Runtime.InteropServices": "4.0.20", - "System.Runtime.WindowsRuntime": "4.0.0", - "System.Security.Principal.Windows": "4.0.0-rc3-23808", - "System.Threading": "4.0.10", - "System.Threading.Tasks": "4.0.0" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Net.NameResolution/tests/FunctionalTests/project.json b/src/System.Net.NameResolution/tests/FunctionalTests/project.json index 6440a9c4be28..a7dbcbada7ea 100644 --- a/src/System.Net.NameResolution/tests/FunctionalTests/project.json +++ b/src/System.Net.NameResolution/tests/FunctionalTests/project.json @@ -1,9 +1,10 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Diagnostics.Contracts": "4.0.0", "System.Diagnostics.Debug": "4.0.10", - "System.Net.Primitives": "4.0.10", "System.Net.NameResolution": "4.0.0-rc3-23808", + "System.Net.Primitives": "4.0.10", "System.Runtime": "4.0.20", "System.Threading.Tasks": "4.0.10", "xunit": "2.1.0", diff --git a/src/System.Net.NameResolution/tests/PalTests/project.json b/src/System.Net.NameResolution/tests/PalTests/project.json index e1e0f562d842..f9ab16448574 100644 --- a/src/System.Net.NameResolution/tests/PalTests/project.json +++ b/src/System.Net.NameResolution/tests/PalTests/project.json @@ -1,26 +1,27 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", + "Microsoft.Win32.Primitives": "4.0.0", "System.Collections": "4.0.10", + "System.Collections.NonGeneric": "4.0.0", + "System.ComponentModel.EventBasedAsync": "4.0.10", "System.Console": "4.0.0-rc3-23808", "System.Diagnostics.Contracts": "4.0.0", + "System.Diagnostics.Debug": "4.0.10", "System.Diagnostics.Tracing": "4.0.20", + "System.Globalization": "4.0.10", + "System.IO": "4.0.10", + "System.IO.FileSystem": "4.0.0", + "System.IO.FileSystem.Primitives": "4.0.0", "System.Net.Primitives": "4.0.10", + "System.Resources.ResourceManager": "4.0.0", "System.Runtime": "4.0.20", "System.Runtime.Extensions": "4.0.10", - "System.Resources.ResourceManager": "4.0.0", - "System.Threading": "4.0.10", - "System.Threading.Tasks": "4.0.10", - "System.Runtime.InteropServices": "4.0.20", "System.Runtime.Handles": "4.0.0", - "System.IO": "4.0.10", - "System.IO.FileSystem": "4.0.0", - "System.IO.FileSystem.Primitives": "4.0.0", - "System.ComponentModel.EventBasedAsync": "4.0.10", - "System.Globalization": "4.0.10", - "System.Diagnostics.Debug": "4.0.10", - "System.Collections.NonGeneric": "4.0.0", + "System.Runtime.InteropServices": "4.0.20", "System.Security.Claims": "4.0.0", - "Microsoft.Win32.Primitives": "4.0.0", + "System.Threading": "4.0.10", + "System.Threading.Tasks": "4.0.10", "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00123" }, diff --git a/src/System.Net.NetworkInformation/src/netcore50/project.json b/src/System.Net.NetworkInformation/src/netcore50/project.json new file mode 100644 index 000000000000..a6ed41588166 --- /dev/null +++ b/src/System.Net.NetworkInformation/src/netcore50/project.json @@ -0,0 +1,17 @@ +{ + "frameworks": { + "netcore50": { + "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", + "Microsoft.TargetingPack.Private.WinRT": "1.0.1", + "System.Linq": "4.0.0", + "System.Net.Sockets": "4.1.0-rc3-23808", + "System.Runtime.InteropServices.WindowsRuntime": "4.0.0" + } + } + }, + "runtimes": { + "win8-x86": {}, + "win8-x64": {} + } +} diff --git a/src/System.Net.NetworkInformation/src/project.json b/src/System.Net.NetworkInformation/src/project.json index 2359fb6004b3..c7675460a6ee 100644 --- a/src/System.Net.NetworkInformation/src/project.json +++ b/src/System.Net.NetworkInformation/src/project.json @@ -2,6 +2,7 @@ "frameworks": { "dnxcore50": { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Diagnostics.Contracts": "4.0.0", "System.Linq": "4.0.0", "System.Net.Primitives": "4.0.10", @@ -14,15 +15,7 @@ }, "net46": { "dependencies": { - "Microsoft.TargetingPack.NetFramework.v4.6": "1.0.0" - } - }, - "netcore50": { - "dependencies": { - "System.Linq": "4.0.0", - "System.Net.Sockets": "4.1.0-rc3-23808", - "System.Runtime.InteropServices.WindowsRuntime": "4.0.0", - "Microsoft.TargetingPack.Private.WinRT": "1.0.0" + "Microsoft.TargetingPack.NetFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Net.NetworkInformation/tests/FunctionalTests/project.json b/src/System.Net.NetworkInformation/tests/FunctionalTests/project.json index 5feb69279f42..79e2c2b82d38 100644 --- a/src/System.Net.NetworkInformation/tests/FunctionalTests/project.json +++ b/src/System.Net.NetworkInformation/tests/FunctionalTests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Net.Primitives": "4.0.10", "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00123" diff --git a/src/System.Net.NetworkInformation/tests/UnitTests/project.json b/src/System.Net.NetworkInformation/tests/UnitTests/project.json index 5feb69279f42..79e2c2b82d38 100644 --- a/src/System.Net.NetworkInformation/tests/UnitTests/project.json +++ b/src/System.Net.NetworkInformation/tests/UnitTests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Net.Primitives": "4.0.10", "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00123" diff --git a/src/System.Net.Ping/src/facade/project.json b/src/System.Net.Ping/src/facade/project.json index f15d78c42d41..2d26366fff58 100644 --- a/src/System.Net.Ping/src/facade/project.json +++ b/src/System.Net.Ping/src/facade/project.json @@ -2,7 +2,7 @@ "frameworks": { "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23530" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Net.Ping/src/project.json b/src/System.Net.Ping/src/project.json index de309a82551d..7da39d165c35 100644 --- a/src/System.Net.Ping/src/project.json +++ b/src/System.Net.Ping/src/project.json @@ -1,8 +1,9 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Diagnostics.Process": "4.1.0-rc3-23808", - "System.Net.Primitives": "4.0.10", "System.Net.NameResolution": "4.0.0-rc3-23808", + "System.Net.Primitives": "4.0.10", "System.Net.Sockets": "4.1.0-rc3-23808", "System.Threading.ThreadPool": "4.0.10-rc3-23808" }, diff --git a/src/System.Net.Ping/tests/FunctionalTests/project.json b/src/System.Net.Ping/tests/FunctionalTests/project.json index ce0cde7bb12b..b4841ee47b5c 100644 --- a/src/System.Net.Ping/tests/FunctionalTests/project.json +++ b/src/System.Net.Ping/tests/FunctionalTests/project.json @@ -1,7 +1,8 @@ { "dependencies": { - "System.Net.Primitives": "4.0.10", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Diagnostics.Process": "4.1.0-rc3-23808", + "System.Net.Primitives": "4.0.10", "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00123" }, diff --git a/src/System.Net.Primitives/src/netcore50/project.json b/src/System.Net.Primitives/src/netcore50/project.json new file mode 100644 index 000000000000..f34bb0bc43bd --- /dev/null +++ b/src/System.Net.Primitives/src/netcore50/project.json @@ -0,0 +1,29 @@ +{ + "frameworks": { + "netcore50": { + "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", + "Microsoft.TargetingPack.Private.WinRT": "1.0.1", + "Microsoft.Win32.Primitives": "4.0.0", + "System.Collections": "4.0.0", + "System.Collections.NonGeneric": "4.0.0", + "System.Diagnostics.Contracts": "4.0.0", + "System.Diagnostics.Debug": "4.0.10", + "System.Diagnostics.Tracing": "4.0.20", + "System.Globalization": "4.0.0", + "System.Resources.ResourceManager": "4.0.0", + "System.Runtime": "4.0.20", + "System.Runtime.Extensions": "4.0.10", + "System.Runtime.Handles": "4.0.0", + "System.Runtime.InteropServices": "4.0.20", + "System.Runtime.WindowsRuntime": "4.0.0", + "System.Threading": "4.0.0", + "System.Threading.Tasks": "4.0.0" + } + } + }, + "runtimes": { + "win8-x86": {}, + "win8-x64": {} + } +} diff --git a/src/System.Net.Primitives/src/project.json b/src/System.Net.Primitives/src/project.json index 8cef046c002f..3a2cbeee2c76 100644 --- a/src/System.Net.Primitives/src/project.json +++ b/src/System.Net.Primitives/src/project.json @@ -2,6 +2,8 @@ "frameworks": { "dnxcore50": { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", + "Microsoft.Win32.Primitives": "4.0.0", "System.Collections": "4.0.0", "System.Collections.NonGeneric": "4.0.0", "System.Diagnostics.Contracts": "4.0.0", @@ -14,33 +16,12 @@ "System.Runtime.Handles": "4.0.0", "System.Runtime.InteropServices": "4.0.20", "System.Threading": "4.0.0", - "System.Threading.Tasks": "4.0.0", - "Microsoft.Win32.Primitives": "4.0.0" + "System.Threading.Tasks": "4.0.0" } }, "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0" - } - }, - "netcore50": { - "dependencies": { - "System.Collections": "4.0.0", - "System.Collections.NonGeneric": "4.0.0", - "System.Diagnostics.Contracts": "4.0.0", - "System.Diagnostics.Debug": "4.0.10", - "System.Diagnostics.Tracing": "4.0.20", - "System.Globalization": "4.0.0", - "System.Resources.ResourceManager": "4.0.0", - "System.Runtime": "4.0.20", - "System.Runtime.Extensions": "4.0.10", - "System.Runtime.Handles": "4.0.0", - "System.Runtime.InteropServices": "4.0.20", - "System.Runtime.WindowsRuntime": "4.0.0", - "System.Threading": "4.0.0", - "System.Threading.Tasks": "4.0.0", - "Microsoft.TargetingPack.Private.WinRT": "1.0.0", - "Microsoft.Win32.Primitives": "4.0.0", + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Net.Primitives/tests/FunctionalTests/project.json b/src/System.Net.Primitives/tests/FunctionalTests/project.json index 546a24a19615..b63abbd98619 100644 --- a/src/System.Net.Primitives/tests/FunctionalTests/project.json +++ b/src/System.Net.Primitives/tests/FunctionalTests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Diagnostics.Contracts": "4.0.0", "System.Runtime": "4.0.20", "System.Threading.Tasks": "4.0.10", diff --git a/src/System.Net.Primitives/tests/PalTests/project.json b/src/System.Net.Primitives/tests/PalTests/project.json index 4584a62bfffe..ea083ef7e19d 100644 --- a/src/System.Net.Primitives/tests/PalTests/project.json +++ b/src/System.Net.Primitives/tests/PalTests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "Microsoft.Win32.Primitives": "4.0.0", "System.Diagnostics.Contracts": "4.0.0", "System.Diagnostics.Debug": "4.0.10", diff --git a/src/System.Net.Primitives/tests/UnitTests/project.json b/src/System.Net.Primitives/tests/UnitTests/project.json index 39b5fed6c2bc..502efa959948 100644 --- a/src/System.Net.Primitives/tests/UnitTests/project.json +++ b/src/System.Net.Primitives/tests/UnitTests/project.json @@ -1,5 +1,7 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", + "Microsoft.Win32.Primitives": "4.0.0", "System.Collections": "4.0.10", "System.Collections.NonGeneric": "4.0.0", "System.Diagnostics.Contracts": "4.0.0", @@ -12,7 +14,6 @@ "System.Runtime.InteropServices": "4.0.20", "System.Threading": "4.0.10", "System.Threading.Tasks": "4.0.10", - "Microsoft.Win32.Primitives": "4.0.0", "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00123" }, diff --git a/src/System.Net.Requests/src/facade/project.json b/src/System.Net.Requests/src/facade/project.json index f15d78c42d41..2d26366fff58 100644 --- a/src/System.Net.Requests/src/facade/project.json +++ b/src/System.Net.Requests/src/facade/project.json @@ -2,7 +2,7 @@ "frameworks": { "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23530" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Net.Requests/src/project.json b/src/System.Net.Requests/src/project.json index 1e5a017acbf4..20d203934aa8 100644 --- a/src/System.Net.Requests/src/project.json +++ b/src/System.Net.Requests/src/project.json @@ -1,10 +1,11 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", "System.Diagnostics.Contracts": "4.0.0", "System.IO": "4.0.10", - "System.Net.Primitives": "4.0.10", "System.Net.Http": "4.0.0", + "System.Net.Primitives": "4.0.10", "System.Net.WebHeaderCollection": "4.0.0", "System.Resources.ResourceManager": "4.0.0", "System.Runtime": "4.0.20", @@ -14,4 +15,4 @@ "frameworks": { "dnxcore50": {} } -} \ No newline at end of file +} diff --git a/src/System.Net.Requests/tests/project.json b/src/System.Net.Requests/tests/project.json index aa48c45cbbff..0de3a5b4ba16 100644 --- a/src/System.Net.Requests/tests/project.json +++ b/src/System.Net.Requests/tests/project.json @@ -1,8 +1,9 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Net.Http": "4.0.0", - "System.Net.Requests": "4.0.11-rc3-23808", "System.Net.Primitives": "4.0.11-rc3-23808", + "System.Net.Requests": "4.0.11-rc3-23808", "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00123" }, diff --git a/src/System.Net.Security/src/facade/project.json b/src/System.Net.Security/src/facade/project.json index f15d78c42d41..2d26366fff58 100644 --- a/src/System.Net.Security/src/facade/project.json +++ b/src/System.Net.Security/src/facade/project.json @@ -2,7 +2,7 @@ "frameworks": { "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23530" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Net.Security/src/unix/project.json b/src/System.Net.Security/src/unix/project.json index b3973991313a..979679027b15 100644 --- a/src/System.Net.Security/src/unix/project.json +++ b/src/System.Net.Security/src/unix/project.json @@ -1,16 +1,21 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Diagnostics.Contracts": "4.0.0", "System.Globalization.Extensions": "4.0.0", - "System.Threading": "4.0.10", - "System.Threading.ThreadPool": "4.0.10-rc3-23808", "System.Net.Primitives": "4.0.10", "System.Security.Cryptography.OpenSsl": "4.0.0-rc3-23808", "System.Security.Cryptography.X509Certificates": "4.0.0-rc3-23808", "System.Security.Principal": "4.0.0", - "System.Security.Principal.Windows": "4.0.0-rc3-23808" + "System.Security.Principal.Windows": "4.0.0-rc3-23808", + "System.Threading": "4.0.10", + "System.Threading.ThreadPool": "4.0.10-rc3-23808" }, "frameworks": { "dnxcore50": {} + }, + "runtimes": { + "ubuntu.14.04-x64": {}, + "osx.10.10-x64": {} } } diff --git a/src/System.Net.Security/src/win/project.json b/src/System.Net.Security/src/win/project.json index 45dc8ddb8387..5b9aa127f430 100644 --- a/src/System.Net.Security/src/win/project.json +++ b/src/System.Net.Security/src/win/project.json @@ -1,13 +1,14 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", + "System.Collections.Specialized": "4.0.0", "System.Diagnostics.Contracts": "4.0.0", - "System.Threading": "4.0.10", - "System.Threading.ThreadPool": "4.0.10-rc3-23808", "System.Net.Primitives": "4.0.10", "System.Security.Cryptography.X509Certificates": "4.0.0-rc3-23808", "System.Security.Principal": "4.0.0", "System.Security.Principal.Windows": "4.0.0-rc3-23808", - "System.Collections.Specialized": "4.0.0" + "System.Threading": "4.0.10", + "System.Threading.ThreadPool": "4.0.10-rc3-23808" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.Net.Security/tests/FunctionalTests/unix/project.json b/src/System.Net.Security/tests/FunctionalTests/unix/project.json index 88b4a66fe5a3..d4bc952495d1 100644 --- a/src/System.Net.Security/tests/FunctionalTests/unix/project.json +++ b/src/System.Net.Security/tests/FunctionalTests/unix/project.json @@ -1,10 +1,11 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Net.Primitives": "4.0.10", "System.Net.Sockets": "4.1.0-rc3-23808", "System.Net.TestData": "1.0.0-prerelease", - "System.Security.Principal": "4.0.0", "System.Security.Cryptography.X509Certificates": "4.0.0-rc3-23808", + "System.Security.Principal": "4.0.0", "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00123" }, diff --git a/src/System.Net.Security/tests/FunctionalTests/win/project.json b/src/System.Net.Security/tests/FunctionalTests/win/project.json index 05231c66cf0b..8ad0d7772058 100644 --- a/src/System.Net.Security/tests/FunctionalTests/win/project.json +++ b/src/System.Net.Security/tests/FunctionalTests/win/project.json @@ -1,11 +1,12 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Net.Primitives": "4.0.10", "System.Net.Sockets": "4.1.0-rc3-23808", "System.Net.TestData": "1.0.0-prerelease", + "System.Security.Cryptography.X509Certificates": "4.0.0-rc3-23808", "System.Security.Principal": "4.0.0", "System.Security.Principal.Windows": "4.0.0-rc3-23808", - "System.Security.Cryptography.X509Certificates": "4.0.0-rc3-23808", "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00123" }, diff --git a/src/System.Net.Security/tests/UnitTests/project.json b/src/System.Net.Security/tests/UnitTests/project.json index 01c592f3182c..2339ebcc469e 100644 --- a/src/System.Net.Security/tests/UnitTests/project.json +++ b/src/System.Net.Security/tests/UnitTests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Net.Primitives": "4.0.10", "System.Net.Sockets": "4.1.0-rc3-23808", "System.Net.TestData": "1.0.0-prerelease", diff --git a/src/System.Net.Sockets.Legacy/tests/FunctionalTests/project.json b/src/System.Net.Sockets.Legacy/tests/FunctionalTests/project.json index 36083d605be4..0776ecdae37f 100644 --- a/src/System.Net.Sockets.Legacy/tests/FunctionalTests/project.json +++ b/src/System.Net.Sockets.Legacy/tests/FunctionalTests/project.json @@ -1,14 +1,15 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", "System.Diagnostics.Debug": "4.0.10", "System.IO": "4.0.10", "System.Net.Primitives": "4.0.10", "System.Runtime": "4.0.20", "System.Threading": "4.0.10", - "System.Threading.Thread": "4.0.0-rc3-23808", "System.Threading.Tasks": "4.0.10", "System.Threading.Tasks.Parallel": "4.0.0", + "System.Threading.Thread": "4.0.0-rc3-23808", "System.Threading.ThreadPool": "4.0.10-rc3-23808", "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00123" diff --git a/src/System.Net.Sockets.Legacy/tests/PerformanceTests/project.json b/src/System.Net.Sockets.Legacy/tests/PerformanceTests/project.json index 472fe8d2029f..7a55ce4dfc4b 100644 --- a/src/System.Net.Sockets.Legacy/tests/PerformanceTests/project.json +++ b/src/System.Net.Sockets.Legacy/tests/PerformanceTests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", "System.Diagnostics.Debug": "4.0.10", "System.Net.Primitives": "4.0.10", diff --git a/src/System.Net.Sockets/src/netcore50/project.json b/src/System.Net.Sockets/src/netcore50/project.json new file mode 100644 index 000000000000..41f1e92c2fc6 --- /dev/null +++ b/src/System.Net.Sockets/src/netcore50/project.json @@ -0,0 +1,32 @@ +{ + "frameworks": { + "netcore50": { + "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", + "Microsoft.TargetingPack.Private.WinRT": "1.0.1", + "System.Collections": "4.0.0", + "System.Diagnostics.Debug": "4.0.10", + "System.Diagnostics.Tracing": "4.0.20", + "System.Globalization": "4.0.0", + "System.IO": "4.0.10", + "System.IO.FileSystem": "4.0.0", + "System.IO.FileSystem.Primitives": "4.0.0", + "System.Net.NameResolution": "4.0.0-rc3-23808", + "System.Net.Primitives": "4.0.10", + "System.Resources.ResourceManager": "4.0.0", + "System.Runtime": "4.0.20", + "System.Runtime.Extensions": "4.0.10", + "System.Runtime.Handles": "4.0.0", + "System.Runtime.InteropServices": "4.0.20", + "System.Runtime.WindowsRuntime": "4.0.0", + "System.Threading": "4.0.10", + "System.Threading.Overlapped": "4.0.0", + "System.Threading.Tasks": "4.0.10" + } + } + }, + "runtimes": { + "win8-x86": {}, + "win8-x64": {} + } +} diff --git a/src/System.Net.Sockets/src/project.json b/src/System.Net.Sockets/src/project.json index dd9d147ed8d8..9b0c17822c60 100644 --- a/src/System.Net.Sockets/src/project.json +++ b/src/System.Net.Sockets/src/project.json @@ -2,6 +2,7 @@ "frameworks": { "dnxcore50": { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.0", "System.Diagnostics.Debug": "4.0.10", "System.Diagnostics.Tracing": "4.0.20", @@ -19,38 +20,13 @@ "System.Security.Principal.Windows": "4.0.0-rc3-23808", "System.Threading": "4.0.10", "System.Threading.Overlapped": "4.0.0", - "System.Threading.ThreadPool": "4.0.10-rc3-23808", - "System.Threading.Tasks": "4.0.10" + "System.Threading.Tasks": "4.0.10", + "System.Threading.ThreadPool": "4.0.10-rc3-23808" } }, "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0" - } - }, - "netcore50": { - "dependencies": { - "System.Collections": "4.0.0", - "System.Diagnostics.Debug": "4.0.10", - "System.Diagnostics.Tracing": "4.0.20", - "System.Globalization": "4.0.0", - "System.IO": "4.0.10", - "System.IO.FileSystem": "4.0.0", - "System.IO.FileSystem.Primitives": "4.0.0", - "System.Net.NameResolution": "4.0.0-rc3-23808", - "System.Net.Primitives": "4.0.10", - "System.Resources.ResourceManager": "4.0.0", - "System.Runtime": "4.0.20", - "System.Runtime.Extensions": "4.0.10", - "System.Runtime.Handles": "4.0.0", - "System.Runtime.InteropServices": "4.0.20", - "System.Runtime.WindowsRuntime": "4.0.0", - "System.Security.Principal.Windows": "4.0.0-rc3-23808", - "System.Threading": "4.0.10", - "System.Threading.Overlapped": "4.0.0", - "System.Threading.ThreadPool": "4.0.10-rc3-23808", - "System.Threading.Tasks": "4.0.10", - "Microsoft.TargetingPack.Private.WinRT": "1.0.0" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Net.Sockets/tests/FunctionalTests/project.json b/src/System.Net.Sockets/tests/FunctionalTests/project.json index 472fe8d2029f..7a55ce4dfc4b 100644 --- a/src/System.Net.Sockets/tests/FunctionalTests/project.json +++ b/src/System.Net.Sockets/tests/FunctionalTests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", "System.Diagnostics.Debug": "4.0.10", "System.Net.Primitives": "4.0.10", diff --git a/src/System.Net.Sockets/tests/PerformanceTests/project.json b/src/System.Net.Sockets/tests/PerformanceTests/project.json index 472fe8d2029f..7a55ce4dfc4b 100644 --- a/src/System.Net.Sockets/tests/PerformanceTests/project.json +++ b/src/System.Net.Sockets/tests/PerformanceTests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", "System.Diagnostics.Debug": "4.0.10", "System.Net.Primitives": "4.0.10", diff --git a/src/System.Net.WebHeaderCollection/src/facade/project.json b/src/System.Net.WebHeaderCollection/src/facade/project.json index f15d78c42d41..2d26366fff58 100644 --- a/src/System.Net.WebHeaderCollection/src/facade/project.json +++ b/src/System.Net.WebHeaderCollection/src/facade/project.json @@ -2,7 +2,7 @@ "frameworks": { "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23530" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Net.WebHeaderCollection/src/project.json b/src/System.Net.WebHeaderCollection/src/project.json index e8d10ff644b8..0ae13cca09e8 100644 --- a/src/System.Net.WebHeaderCollection/src/project.json +++ b/src/System.Net.WebHeaderCollection/src/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", "System.Collections.Specialized": "4.0.0", "System.Resources.ResourceManager": "4.0.0", @@ -8,4 +9,4 @@ "frameworks": { "dnxcore50": {} } -} \ No newline at end of file +} diff --git a/src/System.Net.WebHeaderCollection/tests/project.json b/src/System.Net.WebHeaderCollection/tests/project.json index 1fe22026d10b..8092648093bc 100644 --- a/src/System.Net.WebHeaderCollection/tests/project.json +++ b/src/System.Net.WebHeaderCollection/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections.Specialized": "4.0.0", "System.Runtime": "4.0.20", "xunit": "2.1.0", diff --git a/src/System.Net.WebSockets.Client/src/facade/project.json b/src/System.Net.WebSockets.Client/src/facade/project.json index f15d78c42d41..2d26366fff58 100644 --- a/src/System.Net.WebSockets.Client/src/facade/project.json +++ b/src/System.Net.WebSockets.Client/src/facade/project.json @@ -2,7 +2,7 @@ "frameworks": { "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23530" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Net.WebSockets.Client/src/netcore50/project.json b/src/System.Net.WebSockets.Client/src/netcore50/project.json new file mode 100644 index 000000000000..5996d2ae24ae --- /dev/null +++ b/src/System.Net.WebSockets.Client/src/netcore50/project.json @@ -0,0 +1,27 @@ +{ + "frameworks": { + "netcore50": { + "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", + "Microsoft.TargetingPack.Private.WinRT": "1.0.1", + "System.Collections": "4.0.10", + "System.Diagnostics.Tools": "4.0.0", + "System.Diagnostics.Tracing": "4.0.20", + "System.Net.Primitives": "4.0.10", + "System.Net.WebHeaderCollection": "4.0.0", + "System.Net.WebSockets": "4.0.0-rc3-23808", + "System.Resources.ResourceManager": "4.0.0", + "System.Runtime": "4.0.20", + "System.Runtime.InteropServices.WindowsRuntime": "4.0.0", + "System.Runtime.WindowsRuntime": "4.0.0", + "System.Security.Cryptography.X509Certificates": "4.0.0-rc3-23808", + "System.Threading": "4.0.10", + "System.Threading.Tasks": "4.0.10" + } + } + }, + "runtimes": { + "win8-x86": {}, + "win8-x64": {} + } +} diff --git a/src/System.Net.WebSockets.Client/src/project.json b/src/System.Net.WebSockets.Client/src/project.json index 3f38065ebc7e..8b47efb2bb3b 100644 --- a/src/System.Net.WebSockets.Client/src/project.json +++ b/src/System.Net.WebSockets.Client/src/project.json @@ -2,6 +2,7 @@ "frameworks": { "dnxcore50": { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", "System.Diagnostics.Tools": "4.0.0", "System.Diagnostics.Tracing": "4.0.20", @@ -14,24 +15,6 @@ "System.Threading": "4.0.10", "System.Threading.Tasks": "4.0.10" } - }, - "netcore50": { - "dependencies": { - "Microsoft.TargetingPack.Private.WinRT": "1.0.0", - "System.Collections": "4.0.10", - "System.Diagnostics.Tools": "4.0.0", - "System.Diagnostics.Tracing": "4.0.20", - "System.Net.Primitives": "4.0.10", - "System.Net.WebHeaderCollection": "4.0.0", - "System.Net.WebSockets": "4.0.0-rc3-23808", - "System.Resources.ResourceManager": "4.0.0", - "System.Runtime": "4.0.20", - "System.Runtime.WindowsRuntime": "4.0.0", - "System.Runtime.InteropServices.WindowsRuntime": "4.0.0", - "System.Security.Cryptography.X509Certificates": "4.0.0-rc3-23808", - "System.Threading": "4.0.10", - "System.Threading.Tasks": "4.0.10" - } } } } diff --git a/src/System.Net.WebSockets.Client/tests/project.json b/src/System.Net.WebSockets.Client/tests/project.json index 55e58794e542..995323316767 100644 --- a/src/System.Net.WebSockets.Client/tests/project.json +++ b/src/System.Net.WebSockets.Client/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Net.WebSockets": "4.0.0-rc3-23808", "System.Net.WebSockets.Client": "4.0.0-rc3-23808", "System.Reflection.Extensions": "4.0.0", diff --git a/src/System.Net.WebSockets/src/facade/project.json b/src/System.Net.WebSockets/src/facade/project.json index f15d78c42d41..2d26366fff58 100644 --- a/src/System.Net.WebSockets/src/facade/project.json +++ b/src/System.Net.WebSockets/src/facade/project.json @@ -2,7 +2,7 @@ "frameworks": { "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23530" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Net.WebSockets/src/project.json b/src/System.Net.WebSockets/src/project.json index fe66955dbf62..a99cd908f99a 100644 --- a/src/System.Net.WebSockets/src/project.json +++ b/src/System.Net.WebSockets/src/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "Microsoft.Win32.Primitives": "4.0.0", "System.Diagnostics.Debug": "4.0.0", "System.Diagnostics.Tools": "4.0.0", @@ -10,4 +11,4 @@ "frameworks": { "dnxcore50": {} } -} \ No newline at end of file +} diff --git a/src/System.Net.WebSockets/tests/project.json b/src/System.Net.WebSockets/tests/project.json index 2f99c8de9b68..b93f4ae43e3d 100644 --- a/src/System.Net.WebSockets/tests/project.json +++ b/src/System.Net.WebSockets/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Net.WebSockets": "4.0.0-rc3-23808", "System.Runtime": "4.0.20", "xunit": "2.1.0", diff --git a/src/System.Numerics.Vectors.WindowsRuntime/src/project.json b/src/System.Numerics.Vectors.WindowsRuntime/src/project.json index 14d3df1068f4..a17871142192 100644 --- a/src/System.Numerics.Vectors.WindowsRuntime/src/project.json +++ b/src/System.Numerics.Vectors.WindowsRuntime/src/project.json @@ -1,9 +1,14 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Numerics.Vectors": "4.1.0", "System.Runtime.WindowsRuntime": "4.0.0" }, "frameworks": { - "dnxcore50": {} + "netcore50": {} + }, + "runtimes": { + "win8-x86": {}, + "win8-x64": {} } -} \ No newline at end of file +} diff --git a/src/System.Numerics.Vectors/ref/4.0.0/project.json b/src/System.Numerics.Vectors/ref/4.0.0/project.json index 62d18b61be72..39056e65e1a1 100644 --- a/src/System.Numerics.Vectors/ref/4.0.0/project.json +++ b/src/System.Numerics.Vectors/ref/4.0.0/project.json @@ -3,6 +3,8 @@ "System.Numerics.Vectors": "4.0.0" }, "frameworks": { - "dotnet5.4": {} + "dotnet5.4": { + "imports": "portable-net45+win8" + } } } \ No newline at end of file diff --git a/src/System.Numerics.Vectors/src/System.Numerics.Vectors.csproj b/src/System.Numerics.Vectors/src/System.Numerics.Vectors.csproj index 173b08b9a2f8..8153e1e2388e 100644 --- a/src/System.Numerics.Vectors/src/System.Numerics.Vectors.csproj +++ b/src/System.Numerics.Vectors/src/System.Numerics.Vectors.csproj @@ -12,6 +12,7 @@ true dotnet5.4 true + .NETPlatform,Version=v5.4 diff --git a/src/System.Numerics.Vectors/src/project.json b/src/System.Numerics.Vectors/src/project.json index b61af760477b..8ccfcbb21844 100644 --- a/src/System.Numerics.Vectors/src/project.json +++ b/src/System.Numerics.Vectors/src/project.json @@ -12,7 +12,7 @@ }, "net46":{ "dependencies": { - "Microsoft.TargetingPack.NetFramework.v4.6": "1.0.0", + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1", } } } diff --git a/src/System.Numerics.Vectors/tests/project.json b/src/System.Numerics.Vectors/tests/project.json index 6a3717c509df..0b4c72df5f51 100644 --- a/src/System.Numerics.Vectors/tests/project.json +++ b/src/System.Numerics.Vectors/tests/project.json @@ -1,15 +1,16 @@ { "dependencies": { + "Microsoft.CSharp": "4.0.0", "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0028", - "System.Runtime": "4.0.20", - "System.Runtime.Extensions": "4.0.10", - "System.Linq": "4.0.0", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Dynamic.Runtime": "4.0.10", - "Microsoft.CSharp": "4.0.0", "System.Globalization": "4.0.10", - "System.Reflection.Extensions": "4.0.0", - "System.Reflection": "4.0.10", + "System.Linq": "4.0.0", "System.Linq.Expressions": "4.0.10", + "System.Reflection": "4.0.10", + "System.Reflection.Extensions": "4.0.0", + "System.Runtime": "4.0.20", + "System.Runtime.Extensions": "4.0.10", "System.Runtime.InteropServices": "4.0.20", "System.Threading.Tasks": "4.0.10", "xunit": "2.1.0", diff --git a/src/System.ObjectModel/src/facade/project.json b/src/System.ObjectModel/src/facade/project.json index f15d78c42d41..2d26366fff58 100644 --- a/src/System.ObjectModel/src/facade/project.json +++ b/src/System.ObjectModel/src/facade/project.json @@ -2,7 +2,7 @@ "frameworks": { "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23530" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.ObjectModel/src/project.json b/src/System.ObjectModel/src/project.json index 9942b2e5bfb0..0b09aa52afb0 100644 --- a/src/System.ObjectModel/src/project.json +++ b/src/System.ObjectModel/src/project.json @@ -1,14 +1,15 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", + "System.Diagnostics.Contracts": "4.0.0", + "System.Diagnostics.Debug": "4.0.10", + "System.Diagnostics.Tools": "4.0.0", "System.Resources.ResourceManager": "4.0.0", "System.Runtime": "4.0.20", - "System.Threading": "4.0.10", - "System.Diagnostics.Tools": "4.0.0", - "System.Diagnostics.Debug": "4.0.10", - "System.Diagnostics.Contracts": "4.0.0" + "System.Threading": "4.0.10" }, "frameworks": { "dnxcore50": {} } -} \ No newline at end of file +} diff --git a/src/System.ObjectModel/tests/project.json b/src/System.ObjectModel/tests/project.json index 2ff7f4c608a6..af63b1a083ab 100644 --- a/src/System.ObjectModel/tests/project.json +++ b/src/System.ObjectModel/tests/project.json @@ -1,13 +1,14 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", "System.Diagnostics.Debug": "4.0.10", "System.Linq": "4.0.0", "System.Reflection": "4.0.10", "System.Runtime": "4.0.20", + "System.Runtime.Extensions": "4.0.10", "System.Threading": "4.0.10", "System.Threading.Tasks": "4.0.10", - "System.Runtime.Extensions": "4.0.10", "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00123" }, diff --git a/src/System.Private.DataContractSerialization/src/netcore50aot/project.json b/src/System.Private.DataContractSerialization/src/netcore50aot/project.json new file mode 100644 index 000000000000..c59b1aef6b49 --- /dev/null +++ b/src/System.Private.DataContractSerialization/src/netcore50aot/project.json @@ -0,0 +1,37 @@ +{ + "frameworks": { + "netcore50": { + "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", + "Microsoft.TargetingPack.Private.NETNative": "1.0.0-rc3-23808", + "System.Collections": "4.0.10", + "System.Diagnostics.Debug": "4.0.10", + "System.Diagnostics.Tools": "4.0.0", + "System.Globalization": "4.0.10", + "System.IO": "4.0.10", + "System.Linq": "4.0.0", + "System.Reflection": "4.0.10", + "System.Reflection.Emit.ILGeneration": "4.0.0", + "System.Reflection.Emit.Lightweight": "4.0.0", + "System.Reflection.Extensions": "4.0.0", + "System.Reflection.Primitives": "4.0.0", + "System.Reflection.TypeExtensions": "4.0.0", + "System.Resources.ResourceManager": "4.0.0", + "System.Runtime": "4.0.20", + "System.Runtime.Extensions": "4.0.10", + "System.Runtime.Serialization.Primitives": "4.1.0-rc3-23808", + "System.Text.Encoding": "4.0.10", + "System.Text.Encoding.Extensions": "4.0.10", + "System.Text.RegularExpressions": "4.0.10", + "System.Threading": "4.0.10", + "System.Threading.Tasks": "4.0.10", + "System.Xml.ReaderWriter": "4.0.10", + "System.Xml.XmlSerializer": "4.0.10" + } + } + }, + "runtimes": { + "win8-x86": {}, + "win8-x64": {} + } +} diff --git a/src/System.Private.DataContractSerialization/src/project.json b/src/System.Private.DataContractSerialization/src/project.json index 1890484c34ac..0af186a0ff08 100644 --- a/src/System.Private.DataContractSerialization/src/project.json +++ b/src/System.Private.DataContractSerialization/src/project.json @@ -2,34 +2,7 @@ "frameworks": { "dnxcore50": { "dependencies": { - "System.Collections": "4.0.10", - "System.Diagnostics.Debug": "4.0.10", - "System.Diagnostics.Tools": "4.0.0", - "System.Globalization": "4.0.10", - "System.IO": "4.0.10", - "System.Linq": "4.0.0", - "System.Reflection": "4.0.10", - "System.Reflection.Emit.ILGeneration": "4.0.0", - "System.Reflection.Emit.Lightweight": "4.0.0", - "System.Reflection.Extensions": "4.0.0", - "System.Reflection.Primitives": "4.0.0", - "System.Reflection.TypeExtensions": "4.0.0", - "System.Resources.ResourceManager": "4.0.0", - "System.Runtime": "4.0.20", - "System.Runtime.Extensions": "4.0.10", - "System.Runtime.Serialization.Primitives": "4.1.0-rc3-23808", - "System.Text.Encoding": "4.0.10", - "System.Text.Encoding.Extensions": "4.0.10", - "System.Text.RegularExpressions": "4.0.10", - "System.Threading": "4.0.10", - "System.Threading.Tasks": "4.0.10", - "System.Xml.ReaderWriter": "4.0.10", - "System.Xml.XmlSerializer": "4.0.10" - } - }, - "netcore50": { - "dependencies": { - "Microsoft.TargetingPack.Private.NETNative": "1.0.0-rc3-23808", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", "System.Diagnostics.Debug": "4.0.10", "System.Diagnostics.Tools": "4.0.0", diff --git a/src/System.Private.Uri/src/System.Private.Uri.csproj b/src/System.Private.Uri/src/System.Private.Uri.csproj index 08d2485d9dd8..3a2787f8f488 100644 --- a/src/System.Private.Uri/src/System.Private.Uri.csproj +++ b/src/System.Private.Uri/src/System.Private.Uri.csproj @@ -14,6 +14,7 @@ 0436 dotnet5.1 true + .NETPlatform,Version=v5.1 diff --git a/src/System.Reflection.Context/tests/project.json b/src/System.Reflection.Context/tests/project.json index 23158d831b98..748467dfab81 100644 --- a/src/System.Reflection.Context/tests/project.json +++ b/src/System.Reflection.Context/tests/project.json @@ -1,12 +1,15 @@ { "dependencies": { - "System.Reflection.Primitives": "4.0.0", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Reflection": "4.0.10", + "System.Reflection.Primitives": "4.0.0", "System.Runtime": "4.0.20", "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00123" }, "frameworks": { - "dnxcore50": {} + "dnxcore50": { + "imports": "portable-net45+win8" + } } -} \ No newline at end of file +} diff --git a/src/System.Reflection.DispatchProxy/src/project.json b/src/System.Reflection.DispatchProxy/src/project.json index f721700ab781..8bfc41de8f74 100644 --- a/src/System.Reflection.DispatchProxy/src/project.json +++ b/src/System.Reflection.DispatchProxy/src/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", "System.Diagnostics.Debug": "4.0.10", "System.Linq": "4.0.0", @@ -15,4 +16,4 @@ "frameworks": { "dnxcore50": {} } -} \ No newline at end of file +} diff --git a/src/System.Reflection.DispatchProxy/tests/project.json b/src/System.Reflection.DispatchProxy/tests/project.json index 54018728105d..8848bb7078fb 100644 --- a/src/System.Reflection.DispatchProxy/tests/project.json +++ b/src/System.Reflection.DispatchProxy/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", "System.Diagnostics.Debug": "4.0.10", "System.Linq": "4.0.0", diff --git a/src/System.Reflection.Emit.ILGeneration/src/project.json b/src/System.Reflection.Emit.ILGeneration/src/project.json index 7e5e0697264a..070ee62c662e 100644 --- a/src/System.Reflection.Emit.ILGeneration/src/project.json +++ b/src/System.Reflection.Emit.ILGeneration/src/project.json @@ -12,7 +12,7 @@ }, "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23530" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Reflection.Emit.ILGeneration/tests/project.json b/src/System.Reflection.Emit.ILGeneration/tests/project.json index 8758b0582a52..42412daf9d40 100644 --- a/src/System.Reflection.Emit.ILGeneration/tests/project.json +++ b/src/System.Reflection.Emit.ILGeneration/tests/project.json @@ -1,13 +1,14 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", + "System.Linq": "4.0.0", "System.Reflection.Emit": "4.0.0", - "System.Runtime": "4.0.20", - "System.Runtime.Extensions": "4.0.10", "System.Reflection.Emit.ILGeneration": "4.0.0", - "System.Reflection.Primitives": "4.0.0", "System.Reflection.Extensions": "4.0.0", + "System.Reflection.Primitives": "4.0.0", "System.Reflection.TypeExtensions": "4.0.0", - "System.Linq": "4.0.0", + "System.Runtime": "4.0.20", + "System.Runtime.Extensions": "4.0.10", "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00123" }, diff --git a/src/System.Reflection.Emit.Lightweight/src/project.json b/src/System.Reflection.Emit.Lightweight/src/project.json index 7e5e0697264a..070ee62c662e 100644 --- a/src/System.Reflection.Emit.Lightweight/src/project.json +++ b/src/System.Reflection.Emit.Lightweight/src/project.json @@ -12,7 +12,7 @@ }, "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23530" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Reflection.Emit.Lightweight/tests/project.json b/src/System.Reflection.Emit.Lightweight/tests/project.json index e28d5e24f81f..fcbbd0a883e7 100644 --- a/src/System.Reflection.Emit.Lightweight/tests/project.json +++ b/src/System.Reflection.Emit.Lightweight/tests/project.json @@ -1,9 +1,10 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Reflection.Emit": "4.0.0", - "System.Runtime": "4.0.20", "System.Reflection.Emit.Lightweight": "4.0.0", "System.Reflection.TypeExtensions": "4.0.0", + "System.Runtime": "4.0.20", "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00123" }, diff --git a/src/System.Reflection.Emit/src/project.json b/src/System.Reflection.Emit/src/project.json index 7e5e0697264a..070ee62c662e 100644 --- a/src/System.Reflection.Emit/src/project.json +++ b/src/System.Reflection.Emit/src/project.json @@ -12,7 +12,7 @@ }, "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23530" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Reflection.Emit/tests/project.json b/src/System.Reflection.Emit/tests/project.json index 05562db76329..f5a29df248d6 100644 --- a/src/System.Reflection.Emit/tests/project.json +++ b/src/System.Reflection.Emit/tests/project.json @@ -1,12 +1,13 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", + "System.Console": "4.0.0-rc3-23808", + "System.Linq": "4.0.0", "System.Reflection.Emit": "4.0.0", - "System.Runtime": "4.0.20", - "System.Runtime.Extensions": "4.0.10", "System.Reflection.Extensions": "4.0.0", "System.Reflection.TypeExtensions": "4.0.0", - "System.Linq": "4.0.0", - "System.Console": "4.0.0-rc3-23808", + "System.Runtime": "4.0.20", + "System.Runtime.Extensions": "4.0.10", "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00123" }, diff --git a/src/System.Reflection.Extensions/src/project.json b/src/System.Reflection.Extensions/src/project.json index ed8afa61942d..b2e6b074c2ba 100644 --- a/src/System.Reflection.Extensions/src/project.json +++ b/src/System.Reflection.Extensions/src/project.json @@ -2,11 +2,13 @@ "frameworks": { "dnxcore50": { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "Microsoft.TargetingPack.Private.CoreCLR": "1.0.0-rc3-23808" } }, "netcore50": { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "Microsoft.TargetingPack.Private.NETNative": "1.0.0-rc3-23808", "System.Diagnostics.Contracts": "4.0.0", "System.Diagnostics.Debug": "4.0.10", @@ -20,7 +22,7 @@ }, "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Reflection.Extensions/tests/project.json b/src/System.Reflection.Extensions/tests/project.json index 557c740d6985..f4f9bdce982c 100644 --- a/src/System.Reflection.Extensions/tests/project.json +++ b/src/System.Reflection.Extensions/tests/project.json @@ -1,10 +1,11 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", - "System.Runtime": "4.0.20", - "System.Threading": "4.0.10", "System.Reflection": "4.0.10", "System.Reflection.Extensions": "4.0.0", + "System.Runtime": "4.0.20", + "System.Threading": "4.0.10", "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00123" }, diff --git a/src/System.Reflection.Metadata/src/project.json b/src/System.Reflection.Metadata/src/project.json index a4815ef3124a..23c81f61e01f 100644 --- a/src/System.Reflection.Metadata/src/project.json +++ b/src/System.Reflection.Metadata/src/project.json @@ -1,21 +1,22 @@ { "dependencies": { - "System.Runtime": "4.0.0", - "System.Resources.ResourceManager": "4.0.0", - "System.Reflection.Primitives": "4.0.0", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", + "System.Collections": "4.0.0", + "System.Collections.Immutable": "1.1.37", "System.Diagnostics.Debug": "4.0.0", "System.IO": "4.0.0", - "System.Collections.Immutable": "1.1.37", - "System.Collections": "4.0.0", - "System.Text.Encoding": "4.0.0", - "System.Runtime.InteropServices": "4.0.0", "System.Reflection": "4.0.0", + "System.Reflection.Extensions": "4.0.0", + "System.Reflection.Primitives": "4.0.0", + "System.Resources.ResourceManager": "4.0.0", + "System.Runtime": "4.0.0", "System.Runtime.Extensions": "4.0.0", - "System.Threading": "4.0.0", + "System.Runtime.InteropServices": "4.0.0", + "System.Text.Encoding": "4.0.0", "System.Text.Encoding.Extensions": "4.0.0", - "System.Reflection.Extensions": "4.0.0" + "System.Threading": "4.0.0" }, "frameworks": { "dnxcore50": {} } -} \ No newline at end of file +} diff --git a/src/System.Reflection.Metadata/tests/project.json b/src/System.Reflection.Metadata/tests/project.json index f4d6fcc020e2..a1aa2d0d1fec 100644 --- a/src/System.Reflection.Metadata/tests/project.json +++ b/src/System.Reflection.Metadata/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", "System.Collections.Immutable": "1.1.37", "System.Diagnostics.Debug": "4.0.10", diff --git a/src/System.Reflection.Primitives/src/System.Reflection.Primitives.csproj b/src/System.Reflection.Primitives/src/System.Reflection.Primitives.csproj index b37d6834dab3..bbfb1cf17b4a 100644 --- a/src/System.Reflection.Primitives/src/System.Reflection.Primitives.csproj +++ b/src/System.Reflection.Primitives/src/System.Reflection.Primitives.csproj @@ -6,6 +6,7 @@ 4.0.1.0 true dotnet5.4 + .NETPlatform,Version=v5.1 diff --git a/src/System.Reflection.Primitives/src/project.json b/src/System.Reflection.Primitives/src/project.json index 0c1333c51079..c585be677b61 100644 --- a/src/System.Reflection.Primitives/src/project.json +++ b/src/System.Reflection.Primitives/src/project.json @@ -2,11 +2,13 @@ "frameworks": { "dotnet5.1": { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "Microsoft.TargetingPack.Private.CoreCLR": "1.0.0-rc3-23808" } }, "netcore50": { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Diagnostics.Contracts": "4.0.0", "System.Runtime": "4.0.0", "System.Threading": "4.0.0" @@ -14,7 +16,7 @@ }, "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Reflection.TypeExtensions/src/project.json b/src/System.Reflection.TypeExtensions/src/project.json index ccda527ab037..e201e14c2318 100644 --- a/src/System.Reflection.TypeExtensions/src/project.json +++ b/src/System.Reflection.TypeExtensions/src/project.json @@ -2,22 +2,24 @@ "frameworks": { "dnxcore50": { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "Microsoft.TargetingPack.Private.CoreCLR": "1.0.0-rc3-23808" } }, "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } }, "netcore50": { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", + "Microsoft.TargetingPack.Private.NETNative": "1.0.0-rc3-23808", "System.Collections": "4.0.0", "System.Diagnostics.Contracts": "4.0.0", "System.Linq": "4.0.0", "System.Reflection": "4.0.10", - "System.Runtime.Extensions": "4.0.10", - "Microsoft.TargetingPack.Private.NETNative": "1.0.0-rc3-23808" + "System.Runtime.Extensions": "4.0.10" } } } diff --git a/src/System.Reflection.TypeExtensions/tests/CoreCLR/project.json b/src/System.Reflection.TypeExtensions/tests/CoreCLR/project.json index 05171b5a5e7a..a0d5fd577f3e 100644 --- a/src/System.Reflection.TypeExtensions/tests/CoreCLR/project.json +++ b/src/System.Reflection.TypeExtensions/tests/CoreCLR/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Diagnostics.Debug": "4.0.10", "System.Globalization": "4.0.10", "System.Linq": "4.0.0", diff --git a/src/System.Reflection.TypeExtensions/tests/project.json b/src/System.Reflection.TypeExtensions/tests/project.json index 1f1f60b89a7b..f59cccf1950c 100644 --- a/src/System.Reflection.TypeExtensions/tests/project.json +++ b/src/System.Reflection.TypeExtensions/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Diagnostics.Debug": "4.0.10", "System.Linq": "4.0.0", "System.Reflection": "4.0.10", diff --git a/src/System.Reflection/src/project.json b/src/System.Reflection/src/project.json index 7e5e0697264a..070ee62c662e 100644 --- a/src/System.Reflection/src/project.json +++ b/src/System.Reflection/src/project.json @@ -12,7 +12,7 @@ }, "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23530" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Reflection/tests/CoreCLR/project.json b/src/System.Reflection/tests/CoreCLR/project.json index a03299d42ebc..bc0380104f0f 100644 --- a/src/System.Reflection/tests/CoreCLR/project.json +++ b/src/System.Reflection/tests/CoreCLR/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.AppContext": "4.0.0", "System.IO": "4.0.10", "System.IO.FileSystem": "4.0.0", diff --git a/src/System.Reflection/tests/TestExe/project.json b/src/System.Reflection/tests/TestExe/project.json index db815995cc72..34a664b1d876 100644 --- a/src/System.Reflection/tests/TestExe/project.json +++ b/src/System.Reflection/tests/TestExe/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Runtime": "4.0.0" }, "frameworks": { diff --git a/src/System.Reflection/tests/project.json b/src/System.Reflection/tests/project.json index 39baab0b3c05..b6c90d2647e1 100644 --- a/src/System.Reflection/tests/project.json +++ b/src/System.Reflection/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", "System.Diagnostics.Debug": "4.0.10", "System.Globalization": "4.0.10", diff --git a/src/System.Resources.Reader/src/project.json b/src/System.Resources.Reader/src/project.json index 412023ddb72d..db0ad152519b 100644 --- a/src/System.Resources.Reader/src/project.json +++ b/src/System.Resources.Reader/src/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Diagnostics.Debug": "4.0.0", "System.IO": "4.0.0", "System.Resources.ResourceManager": "4.0.0", @@ -10,4 +11,4 @@ "frameworks": { "dnxcore50": {} } -} \ No newline at end of file +} diff --git a/src/System.Resources.Reader/tests/project.json b/src/System.Resources.Reader/tests/project.json index def21a11ef5d..e78afad2e579 100644 --- a/src/System.Resources.Reader/tests/project.json +++ b/src/System.Resources.Reader/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", "System.IO": "4.0.10", "System.Linq": "4.0.0", diff --git a/src/System.Resources.ReaderWriter/src/facade/project.json b/src/System.Resources.ReaderWriter/src/facade/project.json index f15d78c42d41..2d26366fff58 100644 --- a/src/System.Resources.ReaderWriter/src/facade/project.json +++ b/src/System.Resources.ReaderWriter/src/facade/project.json @@ -2,7 +2,7 @@ "frameworks": { "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23530" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Resources.ReaderWriter/src/project.json b/src/System.Resources.ReaderWriter/src/project.json index 2bc5f2f24943..973d3bcea0d3 100644 --- a/src/System.Resources.ReaderWriter/src/project.json +++ b/src/System.Resources.ReaderWriter/src/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", "System.Diagnostics.Contracts": "4.0.0", "System.Diagnostics.Debug": "4.0.10", @@ -14,4 +15,4 @@ "frameworks": { "dnxcore50": {} } -} \ No newline at end of file +} diff --git a/src/System.Resources.ReaderWriter/tests/project.json b/src/System.Resources.ReaderWriter/tests/project.json index def21a11ef5d..e78afad2e579 100644 --- a/src/System.Resources.ReaderWriter/tests/project.json +++ b/src/System.Resources.ReaderWriter/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", "System.IO": "4.0.10", "System.Linq": "4.0.0", diff --git a/src/System.Resources.ResourceManager/src/netcore50aot/project.json b/src/System.Resources.ResourceManager/src/netcore50aot/project.json index 1b6849760a7e..436daedb3e20 100644 --- a/src/System.Resources.ResourceManager/src/netcore50aot/project.json +++ b/src/System.Resources.ResourceManager/src/netcore50aot/project.json @@ -2,13 +2,14 @@ "frameworks": { "netcore50": { "dependencies": { - "System.Runtime": "4.0.20", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", + "Microsoft.TargetingPack.Private.NETNative": "1.0.0-rc3-23808", "System.Diagnostics.Debug": "4.0.0", "System.Diagnostics.Tools": "4.0.0", "System.Diagnostics.Tracing": "4.0.0", "System.Globalization": "4.0.0", "System.Reflection": "4.0.10", - "Microsoft.TargetingPack.Private.NETNative": "1.0.0-rc3-23808" + "System.Runtime": "4.0.20" } } } diff --git a/src/System.Resources.ResourceManager/src/project.json b/src/System.Resources.ResourceManager/src/project.json index 7e5e0697264a..070ee62c662e 100644 --- a/src/System.Resources.ResourceManager/src/project.json +++ b/src/System.Resources.ResourceManager/src/project.json @@ -12,7 +12,7 @@ }, "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23530" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Resources.ResourceManager/tests/project.json b/src/System.Resources.ResourceManager/tests/project.json index 55abbde2c890..d20f3f61688d 100644 --- a/src/System.Resources.ResourceManager/tests/project.json +++ b/src/System.Resources.ResourceManager/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Diagnostics.Tools": "4.0.0", "System.Globalization": "4.0.10", "System.Resources.ResourceManager": "4.0.0", diff --git a/src/System.Resources.Writer/src/project.json b/src/System.Resources.Writer/src/project.json index 997092bc2149..804070bbe259 100644 --- a/src/System.Resources.Writer/src/project.json +++ b/src/System.Resources.Writer/src/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.0", "System.Diagnostics.Contracts": "4.0.0", "System.Diagnostics.Debug": "4.0.0", @@ -14,4 +15,4 @@ "frameworks": { "dnxcore50": {} } -} \ No newline at end of file +} diff --git a/src/System.Resources.Writer/tests/project.json b/src/System.Resources.Writer/tests/project.json index def21a11ef5d..e78afad2e579 100644 --- a/src/System.Resources.Writer/tests/project.json +++ b/src/System.Resources.Writer/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", "System.IO": "4.0.10", "System.Linq": "4.0.0", diff --git a/src/System.Runtime.CompilerServices.VisualC/src/project.json b/src/System.Runtime.CompilerServices.VisualC/src/project.json index 491a146222bb..61e9ed84cc1e 100644 --- a/src/System.Runtime.CompilerServices.VisualC/src/project.json +++ b/src/System.Runtime.CompilerServices.VisualC/src/project.json @@ -7,7 +7,7 @@ }, "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23530" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Runtime.Extensions/src/project.json b/src/System.Runtime.Extensions/src/project.json index 664b29b7e8b6..c2bc3d462bb6 100644 --- a/src/System.Runtime.Extensions/src/project.json +++ b/src/System.Runtime.Extensions/src/project.json @@ -7,13 +7,13 @@ }, "net46": { "dependencies": { - "Microsoft.TargetingPack.NetFramework.v4.6": "1.0.0" + "Microsoft.TargetingPack.NetFramework.v4.6": "1.0.1" } }, "netcore50": { "dependencies": { "Microsoft.TargetingPack.Private.NETNative": "1.0.0-rc3-23808", - "Microsoft.TargetingPack.Private.WinRT": "1.0.0" + "Microsoft.TargetingPack.Private.WinRT": "1.0.1" } } } diff --git a/src/System.Runtime.Extensions/tests/project.json b/src/System.Runtime.Extensions/tests/project.json index b7f8d922d7a6..922e5493b87c 100644 --- a/src/System.Runtime.Extensions/tests/project.json +++ b/src/System.Runtime.Extensions/tests/project.json @@ -1,11 +1,12 @@ { "dependencies": { "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0028", - "System.IO.FileSystem": "4.0.0", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Globalization": "4.0.10", + "System.IO.FileSystem": "4.0.0", + "System.Reflection.TypeExtensions": "4.1.0-rc3-23808", "System.Runtime": "4.0.20", "System.Runtime.Extensions": "4.0.10", - "System.Reflection.TypeExtensions": "4.1.0-rc3-23808", "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc3-23808", "System.Threading": "4.0.10", "System.Threading.Tasks": "4.0.10", diff --git a/src/System.Runtime.Handles/src/project.json b/src/System.Runtime.Handles/src/project.json index 4765e77c79a5..871dbfad8fe2 100644 --- a/src/System.Runtime.Handles/src/project.json +++ b/src/System.Runtime.Handles/src/project.json @@ -12,7 +12,7 @@ }, "net46": { "dependencies": { - "Microsoft.TargetingPack.NetFramework.v4.6": "1.0.0" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Runtime.Handles/tests/project.json b/src/System.Runtime.Handles/tests/project.json index c8fbffb8285d..4e22117395bb 100644 --- a/src/System.Runtime.Handles/tests/project.json +++ b/src/System.Runtime.Handles/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Runtime.Handles": "4.0.0", "System.Threading.Tasks": "4.0.10", "xunit": "2.1.0", diff --git a/src/System.Runtime.InteropServices.PInvoke/src/project.json b/src/System.Runtime.InteropServices.PInvoke/src/project.json index 4765e77c79a5..871dbfad8fe2 100644 --- a/src/System.Runtime.InteropServices.PInvoke/src/project.json +++ b/src/System.Runtime.InteropServices.PInvoke/src/project.json @@ -12,7 +12,7 @@ }, "net46": { "dependencies": { - "Microsoft.TargetingPack.NetFramework.v4.6": "1.0.0" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Runtime.InteropServices.PInvoke/tests/project.json b/src/System.Runtime.InteropServices.PInvoke/tests/project.json index ed3a9fe381e7..1165e777b56a 100644 --- a/src/System.Runtime.InteropServices.PInvoke/tests/project.json +++ b/src/System.Runtime.InteropServices.PInvoke/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00123" }, diff --git a/src/System.Runtime.InteropServices.RuntimeInformation/src/project.json b/src/System.Runtime.InteropServices.RuntimeInformation/src/project.json index 871817ec69fd..33ccaeb1738f 100644 --- a/src/System.Runtime.InteropServices.RuntimeInformation/src/project.json +++ b/src/System.Runtime.InteropServices.RuntimeInformation/src/project.json @@ -1,13 +1,14 @@ { "dependencies": { - "System.Runtime": "4.0.0", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", + "System.Diagnostics.Debug": "4.0.0", + "System.Reflection": "4.0.0", "System.Resources.ResourceManager": "4.0.0", + "System.Runtime": "4.0.0", "System.Runtime.InteropServices": "4.0.0", - "System.Diagnostics.Debug": "4.0.0", - "System.Threading": "4.0.0", - "System.Reflection": "4.0.0" + "System.Threading": "4.0.0" }, "frameworks": { "dnxcore50": {} } -} \ No newline at end of file +} diff --git a/src/System.Runtime.InteropServices.RuntimeInformation/tests/project.json b/src/System.Runtime.InteropServices.RuntimeInformation/tests/project.json index d813a2bd9e24..88643e975579 100644 --- a/src/System.Runtime.InteropServices.RuntimeInformation/tests/project.json +++ b/src/System.Runtime.InteropServices.RuntimeInformation/tests/project.json @@ -1,8 +1,9 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", + "System.Reflection": "4.0.10", "System.Runtime": "4.0.20", "System.Threading.Tasks": "4.0.10", - "System.Reflection": "4.0.10", "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00123" }, diff --git a/src/System.Runtime.InteropServices.WindowsRuntime/src/System.Runtime.InteropServices.WindowsRuntime.csproj b/src/System.Runtime.InteropServices.WindowsRuntime/src/System.Runtime.InteropServices.WindowsRuntime.csproj index c439e56bd023..436f3006f84f 100644 --- a/src/System.Runtime.InteropServices.WindowsRuntime/src/System.Runtime.InteropServices.WindowsRuntime.csproj +++ b/src/System.Runtime.InteropServices.WindowsRuntime/src/System.Runtime.InteropServices.WindowsRuntime.csproj @@ -12,6 +12,7 @@ true dotnet5.4 win8 + .NETPlatform,Version=v5.4 diff --git a/src/System.Runtime.InteropServices.WindowsRuntime/src/project.json b/src/System.Runtime.InteropServices.WindowsRuntime/src/project.json index a42e58a6a10c..067b3ccefce2 100644 --- a/src/System.Runtime.InteropServices.WindowsRuntime/src/project.json +++ b/src/System.Runtime.InteropServices.WindowsRuntime/src/project.json @@ -12,7 +12,7 @@ }, "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Runtime.InteropServices/src/project.json b/src/System.Runtime.InteropServices/src/project.json index 4765e77c79a5..871dbfad8fe2 100644 --- a/src/System.Runtime.InteropServices/src/project.json +++ b/src/System.Runtime.InteropServices/src/project.json @@ -12,7 +12,7 @@ }, "net46": { "dependencies": { - "Microsoft.TargetingPack.NetFramework.v4.6": "1.0.0" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Runtime.InteropServices/tests/project.json b/src/System.Runtime.InteropServices/tests/project.json index 0bc1808a1c9b..53cfc9aae2bd 100644 --- a/src/System.Runtime.InteropServices/tests/project.json +++ b/src/System.Runtime.InteropServices/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Runtime.InteropServices": "4.0.20", "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00123" diff --git a/src/System.Runtime.Loader/tests/DefaultContext/project.json b/src/System.Runtime.Loader/tests/DefaultContext/project.json index 1708a4de4151..07c5ab8e626f 100644 --- a/src/System.Runtime.Loader/tests/DefaultContext/project.json +++ b/src/System.Runtime.Loader/tests/DefaultContext/project.json @@ -1,7 +1,8 @@ { "dependencies": { - "System.Diagnostics.Tools": "4.0.0", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Diagnostics.Debug": "4.0.10", + "System.Diagnostics.Tools": "4.0.0", "System.IO": "4.0.10", "System.IO.FileSystem": "4.0.0", "System.Linq": "4.0.0", diff --git a/src/System.Runtime.Loader/tests/project.json b/src/System.Runtime.Loader/tests/project.json index 1708a4de4151..07c5ab8e626f 100644 --- a/src/System.Runtime.Loader/tests/project.json +++ b/src/System.Runtime.Loader/tests/project.json @@ -1,7 +1,8 @@ { "dependencies": { - "System.Diagnostics.Tools": "4.0.0", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Diagnostics.Debug": "4.0.10", + "System.Diagnostics.Tools": "4.0.0", "System.IO": "4.0.10", "System.IO.FileSystem": "4.0.0", "System.Linq": "4.0.0", diff --git a/src/System.Runtime.Numerics/src/facade/project.json b/src/System.Runtime.Numerics/src/facade/project.json index f15d78c42d41..2d26366fff58 100644 --- a/src/System.Runtime.Numerics/src/facade/project.json +++ b/src/System.Runtime.Numerics/src/facade/project.json @@ -2,7 +2,7 @@ "frameworks": { "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23530" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Runtime.Numerics/src/project.json b/src/System.Runtime.Numerics/src/project.json index 8821f77013a9..6174dd17cbe4 100644 --- a/src/System.Runtime.Numerics/src/project.json +++ b/src/System.Runtime.Numerics/src/project.json @@ -1,14 +1,15 @@ { "dependencies": { - "System.Runtime": "4.0.20", - "System.Resources.ResourceManager": "4.0.0", - "System.Globalization": "4.0.10", - "System.Runtime.Extensions": "4.0.10", - "System.Diagnostics.Tools": "4.0.0", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", + "System.Diagnostics.Contracts": "4.0.0", "System.Diagnostics.Debug": "4.0.10", - "System.Diagnostics.Contracts": "4.0.0" + "System.Diagnostics.Tools": "4.0.0", + "System.Globalization": "4.0.10", + "System.Resources.ResourceManager": "4.0.0", + "System.Runtime": "4.0.20", + "System.Runtime.Extensions": "4.0.10" }, "frameworks": { "dnxcore50": {} } -} \ No newline at end of file +} diff --git a/src/System.Runtime.Numerics/tests/project.json b/src/System.Runtime.Numerics/tests/project.json index 03eef7df7b4e..aabc04eed105 100644 --- a/src/System.Runtime.Numerics/tests/project.json +++ b/src/System.Runtime.Numerics/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", "System.Console": "4.0.0-rc3-23808", "System.Globalization": "4.0.10", diff --git a/src/System.Runtime.Serialization.Json/src/project.json b/src/System.Runtime.Serialization.Json/src/project.json index 7e5e0697264a..070ee62c662e 100644 --- a/src/System.Runtime.Serialization.Json/src/project.json +++ b/src/System.Runtime.Serialization.Json/src/project.json @@ -12,7 +12,7 @@ }, "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23530" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Runtime.Serialization.Json/tests/project.json b/src/System.Runtime.Serialization.Json/tests/project.json index 541607894987..191fdb7f7903 100644 --- a/src/System.Runtime.Serialization.Json/tests/project.json +++ b/src/System.Runtime.Serialization.Json/tests/project.json @@ -1,6 +1,7 @@ { "dependencies": { "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0028", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", "System.Collections.NonGeneric": "4.0.0", "System.Diagnostics.Debug": "4.0.10", diff --git a/src/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj b/src/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj index 64735dac9b81..e3fc14cbc8a3 100644 --- a/src/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj +++ b/src/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.csproj @@ -12,6 +12,7 @@ {CDF0ACB5-1361-4E48-8ECB-22E8022F5F01} dotnet5.4 true + .NETPlatform,Version=v5.4 diff --git a/src/System.Runtime.Serialization.Primitives/src/project.json b/src/System.Runtime.Serialization.Primitives/src/project.json index 213314b08669..3b8fe917c183 100644 --- a/src/System.Runtime.Serialization.Primitives/src/project.json +++ b/src/System.Runtime.Serialization.Primitives/src/project.json @@ -9,7 +9,7 @@ }, "net46":{ "dependencies": { - "Microsoft.TargetingPack.NetFramework.v4.6": "1.0.0", + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1", } } } diff --git a/src/System.Runtime.Serialization.Xml/src/project.json b/src/System.Runtime.Serialization.Xml/src/project.json index 3ba4a696c249..b641d167ac24 100644 --- a/src/System.Runtime.Serialization.Xml/src/project.json +++ b/src/System.Runtime.Serialization.Xml/src/project.json @@ -12,7 +12,7 @@ }, "net46": { "dependencies": { - "Microsoft.TargetingPack.NetFramework.v4.6": "1.0.0" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Runtime.Serialization.Xml/tests/project.json b/src/System.Runtime.Serialization.Xml/tests/project.json index 69ab8dac9cb7..b4580035e1f8 100644 --- a/src/System.Runtime.Serialization.Xml/tests/project.json +++ b/src/System.Runtime.Serialization.Xml/tests/project.json @@ -1,6 +1,7 @@ { "dependencies": { "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0028", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", "System.Collections.Concurrent": "4.0.0", "System.Collections.NonGeneric": "4.0.0", diff --git a/src/System.Runtime.WindowsRuntime/ref/project.json b/src/System.Runtime.WindowsRuntime/ref/project.json index ef2f18d2ca41..e8d55453903a 100644 --- a/src/System.Runtime.WindowsRuntime/ref/project.json +++ b/src/System.Runtime.WindowsRuntime/ref/project.json @@ -1,7 +1,7 @@ { "dependencies": { "Microsoft.NETCore.Portable.Compatibility": "1.0.0", - "Microsoft.TargetingPack.Private.WinRT": "1.0.0", + "Microsoft.TargetingPack.Private.WinRT": "1.0.1", "System.Runtime": "4.0.0", "System.IO": "4.0.0", "System.Threading.Tasks": "4.0.0" diff --git a/src/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj b/src/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj index 282258d34606..5ce719f3eeee 100644 --- a/src/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj +++ b/src/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj @@ -15,6 +15,7 @@ dotnet5.3 win8 4.0.11.0 + .NETPlatform,Version=v5.3 $(DefineConstants);dotnet53;FEATURE_APPX diff --git a/src/System.Runtime.WindowsRuntime/src/netcore50aot/project.json b/src/System.Runtime.WindowsRuntime/src/netcore50aot/project.json new file mode 100644 index 000000000000..15cc16690445 --- /dev/null +++ b/src/System.Runtime.WindowsRuntime/src/netcore50aot/project.json @@ -0,0 +1,28 @@ +{ + "frameworks": { + "netcore50": { + "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", + "Microsoft.TargetingPack.Private.NETNative": "1.0.0-rc3-23808", + "Microsoft.TargetingPack.Private.WinRT": "1.0.1", + "System.Collections": "4.0.0", + "System.Diagnostics.Debug": "4.0.10", + "System.Dynamic.Runtime": "4.0.10", + "System.Globalization": "4.0.0", + "System.IO": "4.0.10", + "System.Reflection": "4.0.0", + "System.Resources.ResourceManager": "4.0.0", + "System.Runtime": "4.0.20", + "System.Runtime.Extensions": "4.0.0", + "System.Runtime.InteropServices": "4.0.20", + "System.Runtime.InteropServices.WindowsRuntime": "4.0.0", + "System.Threading": "4.0.10.0", + "System.Threading.Tasks": "4.0.10.0" + } + } + }, + "runtimes": { + "win8-x86": {}, + "win8-x64": {} + } +} diff --git a/src/System.Runtime.WindowsRuntime/src/project.json b/src/System.Runtime.WindowsRuntime/src/project.json index a381c4853ac4..31a33a83460f 100644 --- a/src/System.Runtime.WindowsRuntime/src/project.json +++ b/src/System.Runtime.WindowsRuntime/src/project.json @@ -3,26 +3,7 @@ "dotnet5.3": { "dependencies": { "Microsoft.TargetingPack.Private.CoreCLR": "1.0.0-rc3-23808", - "Microsoft.TargetingPack.Private.WinRT": "1.0.0" - } - }, - "netcore50": { - "dependencies": { - "Microsoft.TargetingPack.Private.NetNative": "1.0.0-rc3-23808", - "Microsoft.TargetingPack.Private.WinRT": "1.0.0", - "System.Collections": "4.0.0", - "System.Diagnostics.Debug": "4.0.10", - "System.Dynamic.Runtime": "4.0.10", - "System.Globalization": "4.0.0", - "System.IO": "4.0.10", - "System.Reflection": "4.0.0", - "System.Resources.ResourceManager": "4.0.0", - "System.Runtime": "4.0.20", - "System.Runtime.Extensions": "4.0.0", - "System.Runtime.InteropServices": "4.0.20", - "System.Runtime.InteropServices.WindowsRuntime": "4.0.0", - "System.Threading": "4.0.10.0", - "System.Threading.Tasks": "4.0.10.0" + "Microsoft.TargetingPack.Private.WinRT": "1.0.1" } } } diff --git a/src/System.Runtime/src/project.json b/src/System.Runtime/src/project.json index 4765e77c79a5..871dbfad8fe2 100644 --- a/src/System.Runtime/src/project.json +++ b/src/System.Runtime/src/project.json @@ -12,7 +12,7 @@ }, "net46": { "dependencies": { - "Microsoft.TargetingPack.NetFramework.v4.6": "1.0.0" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Runtime/tests/project.json b/src/System.Runtime/tests/project.json index 7315863d4be6..5c1cfbc7cdc3 100644 --- a/src/System.Runtime/tests/project.json +++ b/src/System.Runtime/tests/project.json @@ -1,6 +1,7 @@ { "dependencies": { "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0028", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Console": "4.0.0-rc3-23808", "System.Globalization": "4.0.10", "System.Reflection": "4.0.10", diff --git a/src/System.Security.AccessControl/src/System.Security.AccessControl.csproj b/src/System.Security.AccessControl/src/System.Security.AccessControl.csproj index e4bf4c673aa0..2a62f36be930 100644 --- a/src/System.Security.AccessControl/src/System.Security.AccessControl.csproj +++ b/src/System.Security.AccessControl/src/System.Security.AccessControl.csproj @@ -6,6 +6,7 @@ 4.0.0.0 true true + .NETPlatform,Version=v5.4 diff --git a/src/System.Security.AccessControl/src/project.json b/src/System.Security.AccessControl/src/project.json index 0b88605a3696..03bf663e2953 100644 --- a/src/System.Security.AccessControl/src/project.json +++ b/src/System.Security.AccessControl/src/project.json @@ -4,7 +4,7 @@ "dependencies": { "System.Collections": "4.0.0", "System.Diagnostics.Contracts": "4.0.0", - "System.Diagnostics.Process": "4.0.0", + "System.Diagnostics.Process": "4.1.0-rc3-23808", "System.Globalization": "4.0.0", "System.IO": "4.0.10", "System.Resources.ResourceManager": "4.0.0", @@ -20,7 +20,7 @@ }, "net46": { "dependencies": { - "Microsoft.TargetingPack.NetFramework.v4.6": "1.0.0" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Security.Claims/src/System.Security.Claims.csproj b/src/System.Security.Claims/src/System.Security.Claims.csproj index a403609a868e..1b38bc72e9b5 100644 --- a/src/System.Security.Claims/src/System.Security.Claims.csproj +++ b/src/System.Security.Claims/src/System.Security.Claims.csproj @@ -7,6 +7,7 @@ {A70BEC0D-5A1C-4DA0-8A0F-69F3BF565D52} dotnet5.4 true + .NETPlatform,Version=v5.4 diff --git a/src/System.Security.Claims/src/project.json b/src/System.Security.Claims/src/project.json index 920e485e6e19..d0771c10a0fd 100644 --- a/src/System.Security.Claims/src/project.json +++ b/src/System.Security.Claims/src/project.json @@ -14,7 +14,7 @@ }, "net46":{ "dependencies": { - "Microsoft.TargetingPack.NetFramework.v4.6": "1.0.0", + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1", } } } diff --git a/src/System.Security.Claims/tests/project.json b/src/System.Security.Claims/tests/project.json index bba33d3c5ecd..3b38ae92f3ec 100644 --- a/src/System.Security.Claims/tests/project.json +++ b/src/System.Security.Claims/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", "System.Diagnostics.Contracts": "4.0.0", "System.Globalization": "4.0.0", @@ -12,6 +13,8 @@ "xunit.netcore.extensions": "1.0.0-prerelease-00123" }, "frameworks": { - "dnxcore50": {} + "dnxcore50": { + "imports": "portable-net45+win8" + } } -} \ No newline at end of file +} diff --git a/src/System.Security.Cryptography.Algorithms/src/System.Security.Cryptography.Algorithms.csproj b/src/System.Security.Cryptography.Algorithms/src/System.Security.Cryptography.Algorithms.csproj index 8bc27aaf289c..fbef98c445b5 100644 --- a/src/System.Security.Cryptography.Algorithms/src/System.Security.Cryptography.Algorithms.csproj +++ b/src/System.Security.Cryptography.Algorithms/src/System.Security.Cryptography.Algorithms.csproj @@ -18,6 +18,7 @@ win7 unix + .NETPlatform,Version=v5.4 diff --git a/src/System.Security.Cryptography.Algorithms/src/project.json b/src/System.Security.Cryptography.Algorithms/src/project.json index 51e745cf2ee1..fcab8090a95d 100644 --- a/src/System.Security.Cryptography.Algorithms/src/project.json +++ b/src/System.Security.Cryptography.Algorithms/src/project.json @@ -14,7 +14,7 @@ }, "net46": { "dependencies": { - "Microsoft.TargetingPack.NetFramework.v4.6": "1.0.0" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Security.Cryptography.Algorithms/tests/project.json b/src/System.Security.Cryptography.Algorithms/tests/project.json index e7168465c5f5..7825a51bad81 100644 --- a/src/System.Security.Cryptography.Algorithms/tests/project.json +++ b/src/System.Security.Cryptography.Algorithms/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.IO": "4.0.10", "System.Runtime": "4.0.20", "System.Runtime.Extensions": "4.0.10", diff --git a/src/System.Security.Cryptography.Cng/src/facade/project.json b/src/System.Security.Cryptography.Cng/src/facade/project.json index f15d78c42d41..2d26366fff58 100644 --- a/src/System.Security.Cryptography.Cng/src/facade/project.json +++ b/src/System.Security.Cryptography.Cng/src/facade/project.json @@ -2,7 +2,7 @@ "frameworks": { "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23530" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Security.Cryptography.Cng/src/project.json b/src/System.Security.Cryptography.Cng/src/project.json index be2b2f0041e4..3c4acd004cdf 100644 --- a/src/System.Security.Cryptography.Cng/src/project.json +++ b/src/System.Security.Cryptography.Cng/src/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Diagnostics.Debug": "4.0.10", "System.IO": "4.0.10", "System.Resources.ResourceManager": "4.0.0", diff --git a/src/System.Security.Cryptography.Cng/tests/project.json b/src/System.Security.Cryptography.Cng/tests/project.json index 0d52dd18dd5c..e8aecb9a96b4 100644 --- a/src/System.Security.Cryptography.Cng/tests/project.json +++ b/src/System.Security.Cryptography.Cng/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Console": "4.0.0-rc3-23808", "System.IO": "4.0.10", "System.Runtime": "4.0.20", diff --git a/src/System.Security.Cryptography.Csp/src/facade/project.json b/src/System.Security.Cryptography.Csp/src/facade/project.json index f15d78c42d41..2d26366fff58 100644 --- a/src/System.Security.Cryptography.Csp/src/facade/project.json +++ b/src/System.Security.Cryptography.Csp/src/facade/project.json @@ -2,7 +2,7 @@ "frameworks": { "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23530" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Security.Cryptography.Csp/src/project.json b/src/System.Security.Cryptography.Csp/src/project.json index 049dedeab0aa..28fcd4846965 100644 --- a/src/System.Security.Cryptography.Csp/src/project.json +++ b/src/System.Security.Cryptography.Csp/src/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Diagnostics.Contracts": "4.0.0", "System.Diagnostics.Debug": "4.0.10", "System.IO": "4.0.10", diff --git a/src/System.Security.Cryptography.Csp/tests/project.json b/src/System.Security.Cryptography.Csp/tests/project.json index 991504ee7184..b42843fe9d8f 100644 --- a/src/System.Security.Cryptography.Csp/tests/project.json +++ b/src/System.Security.Cryptography.Csp/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.IO": "4.0.10", "System.Runtime": "4.0.20", "System.Runtime.Numerics": "4.0.0", diff --git a/src/System.Security.Cryptography.Encoding/src/facade/project.json b/src/System.Security.Cryptography.Encoding/src/facade/project.json index f15d78c42d41..2d26366fff58 100644 --- a/src/System.Security.Cryptography.Encoding/src/facade/project.json +++ b/src/System.Security.Cryptography.Encoding/src/facade/project.json @@ -2,7 +2,7 @@ "frameworks": { "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23530" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Security.Cryptography.Encoding/src/project.json b/src/System.Security.Cryptography.Encoding/src/project.json index 5a8371091ce4..9ad15d7230c4 100644 --- a/src/System.Security.Cryptography.Encoding/src/project.json +++ b/src/System.Security.Cryptography.Encoding/src/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.0", "System.Collections.Concurrent": "4.0.0", "System.Diagnostics.Contracts": "4.0.0", diff --git a/src/System.Security.Cryptography.Encoding/tests/project.json b/src/System.Security.Cryptography.Encoding/tests/project.json index fc74f524540f..49949cbf717b 100644 --- a/src/System.Security.Cryptography.Encoding/tests/project.json +++ b/src/System.Security.Cryptography.Encoding/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Runtime": "4.0.20", "System.Runtime.Numerics": "4.0.0", "System.Security.Cryptography.Primitives": "4.0.0-rc3-23808", diff --git a/src/System.Security.Cryptography.OpenSsl/src/project.json b/src/System.Security.Cryptography.OpenSsl/src/project.json index a0477e5affbb..54e3559f0624 100644 --- a/src/System.Security.Cryptography.OpenSsl/src/project.json +++ b/src/System.Security.Cryptography.OpenSsl/src/project.json @@ -1,13 +1,14 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.0", "System.Diagnostics.Contracts": "4.0.0", "System.Diagnostics.Debug": "4.0.10", "System.IO": "4.0.10", "System.Resources.ResourceManager": "4.0.0", "System.Runtime": "4.0.20", - "System.Runtime.Numerics": "4.0.0", "System.Runtime.InteropServices": "4.0.20", + "System.Runtime.Numerics": "4.0.0", "System.Security.Cryptography.Algorithms": "4.0.0-rc3-23808", "System.Security.Cryptography.Encoding": "4.0.0-rc3-23808", "System.Text.Encoding": "4.0.10" diff --git a/src/System.Security.Cryptography.OpenSsl/tests/project.json b/src/System.Security.Cryptography.OpenSsl/tests/project.json index 40e7d881f2e5..94999f5235aa 100644 --- a/src/System.Security.Cryptography.OpenSsl/tests/project.json +++ b/src/System.Security.Cryptography.OpenSsl/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.IO": "4.0.10", "System.Runtime": "4.0.20", "System.Runtime.Extensions": "4.0.10", diff --git a/src/System.Security.Cryptography.Primitives/src/facade/project.json b/src/System.Security.Cryptography.Primitives/src/facade/project.json index f15d78c42d41..2d26366fff58 100644 --- a/src/System.Security.Cryptography.Primitives/src/facade/project.json +++ b/src/System.Security.Cryptography.Primitives/src/facade/project.json @@ -2,7 +2,7 @@ "frameworks": { "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23530" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Security.Cryptography.Primitives/src/project.json b/src/System.Security.Cryptography.Primitives/src/project.json index ae10ac42a296..2bc61bf3a930 100644 --- a/src/System.Security.Cryptography.Primitives/src/project.json +++ b/src/System.Security.Cryptography.Primitives/src/project.json @@ -1,7 +1,8 @@ { "dependencies": { - "System.Diagnostics.Debug": "4.0.0", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Diagnostics.Contracts": "4.0.0", + "System.Diagnostics.Debug": "4.0.0", "System.IO": "4.0.10", "System.Resources.ResourceManager": "4.0.0", "System.Runtime": "4.0.20", @@ -11,4 +12,4 @@ "frameworks": { "dnxcore50": {} } -} \ No newline at end of file +} diff --git a/src/System.Security.Cryptography.Primitives/tests/project.json b/src/System.Security.Cryptography.Primitives/tests/project.json index ca5553c4a8e0..686d026701b3 100644 --- a/src/System.Security.Cryptography.Primitives/tests/project.json +++ b/src/System.Security.Cryptography.Primitives/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Runtime": "4.0.20", "System.Runtime.Extensions": "4.0.10", "xunit": "2.1.0", diff --git a/src/System.Security.Cryptography.X509Certificates/src/net461/project.json b/src/System.Security.Cryptography.X509Certificates/src/net461/project.json index a2064100e736..4ecd8fd306f2 100644 --- a/src/System.Security.Cryptography.X509Certificates/src/net461/project.json +++ b/src/System.Security.Cryptography.X509Certificates/src/net461/project.json @@ -2,7 +2,7 @@ "frameworks": { "net461": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6.1": "1.0.0" + "Microsoft.TargetingPack.NETFramework.v4.6.1": "1.0.1" } } } diff --git a/src/System.Security.Cryptography.X509Certificates/src/netcore50/project.json b/src/System.Security.Cryptography.X509Certificates/src/netcore50/project.json index f9bcee14f50a..ee916f7ef678 100644 --- a/src/System.Security.Cryptography.X509Certificates/src/netcore50/project.json +++ b/src/System.Security.Cryptography.X509Certificates/src/netcore50/project.json @@ -1,11 +1,11 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", "System.Diagnostics.Contracts": "4.0.0", "System.Diagnostics.Debug": "4.0.10", "System.Globalization.Calendars": "4.0.0", "System.IO.FileSystem": "4.0.0", - "System.IO.FileSystem.Watcher": "4.0.0-rc3-23808", "System.Resources.ResourceManager": "4.0.0", "System.Runtime": "4.0.20", "System.Runtime.InteropServices": "4.0.20", @@ -17,5 +17,9 @@ }, "frameworks": { "netcore50": {} + }, + "runtimes": { + "win8-x86": {}, + "win8-x64": {} } } diff --git a/src/System.Security.Cryptography.X509Certificates/src/unix/project.json b/src/System.Security.Cryptography.X509Certificates/src/unix/project.json index 00cb235fce18..ae5dd9912389 100644 --- a/src/System.Security.Cryptography.X509Certificates/src/unix/project.json +++ b/src/System.Security.Cryptography.X509Certificates/src/unix/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", "System.Diagnostics.Contracts": "4.0.0", "System.Diagnostics.Debug": "4.0.10", @@ -19,5 +20,9 @@ }, "frameworks": { "dnxcore50": {} + }, + "runtimes": { + "ubuntu.14.04-x64": {}, + "osx.10.10-x64": {} } } diff --git a/src/System.Security.Cryptography.X509Certificates/src/win/project.json b/src/System.Security.Cryptography.X509Certificates/src/win/project.json index 0e58450a823b..26940f98a75e 100644 --- a/src/System.Security.Cryptography.X509Certificates/src/win/project.json +++ b/src/System.Security.Cryptography.X509Certificates/src/win/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", "System.Diagnostics.Contracts": "4.0.0", "System.Diagnostics.Debug": "4.0.10", diff --git a/src/System.Security.Cryptography.X509Certificates/tests/project.json b/src/System.Security.Cryptography.X509Certificates/tests/project.json index d29166d85339..c65054f172e9 100644 --- a/src/System.Security.Cryptography.X509Certificates/tests/project.json +++ b/src/System.Security.Cryptography.X509Certificates/tests/project.json @@ -1,7 +1,8 @@ { "dependencies": { - "System.IO.FileSystem": "4.0.0", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Globalization": "4.0.10", + "System.IO.FileSystem": "4.0.0", "System.Runtime": "4.0.20", "System.Runtime.Extensions": "4.0.10", "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc3-23808", diff --git a/src/System.Security.Principal.Windows/src/facade/project.json b/src/System.Security.Principal.Windows/src/facade/project.json index f15d78c42d41..2d26366fff58 100644 --- a/src/System.Security.Principal.Windows/src/facade/project.json +++ b/src/System.Security.Principal.Windows/src/facade/project.json @@ -2,7 +2,7 @@ "frameworks": { "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23530" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Security.Principal.Windows/src/project.json b/src/System.Security.Principal.Windows/src/project.json index f349834b3812..d9c9707060fe 100644 --- a/src/System.Security.Principal.Windows/src/project.json +++ b/src/System.Security.Principal.Windows/src/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "Microsoft.Win32.Primitives": "4.0.0", "System.Collections": "4.0.0", "System.Diagnostics.Contracts": "4.0.0", @@ -18,4 +19,4 @@ "frameworks": { "dnxcore50": {} } -} \ No newline at end of file +} diff --git a/src/System.Security.Principal.Windows/tests/project.json b/src/System.Security.Principal.Windows/tests/project.json index 87bc601d1753..8d615fe199cb 100644 --- a/src/System.Security.Principal.Windows/tests/project.json +++ b/src/System.Security.Principal.Windows/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Runtime": "4.0.20", "System.Runtime.Handles": "4.0.0", "System.Security.Claims": "4.0.0", diff --git a/src/System.Security.Principal/src/facade/project.json b/src/System.Security.Principal/src/facade/project.json index f15d78c42d41..2d26366fff58 100644 --- a/src/System.Security.Principal/src/facade/project.json +++ b/src/System.Security.Principal/src/facade/project.json @@ -2,7 +2,7 @@ "frameworks": { "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23530" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Security.Principal/tests/project.json b/src/System.Security.Principal/tests/project.json index d836114ab0bd..a1b54c6e7c25 100644 --- a/src/System.Security.Principal/tests/project.json +++ b/src/System.Security.Principal/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Runtime": "4.0.20", "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00123" diff --git a/src/System.ServiceProcess.ServiceController/src/facade/project.json b/src/System.ServiceProcess.ServiceController/src/facade/project.json index f15d78c42d41..2d26366fff58 100644 --- a/src/System.ServiceProcess.ServiceController/src/facade/project.json +++ b/src/System.ServiceProcess.ServiceController/src/facade/project.json @@ -2,7 +2,7 @@ "frameworks": { "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23530" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.ServiceProcess.ServiceController/src/project.json b/src/System.ServiceProcess.ServiceController/src/project.json index 8a97e165cd96..942bc398214d 100644 --- a/src/System.ServiceProcess.ServiceController/src/project.json +++ b/src/System.ServiceProcess.ServiceController/src/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "Microsoft.Win32.Primitives": "4.0.0", "System.Collections": "4.0.10", "System.Diagnostics.Tools": "4.0.0", @@ -13,4 +14,4 @@ "frameworks": { "dnxcore50": {} } -} \ No newline at end of file +} diff --git a/src/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.Tests/project.json b/src/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.Tests/project.json index 996063997ddc..450dd8cf4471 100644 --- a/src/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.Tests/project.json +++ b/src/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.Tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "Microsoft.Win32.Registry": "4.0.0-rc3-23808", "System.Diagnostics.Process": "4.1.0-rc3-23808", "System.Runtime": "4.0.20", diff --git a/src/System.Text.Encoding.CodePages/src/project.json b/src/System.Text.Encoding.CodePages/src/project.json index 5009cff239fb..8d0ef7694c0f 100644 --- a/src/System.Text.Encoding.CodePages/src/project.json +++ b/src/System.Text.Encoding.CodePages/src/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "System.Runtime.Handles": "4.0.0", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", "System.Diagnostics.Contracts": "4.0.0", "System.Diagnostics.Debug": "4.0.10", @@ -9,13 +9,14 @@ "System.IO": "4.0.10", "System.Reflection": "4.0.10", "System.Resources.ResourceManager": "4.0.0", + "System.Runtime": "4.0.20", + "System.Runtime.Extensions": "4.0.10", + "System.Runtime.Handles": "4.0.0", "System.Runtime.InteropServices": "4.0.20", "System.Text.Encoding": "4.0.10", - "System.Threading": "4.0.10", - "System.Runtime": "4.0.20", - "System.Runtime.Extensions": "4.0.10" + "System.Threading": "4.0.10" }, "frameworks": { "dnxcore50": {} } -} \ No newline at end of file +} diff --git a/src/System.Text.Encoding.CodePages/tests/project.json b/src/System.Text.Encoding.CodePages/tests/project.json index a9f9b415b6b7..0809dcebbb1b 100644 --- a/src/System.Text.Encoding.CodePages/tests/project.json +++ b/src/System.Text.Encoding.CodePages/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Globalization": "4.0.10", "System.Runtime": "4.0.20", "System.Runtime.Extensions": "4.0.10", diff --git a/src/System.Text.Encoding.Extensions/src/project.json b/src/System.Text.Encoding.Extensions/src/project.json index 7e5e0697264a..070ee62c662e 100644 --- a/src/System.Text.Encoding.Extensions/src/project.json +++ b/src/System.Text.Encoding.Extensions/src/project.json @@ -12,7 +12,7 @@ }, "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23530" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Text.Encoding.Extensions/tests/project.json b/src/System.Text.Encoding.Extensions/tests/project.json index 9525b80fee1e..585959a39e7b 100644 --- a/src/System.Text.Encoding.Extensions/tests/project.json +++ b/src/System.Text.Encoding.Extensions/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Runtime": "4.0.20", "System.Text.Encoding": "4.0.10", "System.Text.Encoding.Extensions": "4.0.10", diff --git a/src/System.Text.Encoding/src/project.json b/src/System.Text.Encoding/src/project.json index 7e5e0697264a..070ee62c662e 100644 --- a/src/System.Text.Encoding/src/project.json +++ b/src/System.Text.Encoding/src/project.json @@ -12,7 +12,7 @@ }, "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23530" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Text.Encoding/tests/project.json b/src/System.Text.Encoding/tests/project.json index 720cf38b9f7e..8c83770c8ac2 100644 --- a/src/System.Text.Encoding/tests/project.json +++ b/src/System.Text.Encoding/tests/project.json @@ -1,12 +1,13 @@ { "dependencies": { "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0028", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Globalization": "4.0.10", - "System.Threading.Tasks": "4.0.10", "System.Runtime": "4.0.20", "System.Runtime.Extensions": "4.0.10", "System.Text.Encoding": "4.0.10", "System.Text.Encoding.Extensions": "4.0.10", + "System.Threading.Tasks": "4.0.10", "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00123" }, diff --git a/src/System.Text.Encodings.Web/src/project.json b/src/System.Text.Encodings.Web/src/project.json index 83c1ea1ffcc1..9f90151024ce 100644 --- a/src/System.Text.Encodings.Web/src/project.json +++ b/src/System.Text.Encodings.Web/src/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Diagnostics.Contracts": "4.0.0", "System.Diagnostics.Debug": "4.0.0", "System.Diagnostics.Tools": "4.0.0", @@ -13,4 +14,4 @@ "frameworks": { "dnxcore50": {} } -} \ No newline at end of file +} diff --git a/src/System.Text.Encodings.Web/tests/project.json b/src/System.Text.Encodings.Web/tests/project.json index ee1bcf747e4c..ea829f00c548 100644 --- a/src/System.Text.Encodings.Web/tests/project.json +++ b/src/System.Text.Encodings.Web/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Globalization": "4.0.0", "System.IO": "4.0.0", "System.Reflection": "4.0.10", diff --git a/src/System.Text.RegularExpressions/src/facade/project.json b/src/System.Text.RegularExpressions/src/facade/project.json index f15d78c42d41..2d26366fff58 100644 --- a/src/System.Text.RegularExpressions/src/facade/project.json +++ b/src/System.Text.RegularExpressions/src/facade/project.json @@ -2,7 +2,7 @@ "frameworks": { "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23530" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Text.RegularExpressions/src/project.json b/src/System.Text.RegularExpressions/src/project.json index 8a7642480360..52a287d14c17 100644 --- a/src/System.Text.RegularExpressions/src/project.json +++ b/src/System.Text.RegularExpressions/src/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", "System.Diagnostics.Debug": "4.0.10", "System.Diagnostics.Tools": "4.0.0", @@ -13,4 +14,4 @@ "frameworks": { "dnxcore50": {} } -} \ No newline at end of file +} diff --git a/src/System.Text.RegularExpressions/tests/project.json b/src/System.Text.RegularExpressions/tests/project.json index 03eef7df7b4e..aabc04eed105 100644 --- a/src/System.Text.RegularExpressions/tests/project.json +++ b/src/System.Text.RegularExpressions/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", "System.Console": "4.0.0-rc3-23808", "System.Globalization": "4.0.10", diff --git a/src/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj b/src/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj index 970edf35f82f..f80af5c52cf4 100644 --- a/src/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj +++ b/src/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj @@ -7,6 +7,7 @@ {E3ED83FD-3015-4BD8-A1B8-6294986E6CFA} dotnet5.4 true + .NETPlatform,Version=v5.4 diff --git a/src/System.Threading.AccessControl/src/project.json b/src/System.Threading.AccessControl/src/project.json index 965fa71be8f3..9b11375cba34 100644 --- a/src/System.Threading.AccessControl/src/project.json +++ b/src/System.Threading.AccessControl/src/project.json @@ -15,7 +15,7 @@ }, "net46": { "dependencies": { - "Microsoft.TargetingPack.NetFramework.v4.6": "1.0.0" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Threading.AccessControl/tests/project.json b/src/System.Threading.AccessControl/tests/project.json index c7c4b64116b3..51987aaf76bd 100644 --- a/src/System.Threading.AccessControl/tests/project.json +++ b/src/System.Threading.AccessControl/tests/project.json @@ -1,9 +1,10 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Diagnostics.Contracts": "4.0.0", - "System.Runtime.Handles": "4.0.0", "System.Resources.ResourceManager": "4.0.0", "System.Runtime": "4.0.20", + "System.Runtime.Handles": "4.0.0", "System.Runtime.InteropServices": "4.0.20", "System.Security.AccessControl": "4.0.0-rc3-23808", "System.Security.Principal.Windows": "4.0.0-rc3-23808", @@ -13,6 +14,8 @@ "xunit.netcore.extensions": "1.0.0-prerelease-00123" }, "frameworks": { - "dnxcore50": {} + "dnxcore50": { + "imports": "portable-net45+win8" + } } } diff --git a/src/System.Threading.Overlapped/src/System.Threading.Overlapped.csproj b/src/System.Threading.Overlapped/src/System.Threading.Overlapped.csproj index a9c2680b67e6..77608f1f1434 100644 --- a/src/System.Threading.Overlapped/src/System.Threading.Overlapped.csproj +++ b/src/System.Threading.Overlapped/src/System.Threading.Overlapped.csproj @@ -10,6 +10,7 @@ {6A07CCB8-3E59-47e7-B3DD-DB1F6FC501D5} true true + .NETPlatform,Version=v5.1 diff --git a/src/System.Threading.Overlapped/src/project.json b/src/System.Threading.Overlapped/src/project.json index 94b3e1bd9f6d..1fb723ec14a9 100644 --- a/src/System.Threading.Overlapped/src/project.json +++ b/src/System.Threading.Overlapped/src/project.json @@ -2,11 +2,13 @@ "frameworks": { "dotnet5.1": { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "Microsoft.TargetingPack.Private.CoreCLR": "1.0.0-rc3-23808" } }, "netcore50": { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Diagnostics.Debug": "4.0.0.0", "System.Resources.ResourceManager": "4.0.0.0", "System.Runtime": "4.0.20.0", @@ -18,7 +20,7 @@ }, "net46": { "dependencies": { - "Microsoft.TargetingPack.NetFramework.v4.6": "1.0.0" + "Microsoft.TargetingPack.NetFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Threading.Overlapped/tests/project.json b/src/System.Threading.Overlapped/tests/project.json index febbf66ac77d..c11121f38a47 100644 --- a/src/System.Threading.Overlapped/tests/project.json +++ b/src/System.Threading.Overlapped/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Threading.Overlapped": "4.0.0", "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00123" diff --git a/src/System.Threading.Tasks.Dataflow/tests/project.json b/src/System.Threading.Tasks.Dataflow/tests/project.json index 1c0d47d257ce..66fc7228441e 100644 --- a/src/System.Threading.Tasks.Dataflow/tests/project.json +++ b/src/System.Threading.Tasks.Dataflow/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", "System.Diagnostics.Contracts": "4.0.0", "System.Diagnostics.Debug": "4.0.10", diff --git a/src/System.Threading.Tasks.Extensions/src/project.json b/src/System.Threading.Tasks.Extensions/src/project.json index c2acf1edc0fe..d6fb3c79dba6 100644 --- a/src/System.Threading.Tasks.Extensions/src/project.json +++ b/src/System.Threading.Tasks.Extensions/src/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.0", "System.Diagnostics.Debug": "4.0.0", "System.Runtime": "4.0.0", @@ -8,4 +9,4 @@ "frameworks": { "dnxcore50": {} } -} \ No newline at end of file +} diff --git a/src/System.Threading.Tasks.Extensions/tests/project.json b/src/System.Threading.Tasks.Extensions/tests/project.json index 3709448a7fd4..d2b345ea6f48 100644 --- a/src/System.Threading.Tasks.Extensions/tests/project.json +++ b/src/System.Threading.Tasks.Extensions/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Runtime": "4.0.20", "System.Threading.Tasks": "4.0.10", "xunit": "2.1.0", @@ -10,4 +11,4 @@ "imports": "portable-net45+win8" } } -} \ No newline at end of file +} diff --git a/src/System.Threading.Tasks.Parallel/src/facade/project.json b/src/System.Threading.Tasks.Parallel/src/facade/project.json index f15d78c42d41..2d26366fff58 100644 --- a/src/System.Threading.Tasks.Parallel/src/facade/project.json +++ b/src/System.Threading.Tasks.Parallel/src/facade/project.json @@ -2,7 +2,7 @@ "frameworks": { "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23530" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Threading.Tasks.Parallel/src/project.json b/src/System.Threading.Tasks.Parallel/src/project.json index 0dac0ad2823f..454d7905dd3c 100644 --- a/src/System.Threading.Tasks.Parallel/src/project.json +++ b/src/System.Threading.Tasks.Parallel/src/project.json @@ -1,12 +1,13 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections.Concurrent": "4.0.10", - "System.Diagnostics.Tracing": "4.0.20", + "System.Diagnostics.Contracts": "4.0.0", "System.Diagnostics.Debug": "4.0.10", "System.Diagnostics.Tools": "4.0.0", - "System.Diagnostics.Contracts": "4.0.0", - "System.Runtime": "4.0.20", + "System.Diagnostics.Tracing": "4.0.20", "System.Resources.ResourceManager": "4.0.0", + "System.Runtime": "4.0.20", "System.Runtime.Extensions": "4.0.10", "System.Threading": "4.0.10", "System.Threading.Tasks": "4.0.10" @@ -14,4 +15,4 @@ "frameworks": { "dnxcore50": {} } -} \ No newline at end of file +} diff --git a/src/System.Threading.Tasks.Parallel/tests/project.json b/src/System.Threading.Tasks.Parallel/tests/project.json index 0053e18fbe67..2c966bfdfbb1 100644 --- a/src/System.Threading.Tasks.Parallel/tests/project.json +++ b/src/System.Threading.Tasks.Parallel/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", "System.Collections.Concurrent": "4.0.10", "System.Diagnostics.Debug": "4.0.10", diff --git a/src/System.Threading.Tasks/src/project.json b/src/System.Threading.Tasks/src/project.json index 1615b2e388e7..9c17bfe3c310 100644 --- a/src/System.Threading.Tasks/src/project.json +++ b/src/System.Threading.Tasks/src/project.json @@ -7,7 +7,7 @@ }, "net46": { "dependencies": { - "Microsoft.TargetingPack.NetFramework.v4.6": "1.0.0" + "Microsoft.TargetingPack.NetFramework.v4.6": "1.0.1" } }, "netcore50": { diff --git a/src/System.Threading.Tasks/tests/project.json b/src/System.Threading.Tasks/tests/project.json index 142ef2417702..0c68e7c62c49 100644 --- a/src/System.Threading.Tasks/tests/project.json +++ b/src/System.Threading.Tasks/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", "System.Collections.Concurrent": "4.0.0", "System.Diagnostics.Debug": "4.0.10", diff --git a/src/System.Threading.Thread/src/project.json b/src/System.Threading.Thread/src/project.json index 491a146222bb..61e9ed84cc1e 100644 --- a/src/System.Threading.Thread/src/project.json +++ b/src/System.Threading.Thread/src/project.json @@ -7,7 +7,7 @@ }, "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23530" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Threading.ThreadPool/src/project.json b/src/System.Threading.ThreadPool/src/project.json index 491a146222bb..61e9ed84cc1e 100644 --- a/src/System.Threading.ThreadPool/src/project.json +++ b/src/System.Threading.ThreadPool/src/project.json @@ -7,7 +7,7 @@ }, "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23530" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Threading.Timer/src/project.json b/src/System.Threading.Timer/src/project.json index 7e5e0697264a..070ee62c662e 100644 --- a/src/System.Threading.Timer/src/project.json +++ b/src/System.Threading.Timer/src/project.json @@ -12,7 +12,7 @@ }, "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23530" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Threading.Timer/tests/project.json b/src/System.Threading.Timer/tests/project.json index c43a40ab6139..64b6d3bb3f28 100644 --- a/src/System.Threading.Timer/tests/project.json +++ b/src/System.Threading.Timer/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Linq": "4.0.0", "System.Runtime": "4.0.20", "System.Threading.Tasks": "4.0.10", diff --git a/src/System.Threading/src/project.json b/src/System.Threading/src/project.json index 4765e77c79a5..871dbfad8fe2 100644 --- a/src/System.Threading/src/project.json +++ b/src/System.Threading/src/project.json @@ -12,7 +12,7 @@ }, "net46": { "dependencies": { - "Microsoft.TargetingPack.NetFramework.v4.6": "1.0.0" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Threading/tests/project.json b/src/System.Threading/tests/project.json index 887cf7046fd1..88e91d377ba5 100644 --- a/src/System.Threading/tests/project.json +++ b/src/System.Threading/tests/project.json @@ -1,6 +1,7 @@ { "dependencies": { "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0028", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", "System.Diagnostics.Debug": "4.0.10", "System.Diagnostics.Tracing": "4.0.20", diff --git a/src/System.Xml.ReaderWriter/src/facade/project.json b/src/System.Xml.ReaderWriter/src/facade/project.json index f15d78c42d41..2d26366fff58 100644 --- a/src/System.Xml.ReaderWriter/src/facade/project.json +++ b/src/System.Xml.ReaderWriter/src/facade/project.json @@ -2,7 +2,7 @@ "frameworks": { "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23530" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Xml.ReaderWriter/src/project.json b/src/System.Xml.ReaderWriter/src/project.json index f3a677da650d..42a38ed74135 100644 --- a/src/System.Xml.ReaderWriter/src/project.json +++ b/src/System.Xml.ReaderWriter/src/project.json @@ -1,21 +1,22 @@ { "dependencies": { - "System.Runtime": "4.0.20", - "System.Runtime.InteropServices": "4.0.20", - "System.Resources.ResourceManager": "4.0.0", - "System.Globalization": "4.0.10", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", + "System.Diagnostics.Debug": "4.0.10", + "System.Diagnostics.Tools": "4.0.0", + "System.Globalization": "4.0.10", "System.IO": "4.0.10", "System.IO.FileSystem": "4.0.0", "System.IO.FileSystem.Primitives": "4.0.0", - "System.Diagnostics.Tools": "4.0.0", - "System.Diagnostics.Debug": "4.0.10", + "System.Resources.ResourceManager": "4.0.0", + "System.Runtime": "4.0.20", "System.Runtime.Extensions": "4.0.10", - "System.Threading.Tasks": "4.0.10", - "System.Threading.Tasks.Extensions": "4.0.0-rc3-23808", + "System.Runtime.InteropServices": "4.0.20", "System.Text.Encoding": "4.0.10", "System.Text.Encoding.Extensions": "4.0.10", - "System.Text.RegularExpressions": "4.0.0" + "System.Text.RegularExpressions": "4.0.0", + "System.Threading.Tasks": "4.0.10", + "System.Threading.Tasks.Extensions": "4.0.0-rc3-23808" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.Xml.ReaderWriter/tests/Readers/CharCheckingReader/project.json b/src/System.Xml.ReaderWriter/tests/Readers/CharCheckingReader/project.json index b5ba0c32d362..a6d8a80fd092 100644 --- a/src/System.Xml.ReaderWriter/tests/Readers/CharCheckingReader/project.json +++ b/src/System.Xml.ReaderWriter/tests/Readers/CharCheckingReader/project.json @@ -1,8 +1,9 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Globalization": "4.0.10", - "System.Runtime": "4.0.20", "System.IO": "4.0.10", + "System.Runtime": "4.0.20", "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00123" }, diff --git a/src/System.Xml.ReaderWriter/tests/Readers/CustomReader/project.json b/src/System.Xml.ReaderWriter/tests/Readers/CustomReader/project.json index b5ba0c32d362..a6d8a80fd092 100644 --- a/src/System.Xml.ReaderWriter/tests/Readers/CustomReader/project.json +++ b/src/System.Xml.ReaderWriter/tests/Readers/CustomReader/project.json @@ -1,8 +1,9 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Globalization": "4.0.10", - "System.Runtime": "4.0.20", "System.IO": "4.0.10", + "System.Runtime": "4.0.20", "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00123" }, diff --git a/src/System.Xml.ReaderWriter/tests/Readers/FactoryReader/project.json b/src/System.Xml.ReaderWriter/tests/Readers/FactoryReader/project.json index b5ba0c32d362..a6d8a80fd092 100644 --- a/src/System.Xml.ReaderWriter/tests/Readers/FactoryReader/project.json +++ b/src/System.Xml.ReaderWriter/tests/Readers/FactoryReader/project.json @@ -1,8 +1,9 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Globalization": "4.0.10", - "System.Runtime": "4.0.20", "System.IO": "4.0.10", + "System.Runtime": "4.0.20", "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00123" }, diff --git a/src/System.Xml.ReaderWriter/tests/Readers/NameTable/project.json b/src/System.Xml.ReaderWriter/tests/Readers/NameTable/project.json index cd6369899727..08e3d72dfdc4 100644 --- a/src/System.Xml.ReaderWriter/tests/Readers/NameTable/project.json +++ b/src/System.Xml.ReaderWriter/tests/Readers/NameTable/project.json @@ -1,10 +1,11 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", + "System.Collections": "4.0.10", "System.Globalization": "4.0.10", + "System.IO": "4.0.10", "System.Runtime": "4.0.20", "System.Runtime.Extensions": "4.0.10", - "System.Collections": "4.0.10", - "System.IO": "4.0.10", "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00123" }, diff --git a/src/System.Xml.ReaderWriter/tests/Readers/ReaderSettings/project.json b/src/System.Xml.ReaderWriter/tests/Readers/ReaderSettings/project.json index d05672f94fc2..63cdd4eb7044 100644 --- a/src/System.Xml.ReaderWriter/tests/Readers/ReaderSettings/project.json +++ b/src/System.Xml.ReaderWriter/tests/Readers/ReaderSettings/project.json @@ -1,11 +1,12 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", + "System.Collections": "4.0.10", "System.Globalization": "4.0.10", + "System.IO": "4.0.10", "System.Runtime": "4.0.20", "System.Runtime.Extensions": "4.0.10", "System.Text.Encoding": "4.0.10", - "System.Collections": "4.0.10", - "System.IO": "4.0.10", "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00123" }, diff --git a/src/System.Xml.ReaderWriter/tests/Readers/SubtreeReader/project.json b/src/System.Xml.ReaderWriter/tests/Readers/SubtreeReader/project.json index b5ba0c32d362..a6d8a80fd092 100644 --- a/src/System.Xml.ReaderWriter/tests/Readers/SubtreeReader/project.json +++ b/src/System.Xml.ReaderWriter/tests/Readers/SubtreeReader/project.json @@ -1,8 +1,9 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Globalization": "4.0.10", - "System.Runtime": "4.0.20", "System.IO": "4.0.10", + "System.Runtime": "4.0.20", "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00123" }, diff --git a/src/System.Xml.ReaderWriter/tests/Readers/WrappedReader/project.json b/src/System.Xml.ReaderWriter/tests/Readers/WrappedReader/project.json index 964a090732a0..230ed1694bc8 100644 --- a/src/System.Xml.ReaderWriter/tests/Readers/WrappedReader/project.json +++ b/src/System.Xml.ReaderWriter/tests/Readers/WrappedReader/project.json @@ -1,7 +1,8 @@ { "dependencies": { - "System.Runtime": "4.0.20", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.IO": "4.0.10", + "System.Runtime": "4.0.20", "System.Xml.ReaderWriter": "4.0.10", "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00123" diff --git a/src/System.Xml.ReaderWriter/tests/Writers/RwFactory/project.json b/src/System.Xml.ReaderWriter/tests/Writers/RwFactory/project.json index e126fa099714..a4bdbd74c402 100644 --- a/src/System.Xml.ReaderWriter/tests/Writers/RwFactory/project.json +++ b/src/System.Xml.ReaderWriter/tests/Writers/RwFactory/project.json @@ -1,12 +1,13 @@ { "dependencies": { - "System.Runtime": "4.0.20", - "System.Runtime.Extensions": "4.0.10", - "System.Console": "4.0.0-rc3-23808", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", + "System.Console": "4.0.0-rc3-23808", "System.Globalization": "4.0.10", "System.IO": "4.0.10", "System.Linq": "4.0.0", + "System.Runtime": "4.0.20", + "System.Runtime.Extensions": "4.0.10", "System.Text.Encoding": "4.0.10", "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00123" diff --git a/src/System.Xml.ReaderWriter/tests/Writers/XmlWriterApi/project.json b/src/System.Xml.ReaderWriter/tests/Writers/XmlWriterApi/project.json index 6e8107189a10..a4bdbd74c402 100644 --- a/src/System.Xml.ReaderWriter/tests/Writers/XmlWriterApi/project.json +++ b/src/System.Xml.ReaderWriter/tests/Writers/XmlWriterApi/project.json @@ -1,12 +1,13 @@ { "dependencies": { - "System.Runtime": "4.0.20", - "System.Runtime.Extensions": "4.0.10", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", "System.Console": "4.0.0-rc3-23808", "System.Globalization": "4.0.10", - "System.Linq": "4.0.0", "System.IO": "4.0.10", + "System.Linq": "4.0.0", + "System.Runtime": "4.0.20", + "System.Runtime.Extensions": "4.0.10", "System.Text.Encoding": "4.0.10", "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00123" diff --git a/src/System.Xml.ReaderWriter/tests/XmlConvert/project.json b/src/System.Xml.ReaderWriter/tests/XmlConvert/project.json index 534a83ac2c97..7ea21ad313be 100644 --- a/src/System.Xml.ReaderWriter/tests/XmlConvert/project.json +++ b/src/System.Xml.ReaderWriter/tests/XmlConvert/project.json @@ -1,8 +1,9 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", + "System.Globalization": "4.0.10", "System.Runtime": "4.0.20", "System.Runtime.Extensions": "4.0.10", - "System.Globalization": "4.0.10", "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00123" }, diff --git a/src/System.Xml.ReaderWriter/tests/XmlReader/ReadContentAs/project.json b/src/System.Xml.ReaderWriter/tests/XmlReader/ReadContentAs/project.json index 701569eacdfa..85fbe02f3584 100644 --- a/src/System.Xml.ReaderWriter/tests/XmlReader/ReadContentAs/project.json +++ b/src/System.Xml.ReaderWriter/tests/XmlReader/ReadContentAs/project.json @@ -1,7 +1,8 @@ { "dependencies": { - "System.Runtime": "4.0.20", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.IO": "4.0.10", + "System.Runtime": "4.0.20", "System.Threading.Tasks": "4.0.10", "System.Xml.ReaderWriter": "4.0.10", "xunit": "2.1.0", diff --git a/src/System.Xml.ReaderWriter/tests/XmlReader/Tests/project.json b/src/System.Xml.ReaderWriter/tests/XmlReader/Tests/project.json index fbb61a04daf3..acda6d33ef68 100644 --- a/src/System.Xml.ReaderWriter/tests/XmlReader/Tests/project.json +++ b/src/System.Xml.ReaderWriter/tests/XmlReader/Tests/project.json @@ -1,8 +1,9 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Globalization": "4.0.10", - "System.Runtime": "4.0.20", "System.IO": "4.0.10", + "System.Runtime": "4.0.20", "System.Text.Encoding": "4.0.10", "System.Threading.Tasks": "4.0.10", "xunit": "2.1.0", diff --git a/src/System.Xml.ReaderWriter/tests/XmlReader/XmlResolver/project.json b/src/System.Xml.ReaderWriter/tests/XmlReader/XmlResolver/project.json index 2691abf60858..1499ca927a85 100644 --- a/src/System.Xml.ReaderWriter/tests/XmlReader/XmlResolver/project.json +++ b/src/System.Xml.ReaderWriter/tests/XmlReader/XmlResolver/project.json @@ -1,10 +1,11 @@ { "dependencies": { - "System.Runtime": "4.0.20", - "System.Runtime.Extensions": "4.0.10", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.IO": "4.0.10", "System.IO.FileSystem": "4.0.0", "System.IO.FileSystem.Primitives": "4.0.0", + "System.Runtime": "4.0.20", + "System.Runtime.Extensions": "4.0.10", "System.Threading.Tasks": "4.0.10", "System.Xml.ReaderWriter": "4.0.10", "xunit": "2.1.0", diff --git a/src/System.Xml.ReaderWriter/tests/XmlReaderLib/project.json b/src/System.Xml.ReaderWriter/tests/XmlReaderLib/project.json index 7391c7d2bde7..115b6990c1b1 100644 --- a/src/System.Xml.ReaderWriter/tests/XmlReaderLib/project.json +++ b/src/System.Xml.ReaderWriter/tests/XmlReaderLib/project.json @@ -1,9 +1,10 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", + "System.Collections": "4.0.10", "System.IO": "4.0.10", "System.Runtime": "4.0.20", "System.Runtime.Extensions": "4.0.10", - "System.Collections": "4.0.10", "System.Text.Encoding": "4.0.10", "System.Xml.ReaderWriter": "4.0.10", "xunit": "2.1.0", diff --git a/src/System.Xml.ReaderWriter/tests/XmlWriter/project.json b/src/System.Xml.ReaderWriter/tests/XmlWriter/project.json index 669ece3dc07e..fd7affde9d79 100644 --- a/src/System.Xml.ReaderWriter/tests/XmlWriter/project.json +++ b/src/System.Xml.ReaderWriter/tests/XmlWriter/project.json @@ -1,8 +1,9 @@ { "dependencies": { - "System.Runtime": "4.0.20", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.AppContext": "4.0.0", "System.IO": "4.0.10", + "System.Runtime": "4.0.20", "System.Text.Encoding": "4.0.10", "System.Text.Encoding.CodePages": "4.0.0", "System.Text.Encoding.Extensions": "4.0.10", diff --git a/src/System.Xml.XDocument/src/facade/project.json b/src/System.Xml.XDocument/src/facade/project.json index f15d78c42d41..2d26366fff58 100644 --- a/src/System.Xml.XDocument/src/facade/project.json +++ b/src/System.Xml.XDocument/src/facade/project.json @@ -2,7 +2,7 @@ "frameworks": { "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23530" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Xml.XDocument/tests/Properties/project.json b/src/System.Xml.XDocument/tests/Properties/project.json index e211b39f04c9..3339335e6b32 100644 --- a/src/System.Xml.XDocument/tests/Properties/project.json +++ b/src/System.Xml.XDocument/tests/Properties/project.json @@ -1,14 +1,15 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", + "System.Collections": "4.0.10", + "System.Diagnostics.Debug": "4.0.10", + "System.Globalization": "4.0.10", + "System.IO": "4.0.10", "System.Linq": "4.0.0", "System.Runtime": "4.0.20", "System.Runtime.Extensions": "4.0.10", "System.Threading.Tasks": "4.0.10", "System.Xml.ReaderWriter": "4.0.10", - "System.Collections": "4.0.10", - "System.IO": "4.0.10", - "System.Diagnostics.Debug": "4.0.10", - "System.Globalization": "4.0.10", "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00123" }, diff --git a/src/System.Xml.XDocument/tests/SDMSample/project.json b/src/System.Xml.XDocument/tests/SDMSample/project.json index 09dea0d16a78..4db01416057c 100644 --- a/src/System.Xml.XDocument/tests/SDMSample/project.json +++ b/src/System.Xml.XDocument/tests/SDMSample/project.json @@ -1,13 +1,14 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", + "System.Collections": "4.0.10", + "System.Console": "4.0.0-rc3-23808", + "System.Globalization": "4.0.10", + "System.IO": "4.0.10", "System.Runtime": "4.0.20", "System.Runtime.Extensions": "4.0.10", "System.Threading.Tasks": "4.0.10", "System.Xml.ReaderWriter": "4.0.10", - "System.Console": "4.0.0-rc3-23808", - "System.IO": "4.0.10", - "System.Globalization": "4.0.10", - "System.Collections": "4.0.10", "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00123" }, diff --git a/src/System.Xml.XDocument/tests/Streaming/project.json b/src/System.Xml.XDocument/tests/Streaming/project.json index 4af025c65c6a..81f52aaca14b 100644 --- a/src/System.Xml.XDocument/tests/Streaming/project.json +++ b/src/System.Xml.XDocument/tests/Streaming/project.json @@ -1,12 +1,13 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", + "System.Collections": "4.0.10", + "System.IO": "4.0.10", "System.Linq": "4.0.0", "System.Runtime": "4.0.20", "System.Runtime.Extensions": "4.0.10", "System.Threading.Tasks": "4.0.10", "System.Xml.ReaderWriter": "4.0.10", - "System.IO": "4.0.10", - "System.Collections": "4.0.10", "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00123" }, diff --git a/src/System.Xml.XDocument/tests/TreeManipulation/project.json b/src/System.Xml.XDocument/tests/TreeManipulation/project.json index d660a82bbd97..56a9fc7b2960 100644 --- a/src/System.Xml.XDocument/tests/TreeManipulation/project.json +++ b/src/System.Xml.XDocument/tests/TreeManipulation/project.json @@ -1,13 +1,14 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", + "System.Collections": "4.0.10", + "System.IO": "4.0.10", "System.Linq": "4.0.0", "System.Runtime": "4.0.20", "System.Runtime.Extensions": "4.0.10", + "System.Text.Encoding": "4.0.10", "System.Threading.Tasks": "4.0.10", "System.Xml.ReaderWriter": "4.0.10", - "System.Text.Encoding": "4.0.10", - "System.Collections": "4.0.10", - "System.IO": "4.0.10", "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00123" }, diff --git a/src/System.Xml.XDocument/tests/XDocument.Common/project.json b/src/System.Xml.XDocument/tests/XDocument.Common/project.json index da5ae147763b..774d7e711ade 100644 --- a/src/System.Xml.XDocument/tests/XDocument.Common/project.json +++ b/src/System.Xml.XDocument/tests/XDocument.Common/project.json @@ -1,14 +1,15 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", + "System.Collections": "4.0.10", + "System.Diagnostics.Debug": "4.0.10", + "System.IO": "4.0.10", "System.Linq": "4.0.0", "System.Runtime": "4.0.20", "System.Runtime.Extensions": "4.0.10", + "System.Text.Encoding": "4.0.10", "System.Threading.Tasks": "4.0.10", "System.Xml.ReaderWriter": "4.0.10", - "System.Text.Encoding": "4.0.10", - "System.Collections": "4.0.10", - "System.IO": "4.0.10", - "System.Diagnostics.Debug": "4.0.10", "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00123" }, diff --git a/src/System.Xml.XDocument/tests/XDocument.Test.ModuleCore/project.json b/src/System.Xml.XDocument/tests/XDocument.Test.ModuleCore/project.json index bff808577bf4..40b47f7c24b5 100644 --- a/src/System.Xml.XDocument/tests/XDocument.Test.ModuleCore/project.json +++ b/src/System.Xml.XDocument/tests/XDocument.Test.ModuleCore/project.json @@ -1,13 +1,14 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", + "System.Collections": "4.0.10", + "System.Console": "4.0.0-rc3-23808", + "System.IO": "4.0.10", "System.Linq": "4.0.0", "System.Runtime": "4.0.20", + "System.Text.Encoding": "4.0.10", "System.Threading.Tasks": "4.0.10", "System.Xml.ReaderWriter": "4.0.10", - "System.Collections": "4.0.10", - "System.Text.Encoding": "4.0.10", - "System.IO": "4.0.10", - "System.Console": "4.0.0-rc3-23808", "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00123" }, diff --git a/src/System.Xml.XDocument/tests/axes/project.json b/src/System.Xml.XDocument/tests/axes/project.json index af7de794bd26..f3add53ac07b 100644 --- a/src/System.Xml.XDocument/tests/axes/project.json +++ b/src/System.Xml.XDocument/tests/axes/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Linq": "4.0.0", "System.Runtime": "4.0.20", "System.Threading.Tasks": "4.0.10", diff --git a/src/System.Xml.XDocument/tests/events/project.json b/src/System.Xml.XDocument/tests/events/project.json index f6a377211886..465b5eb49086 100644 --- a/src/System.Xml.XDocument/tests/events/project.json +++ b/src/System.Xml.XDocument/tests/events/project.json @@ -1,10 +1,11 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", + "System.Collections": "4.0.10", "System.Globalization": "4.0.10", "System.Linq": "4.0.0", "System.Runtime": "4.0.20", "System.Threading.Tasks": "4.0.10", - "System.Collections": "4.0.10", "System.Xml.ReaderWriter": "4.0.10", "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00123" diff --git a/src/System.Xml.XDocument/tests/misc/project.json b/src/System.Xml.XDocument/tests/misc/project.json index 26dcd9597ee5..81f52aaca14b 100644 --- a/src/System.Xml.XDocument/tests/misc/project.json +++ b/src/System.Xml.XDocument/tests/misc/project.json @@ -1,12 +1,13 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", + "System.Collections": "4.0.10", + "System.IO": "4.0.10", "System.Linq": "4.0.0", "System.Runtime": "4.0.20", "System.Runtime.Extensions": "4.0.10", "System.Threading.Tasks": "4.0.10", "System.Xml.ReaderWriter": "4.0.10", - "System.Collections": "4.0.10", - "System.IO": "4.0.10", "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00123" }, diff --git a/src/System.Xml.XDocument/tests/xNodeBuilder/project.json b/src/System.Xml.XDocument/tests/xNodeBuilder/project.json index 53f582d0cbc3..bfd5beb226ca 100644 --- a/src/System.Xml.XDocument/tests/xNodeBuilder/project.json +++ b/src/System.Xml.XDocument/tests/xNodeBuilder/project.json @@ -1,15 +1,16 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", + "System.Collections": "4.0.10", + "System.Globalization": "4.0.10", + "System.IO": "4.0.10", "System.Linq": "4.0.0", + "System.Reflection": "4.0.10", "System.Runtime": "4.0.20", "System.Runtime.Extensions": "4.0.10", + "System.Text.Encoding": "4.0.10", "System.Threading.Tasks": "4.0.10", "System.Xml.ReaderWriter": "4.0.10", - "System.IO": "4.0.10", - "System.Collections": "4.0.10", - "System.Reflection": "4.0.10", - "System.Globalization": "4.0.10", - "System.Text.Encoding": "4.0.10", "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00123" }, diff --git a/src/System.Xml.XDocument/tests/xNodeReader/project.json b/src/System.Xml.XDocument/tests/xNodeReader/project.json index 2afd28c9645c..56a9fc7b2960 100644 --- a/src/System.Xml.XDocument/tests/xNodeReader/project.json +++ b/src/System.Xml.XDocument/tests/xNodeReader/project.json @@ -1,13 +1,14 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", + "System.Collections": "4.0.10", + "System.IO": "4.0.10", "System.Linq": "4.0.0", "System.Runtime": "4.0.20", "System.Runtime.Extensions": "4.0.10", + "System.Text.Encoding": "4.0.10", "System.Threading.Tasks": "4.0.10", "System.Xml.ReaderWriter": "4.0.10", - "System.Collections": "4.0.10", - "System.Text.Encoding": "4.0.10", - "System.IO": "4.0.10", "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00123" }, diff --git a/src/System.Xml.XPath.XDocument/src/System.Xml.XPath.XDocument.csproj b/src/System.Xml.XPath.XDocument/src/System.Xml.XPath.XDocument.csproj index 70b79e7d28d4..76fcdc444c41 100644 --- a/src/System.Xml.XPath.XDocument/src/System.Xml.XPath.XDocument.csproj +++ b/src/System.Xml.XPath.XDocument/src/System.Xml.XPath.XDocument.csproj @@ -8,6 +8,7 @@ true dotnet5.4 true + .NETPlatform,Version=v5.4 diff --git a/src/System.Xml.XPath.XDocument/src/project.json b/src/System.Xml.XPath.XDocument/src/project.json index 40123c7c096a..7dc2c6d898f2 100644 --- a/src/System.Xml.XPath.XDocument/src/project.json +++ b/src/System.Xml.XPath.XDocument/src/project.json @@ -15,7 +15,7 @@ }, "net46":{ "dependencies": { - "Microsoft.TargetingPack.NetFramework.v4.6": "1.0.0", + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1", } } } diff --git a/src/System.Xml.XPath.XDocument/tests/project.json b/src/System.Xml.XPath.XDocument/tests/project.json index 1a2e2e4a4df4..db13805db543 100644 --- a/src/System.Xml.XPath.XDocument/tests/project.json +++ b/src/System.Xml.XPath.XDocument/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Globalization": "4.0.10", "System.IO": "4.0.10", "System.Reflection": "4.0.10", diff --git a/src/System.Xml.XPath.XmlDocument/src/project.json b/src/System.Xml.XPath.XmlDocument/src/project.json index 9dd06605670f..b35028860b2e 100644 --- a/src/System.Xml.XPath.XmlDocument/src/project.json +++ b/src/System.Xml.XPath.XmlDocument/src/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", "System.Diagnostics.Debug": "4.0.10", "System.Diagnostics.Tools": "4.0.0", @@ -16,4 +17,4 @@ "frameworks": { "dnxcore50": {} } -} \ No newline at end of file +} diff --git a/src/System.Xml.XPath.XmlDocument/tests/project.json b/src/System.Xml.XPath.XmlDocument/tests/project.json index 9b35041d88e7..406c1b10685a 100644 --- a/src/System.Xml.XPath.XmlDocument/tests/project.json +++ b/src/System.Xml.XPath.XmlDocument/tests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Globalization": "4.0.10", "System.IO": "4.0.10", "System.Reflection": "4.0.10", diff --git a/src/System.Xml.XPath/src/facade/project.json b/src/System.Xml.XPath/src/facade/project.json index f15d78c42d41..2d26366fff58 100644 --- a/src/System.Xml.XPath/src/facade/project.json +++ b/src/System.Xml.XPath/src/facade/project.json @@ -2,7 +2,7 @@ "frameworks": { "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23530" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Xml.XPath/src/project.json b/src/System.Xml.XPath/src/project.json index ac3d295ed1ba..a75930a2e643 100644 --- a/src/System.Xml.XPath/src/project.json +++ b/src/System.Xml.XPath/src/project.json @@ -1,18 +1,19 @@ { "dependencies": { - "System.Runtime": "4.0.20", - "System.Xml.ReaderWriter": "4.0.10", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", - "System.Resources.ResourceManager": "4.0.0", + "System.Diagnostics.Contracts": "4.0.0", + "System.Diagnostics.Debug": "4.0.10", + "System.Diagnostics.Tools": "4.0.0", "System.Globalization": "4.0.10", "System.IO": "4.0.10", + "System.Resources.ResourceManager": "4.0.0", + "System.Runtime": "4.0.20", "System.Runtime.Extensions": "4.0.10", "System.Threading": "4.0.10", - "System.Diagnostics.Tools": "4.0.0", - "System.Diagnostics.Debug": "4.0.10", - "System.Diagnostics.Contracts": "4.0.0" + "System.Xml.ReaderWriter": "4.0.10" }, "frameworks": { "dnxcore50": {} } -} \ No newline at end of file +} diff --git a/src/System.Xml.XPath/tests/project.json b/src/System.Xml.XPath/tests/project.json index bf72cb6a5065..f1a0757c610f 100644 --- a/src/System.Xml.XPath/tests/project.json +++ b/src/System.Xml.XPath/tests/project.json @@ -1,14 +1,15 @@ { "dependencies": { - "System.Runtime": "4.0.20", - "System.Xml.ReaderWriter": "4.0.10", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", + "System.Globalization": "4.0.10", "System.IO": "4.0.10", - "System.Runtime.Extensions": "4.0.10", "System.Reflection": "4.0.10", - "System.Globalization": "4.0.10", - "System.Threading.Tasks": "4.0.10", + "System.Runtime": "4.0.20", + "System.Runtime.Extensions": "4.0.10", "System.Text.Encoding": "4.0.10", "System.Text.Encoding.CodePages": "4.0.0", + "System.Threading.Tasks": "4.0.10", + "System.Xml.ReaderWriter": "4.0.10", "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00123" }, diff --git a/src/System.Xml.XmlDocument/src/facade/project.json b/src/System.Xml.XmlDocument/src/facade/project.json index f15d78c42d41..2d26366fff58 100644 --- a/src/System.Xml.XmlDocument/src/facade/project.json +++ b/src/System.Xml.XmlDocument/src/facade/project.json @@ -2,7 +2,7 @@ "frameworks": { "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23530" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Xml.XmlDocument/src/project.json b/src/System.Xml.XmlDocument/src/project.json index 9c01a79bf869..a047e32e0e19 100644 --- a/src/System.Xml.XmlDocument/src/project.json +++ b/src/System.Xml.XmlDocument/src/project.json @@ -1,18 +1,19 @@ { "dependencies": { - "System.Runtime": "4.0.20", - "System.Xml.ReaderWriter": "4.0.10", - "System.IO": "4.0.10", - "System.Text.Encoding": "4.0.10", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", - "System.Resources.ResourceManager": "4.0.0", + "System.Diagnostics.Debug": "4.0.10", + "System.Diagnostics.Tools": "4.0.0", "System.Globalization": "4.0.10", + "System.IO": "4.0.10", + "System.Resources.ResourceManager": "4.0.0", + "System.Runtime": "4.0.20", "System.Runtime.Extensions": "4.0.10", + "System.Text.Encoding": "4.0.10", "System.Threading": "4.0.10", - "System.Diagnostics.Tools": "4.0.0", - "System.Diagnostics.Debug": "4.0.10" + "System.Xml.ReaderWriter": "4.0.10" }, "frameworks": { "dnxcore50": {} } -} \ No newline at end of file +} diff --git a/src/System.Xml.XmlDocument/tests/project.json b/src/System.Xml.XmlDocument/tests/project.json index d85cc7805299..863332fc0f8d 100644 --- a/src/System.Xml.XmlDocument/tests/project.json +++ b/src/System.Xml.XmlDocument/tests/project.json @@ -1,6 +1,7 @@ { "dependencies": { "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0028", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Runtime": "4.0.20", "System.Threading.Tasks": "4.0.10", "System.Xml.ReaderWriter": "4.0.10", diff --git a/src/System.Xml.XmlSerializer/src/facade/project.json b/src/System.Xml.XmlSerializer/src/facade/project.json index f15d78c42d41..2d26366fff58 100644 --- a/src/System.Xml.XmlSerializer/src/facade/project.json +++ b/src/System.Xml.XmlSerializer/src/facade/project.json @@ -2,7 +2,7 @@ "frameworks": { "net46": { "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.0-rc2-23530" + "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" } } } diff --git a/src/System.Xml.XmlSerializer/tests/project.json b/src/System.Xml.XmlSerializer/tests/project.json index 07cf140fdd3e..3ad9355b028f 100644 --- a/src/System.Xml.XmlSerializer/tests/project.json +++ b/src/System.Xml.XmlSerializer/tests/project.json @@ -1,6 +1,7 @@ { "dependencies": { "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0028", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", "System.Collections": "4.0.10", "System.Diagnostics.Debug": "4.0.10", "System.Diagnostics.Tools": "4.0.0", @@ -13,8 +14,8 @@ "System.Text.Encoding": "4.0.10", "System.Threading.Tasks": "4.0.10", "System.Xml.ReaderWriter": "4.0.10", - "System.Xml.XmlDocument": "4.0.0", "System.Xml.XDocument": "4.0.10", + "System.Xml.XmlDocument": "4.0.0", "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00123" }, From 67f99bffa22679a8c014f082341bb068d702d172 Mon Sep 17 00:00:00 2001 From: Alex Ghiondea Date: Tue, 9 Feb 2016 15:50:44 -0800 Subject: [PATCH 2/5] Update the System.Private.DataContractSerialization assembly to *not have* the reflection blocking attribute defined. Update the System.Runtime.Serialization.Primitives assembly to *have* the reflection blocking attribute defined. This brings back these libraries to parity with how reflection blocking worked in Update 1. [tfs-changeset: 1573915] --- .../src/System.Private.DataContractSerialization.csproj | 3 +++ .../src/System.Runtime.Serialization.Primitives.builds | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/src/System.Private.DataContractSerialization/src/System.Private.DataContractSerialization.csproj b/src/System.Private.DataContractSerialization/src/System.Private.DataContractSerialization.csproj index 8618df0cb765..2160d87ff076 100644 --- a/src/System.Private.DataContractSerialization/src/System.Private.DataContractSerialization.csproj +++ b/src/System.Private.DataContractSerialization/src/System.Private.DataContractSerialization.csproj @@ -12,6 +12,9 @@ true AnyCPU $(DefineConstants);NET_NATIVE + + + false diff --git a/src/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.builds b/src/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.builds index 6f43565837d0..e50cddae7e54 100644 --- a/src/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.builds +++ b/src/System.Runtime.Serialization.Primitives/src/System.Runtime.Serialization.Primitives.builds @@ -6,6 +6,12 @@ net46 + + + Windows_NT + netcore50aot + \ No newline at end of file From 0da1e06bc591c5ae4882a8a97d600623402533f6 Mon Sep 17 00:00:00 2001 From: "Eric St. John" Date: Wed, 10 Feb 2016 09:44:50 -0800 Subject: [PATCH 3/5] Add System.Buffers to netcore50 S.IO.FileSystem A dependency on System.Buffers was added to FileSystem around the same time that the project.json was forked. Add the new dependency to the new project.json. [tfs-changeset: 1574208] --- src/System.IO.FileSystem/src/netcore50/project.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/System.IO.FileSystem/src/netcore50/project.json b/src/System.IO.FileSystem/src/netcore50/project.json index 0e3247f3f77d..242ca939d6bb 100644 --- a/src/System.IO.FileSystem/src/netcore50/project.json +++ b/src/System.IO.FileSystem/src/netcore50/project.json @@ -1,6 +1,7 @@ { "dependencies": { "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", + "System.Buffers": "4.0.0-rc3-23808", "System.Collections": "4.0.10", "System.Diagnostics.Contracts": "4.0.0", "System.Diagnostics.Debug": "4.0.10", From 74495517b65843237ddf373f6ff796722ed6c293 Mon Sep 17 00:00:00 2001 From: "Eric St. John" Date: Wed, 10 Feb 2016 09:53:52 -0800 Subject: [PATCH 4/5] S.R.Serialization.Primitives should resolve packages for netcore50 A netcore50aot configuration was added but missing from project.json. As a result the nuget resolve build task chose to use the desktop target and compiler blew up with conflicts between mscorlib and the local types. Make sure we resolve for netcore50. [tfs-changeset: 1574210] --- .../src/project.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/System.Runtime.Serialization.Primitives/src/project.json b/src/System.Runtime.Serialization.Primitives/src/project.json index 3b8fe917c183..fe9c6d405ca4 100644 --- a/src/System.Runtime.Serialization.Primitives/src/project.json +++ b/src/System.Runtime.Serialization.Primitives/src/project.json @@ -7,6 +7,14 @@ "System.Threading.Tasks": "4.0.10" } }, + "netcore50": { + "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", + "System.Runtime": "4.0.20", + "System.Resources.ResourceManager": "4.0.0", + "System.Threading.Tasks": "4.0.10" + } + }, "net46":{ "dependencies": { "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1", From 04879960d6deea357350458d1fa04fe28a1a9ae6 Mon Sep 17 00:00:00 2001 From: "Eric St. John" Date: Wed, 10 Feb 2016 10:41:12 -0800 Subject: [PATCH 5/5] Fixing System.Linq package The package build was broken because the version of System.Linq changed to 4.1.0.0. For platforms that used to support 4.0.0.0 inbox we need to continue to redist the 4.0.0.0 version. Additionally, since desktop 4.6 doesn't support the new API we need to bump up the generation. For now I am claiming 5.6 which implies that this surface area must be added to .NET Framework 4.6. [tfs-changeset: 1574232] --- src/System.Linq/pkg/System.Linq.pkgproj | 5 ++++- src/System.Linq/ref/System.Linq.csproj | 4 ++-- src/System.Linq/ref/project.json | 2 +- src/System.Linq/src/System.Linq.builds | 7 +++---- src/System.Linq/src/System.Linq.csproj | 22 +++++++++++++++++++-- src/System.Linq/src/project.json | 26 +++++++++++++++---------- 6 files changed, 46 insertions(+), 20 deletions(-) diff --git a/src/System.Linq/pkg/System.Linq.pkgproj b/src/System.Linq/pkg/System.Linq.pkgproj index 9609bed134cf..c491f217cb62 100644 --- a/src/System.Linq/pkg/System.Linq.pkgproj +++ b/src/System.Linq/pkg/System.Linq.pkgproj @@ -3,8 +3,11 @@ + + net45;netcore45;wp8;wpa81 + - net45;netcore45;dnxcore50;wp8;wpa81 + netcore50;dnxcore50 diff --git a/src/System.Linq/ref/System.Linq.csproj b/src/System.Linq/ref/System.Linq.csproj index cadafe52c89a..62b341e49f07 100644 --- a/src/System.Linq/ref/System.Linq.csproj +++ b/src/System.Linq/ref/System.Linq.csproj @@ -4,8 +4,8 @@ 4.1.0.0 Library - dotnet5.1 - .NETPlatform,Version=v5.1 + dotnet5.6 + .NETPlatform,Version=v5.6 diff --git a/src/System.Linq/ref/project.json b/src/System.Linq/ref/project.json index ee4209f247c6..91c04b10187e 100644 --- a/src/System.Linq/ref/project.json +++ b/src/System.Linq/ref/project.json @@ -4,6 +4,6 @@ "System.Collections": "4.0.0" }, "frameworks": { - "dotnet5.1": {} + "dotnet5.6": {} } } \ No newline at end of file diff --git a/src/System.Linq/src/System.Linq.builds b/src/System.Linq/src/System.Linq.builds index d1c7110449a8..f09be9150071 100644 --- a/src/System.Linq/src/System.Linq.builds +++ b/src/System.Linq/src/System.Linq.builds @@ -3,10 +3,9 @@ - + + net462 + diff --git a/src/System.Linq/src/System.Linq.csproj b/src/System.Linq/src/System.Linq.csproj index d75aec9cddb3..a455e79a128a 100644 --- a/src/System.Linq/src/System.Linq.csproj +++ b/src/System.Linq/src/System.Linq.csproj @@ -6,14 +6,28 @@ System.Linq 4.1.0.0 System.Linq - dotnet5.4 + true + + Microsoft.TargetingPack.NETFramework.v4.6.1 + + + + dotnet5.6 + + + dnxcore50 + + - + System\Collections\Generic\EnumerableHelpers.cs @@ -23,6 +37,10 @@ + + + + diff --git a/src/System.Linq/src/project.json b/src/System.Linq/src/project.json index 99cae3def1ae..7dd4e3109833 100644 --- a/src/System.Linq/src/project.json +++ b/src/System.Linq/src/project.json @@ -1,14 +1,20 @@ { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", - "System.Collections": "4.0.10", - "System.Diagnostics.Debug": "4.0.10", - "System.Resources.ResourceManager": "4.0.0", - "System.Runtime": "4.0.20", - "System.Runtime.Extensions": "4.0.10", - "System.Threading.Tasks": "4.0.10" - }, "frameworks": { - "dnxcore50": {} + "dnxcore50": { + "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc3-23808", + "System.Collections": "4.0.10", + "System.Diagnostics.Debug": "4.0.10", + "System.Resources.ResourceManager": "4.0.0", + "System.Runtime": "4.0.20", + "System.Runtime.Extensions": "4.0.10", + "System.Threading.Tasks": "4.0.10" + } + }, + "net462": { + "dependencies": { + "Microsoft.TargetingPack.NetFramework.v4.6.1": "1.0.1" + } + } } }